Merge "Remove silky flag from Display for official release" into sc-dev
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index ab8b385..c48dcbc 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -19,134 +19,140 @@
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="display_settings_screen"
android:title="@string/display_settings"
- settings:keywords="@string/keywords_display"
- settings:initialExpandedChildrenCount="6">
+ settings:keywords="@string/keywords_display">
- <com.android.settingslib.RestrictedPreference
- android:key="brightness"
- android:title="@string/brightness"
- settings:keywords="@string/keywords_display_brightness_level"
- settings:useAdminDisabledSummary="true"
- settings:userRestriction="no_config_brightness">
- <intent android:action="com.android.intent.action.SHOW_BRIGHTNESS_DIALOG" />
- </com.android.settingslib.RestrictedPreference>
+ <PreferenceCategory
+ android:title="@string/category_name_brightness">
- <com.android.settings.display.darkmode.DarkModePreference
- android:key="dark_ui_mode"
- android:title="@string/dark_ui_mode"
- android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
- android:widgetLayout="@null"
- settings:widgetLayout="@null"
- settings:controller="com.android.settings.display.DarkUIPreferenceController"
- settings:keywords="@string/keywords_dark_ui_mode"/>
+ <com.android.settingslib.RestrictedPreference
+ android:key="brightness"
+ android:title="@string/brightness"
+ settings:keywords="@string/keywords_display_brightness_level"
+ settings:useAdminDisabledSummary="true"
+ settings:userRestriction="no_config_brightness"/>
- <com.android.settings.widget.PrimarySwitchPreference
- android:key="night_display"
- android:title="@string/night_display_title"
- android:fragment="com.android.settings.display.NightDisplaySettings"
- settings:controller="com.android.settings.display.NightDisplayPreferenceController"
- settings:keywords="@string/keywords_display_night_display"/>
+ <com.android.settings.widget.PrimarySwitchPreference
+ android:key="auto_brightness_entry"
+ android:title="@string/auto_brightness_title"
+ android:fragment="com.android.settings.display.AutoBrightnessSettings"
+ settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
+ </PreferenceCategory>
- <Preference
- android:key="auto_brightness_entry"
- android:title="@string/auto_brightness_title"
- android:summary="@string/summary_placeholder"
- android:fragment="com.android.settings.display.AutoBrightnessSettings"
- settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
+ <PreferenceCategory
+ android:title="@string/category_name_lock_display">
- <com.android.settingslib.RestrictedPreference
- android:key="wallpaper"
- android:title="@string/wallpaper_settings_title"
- settings:keywords="@string/keywords_display_wallpaper"
- settings:useAdminDisabledSummary="true"
- settings:controller="com.android.settings.display.WallpaperPreferenceController">
- </com.android.settingslib.RestrictedPreference>
+ <Preference
+ android:key="lockscreen_from_display_settings"
+ android:title="@string/lockscreen_settings_title"
+ android:fragment="com.android.settings.security.LockscreenDashboardFragment"
+ settings:keywords="@string/keywords_ambient_display_screen"
+ settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController"/>
- <!-- Cross-listed item, if you change this, also change it in power_usage_summary.xml -->
- <com.android.settingslib.RestrictedPreference
- android:key="screen_timeout"
- android:title="@string/screen_timeout"
- android:summary="@string/summary_placeholder"
- android:fragment="com.android.settings.display.ScreenTimeoutSettings"
- settings:controller="com.android.settings.display.ScreenTimeoutPreferenceController" />
+ <com.android.settingslib.RestrictedPreference
+ android:key="screen_timeout"
+ android:title="@string/screen_timeout"
+ android:summary="@string/summary_placeholder"
+ android:fragment="com.android.settings.display.ScreenTimeoutSettings"
+ settings:controller="com.android.settings.display.ScreenTimeoutPreferenceController"/>
+ </PreferenceCategory>
- <SwitchPreference
- android:key="auto_rotate"
- android:title="@string/accelerometer_title"
- settings:keywords="@string/keywords_auto_rotate"
- settings:controller="com.android.settings.display.AutoRotatePreferenceController" />
+ <PreferenceCategory
+ android:title="@string/category_name_appearance">
- <Preference
- android:key="color_mode"
- android:title="@string/color_mode_title"
- android:fragment="com.android.settings.display.ColorModePreferenceFragment"
- settings:controller="com.android.settings.display.ColorModePreferenceController"
- settings:keywords="@string/keywords_color_mode" />
+ <com.android.settings.display.darkmode.DarkModePreference
+ android:key="dark_ui_mode"
+ android:title="@string/dark_ui_mode"
+ android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
+ android:widgetLayout="@null"
+ settings:widgetLayout="@null"
+ settings:controller="com.android.settings.display.DarkUIPreferenceController"
+ settings:keywords="@string/keywords_dark_ui_mode"/>
- <SwitchPreference
- android:key="display_white_balance"
- android:title="@string/display_white_balance_title"
- android:summary="@string/display_white_balance_summary"
- settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController" />
+ <Preference
+ android:key="font_size"
+ android:title="@string/title_font_size"
+ android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
+ settings:controller="com.android.settings.display.FontSizePreferenceController"
+ settings:keywords="@string/keywords_font_size"/>
- <SwitchPreference
- android:key="peak_refresh_rate"
- android:title="@string/peak_refresh_rate_title"
- android:summary="@string/peak_refresh_rate_summary"
- settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController" />
+ <com.android.settings.display.ScreenZoomPreference
+ android:key="display_settings_screen_zoom"
+ android:title="@string/screen_zoom_title"
+ android:fragment="com.android.settings.display.ScreenZoomSettings"
+ settings:keywords="@string/keywords_display_size"/>
+ </PreferenceCategory>
- <Preference
- android:key="font_size"
- android:title="@string/title_font_size"
- android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
- settings:controller="com.android.settings.display.FontSizePreferenceController"
- settings:keywords="@string/keywords_font_size" />
+ <PreferenceCategory
+ android:title="@string/category_name_color">
- <com.android.settings.display.ScreenZoomPreference
- android:key="display_settings_screen_zoom"
- android:title="@string/screen_zoom_title"
- android:fragment="com.android.settings.display.ScreenZoomSettings"
- settings:keywords="@string/keywords_display_size"/>
+ <com.android.settings.widget.PrimarySwitchPreference
+ android:key="night_display"
+ android:title="@string/night_display_title"
+ android:fragment="com.android.settings.display.NightDisplaySettings"
+ settings:controller="com.android.settings.display.NightDisplayPreferenceController"
+ settings:keywords="@string/keywords_display_night_display"/>
- <SwitchPreference
- android:key="show_operator_name"
- android:title="@string/show_operator_name_title"
- android:summary="@string/show_operator_name_summary" />
+ <Preference
+ android:key="color_mode"
+ android:title="@string/color_mode_title"
+ android:fragment="com.android.settings.display.ColorModePreferenceFragment"
+ settings:controller="com.android.settings.display.ColorModePreferenceController"
+ settings:keywords="@string/keywords_color_mode"/>
+ </PreferenceCategory>
- <Preference
- android:key="screensaver"
- android:title="@string/screensaver_settings_title"
- android:fragment="com.android.settings.dream.DreamSettings" />
+ <PreferenceCategory
+ android:title="@string/category_name_display_controls">
- <Preference
- android:key="lockscreen_from_display_settings"
- android:title="@string/lockscreen_settings_title"
- android:fragment="com.android.settings.security.LockscreenDashboardFragment"
- settings:keywords="@string/keywords_ambient_display_screen"
- settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController" />
+ <SwitchPreference
+ android:key="auto_rotate"
+ android:title="@string/accelerometer_title"
+ settings:keywords="@string/keywords_auto_rotate"
+ settings:controller="com.android.settings.display.AutoRotatePreferenceController"/>
- <SwitchPreference
- android:key="camera_gesture"
- android:title="@string/camera_gesture_title"
- android:summary="@string/camera_gesture_desc" />
+ <SwitchPreference
+ android:key="display_white_balance"
+ android:title="@string/display_white_balance_title"
+ android:summary="@string/display_white_balance_summary"
+ settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController"/>
- <SwitchPreference
- android:key="lift_to_wake"
- android:title="@string/lift_to_wake_title" />
+ <SwitchPreference
+ android:key="peak_refresh_rate"
+ android:title="@string/peak_refresh_rate_title"
+ android:summary="@string/peak_refresh_rate_summary"
+ settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController"/>
- <SwitchPreference
- android:key="tap_to_wake"
- android:title="@string/tap_to_wake"
- android:summary="@string/tap_to_wake_summary" />
+ <SwitchPreference
+ android:key="show_operator_name"
+ android:title="@string/show_operator_name_title"
+ android:summary="@string/show_operator_name_summary"/>
- <ListPreference
- android:key="theme"
- android:title="@string/device_theme"
- android:summary="@string/summary_placeholder" />
+ <Preference
+ android:key="screensaver"
+ android:title="@string/screensaver_settings_title"
+ android:fragment="com.android.settings.dream.DreamSettings"/>
- <Preference
- android:key="vr_display_pref"
- android:title="@string/display_vr_pref_title"
- android:fragment="com.android.settings.display.VrDisplayPreferencePicker" />
+ <SwitchPreference
+ android:key="camera_gesture"
+ android:title="@string/camera_gesture_title"
+ android:summary="@string/camera_gesture_desc"/>
+ <SwitchPreference
+ android:key="lift_to_wake"
+ android:title="@string/lift_to_wake_title"/>
+
+ <SwitchPreference
+ android:key="tap_to_wake"
+ android:title="@string/tap_to_wake"
+ android:summary="@string/tap_to_wake_summary"/>
+
+ <ListPreference
+ android:key="theme"
+ android:title="@string/device_theme"
+ android:summary="@string/summary_placeholder"/>
+
+ <Preference
+ android:key="vr_display_pref"
+ android:title="@string/display_vr_pref_title"
+ android:fragment="com.android.settings.display.VrDisplayPreferencePicker"/>
+ </PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/display_settings_v2.xml b/res/xml/display_settings_v2.xml
deleted file mode 100644
index 2d6e3db..0000000
--- a/res/xml/display_settings_v2.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2020 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.
--->
-
-<PreferenceScreen
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:settings="http://schemas.android.com/apk/res-auto"
- android:key="display_settings_screen"
- android:title="@string/display_settings"
- settings:keywords="@string/keywords_display">
-
- <PreferenceCategory
- android:title="@string/category_name_brightness">
-
- <com.android.settingslib.RestrictedPreference
- android:key="brightness"
- android:title="@string/brightness"
- settings:keywords="@string/keywords_display_brightness_level"
- settings:useAdminDisabledSummary="true"
- settings:userRestriction="no_config_brightness">
- </com.android.settingslib.RestrictedPreference>
-
- <com.android.settings.widget.PrimarySwitchPreference
- android:key="auto_brightness_entry"
- android:title="@string/auto_brightness_title"
- android:fragment="com.android.settings.display.AutoBrightnessSettings"
- settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"/>
- </PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/category_name_lock_display">
-
- <Preference
- android:key="lockscreen_from_display_settings"
- android:title="@string/lockscreen_settings_title"
- android:fragment="com.android.settings.security.LockscreenDashboardFragment"
- settings:keywords="@string/keywords_ambient_display_screen"
- settings:controller="com.android.settings.security.screenlock.LockScreenPreferenceController"/>
-
- <com.android.settingslib.RestrictedPreference
- android:key="screen_timeout"
- android:title="@string/screen_timeout"
- android:summary="@string/summary_placeholder"
- android:fragment="com.android.settings.display.ScreenTimeoutSettings"
- settings:controller="com.android.settings.display.ScreenTimeoutPreferenceController"/>
- </PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/category_name_appearance">
-
- <com.android.settings.display.darkmode.DarkModePreference
- android:key="dark_ui_mode"
- android:title="@string/dark_ui_mode"
- android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
- android:widgetLayout="@null"
- settings:widgetLayout="@null"
- settings:controller="com.android.settings.display.DarkUIPreferenceController"
- settings:keywords="@string/keywords_dark_ui_mode"/>
-
- <Preference
- android:key="font_size"
- android:title="@string/title_font_size"
- android:fragment="com.android.settings.display.ToggleFontSizePreferenceFragment"
- settings:controller="com.android.settings.display.FontSizePreferenceController"
- settings:keywords="@string/keywords_font_size"/>
-
- <com.android.settings.display.ScreenZoomPreference
- android:key="display_settings_screen_zoom"
- android:title="@string/screen_zoom_title"
- android:fragment="com.android.settings.display.ScreenZoomSettings"
- settings:keywords="@string/keywords_display_size"/>
- </PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/category_name_color">
-
- <com.android.settings.widget.PrimarySwitchPreference
- android:key="night_display"
- android:title="@string/night_display_title"
- android:fragment="com.android.settings.display.NightDisplaySettings"
- settings:controller="com.android.settings.display.NightDisplayPreferenceController"
- settings:keywords="@string/keywords_display_night_display"/>
-
- <Preference
- android:key="color_mode"
- android:title="@string/color_mode_title"
- android:fragment="com.android.settings.display.ColorModePreferenceFragment"
- settings:controller="com.android.settings.display.ColorModePreferenceController"
- settings:keywords="@string/keywords_color_mode"/>
- </PreferenceCategory>
-
- <PreferenceCategory
- android:title="@string/category_name_display_controls">
-
- <SwitchPreference
- android:key="auto_rotate"
- android:title="@string/accelerometer_title"
- settings:keywords="@string/keywords_auto_rotate"
- settings:controller="com.android.settings.display.AutoRotatePreferenceController"/>
-
- <SwitchPreference
- android:key="display_white_balance"
- android:title="@string/display_white_balance_title"
- android:summary="@string/display_white_balance_summary"
- settings:controller="com.android.settings.display.DisplayWhiteBalancePreferenceController"/>
-
- <SwitchPreference
- android:key="peak_refresh_rate"
- android:title="@string/peak_refresh_rate_title"
- android:summary="@string/peak_refresh_rate_summary"
- settings:controller="com.android.settings.display.PeakRefreshRatePreferenceController"/>
-
- <SwitchPreference
- android:key="show_operator_name"
- android:title="@string/show_operator_name_title"
- android:summary="@string/show_operator_name_summary"/>
-
- <Preference
- android:key="screensaver"
- android:title="@string/screensaver_settings_title"
- android:fragment="com.android.settings.dream.DreamSettings"/>
-
- <SwitchPreference
- android:key="camera_gesture"
- android:title="@string/camera_gesture_title"
- android:summary="@string/camera_gesture_desc"/>
-
- <SwitchPreference
- android:key="lift_to_wake"
- android:title="@string/lift_to_wake_title"/>
-
- <SwitchPreference
- android:key="tap_to_wake"
- android:title="@string/tap_to_wake"
- android:summary="@string/tap_to_wake_summary"/>
-
- <ListPreference
- android:key="theme"
- android:title="@string/device_theme"
- android:summary="@string/summary_placeholder"/>
-
- <Preference
- android:key="vr_display_pref"
- android:title="@string/display_vr_pref_title"
- android:fragment="com.android.settings.display.VrDisplayPreferencePicker"/>
- </PreferenceCategory>
-</PreferenceScreen>
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 1cb9ade..9a62412 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -19,10 +19,7 @@
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
-import android.provider.SearchIndexableResource;
-import android.util.FeatureFlagUtils;
-import com.android.settings.core.FeatureFlags;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.display.BrightnessLevelPreferenceController;
import com.android.settings.display.CameraGesturePreferenceController;
@@ -38,7 +35,6 @@
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
@@ -57,9 +53,6 @@
@Override
protected int getPreferenceScreenResId() {
- if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.SILKY_HOME)) {
- return R.xml.display_settings_v2;
- }
return R.xml.display_settings;
}
@@ -93,16 +86,7 @@
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
- new BaseSearchIndexProvider() {
-
- @Override
- public List<SearchIndexableResource> getXmlResourcesToIndex(
- Context context, boolean enabled) {
- final SearchIndexableResource sir = new SearchIndexableResource(context);
- sir.xmlResId = FeatureFlagUtils.isEnabled(context, FeatureFlags.SILKY_HOME)
- ? R.xml.display_settings_v2 : R.xml.display_settings;
- return Arrays.asList(sir);
- }
+ new BaseSearchIndexProvider(R.xml.display_settings) {
@Override
public List<AbstractPreferenceController> createPreferenceControllers(