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

Commit 71370c58 authored by Jon Miranda's avatar Jon Miranda Committed by Android (Google) Code Review
Browse files

Merge "Update insets for transient taskbar" into tm-qpr-dev

parents 8d3241b3 7e819508

quickstep/res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -288,6 +288,8 @@ 
    <dimen name="transient_taskbar_margin">24dp</dimen>

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

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

    <dimen name="transient_taskbar_stashed_size">32dp</dimen>

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

    <!-- Taskbar swipe up thresholds -->

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

    <dimen name="taskbar_home_overview_threshold">225dp</dimen>

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

+9 −3
Original line number Diff line number Diff line
@@ -190,8 +190,13 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
        if (isPhoneMode()) {

            // DeviceProfile's taskbar vars aren't initialized w/ the flag off

            Resources resources = mActivity.getResources();

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

            mStashedHeight = resources.getDimensionPixelOffset(R.dimen.taskbar_stashed_size);

            boolean isTransientTaskbar = DisplayController.isTransientTaskbar(mActivity);

            mUnstashedHeight = resources.getDimensionPixelSize(isTransientTaskbar

                    ? R.dimen.transient_taskbar_size

                    : R.dimen.taskbar_size);

            mStashedHeight = resources.getDimensionPixelSize(isTransientTaskbar

                    ? R.dimen.transient_taskbar_stashed_size

                    : R.dimen.taskbar_stashed_size);

        } else {

            mUnstashedHeight = mActivity.getDeviceProfile().taskbarSize;

            mStashedHeight = mActivity.getDeviceProfile().stashedTaskbarSize;
@@ -344,7 +349,8 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba 
     * @see WindowInsets.Type#systemBars()

     */

    public int getContentHeightToReportToApps() {

        if (isPhoneMode() && !mActivity.isThreeButtonNav()) {

        if ((isPhoneMode() && !mActivity.isThreeButtonNav())

                || DisplayController.isTransientTaskbar(mActivity)) {

            return getStashedHeight();

        }

res/values/dimens.xml

+3 −1
Original line number Diff line number Diff line
@@ -367,7 +367,9 @@ 
    <dimen name="transient_taskbar_margin">0dp</dimen>

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

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

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

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

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

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

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

    <dimen name="taskbar_icon_spacing">8dp</dimen>

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

src/com/android/launcher3/DeviceProfile.java

+8 −4
Original line number Diff line number Diff line
@@ -312,11 +312,15 @@ public class DeviceProfile { 
        }



        if (isTaskbarPresent) {

            taskbarSize = DisplayController.isTransientTaskbar(context)

                    ? res.getDimensionPixelSize(R.dimen.transient_taskbar_size)

                    : res.getDimensionPixelSize(R.dimen.taskbar_size);

            if (DisplayController.isTransientTaskbar(context)) {

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

                stashedTaskbarSize =

                        res.getDimensionPixelSize(R.dimen.transient_taskbar_stashed_size);

            } else {

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

                stashedTaskbarSize = res.getDimensionPixelSize(R.dimen.taskbar_stashed_size);

            }

        }



        edgeMarginPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);

        workspaceContentScale = res.getFloat(R.dimen.workspace_content_scale);