summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-08-13 23:58:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-08-13 23:58:29 +0000
commit587488e027c41394dc6a1f2248c4dbe8d3530b69 (patch)
treecc7ce05ac7482a5723c5d92cf74bb144e93faa77 /packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
parente41c18d629d65e302d4c40f2582845225da0d4f4 (diff)
parent81eeef589386483722c21572d9ab6d3f95dd26be (diff)
downloadframeworks_base-587488e027c41394dc6a1f2248c4dbe8d3530b69.zip
frameworks_base-587488e027c41394dc6a1f2248c4dbe8d3530b69.tar.gz
frameworks_base-587488e027c41394dc6a1f2248c4dbe8d3530b69.tar.bz2
am 81eeef58: Merge "Update time when turning on screen, in addition to waking up" into mnc-dev
* commit '81eeef589386483722c21572d9ab6d3f95dd26be': Update time when turning on screen, in addition to waking up
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
index 3c1272d..9543f93 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
@@ -172,6 +172,10 @@ public class StatusBarKeyguardViewManager {
mPhoneStatusBar.onScreenTurnedOn();
}
+ public void onScreenTurningOn() {
+ mPhoneStatusBar.onScreenTurningOn();
+ }
+
public void onScreenTurnedOn() {
mScreenTurnedOn = true;
mWakeAndUnlocking = false;