diff options
| author | Diogo Ferreira <defer@cyngn.com> | 2014-12-01 18:17:47 +0000 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-10-29 17:36:29 -0700 |
| commit | 0740704dcb93ae10b9925bb8555c043e356a9173 (patch) | |
| tree | 190b92cb4fcd614fb865804fef36c763fa029a63 | |
| parent | 68b424541b87f0befa7a519b5eaf22189ba85972 (diff) | |
| download | packages_apps_Settings-0740704dcb93ae10b9925bb8555c043e356a9173.zip packages_apps_Settings-0740704dcb93ae10b9925bb8555c043e356a9173.tar.gz packages_apps_Settings-0740704dcb93ae10b9925bb8555c043e356a9173.tar.bz2 | |
display: Make advanced settings a category
This was a separate screen but it's too empty for that, let's make
it a category like in CM11 for now. If it ever becomes a separate
screen it needs its own fragment so that navigation is possible
via actionbar.
Change-Id: I4b1f3e78a013412d5e39847683ca622dc76b9fa1
| -rw-r--r-- | res/xml/display_settings.xml | 4 | ||||
| -rw-r--r-- | src/com/android/settings/DisplaySettings.java | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml index 85ac374..1cc0c00 100644 --- a/res/xml/display_settings.xml +++ b/res/xml/display_settings.xml @@ -97,7 +97,7 @@ android:title="@string/wifi_display_settings_title" settings:keywords="@string/keywords_display_cast_screen" android:fragment="com.android.settings.wfd.WifiDisplaySettings" /> - <PreferenceScreen + <PreferenceCategory android:key="advanced_display_prefs" android:title="@string/advanced_settings"> @@ -110,5 +110,5 @@ android:title="@string/double_tap_to_sleep_title" android:summary="@string/double_tap_to_sleep_summary" android:defaultValue="true" /> - </PreferenceScreen> + </PreferenceCategory> </PreferenceScreen> diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index 1cbb3af..392e44d 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -49,6 +49,7 @@ import android.os.SystemProperties; import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceClickListener; +import android.preference.PreferenceCategory; import android.preference.PreferenceManager; import android.preference.PreferenceScreen; import android.preference.SwitchPreference; @@ -204,7 +205,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements mNightModePreference.setValue(String.valueOf(currentNightMode)); mNightModePreference.setOnPreferenceChangeListener(this); } - PreferenceScreen advancedPrefs = (PreferenceScreen) findPreference(CATEGORY_ADVANCED); + PreferenceCategory advancedPrefs = (PreferenceCategory) findPreference(CATEGORY_ADVANCED); mTapToWake = (SwitchPreference) findPreference(KEY_TAP_TO_WAKE); if (!isTapToWakeSupported()) { |