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

Commit 6452cc3c authored by Rajeev Kumar's avatar Rajeev Kumar Committed by Gerrit Code Review
Browse files

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

parents e921001f cd497ef6

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
@@ -219,7 +219,7 @@ public class AssistManager implements ConfigurationChangedReceiver { 
        intent.setComponent(assistComponent);

        intent.putExtras(args);



        if (structureEnabled) {

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

            showDisclosure();

        }