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

Commit ceb49008 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Remove more car icons and simplify back button to just one icon (1/2)"

parents d2e6c81a ec5b841e

packages/SystemUI/res/drawable-ldrtl/ic_sysbar_back_carmode.xml

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="44dp"

        android:height="44dp"

        android:viewportWidth="44.0"

        android:viewportHeight="44.0">

    <path

        android:pathData="M35,21.94C35,22.78 34.49,23.58 33.64,24.05L12.44,36.13C11.43,36.7 10.58,36.51 10.11,36.25C9.08,35.67 9,34.56 9,34.09L9,9.91C9,9.35 9.08,8.31 10.09,7.75C10.54,7.49 11.34,7.31 12.33,7.86L33.74,19.95C34.51,20.39 35,21.13 35,21.94L35,21.94ZM12.5,32L30.5,21.96L12.5,12L12.5,32Z"

        android:strokeColor="#00000000"

        android:fillType="evenOdd"

        android:fillColor="#F8F9FA"

        android:strokeWidth="1"/>

</vector>

packages/SystemUI/res/drawable/ic_sysbar_back_ime_carmode.xml

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="44dp"

        android:height="44dp"

        android:viewportWidth="44.0"

        android:viewportHeight="44.0">

    <path

        android:pathData="M22.06,35C21.22,35 20.42,34.49 19.95,33.64L7.87,12.44C7.3,11.43 7.49,10.58 7.75,10.11C8.33,9.08 9.44,9 9.91,9L34.09,9C34.65,9 35.69,9.08 36.25,10.09C36.51,10.54 36.69,11.34 36.14,12.33L24.05,33.74C23.61,34.51 22.87,35 22.06,35L22.06,35ZM12,12.5L22.04,30.5L32,12.5L12,12.5Z"

        android:strokeColor="#00000000"

        android:fillType="evenOdd"

        android:fillColor="#F8F9FA"

        android:strokeWidth="1"/>

</vector>

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java

+12 −31
Original line number Diff line number Diff line
@@ -123,9 +123,9 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
    private Rect mTmpRect = new Rect();



    private KeyButtonDrawable mBackIcon;

    private KeyButtonDrawable mBackCarModeIcon, mBackLandCarModeIcon;

    private KeyButtonDrawable mBackAltCarModeIcon, mBackAltLandCarModeIcon;

    private KeyButtonDrawable mHomeDefaultIcon, mHomeCarModeIcon;

    private KeyButtonDrawable mHomeDefaultIcon;

    private KeyButtonDrawable mBackCarModeIcon;

    private KeyButtonDrawable mHomeCarModeIcon;

    private KeyButtonDrawable mRecentIcon;

    private KeyButtonDrawable mDockedIcon;

    private KeyButtonDrawable mImeIcon;
@@ -461,16 +461,9 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
                && ((mOverviewProxyService.getInteractionFlags() & FLAG_DISABLE_QUICK_SCRUB) == 0);

    }



    // TODO(b/80003212): change car mode icons to vector icons.

    private void updateCarModeIcons(Context ctx) {

        mBackCarModeIcon = getDrawable(ctx,

                R.drawable.ic_sysbar_back_carmode, R.drawable.ic_sysbar_back_carmode);

        mBackLandCarModeIcon = mBackCarModeIcon;

        mBackAltCarModeIcon = getDrawable(ctx,

                R.drawable.ic_sysbar_back_ime_carmode, R.drawable.ic_sysbar_back_ime_carmode);

        mBackAltLandCarModeIcon = mBackAltCarModeIcon;

        mHomeCarModeIcon = getDrawable(ctx,

                R.drawable.ic_sysbar_home_carmode, R.drawable.ic_sysbar_home_carmode);

        mBackCarModeIcon = getDrawable(ctx, R.drawable.ic_sysbar_back_carmode);

        mHomeCarModeIcon = getDrawable(ctx, R.drawable.ic_sysbar_home_carmode);

    }



    private void reloadNavIcons() {
@@ -575,11 +568,9 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
                darkContext.getDrawable(icon), hasShadow);

    }



    private KeyButtonDrawable getDrawable(Context ctx, @DrawableRes int lightIcon,

            @DrawableRes int darkIcon) {

        // Legacy image icons using separate light and dark images will not support shadows

        return KeyButtonDrawable.create(ctx, ctx.getDrawable(lightIcon),

            ctx.getDrawable(darkIcon), false /* hasShadow */);

    private KeyButtonDrawable getDrawable(Context ctx, @DrawableRes int icon) {

        // Legacy image icons using a single image will not support shadows

        return KeyButtonDrawable.create(ctx, ctx.getDrawable(icon), null, false /* hasShadow */);

    }



    private TintedKeyButtonDrawable getDrawable(Context ctx, @DrawableRes int icon,
@@ -594,16 +585,8 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        super.setLayoutDirection(layoutDirection);

    }



    private KeyButtonDrawable getBackIconWithAlt(boolean carMode, boolean landscape) {

        return landscape

                ? carMode ? mBackAltLandCarModeIcon : mBackIcon

                : carMode ? mBackAltCarModeIcon : mBackIcon;

    }



    private KeyButtonDrawable getBackIcon(boolean carMode, boolean landscape) {

        return landscape

                ? carMode ? mBackLandCarModeIcon : mBackIcon

                : carMode ? mBackCarModeIcon : mBackIcon;

    private KeyButtonDrawable getBackIcon(boolean carMode) {

        return carMode ? mBackCarModeIcon : mBackIcon;

    }



    public void setNavigationIconHints(int hints) {
@@ -643,12 +626,10 @@ public class NavigationBarView extends FrameLayout implements PluginListener<Nav 
        // to recent icon is not required.

        final boolean useAltBack =

                (mNavigationIconHints & StatusBarManager.NAVIGATION_HINT_BACK_ALT) != 0;

        KeyButtonDrawable backIcon = useAltBack

                ? getBackIconWithAlt(mUseCarModeUi, mVertical)

                : getBackIcon(mUseCarModeUi, mVertical);

        KeyButtonDrawable backIcon = getBackIcon(mUseCarModeUi);

        orientBackButton(backIcon);

        KeyButtonDrawable homeIcon = mUseCarModeUi ? mHomeCarModeIcon : mHomeDefaultIcon;

        if (!mUseCarModeUi) {

            orientBackButton(backIcon);

            orientHomeButton(homeIcon);

        }

        getHomeButton().setImageDrawable(homeIcon);