diff options
| author | 2019-05-22 20:45:30 +0000 | |
|---|---|---|
| committer | 2019-05-22 20:45:30 +0000 | |
| commit | 54057a1160ca302a315edbdba7ed52c5bd027f37 (patch) | |
| tree | f82c3d0e8310eac9d5e96fdb80310df28c470e58 | |
| parent | 6e49f3a4a6fd3368c4c500054de3545ced1db6fb (diff) | |
| parent | fc5e15c6220d53c77d2dc9b3643c56f717fbfffe (diff) | |
Merge "Disable OPA edge flash animation" into qt-dev
| -rw-r--r-- | core/res/res/values/config.xml | 2 | ||||
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/assist/AssistManager.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 0daebd76daf4..2de539721195 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -3457,7 +3457,7 @@ <!-- Flag indicating whether the assist disclosure can be disabled using ASSIST_DISCLOSURE_ENABLED. --> - <bool name="config_allowDisablingAssistDisclosure">false</bool> + <bool name="config_allowDisablingAssistDisclosure">true</bool> <!-- True if the device supports system navigation keys. --> <bool name="config_supportSystemNavigationKeys">false</bool> diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index 51bd9f86230a..f0c38fb7534f 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -169,7 +169,7 @@ public class AssistManager implements ConfigurationChangedReceiver { } protected boolean shouldShowOrb() { - return true; + return false; } public void startAssist(Bundle args) { |