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

Commit 0d5ca5fe authored by Alex Chau's avatar Alex Chau Committed by Automerger Merge Worker
Browse files

Merge "Polish hotseat and taskbar with 3 buttons" into tm-qpr-dev am: 4537638d 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20533919



Change-Id: I23b86a2c2588e8b22c717626fcf345cf32d1f7a4
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 59e6016e 4537638d

quickstep/res/values-land/dimens.xml

+1 −3
Original line number Original line Diff line number Diff line
@@ -76,10 +76,8 @@ 
    <dimen name="gesture_tutorial_taskbar_padding_start_end">218dp</dimen>

    <dimen name="gesture_tutorial_taskbar_padding_start_end">218dp</dimen>





    <!--  Taskbar 3 button spacing  -->

    <!--  Taskbar 3 button spacing  -->

    <dimen name="taskbar_button_margin_5_5">94.5dp</dimen>

    <dimen name="taskbar_button_margin_split">88dp</dimen>

    <dimen name="taskbar_button_margin_6_5">219.6dp</dimen>

    <dimen name="taskbar_button_margin_6_5">219.6dp</dimen>

    <dimen name="taskbar_button_margin_4_5">84dp</dimen>

    <dimen name="taskbar_button_margin_4_4">79dp</dimen>

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

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

    <dimen name="taskbar_suw_frame">96dp</dimen>

    <dimen name="taskbar_suw_frame">96dp</dimen>

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

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

quickstep/res/values/dimens.xml

+2 −4
Original line number Original line Diff line number Diff line
@@ -303,11 +303,9 @@ 
    <!--  Taskbar 3 button spacing  -->

    <!--  Taskbar 3 button spacing  -->

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

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

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

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

    <dimen name="taskbar_button_margin_5_5">26dp</dimen>

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

    <dimen name="taskbar_button_margin_6_5">75dp</dimen>

    <dimen name="taskbar_button_margin_6_5">75dp</dimen>

    <dimen name="taskbar_button_margin_4_5">47dp</dimen>

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

    <dimen name="taskbar_button_margin_4_4">47dp</dimen>

    <dimen name="taskbar_button_margin_default">47dp</dimen>





    <!-- Launcher splash screen -->

    <!-- Launcher splash screen -->

    <!-- Note: keep this value in sync with the WindowManager/Shell dimens.xml -->

    <!-- Note: keep this value in sync with the WindowManager/Shell dimens.xml -->

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

