Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0740704d authored by Diogo Ferreira's avatar Diogo Ferreira Committed by Adnan Begovic
Browse files

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
parent 68b42454

res/xml/display_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

src/com/android/settings/DisplaySettings.java

+2 −1
Original line number Diff line number Diff line
@@ -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()) {