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

Commit 8c41f426 authored by Michael A. Alcorn's avatar Michael A. Alcorn Committed by Gerrit Code Review
Browse files

Option to show status bar in expanded desktop mode (1/2) 



This commit changes the "Expanded desktop" checkbox in the "Power menu" settings to a list containing the options "Off", "With status bar", and
"Without status bar".

Patch-set 1: fix erroneous whitespace/tabs.
Patch-set 2: missed some whitespace.
Patch-set 3: fix typos, clarify variable names.

Change-Id: I491538d1e537b5b245ff8621e88bc2012ca17a49
Signed-off-by: default avatarMichael A. Alcorn <airalcorn2@gmail.com>
parent e9486fe8

res/values/arrays.xml

+13 −0
Original line number Diff line number Diff line
@@ -1226,6 +1226,19 @@ 
        <item>1</item>

    </string-array>



    <!-- Expanded desktop -->

    <string-array name="expanded_desktop_entries" translatable="false">

        <item>@string/expanded_desktop_disabled</item>

        <item>@string/expanded_desktop_status_bar</item>

        <item>@string/expanded_desktop_no_status_bar</item>

    </string-array>



    <string-array name="expanded_desktop_values" translatable="false">

        <item>0</item>

        <item>1</item>

        <item>2</item>

    </string-array>



    <!-- Quick pulldown -->

    <string-array name="quick_pulldown_entries" translatable="false">

        <item>@string/quick_pulldown_off</item>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -4978,6 +4978,12 @@ 
    <string name="power_menu_reboot_title">Reboot menu</string>

    <string name="power_menu_screenshot_title">Screenshot</string>

    <string name="power_menu_expanded_desktop">Expanded desktop</string>

    <string name="summary_expanded_desktop">%1$s</string>

    <string name="expanded_desktop_summary_status_bar">With status bar</string>

    <string name="expanded_desktop_summary_no_status_bar">Without status bar</string>

    <string name="expanded_desktop_disabled">Off</string>

    <string name="expanded_desktop_status_bar">With status bar</string>

    <string name="expanded_desktop_no_status_bar">Without status bar</string>

    <string name="power_menu_profiles_title">Profile switcher</string>

    <string name="power_menu_airplane_title">Airplane mode</string>

    <string name="power_menu_user_title">User switcher</string>

res/xml/power_menu_settings.xml

+4 −2
Original line number Diff line number Diff line
@@ -29,10 +29,12 @@ 
        android:title="@string/power_menu_screenshot_title"

        android:defaultValue="false" />



    <CheckBoxPreference

    <ListPreference

        android:key="power_menu_expanded_desktop"

        android:title="@string/power_menu_expanded_desktop"

        android:defaultValue="false" />

        android:entries="@array/expanded_desktop_entries"

        android:entryValues="@array/expanded_desktop_values"

        android:persistent="false" />



    <CheckBoxPreference

        android:key="power_menu_profiles"

src/com/android/settings/cyanogenmod/PowerMenu.java

+43 −18
Original line number Diff line number Diff line
@@ -16,18 +16,22 @@ 


package com.android.settings.cyanogenmod;



import android.content.res.Resources;

import android.os.Bundle;

import android.os.UserHandle;

import android.os.UserManager;

import android.preference.CheckBoxPreference;

import android.preference.ListPreference;

import android.preference.Preference;

import android.preference.Preference.OnPreferenceChangeListener;

import android.preference.PreferenceScreen;

import android.provider.Settings;



import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;



public class PowerMenu extends SettingsPreferenceFragment {

public class PowerMenu extends SettingsPreferenceFragment implements

