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

Commit 9a7e4ce7 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 5466678: use new setSystemUiVisibility() API to enable clock in statusbar" into ics-mr0

parents 7788c51d 305c78cc

core/java/android/app/StatusBarManager.java

+4 −2
Original line number Original line Diff line number Diff line
@@ -71,7 +71,9 @@ public class StatusBarManager { 
     */

     */

    public void disable(int what) {

    public void disable(int what) {

        try {

        try {

            if (mService != null) {

                mService.disable(what, mToken, mContext.getPackageName());

                mService.disable(what, mToken, mContext.getPackageName());

            }

        } catch (RemoteException ex) {

        } catch (RemoteException ex) {

            // system process is dead anyway.

            // system process is dead anyway.

            throw new RuntimeException(ex);

            throw new RuntimeException(ex);

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -524,6 +524,7 @@ public class KeyguardUpdateMonitor { 
            callback.onRingerModeChanged(mRingMode);

            callback.onRingerModeChanged(mRingMode);

            callback.onPhoneStateChanged(mPhoneState);

            callback.onPhoneStateChanged(mPhoneState);

            callback.onRefreshCarrierInfo(mTelephonyPlmn, mTelephonySpn);

            callback.onRefreshCarrierInfo(mTelephonyPlmn, mTelephonySpn);

            callback.onClockVisibilityChanged();

        } else {

        } else {

            if (DEBUG) Log.e(TAG, "Object tried to add another INFO callback",

            if (DEBUG) Log.e(TAG, "Object tried to add another INFO callback",

                    new Exception("Whoops"));

                    new Exception("Whoops"));

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

+0 −1
Original line number Original line Diff line number Diff line
@@ -178,7 +178,6 @@ public class KeyguardViewManager implements KeyguardWindowController { 
        int visFlags =

        int visFlags =

                ( View.STATUS_BAR_DISABLE_BACK

                ( View.STATUS_BAR_DISABLE_BACK

                | View.STATUS_BAR_DISABLE_HOME

                | View.STATUS_BAR_DISABLE_HOME

                | View.STATUS_BAR_DISABLE_CLOCK

                );

                );

        mKeyguardHost.setSystemUiVisibility(visFlags);

        mKeyguardHost.setSystemUiVisibility(visFlags);

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -709,8 +709,14 @@ public class LockPatternKeyguardView extends KeyguardViewBase implements Handler 
    public void onRefreshCarrierInfo(CharSequence plmn, CharSequence spn) {}

    public void onRefreshCarrierInfo(CharSequence plmn, CharSequence spn) {}

    @Override

    @Override

    public void onRingerModeChanged(int state) {}

    public void onRingerModeChanged(int state) {}



    @Override

    @Override

    public void onClockVisibilityChanged() {}

    public void onClockVisibilityChanged() {

        int visFlags = getSystemUiVisibility() & ~View.STATUS_BAR_DISABLE_CLOCK;

        setSystemUiVisibility(visFlags

                | (mUpdateMonitor.isClockVisible() ? View.STATUS_BAR_DISABLE_CLOCK : 0));

    }



    @Override

    @Override

    public void onDeviceProvisioned() {}

    public void onDeviceProvisioned() {}