commit 7c9a6b502a4afbaa62c32eeb6ee411ddc9de3ac1
author Geoffrey Pitsch <gpitsch@google.com> Wed Jul 12 16:50:53 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jul 12 16:50:53 2017 +0000
tree af2fa04d5b0d6cc01bd26946ac92287186164fc1
parent fcceb3ada4c633fcd7eb43c04c5546373d2f04bf
parent 70753081c8d40ad1146dfa5d3cf3fbbb39da36ce

Merge "canBeModified accessors for AmbientDisplay pickup setting" into oc-dr1-dev

core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java

diff --git a/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java b/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java
index 00fa711a..445a82c 100644
--- a/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java
+++ b/core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java
@@ -53,8 +53,8 @@
     }
 
     public boolean pulseOnPickupEnabled(int user) {
-        return boolSettingDefaultOn(Settings.Secure.DOZE_PULSE_ON_PICK_UP, user)
-                && pulseOnPickupAvailable();
+        boolean settingEnabled = boolSettingDefaultOn(Settings.Secure.DOZE_PULSE_ON_PICK_UP, user);
+        return (settingEnabled || alwaysOnEnabled(user)) && pulseOnPickupAvailable();
     }
 
     public boolean pulseOnPickupAvailable() {
@@ -62,6 +62,10 @@
                 && ambientDisplayAvailable();
     }
 
+    public boolean pulseOnPickupCanBeModified(int user) {
+        return !alwaysOnEnabled(user);
+    }
+
     public boolean pulseOnDoubleTapEnabled(int user) {
         return boolSettingDefaultOn(Settings.Secure.DOZE_PULSE_ON_DOUBLE_TAP, user)
                 && pulseOnDoubleTapAvailable();