Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Hook up wake-lock-screen with plugin structure"

Browse Source
This commit is contained in:
Lucas Dupin
2018-10-10 23:42:52 +00:00
committed by Android (Google) Code Review
parent a1300eb05c 3d95175dd5
commit 477cd4f249
5 changed files with 62 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/java/com/android/internal/hardware/AmbientDisplayConfiguration.java
View File

@@ -72,7 +72,8 @@ public class AmbientDisplayConfiguration {
}
public boolean wakeLockScreenGestureAvailable() {
return !TextUtils.isEmpty(wakeLockScreenSensorType());
return mContext.getResources()
.getBoolean(R.bool.config_dozeWakeLockScreenSensorAvailable);
}
public boolean wakeScreenGestureEnabled(int user) {
@@ -92,10 +93,6 @@ public class AmbientDisplayConfiguration {
return mContext.getResources().getString(R.string.config_dozeLongPressSensorType);
}
public String wakeLockScreenSensorType() {
return mContext.getResources().getString(R.string.config_dozeWakeLockScreenSensorType);
}
public String wakeScreenSensorType() {
return mContext.getResources().getString(R.string.config_dozeWakeScreenSensorType);
}