Merge "Make splitName public"

2017-01-24 20:44:16 +00:00
parent 5a5afca936 4d38df3cf2
commit ef6be9fbdb
4 changed files with 4 additions and 0 deletions
--- a/api/current.txt
+++ b/api/current.txt
@@ -1169,6 +1169,7 @@ package android {
    field public static final int spinnerStyle = 16842881; // 0x1010081
    field public static final int spinnersShown = 16843595; // 0x101034b
    field public static final int splitMotionEvents = 16843503; // 0x10102ef
+    field public static final int splitName = 16844107; // 0x101054b
    field public static final int splitTrack = 16843852; // 0x101044c
    field public static final int spotShadowAlpha = 16843967; // 0x10104bf
    field public static final int src = 16843033; // 0x1010119
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -1282,6 +1282,7 @@ package android {
    field public static final int spinnerStyle = 16842881; // 0x1010081
    field public static final int spinnersShown = 16843595; // 0x101034b
    field public static final int splitMotionEvents = 16843503; // 0x10102ef
+    field public static final int splitName = 16844107; // 0x101054b
    field public static final int splitTrack = 16843852; // 0x101044c
    field public static final int spotShadowAlpha = 16843967; // 0x10104bf
    field public static final int src = 16843033; // 0x1010119
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -1169,6 +1169,7 @@ package android {
    field public static final int spinnerStyle = 16842881; // 0x1010081
    field public static final int spinnersShown = 16843595; // 0x101034b
    field public static final int splitMotionEvents = 16843503; // 0x10102ef
+    field public static final int splitName = 16844107; // 0x101054b
    field public static final int splitTrack = 16843852; // 0x101044c
    field public static final int spotShadowAlpha = 16843967; // 0x10104bf
    field public static final int src = 16843033; // 0x1010119
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2787,6 +2787,7 @@
        <public name="supportsDismissingWindow" />
        <public name="restartOnConfigChanges" />
        <public name="certDigest" />
+        <public name="splitName" />
    </public-group>

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