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

Commit 32319bf1 authored by Jon Miranda's avatar Jon Miranda Committed by Android (Google) Code Review
Browse files

Merge "Move All Apps button to the left in RTL."

parents fb1e5920 daa3150b

quickstep/src/com/android/launcher3/taskbar/TaskbarView.java

+3 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import androidx.annotation.Nullable; 
import com.android.launcher3.BubbleTextView;

import com.android.launcher3.Insettable;

import com.android.launcher3.R;

import com.android.launcher3.Utilities;

import com.android.launcher3.config.FeatureFlags;

import com.android.launcher3.folder.FolderIcon;

import com.android.launcher3.model.data.FolderInfo;
@@ -214,7 +215,8 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 
        }



        if (mAllAppsButton != null) {

            addView(mAllAppsButton);

            int index = Utilities.isRtl(getResources()) ? 0 : getChildCount();

            addView(mAllAppsButton, index);

        }

    }

quickstep/src/com/android/launcher3/taskbar/TaskbarViewController.java

+3 −1
Original line number Diff line number Diff line
@@ -235,7 +235,9 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar 
            if (FeatureFlags.ENABLE_ALL_APPS_IN_TASKBAR.get() && i == count - 1) {

                // Note that there is no All Apps button in the hotseat, this position is only used

                // as its convenient for animation purposes.

                positionInHotseat = mActivity.getDeviceProfile().inv.numShownHotseatIcons;

                positionInHotseat = Utilities.isRtl(child.getResources())

                        ? -1

                        : mActivity.getDeviceProfile().inv.numShownHotseatIcons;



                setter.setViewAlpha(child, 0, LINEAR);

            } else if (child.getTag() instanceof ItemInfo) {