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

Merge changes I089fa8ff,I8db745c1,I6fa83189 into qt-r1-dev

Browse Source 
* changes:
  Showing heads up for music when bypassing
  Not rendering background when bypassing
  Made sure the lock icon is invisible while hunned
This commit is contained in:
Selim Cinek
2019-06-29 23:11:43 +00:00
committed by Android (Google) Code Review
parent 6147626728 e3c6e46e95
commit a0aa088c9f
21 changed files with 345 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/provider/Settings.java
View File

@@ -8275,6 +8275,16 @@ public final class Settings {
private static final Validator FACE_UNLOCK_DISMISSES_KEYGUARD_VALIDATOR =
BOOLEAN_VALIDATOR;
/**
* Whether or not media is shown automatically when bypassing as a heads up.
* @hide
*/
public static final String SHOW_MEDIA_WHEN_BYPASSING =
"show_media_when_bypassing";
private static final Validator SHOW_MEDIA_WHEN_BYPASSING_VALIDATOR =
BOOLEAN_VALIDATOR;
/**
* Whether or not face unlock requires attention. This is a cached value, the source of
* truth is obtained through the HAL.
@@ -8979,6 +8989,7 @@ public final class Settings {
NFC_PAYMENT_DEFAULT_COMPONENT,
AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
FACE_UNLOCK_KEYGUARD_ENABLED,
SHOW_MEDIA_WHEN_BYPASSING,
FACE_UNLOCK_DISMISSES_KEYGUARD,
FACE_UNLOCK_APP_ENABLED,
FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,
@@ -9155,6 +9166,7 @@ public final class Settings {
VALIDATORS.put(FACE_UNLOCK_KEYGUARD_ENABLED, FACE_UNLOCK_KEYGUARD_ENABLED_VALIDATOR);
VALIDATORS.put(FACE_UNLOCK_DISMISSES_KEYGUARD,
FACE_UNLOCK_DISMISSES_KEYGUARD_VALIDATOR);
VALIDATORS.put(SHOW_MEDIA_WHEN_BYPASSING, SHOW_MEDIA_WHEN_BYPASSING_VALIDATOR);
VALIDATORS.put(FACE_UNLOCK_APP_ENABLED, FACE_UNLOCK_APP_ENABLED_VALIDATOR);
VALIDATORS.put(FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,
FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR);