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

Commit 1b276a1b authored by Alex Chau's avatar Alex Chau
Browse files

Add transientTaskbarMargin above taskbar in overview 

- Also removed transient_taskbar_two_panels_size and use sw720dp override instead, to be consistent with how we handle small vs large tablet in overview
- Also made isTransientTaskbar mockable so we can test that in DeviceProfileDumpTest

Bug: 260596114
Test: DeviceProfileDumpTest
Change-Id: I3c2236b95d91246e9581531478e3c97601cfb2ec
parent 4537638d

quickstep/res/values-sw720dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -37,4 +37,7 @@ 
    <!-- All Set page-->

    <dimen name="allset_page_allset_text_size">42sp</dimen>

    <dimen name="allset_page_swipe_up_text_size">16sp</dimen>



    <!-- Transient taskbar -->

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

</resources>

quickstep/res/values/dimens.xml

+1 −2
Original line number Diff line number Diff line
@@ -281,8 +281,7 @@ 
    <dimen name="taskbar_icon_size_kids">32dp</dimen>



    <!-- Transient taskbar -->

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

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

    <dimen name="transient_taskbar_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

+2 −6
Original line number Diff line number Diff line
@@ -284,9 +284,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
    private void updateIconSize(Resources resources) {

        mDeviceProfile.iconSizePx = resources.getDimensionPixelSize(

                DisplayController.isTransientTaskbar(this)

                    ? mDeviceProfile.isTwoPanels

                            ? R.dimen.transient_taskbar_two_panels_icon_size

                            : R.dimen.transient_taskbar_icon_size

                    ? R.dimen.transient_taskbar_icon_size

                    : R.dimen.taskbar_icon_size);

        mDeviceProfile.updateIconSize(1f, resources);

    }
@@ -694,9 +692,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        }



        if (DisplayController.isTransientTaskbar(this)) {

            int taskbarSize = resources.getDimensionPixelSize(mDeviceProfile.isTwoPanels

                    ? R.dimen.transient_taskbar_two_panels_size

                    : R.dimen.transient_taskbar_size);

            int taskbarSize = resources.getDimensionPixelSize(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

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

            boolean isTransientTaskbar = DisplayController.isTransientTaskbar(mActivity);

            mUnstashedHeight = resources.getDimensionPixelSize(isTransientTaskbar

                    ? (mActivity.getDeviceProfile().isTwoPanels

                            ? R.dimen.transient_taskbar_two_panels_size

                            : R.dimen.transient_taskbar_size)

                    ? R.dimen.transient_taskbar_size

                    : R.dimen.taskbar_size);

            mStashedHeight = resources.getDimensionPixelSize(isTransientTaskbar

                    ? R.dimen.transient_taskbar_stashed_size

res/values-sw720dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -46,4 +46,7 @@ 


    <!--  Folder spaces  -->

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



    <!-- Transient taskbar -->

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

</resources>