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

Commit 6e9302f7 authored by Sukesh Ram's avatar Sukesh Ram
Browse files

Make Navbar Back Button UI Consistent with SysUI 

Change the back button (3-button nav) from a chevron during setup wizard into a triangle to be more consistent with the rest of SysUI.

Flag: NONE
Test: Manually tested in Pixel 7 setup wizard mode.
Bug: 293260092
Change-Id: I4dd5ff980f386ed108f12c7614c8f1217bc07e59
parent 7bf43433

packages/SystemUI/res/drawable/ic_sysbar_back_quick_step.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2018 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="28dp"

    android:height="28dp"

    android:autoMirrored="true"

    android:viewportWidth="28"

    android:viewportHeight="28">

    <path

        android:pathData="M16.78,10.03l-3.97,3.97l3.97,3.97l-1.06,1.06l-5.03,-5.03l5.03,-5.03z"

        android:fillColor="?attr/singleToneColor" />

</vector>
 
 No newline at end of file

packages/SystemUI/src/com/android/systemui/navigationbar/NavigationBarView.java

+1 −11
Original line number Diff line number Diff line
@@ -494,16 +494,11 @@ public class NavigationBarView extends FrameLayout { 
    }



    public KeyButtonDrawable getBackDrawable() {

        KeyButtonDrawable drawable = getDrawable(getBackDrawableRes());

        KeyButtonDrawable drawable = getDrawable(R.drawable.ic_sysbar_back);

        orientBackButton(drawable);

        return drawable;

    }



    public @DrawableRes int getBackDrawableRes() {

        return chooseNavigationIconDrawableRes(R.drawable.ic_sysbar_back,

                R.drawable.ic_sysbar_back_quick_step);

    }



    public KeyButtonDrawable getHomeDrawable() {

        KeyButtonDrawable drawable = mShowSwipeUpUi

                ? getDrawable(R.drawable.ic_sysbar_home_quick_step)
@@ -543,11 +538,6 @@ public class NavigationBarView extends FrameLayout { 
        drawable.setRotation(mIsVertical ? 90 : 0);

    }



    private @DrawableRes int chooseNavigationIconDrawableRes(@DrawableRes int icon,

            @DrawableRes int quickStepIcon) {

        return mShowSwipeUpUi ? quickStepIcon : icon;

    }



    private KeyButtonDrawable getDrawable(@DrawableRes int icon) {

        return KeyButtonDrawable.create(mLightContext, mLightIconColor, mDarkIconColor, icon,

                true /* hasShadow */, null /* ovalBackgroundColor */);