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

Commit 518a7b15 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 9048375 from 5d7aec8e to tm-qpr1-release 

Change-Id: Ia87b6ab8c70ce96760b26e347228deb01ce99d84
parents be4ede51 5d7aec8e

go/src/com/android/launcher3/model/WidgetsModel.java

+3 −1
Original line number Diff line number Diff line
@@ -41,8 +41,10 @@ import java.util.Set; 
 */

public class WidgetsModel {



    // True is the widget support is disabled.

    // True if the widget support is disabled.

    public static final boolean GO_DISABLE_WIDGETS = true;

    // True if the shortcut support is disabled.

    public static final boolean GO_DISABLE_SHORTCUTS = true;

    public static final boolean GO_DISABLE_NOTIFICATION_DOTS = true;



    private static final ArrayList<WidgetsListBaseEntry> EMPTY_WIDGET_LIST = new ArrayList<>();

src/com/android/launcher3/ExtendedEditText.java

+8 −16
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
 */

package com.android.launcher3;



import static com.android.launcher3.logging.KeyboardStateManager.KeyboardState.SHOW;

import static com.android.launcher3.util.UiThreadHelper.hideKeyboardAsync;



import android.content.Context;
@@ -33,8 +34,6 @@ import com.android.launcher3.views.ActivityContext; 
 * Note: AppCompatEditText doesn't fully support #displayCompletions and #onCommitCompletion

 */

public class ExtendedEditText extends EditText {



    private boolean mShowImeAfterFirstLayout;

    private boolean mForceDisableSuggestions = false;



    /**
@@ -85,21 +84,9 @@ public class ExtendedEditText extends EditText { 
        return false;

    }



    @Override

    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        super.onLayout(changed, left, top, right, bottom);

        if (mShowImeAfterFirstLayout) {

            // soft input only shows one frame after the layout of the EditText happens,

            post(() -> {

                showSoftInput();

                mShowImeAfterFirstLayout = false;

            });

        }

    }





    public void showKeyboard() {

        mShowImeAfterFirstLayout = !showSoftInput();

        onKeyboardShown();

        showSoftInput();

    }



    public void hideKeyboard() {
@@ -107,6 +94,11 @@ public class ExtendedEditText extends EditText { 
        clearFocus();

    }



    protected void onKeyboardShown() {

        ActivityContext.lookupContext(getContext()).getStatsLogManager()

                .keyboardStateManager().setKeyboardState(SHOW);

    }



    private boolean showSoftInput() {

        return requestFocus() &&

                getContext().getSystemService(InputMethodManager.class)

src/com/android/launcher3/PendingAddItemInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.launcher3; 


import android.content.ComponentName;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.launcher3.model.data.ItemInfo;
@@ -43,6 +44,7 @@ public class PendingAddItemInfo extends ItemInfo { 
    /**

     * Returns shallow copy of the object.

     */

    @NonNull

    @Override

    public ItemInfo makeShallowCopy() {

        PendingAddItemInfo itemInfo = new PendingAddItemInfo();

src/com/android/launcher3/allapps/AllAppsTransitionController.java

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ public class AllAppsTransitionController 
    @Override

    public void setStateWithAnimation(LauncherState toState,

            StateAnimationConfig config, PendingAnimation builder) {

        if (NORMAL.equals(toState) && mLauncher.isInState(ALL_APPS)) {

        if (mLauncher.isInState(ALL_APPS) && !ALL_APPS.equals(toState)) {

            builder.addEndListener(success -> {

                // Reset pull back progress and alpha after switching states.

                ALL_APPS_PULL_BACK_TRANSLATION.set(this, 0f);

src/com/android/launcher3/anim/AnimationSuccessListener.java

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ package com.android.launcher3.anim; 
import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;



import androidx.annotation.CallSuper;



/**

 * Extension of {@link AnimatorListenerAdapter} for listening for non-cancelled animations

 */
@@ -27,6 +29,7 @@ public abstract class AnimationSuccessListener extends AnimatorListenerAdapter { 
    protected boolean mCancelled = false;



    @Override

    @CallSuper

    public void onAnimationCancel(Animator animation) {

        mCancelled = true;

    }