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

Commit 8702263d authored by jackmu95's avatar jackmu95 Committed by Gerrit Code Review
Browse files

Settings: Simplyfiy expanded desktop summary 

There is no need to have an extra summary string to display the
state of the expanded desktop mode. This commit removes the unneeded
strings and uses the entries as summary.

Change-Id: Ia7e99ec52577c64d786ef5a0117fb33f5af671ab
parent 79924823

res/values/strings.xml

+1 −4
Original line number Diff line number Diff line
@@ -4977,10 +4977,7 @@ 
    <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">Status bar visible</string>

    <string name="expanded_desktop_summary_no_status_bar">Status bar hidden</string>

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

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

    <string name="expanded_desktop_status_bar">Status bar visible</string>

    <string name="expanded_desktop_no_status_bar">Status bar hidden</string>

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

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

+3 −5
Original line number Diff line number Diff line
@@ -155,20 +155,18 @@ public class PowerMenu extends SettingsPreferenceFragment implements 
        Resources res = getResources();



        if (value == 0) {

            /* expanded desktop deactivated */

            // 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));

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

        } 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));

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

        }

    }

}