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

Commit 22413d10 authored by Alan Viverette's avatar Alan Viverette Committed by android-build-merger
Browse files

Merge "Make Material switch style public" into nyc-dev 

am: 29e2d427

* commit '29e2d427':
  Make Material switch style public

Change-Id: I7672ee8123107fc68f6675b3db577f4cba7a9481
parents 0a7609b2 29e2d427

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2485,6 +2485,7 @@ package android { 
    field public static final int Widget_Material_CompoundButton_CheckBox = 16974435; // 0x1030263

    field public static final int Widget_Material_CompoundButton_RadioButton = 16974436; // 0x1030264

    field public static final int Widget_Material_CompoundButton_Star = 16974437; // 0x1030265

    field public static final int Widget_Material_CompoundButton_Switch = 16974554; // 0x10302da

    field public static final int Widget_Material_DatePicker = 16974438; // 0x1030266

    field public static final int Widget_Material_DropDownItem = 16974439; // 0x1030267

    field public static final int Widget_Material_DropDownItem_Spinner = 16974440; // 0x1030268
@@ -2519,6 +2520,7 @@ package android { 
    field public static final int Widget_Material_Light_CompoundButton_CheckBox = 16974500; // 0x10302a4

    field public static final int Widget_Material_Light_CompoundButton_RadioButton = 16974501; // 0x10302a5

    field public static final int Widget_Material_Light_CompoundButton_Star = 16974502; // 0x10302a6

    field public static final int Widget_Material_Light_CompoundButton_Switch = 16974555; // 0x10302db

    field public static final int Widget_Material_Light_DatePicker = 16974503; // 0x10302a7

    field public static final int Widget_Material_Light_DropDownItem = 16974504; // 0x10302a8

    field public static final int Widget_Material_Light_DropDownItem_Spinner = 16974505; // 0x10302a9

api/system-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2588,6 +2588,7 @@ package android { 
    field public static final int Widget_Material_CompoundButton_CheckBox = 16974435; // 0x1030263

    field public static final int Widget_Material_CompoundButton_RadioButton = 16974436; // 0x1030264

    field public static final int Widget_Material_CompoundButton_Star = 16974437; // 0x1030265

    field public static final int Widget_Material_CompoundButton_Switch = 16974554; // 0x10302da

    field public static final int Widget_Material_DatePicker = 16974438; // 0x1030266

    field public static final int Widget_Material_DropDownItem = 16974439; // 0x1030267

    field public static final int Widget_Material_DropDownItem_Spinner = 16974440; // 0x1030268
@@ -2622,6 +2623,7 @@ package android { 
    field public static final int Widget_Material_Light_CompoundButton_CheckBox = 16974500; // 0x10302a4

    field public static final int Widget_Material_Light_CompoundButton_RadioButton = 16974501; // 0x10302a5

    field public static final int Widget_Material_Light_CompoundButton_Star = 16974502; // 0x10302a6

    field public static final int Widget_Material_Light_CompoundButton_Switch = 16974555; // 0x10302db

    field public static final int Widget_Material_Light_DatePicker = 16974503; // 0x10302a7

    field public static final int Widget_Material_Light_DropDownItem = 16974504; // 0x10302a8

    field public static final int Widget_Material_Light_DropDownItem_Spinner = 16974505; // 0x10302a9

api/test-current.txt

+2 −0
Original line number Diff line number Diff line
@@ -2485,6 +2485,7 @@ package android { 
    field public static final int Widget_Material_CompoundButton_CheckBox = 16974435; // 0x1030263

    field public static final int Widget_Material_CompoundButton_RadioButton = 16974436; // 0x1030264

    field public static final int Widget_Material_CompoundButton_Star = 16974437; // 0x1030265

    field public static final int Widget_Material_CompoundButton_Switch = 16974554; // 0x10302da

    field public static final int Widget_Material_DatePicker = 16974438; // 0x1030266

    field public static final int Widget_Material_DropDownItem = 16974439; // 0x1030267

    field public static final int Widget_Material_DropDownItem_Spinner = 16974440; // 0x1030268
@@ -2519,6 +2520,7 @@ package android { 
    field public static final int Widget_Material_Light_CompoundButton_CheckBox = 16974500; // 0x10302a4

    field public static final int Widget_Material_Light_CompoundButton_RadioButton = 16974501; // 0x10302a5

    field public static final int Widget_Material_Light_CompoundButton_Star = 16974502; // 0x10302a6

    field public static final int Widget_Material_Light_CompoundButton_Switch = 16974555; // 0x10302db

    field public static final int Widget_Material_Light_DatePicker = 16974503; // 0x10302a7

    field public static final int Widget_Material_Light_DropDownItem = 16974504; // 0x10302a8

    field public static final int Widget_Material_Light_DropDownItem_Spinner = 16974505; // 0x10302a9

core/res/res/values/public.xml

+2 −0
Original line number Diff line number Diff line
@@ -2716,6 +2716,8 @@ 


    <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="id" name="accessibilityActionSetProgress" />

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