PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update dark mode in accessiblity settings"

Browse Source
This commit is contained in:
Salvador Martinez
2019-03-28 20:56:27 +00:00
committed by Android (Google) Code Review
parent 23cb22a7f9 194abe94d0
commit 70da69b0ac
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/xml/accessibility_settings.xml
View File

@@ -58,12 +58,10 @@
android:title="@string/screen_zoom_title" android:title="@string/screen_zoom_title"
settings:searchable="false"/> settings:searchable="false"/>
<ListPreference <Preference
android:key="dark_ui_mode_accessibility" android:key="dark_ui_mode_accessibility"
android:fragment="com.android.settings.display.DarkUISettings"
android:title="@string/dark_ui_mode" android:title="@string/dark_ui_mode"
android:dialogTitle="@string/dark_ui_mode_title"
android:entries="@array/dark_ui_mode_entries"
android:entryValues="@array/dark_ui_mode_values"
settings:searchable="false" /> settings:searchable="false" />
<Preference <Preference

2
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -244,7 +244,7 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
private SwitchPreference mToggleInversionPreference; private SwitchPreference mToggleInversionPreference;
private ColorInversionPreferenceController mInversionPreferenceController; private ColorInversionPreferenceController mInversionPreferenceController;
private AccessibilityHearingAidPreferenceController mHearingAidPreferenceController; private AccessibilityHearingAidPreferenceController mHearingAidPreferenceController;
private ListPreference mDarkUIModePreference; private Preference mDarkUIModePreference;
private DarkUIPreferenceController mDarkUIPreferenceController; private DarkUIPreferenceController mDarkUIPreferenceController;
private LiveCaptionPreferenceController mLiveCaptionPreferenceController; private LiveCaptionPreferenceController mLiveCaptionPreferenceController;

2
tests/robotests/src/com/android/settings/accessibility/AccessibilitySettingsTest.java
View File

@@ -156,7 +156,7 @@ public class AccessibilitySettingsTest {
@Test @Test
public void testDarkUIModePreferenceSummary_shouldUpdateSummary() { public void testDarkUIModePreferenceSummary_shouldUpdateSummary() {
final ListPreference darkUIModePreference = new ListPreference(mContext); final Preference darkUIModePreference = new Preference(mContext);
final DarkUIPreferenceController mController; final DarkUIPreferenceController mController;
doReturn(darkUIModePreference).when(mSettings).findPreference( doReturn(darkUIModePreference).when(mSettings).findPreference(
DARK_UI_MODE_PREFERENCE); DARK_UI_MODE_PREFERENCE);