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

Commit 487bcec2 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Make number picker styles public" into nyc-dev

parents cb6903de b9e6ad32

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -891,6 +891,7 @@ package android { 
    field public static final int notificationTimeout = 16843651; // 0x1010383

    field public static final int numColumns = 16843032; // 0x1010118

    field public static final int numStars = 16843076; // 0x1010144

    field public static final int numberPickerStyle = 16844071; // 0x1010527

    field public static final int numbersBackgroundColor = 16843938; // 0x10104a2

    field public static final int numbersInnerTextColor = 16844001; // 0x10104e1

    field public static final int numbersSelectorColor = 16843939; // 0x10104a3
@@ -2534,6 +2535,7 @@ package android { 
    field public static final int Widget_Material_Light_ListView = 16974513; // 0x10302b1

    field public static final int Widget_Material_Light_ListView_DropDown = 16974514; // 0x10302b2

    field public static final int Widget_Material_Light_MediaRouteButton = 16974515; // 0x10302b3

    field public static final int Widget_Material_Light_NumberPicker = 16974557; // 0x10302dd

    field public static final int Widget_Material_Light_PopupMenu = 16974516; // 0x10302b4

    field public static final int Widget_Material_Light_PopupMenu_Overflow = 16974517; // 0x10302b5

    field public static final int Widget_Material_Light_PopupWindow = 16974518; // 0x10302b6
@@ -2566,6 +2568,7 @@ package android { 
    field public static final int Widget_Material_ListView = 16974448; // 0x1030270

    field public static final int Widget_Material_ListView_DropDown = 16974449; // 0x1030271

    field public static final int Widget_Material_MediaRouteButton = 16974450; // 0x1030272

    field public static final int Widget_Material_NumberPicker = 16974556; // 0x10302dc

    field public static final int Widget_Material_PopupMenu = 16974451; // 0x1030273

    field public static final int Widget_Material_PopupMenu_Overflow = 16974452; // 0x1030274

    field public static final int Widget_Material_PopupWindow = 16974453; // 0x1030275

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -988,6 +988,7 @@ package android { 
    field public static final int notificationTimeout = 16843651; // 0x1010383

    field public static final int numColumns = 16843032; // 0x1010118

    field public static final int numStars = 16843076; // 0x1010144

    field public static final int numberPickerStyle = 16844071; // 0x1010527

    field public static final int numbersBackgroundColor = 16843938; // 0x10104a2

    field public static final int numbersInnerTextColor = 16844001; // 0x10104e1

    field public static final int numbersSelectorColor = 16843939; // 0x10104a3
@@ -2638,6 +2639,7 @@ package android { 
    field public static final int Widget_Material_Light_ListView = 16974513; // 0x10302b1

    field public static final int Widget_Material_Light_ListView_DropDown = 16974514; // 0x10302b2

    field public static final int Widget_Material_Light_MediaRouteButton = 16974515; // 0x10302b3

    field public static final int Widget_Material_Light_NumberPicker = 16974557; // 0x10302dd

    field public static final int Widget_Material_Light_PopupMenu = 16974516; // 0x10302b4

    field public static final int Widget_Material_Light_PopupMenu_Overflow = 16974517; // 0x10302b5

    field public static final int Widget_Material_Light_PopupWindow = 16974518; // 0x10302b6
@@ -2670,6 +2672,7 @@ package android { 
    field public static final int Widget_Material_ListView = 16974448; // 0x1030270

    field public static final int Widget_Material_ListView_DropDown = 16974449; // 0x1030271

    field public static final int Widget_Material_MediaRouteButton = 16974450; // 0x1030272

    field public static final int Widget_Material_NumberPicker = 16974556; // 0x10302dc

    field public static final int Widget_Material_PopupMenu = 16974451; // 0x1030273

    field public static final int Widget_Material_PopupMenu_Overflow = 16974452; // 0x1030274

    field public static final int Widget_Material_PopupWindow = 16974453; // 0x1030275

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -891,6 +891,7 @@ package android { 
    field public static final int notificationTimeout = 16843651; // 0x1010383

    field public static final int numColumns = 16843032; // 0x1010118

    field public static final int numStars = 16843076; // 0x1010144

    field public static final int numberPickerStyle = 16844071; // 0x1010527

    field public static final int numbersBackgroundColor = 16843938; // 0x10104a2

    field public static final int numbersInnerTextColor = 16844001; // 0x10104e1

    field public static final int numbersSelectorColor = 16843939; // 0x10104a3
@@ -2534,6 +2535,7 @@ package android { 
    field public static final int Widget_Material_Light_ListView = 16974513; // 0x10302b1

    field public static final int Widget_Material_Light_ListView_DropDown = 16974514; // 0x10302b2

    field public static final int Widget_Material_Light_MediaRouteButton = 16974515; // 0x10302b3

    field public static final int Widget_Material_Light_NumberPicker = 16974557; // 0x10302dd

    field public static final int Widget_Material_Light_PopupMenu = 16974516; // 0x10302b4

    field public static final int Widget_Material_Light_PopupMenu_Overflow = 16974517; // 0x10302b5

    field public static final int Widget_Material_Light_PopupWindow = 16974518; // 0x10302b6
@@ -2566,6 +2568,7 @@ package android { 
    field public static final int Widget_Material_ListView = 16974448; // 0x1030270

    field public static final int Widget_Material_ListView_DropDown = 16974449; // 0x1030271

    field public static final int Widget_Material_MediaRouteButton = 16974450; // 0x1030272

    field public static final int Widget_Material_NumberPicker = 16974556; // 0x10302dc

    field public static final int Widget_Material_PopupMenu = 16974451; // 0x1030273

    field public static final int Widget_Material_PopupMenu_Overflow = 16974452; // 0x1030274

    field public static final int Widget_Material_PopupWindow = 16974453; // 0x1030275

core/res/res/values/public.xml

+3 −0
Original line number Diff line number Diff line
@@ -2713,11 +2713,14 @@ 
    <public type="attr" name="forceHasOverlappingRendering" />

    <public type="attr" name="contentInsetStartWithNavigation" />

    <public type="attr" name="contentInsetEndWithActions" />

    <public type="attr" name="numberPickerStyle" />



    <public type="style" name="Theme.Material.Light.DialogWhenLarge.DarkActionBar" />

    <public type="style" name="Widget.Material.SeekBar.Discrete" />

    <public type="style" name="Widget.Material.CompoundButton.Switch" />

    <public type="style" name="Widget.Material.Light.CompoundButton.Switch" />

    <public type="style" name="Widget.Material.NumberPicker" />

    <public type="style" name="Widget.Material.Light.NumberPicker" />



    <public type="id" name="accessibilityActionSetProgress" />

    <public type="id" name="icon_frame" />