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

Commit ca067e97 authored by Adrian Roos's avatar Adrian Roos Committed by Android (Google) Code Review
Browse files

Merge "Rename windowLightStatusBar" into mnc-dev

parents fd4e5664 f4f84c98

api/current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1416,7 +1416,7 @@ package android { 
    field public static final int windowExitTransition = 16843832; // 0x1010438

    field public static final int windowFrame = 16842837; // 0x1010055

    field public static final int windowFullscreen = 16843277; // 0x101020d

    field public static final int windowHasLightStatusBar = 16843998; // 0x10104de

    field public static final int windowLightStatusBar = 16843998; // 0x10104de

    field public static final int windowHideAnimation = 16842935; // 0x10100b7

    field public static final int windowIsFloating = 16842839; // 0x1010057

    field public static final int windowIsTranslucent = 16842840; // 0x1010058

api/system-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -1493,7 +1493,7 @@ package android { 
    field public static final int windowExitTransition = 16843832; // 0x1010438

    field public static final int windowFrame = 16842837; // 0x1010055

    field public static final int windowFullscreen = 16843277; // 0x101020d

    field public static final int windowHasLightStatusBar = 16843998; // 0x10104de

    field public static final int windowLightStatusBar = 16843998; // 0x10104de

    field public static final int windowHideAnimation = 16842935; // 0x10100b7

    field public static final int windowIsFloating = 16842839; // 0x1010057

    field public static final int windowIsTranslucent = 16842840; // 0x1010058

core/java/android/view/PhoneWindow.java

+1 −1
Original line number Diff line number Diff line
@@ -3599,7 +3599,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { 
        if (!mForcedNavigationBarColor) {

            mNavigationBarColor = a.getColor(R.styleable.Window_navigationBarColor, 0xFF000000);

        }

        if (a.getBoolean(R.styleable.Window_windowHasLightStatusBar, false)) {

        if (a.getBoolean(R.styleable.Window_windowLightStatusBar, false)) {

            decor.setSystemUiVisibility(

                    decor.getSystemUiVisibility() | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);

        }

core/java/android/view/View.java

+1 −1
Original line number Diff line number Diff line
@@ -2592,7 +2592,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     * {@link android.view.WindowManager.LayoutParams#FLAG_TRANSLUCENT_STATUS

     *         FLAG_TRANSLUCENT_STATUS}.

     *

     * @see android.R.attr#windowHasLightStatusBar

     * @see android.R.attr#windowLightStatusBar

     */

    public static final int SYSTEM_UI_FLAG_LIGHT_STATUS_BAR = 0x00002000;

































core/res/res/values/attrs.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -1971,7 +1971,7 @@













             {@link android.R.attr#windowTranslucentStatus}.















             Corresponds to setting {@link android.view.View#SYSTEM_UI_FLAG_LIGHT_STATUS_BAR} on















             the decor view. -->













        <attr name="windowHasLightStatusBar" format="boolean" />













        <attr name="windowLightStatusBar" format="boolean" />















    </declare-styleable>































    <!-- The set of attributes that describe a AlertDialog's theme. -->