Merge "Fix testing fail for BatteryInfoTest and HighUsageTipTest" into sc-dev
diff --git a/res/xml/accessibility_settings.xml b/res/xml/accessibility_settings.xml
index 1743f9b..bebb336 100644
--- a/res/xml/accessibility_settings.xml
+++ b/res/xml/accessibility_settings.xml
@@ -43,6 +43,21 @@
android:title="@string/accessibility_text_and_display_title"
settings:searchable="true"/>
+ <!--TODO(b/170973645): Get icon-->
+ <Preference
+ android:fragment="com.android.settings.accessibility.ToggleReduceBrightColorsPreferenceFragment"
+ android:key="reduce_bright_colors_preference"
+ android:persistent="false"
+ android:title="@string/reduce_bright_colors_preference_title"
+ settings:controller="com.android.settings.accessibility.ReduceBrightColorsPreferenceController"/>
+
+ <SwitchPreference
+ android:key="dark_ui_mode_accessibility"
+ android:persistent="false"
+ android:title="@string/dark_ui_mode"
+ settings:controller="com.android.settings.display.DarkUIPreferenceController"
+ settings:searchable="false"/>
+
<Preference
android:fragment="com.android.settings.accessibility.MagnificationPreferenceFragment"
android:icon="@drawable/ic_accessibility_magnification"
@@ -50,6 +65,7 @@
android:persistent="false"
android:title="@string/accessibility_screen_magnification_title"
settings:controller="com.android.settings.accessibility.MagnificationPreferenceController"/>
+
</PreferenceCategory>
<PreferenceCategory
diff --git a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
index 5ab4754..25b3abd 100644
--- a/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
+++ b/src/com/android/settings/applications/specialaccess/deviceadmin/DeviceAdminListPreferenceController.java
@@ -207,6 +207,7 @@
return true;
});
pref.setOnPreferenceChangeListener((preference, newValue) -> false);
+ pref.setSingleLineTitle(true);
}
/**
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
index 6858579..c1bafca 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryEntryTest.java
@@ -20,6 +20,7 @@
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -235,6 +236,7 @@
@Test
public void getKey_UserBatteryConsumer_returnUserId() {
+ doReturn(mockUserManager).when(mMockContext).getSystemService(UserManager.class);
final BatteryEntry entry = createUserBatteryConsumer(2);
final String key = entry.getKey();
assertThat(key).isEqualTo("U|2");