From 9b45ea85d668d67216503fb2f34fa50b8a812ced Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Tue, 26 Sep 2017 17:24:34 +0200
Subject: Add API to request light navigation bar in theme

Such that splash screens can already have a light navigation bar,
avoiding a janky flash.

This is the CL on master for this change, which only cleans up the
API.

Test: CtsSystemUiTestCases
Bug: 66986286
Bug: 63630024
Change-Id: I81b34fefeb336ac2269dc5e6b98cc0b6045cea70
---
 api/current.txt                | 1 +
 api/system-current.txt         | 1 +
 api/test-current.txt           | 1 +
 core/res/res/values/attrs.xml  | 6 +++---
 core/res/res/values/public.xml | 6 ++----
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/api/current.txt b/api/current.txt
index c6770898a903..2f22ba4c848d 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -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
diff --git a/api/system-current.txt b/api/system-current.txt
index bfd16612eb2b..7841bdf60b45 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -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
diff --git a/api/test-current.txt b/api/test-current.txt
index 2512e8e666b5..89e0d5b7bdb9 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -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
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 61b412396d63..11cdb76f2c1b 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -2056,11 +2056,11 @@
              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
+             have been requested to be translucent with
              {@link android.R.attr#windowTranslucentNavigation}. -->
         <attr name="navigationBarDividerColor" format="color" />
 
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 9b2f18511e83..e9d574afef8d 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -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
 
-- 
cgit v1.2.3-59-g8ed1b