commit | 6452cc3cc133aca6b5887bd841a662371e1cf783 | [log] [tgz] |
---|---|---|
author | Rajeev Kumar <rajekumar@google.com> | Thu Aug 08 15:42:51 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Aug 08 15:42:51 2019 +0000 |
tree | 01637ebb1d7248a7ea90e08a43813ee3490ba8f5 | |
parent | e921001f2d2cbb38053773a35ffba86a6d14c384 [diff] | |
parent | cd497ef6f394bb66ae6ce490b2d44e3b7c409412 [diff] |
Merge "Stop showing disclosure UI when isDisclosureEnabled is false."
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(); }