Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f8ad443 authored by Rajeev Kumar's avatar Rajeev Kumar Committed by android-build-merger
Browse files

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

Merge "Stop showing disclosure UI when isDisclosureEnabled is false." am: 6452cc3c am: f9e3e406 am: 2123aad7 am: df003a7b
am: a9ba0f30

Change-Id: Iaf5f03f1cbe7285a141a263821d00d507716031c
parents 69be1d22 a9ba0f30

core/java/com/android/internal/app/AssistUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+1 −1
Original line number Diff line number Diff line
@@ -339,7 +339,7 @@ public class AssistManager implements ConfigurationChangedReceiver { 
        intent.setComponent(assistComponent);

        intent.putExtras(args);



        if (structureEnabled) {

        if (structureEnabled && AssistUtils.isDisclosureEnabled(mContext)) {

            showDisclosure();

        }