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

Commit f2643521 authored by Tracy Zhou's avatar Tracy Zhou Committed by Android (Google) Code Review
Browse files

Merge "Introduce taskbar_phone_size" into main

parents 113569f4 9ccd5d42

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/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);

        }

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

+2 −1
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
        mAccessibilityManager = mActivity.getSystemService(AccessibilityManager.class);



        if (isPhoneMode()) {

            mUnstashedHeight = mActivity.getResources().getDimensionPixelSize(R.dimen.taskbar_size);

            mUnstashedHeight = mActivity.getResources().getDimensionPixelSize(

                    R.dimen.taskbar_phone_size);

            mStashedHeight = mActivity.getResources().getDimensionPixelSize(

                    R.dimen.taskbar_stashed_size);

        } else {

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

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ public class TaskbarViewController implements TaskbarControllers.LoggableTaskbar 
        mControllers = controllers;

        mTaskbarView.init(new TaskbarViewCallbacks());

        mTaskbarView.getLayoutParams().height = isPhoneMode(mActivity.getDeviceProfile())

                ? mActivity.getResources().getDimensionPixelSize(R.dimen.taskbar_size)

                ? mActivity.getResources().getDimensionPixelSize(R.dimen.taskbar_phone_size)

                : mActivity.getDeviceProfile().taskbarHeight;



        mTaskbarIconScaleForStash.updateValue(1f);