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

Commit 867014b7 authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Tune nav bar height" into tm-dev am: 66871fa4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17983271



Change-Id: Idaac66a91181e8cb3c95cb9050a6c15b0c0e2577
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e2a19d0b 66871fa4

packages/SystemUI/res/values/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -30,10 +30,10 @@ 
    <dimen name="navigation_bar_deadzone_size_max">32dp</dimen>



    <!-- dimensions for the navigation bar handle -->

    <dimen name="navigation_handle_radius">1dp</dimen>

    <dimen name="navigation_handle_bottom">6dp</dimen>

    <dimen name="navigation_handle_radius">2dp</dimen>

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

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

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

    <dimen name="navigation_home_handle_width">108dp</dimen>



    <!-- Size of the nav bar edge panels, should be greater to the

         edge sensitivity + the drag threshold -->

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/NavigationHandle.java

+6 −6
Original line number Diff line number Diff line
@@ -36,8 +36,8 @@ public class NavigationHandle extends View implements ButtonInterface { 
    protected final Paint mPaint = new Paint();

    private @ColorInt final int mLightColor;

    private @ColorInt final int mDarkColor;

    protected final int mRadius;

    protected final int mBottom;

    protected final float mRadius;

    protected final float mBottom;

    private boolean mRequiresInvalidate;



    public NavigationHandle(Context context) {
@@ -47,8 +47,8 @@ public class NavigationHandle extends View implements ButtonInterface { 
    public NavigationHandle(Context context, AttributeSet attr) {

        super(context, attr);

        final Resources res = context.getResources();

        mRadius = res.getDimensionPixelSize(R.dimen.navigation_handle_radius);

        mBottom = res.getDimensionPixelSize(R.dimen.navigation_handle_bottom);

        mRadius = res.getDimension(R.dimen.navigation_handle_radius);

        mBottom = res.getDimension(R.dimen.navigation_handle_bottom);



        final int dualToneDarkTheme = Utils.getThemeAttr(context, R.attr.darkIconTheme);

        final int dualToneLightTheme = Utils.getThemeAttr(context, R.attr.lightIconTheme);
@@ -75,9 +75,9 @@ public class NavigationHandle extends View implements ButtonInterface { 


        // Draw that bar

        int navHeight = getHeight();

        int height = mRadius * 2;

        float height = mRadius * 2;

        int width = getWidth();

        int y = (navHeight - mBottom - height);

        float y = (navHeight - mBottom - height);

        canvas.drawRoundRect(0, y, width, y + height, mRadius, mRadius, mPaint);

    }

packages/SystemUI/src/com/android/systemui/navigationbar/gestural/QuickswitchOrientedNavHandle.java

+10 −10
Original line number Diff line number Diff line
@@ -44,33 +44,33 @@ public class QuickswitchOrientedNavHandle extends NavigationHandle { 
    }



    public RectF computeHomeHandleBounds() {

        int left;

        int top;

        int bottom;

        int right;

        int radiusOffset = mRadius * 2;

        float left;

        float top;

        float bottom;

        float right;

        float radiusOffset = mRadius * 2;

        int topStart = getLocationOnScreen()[1];



        switch (mDeltaRotation) {

            default:

            case Surface.ROTATION_0:

            case Surface.ROTATION_180:

                int height = mRadius * 2;

                left = getWidth() / 2 - mWidth / 2;

                float height = mRadius * 2;

                left = getWidth() / 2f - mWidth / 2f;

                top = (getHeight() - mBottom - height);

                right = getWidth() / 2 + mWidth / 2;

                right = getWidth() / 2f + mWidth / 2f;

                bottom = top + height;

                break;

            case Surface.ROTATION_90:

                left = mBottom;

                right = left + radiusOffset;

                top = getHeight() / 2 - (mWidth / 2) - (topStart / 2);

                top = getHeight() / 2f - (mWidth / 2f) - (topStart / 2f);

                bottom = top + mWidth;

                break;

            case Surface.ROTATION_270:

                right = getWidth() - mBottom;

                left = right - radiusOffset;

                top = getHeight() / 2 - (mWidth / 2) - (topStart / 2);

                top = getHeight() / 2f - (mWidth / 2f) - (topStart / 2f);

                bottom = top + mWidth;

                break;

        }

packages/overlays/NavigationBarModeGesturalOverlay/res/values/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 
-->

<resources>

    <!-- Height of the bottom navigation / system bar. -->

    <dimen name="navigation_bar_height">16dp</dimen>

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

    <!-- Height of the bottom navigation bar in portrait; often the same as @dimen/navigation_bar_height -->

    <dimen name="navigation_bar_height_landscape">16dp</dimen>

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

    <!-- Width of the navigation bar when it is placed vertically on the screen -->

    <dimen name="navigation_bar_width">16dp</dimen>

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

    <!-- Height of the bottom navigation / system bar. -->

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

    <!-- The height of the bottom navigation gesture area. -->

packages/overlays/NavigationBarModeGesturalOverlayExtraWideBack/res/values/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -18,11 +18,11 @@ 
-->

<resources>

    <!-- Height of the bottom navigation / system bar. -->

    <dimen name="navigation_bar_height">16dp</dimen>

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

    <!-- Height of the bottom navigation bar in portrait; often the same as @dimen/navigation_bar_height -->

    <dimen name="navigation_bar_height_landscape">16dp</dimen>

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

    <!-- Width of the navigation bar when it is placed vertically on the screen -->

    <dimen name="navigation_bar_width">16dp</dimen>

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

    <!-- Height of the bottom navigation / system bar. -->

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

    <!-- The height of the bottom navigation gesture area. -->