Merge "Disable OPA edge flash animation" into qt-dev

2019-05-22 20:45:30 +00:00
parent 6e49f3a4a6 fc5e15c622
commit 54057a1160
2 changed files with 2 additions and 2 deletions
--- 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>
--- 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) {