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

Commit fdbac12a authored by Andy Wickham's avatar Andy Wickham Committed by Automerger Merge Worker
Browse files

Merge "Listen for SEARCH_LONG_PRESS_HOME_ENABLED settings changes" into... 

Merge "Listen for SEARCH_LONG_PRESS_HOME_ENABLED settings changes" into udc-qpr-dev am: 60097ee5 am: 795827df

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24796434



Change-Id: I22cf4288e5e631dbc7127c6ded76223538a4d05b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 73296d35 795827df

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

+8 −2
Original line number Original line Diff line number Diff line
@@ -309,8 +309,14 @@ public class AssistManager { 
        }

        }





        int invocationType = args.getInt(INVOCATION_TYPE_KEY);

        int invocationType = args.getInt(INVOCATION_TYPE_KEY);

        return mAssistOverrideInvocationTypes != null && Arrays.stream(

        return shouldOverrideAssist(invocationType);

                mAssistOverrideInvocationTypes).anyMatch(override -> override == invocationType);

    }



    /** @return true if the invocation type should be handled by OverviewProxy instead of SysUI. */

    public boolean shouldOverrideAssist(int invocationType) {

        return mAssistOverrideInvocationTypes != null

                && Arrays.stream(mAssistOverrideInvocationTypes).anyMatch(

                        override -> override == invocationType);

    }

    }





    /**

    /**

packages/SystemUI/src/com/android/systemui/navigationbar/NavBarHelper.java

+13 −3
Original line number Original line Diff line number Diff line
@@ -232,6 +232,9 @@ public final class NavBarHelper implements 
        mContentResolver.registerContentObserver(

        mContentResolver.registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED),

                Settings.Secure.getUriFor(Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED),

                false, mAssistContentObserver, UserHandle.USER_ALL);

                false, mAssistContentObserver, UserHandle.USER_ALL);

        mContentResolver.registerContentObserver(

                Settings.Secure.getUriFor(Secure.SEARCH_LONG_PRESS_HOME_ENABLED),

                false, mAssistContentObserver, UserHandle.USER_ALL);

        mContentResolver.registerContentObserver(

        mContentResolver.registerContentObserver(

                Settings.Secure.getUriFor(Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED),

                Settings.Secure.getUriFor(Settings.Secure.ASSIST_TOUCH_GESTURE_ENABLED),

                false, mAssistContentObserver, UserHandle.USER_ALL);

                false, mAssistContentObserver, UserHandle.USER_ALL);
@@ -422,11 +425,17 @@ public final class NavBarHelper implements 
    private void updateAssistantAvailability() {

    private void updateAssistantAvailability() {

        boolean assistantAvailableForUser = mAssistManagerLazy.get()

        boolean assistantAvailableForUser = mAssistManagerLazy.get()

                .getAssistInfoForUser(mUserTracker.getUserId()) != null;

                .getAssistInfoForUser(mUserTracker.getUserId()) != null;

        boolean longPressDefault = mContext.getResources().getBoolean(



                com.android.internal.R.bool.config_assistLongPressHomeEnabledDefault);

        boolean overrideLongPressHome = mAssistManagerLazy.get()

                .shouldOverrideAssist(AssistManager.INVOCATION_TYPE_HOME_BUTTON_LONG_PRESS);

        boolean longPressDefault = mContext.getResources().getBoolean(overrideLongPressHome

                ? com.android.internal.R.bool.config_searchLongPressHomeEnabledDefault

                : com.android.internal.R.bool.config_assistLongPressHomeEnabledDefault);

        mLongPressHomeEnabled = Settings.Secure.getIntForUser(mContentResolver,

        mLongPressHomeEnabled = Settings.Secure.getIntForUser(mContentResolver,

                Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, longPressDefault ? 1 : 0,

                overrideLongPressHome ? Secure.SEARCH_LONG_PRESS_HOME_ENABLED

                        : Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED, longPressDefault ? 1 : 0,

                mUserTracker.getUserId()) != 0;

                mUserTracker.getUserId()) != 0;



        boolean gestureDefault = mContext.getResources().getBoolean(

        boolean gestureDefault = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_assistTouchGestureEnabledDefault);

                com.android.internal.R.bool.config_assistTouchGestureEnabledDefault);

        mAssistantTouchGestureEnabled = Settings.Secure.getIntForUser(mContentResolver,

        mAssistantTouchGestureEnabled = Settings.Secure.getIntForUser(mContentResolver,
@@ -455,6 +464,7 @@ public final class NavBarHelper implements 
    @Override

    @Override

    public void setAssistantOverridesRequested(int[] invocationTypes) {

    public void setAssistantOverridesRequested(int[] invocationTypes) {

        mAssistManagerLazy.get().setAssistantOverridesRequested(invocationTypes);

        mAssistManagerLazy.get().setAssistantOverridesRequested(invocationTypes);

        updateAssistantAvailability();

    }

    }





    @Override

    @Override