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." am: 6452cc3cc1 am: f9e3e40676 am: 2123aad7ab

Browse Source 
am: df003a7ba1

Change-Id: I463fa34afc551e61b7367525acc1a180d0d7376b
This commit is contained in:
Rajeev Kumar
2019-08-08 09:56:34 -07:00
committed by android-build-merger
parent 4c5c7c9a2c df003a7ba1
commit a9ba0f30ca
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();
}
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;
}

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

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