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

Commit 5cc1b5ec authored by Priyanka Advani's avatar Priyanka Advani Committed by Android (Google) Code Review
Browse files

Merge "Revert "Update Gesture/3B nav color to B/W"" into main

parents a9b54179 d81decaa

core/java/android/inputmethodservice/navigationbar/NavigationBarConstants.java

+4 −5
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package android.inputmethodservice.navigationbar;



import android.annotation.ColorInt;

import android.graphics.Color;



final class NavigationBarConstants {

    private NavigationBarConstants() {
@@ -28,13 +27,13 @@ final class NavigationBarConstants { 
    // TODO(b/215443343): Handle this in the drawable then remove this constant.

    static final float NAVBAR_BACK_BUTTON_IME_OFFSET = 2.0f;



    // Copied from "white" at packages/SettingsLib/res/values/colors.xml

    // Copied from "light_mode_icon_color_single_tone" at packages/SettingsLib/res/values/colors.xml

    @ColorInt

    static final int WHITE = Color.WHITE;

    static final int LIGHT_MODE_ICON_COLOR_SINGLE_TONE = 0xffffffff;



    // Copied from "black" at packages/SettingsLib/res/values/colors.xml

    // Copied from "dark_mode_icon_color_single_tone" at packages/SettingsLib/res/values/colors.xml

    @ColorInt

    static final int BLACK = Color.BLACK;

    static final int DARK_MODE_ICON_COLOR_SINGLE_TONE = 0x99000000;



    // Copied from "navigation_bar_deadzone_hold"

    static final int NAVIGATION_BAR_DEADZONE_HOLD = 333;

core/java/android/inputmethodservice/navigationbar/NavigationBarView.java

+4 −4
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package android.inputmethodservice.navigationbar;



import static android.inputmethodservice.navigationbar.NavigationBarConstants.BLACK;

import static android.inputmethodservice.navigationbar.NavigationBarConstants.WHITE;

import static android.inputmethodservice.navigationbar.NavigationBarConstants.DARK_MODE_ICON_COLOR_SINGLE_TONE;

import static android.inputmethodservice.navigationbar.NavigationBarConstants.LIGHT_MODE_ICON_COLOR_SINGLE_TONE;

import static android.inputmethodservice.navigationbar.NavigationBarConstants.NAVBAR_BACK_BUTTON_IME_OFFSET;

import static android.inputmethodservice.navigationbar.NavigationBarUtils.dpToPx;

import static android.view.WindowManagerPolicyConstants.NAV_BAR_MODE_GESTURAL;
@@ -83,8 +83,8 @@ public final class NavigationBarView extends FrameLayout { 
        super(context, attrs);



        mLightContext = context;

        mLightIconColor = WHITE;

        mDarkIconColor = BLACK;

        mLightIconColor = LIGHT_MODE_ICON_COLOR_SINGLE_TONE;

        mDarkIconColor = DARK_MODE_ICON_COLOR_SINGLE_TONE;



        mConfiguration = new Configuration();

        mTmpLastConfiguration = new Configuration();

packages/SettingsLib/res/values/colors.xml

+3 −4
Original line number Diff line number Diff line
@@ -14,8 +14,7 @@ 
     limitations under the License.

-->



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

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

<resources>

    <color name="disabled_text_color">#66000000</color> <!-- 38% black -->



    <color name="bt_color_icon_1">#b4a50e0e</color> <!-- 72% Material Red 900 -->
@@ -34,8 +33,8 @@ 
    <color name="bt_color_bg_6">#e9d2fd</color> <!-- Material Purple 100 -->

    <color name="bt_color_bg_7">#cbf0f8</color> <!-- Material Cyan 100 -->



    <color name="black">@*android:color/black</color>

    <color name="white">@*android:color/white</color>

    <color name="dark_mode_icon_color_single_tone">#99000000</color>

    <color name="light_mode_icon_color_single_tone">#ffffff</color>



    <color name="user_avatar_color_bg">?android:attr/colorBackgroundFloating</color>

packages/SettingsLib/src/com/android/settingslib/graph/SignalDrawable.java

+2 −2
Original line number Diff line number Diff line
@@ -100,9 +100,9 @@ public class SignalDrawable extends DrawableWrapper { 
        mCutoutHeightFraction = context.getResources().getFloat(

                com.android.internal.R.dimen.config_signalCutoutHeightFraction);

        mDarkModeFillColor = Utils.getColorStateListDefaultColor(context,

                R.color.black);

                R.color.dark_mode_icon_color_single_tone);

        mLightModeFillColor = Utils.getColorStateListDefaultColor(context,

                R.color.white);

                R.color.light_mode_icon_color_single_tone);

        mIntrinsicSize = context.getResources().getDimensionPixelSize(R.dimen.signal_icon_size);

        mTransparentPaint.setColor(context.getColor(android.R.color.transparent));

        mTransparentPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.SRC_IN));

packages/SystemUI/res/values/colors.xml

+2 −2
Original line number Diff line number Diff line
@@ -100,8 +100,8 @@ 
    <!-- The color of the navigation bar icons. Need to be in sync with ic_sysbar_* -->

    <color name="navigation_bar_icon_color">#E5FFFFFF</color>



    <color name="white">@*android:color/white</color>

    <color name="black">@*android:color/black</color>

    <color name="navigation_bar_home_handle_light_color">#EBffffff</color>

    <color name="navigation_bar_home_handle_dark_color">#99000000</color>



    <!-- The shadow color for light navigation bar icons. -->

    <color name="nav_key_button_shadow_color">#30000000</color>