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

Commit d405653c authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

Merging ub-launcher3-qt-dev, build 5595491 

am: cf7e6c4a

Change-Id: I6d490f8d51fd10ef6fe2b4e9bdf3c222fb4c8de6
parents d0993b2b cf7e6c4a

go/quickstep/res/layout/clear_all_button.xml

+2 −1
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ 
        android:text="@string/recents_clear_all"

        android:textAllCaps="false"

        android:textColor="@color/clear_all_button_text"

        android:textSize="14sp"/>

        android:textSize="14sp"

        style="@style/TextTitle"/>

</FrameLayout>

go/quickstep/res/layout/icon_recents_root_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -36,5 +36,6 @@ 
        android:text="@string/recents_empty_message"

        android:textColor="@android:color/white"

        android:textSize="25sp"

        style="@style/TextTitle"

        android:visibility="gone"/>

</com.android.quickstep.views.IconRecentsView>
 
 No newline at end of file

go/quickstep/res/layout/task_item_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -41,5 +41,6 @@ 
        android:layout_gravity="center_vertical"

        android:singleLine="true"

        android:textColor="@android:color/white"

        android:textSize="24sp"/>

        android:textSize="24sp"

        style="@style/TextTitle"/>

</com.android.quickstep.views.TaskItemView>

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java

+9 −2
Original line number Diff line number Diff line
@@ -76,8 +76,13 @@ public abstract class RecentsUiFactory { 


        @Override

        public void mapInsets(Context context, Rect insets, Rect out) {

            // If there is a display cutout, the top insets in portrait would also include the

            // cutout, which we will get as the left inset in landscape. Using the max of left and

            // top allows us to cover both cases (with or without cutout).

            if (SysUINavigationMode.getMode(context) == NO_BUTTON) {

                out.set(insets);

                out.top = Math.max(insets.top, insets.left);

                out.bottom = Math.max(insets.right, insets.bottom);

                out.left = out.right = 0;

            } else {

                out.top = Math.max(insets.top, insets.left);

                out.bottom = insets.right;
@@ -99,7 +104,9 @@ public abstract class RecentsUiFactory { 
        @Override

        public void mapInsets(Context context, Rect insets, Rect out) {

            if (SysUINavigationMode.getMode(context) == NO_BUTTON) {

                out.set(insets);

                out.top = Math.max(insets.top, insets.right);

                out.bottom = Math.max(insets.left, insets.bottom);

                out.left = out.right = 0;

            } else {

                out.top = Math.max(insets.top, insets.right);

                out.bottom = insets.left;

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.launcher3.uioverrides.states; 


import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;



import com.android.launcher3.AbstractFloatingView;

import com.android.launcher3.Launcher;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.userevent.nano.LauncherLogProto;
@@ -41,6 +42,13 @@ public class BackgroundAppState extends OverviewState { 
        super(id, logContainer, OVERVIEW_TRANSITION_MS, STATE_FLAGS);

    }



    @Override

    public void onStateEnabled(Launcher launcher) {

        RecentsView rv = launcher.getOverviewPanel();

        rv.setOverviewStateEnabled(true);

        AbstractFloatingView.closeAllOpenViews(launcher, false);

    }



    @Override

    public float getVerticalProgress(Launcher launcher) {

        if (launcher.getDeviceProfile().isVerticalBarLayout()) {