From cd497ef6f394bb66ae6ce490b2d44e3b7c409412 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Tue, 6 Aug 2019 12:02:47 -0700 Subject: [PATCH] Stop showing disclosure UI when isDisclosureEnabled is false. Bug: 137395050 Change-Id: Ic7768f7d3306f5d9d5c5c988afda4e8710c4ccd0 Test: Manual tests --- core/java/com/android/internal/app/AssistUtils.java | 2 +- packages/SystemUI/src/com/android/systemui/assist/AssistManager.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/java/com/android/internal/app/AssistUtils.java b/core/java/com/android/internal/app/AssistUtils.java index fde01dd0deea..750d698db333 100644 --- a/core/java/com/android/internal/app/AssistUtils.java +++ b/core/java/com/android/internal/app/AssistUtils.java @@ -195,7 +195,7 @@ public class AssistUtils { 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 38a90cfd96a5..c906240f781c 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 @@ public class AssistManager implements ConfigurationChangedReceiver { intent.setComponent(assistComponent); intent.putExtras(args); - if (structureEnabled) { + if (structureEnabled && AssistUtils.isDisclosureEnabled(mContext)) { showDisclosure(); } -- 2.11.0