summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Quinn <pquinn@google.com>2017-07-20 01:34:02 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-20 01:34:02 +0000
commitbc5b6f412455c5c31addf415d65b0ce3fb89ad12 (patch)
treeab3b63dd840350fb68ee8ab6cd25f80a7a95420c
parent24416b86af597355d5959fab11548747ab203e36 (diff)
parent1659b400b539dd7955e98673aae8f6f7db8ba862 (diff)
Expose KeyguardMonitor.isOccluded().
am: 1659b400b5 Change-Id: I299c5a9b2fb93157622afa905c4c55918f46bf3e
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java3
-rw-r--r--packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeKeyguardMonitor.java5
2 files changed, 7 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java
index 728005dde131..ccfbb26a61d2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardMonitor.java
@@ -21,12 +21,13 @@ public interface KeyguardMonitor extends CallbackController<Callback> {
boolean isSecure();
boolean canSkipBouncer();
boolean isShowing();
+ boolean isOccluded();
boolean isKeyguardFadingAway();
boolean isKeyguardGoingAway();
long getKeyguardFadingAwayDuration();
long getKeyguardFadingAwayDelay();
- public interface Callback {
+ interface Callback {
void onKeyguardShowingChanged();
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeKeyguardMonitor.java b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeKeyguardMonitor.java
index 51e35cc3915e..3f952c3cbca9 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeKeyguardMonitor.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/utils/leaks/FakeKeyguardMonitor.java
@@ -47,6 +47,11 @@ public class FakeKeyguardMonitor implements KeyguardMonitor {
}
@Override
+ public boolean isOccluded() {
+ return false;
+ }
+
+ @Override
public boolean isKeyguardFadingAway() {
return false;
}