Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop showing disclosure UI when isDisclosureEnabled is false."

Browse Source
This commit is contained in:
Rajeev Kumar
2019-08-08 15:42:51 +00:00
committed by Gerrit Code Review
parent e921001f2d cd497ef6f3
commit 6452cc3cc1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/com/android/internal/app/AssistUtils.java
View File

@@ -195,7 +195,7 @@ public class AssistUtils {
return applicationInfo.isSystemApp() || applicationInfo.isUpdatedSystemApp(); return applicationInfo.isSystemApp() || applicationInfo.isUpdatedSystemApp();
} }
private static boolean isDisclosureEnabled(Context context) { public static boolean isDisclosureEnabled(Context context) {
return Settings.Secure.getInt(context.getContentResolver(), return Settings.Secure.getInt(context.getContentResolver(),
Settings.Secure.ASSIST_DISCLOSURE_ENABLED, 0) != 0; Settings.Secure.ASSIST_DISCLOSURE_ENABLED, 0) != 0;
} }

2
packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
View File

@@ -219,7 +219,7 @@ public class AssistManager implements ConfigurationChangedReceiver {
intent.setComponent(assistComponent); intent.setComponent(assistComponent);
intent.putExtras(args); intent.putExtras(args);
if (structureEnabled) { if (structureEnabled && AssistUtils.isDisclosureEnabled(mContext)) {
showDisclosure(); showDisclosure();
} }