Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 11e73661: Merge "Rename Spinner.Form to Spinner.Underlined, make Alert theme public" into lmp-dev

Browse Source 
* commit '11e73661d71e8616b502f800eca9a7985115e898':
  Rename Spinner.Form to Spinner.Underlined, make Alert theme public
This commit is contained in:
Alan Viverette
2014-08-27 19:57:54 +00:00
committed by Android Git Automerger
parent 2b0dcd43db 12c75ab730
commit 52315cf17f
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/current.txt
View File

@@ -2166,18 +2166,22 @@ package android {
field public static final int Theme_Material_Dialog = 16974386; // 0x1030232
field public static final int Theme_Material_DialogWhenLarge = 16974390; // 0x1030236
field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974391; // 0x1030237
field public static final int Theme_Material_Dialog_Alert = 16974570; // 0x10302ea
field public static final int Theme_Material_Dialog_MinWidth = 16974387; // 0x1030233
field public static final int Theme_Material_Dialog_NoActionBar = 16974388; // 0x1030234
field public static final int Theme_Material_Dialog_NoActionBar_MinWidth = 16974389; // 0x1030235
field public static final int Theme_Material_Dialog_Presentation = 16974571; // 0x10302eb
field public static final int Theme_Material_InputMethod = 16974392; // 0x1030238
field public static final int Theme_Material_Light = 16974402; // 0x1030242
field public static final int Theme_Material_Light_DarkActionBar = 16974403; // 0x1030243
field public static final int Theme_Material_Light_Dialog = 16974404; // 0x1030244
field public static final int Theme_Material_Light_DialogWhenLarge = 16974408; // 0x1030248
field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974409; // 0x1030249
field public static final int Theme_Material_Light_Dialog_Alert = 16974572; // 0x10302ec
field public static final int Theme_Material_Light_Dialog_MinWidth = 16974405; // 0x1030245
field public static final int Theme_Material_Light_Dialog_NoActionBar = 16974406; // 0x1030246
field public static final int Theme_Material_Light_Dialog_NoActionBar_MinWidth = 16974407; // 0x1030247
field public static final int Theme_Material_Light_Dialog_Presentation = 16974573; // 0x10302ed
field public static final int Theme_Material_Light_NoActionBar = 16974410; // 0x103024a
field public static final int Theme_Material_Light_NoActionBar_Fullscreen = 16974411; // 0x103024b
field public static final int Theme_Material_Light_NoActionBar_Overscan = 16974412; // 0x103024c
@@ -2566,7 +2570,7 @@ package android {
field public static final int Widget_Material_Light_SeekBar = 16974534; // 0x10302c6
field public static final int Widget_Material_Light_SegmentedButton = 16974535; // 0x10302c7
field public static final int Widget_Material_Light_Spinner = 16974537; // 0x10302c9
field public static final int Widget_Material_Light_Spinner_Form = 16974567; // 0x10302e7
field public static final int Widget_Material_Light_Spinner_Underlined = 16974567; // 0x10302e7
field public static final int Widget_Material_Light_StackView = 16974536; // 0x10302c8
field public static final int Widget_Material_Light_Tab = 16974538; // 0x10302ca
field public static final int Widget_Material_Light_TabWidget = 16974539; // 0x10302cb
@@ -2593,7 +2597,7 @@ package android {
field public static final int Widget_Material_SeekBar = 16974471; // 0x1030287
field public static final int Widget_Material_SegmentedButton = 16974472; // 0x1030288
field public static final int Widget_Material_Spinner = 16974474; // 0x103028a
field public static final int Widget_Material_Spinner_Form = 16974566; // 0x10302e6
field public static final int Widget_Material_Spinner_Underlined = 16974566; // 0x10302e6
field public static final int Widget_Material_StackView = 16974473; // 0x1030289
field public static final int Widget_Material_Tab = 16974475; // 0x103028b
field public static final int Widget_Material_TabWidget = 16974476; // 0x103028c

9
core/res/res/values/public.xml
View File

@@ -2535,12 +2535,17 @@
<public type="style" name="TextAppearance.StatusBar.Material.EventContent.Time" />
<public type="style" name="TextAppearance.StatusBar.Material.EventContent.Emphasis" />
<public type="style" name="Widget.Material.Spinner.Form" />
<public type="style" name="Widget.Material.Light.Spinner.Form" />
<public type="style" name="Widget.Material.Spinner.Underlined" />
<public type="style" name="Widget.Material.Light.Spinner.Underlined" />
<public type="style" name="TextAppearance.Material.Widget.Toolbar.Title" />
<public type="style" name="TextAppearance.Material.Widget.Toolbar.Subtitle" />
<public type="style" name="Theme.Material.Dialog.Alert" />
<public type="style" name="Theme.Material.Dialog.Presentation" />
<public type="style" name="Theme.Material.Light.Dialog.Alert" />
<public type="style" name="Theme.Material.Light.Dialog.Presentation" />
<public-padding type="string" name="l_resource_pad" end="0x01040030" />
<public type="string" name="config_webSettingsDefaultTextEncoding" />

6
core/res/res/values/styles_material.xml
View File

@@ -308,7 +308,7 @@ please see styles_device_defaults.xml.
<style name="TextAppearance.Material.Widget.TextView.PopupMenu" parent="TextAppearance.Material.Menu" />
<style name="TextAppearance.Material.Widget.TextView.SpinnerItem" />
<style name="TextAppearance.Material.Widget.DropDownItem">
<style name="TextAppearance.Material.Widget.DropDownItem" parent="TextAppearance.Material.Menu">
<item name="textColor">?attr/textColorPrimaryDisableOnly</item>
</style>
@@ -759,7 +759,7 @@ please see styles_device_defaults.xml.
<item name="overlapAnchor">true</item>
</style>
<style name="Widget.Material.Spinner.Form">
<style name="Widget.Material.Spinner.Underlined">
<item name="background">@drawable/spinner_textfield_background_material</item>
</style>
@@ -1022,7 +1022,7 @@ please see styles_device_defaults.xml.
<style name="Widget.Material.Light.Spinner" parent="Widget.Material.Spinner" />
<style name="Widget.Material.Light.Spinner.DropDown" parent="Widget.Material.Spinner.DropDown"/>
<style name="Widget.Material.Light.Spinner.DropDown.ActionBar" parent="Widget.Material.Spinner.DropDown.ActionBar"/>
<style name="Widget.Material.Light.Spinner.Form" parent="Widget.Material.Spinner.Form" />
<style name="Widget.Material.Light.Spinner.Underlined" parent="Widget.Material.Spinner.Underlined" />
<style name="Widget.Material.Light.TabWidget" parent="Widget.Material.TabWidget"/>
<style name="Widget.Material.Light.WebTextView" parent="Widget.Material.WebTextView"/>
<style name="Widget.Material.Light.WebView" parent="Widget.Material.WebView"/>