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

Commit ed0665f3 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Add API to request light navigation bar in theme"

parents 59c41b23 9b45ea85

api/current.txt

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

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

    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 navigationIcon = 16843968; // 0x10104c0

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

api/system-current.txt

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

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

    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 navigationIcon = 16843968; // 0x10104c0

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

api/test-current.txt

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

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

    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 navigationIcon = 16843968; // 0x10104c0

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

core/res/res/values/attrs.xml

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

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



        <!-- @hide

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

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

             content.

             <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

             have been requested to be translucent with

core/res/res/values/public.xml

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

        <public name="turnScreenOn"/>

        <public name="classLoader" />

        <public name="windowLightNavigationBar" />

        <public name="navigationBarDividerColor" />

    </public-group>



    <public-group type="style" first-id="0x010302e0">
@@ -2875,10 +2877,6 @@ 
         =============================================================== -->

    <eat-comment />



    <public-group type="attr" first-id="0x0101056c">

      <public name="windowLightNavigationBar" />

    </public-group>



  <!-- ===============================================================

       DO NOT ADD UN-GROUPED ITEMS HERE