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

Commit 46915f82 authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Merge "Settings: add Advanced Settings under Display" into cm-10.2

parents 7c863f01 22abafa8

res/xml/display_settings.xml

+10 −0
Original line number Original line Diff line number Diff line
@@ -74,6 +74,16 @@ 
            android:summary="@string/wake_when_plugged_or_unplugged_summary"

            android:summary="@string/wake_when_plugged_or_unplugged_summary"

            android:defaultValue="false" />

            android:defaultValue="false" />





        <!-- DeviceParts Device Specific Display settings -->

        <Preference

            android:key="advanced_display_settings"

            android:title="@string/advanced_settings_title">

            <intent

                android:action="com.cyanogenmod.action.LAUNCH_DEVICE_SETTINGS"

                android:targetPackage="com.cyanogenmod.settings.device"

                android:targetClass="com.cyanogenmod.settings.device.DisplaySettings" />

        </Preference>



        <PreferenceCategory

        <PreferenceCategory

            android:key="lights_prefs"

            android:key="lights_prefs"

            android:title="@string/lights_category_title">

            android:title="@string/lights_category_title">

src/com/android/settings/DisplaySettings.java

+4 −0
Original line number Original line Diff line number Diff line
@@ -69,6 +69,7 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
    private static final String KEY_LOCKSCREEN_ROTATION = "lockscreen_rotation";

    private static final String KEY_LOCKSCREEN_ROTATION = "lockscreen_rotation";

    private static final String KEY_ADAPTIVE_BACKLIGHT = "adaptive_backlight";

    private static final String KEY_ADAPTIVE_BACKLIGHT = "adaptive_backlight";

    private static final String KEY_WAKE_WHEN_PLUGGED_OR_UNPLUGGED = "wake_when_plugged_or_unplugged";

    private static final String KEY_WAKE_WHEN_PLUGGED_OR_UNPLUGGED = "wake_when_plugged_or_unplugged";

    private static final String KEY_ADVANCED_DISPLAY_SETTINGS = "advanced_display_settings";





    private static final String CATEGORY_LIGHTS = "lights_prefs";

    private static final String CATEGORY_LIGHTS = "lights_prefs";

    private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";

    private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
@@ -179,6 +180,9 @@ public class DisplaySettings extends SettingsPreferenceFragment implements 
        mWakeWhenPluggedOrUnplugged =

        mWakeWhenPluggedOrUnplugged =

                (CheckBoxPreference) findPreference(KEY_WAKE_WHEN_PLUGGED_OR_UNPLUGGED);

                (CheckBoxPreference) findPreference(KEY_WAKE_WHEN_PLUGGED_OR_UNPLUGGED);





        Utils.updatePreferenceToSpecificActivityFromMetaDataOrRemove(getActivity(),

                getPreferenceScreen(), KEY_ADVANCED_DISPLAY_SETTINGS);



        boolean hasNotificationLed = res.getBoolean(

        boolean hasNotificationLed = res.getBoolean(

                com.android.internal.R.bool.config_intrusiveNotificationLed);

                com.android.internal.R.bool.config_intrusiveNotificationLed);

        boolean hasBatteryLed = res.getBoolean(

        boolean hasBatteryLed = res.getBoolean(

src/com/android/settings/Utils.java

+5 −3
Original line number Original line Diff line number Diff line
@@ -201,8 +201,7 @@ public class Utils { 
    public static boolean updatePreferenceToSpecificActivityFromMetaDataOrRemove(Context context,

    public static boolean updatePreferenceToSpecificActivityFromMetaDataOrRemove(Context context,

            PreferenceGroup parentPreferenceGroup, String preferenceKey) {

            PreferenceGroup parentPreferenceGroup, String preferenceKey) {





        IconPreferenceScreen preference = (IconPreferenceScreen)parentPreferenceGroup

        Preference preference = parentPreferenceGroup.findPreference(preferenceKey);

                .findPreference(preferenceKey);

        if (preference == null) {

        if (preference == null) {

            return false;

            return false;

        }

        }
@@ -245,9 +244,12 @@ public class Utils { 
                    }

                    }





                    // Set icon, title and summary for the preference

                    // Set icon, title and summary for the preference

                    preference.setIcon(icon);

                    preference.setTitle(title);

                    preference.setTitle(title);

                    preference.setSummary(summary);

                    preference.setSummary(summary);

                    if (preference instanceof IconPreferenceScreen) {

                        IconPreferenceScreen iconPreference = (IconPreferenceScreen) preference;

                        iconPreference.setIcon(icon);

                    }





                    // Replace the intent with this specific activity

                    // Replace the intent with this specific activity

                    preference.setIntent(new Intent().setClassName(

                    preference.setIntent(new Intent().setClassName(