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

Commit 26887dc8 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE. Update lockscreen message when user unlocked." into nyc-mr1-dev

parents cdd2b6f3 99e1bca9
Loading
Loading
Loading
Loading
+13 −2
Original line number Diff line number Diff line
@@ -93,8 +93,10 @@ public class KeyguardIndicationController {
                ServiceManager.getService(BatteryStats.SERVICE_NAME));

        KeyguardUpdateMonitor.getInstance(context).registerCallback(mUpdateMonitor);
        context.registerReceiverAsUser(mReceiver, UserHandle.SYSTEM,
        context.registerReceiverAsUser(mTickReceiver, UserHandle.SYSTEM,
                new IntentFilter(Intent.ACTION_TIME_TICK), null, null);
        context.registerReceiverAsUser(mUnlockReceiver, UserHandle.ALL,
                new IntentFilter(Intent.ACTION_USER_UNLOCKED), null, null);
    }

    public void setVisible(boolean visible) {
@@ -322,7 +324,16 @@ public class KeyguardIndicationController {
        }
    };

    BroadcastReceiver mReceiver = new BroadcastReceiver() {
    BroadcastReceiver mTickReceiver = new BroadcastReceiver() {
        @Override
        public void onReceive(Context context, Intent intent) {
            if (mVisible) {
                updateIndication();
            }
        }
    };

    BroadcastReceiver mUnlockReceiver = new BroadcastReceiver() {
        @Override
        public void onReceive(Context context, Intent intent) {
            if (mVisible) {