+18 −6
Original line number Original line Diff line number Diff line
@@ -152,10 +152,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
            TaskbarNavButtonController buttonController, ScopedUnfoldTransitionProgressProvider

            TaskbarNavButtonController buttonController, ScopedUnfoldTransitionProgressProvider

            unfoldTransitionProgressProvider) {

            unfoldTransitionProgressProvider) {

        super(windowContext);

        super(windowContext);

        mDeviceProfile = launcherDp.copy(this);



        final Resources resources = getResources();

        final Resources resources = getResources();





        matchDeviceProfile(launcherDp, getResources());



        mNavMode = DisplayController.getNavigationMode(windowContext);

        mNavMode = DisplayController.getNavigationMode(windowContext);

        mImeDrawsImeNavBar = getBoolByName(IME_DRAWS_IME_NAV_BAR_RES_NAME, resources, false);

        mImeDrawsImeNavBar = getBoolByName(IME_DRAWS_IME_NAV_BAR_RES_NAME, resources, false);

        mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode",

        mIsSafeModeEnabled = TraceHelper.allowIpcs("isSafeMode",
@@ -170,8 +170,6 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        mIsNavBarKidsMode = settingsCache.getValue(

        mIsNavBarKidsMode = settingsCache.getValue(

                Settings.Secure.getUriFor(Settings.Secure.NAV_BAR_KIDS_MODE), 0);

                Settings.Secure.getUriFor(Settings.Secure.NAV_BAR_KIDS_MODE), 0);





        updateIconSize(resources);



        // Get display and corners first, as views might use them in constructor.

        // Get display and corners first, as views might use them in constructor.

        Display display = windowContext.getDisplay();

        Display display = windowContext.getDisplay();

        Context c = display.getDisplayId() == Display.DEFAULT_DISPLAY

        Context c = display.getDisplayId() == Display.DEFAULT_DISPLAY
@@ -259,8 +257,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
    public void updateDeviceProfile(DeviceProfile launcherDp, NavigationMode navMode) {

    public void updateDeviceProfile(DeviceProfile launcherDp, NavigationMode navMode) {

        mNavMode = navMode;

        mNavMode = navMode;

        mControllers.taskbarOverlayController.updateLauncherDeviceProfile(launcherDp);

        mControllers.taskbarOverlayController.updateLauncherDeviceProfile(launcherDp);

        mDeviceProfile = launcherDp.copy(this);

        matchDeviceProfile(launcherDp, getResources());

        updateIconSize(getResources());





        AbstractFloatingView.closeAllOpenViewsExcept(this, false, TYPE_REBIND_SAFE);

        AbstractFloatingView.closeAllOpenViewsExcept(this, false, TYPE_REBIND_SAFE);

        // Reapply fullscreen to take potential new screen size into account.

        // Reapply fullscreen to take potential new screen size into account.
@@ -269,6 +266,21 @@ public class TaskbarActivityContext extends BaseTaskbarContext { 
        dispatchDeviceProfileChanged();

        dispatchDeviceProfileChanged();

    }

    }





    /**

     * Copy the original DeviceProfile, match the number of hotseat icons and qsb width and update

     * the icon size

     */

    private void matchDeviceProfile(DeviceProfile originDeviceProfile, Resources resources) {

        mDeviceProfile = originDeviceProfile.copy(this);

        // Taskbar should match the number of icons of hotseat

        mDeviceProfile.numShownHotseatIcons = originDeviceProfile.numShownHotseatIcons;

        // Same QSB width to have a smooth animation

        mDeviceProfile.hotseatQsbWidth = originDeviceProfile.hotseatQsbWidth;

        // Update the size of the icons

        updateIconSize(resources);

    }





    private void updateIconSize(Resources resources) {

    private void updateIconSize(Resources resources) {

        mDeviceProfile.iconSizePx = resources.getDimensionPixelSize(

        mDeviceProfile.iconSizePx = resources.getDimensionPixelSize(

                DisplayController.isTransientTaskbar(this)

                DisplayController.isTransientTaskbar(this)

quickstep/tests/src/com/android/quickstep/HotseatWidthCalculationTest.kt

+24 −24
Original line number Original line Diff line number Diff line
@@ -39,12 +39,12 @@ class HotseatWidthCalculationTest : DeviceProfileBaseTest() { 
        val dp = newDP()

        val dp = newDP()

        dp.isTaskbarPresentInApps = true

        dp.isTaskbarPresentInApps = true





        assertThat(dp.hotseatBarEndOffset).isEqualTo(558)

        assertThat(dp.hotseatBarEndOffset).isEqualTo(510)

        assertThat(dp.numShownHotseatIcons).isEqualTo(6)

        assertThat(dp.numShownHotseatIcons).isEqualTo(6)

        assertThat(dp.hotseatBorderSpace).isEqualTo(69)

        assertThat(dp.hotseatBorderSpace).isEqualTo(70)





        assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(176)

        assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(150)

        assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(558)

        assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(580)





        assertThat(dp.isQsbInline).isFalse()

        assertThat(dp.isQsbInline).isFalse()

        assertThat(dp.hotseatQsbWidth).isEqualTo(1445)

        assertThat(dp.hotseatQsbWidth).isEqualTo(1445)
@@ -61,12 +61,12 @@ class HotseatWidthCalculationTest : DeviceProfileBaseTest() { 
        val dp = newDP()

        val dp = newDP()

        dp.isTaskbarPresentInApps = true

        dp.isTaskbarPresentInApps = true





        assertThat(dp.hotseatBarEndOffset).isEqualTo(558)

        assertThat(dp.hotseatBarEndOffset).isEqualTo(510)

        assertThat(dp.numShownHotseatIcons).isEqualTo(4)

        assertThat(dp.numShownHotseatIcons).isEqualTo(4)

        assertThat(dp.hotseatBorderSpace).isEqualTo(50)

        assertThat(dp.hotseatBorderSpace).isEqualTo(40)





        assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(112)

        assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(150)

        assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(558)

        assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(550)





        assertThat(dp.isQsbInline).isFalse()

        assertThat(dp.isQsbInline).isFalse()

        assertThat(dp.hotseatQsbWidth).isEqualTo(1080)

        assertThat(dp.hotseatQsbWidth).isEqualTo(1080)
@@ -82,12 +82,12 @@ class HotseatWidthCalculationTest : DeviceProfileBaseTest() { 
        val dp = newDP()

        val dp = newDP()

        dp.isTaskbarPresentInApps = true

        dp.isTaskbarPresentInApps = true





        assertThat(dp.hotseatBarEndOffset).isEqualTo(744)

        assertThat(dp.hotseatBarEndOffset).isEqualTo(705)

        assertThat(dp.numShownHotseatIcons).isEqualTo(6)

        assertThat(dp.numShownHotseatIcons).isEqualTo(6)

        assertThat(dp.hotseatBorderSpace).isEqualTo(82)

        assertThat(dp.hotseatBorderSpace).isEqualTo(54)





        assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(106)

        assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(231)

        assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(744)

        assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(759)





        assertThat(dp.isQsbInline).isFalse()

        assertThat(dp.isQsbInline).isFalse()

        assertThat(dp.hotseatQsbWidth).isEqualTo(1468)

        assertThat(dp.hotseatQsbWidth).isEqualTo(1468)
@@ -107,12 +107,12 @@ class HotseatWidthCalculationTest : DeviceProfileBaseTest() { 
        val dp = newDP()

        val dp = newDP()

        dp.isTaskbarPresentInApps = true

        dp.isTaskbarPresentInApps = true





        assertThat(dp.hotseatBarEndOffset).isEqualTo(705)

        assertThat(dp.hotseatBarEndOffset).isEqualTo(660)

        assertThat(dp.numShownHotseatIcons).isEqualTo(6)

        assertThat(dp.numShownHotseatIcons).isEqualTo(6)

        assertThat(dp.hotseatBorderSpace).isEqualTo(102)

        assertThat(dp.hotseatBorderSpace).isEqualTo(100)





        assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(625)

        assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(300)

        assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(705)

        assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(1040)





        assertThat(dp.isQsbInline).isFalse()

        assertThat(dp.isQsbInline).isFalse()

        assertThat(dp.hotseatQsbWidth).isEqualTo(1233)

        assertThat(dp.hotseatQsbWidth).isEqualTo(1233)
@@ -128,15 +128,15 @@ class HotseatWidthCalculationTest : DeviceProfileBaseTest() { 
        val dp = newDP()

        val dp = newDP()

        dp.isTaskbarPresentInApps = true

        dp.isTaskbarPresentInApps = true





        assertThat(dp.hotseatBarEndOffset).isEqualTo(705)

        assertThat(dp.hotseatBarEndOffset).isEqualTo(660)

        assertThat(dp.numShownHotseatIcons).isEqualTo(6)

        assertThat(dp.numShownHotseatIcons).isEqualTo(6)

        assertThat(dp.hotseatBorderSpace).isEqualTo(36)

        assertThat(dp.hotseatBorderSpace).isEqualTo(36)





        assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(854)

        assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(864)

        assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(705)

        assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(696)





        assertThat(dp.isQsbInline).isTrue()

        assertThat(dp.isQsbInline).isTrue()

        assertThat(dp.hotseatQsbWidth).isEqualTo(531)

        assertThat(dp.hotseatQsbWidth).isEqualTo(528)

    }

    }





    /**

    /**
@@ -150,12 +150,12 @@ class HotseatWidthCalculationTest : DeviceProfileBaseTest() { 
        val dp = newDP()

        val dp = newDP()

        dp.isTaskbarPresentInApps = true

        dp.isTaskbarPresentInApps = true





        assertThat(dp.hotseatBarEndOffset).isEqualTo(705)

        assertThat(dp.hotseatBarEndOffset).isEqualTo(660)

        assertThat(dp.numShownHotseatIcons).isEqualTo(5)

        assertThat(dp.numShownHotseatIcons).isEqualTo(5)

        assertThat(dp.hotseatBorderSpace).isEqualTo(43)

        assertThat(dp.hotseatBorderSpace).isEqualTo(36)





        assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(782)

        assertThat(dp.getHotseatLayoutPadding(context).left).isEqualTo(816)

        assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(705)

        assertThat(dp.getHotseatLayoutPadding(context).right).isEqualTo(700)





        assertThat(dp.isQsbInline).isTrue()

        assertThat(dp.isQsbInline).isTrue()

        assertThat(dp.hotseatQsbWidth).isEqualTo(480)

        assertThat(dp.hotseatQsbWidth).isEqualTo(480)

res/values/dimens.xml

+2 −3
Original line number Original line Diff line number Diff line
@@ -361,6 +361,7 @@ 
    <dimen name="qsb_widget_height">0dp</dimen>

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

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

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

    <dimen name="min_hotseat_icon_space">18dp</dimen>

    <dimen name="min_hotseat_icon_space">18dp</dimen>

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

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

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

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

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

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

    <dimen name="transient_taskbar_icon_size">57dp</dimen>
@@ -383,10 +384,8 @@ 
    <dimen name="taskbar_button_margin_default">0dp</dimen>

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

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

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

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

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

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

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

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

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

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

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

    <!-- Taskbar swipe up thresholds threshold -->

    <!-- Taskbar swipe up thresholds threshold -->

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

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

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

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