summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
diff options
context:
space:
mode:
authorEdgar Wang <edgarwang@google.com>2019-09-19 19:23:01 +0800
committerEdgar Wang <edgarwang@google.com>2019-09-21 07:19:35 +0800
commit0f8c7a71d0f16fcb6df68130cb10175512ea341a (patch)
tree36a83a279d880f854bd644cf937b9bac21a1d336 /src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
parent0aec85c8c1f0d2b1ee8f6472448f6089bee4a928 (diff)
downloadpackages_apps_Settings-0f8c7a71d0f16fcb6df68130cb10175512ea341a.tar.gz
packages_apps_Settings-0f8c7a71d0f16fcb6df68130cb10175512ea341a.tar.bz2
packages_apps_Settings-0f8c7a71d0f16fcb6df68130cb10175512ea341a.zip
Handle Aware sensor status for Always On
- "Always On" preference will be hiden when aware sensor is available - Extract NavModeCandidateInfo from SystemNavigationGestureSettings Bug: 136610131 Test: robotest & manual Change-Id: If58c70549339b66116f19df7193d85bb04e3f1b7
Diffstat (limited to 'src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java')
-rw-r--r--src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
index 6a9e9fc2f7..a0b1f444be 100644
--- a/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
+++ b/src/com/android/settings/display/AmbientDisplayAlwaysOnPreferenceController.java
@@ -17,6 +17,7 @@ package com.android.settings.display;
import android.content.Context;
import android.hardware.display.AmbientDisplayConfiguration;
+import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
import android.text.TextUtils;
@@ -29,6 +30,7 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
private final int OFF = 0;
private static final int MY_USER = UserHandle.myUserId();
+ private static final String PROP_AWARE_AVAILABLE = "ro.vendor.aware_available";
private AmbientDisplayConfiguration mConfig;
private OnPreferenceChangedCallback mCallback;
@@ -43,7 +45,9 @@ public class AmbientDisplayAlwaysOnPreferenceController extends TogglePreference
@Override
public int getAvailabilityStatus() {
- return isAvailable(getConfig()) ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
+ return isAvailable(getConfig())
+ && !SystemProperties.getBoolean(PROP_AWARE_AVAILABLE, false) ?
+ AVAILABLE : UNSUPPORTED_ON_DEVICE;
}
@Override