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

Commit 2bc6acbf authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [2978126, 2977997, 2977757, 2977846, 2977998, 2978351,... 

Merge cherrypicks of [2978126, 2977997, 2977757, 2977846, 2977998, 2978351, 2978352, 2977999, 2978127] into oc-mr1-release

Change-Id: Idb61f88cdf0bdfc8f611c6f3a63f2a7e4b6c8c2c
parents 9af72223 725fccab

api/current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -919,6 +919,7 @@ package android { 
    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int name = 16842755; // 0x1010003

    field public static final int name = 16842755; // 0x1010003

    field public static final int navigationBarColor = 16843858; // 0x1010452

    field public static final int navigationBarColor = 16843858; // 0x1010452

    field public static final int navigationBarDividerColor = 16844141; // 0x101056d

    field public static final int navigationContentDescription = 16843969; // 0x10104c1

    field public static final int navigationContentDescription = 16843969; // 0x10104c1

    field public static final int navigationIcon = 16843968; // 0x10104c0

    field public static final int navigationIcon = 16843968; // 0x10104c0

    field public static final int navigationMode = 16843471; // 0x10102cf

    field public static final int navigationMode = 16843471; // 0x10102cf
@@ -1524,6 +1525,7 @@ package android { 
    field public static final int windowHideAnimation = 16842935; // 0x10100b7

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

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

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

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

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

    field public static final int windowLightNavigationBar = 16844140; // 0x101056c

    field public static final int windowLightStatusBar = 16844000; // 0x10104e0

    field public static final int windowLightStatusBar = 16844000; // 0x10104e0

    field public static final int windowMinWidthMajor = 16843606; // 0x1010356

    field public static final int windowMinWidthMajor = 16843606; // 0x1010356

    field public static final int windowMinWidthMinor = 16843607; // 0x1010357

    field public static final int windowMinWidthMinor = 16843607; // 0x1010357

api/system-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -1049,6 +1049,7 @@ package android { 
    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int name = 16842755; // 0x1010003

    field public static final int name = 16842755; // 0x1010003

    field public static final int navigationBarColor = 16843858; // 0x1010452

    field public static final int navigationBarColor = 16843858; // 0x1010452

    field public static final int navigationBarDividerColor = 16844141; // 0x101056d

    field public static final int navigationContentDescription = 16843969; // 0x10104c1

    field public static final int navigationContentDescription = 16843969; // 0x10104c1

    field public static final int navigationIcon = 16843968; // 0x10104c0

    field public static final int navigationIcon = 16843968; // 0x10104c0

    field public static final int navigationMode = 16843471; // 0x10102cf

    field public static final int navigationMode = 16843471; // 0x10102cf
@@ -1660,6 +1661,7 @@ package android { 
    field public static final int windowHideAnimation = 16842935; // 0x10100b7

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

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

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

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

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

    field public static final int windowLightNavigationBar = 16844140; // 0x101056c

    field public static final int windowLightStatusBar = 16844000; // 0x10104e0

    field public static final int windowLightStatusBar = 16844000; // 0x10104e0

    field public static final int windowMinWidthMajor = 16843606; // 0x1010356

    field public static final int windowMinWidthMajor = 16843606; // 0x1010356

    field public static final int windowMinWidthMinor = 16843607; // 0x1010357

    field public static final int windowMinWidthMinor = 16843607; // 0x1010357

api/test-current.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -919,6 +919,7 @@ package android { 
    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int multiprocess = 16842771; // 0x1010013

    field public static final int name = 16842755; // 0x1010003

    field public static final int name = 16842755; // 0x1010003

    field public static final int navigationBarColor = 16843858; // 0x1010452

    field public static final int navigationBarColor = 16843858; // 0x1010452

    field public static final int navigationBarDividerColor = 16844141; // 0x101056d

    field public static final int navigationContentDescription = 16843969; // 0x10104c1

    field public static final int navigationContentDescription = 16843969; // 0x10104c1

    field public static final int navigationIcon = 16843968; // 0x10104c0

    field public static final int navigationIcon = 16843968; // 0x10104c0

    field public static final int navigationMode = 16843471; // 0x10102cf

    field public static final int navigationMode = 16843471; // 0x10102cf
@@ -1524,6 +1525,7 @@ package android { 
    field public static final int windowHideAnimation = 16842935; // 0x10100b7

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

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

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

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

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

    field public static final int windowLightNavigationBar = 16844140; // 0x101056c

    field public static final int windowLightStatusBar = 16844000; // 0x10104e0

    field public static final int windowLightStatusBar = 16844000; // 0x10104e0

    field public static final int windowMinWidthMajor = 16843606; // 0x1010356

    field public static final int windowMinWidthMajor = 16843606; // 0x1010356

    field public static final int windowMinWidthMinor = 16843607; // 0x1010357

    field public static final int windowMinWidthMinor = 16843607; // 0x1010357

core/res/res/values/attrs.xml

+4 −4
Original line number Original line Diff line number Diff line
@@ -2056,8 +2056,8 @@ 
             Corresponds to {@link android.view.Window#setNavigationBarColor(int)}. -->

             Corresponds to {@link android.view.Window#setNavigationBarColor(int)}. -->

        <attr name="navigationBarColor" format="color" />

        <attr name="navigationBarColor" format="color" />





        <!-- @hide

        <!-- Shows a thin line of the specified color between the navigation bar and the app

             Shows 1dp line of the specified color between the navigation bar and the app content.

             content.

             <p>For this to take effect, the window must be drawing the system bar backgrounds with

             <p>For this to take effect, the window must be drawing the system bar backgrounds with

             {@link android.R.attr#windowDrawsSystemBarBackgrounds} and the navigation bar must not

             {@link android.R.attr#windowDrawsSystemBarBackgrounds} and the navigation bar must not

             have been requested to be translucent with

             have been requested to be translucent with
@@ -2097,7 +2097,7 @@ 
             -->

             -->

        <attr name="windowSplashscreenContent" format="reference" />

        <attr name="windowSplashscreenContent" format="reference" />





        <!-- @hide If set, the navigation bar will be drawn such that it is

        <!-- If set, the navigation bar will be drawn such that it is

             compatible with a light navigation bar background.

             compatible with a light navigation bar background.

             <p>For this to take effect, the window must be drawing the system bar backgrounds with

             <p>For this to take effect, the window must be drawing the system bar backgrounds with

             {@link android.R.attr#windowDrawsSystemBarBackgrounds} and the navigation bar must not

             {@link android.R.attr#windowDrawsSystemBarBackgrounds} and the navigation bar must not

core/res/res/values/public.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -2846,6 +2846,8 @@ 
        <public name="showWhenLocked"/>

        <public name="showWhenLocked"/>

        <public name="turnScreenOn"/>

        <public name="turnScreenOn"/>

        <public name="classLoader" />

        <public name="classLoader" />

        <public name="windowLightNavigationBar" />

        <public name="navigationBarDividerColor" />

    </public-group>

    </public-group>





    <public-group type="style" first-id="0x010302e0">

    <public-group type="style" first-id="0x010302e0">