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

Commit 507df146 authored by Oliver Middleton's avatar Oliver Middleton Committed by Gerrit Code Review
Browse files

Improve screen timeout QS tile 

 * Use com.android.internal.R.plurals.duration_* for text
 * Use white icon as suggested here https://jira.cyanogenmod.org/browse/CYAN-3769

Change-Id: Idfedbc1e7a857dbfa05736810e09528852c8bfa3
parent 01c0a0ba

packages/SystemUI/res/values/cm_strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
    <string name="quick_settings_torch_off">Torch off</string>

    <string name="quick_settings_nfc">NFC</string>

    <string name="quick_settings_nfc_off">NFC off</string>

    <string name="quick_settings_screen_timeout_summary" translatable="false">%1$d %2$s</string>

    <string name="quick_settings_usb_tether_off_label">Disconnected</string>

    <string name="quick_settings_usb_tether_connected_label">Tethering off</string>

    <string name="quick_settings_usb_tether_on_label">Tethering</string>

packages/SystemUI/src/com/android/systemui/quicksettings/ScreenTimeoutTile.java

+5 −12
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class ScreenTimeoutTile extends QuickSettingsTile { 
    private synchronized void updateTile() {

        int timeout = getScreenTimeout();

        mLabel = makeTimeoutSummaryString(mContext, timeout);

        mDrawable = R.drawable.ic_qs_screen_timeout_off;

        mDrawable = R.drawable.ic_qs_screen_timeout_on;

    }



    protected void toggleState() {
@@ -140,22 +140,15 @@ public class ScreenTimeoutTile extends QuickSettingsTile { 
            if (timeout >= 60 && timeout % 60 == 0) {

                /* minutes -> hours */

                timeout /= 60;

                resId = timeout == 1

                        ? com.android.internal.R.string.hour

                        : com.android.internal.R.string.hours;

                resId = com.android.internal.R.plurals.duration_hours;

            } else {

                resId = timeout == 1

                        ? com.android.internal.R.string.minute

                        : com.android.internal.R.string.minutes;

                resId = com.android.internal.R.plurals.duration_minutes;

            }

        } else {

            resId = timeout == 1

                    ? com.android.internal.R.string.second

                    : com.android.internal.R.string.seconds;

            resId = com.android.internal.R.plurals.duration_seconds;

        }



        return res.getString(R.string.quick_settings_screen_timeout_summary,

                timeout, res.getString(resId));

        return res.getQuantityString(resId, timeout, timeout);

    }



    private int getScreenTimeout() {