Merge "[Audiosharing] Set earlist connected device active in sharing." into main
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceController.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceController.java
index f1119fc..d001409 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceController.java
@@ -25,10 +25,10 @@
import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
-import com.android.settings.widget.SummaryUpdater;
public class AudioStreamsActiveDeviceController extends BasePreferenceController
- implements SummaryUpdater.OnSummaryChangeListener, DefaultLifecycleObserver {
+ implements AudioStreamsActiveDeviceSummaryUpdater.OnSummaryChangeListener,
+ DefaultLifecycleObserver {
public static final String KEY = "audio_streams_active_device";
private final AudioStreamsActiveDeviceSummaryUpdater mSummaryHelper;
diff --git a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java
index 66101f7..cf79596 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsActiveDeviceSummaryUpdater.java
@@ -19,28 +19,30 @@
import android.annotation.Nullable;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
+import android.text.TextUtils;
import android.util.Log;
import com.android.settings.bluetooth.Utils;
import com.android.settings.connecteddevice.audiosharing.AudioSharingUtils;
-import com.android.settings.widget.SummaryUpdater;
import com.android.settingslib.bluetooth.BluetoothCallback;
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.utils.ThreadUtils;
import java.util.Optional;
-public class AudioStreamsActiveDeviceSummaryUpdater extends SummaryUpdater
- implements BluetoothCallback {
- private static final String TAG = "AudioStreamsListenWithSummaryUpdater";
+public class AudioStreamsActiveDeviceSummaryUpdater implements BluetoothCallback {
+ private static final String TAG = "AudioStreamsActiveDeviceSummaryUpdater";
private static final boolean DEBUG = BluetoothUtils.D;
private final LocalBluetoothManager mBluetoothManager;
+ private String mSummary;
+ private OnSummaryChangeListener mListener;
public AudioStreamsActiveDeviceSummaryUpdater(
Context context, OnSummaryChangeListener listener) {
- super(context, listener);
mBluetoothManager = Utils.getLocalBluetoothManager(context);
+ mListener = listener;
}
@Override
@@ -59,8 +61,7 @@
}
}
- @Override
- public void register(boolean register) {
+ void register(boolean register) {
if (register) {
notifyChangeIfNeeded();
mBluetoothManager.getEventManager().registerCallback(this);
@@ -69,8 +70,18 @@
}
}
- @Override
- protected String getSummary() {
+ private void notifyChangeIfNeeded() {
+ ThreadUtils.postOnBackgroundThread(
+ () -> {
+ String summary = getSummary();
+ if (!TextUtils.equals(mSummary, summary)) {
+ mSummary = summary;
+ ThreadUtils.postOnMainThread(() -> mListener.onSummaryChanged(summary));
+ }
+ });
+ }
+
+ private String getSummary() {
var activeSink = getActiveSinkOnAssistant(mBluetoothManager);
if (activeSink.isEmpty()) {
return "No active LE Audio device";
@@ -95,4 +106,14 @@
}
return Optional.empty();
}
+
+ /** Interface definition for a callback to be invoked when the summary has been changed. */
+ interface OnSummaryChangeListener {
+ /**
+ * Called when summary has changed.
+ *
+ * @param summary The new summary.
+ */
+ void onSummaryChanged(String summary);
+ }
}
diff --git a/src/com/android/settings/inputmethod/SpellCheckerPreference.java b/src/com/android/settings/inputmethod/SpellCheckerPreference.java
index 8c8942a..b8028fe 100644
--- a/src/com/android/settings/inputmethod/SpellCheckerPreference.java
+++ b/src/com/android/settings/inputmethod/SpellCheckerPreference.java
@@ -25,6 +25,7 @@
import android.view.View.OnClickListener;
import android.view.textservice.SpellCheckerInfo;
+import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.preference.PreferenceViewHolder;
@@ -41,11 +42,15 @@
class SpellCheckerPreference extends CustomListPreference {
private final SpellCheckerInfo[] mScis;
- private Intent mIntent;
+ @VisibleForTesting
+ Intent mIntent;
public SpellCheckerPreference(final Context context, final SpellCheckerInfo[] scis) {
super(context, null);
mScis = scis;
+ setLayoutResource(
+ com.android.settingslib.widget.preference.twotarget.R.layout.preference_two_target);
+
setWidgetLayoutResource(R.layout.preference_widget_gear);
if (scis == null) {
return;
@@ -108,14 +113,26 @@
@Override
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
+ final View divider = view.findViewById(
+ com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider);
+ final View widgetFrame = view.findViewById(android.R.id.widget_frame);
+ if (divider != null) {
+ divider.setVisibility(mIntent != null ? View.VISIBLE : View.GONE);
+ }
+ if (widgetFrame != null) {
+ widgetFrame.setVisibility(mIntent != null ? View.VISIBLE : View.GONE);
+ }
+
View settingsButton = view.findViewById(R.id.settings_button);
- settingsButton.setVisibility(mIntent != null ? View.VISIBLE : View.INVISIBLE);
- settingsButton.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- onSettingsButtonClicked();
- }
- });
+ if (settingsButton != null) {
+ settingsButton.setVisibility(mIntent != null ? View.VISIBLE : View.INVISIBLE);
+ settingsButton.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ onSettingsButtonClicked();
+ }
+ });
+ }
}
private void onSettingsButtonClicked() {
diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceTest.java
new file mode 100644
index 0000000..d8e54b0
--- /dev/null
+++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceTest.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.inputmethod;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.Mockito.spy;
+
+import android.content.Context;
+import android.content.Intent;
+import android.view.View;
+import android.view.textservice.SpellCheckerInfo;
+
+import androidx.preference.PreferenceViewHolder;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+
+@RunWith(RobolectricTestRunner.class)
+public class SpellCheckerPreferenceTest {
+
+ private Context mContext;
+ private PreferenceViewHolder mViewHolder;
+ private View mDivider;
+ private SpellCheckerPreference mPreference;
+ private final SpellCheckerInfo[] mScis = new SpellCheckerInfo[]{};
+
+ @Before
+ public void setUp() {
+ mContext = RuntimeEnvironment.application;
+ mPreference = new SpellCheckerPreference(mContext, mScis);
+ }
+
+ @Test
+ public void onBindViewHolder_withIntent_DividerIsVisible() {
+ final View view = spy(View.inflate(mContext, mPreference.getLayoutResource(), null));
+ mViewHolder = PreferenceViewHolder.createInstanceForTests(view);
+ mDivider = view.findViewById(
+ com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider);
+ mPreference.mIntent = new Intent(Intent.ACTION_MAIN);
+
+ mPreference.onBindViewHolder(mViewHolder);
+
+ assertThat(mDivider.getVisibility()).isEqualTo(View.VISIBLE);
+ }
+
+ @Test
+ public void onBindViewHolder_withoutIntent_DividerIsNotExist() {
+ final View view = spy(View.inflate(mContext, mPreference.getLayoutResource(), null));
+ mViewHolder = PreferenceViewHolder.createInstanceForTests(view);
+ mDivider = view.findViewById(
+ com.android.settingslib.widget.preference.twotarget.R.id.two_target_divider);
+
+ mPreference.onBindViewHolder(mViewHolder);
+
+ assertThat(mDivider.getVisibility()).isEqualTo(View.GONE);
+ }
+}