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

Commit 9136897b authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Merging from ub-launcher3-master @ build 6782663 

Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_master_6782663.html

Change-Id: I649c4d931b84c1e8e22a58fa92b92c76f5222451
parents 9c407861 ec50c06c

go/AndroidManifest.xml

+6 −0
Original line number Diff line number Diff line
@@ -46,6 +46,12 @@ 
            tools:node="replace" >

        </activity>



        <service

            android:name="com.android.launcher3.notification.NotificationListener"

            android:label="@string/notification_dots_service_title"

            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE"

            android:enabled="false"

            tools:node="replace" />

    </application>



</manifest>

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

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ public class WidgetsModel { 


    // True is the widget support is disabled.

    public static final boolean GO_DISABLE_WIDGETS = true;

    public static final boolean GO_DISABLE_NOTIFICATION_DOTS = true;



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

src/com/android/launcher3/ExtendedEditText.java

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.view.View; 
import android.view.inputmethod.InputMethodManager;

import android.widget.EditText;



import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.util.UiThreadHelper;
@@ -130,6 +131,10 @@ public class ExtendedEditText extends EditText { 
    public void reset() {

        if (!TextUtils.isEmpty(getText())) {

            setText("");

        } else {

            if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) {

                return;

            }

        }

        if (isFocused()) {

            View nextFocus = focusSearch(View.FOCUS_DOWN);

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

+19 −2
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.view.WindowInsets; 
import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.StringRes;

import androidx.core.os.BuildCompat;

import androidx.recyclerview.widget.DefaultItemAnimator;

import androidx.recyclerview.widget.LinearLayoutManager;

import androidx.recyclerview.widget.RecyclerView;
@@ -110,7 +111,7 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo 


    private final MultiValueAlpha mMultiValueAlpha;



    Rect mInsets = new Rect();

    private Rect mInsets = new Rect();



    public AllAppsContainerView(Context context) {

        this(context, null);
@@ -206,6 +207,17 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo 
        mAH[AdapterHolder.WORK].applyPadding();

    }



    private void hideInput() {

        if (!BuildCompat.isAtLeastR() || !FeatureFlags.ENABLE_DEVICE_SEARCH.get()) return;



        WindowInsets insets = getRootWindowInsets();

        if (insets == null) return;



        if (insets.isVisible(WindowInsets.Type.ime())) {

            getWindowInsetsController().hide(WindowInsets.Type.ime());

        }

    }



    /**

     * Returns whether the view itself will handle the touch event or not.

     */
@@ -221,9 +233,14 @@ public class AllAppsContainerView extends SpringRelativeLayout implements DragSo 
        }

        if (rv.getScrollbar().getThumbOffsetY() >= 0 &&

                mLauncher.getDragLayer().isEventOverView(rv.getScrollbar(), ev)) {

            hideInput();

            return false;

        }

        return rv.shouldContainerScroll(ev, mLauncher.getDragLayer());

        boolean shouldScroll = rv.shouldContainerScroll(ev, mLauncher.getDragLayer());

        if (shouldScroll) {

            hideInput();

        }

        return shouldScroll;

    }



    @Override

src/com/android/launcher3/config/FeatureFlags.java

+0 −3
Original line number Diff line number Diff line
@@ -174,9 +174,6 @@ public final class FeatureFlags { 
            "SEPARATE_RECENTS_ACTIVITY", false,

            "Uses a separate recents activity instead of using the integrated recents+Launcher UI");



    public static final BooleanFlag USER_EVENT_DISPATCHER = new DeviceFlag(

            "USER_EVENT_DISPATCHER", true, "User event dispatcher collects logs.");



    public static final BooleanFlag ENABLE_MINIMAL_DEVICE = new DeviceFlag(

            "ENABLE_MINIMAL_DEVICE", false,

            "Allow user to toggle minimal device mode in launcher.");