Merge "Also clear the foreground service usage time for BatteryDiffEntry should hide background usage time." into main
diff --git a/res/xml/storage_dashboard_fragment.xml b/res/xml/storage_dashboard_fragment.xml
index f14f4ad..6c2b8d4 100644
--- a/res/xml/storage_dashboard_fragment.xml
+++ b/res/xml/storage_dashboard_fragment.xml
@@ -101,7 +101,8 @@
android:key="pref_system"
android:title="@string/storage_os_name"
android:icon="@drawable/ic_android_vd_theme_24"
- android:order="202"/>
+ android:order="202"
+ settings:searchable="false"/>
<com.android.settings.deviceinfo.StorageItemPreference
android:key="temporary_files"
android:title="@string/storage_temporary_files"
diff --git a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
index 80d1ce0..91e65b1 100644
--- a/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java
@@ -67,7 +67,7 @@
initLaunchPreference();
final View view = super.onCreateView(inflater, container, savedInstanceState);
- removePreference(KEY_USE_SERVICE_PREFERENCE);
+ removePreference(getUseServicePreferenceKey());
return view;
}
diff --git a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
index ccba9e7f..24aae3f 100644
--- a/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragment.java
@@ -33,6 +33,8 @@
import android.view.View;
import android.view.ViewGroup;
+import androidx.annotation.VisibleForTesting;
+
import com.android.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.QuickSettingsTooltipType;
import com.android.settings.search.BaseSearchIndexProvider;
@@ -52,7 +54,10 @@
private static final String TAG = "ToggleColorInversionPreferenceFragment";
private static final String ENABLED = Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED;
- private static final String KEY_SHORTCUT_PREFERENCE = "color_inversion_shortcut_key";
+ @VisibleForTesting
+ static final String KEY_SHORTCUT_PREFERENCE = "color_inversion_shortcut_key";
+ @VisibleForTesting
+ static final String KEY_SWITCH_PREFERENCE = "color_inversion_switch_preference_key";
@Override
protected void registerKeysToObserverCallback(
@@ -73,9 +78,9 @@
mHtmlDescription = getText(R.string.accessibility_display_inversion_preference_subtitle);
mTopIntroTitle = getText(R.string.accessibility_display_inversion_preference_intro_text);
mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
- .authority(getPrefContext().getPackageName())
- .appendPath(String.valueOf(R.raw.a11y_color_inversion_banner))
- .build();
+ .authority(getPrefContext().getPackageName())
+ .appendPath(String.valueOf(R.raw.a11y_color_inversion_banner))
+ .build();
final View view = super.onCreateView(inflater, container, savedInstanceState);
updateFooterPreference();
return view;
@@ -132,6 +137,11 @@
}
@Override
+ protected String getUseServicePreferenceKey() {
+ return KEY_SWITCH_PREFERENCE;
+ }
+
+ @Override
protected CharSequence getShortcutTitle() {
return getText(R.string.accessibility_display_inversion_shortcut_title);
}
@@ -165,7 +175,7 @@
@Override
int getUserShortcutTypes() {
return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),
- mComponentName);
+ mComponentName);
}
@Override
@@ -176,8 +186,8 @@
@Override
CharSequence getTileTooltipContent(@QuickSettingsTooltipType int type) {
return getText(type == QuickSettingsTooltipType.GUIDE_TO_EDIT
- ? R.string.accessibility_color_inversion_qs_tooltip_content
- : R.string.accessibility_color_inversion_auto_added_qs_tooltip_content);
+ ? R.string.accessibility_color_inversion_qs_tooltip_content
+ : R.string.accessibility_color_inversion_auto_added_qs_tooltip_content);
}
@Override
@@ -194,12 +204,22 @@
@Override
public List<SearchIndexableRaw> getRawDataToIndex(Context context,
boolean enabled) {
- final List<SearchIndexableRaw> rawData = new ArrayList<>();
+ final List<SearchIndexableRaw> rawData =
+ super.getRawDataToIndex(context, enabled);
+
SearchIndexableRaw raw = new SearchIndexableRaw(context);
raw.key = KEY_SHORTCUT_PREFERENCE;
raw.title = context.getString(
- R.string.accessibility_display_inversion_shortcut_title);
+ R.string.accessibility_display_inversion_shortcut_title);
rawData.add(raw);
+
+ if (Flags.fixA11ySettingsSearch()) {
+ SearchIndexableRaw mainPreferenceRaw = new SearchIndexableRaw(context);
+ mainPreferenceRaw.key = KEY_SWITCH_PREFERENCE;
+ mainPreferenceRaw.title = context.getString(
+ R.string.accessibility_display_inversion_switch_title);
+ rawData.add(mainPreferenceRaw);
+ }
return rawData;
}
};
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 86ddd71..d2fc6cc 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -106,7 +106,7 @@
final List<String> lists = new ArrayList<>();
lists.add(KEY_TOP_INTRO_PREFERENCE);
lists.add(KEY_PREVIEW);
- lists.add(KEY_USE_SERVICE_PREFERENCE);
+ lists.add(getUseServicePreferenceKey());
// Putting saturation level close to the preview so users can see what is changing.
lists.add(KEY_SATURATION);
lists.add(KEY_DEUTERANOMALY);
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index 6649cf4..a9f422e 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -83,7 +83,6 @@
public static final String KEY_GENERAL_CATEGORY = "general_categories";
public static final String KEY_SHORTCUT_PREFERENCE = "shortcut_preference";
protected static final String KEY_TOP_INTRO_PREFERENCE = "top_intro";
- protected static final String KEY_USE_SERVICE_PREFERENCE = "use_service";
protected static final String KEY_HTML_DESCRIPTION_PREFERENCE = "html_description";
protected static final String KEY_SAVED_QS_TOOLTIP_RESHOW = "qs_tooltip_reshow";
protected static final String KEY_SAVED_QS_TOOLTIP_TYPE = "qs_tooltip_type";
@@ -325,6 +324,10 @@
switchPreference.setTitle(title);
}
+ protected String getUseServicePreferenceKey() {
+ return "use_service";
+ }
+
protected CharSequence getShortcutTitle() {
return getString(R.string.accessibility_shortcut_title, mPackageName);
}
@@ -411,7 +414,7 @@
final List<String> lists = new ArrayList<>();
lists.add(KEY_TOP_INTRO_PREFERENCE);
lists.add(KEY_ANIMATED_IMAGE);
- lists.add(KEY_USE_SERVICE_PREFERENCE);
+ lists.add(getUseServicePreferenceKey());
lists.add(KEY_GENERAL_CATEGORY);
lists.add(KEY_HTML_DESCRIPTION_PREFERENCE);
return lists;
@@ -476,7 +479,7 @@
private void initToggleServiceSwitchPreference() {
mToggleServiceSwitchPreference = new SettingsMainSwitchPreference(getPrefContext());
- mToggleServiceSwitchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
+ mToggleServiceSwitchPreference.setKey(getUseServicePreferenceKey());
if (getArguments().containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
final boolean enabled = getArguments().getBoolean(AccessibilitySettings.EXTRA_CHECKED);
mToggleServiceSwitchPreference.setChecked(enabled);
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java
index 60a8a13..6fd6f18 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdater.java
@@ -16,7 +16,6 @@
package com.android.settings.connecteddevice.audiosharing;
-import android.app.settings.SettingsEnums;
import android.content.Context;
import android.util.Log;
@@ -30,6 +29,7 @@
import com.android.settingslib.bluetooth.BluetoothUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
+import com.android.settingslib.utils.ThreadUtils;
public class AudioSharingBluetoothDeviceUpdater extends BluetoothDeviceUpdater
implements Preference.OnPreferenceClickListener {
@@ -73,7 +73,9 @@
@Override
public boolean onPreferenceClick(Preference preference) {
mMetricsFeatureProvider.logClickedPreference(preference, mMetricsCategory);
- mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_AUDIO_SHARING_DEVICE_CLICK);
+ var unused =
+ ThreadUtils.postOnBackgroundThread(
+ () -> mDevicePreferenceCallback.onDeviceClick(preference));
return true;
}
diff --git a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java
index 8b4c7f2..db2c7b2 100644
--- a/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java
+++ b/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceController.java
@@ -16,6 +16,7 @@
package com.android.settings.connecteddevice.audiosharing;
+import static com.android.settingslib.Utils.isAudioModeOngoingCall;
import static com.android.settingslib.bluetooth.LocalBluetoothLeBroadcast.EXTRA_BLUETOOTH_DEVICE;
import android.app.settings.SettingsEnums;
@@ -39,7 +40,9 @@
import androidx.preference.PreferenceGroup;
import androidx.preference.PreferenceScreen;
+import com.android.settings.R;
import com.android.settings.SettingsActivity;
+import com.android.settings.bluetooth.BluetoothDevicePreference;
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
import com.android.settings.bluetooth.Utils;
import com.android.settings.connecteddevice.DevicePreferenceCallback;
@@ -91,6 +94,7 @@
@Nullable private DashboardFragment mFragment;
@Nullable private AudioSharingDialogHandler mDialogHandler;
private AtomicBoolean mIntentHandled = new AtomicBoolean(false);
+ private AtomicBoolean mIsAudioModeOngoingCall = new AtomicBoolean(false);
@VisibleForTesting
BluetoothLeBroadcastAssistant.Callback mBroadcastAssistantCallback =
@@ -201,51 +205,57 @@
@Override
public void onStart(@NonNull LifecycleOwner owner) {
- if (!isAvailable()) {
- Log.d(TAG, "Skip onStart(), feature is not supported.");
- return;
- }
- if (!AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)
- && mProfileManager != null) {
- Log.d(TAG, "Register profile service listener");
- mProfileManager.addServiceListener(this);
- }
- if (mEventManager == null
- || mAssistant == null
- || mDialogHandler == null
- || mBluetoothDeviceUpdater == null) {
- Log.d(TAG, "Skip onStart(), profile is not ready.");
- return;
- }
- Log.d(TAG, "onStart() Register callbacks.");
- mEventManager.registerCallback(this);
- mAssistant.registerServiceCallBack(mExecutor, mBroadcastAssistantCallback);
- mDialogHandler.registerCallbacks(mExecutor);
- mBluetoothDeviceUpdater.registerCallback();
- mBluetoothDeviceUpdater.refreshPreference();
+ var unused = ThreadUtils.postOnBackgroundThread(() -> {
+ if (!isAvailable()) {
+ Log.d(TAG, "Skip onStart(), feature is not supported.");
+ return;
+ }
+ if (!AudioSharingUtils.isAudioSharingProfileReady(mProfileManager)
+ && mProfileManager != null) {
+ Log.d(TAG, "Register profile service listener");
+ mProfileManager.addServiceListener(this);
+ }
+ if (mEventManager == null
+ || mAssistant == null
+ || mDialogHandler == null
+ || mBluetoothDeviceUpdater == null) {
+ Log.d(TAG, "Skip onStart(), profile is not ready.");
+ return;
+ }
+ Log.d(TAG, "onStart() Register callbacks.");
+ mEventManager.registerCallback(this);
+ mAssistant.registerServiceCallBack(mExecutor, mBroadcastAssistantCallback);
+ mDialogHandler.registerCallbacks(mExecutor);
+ mBluetoothDeviceUpdater.registerCallback();
+ mBluetoothDeviceUpdater.refreshPreference();
+ mIsAudioModeOngoingCall.set(isAudioModeOngoingCall(mContext));
+ updateTitle();
+ });
}
@Override
public void onStop(@NonNull LifecycleOwner owner) {
- if (!isAvailable()) {
- Log.d(TAG, "Skip onStop(), feature is not supported.");
- return;
- }
- if (mProfileManager != null) {
- mProfileManager.removeServiceListener(this);
- }
- if (mEventManager == null
- || mAssistant == null
- || mDialogHandler == null
- || mBluetoothDeviceUpdater == null) {
- Log.d(TAG, "Skip onStop(), profile is not ready.");
- return;
- }
- Log.d(TAG, "onStop() Unregister callbacks.");
- mEventManager.unregisterCallback(this);
- mAssistant.unregisterServiceCallBack(mBroadcastAssistantCallback);
- mDialogHandler.unregisterCallbacks();
- mBluetoothDeviceUpdater.unregisterCallback();
+ var unused = ThreadUtils.postOnBackgroundThread(() -> {
+ if (!isAvailable()) {
+ Log.d(TAG, "Skip onStop(), feature is not supported.");
+ return;
+ }
+ if (mProfileManager != null) {
+ mProfileManager.removeServiceListener(this);
+ }
+ if (mEventManager == null
+ || mAssistant == null
+ || mDialogHandler == null
+ || mBluetoothDeviceUpdater == null) {
+ Log.d(TAG, "Skip onStop(), profile is not ready.");
+ return;
+ }
+ Log.d(TAG, "onStop() Unregister callbacks.");
+ mEventManager.unregisterCallback(this);
+ mAssistant.unregisterServiceCallBack(mBroadcastAssistantCallback);
+ mDialogHandler.unregisterCallbacks();
+ mBluetoothDeviceUpdater.unregisterCallback();
+ });
}
@Override
@@ -367,6 +377,25 @@
handleOnProfileStateChanged(cachedDevice, bluetoothProfile);
}
+ @Override
+ public void onAudioModeChanged() {
+ mIsAudioModeOngoingCall.set(isAudioModeOngoingCall(mContext));
+ updateTitle();
+ }
+
+ @Override
+ public void onDeviceClick(@NonNull Preference preference) {
+ boolean isCallMode = mIsAudioModeOngoingCall.get();
+ if (isCallMode) {
+ Log.d(TAG, "onDeviceClick, set active in call mode");
+ CachedBluetoothDevice cachedDevice =
+ ((BluetoothDevicePreference) preference).getBluetoothDevice();
+ cachedDevice.setActive();
+ }
+ mMetricsFeatureProvider.action(mContext, SettingsEnums.ACTION_AUDIO_SHARING_DEVICE_CLICK,
+ isCallMode);
+ }
+
/**
* Initialize the controller.
*
@@ -499,4 +528,22 @@
mDialogHandler.handleDeviceConnected(cachedDevice, /* userTriggered= */ true);
}
}
+
+ private void updateTitle() {
+ if (mPreferenceGroup == null) return;
+ int titleResId;
+ if (mIsAudioModeOngoingCall.get()) {
+ // in phone call
+ titleResId = R.string.connected_device_call_device_title;
+ } else {
+ // without phone call
+ titleResId = R.string.audio_sharing_device_group_title;
+ }
+ AudioSharingUtils.postOnMainThread(mContext,
+ () -> {
+ if (mPreferenceGroup != null) {
+ mPreferenceGroup.setTitle(titleResId);
+ }
+ });
+ }
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
index 1a82a25..e971186 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleColorInversionPreferenceFragmentTest.java
@@ -18,7 +18,8 @@
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
-import static com.android.settings.accessibility.ToggleColorInversionPreferenceFragment.KEY_USE_SERVICE_PREFERENCE;
+import static com.android.settings.accessibility.ToggleColorInversionPreferenceFragment.KEY_SHORTCUT_PREFERENCE;
+import static com.android.settings.accessibility.ToggleColorInversionPreferenceFragment.KEY_SWITCH_PREFERENCE;
import static com.google.common.truth.Truth.assertThat;
@@ -32,12 +33,12 @@
import android.content.Context;
import android.os.Bundle;
import android.platform.test.annotations.DisableFlags;
+import android.platform.test.annotations.EnableFlags;
import android.platform.test.flag.junit.SetFlagsRule;
import android.provider.Settings;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.view.accessibility.Flags;
import android.widget.PopupWindow;
import androidx.fragment.app.FragmentActivity;
@@ -50,6 +51,7 @@
import com.android.settings.testutils.XmlTestUtils;
import com.android.settings.testutils.shadow.ShadowFragment;
import com.android.settings.widget.SettingsMainSwitchPreference;
+import com.android.settingslib.search.SearchIndexableRaw;
import org.junit.Before;
import org.junit.Rule;
@@ -63,6 +65,7 @@
import org.robolectric.shadow.api.Shadow;
import org.robolectric.shadows.ShadowApplication;
+import java.util.ArrayList;
import java.util.List;
/** Tests for {@link ToggleColorInversionPreferenceFragment} */
@@ -93,10 +96,10 @@
when(mActivity.getContentResolver()).thenReturn(mContext.getContentResolver());
mScreen = spy(new PreferenceScreen(mContext, /* attrs= */ null));
- when(mScreen.findPreference(KEY_USE_SERVICE_PREFERENCE))
+ when(mScreen.findPreference(mFragment.getUseServicePreferenceKey()))
.thenReturn(mFragment.mToggleServiceSwitchPreference);
doReturn(mScreen).when(mFragment).getPreferenceScreen();
- mSwitchPreference = mScreen.findPreference(KEY_USE_SERVICE_PREFERENCE);
+ mSwitchPreference = mScreen.findPreference(mFragment.getUseServicePreferenceKey());
}
@Test
@@ -137,7 +140,7 @@
}
@Test
- @DisableFlags(Flags.FLAG_A11Y_QS_SHORTCUT)
+ @DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
public void onPreferenceToggled_colorCorrectDisabled_shouldReturnTrueAndShowTooltipView() {
Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.ACCESSIBILITY_DISPLAY_INVERSION_ENABLED, OFF);
@@ -199,6 +202,41 @@
assertThat(keys).containsAtLeastElementsIn(niks);
}
+ @Test
+ @DisableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+ public void getRawDataToIndex_flagOff_returnShortcutIndexablePreferences() {
+ List<SearchIndexableRaw> rawData = ToggleColorInversionPreferenceFragment
+ .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, /* enabled= */ true);
+
+ assertThat(rawData).hasSize(1);
+ assertThat(rawData.get(0).key).isEqualTo(KEY_SHORTCUT_PREFERENCE);
+ assertThat(rawData.get(0).title).isEqualTo(mContext.getString(
+ R.string.accessibility_display_inversion_shortcut_title));
+
+ }
+
+ @Test
+ @EnableFlags(Flags.FLAG_FIX_A11Y_SETTINGS_SEARCH)
+ public void getRawDataToIndex_flagOn_returnAllIndexablePreferences() {
+ String[] expectedKeys = {KEY_SHORTCUT_PREFERENCE, KEY_SWITCH_PREFERENCE};
+ String[] expectedTitles = {
+ mContext.getString(R.string.accessibility_display_inversion_shortcut_title),
+ mContext.getString(R.string.accessibility_display_inversion_switch_title)};
+ List<String> keysResultList = new ArrayList<>();
+ List<String> titlesResultList = new ArrayList<>();
+ List<SearchIndexableRaw> rawData = ToggleColorInversionPreferenceFragment
+ .SEARCH_INDEX_DATA_PROVIDER.getRawDataToIndex(mContext, /* enabled= */ true);
+
+ for (SearchIndexableRaw rawDataItem : rawData) {
+ keysResultList.add(rawDataItem.key);
+ titlesResultList.add(rawDataItem.title);
+ }
+
+ assertThat(rawData).hasSize(2);
+ assertThat(keysResultList).containsExactly(expectedKeys);
+ assertThat(titlesResultList).containsExactly(expectedTitles);
+ }
+
private static PopupWindow getLatestPopupWindow() {
final ShadowApplication shadowApplication =
Shadow.extract(ApplicationProvider.getApplicationContext());
@@ -220,7 +258,7 @@
mComponentName = PLACEHOLDER_COMPONENT_NAME;
final SettingsMainSwitchPreference switchPreference =
new SettingsMainSwitchPreference(context);
- switchPreference.setKey(KEY_USE_SERVICE_PREFERENCE);
+ switchPreference.setKey(getUseServicePreferenceKey());
mToggleServiceSwitchPreference = switchPreference;
setArguments(new Bundle());
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
index a5bfec2..fd82994 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragmentTest.java
@@ -18,7 +18,6 @@
import static com.android.settings.accessibility.AccessibilityUtil.State.OFF;
import static com.android.settings.accessibility.AccessibilityUtil.State.ON;
-import static com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment.KEY_USE_SERVICE_PREFERENCE;
import static com.google.common.truth.Truth.assertThat;
@@ -189,6 +188,6 @@
private SettingsMainSwitchPreference getMainFeatureToggle(
ToggleDaltonizerPreferenceFragment fragment) {
- return fragment.findPreference(KEY_USE_SERVICE_PREFERENCE);
+ return fragment.findPreference(fragment.getUseServicePreferenceKey());
}
}
diff --git a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
index 71855e0..844fabe 100644
--- a/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragmentTest.java
@@ -235,8 +235,7 @@
@Test
@Config(shadows = ShadowFragment.class)
public void onPreferenceToggledOnDisabledService_notShowTooltipView() {
- mFragment.onPreferenceToggled(
- ToggleFeaturePreferenceFragment.KEY_USE_SERVICE_PREFERENCE, /* enabled= */ false);
+ mFragment.onPreferenceToggled(mFragment.getUseServicePreferenceKey(), /* enabled= */ false);
assertThat(getLatestPopupWindow()).isNull();
}
@@ -245,8 +244,7 @@
@DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
@Config(shadows = ShadowFragment.class)
public void onPreferenceToggledOnEnabledService_showTooltipView() {
- mFragment.onPreferenceToggled(
- ToggleFeaturePreferenceFragment.KEY_USE_SERVICE_PREFERENCE, /* enabled= */ true);
+ mFragment.onPreferenceToggled(mFragment.getUseServicePreferenceKey(), /* enabled= */ true);
assertThat(getLatestPopupWindow().isShowing()).isTrue();
}
@@ -258,8 +256,7 @@
suwIntent.putExtra(WizardManagerHelper.EXTRA_IS_SETUP_FLOW, true);
when(mActivity.getIntent()).thenReturn(suwIntent);
- mFragment.onPreferenceToggled(
- ToggleFeaturePreferenceFragment.KEY_USE_SERVICE_PREFERENCE, /* enabled= */ true);
+ mFragment.onPreferenceToggled(mFragment.getUseServicePreferenceKey(), /* enabled= */ true);
assertThat(getLatestPopupWindow()).isNull();
}
@@ -268,12 +265,10 @@
@DisableFlags(android.view.accessibility.Flags.FLAG_A11Y_QS_SHORTCUT)
@Config(shadows = ShadowFragment.class)
public void onPreferenceToggledOnEnabledService_tooltipViewShown_notShowTooltipView() {
- mFragment.onPreferenceToggled(
- ToggleFeaturePreferenceFragment.KEY_USE_SERVICE_PREFERENCE, /* enabled= */ true);
+ mFragment.onPreferenceToggled(mFragment.getUseServicePreferenceKey(), /* enabled= */ true);
getLatestPopupWindow().dismiss();
- mFragment.onPreferenceToggled(
- ToggleFeaturePreferenceFragment.KEY_USE_SERVICE_PREFERENCE, /* enabled= */ true);
+ mFragment.onPreferenceToggled(mFragment.getUseServicePreferenceKey(), /* enabled= */ true);
assertThat(getLatestPopupWindow().isShowing()).isFalse();
}
diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
index faea3d8..d9054a8 100644
--- a/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
+++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothDetailsCompanionAppsControllerTest.java
@@ -115,7 +115,8 @@
/* pending */ false,
/* timeApprovedMs */ System.currentTimeMillis(),
/* lastTimeConnected */ Long.MAX_VALUE,
- /* systemDataSyncFlags */ -1);
+ /* systemDataSyncFlags */ -1,
+ /* deviceIcon */ null);
mAssociations.add(association);
showScreen(mController);
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java
index 879c6a4..11e31b6 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingBluetoothDeviceUpdaterTest.java
@@ -28,7 +28,6 @@
import static org.mockito.Mockito.when;
import static org.robolectric.Shadows.shadowOf;
-import android.app.settings.SettingsEnums;
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothLeBroadcastReceiveState;
@@ -271,8 +270,9 @@
public void onPreferenceClick_logClick() {
Preference preference = new Preference(mContext);
mDeviceUpdater.onPreferenceClick(preference);
- verify(mFeatureFactory.metricsFeatureProvider)
- .action(mContext, SettingsEnums.ACTION_AUDIO_SHARING_DEVICE_CLICK);
+ shadowOf(Looper.getMainLooper()).idle();
+
+ verify(mDevicePreferenceCallback).onDeviceClick(preference);
}
private void setupPreferenceMapWithDevice() {
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java
index 03f1303..61bc8aa 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/audiosharing/AudioSharingDevicePreferenceControllerTest.java
@@ -25,6 +25,7 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
@@ -44,10 +45,14 @@
import android.bluetooth.BluetoothStatusCodes;
import android.content.Context;
import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.media.AudioManager;
import android.os.Bundle;
import android.os.Looper;
import android.platform.test.flag.junit.SetFlagsRule;
+import android.util.Pair;
+import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
import androidx.lifecycle.LifecycleOwner;
import androidx.preference.Preference;
@@ -56,10 +61,13 @@
import androidx.preference.PreferenceScreen;
import androidx.test.core.app.ApplicationProvider;
+import com.android.settings.R;
import com.android.settings.SettingsActivity;
+import com.android.settings.bluetooth.BluetoothDevicePreference;
import com.android.settings.bluetooth.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.shadow.ShadowAudioManager;
import com.android.settings.testutils.shadow.ShadowBluetoothAdapter;
import com.android.settings.testutils.shadow.ShadowBluetoothUtils;
import com.android.settings.testutils.shadow.ShadowFragment;
@@ -99,14 +107,16 @@
@RunWith(RobolectricTestRunner.class)
@Config(
shadows = {
- ShadowBluetoothAdapter.class,
- ShadowBluetoothUtils.class,
- ShadowFragment.class,
+ ShadowBluetoothAdapter.class,
+ ShadowBluetoothUtils.class,
+ ShadowFragment.class,
+ ShadowAudioManager.class,
})
public class AudioSharingDevicePreferenceControllerTest {
private static final String KEY = "audio_sharing_device_list";
private static final String KEY_AUDIO_SHARING_SETTINGS =
"connected_device_audio_sharing_settings";
+ private static final String TEST_DEVICE_NAME = "test";
@Rule public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Rule public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();
@@ -140,6 +150,7 @@
private PreferenceCategory mPreferenceGroup;
private Preference mAudioSharingPreference;
private FakeFeatureFactory mFeatureFactory;
+ private AudioManager mAudioManager;
@Before
public void setUp() {
@@ -153,6 +164,7 @@
mLifecycleOwner = () -> mLifecycle;
mLifecycle = new Lifecycle(mLifecycleOwner);
mFeatureFactory = FakeFeatureFactory.setupForTest();
+ mAudioManager = mContext.getSystemService(AudioManager.class);
ShadowBluetoothUtils.sLocalBluetoothManager = mLocalBtManager;
mLocalBtManager = Utils.getLocalBtManager(mContext);
when(mLocalBtManager.getEventManager()).thenReturn(mEventManager);
@@ -571,4 +583,51 @@
verify(mBluetoothDeviceUpdater, never()).forceUpdate();
verifyNoMoreInteractions(mFeatureFactory.metricsFeatureProvider);
}
+
+ @Test
+ public void testInCallState_showCallStateTitleAndSetActiveOnDeviceClick() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mController.displayPreference(mScreen);
+
+ mAudioManager.setMode(AudioManager.MODE_IN_CALL);
+ mController.onAudioModeChanged();
+ shadowOf(Looper.getMainLooper()).idle();
+
+ assertThat(mPreferenceGroup.getTitle().toString())
+ .isEqualTo(mContext.getString(R.string.connected_device_call_device_title));
+
+ BluetoothDevicePreference preference = createBluetoothDevicePreference();
+ mController.onDeviceClick(preference);
+ verify(mCachedDevice).setActive();
+ }
+
+ @Test
+ public void testInNormalState_showNormalStateTitleAndDoNothingOnDeviceClick() {
+ mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_LE_AUDIO_SHARING);
+ mController.displayPreference(mScreen);
+
+ mAudioManager.setMode(AudioManager.MODE_NORMAL);
+ mController.onAudioModeChanged();
+ shadowOf(Looper.getMainLooper()).idle();
+
+ assertThat(mPreferenceGroup.getTitle().toString())
+ .isEqualTo(mContext.getString(R.string.audio_sharing_device_group_title));
+
+ BluetoothDevicePreference preference = createBluetoothDevicePreference();
+ mController.onDeviceClick(preference);
+
+ verify(mCachedDevice, never()).setActive();
+ }
+
+ @NonNull
+ private BluetoothDevicePreference createBluetoothDevicePreference() {
+ Drawable drawable = mock(Drawable.class);
+ Pair<Drawable, String> pairs = new Pair<>(drawable, TEST_DEVICE_NAME);
+ when(mCachedDevice.getDrawableWithDescription()).thenReturn(pairs);
+ return new BluetoothDevicePreference(
+ mContext,
+ mCachedDevice,
+ /* showDeviceWithoutNames= */ false,
+ BluetoothDevicePreference.SortType.TYPE_DEFAULT);
+ }
}