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

Commit 6b5877c3 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "SystemUI QuickSettings: Allow more off-status localizations" into cm-10.1

parents 2f52b272 90560e7c

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -542,9 +542,11 @@ 
    <string name="quick_settings_network_type">Network mode</string>

    <string name="quick_settings_report_bug">Report bug</string>

    <string name="quick_settings_sync">Sync</string>

    <string name="quick_settings_sync_off">Sync off</string>

    <string name="quick_settings_torch">Torch</string>

    <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">Timeout</string>

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

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

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

+2 −3
Original line number Diff line number Diff line
@@ -73,19 +73,18 @@ public class NfcTile extends QuickSettingsTile { 
    }



    private void setTileState(int state) {

        // Get the initial label

        mLabel = mContext.getString(R.string.quick_settings_nfc);



        switch (state) {

        case NfcAdapter.STATE_TURNING_ON:

        case NfcAdapter.STATE_ON:

            mDrawable = R.drawable.ic_qs_nfc_on;

            mLabel = mContext.getString(R.string.quick_settings_nfc);

            break;

        case NfcAdapter.STATE_TURNING_OFF:

        case NfcAdapter.STATE_OFF:

        default:

            mDrawable = R.drawable.ic_qs_nfc_off;

            mLabel += " " + mContext.getString(R.string.quick_settings_label_disabled);

            mLabel = mContext.getString(R.string.quick_settings_nfc_off);

            break;

        }

    }

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

+2 −3
Original line number Diff line number Diff line
@@ -74,14 +74,13 @@ public class SyncTile extends QuickSettingsTile { 
    }



    private void updateTileState() {

        // Get the initial label

        mLabel = mContext.getString(R.string.quick_settings_sync);



        if (getSyncState()) {

            mDrawable = R.drawable.ic_qs_sync_on;

            mLabel = mContext.getString(R.string.quick_settings_sync);

        } else {

            mDrawable = R.drawable.ic_qs_sync_off;

            mLabel += " " + mContext.getString(R.string.quick_settings_label_disabled);

            mLabel = mContext.getString(R.string.quick_settings_sync_off);

        }

    }