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

Commit a4aaf1ac authored by Jon Miranda's avatar Jon Miranda
Browse files

Add transient taskbar sizing for twoPanel devices. 

Bug: 259712417
Test: on two panel device, on tablet device
Change-Id: Iae273b6bbfb254288c234aa5882f39eb0b6a88b1
parent b0ed7dae

quickstep/res/values/dimens.xml

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


    <!-- Transient taskbar -->

    <dimen name="transient_taskbar_size">76dp</dimen>

    <dimen name="transient_taskbar_two_panels_size">72dp</dimen>

    <dimen name="transient_taskbar_margin">24dp</dimen>

    <dimen name="transient_taskbar_shadow_blur">40dp</dimen>

    <dimen name="transient_taskbar_key_shadow_distance">10dp</dimen>

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

+9 −4
Original line number Diff line number Diff line
@@ -269,9 +269,11 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
    }



    private void updateIconSize(Resources resources) {

        float taskbarIconSize = DisplayController.isTransientTaskbar(this)

                ? resources.getDimension(R.dimen.transient_taskbar_icon_size)

                : resources.getDimension(R.dimen.taskbar_icon_size);

        float taskbarIconSize = resources.getDimension(DisplayController.isTransientTaskbar(this)

                ? mDeviceProfile.isTwoPanels

                        ? R.dimen.transient_taskbar_two_panels_icon_size

                        : R.dimen.transient_taskbar_icon_size

                : R.dimen.taskbar_icon_size);

        mDeviceProfile.updateIconSize(1, resources);

        float iconScale = taskbarIconSize / mDeviceProfile.iconSizePx;

        mDeviceProfile.updateIconSize(iconScale, resources);
@@ -677,7 +679,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        }



        if (DisplayController.isTransientTaskbar(this)) {

            return resources.getDimensionPixelSize(R.dimen.transient_taskbar_size)

            int taskbarSize = resources.getDimensionPixelSize(mDeviceProfile.isTwoPanels

                    ? R.dimen.transient_taskbar_two_panels_size

                    : R.dimen.transient_taskbar_size);

            return taskbarSize

                    + (2 * resources.getDimensionPixelSize(R.dimen.transient_taskbar_margin))

                    + resources.getDimensionPixelSize(R.dimen.transient_taskbar_shadow_blur);

        }

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

+3 −1
Original line number Diff line number Diff line
@@ -195,7 +195,9 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
            Resources resources = mActivity.getResources();

            boolean isTransientTaskbar = DisplayController.isTransientTaskbar(mActivity);

            mUnstashedHeight = resources.getDimensionPixelSize(isTransientTaskbar

                    ? R.dimen.transient_taskbar_size

                    ? (mActivity.getDeviceProfile().isTwoPanels

                            ? R.dimen.transient_taskbar_two_panels_size

                            : R.dimen.transient_taskbar_size)

                    : R.dimen.taskbar_size);

            mStashedHeight = resources.getDimensionPixelSize(isTransientTaskbar

                    ? R.dimen.transient_taskbar_stashed_size

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -362,8 +362,10 @@ 
    <dimen name="min_hotseat_qsb_width">0dp</dimen>

    <dimen name="taskbar_icon_size">44dp</dimen>

    <dimen name="transient_taskbar_icon_size">57dp</dimen>

    <dimen name="transient_taskbar_two_panels_icon_size">50dp</dimen>

    <!-- Transient taskbar (placeholders to compile in Launcher3 without Quickstep) -->

    <dimen name="transient_taskbar_size">0dp</dimen>

    <dimen name="transient_taskbar_two_panels_size">0dp</dimen>

    <dimen name="transient_taskbar_margin">0dp</dimen>

    <dimen name="transient_taskbar_shadow_blur">0dp</dimen>

    <dimen name="transient_taskbar_key_shadow_distance">0dp</dimen>

src/com/android/launcher3/DeviceProfile.java

+3 −1
Original line number Diff line number Diff line
@@ -319,7 +319,9 @@ public class DeviceProfile { 


        if (isTaskbarPresent) {

            if (DisplayController.isTransientTaskbar(context)) {

                taskbarSize = res.getDimensionPixelSize(R.dimen.transient_taskbar_size);

                taskbarSize = res.getDimensionPixelSize(isTwoPanels

                        ? R.dimen.transient_taskbar_two_panels_size

                        : R.dimen.transient_taskbar_size);

                stashedTaskbarSize =

                        res.getDimensionPixelSize(R.dimen.transient_taskbar_stashed_size);

                transientTaskbarMargin =