android 9.0 GMS 修改google 语音助手需求--非EEA版本需求

▪[GMS-M-5.4-001] 从 2019年9月3日 起, 所有新设备必须:

–实现“闪烁屏幕” 菜单，用来提醒用户Google助理正在访问屏幕/屏幕截图上的文字, 此要求在CDD规范 3.8.4章节有提到, 可以参考[C-2-1] 小节.

–当用户启动默认的助理程序时，禁止白色圆球动画 ,.

▪“闪烁屏幕”这个开箱设置必须默认为关闭。

  可以参考FAQ22216来修改

 

 

 

 GMS 修改google 语音助手需求

diff --git a/frameworks/base/core/res/res/values/config.xml b/frameworks/base/core/res/res/values/config.xml
old mode 100644
new mode 100755
index caf5778..ae6eff0
--- a/frameworks/base/core/res/res/values/config.xml
+++ b/frameworks/base/core/res/res/values/config.xml
@@ -3214,7 +3214,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/frameworks/base/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/frameworks/base/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
old mode 100644
new mode 100755
index 38a90cf..4a96d9f
--- a/frameworks/base/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
+++ b/frameworks/base/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
@@ -139,7 +139,7 @@ public class AssistManager implements ConfigurationChangedReceiver {
     }
 
     protected boolean shouldShowOrb() {
-        return true;
+        return false;
     }
 
     public void startAssist(Bundle args) {
@@ -207,6 +207,8 @@ public class AssistManager implements ConfigurationChangedReceiver {
         boolean structureEnabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
                 Settings.Secure.ASSIST_STRUCTURE_ENABLED, 1, UserHandle.USER_CURRENT) != 0;
 
+	boolean disclosureEnabled = Settings.Secure.getIntForUser(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_DISCLOSURE_ENABLED, 0, UserHandle.USER_CURRENT) != 0;
         final SearchManager searchManager =
             (SearchManager) mContext.getSystemService(Context.SEARCH_SERVICE);
         if (searchManager == null) {
@@ -219,7 +221,7 @@ public class AssistManager implements ConfigurationChangedReceiver {
         intent.setComponent(assistComponent);
         intent.putExtras(args);
 
-        if (structureEnabled) {
+        if (structureEnabled&&disclosureEnabled) {
             showDisclosure();
         }
 
@@ -240,6 +242,11 @@ public class AssistManager implements ConfigurationChangedReceiver {
     }
 
     private void startVoiceInteractor(Bundle args) {
+		boolean disclosureEnabled = Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.ASSIST_DISCLOSURE_ENABLED, 0) != 0;			
+        if (disclosureEnabled) {
+            showDisclosure();
+        }
         mAssistUtils.showSessionForActiveService(args,
                 VoiceInteractionSession.SHOW_SOURCE_ASSIST_GESTURE, mShowCallback, null);
     }