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

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

Snap for 11216811 from 8a401e88 to 24Q1-release 

Change-Id: Icf409ee8730334bf41d9f794c7465e31d17d3f8f
parents 6fdc2fda 8a401e88

quickstep/res/values/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -322,6 +322,7 @@ 


    <!-- Taskbar -->

    <dimen name="taskbar_size">@*android:dimen/taskbar_frame_height</dimen>

    <dimen name="taskbar_phone_size">@*android:dimen/navigation_bar_frame_height</dimen>

    <dimen name="taskbar_ime_size">48dp</dimen>

    <dimen name="taskbar_icon_min_touch_size">48dp</dimen>

    <!-- Note that this applies to both sides of all icons, so visible space is double this. -->

quickstep/res/values/override.xml

+2 −0
Original line number Diff line number Diff line
@@ -35,4 +35,6 @@ 


  <string name="assist_state_manager_class" translatable="false"></string>



  <string name="launcher_restore_event_logger_class" translatable="false">com.android.quickstep.LauncherRestoreEventLoggerImpl</string>



</resources>

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

+5 −0
Original line number Diff line number Diff line
@@ -203,6 +203,11 @@ public class LauncherTaskbarUIController extends TaskbarUIController { 
        return mTaskbarLauncherStateController.applyState(fromInit ? 0 : duration, startAnimation);

    }



    @Override

    public void onStateTransitionCompletedAfterSwipeToHome(LauncherState state) {

        mTaskbarLauncherStateController.onStateTransitionCompletedAfterSwipeToHome(state);

    }



    @Override

    public void refreshResumedState() {

        onLauncherVisibilityChanged(mLauncher.hasBeenResumed());

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

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ public class StashedHandleViewController implements TaskbarControllers.LoggableT 
        DeviceProfile deviceProfile = mActivity.getDeviceProfile();

        Resources resources = mActivity.getResources();

        if (isPhoneGestureNavMode(mActivity.getDeviceProfile())) {

            mTaskbarSize = resources.getDimensionPixelSize(R.dimen.taskbar_size);

            mTaskbarSize = resources.getDimensionPixelSize(R.dimen.taskbar_phone_size);

            mStashedHandleWidth =

                    resources.getDimensionPixelSize(R.dimen.taskbar_stashed_small_screen);

        } else {

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

+1 −1
Original line number Diff line number Diff line
@@ -885,7 +885,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 


        if (ENABLE_TASKBAR_NAVBAR_UNIFICATION && mDeviceProfile.isPhone) {

            return isThreeButtonNav() ?

                    resources.getDimensionPixelSize(R.dimen.taskbar_size) :

                    resources.getDimensionPixelSize(R.dimen.taskbar_phone_size) :

                    resources.getDimensionPixelSize(R.dimen.taskbar_stashed_size);

        }