commit | cd497ef6f394bb66ae6ce490b2d44e3b7c409412 | [log] [tgz] |
---|---|---|
author | Rajeev Kumar <rajekumar@google.com> | Tue Aug 06 12:02:47 2019 -0700 |
committer | Rajeev Kumar <rajekumar@google.com> | Thu Aug 08 03:09:38 2019 +0000 |
tree | 640f7bef74c9ee3396fe6e3ab163812dd1b515ec | |
parent | d7f82d576689821601fec4253009c279b40bea0a [diff] |
Stop showing disclosure UI when isDisclosureEnabled is false. Bug: 137395050 Change-Id: Ic7768f7d3306f5d9d5c5c988afda4e8710c4ccd0 Test: Manual tests
diff --git a/core/java/com/android/internal/app/AssistUtils.java b/core/java/com/android/internal/app/AssistUtils.java index fde01dd..750d698 100644 --- a/core/java/com/android/internal/app/AssistUtils.java +++ b/core/java/com/android/internal/app/AssistUtils.java
@@ -195,7 +195,7 @@ return applicationInfo.isSystemApp() || applicationInfo.isUpdatedSystemApp(); } - private static boolean isDisclosureEnabled(Context context) { + public static boolean isDisclosureEnabled(Context context) { return Settings.Secure.getInt(context.getContentResolver(), Settings.Secure.ASSIST_DISCLOSURE_ENABLED, 0) != 0; }
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index 38a90cf..c906240 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
@@ -219,7 +219,7 @@ intent.setComponent(assistComponent); intent.putExtras(args); - if (structureEnabled) { + if (structureEnabled && AssistUtils.isDisclosureEnabled(mContext)) { showDisclosure(); }