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

Commit 6724872b authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix bug 5336495 - Silent mode icon on power dialog is wrong" into ics-factoryrom

parents edc8029b 093dee95

policy/src/com/android/internal/policy/impl/GlobalActions.java

+5 −5
Original line number Diff line number Diff line
@@ -118,18 +118,18 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac 
     */

    private AlertDialog createDialog() {

        mSilentModeToggle = new ToggleAction(

                R.drawable.ic_lock_silent_mode,

                R.drawable.ic_lock_silent_mode_off,

                R.drawable.ic_audio_vol_mute,

                R.drawable.ic_audio_vol,

                R.string.global_action_toggle_silent_mode,

                R.string.global_action_silent_mode_on_status,

                R.string.global_action_silent_mode_off_status) {



            void willCreate() {

                // XXX: FIXME: switch to ic_lock_vibrate_mode when available

                // XXX: FIXME: Add vibrate indicator when available

                mEnabledIconResId = (Settings.System.getInt(mContext.getContentResolver(),

                        Settings.System.VIBRATE_IN_SILENT, 1) == 1)

                    ? R.drawable.ic_lock_silent_mode_vibrate

                    : R.drawable.ic_lock_silent_mode;

                    ? R.drawable.ic_audio_vol_mute

                    : R.drawable.ic_audio_vol_mute;

            }



            void onToggle(boolean on) {