        OnPreferenceChangeListener {

    private static final String TAG = "PowerMenu";



    private static final String KEY_REBOOT = "power_menu_reboot";
@@ -40,7 +44,7 @@ public class PowerMenu extends SettingsPreferenceFragment { 


    private CheckBoxPreference mRebootPref;

    private CheckBoxPreference mScreenshotPref;

    private CheckBoxPreference mExpandedDesktopPref;

    ListPreference mExpandedDesktopPref;

    private CheckBoxPreference mProfilesPref;

    private CheckBoxPreference mAirplanePref;

    private CheckBoxPreference mUserPref;
@@ -60,17 +64,12 @@ public class PowerMenu extends SettingsPreferenceFragment { 
        mScreenshotPref.setChecked((Settings.System.getInt(getContentResolver(),

                Settings.System.POWER_MENU_SCREENSHOT_ENABLED, 0) == 1));



        mExpandedDesktopPref = (CheckBoxPreference) findPreference(KEY_EXPANDED_DESKTOP);

        boolean showExpandedDesktopPref =

            getResources().getBoolean(R.bool.config_show_expandedDesktop);

        if (!showExpandedDesktopPref) {

            if (mExpandedDesktopPref != null) {

                getPreferenceScreen().removePreference(mExpandedDesktopPref);

            }

        } else {

            mExpandedDesktopPref.setChecked((Settings.System.getInt(getContentResolver(),

                Settings.System.POWER_MENU_EXPANDED_DESKTOP_ENABLED, 0) == 1));

        }

        PreferenceScreen prefSet = getPreferenceScreen();

        mExpandedDesktopPref = (ListPreference) prefSet.findPreference(KEY_EXPANDED_DESKTOP);

        mExpandedDesktopPref.setOnPreferenceChangeListener(this);

        int expandedDesktopValue = Settings.System.getInt(getContentResolver(), Settings.System.EXPANDED_DESKTOP_STYLE, 0);

        mExpandedDesktopPref.setValue(String.valueOf(expandedDesktopValue));

        updateExpandedDesktopSummary(expandedDesktopValue);



        mProfilesPref = (CheckBoxPreference) findPreference(KEY_PROFILES);

        mProfilesPref.setChecked((Settings.System.getInt(getContentResolver(),
@@ -100,6 +99,17 @@ public class PowerMenu extends SettingsPreferenceFragment { 


    }



    public boolean onPreferenceChange(Preference preference, Object newValue) {

        if (preference == mExpandedDesktopPref) {

            int expandedDesktopValue = Integer.valueOf((String) newValue);

            Settings.System.putInt(getContentResolver(),

                    Settings.System.EXPANDED_DESKTOP_STYLE, expandedDesktopValue);

            updateExpandedDesktopSummary(expandedDesktopValue);

            return true;

        }

        return false;

    }



    @Override

    public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {

        boolean value;
@@ -109,11 +119,6 @@ public class PowerMenu extends SettingsPreferenceFragment { 
            Settings.System.putInt(getContentResolver(),

                    Settings.System.POWER_MENU_SCREENSHOT_ENABLED,

                    value ? 1 : 0);

        } else if (preference == mExpandedDesktopPref) {

            value = mExpandedDesktopPref.isChecked();

            Settings.System.putInt(getContentResolver(),

                    Settings.System.POWER_MENU_EXPANDED_DESKTOP_ENABLED,

                    value ? 1 : 0);

        } else if (preference == mRebootPref) {

            value = mRebootPref.isChecked();

            Settings.System.putInt(getContentResolver(),
@@ -146,4 +151,24 @@ public class PowerMenu extends SettingsPreferenceFragment { 
        return true;

    }



    private void updateExpandedDesktopSummary(int value) {

        Resources res = getResources();



        if (value == 0) {

            /* expanded desktop deactivated */

            Settings.System.putInt(getContentResolver(),

                    Settings.System.POWER_MENU_EXPANDED_DESKTOP_ENABLED, 0);

            mExpandedDesktopPref.setSummary(res.getString(R.string.expanded_desktop_disabled));

        } else if (value == 1) {

            Settings.System.putInt(getContentResolver(),

                    Settings.System.POWER_MENU_EXPANDED_DESKTOP_ENABLED, 1);

            String statusBarPresent = res.getString(R.string.expanded_desktop_summary_status_bar);

            mExpandedDesktopPref.setSummary(res.getString(R.string.summary_expanded_desktop, statusBarPresent));

        } else if (value == 2) {

            Settings.System.putInt(getContentResolver(),

                    Settings.System.POWER_MENU_EXPANDED_DESKTOP_ENABLED, 1);

            String statusBarPresent = res.getString(R.string.expanded_desktop_summary_no_status_bar);

            mExpandedDesktopPref.setSummary(res.getString(R.string.summary_expanded_desktop, statusBarPresent));

        }

    }

}