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

Commit 1bd137dc authored by Roman Birg's avatar Roman Birg
Browse files

SystemUI: fix incorrectly sized nav bar icons



Change-Id: Ief45ac0ed54f5a22477d54f685ec423350fc467c
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent 9b46d456
Loading
Loading
Loading
Loading
+6 −2
Original line number Diff line number Diff line
@@ -69,24 +69,28 @@
        android:animateLayoutChanges="true">
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/two"
            android:scaleType="centerInside"
            android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
            android:layout_height="match_parent"
            systemui:keyRepeat="true"
            android:layout_weight="0" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/three"
            android:scaleType="centerInside"
            android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
            android:layout_height="match_parent"
            systemui:keyRepeat="true"
            android:layout_weight="0" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/four"
            android:scaleType="centerInside"
            android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
            android:layout_height="match_parent"
            android:layout_weight="0"
            systemui:keyRepeat="true" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/five"
            android:scaleType="centerInside"
            android:layout_width="128dp" android:paddingLeft="25dp" android:paddingRight="25dp"
            android:layout_height="match_parent"
            android:layout_weight="0"
@@ -114,14 +118,14 @@
            android:layout_width="@dimen/navigation_extra_key_width"
            android:layout_height="match_parent"
            android:layout_weight="0"
            android:scaleType="fitCenter" />
            android:scaleType="centerInside" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/dpad_right"
            android:visibility="gone"
            android:layout_width="48dp"
            android:layout_height="match_parent"
            android:layout_weight="0"
            android:scaleType="fitCenter"
            android:scaleType="centerInside"
            systemui:keyRepeat="true" />
    </FrameLayout>

+8 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@

        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/one"
            android:scaleType="centerInside"
            android:layout_height="40dp"
            android:layout_width="match_parent"
            android:layout_weight="0" />
@@ -48,7 +49,7 @@
            android:layout_width="match_parent"
            android:layout_height="40dp"
            android:layout_weight="0"
            android:scaleType="fitCenter"
            android:scaleType="centerInside"
            systemui:keyRepeat="true"/>
    </FrameLayout>
    <LinearLayout
@@ -64,6 +65,7 @@
        android:animateLayoutChanges="true">
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/two"
            android:scaleType="centerInside"
            android:layout_height="80dp"
            android:layout_width="match_parent"
            android:layout_weight="0"
@@ -75,6 +77,7 @@
            android:visibility="invisible" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/three"
            android:scaleType="centerInside"
            android:layout_height="80dp"
            android:layout_width="match_parent"
            systemui:keyRepeat="true"
@@ -86,6 +89,7 @@
            android:visibility="invisible" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/four"
            android:scaleType="centerInside"
            android:layout_height="80dp"
            android:layout_width="match_parent"
            android:layout_weight="0"
@@ -97,6 +101,7 @@
            android:visibility="invisible" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/five"
            android:scaleType="centerInside"
            android:layout_height="80dp"
            android:layout_width="match_parent"
            android:layout_weight="0"
@@ -111,10 +116,11 @@
            android:layout_width="match_parent"
            android:layout_height="40dp"
            android:layout_weight="0"
            android:scaleType="fitCenter"
            android:scaleType="centerInside"
            systemui:keyRepeat="true" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/six"
            android:scaleType="centerInside"
            android:layout_height="40dp"
            android:layout_width="match_parent"
            android:layout_weight="0"
+8 −4
Original line number Diff line number Diff line
@@ -35,14 +35,14 @@
            android:layout_width="40dp"
            android:layout_height="match_parent"
            android:layout_weight="0"
            android:scaleType="fitCenter"
            android:scaleType="centerInside"
            systemui:keyRepeat="true" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/one"
            android:layout_width="@dimen/navigation_extra_key_width"
            android:layout_height="match_parent"
            android:layout_weight="0"
            android:scaleType="fitCenter" />
            android:scaleType="centerInside" />
    </FrameLayout>
    <LinearLayout
        android:layout_height="match_parent"
@@ -56,6 +56,7 @@
        android:animateLayoutChanges="true">
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/two"
            android:scaleType="centerInside"
            android:layout_width="@dimen/navigation_key_width"
            android:layout_height="match_parent"
            systemui:keyRepeat="true"
@@ -66,6 +67,7 @@
            android:layout_weight="1" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/three"
            android:scaleType="centerInside"
            android:layout_width="@dimen/navigation_key_width"
            android:layout_height="match_parent"
            systemui:keyRepeat="true"
@@ -76,6 +78,7 @@
            android:layout_weight="1" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/four"
            android:scaleType="centerInside"
            android:layout_width="@dimen/navigation_key_width"
            android:layout_height="match_parent"
            android:layout_weight="0"
@@ -86,6 +89,7 @@
            android:layout_weight="1" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/five"
            android:scaleType="centerInside"
            android:layout_width="@dimen/navigation_key_width"
            android:layout_height="match_parent"
            android:layout_weight="0"
@@ -109,14 +113,14 @@
            android:layout_width="@dimen/navigation_extra_key_width"
            android:layout_height="match_parent"
            android:layout_weight="0"
            android:scaleType="fitCenter" />
            android:scaleType="centerInside" />
        <com.android.systemui.statusbar.policy.KeyButtonView
            android:id="@+id/dpad_right"
            android:visibility="gone"
            android:layout_width="40dp"
            android:layout_height="match_parent"
            android:layout_weight="0"
            android:scaleType="fitCenter"
            android:scaleType="centerInside"
            systemui:keyRepeat="true"/>
    </FrameLayout>
</LinearLayout>
+16 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.systemui.statusbar.phone;

import android.animation.Animator;
import android.animation.ObjectAnimator;
import android.annotation.NonNull;
import android.app.ActivityManager;
import android.graphics.Canvas;
import android.graphics.ColorFilter;
@@ -71,6 +72,11 @@ public class BackButtonDrawable extends Drawable {
        mWrappedDrawable.setBounds(left, top, right, bottom);
    }

    @Override
    protected void onBoundsChange(Rect bounds) {
        mWrappedDrawable.setBounds(bounds);
    }

    @Override
    public void setAlpha(int alpha) {
        mWrappedDrawable.setAlpha(alpha);
@@ -93,6 +99,16 @@ public class BackButtonDrawable extends Drawable {
        return mWrappedDrawable.getOpacity();
    }

    @Override
    public int getIntrinsicWidth() {
        return mWrappedDrawable.getIntrinsicWidth();
    }

    @Override
    public int getIntrinsicHeight() {
        return mWrappedDrawable.getIntrinsicHeight();
    }

    public void setRotation(float rotation) {
        mRotation = rotation;
        invalidateSelf();