diff options
17 files changed, 316 insertions, 264 deletions
diff --git a/api/current.txt b/api/current.txt index 94be851c5388..59ee01a04ada 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1858,28 +1858,28 @@ package android { field public static final int TextAppearance_Large = 16973890; // 0x1030042 field public static final int TextAppearance_Large_Inverse = 16973891; // 0x1030043 field public static final int TextAppearance_Material = 16974350; // 0x103020e - field public static final int TextAppearance_Material_Body1 = 16974550; // 0x10302d6 - field public static final int TextAppearance_Material_Body2 = 16974549; // 0x10302d5 - field public static final int TextAppearance_Material_Button = 16974553; // 0x10302d9 - field public static final int TextAppearance_Material_Caption = 16974551; // 0x10302d7 + field public static final int TextAppearance_Material_Body1 = 16974552; // 0x10302d8 + field public static final int TextAppearance_Material_Body2 = 16974551; // 0x10302d7 + field public static final int TextAppearance_Material_Button = 16974555; // 0x10302db + field public static final int TextAppearance_Material_Caption = 16974553; // 0x10302d9 field public static final int TextAppearance_Material_DialogWindowTitle = 16974351; // 0x103020f - field public static final int TextAppearance_Material_Display1 = 16974545; // 0x10302d1 - field public static final int TextAppearance_Material_Display2 = 16974544; // 0x10302d0 - field public static final int TextAppearance_Material_Display3 = 16974543; // 0x10302cf - field public static final int TextAppearance_Material_Display4 = 16974542; // 0x10302ce - field public static final int TextAppearance_Material_Headline = 16974546; // 0x10302d2 + field public static final int TextAppearance_Material_Display1 = 16974547; // 0x10302d3 + field public static final int TextAppearance_Material_Display2 = 16974546; // 0x10302d2 + field public static final int TextAppearance_Material_Display3 = 16974545; // 0x10302d1 + field public static final int TextAppearance_Material_Display4 = 16974544; // 0x10302d0 + field public static final int TextAppearance_Material_Headline = 16974548; // 0x10302d4 field public static final int TextAppearance_Material_Inverse = 16974352; // 0x1030210 field public static final int TextAppearance_Material_Large = 16974353; // 0x1030211 field public static final int TextAppearance_Material_Large_Inverse = 16974354; // 0x1030212 field public static final int TextAppearance_Material_Medium = 16974355; // 0x1030213 field public static final int TextAppearance_Material_Medium_Inverse = 16974356; // 0x1030214 - field public static final int TextAppearance_Material_Menu = 16974552; // 0x10302d8 + field public static final int TextAppearance_Material_Menu = 16974554; // 0x10302da field public static final int TextAppearance_Material_SearchResult_Subtitle = 16974357; // 0x1030215 field public static final int TextAppearance_Material_SearchResult_Title = 16974358; // 0x1030216 field public static final int TextAppearance_Material_Small = 16974359; // 0x1030217 field public static final int TextAppearance_Material_Small_Inverse = 16974360; // 0x1030218 - field public static final int TextAppearance_Material_Subhead = 16974548; // 0x10302d4 - field public static final int TextAppearance_Material_Title = 16974547; // 0x10302d3 + field public static final int TextAppearance_Material_Subhead = 16974550; // 0x10302d6 + field public static final int TextAppearance_Material_Title = 16974549; // 0x10302d5 field public static final int TextAppearance_Material_Widget = 16974362; // 0x103021a field public static final int TextAppearance_Material_Widget_ActionBar_Menu = 16974363; // 0x103021b field public static final int TextAppearance_Material_Widget_ActionBar_Subtitle = 16974364; // 0x103021c @@ -1928,12 +1928,12 @@ package android { field public static final int TextAppearance_Widget_TextView_SpinnerItem = 16973906; // 0x1030052 field public static final int TextAppearance_WindowTitle = 16973907; // 0x1030053 field public static final int Theme = 16973829; // 0x1030005 - field public static final int ThemeOverlay = 16974414; // 0x103024e - field public static final int ThemeOverlay_Material = 16974415; // 0x103024f - field public static final int ThemeOverlay_Material_ActionBar = 16974416; // 0x1030250 - field public static final int ThemeOverlay_Material_Dark = 16974418; // 0x1030252 - field public static final int ThemeOverlay_Material_Dark_ActionBar = 16974419; // 0x1030253 - field public static final int ThemeOverlay_Material_Light = 16974417; // 0x1030251 + field public static final int ThemeOverlay = 16974416; // 0x1030250 + field public static final int ThemeOverlay_Material = 16974417; // 0x1030251 + field public static final int ThemeOverlay_Material_ActionBar = 16974418; // 0x1030252 + field public static final int ThemeOverlay_Material_Dark = 16974420; // 0x1030254 + field public static final int ThemeOverlay_Material_Dark_ActionBar = 16974421; // 0x1030255 + field public static final int ThemeOverlay_Material_Light = 16974419; // 0x1030253 field public static final int Theme_Black = 16973832; // 0x1030008 field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009 field public static final int Theme_Black_NoTitleBar_Fullscreen = 16973834; // 0x103000a @@ -1963,6 +1963,7 @@ package android { field public static final int Theme_DeviceDefault_NoActionBar_Overscan = 16974303; // 0x10301df field public static final int Theme_DeviceDefault_NoActionBar_TranslucentDecor = 16974307; // 0x10301e3 field public static final int Theme_DeviceDefault_Panel = 16974138; // 0x103013a + field public static final int Theme_DeviceDefault_Settings = 16974384; // 0x1030230 field public static final int Theme_DeviceDefault_Wallpaper = 16974140; // 0x103013c field public static final int Theme_DeviceDefault_Wallpaper_NoTitleBar = 16974141; // 0x103013d field public static final int Theme_Dialog = 16973835; // 0x103000b @@ -2000,36 +2001,37 @@ package android { field public static final int Theme_Light_NoTitleBar_Fullscreen = 16973838; // 0x103000e field public static final int Theme_Light_Panel = 16973914; // 0x103005a field public static final int Theme_Light_WallpaperSettings = 16973922; // 0x1030062 - field public static final int Theme_Material = 16974384; // 0x1030230 - field public static final int Theme_Material_Dialog = 16974385; // 0x1030231 - field public static final int Theme_Material_DialogWhenLarge = 16974389; // 0x1030235 - field public static final int Theme_Material_DialogWhenLarge_NoActionBar = 16974390; // 0x1030236 - field public static final int Theme_Material_Dialog_MinWidth = 16974386; // 0x1030232 - field public static final int Theme_Material_Dialog_NoActionBar = 16974387; // 0x1030233 - field public static final int Theme_Material_Dialog_NoActionBar_MinWidth = 16974388; // 0x1030234 - field public static final int Theme_Material_InputMethod = 16974391; // 0x1030237 - field public static final int Theme_Material_Light = 16974400; // 0x1030240 - field public static final int Theme_Material_Light_DarkActionBar = 16974401; // 0x1030241 - field public static final int Theme_Material_Light_Dialog = 16974402; // 0x1030242 - field public static final int Theme_Material_Light_DialogWhenLarge = 16974406; // 0x1030246 - field public static final int Theme_Material_Light_DialogWhenLarge_NoActionBar = 16974407; // 0x1030247 - field public static final int Theme_Material_Light_Dialog_MinWidth = 16974403; // 0x1030243 - field public static final int Theme_Material_Light_Dialog_NoActionBar = 16974404; // 0x1030244 - field public static final int Theme_Material_Light_Dialog_NoActionBar_MinWidth = 16974405; // 0x1030245 - field public static final int Theme_Material_Light_NoActionBar = 16974408; // 0x1030248 - field public static final int Theme_Material_Light_NoActionBar_Fullscreen = 16974409; // 0x1030249 - field public static final int Theme_Material_Light_NoActionBar_Overscan = 16974410; // 0x103024a - field public static final int Theme_Material_Light_NoActionBar_TranslucentDecor = 16974411; // 0x103024b - field public static final int Theme_Material_Light_Panel = 16974412; // 0x103024c - field public static final int Theme_Material_Light_Voice = 16974413; // 0x103024d - field public static final int Theme_Material_NoActionBar = 16974392; // 0x1030238 - field public static final int Theme_Material_NoActionBar_Fullscreen = 16974393; // 0x1030239 - field public static final int Theme_Material_NoActionBar_Overscan = 16974394; // 0x103023a - field public static final int Theme_Material_NoActionBar_TranslucentDecor = 16974395; // 0x103023b - field public static final int Theme_Material_Panel = 16974396; // 0x103023c - field public static final int Theme_Material_Voice = 16974397; // 0x103023d - field public static final int Theme_Material_Wallpaper = 16974398; // 0x103023e - field public static final int Theme_Material_Wallpaper_NoTitleBar = 16974399; // 0x103023f + field public static final int Theme_Material = 16974385; // 0x1030231 + 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_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_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_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_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 + field public static final int Theme_Material_Light_NoActionBar_TranslucentDecor = 16974413; // 0x103024d + field public static final int Theme_Material_Light_Panel = 16974414; // 0x103024e + field public static final int Theme_Material_Light_Voice = 16974415; // 0x103024f + field public static final int Theme_Material_NoActionBar = 16974393; // 0x1030239 + field public static final int Theme_Material_NoActionBar_Fullscreen = 16974394; // 0x103023a + field public static final int Theme_Material_NoActionBar_Overscan = 16974395; // 0x103023b + field public static final int Theme_Material_NoActionBar_TranslucentDecor = 16974396; // 0x103023c + field public static final int Theme_Material_Panel = 16974397; // 0x103023d + field public static final int Theme_Material_Settings = 16974398; // 0x103023e + field public static final int Theme_Material_Voice = 16974399; // 0x103023f + field public static final int Theme_Material_Wallpaper = 16974400; // 0x1030240 + field public static final int Theme_Material_Wallpaper_NoTitleBar = 16974401; // 0x1030241 field public static final int Theme_NoDisplay = 16973909; // 0x1030055 field public static final int Theme_NoTitleBar = 16973830; // 0x1030006 field public static final int Theme_NoTitleBar_Fullscreen = 16973831; // 0x1030007 @@ -2314,128 +2316,128 @@ package android { field public static final int Widget_ListView_DropDown = 16973872; // 0x1030030 field public static final int Widget_ListView_Menu = 16973873; // 0x1030031 field public static final int Widget_ListView_White = 16973871; // 0x103002f - field public static final int Widget_Material = 16974420; // 0x1030254 - field public static final int Widget_Material_ActionBar = 16974421; // 0x1030255 - field public static final int Widget_Material_ActionBar_Solid = 16974422; // 0x1030256 - field public static final int Widget_Material_ActionBar_TabBar = 16974423; // 0x1030257 - field public static final int Widget_Material_ActionBar_TabText = 16974424; // 0x1030258 - field public static final int Widget_Material_ActionBar_TabView = 16974425; // 0x1030259 - field public static final int Widget_Material_ActionButton = 16974426; // 0x103025a - field public static final int Widget_Material_ActionButton_CloseMode = 16974427; // 0x103025b - field public static final int Widget_Material_ActionButton_Overflow = 16974428; // 0x103025c - field public static final int Widget_Material_ActionMode = 16974429; // 0x103025d - field public static final int Widget_Material_AutoCompleteTextView = 16974430; // 0x103025e - field public static final int Widget_Material_Button = 16974431; // 0x103025f - field public static final int Widget_Material_ButtonBar = 16974437; // 0x1030265 - field public static final int Widget_Material_ButtonBar_AlertDialog = 16974438; // 0x1030266 - field public static final int Widget_Material_Button_Borderless = 16974432; // 0x1030260 - field public static final int Widget_Material_Button_Borderless_Small = 16974433; // 0x1030261 - field public static final int Widget_Material_Button_Inset = 16974434; // 0x1030262 - field public static final int Widget_Material_Button_Small = 16974435; // 0x1030263 - field public static final int Widget_Material_Button_Toggle = 16974436; // 0x1030264 - field public static final int Widget_Material_CalendarView = 16974439; // 0x1030267 - field public static final int Widget_Material_CheckedTextView = 16974440; // 0x1030268 - field public static final int Widget_Material_CompoundButton_CheckBox = 16974441; // 0x1030269 - field public static final int Widget_Material_CompoundButton_RadioButton = 16974442; // 0x103026a - field public static final int Widget_Material_CompoundButton_Star = 16974443; // 0x103026b - field public static final int Widget_Material_DatePicker = 16974444; // 0x103026c - field public static final int Widget_Material_DropDownItem = 16974445; // 0x103026d - field public static final int Widget_Material_DropDownItem_Spinner = 16974446; // 0x103026e - field public static final int Widget_Material_EditText = 16974447; // 0x103026f - field public static final int Widget_Material_ExpandableListView = 16974448; // 0x1030270 - field public static final int Widget_Material_FastScroll = 16974449; // 0x1030271 - field public static final int Widget_Material_GridView = 16974450; // 0x1030272 - field public static final int Widget_Material_HorizontalScrollView = 16974451; // 0x1030273 - field public static final int Widget_Material_ImageButton = 16974452; // 0x1030274 - field public static final int Widget_Material_Light = 16974481; // 0x1030291 - field public static final int Widget_Material_Light_ActionBar = 16974482; // 0x1030292 - field public static final int Widget_Material_Light_ActionBar_Solid = 16974483; // 0x1030293 - field public static final int Widget_Material_Light_ActionBar_TabBar = 16974484; // 0x1030294 - field public static final int Widget_Material_Light_ActionBar_TabText = 16974485; // 0x1030295 - field public static final int Widget_Material_Light_ActionBar_TabView = 16974486; // 0x1030296 - field public static final int Widget_Material_Light_ActionButton = 16974487; // 0x1030297 - field public static final int Widget_Material_Light_ActionButton_CloseMode = 16974488; // 0x1030298 - field public static final int Widget_Material_Light_ActionButton_Overflow = 16974489; // 0x1030299 - field public static final int Widget_Material_Light_ActionMode = 16974490; // 0x103029a - field public static final int Widget_Material_Light_AutoCompleteTextView = 16974491; // 0x103029b - field public static final int Widget_Material_Light_Button = 16974492; // 0x103029c - field public static final int Widget_Material_Light_ButtonBar = 16974498; // 0x10302a2 - field public static final int Widget_Material_Light_ButtonBar_AlertDialog = 16974499; // 0x10302a3 - field public static final int Widget_Material_Light_Button_Borderless = 16974493; // 0x103029d - field public static final int Widget_Material_Light_Button_Borderless_Small = 16974494; // 0x103029e - field public static final int Widget_Material_Light_Button_Inset = 16974495; // 0x103029f - field public static final int Widget_Material_Light_Button_Small = 16974496; // 0x10302a0 - field public static final int Widget_Material_Light_Button_Toggle = 16974497; // 0x10302a1 - field public static final int Widget_Material_Light_CalendarView = 16974500; // 0x10302a4 - field public static final int Widget_Material_Light_CheckedTextView = 16974501; // 0x10302a5 - field public static final int Widget_Material_Light_CompoundButton_CheckBox = 16974502; // 0x10302a6 - field public static final int Widget_Material_Light_CompoundButton_RadioButton = 16974503; // 0x10302a7 - field public static final int Widget_Material_Light_CompoundButton_Star = 16974504; // 0x10302a8 - field public static final int Widget_Material_Light_DropDownItem = 16974505; // 0x10302a9 - field public static final int Widget_Material_Light_DropDownItem_Spinner = 16974506; // 0x10302aa - field public static final int Widget_Material_Light_EditText = 16974507; // 0x10302ab - field public static final int Widget_Material_Light_ExpandableListView = 16974508; // 0x10302ac - field public static final int Widget_Material_Light_FastScroll = 16974509; // 0x10302ad - field public static final int Widget_Material_Light_GridView = 16974510; // 0x10302ae - field public static final int Widget_Material_Light_HorizontalScrollView = 16974511; // 0x10302af - field public static final int Widget_Material_Light_ImageButton = 16974512; // 0x10302b0 - field public static final int Widget_Material_Light_ListPopupWindow = 16974513; // 0x10302b1 - field public static final int Widget_Material_Light_ListView = 16974514; // 0x10302b2 - field public static final int Widget_Material_Light_ListView_DropDown = 16974515; // 0x10302b3 - field public static final int Widget_Material_Light_MediaRouteButton = 16974516; // 0x10302b4 - field public static final int Widget_Material_Light_PopupMenu = 16974517; // 0x10302b5 - field public static final int Widget_Material_Light_PopupMenu_Overflow = 16974518; // 0x10302b6 - field public static final int Widget_Material_Light_PopupWindow = 16974519; // 0x10302b7 - field public static final int Widget_Material_Light_ProgressBar = 16974520; // 0x10302b8 - field public static final int Widget_Material_Light_ProgressBar_Horizontal = 16974521; // 0x10302b9 - field public static final int Widget_Material_Light_ProgressBar_Inverse = 16974522; // 0x10302ba - field public static final int Widget_Material_Light_ProgressBar_Large = 16974523; // 0x10302bb - field public static final int Widget_Material_Light_ProgressBar_Large_Inverse = 16974524; // 0x10302bc - field public static final int Widget_Material_Light_ProgressBar_Small = 16974525; // 0x10302bd - field public static final int Widget_Material_Light_ProgressBar_Small_Inverse = 16974526; // 0x10302be - field public static final int Widget_Material_Light_ProgressBar_Small_Title = 16974527; // 0x10302bf - field public static final int Widget_Material_Light_RatingBar = 16974528; // 0x10302c0 - field public static final int Widget_Material_Light_RatingBar_Indicator = 16974529; // 0x10302c1 - field public static final int Widget_Material_Light_RatingBar_Small = 16974530; // 0x10302c2 - field public static final int Widget_Material_Light_ScrollView = 16974531; // 0x10302c3 - field public static final int Widget_Material_Light_SeekBar = 16974532; // 0x10302c4 - field public static final int Widget_Material_Light_SegmentedButton = 16974533; // 0x10302c5 - field public static final int Widget_Material_Light_Spinner = 16974535; // 0x10302c7 - field public static final int Widget_Material_Light_StackView = 16974534; // 0x10302c6 - field public static final int Widget_Material_Light_Tab = 16974536; // 0x10302c8 - field public static final int Widget_Material_Light_TabWidget = 16974537; // 0x10302c9 - field public static final int Widget_Material_Light_TextView = 16974538; // 0x10302ca - field public static final int Widget_Material_Light_TextView_SpinnerItem = 16974539; // 0x10302cb - field public static final int Widget_Material_Light_WebTextView = 16974540; // 0x10302cc - field public static final int Widget_Material_Light_WebView = 16974541; // 0x10302cd - field public static final int Widget_Material_ListPopupWindow = 16974453; // 0x1030275 - field public static final int Widget_Material_ListView = 16974454; // 0x1030276 - field public static final int Widget_Material_ListView_DropDown = 16974455; // 0x1030277 - field public static final int Widget_Material_MediaRouteButton = 16974456; // 0x1030278 - field public static final int Widget_Material_PopupMenu = 16974457; // 0x1030279 - field public static final int Widget_Material_PopupMenu_Overflow = 16974458; // 0x103027a - field public static final int Widget_Material_PopupWindow = 16974459; // 0x103027b - field public static final int Widget_Material_ProgressBar = 16974460; // 0x103027c - field public static final int Widget_Material_ProgressBar_Horizontal = 16974461; // 0x103027d - field public static final int Widget_Material_ProgressBar_Large = 16974462; // 0x103027e - field public static final int Widget_Material_ProgressBar_Small = 16974463; // 0x103027f - field public static final int Widget_Material_ProgressBar_Small_Title = 16974464; // 0x1030280 - field public static final int Widget_Material_RatingBar = 16974465; // 0x1030281 - field public static final int Widget_Material_RatingBar_Indicator = 16974466; // 0x1030282 - field public static final int Widget_Material_RatingBar_Small = 16974467; // 0x1030283 - field public static final int Widget_Material_ScrollView = 16974468; // 0x1030284 - field public static final int Widget_Material_SeekBar = 16974469; // 0x1030285 - field public static final int Widget_Material_SegmentedButton = 16974470; // 0x1030286 - field public static final int Widget_Material_Spinner = 16974472; // 0x1030288 - field public static final int Widget_Material_StackView = 16974471; // 0x1030287 - field public static final int Widget_Material_Tab = 16974473; // 0x1030289 - field public static final int Widget_Material_TabWidget = 16974474; // 0x103028a - field public static final int Widget_Material_TextView = 16974475; // 0x103028b - field public static final int Widget_Material_TextView_SpinnerItem = 16974476; // 0x103028c - field public static final int Widget_Material_Toolbar = 16974477; // 0x103028d - field public static final int Widget_Material_Toolbar_Button_Navigation = 16974478; // 0x103028e - field public static final int Widget_Material_WebTextView = 16974479; // 0x103028f - field public static final int Widget_Material_WebView = 16974480; // 0x1030290 + field public static final int Widget_Material = 16974422; // 0x1030256 + field public static final int Widget_Material_ActionBar = 16974423; // 0x1030257 + field public static final int Widget_Material_ActionBar_Solid = 16974424; // 0x1030258 + field public static final int Widget_Material_ActionBar_TabBar = 16974425; // 0x1030259 + field public static final int Widget_Material_ActionBar_TabText = 16974426; // 0x103025a + field public static final int Widget_Material_ActionBar_TabView = 16974427; // 0x103025b + field public static final int Widget_Material_ActionButton = 16974428; // 0x103025c + field public static final int Widget_Material_ActionButton_CloseMode = 16974429; // 0x103025d + field public static final int Widget_Material_ActionButton_Overflow = 16974430; // 0x103025e + field public static final int Widget_Material_ActionMode = 16974431; // 0x103025f + field public static final int Widget_Material_AutoCompleteTextView = 16974432; // 0x1030260 + field public static final int Widget_Material_Button = 16974433; // 0x1030261 + field public static final int Widget_Material_ButtonBar = 16974439; // 0x1030267 + field public static final int Widget_Material_ButtonBar_AlertDialog = 16974440; // 0x1030268 + field public static final int Widget_Material_Button_Borderless = 16974434; // 0x1030262 + field public static final int Widget_Material_Button_Borderless_Small = 16974435; // 0x1030263 + field public static final int Widget_Material_Button_Inset = 16974436; // 0x1030264 + field public static final int Widget_Material_Button_Small = 16974437; // 0x1030265 + field public static final int Widget_Material_Button_Toggle = 16974438; // 0x1030266 + field public static final int Widget_Material_CalendarView = 16974441; // 0x1030269 + field public static final int Widget_Material_CheckedTextView = 16974442; // 0x103026a + field public static final int Widget_Material_CompoundButton_CheckBox = 16974443; // 0x103026b + field public static final int Widget_Material_CompoundButton_RadioButton = 16974444; // 0x103026c + field public static final int Widget_Material_CompoundButton_Star = 16974445; // 0x103026d + field public static final int Widget_Material_DatePicker = 16974446; // 0x103026e + field public static final int Widget_Material_DropDownItem = 16974447; // 0x103026f + field public static final int Widget_Material_DropDownItem_Spinner = 16974448; // 0x1030270 + field public static final int Widget_Material_EditText = 16974449; // 0x1030271 + field public static final int Widget_Material_ExpandableListView = 16974450; // 0x1030272 + field public static final int Widget_Material_FastScroll = 16974451; // 0x1030273 + field public static final int Widget_Material_GridView = 16974452; // 0x1030274 + field public static final int Widget_Material_HorizontalScrollView = 16974453; // 0x1030275 + field public static final int Widget_Material_ImageButton = 16974454; // 0x1030276 + field public static final int Widget_Material_Light = 16974483; // 0x1030293 + field public static final int Widget_Material_Light_ActionBar = 16974484; // 0x1030294 + field public static final int Widget_Material_Light_ActionBar_Solid = 16974485; // 0x1030295 + field public static final int Widget_Material_Light_ActionBar_TabBar = 16974486; // 0x1030296 + field public static final int Widget_Material_Light_ActionBar_TabText = 16974487; // 0x1030297 + field public static final int Widget_Material_Light_ActionBar_TabView = 16974488; // 0x1030298 + field public static final int Widget_Material_Light_ActionButton = 16974489; // 0x1030299 + field public static final int Widget_Material_Light_ActionButton_CloseMode = 16974490; // 0x103029a + field public static final int Widget_Material_Light_ActionButton_Overflow = 16974491; // 0x103029b + field public static final int Widget_Material_Light_ActionMode = 16974492; // 0x103029c + field public static final int Widget_Material_Light_AutoCompleteTextView = 16974493; // 0x103029d + field public static final int Widget_Material_Light_Button = 16974494; // 0x103029e + field public static final int Widget_Material_Light_ButtonBar = 16974500; // 0x10302a4 + field public static final int Widget_Material_Light_ButtonBar_AlertDialog = 16974501; // 0x10302a5 + field public static final int Widget_Material_Light_Button_Borderless = 16974495; // 0x103029f + field public static final int Widget_Material_Light_Button_Borderless_Small = 16974496; // 0x10302a0 + field public static final int Widget_Material_Light_Button_Inset = 16974497; // 0x10302a1 + field public static final int Widget_Material_Light_Button_Small = 16974498; // 0x10302a2 + field public static final int Widget_Material_Light_Button_Toggle = 16974499; // 0x10302a3 + field public static final int Widget_Material_Light_CalendarView = 16974502; // 0x10302a6 + field public static final int Widget_Material_Light_CheckedTextView = 16974503; // 0x10302a7 + field public static final int Widget_Material_Light_CompoundButton_CheckBox = 16974504; // 0x10302a8 + field public static final int Widget_Material_Light_CompoundButton_RadioButton = 16974505; // 0x10302a9 + field public static final int Widget_Material_Light_CompoundButton_Star = 16974506; // 0x10302aa + field public static final int Widget_Material_Light_DropDownItem = 16974507; // 0x10302ab + field public static final int Widget_Material_Light_DropDownItem_Spinner = 16974508; // 0x10302ac + field public static final int Widget_Material_Light_EditText = 16974509; // 0x10302ad + field public static final int Widget_Material_Light_ExpandableListView = 16974510; // 0x10302ae + field public static final int Widget_Material_Light_FastScroll = 16974511; // 0x10302af + field public static final int Widget_Material_Light_GridView = 16974512; // 0x10302b0 + field public static final int Widget_Material_Light_HorizontalScrollView = 16974513; // 0x10302b1 + field public static final int Widget_Material_Light_ImageButton = 16974514; // 0x10302b2 + field public static final int Widget_Material_Light_ListPopupWindow = 16974515; // 0x10302b3 + field public static final int Widget_Material_Light_ListView = 16974516; // 0x10302b4 + field public static final int Widget_Material_Light_ListView_DropDown = 16974517; // 0x10302b5 + field public static final int Widget_Material_Light_MediaRouteButton = 16974518; // 0x10302b6 + field public static final int Widget_Material_Light_PopupMenu = 16974519; // 0x10302b7 + field public static final int Widget_Material_Light_PopupMenu_Overflow = 16974520; // 0x10302b8 + field public static final int Widget_Material_Light_PopupWindow = 16974521; // 0x10302b9 + field public static final int Widget_Material_Light_ProgressBar = 16974522; // 0x10302ba + field public static final int Widget_Material_Light_ProgressBar_Horizontal = 16974523; // 0x10302bb + field public static final int Widget_Material_Light_ProgressBar_Inverse = 16974524; // 0x10302bc + field public static final int Widget_Material_Light_ProgressBar_Large = 16974525; // 0x10302bd + field public static final int Widget_Material_Light_ProgressBar_Large_Inverse = 16974526; // 0x10302be + field public static final int Widget_Material_Light_ProgressBar_Small = 16974527; // 0x10302bf + field public static final int Widget_Material_Light_ProgressBar_Small_Inverse = 16974528; // 0x10302c0 + field public static final int Widget_Material_Light_ProgressBar_Small_Title = 16974529; // 0x10302c1 + field public static final int Widget_Material_Light_RatingBar = 16974530; // 0x10302c2 + field public static final int Widget_Material_Light_RatingBar_Indicator = 16974531; // 0x10302c3 + field public static final int Widget_Material_Light_RatingBar_Small = 16974532; // 0x10302c4 + field public static final int Widget_Material_Light_ScrollView = 16974533; // 0x10302c5 + 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_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 + field public static final int Widget_Material_Light_TextView = 16974540; // 0x10302cc + field public static final int Widget_Material_Light_TextView_SpinnerItem = 16974541; // 0x10302cd + field public static final int Widget_Material_Light_WebTextView = 16974542; // 0x10302ce + field public static final int Widget_Material_Light_WebView = 16974543; // 0x10302cf + field public static final int Widget_Material_ListPopupWindow = 16974455; // 0x1030277 + field public static final int Widget_Material_ListView = 16974456; // 0x1030278 + field public static final int Widget_Material_ListView_DropDown = 16974457; // 0x1030279 + field public static final int Widget_Material_MediaRouteButton = 16974458; // 0x103027a + field public static final int Widget_Material_PopupMenu = 16974459; // 0x103027b + field public static final int Widget_Material_PopupMenu_Overflow = 16974460; // 0x103027c + field public static final int Widget_Material_PopupWindow = 16974461; // 0x103027d + field public static final int Widget_Material_ProgressBar = 16974462; // 0x103027e + field public static final int Widget_Material_ProgressBar_Horizontal = 16974463; // 0x103027f + field public static final int Widget_Material_ProgressBar_Large = 16974464; // 0x1030280 + field public static final int Widget_Material_ProgressBar_Small = 16974465; // 0x1030281 + field public static final int Widget_Material_ProgressBar_Small_Title = 16974466; // 0x1030282 + field public static final int Widget_Material_RatingBar = 16974467; // 0x1030283 + field public static final int Widget_Material_RatingBar_Indicator = 16974468; // 0x1030284 + field public static final int Widget_Material_RatingBar_Small = 16974469; // 0x1030285 + field public static final int Widget_Material_ScrollView = 16974470; // 0x1030286 + 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_StackView = 16974473; // 0x1030289 + field public static final int Widget_Material_Tab = 16974475; // 0x103028b + field public static final int Widget_Material_TabWidget = 16974476; // 0x103028c + field public static final int Widget_Material_TextView = 16974477; // 0x103028d + field public static final int Widget_Material_TextView_SpinnerItem = 16974478; // 0x103028e + field public static final int Widget_Material_Toolbar = 16974479; // 0x103028f + field public static final int Widget_Material_Toolbar_Button_Navigation = 16974480; // 0x1030290 + field public static final int Widget_Material_WebTextView = 16974481; // 0x1030291 + field public static final int Widget_Material_WebView = 16974482; // 0x1030292 field public static final int Widget_PopupMenu = 16973958; // 0x1030086 field public static final int Widget_PopupWindow = 16973878; // 0x1030036 field public static final int Widget_ProgressBar = 16973852; // 0x103001c diff --git a/core/res/res/drawable-hdpi/dialog_background_mtrl_mult.9.png b/core/res/res/drawable-hdpi/dialog_background_mtrl_mult.9.png Binary files differnew file mode 100644 index 000000000000..0c3c3b475e91 --- /dev/null +++ b/core/res/res/drawable-hdpi/dialog_background_mtrl_mult.9.png diff --git a/core/res/res/drawable-mdpi/dialog_background_mtrl_mult.9.png b/core/res/res/drawable-mdpi/dialog_background_mtrl_mult.9.png Binary files differnew file mode 100644 index 000000000000..8322ae3a6289 --- /dev/null +++ b/core/res/res/drawable-mdpi/dialog_background_mtrl_mult.9.png diff --git a/core/res/res/drawable-xhdpi/dialog_background_mtrl_mult.9.png b/core/res/res/drawable-xhdpi/dialog_background_mtrl_mult.9.png Binary files differnew file mode 100644 index 000000000000..e6c0047d6217 --- /dev/null +++ b/core/res/res/drawable-xhdpi/dialog_background_mtrl_mult.9.png diff --git a/core/res/res/drawable-xxhdpi/dialog_background_mtrl_mult.9.png b/core/res/res/drawable-xxhdpi/dialog_background_mtrl_mult.9.png Binary files differnew file mode 100644 index 000000000000..bb9debbd7a4a --- /dev/null +++ b/core/res/res/drawable-xxhdpi/dialog_background_mtrl_mult.9.png diff --git a/core/res/res/drawable/dialog_background_shadow_material.xml b/core/res/res/drawable/dialog_background_shadow_material.xml new file mode 100644 index 000000000000..05549204de81 --- /dev/null +++ b/core/res/res/drawable/dialog_background_shadow_material.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<nine-patch xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/dialog_background_mtrl_mult" + android:tint="?attr/colorBackground" + android:tintMode="multiply" /> diff --git a/core/res/res/layout/dialog_custom_title_material.xml b/core/res/res/layout/dialog_custom_title_material.xml index 1bb93eb61f39..550b72e8a167 100644 --- a/core/res/res/layout/dialog_custom_title_material.xml +++ b/core/res/res/layout/dialog_custom_title_material.xml @@ -23,6 +23,7 @@ This is a custom layout for a dialog. android:fitsSystemWindows="true"> <FrameLayout android:id="@android:id/title_container" android:layout_width="match_parent" + android:layout_height="?android:attr/windowTitleSize" android:layout_weight="0" android:gravity="center_vertical|start" style="?android:attr/windowTitleBackgroundStyle" /> diff --git a/core/res/res/layout/dialog_title_material.xml b/core/res/res/layout/dialog_title_material.xml index b92c1e701726..918c8f1c18c4 100644 --- a/core/res/res/layout/dialog_title_material.xml +++ b/core/res/res/layout/dialog_title_material.xml @@ -22,7 +22,7 @@ enabled. <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:fitsSystemWindows="true"> - <TextView android:id="@+id/alertTitle" + <TextView android:id="@+id/title" style="?android:attr/windowTitleStyle" android:singleLine="true" android:ellipsize="end" diff --git a/core/res/res/values-large/themes.xml b/core/res/res/values-large/themes.xml deleted file mode 100644 index 8c8f86c906a8..000000000000 --- a/core/res/res/values-large/themes.xml +++ /dev/null @@ -1,64 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** Copyright 2010, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<!-- -=============================================================== - PLEASE READ -=============================================================== - -The Holo themes must not be modified in order to pass CTS. -Many related themes and styles depend on other values defined in this file. -If you would like to provide custom themes and styles for your device, -please see themes_device_defaults.xml. - -=============================================================== - PLEASE READ -=============================================================== - --> -<resources> - <style name="Theme.Holo.DialogWhenLarge" - parent="@android:style/Theme.Holo.Dialog.FixedSize"> - <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item> - </style> - <style name="Theme.Holo.DialogWhenLarge.NoActionBar" - parent="@android:style/Theme.Holo.Dialog.NoActionBar.FixedSize"> - <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item> - </style> - <style name="Theme.Holo.Light.DialogWhenLarge" - parent="@android:style/Theme.Holo.Light.Dialog.FixedSize"> - </style> - <style name="Theme.Holo.Light.DialogWhenLarge.NoActionBar" - parent="@android:style/Theme.Holo.Light.Dialog.NoActionBar.FixedSize"> - </style> - - <style name="Theme.Material.DialogWhenLarge" - parent="@android:style/Theme.Material.Dialog.FixedSize"> - <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item> - </style> - <style name="Theme.Material.DialogWhenLarge.NoActionBar" - parent="@android:style/Theme.Material.Dialog.NoActionBar.FixedSize"> - <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item> - </style> - <style name="Theme.Material.Light.DialogWhenLarge" - parent="@android:style/Theme.Material.Light.Dialog.FixedSize"> - </style> - <style name="Theme.Material.Light.DialogWhenLarge.NoActionBar" - parent="@android:style/Theme.Material.Light.Dialog.NoActionBar.FixedSize"> - </style> -</resources> diff --git a/core/res/res/values-large/themes_device_defaults.xml b/core/res/res/values-large/themes_device_defaults.xml index d57e827e89c3..d252c270baf0 100644 --- a/core/res/res/values-large/themes_device_defaults.xml +++ b/core/res/res/values-large/themes_device_defaults.xml @@ -31,18 +31,12 @@ easier. =============================================================== --> <resources> - <style name="Theme.DeviceDefault.DialogWhenLarge" - parent="@android:style/Theme.DeviceDefault.Dialog.FixedSize"> + <style name="Theme.DeviceDefault.DialogWhenLarge" parent="@style/Theme.DeviceDefault.Dialog.FixedSize"> <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item> </style> - <style name="Theme.DeviceDefault.DialogWhenLarge.NoActionBar" - parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar.FixedSize"> + <style name="Theme.DeviceDefault.DialogWhenLarge.NoActionBar" parent="@style/Theme.DeviceDefault.Dialog.NoActionBar.FixedSize"> <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item> </style> - <style name="Theme.DeviceDefault.Light.DialogWhenLarge" - parent="@android:style/Theme.DeviceDefault.Light.Dialog.FixedSize"> - </style> - <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" - parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar.FixedSize"> - </style> + <style name="Theme.DeviceDefault.Light.DialogWhenLarge" parent="@style/Theme.DeviceDefault.Light.Dialog.FixedSize" /> + <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar" parent="@style/Theme.DeviceDefault.Light.Dialog.NoActionBar.FixedSize" /> </resources> diff --git a/core/res/res/values-large/themes_holo.xml b/core/res/res/values-large/themes_holo.xml new file mode 100644 index 000000000000..3f03932c579f --- /dev/null +++ b/core/res/res/values-large/themes_holo.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* +** Copyright 2010, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ +--> + +<!-- +=============================================================== + PLEASE READ +=============================================================== + +The Holo themes must not be modified in order to pass CTS. +Many related themes and styles depend on other values defined in this file. +If you would like to provide custom themes and styles for your device, +please see themes_device_defaults.xml. + +=============================================================== + PLEASE READ +=============================================================== + --> +<resources> + <style name="Theme.Holo.DialogWhenLarge" parent="@style/Theme.Holo.Dialog.FixedSize"> + <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item> + </style> + <style name="Theme.Holo.DialogWhenLarge.NoActionBar" parent="@style/Theme.Holo.Dialog.NoActionBar.FixedSize"> + <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item> + </style> + <style name="Theme.Holo.Light.DialogWhenLarge" parent="@style/Theme.Holo.Light.Dialog.FixedSize" /> + <style name="Theme.Holo.Light.DialogWhenLarge.NoActionBar" parent="@style/Theme.Holo.Light.Dialog.NoActionBar.FixedSize" /> +</resources> diff --git a/core/res/res/values-large/themes_material.xml b/core/res/res/values-large/themes_material.xml new file mode 100644 index 000000000000..27816080c284 --- /dev/null +++ b/core/res/res/values-large/themes_material.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<!-- +=============================================================== + PLEASE READ +=============================================================== + +The Material themes must not be modified in order to pass CTS. +Many related themes and styles depend on other values defined in this file. +If you would like to provide custom themes and styles for your device, +please see themes_device_defaults.xml. + +=============================================================== + PLEASE READ +=============================================================== + --> +<resources> + <style name="Theme.Material.DialogWhenLarge" parent="@style/Theme.Material.Dialog.FixedSize"> + <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item> + </style> + <style name="Theme.Material.DialogWhenLarge.NoActionBar" parent="@style/Theme.Material.Dialog.NoActionBar.FixedSize"> + <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item> + </style> + <style name="Theme.Material.Light.DialogWhenLarge" parent="@style/Theme.Material.Light.Dialog.FixedSize" /> + <style name="Theme.Material.Light.DialogWhenLarge.NoActionBar" parent="@style/Theme.Material.Light.Dialog.NoActionBar.FixedSize" /> +</resources> diff --git a/core/res/res/values/colors_material.xml b/core/res/res/values/colors_material.xml index fdbe0a055ba9..faa9fb7d0ca9 100644 --- a/core/res/res/values/colors_material.xml +++ b/core/res/res/values/colors_material.xml @@ -89,6 +89,9 @@ <color name="material_teal_A200">#ff18ffff</color> <color name="material_teal_A400">#ff00e5ff</color> + <!-- Accent color used by Settings --> + <color name="material_dark_teal_A400">#ff009688</color> + <color name="material_green_100">#ffb7e1cd</color> <color name="material_green_300">#ff57bb8a</color> <color name="material_green_500">#ff0f9d58</color> @@ -143,7 +146,10 @@ <color name="material_blue_grey_600">#ff546e7a</color> <color name="material_blue_grey_700">#ff455a64</color> <color name="material_blue_grey_800">#ff37474f</color> + <!-- Primary color used by Settings --> <color name="material_blue_grey_900">#ff263238</color> + <!-- Primary dark color used by Settings --> + <color name="material_blue_grey_950">#ff21272b</color> <color name="material_brown_100">#ffd7ccc8</color> <color name="material_brown_300">#ffa1887f</color> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 94cf116df747..e16082f9559a 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2244,6 +2244,8 @@ <public type="style" name="TextAppearance.Material.Widget.TextView.PopupMenu" /> <public type="style" name="TextAppearance.Material.Widget.TextView.SpinnerItem" /> + <public type="style" name="Theme.DeviceDefault.Settings" /> + <public type="style" name="Theme.Material" /> <public type="style" name="Theme.Material.Dialog" /> <public type="style" name="Theme.Material.Dialog.MinWidth" /> @@ -2257,6 +2259,7 @@ <public type="style" name="Theme.Material.NoActionBar.Overscan" /> <public type="style" name="Theme.Material.NoActionBar.TranslucentDecor" /> <public type="style" name="Theme.Material.Panel" /> + <public type="style" name="Theme.Material.Settings" /> <public type="style" name="Theme.Material.Voice" /> <public type="style" name="Theme.Material.Wallpaper" /> <public type="style" name="Theme.Material.Wallpaper.NoTitleBar" /> diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml index a40835c58e90..71205216d194 100644 --- a/core/res/res/values/styles_material.xml +++ b/core/res/res/values/styles_material.xml @@ -344,8 +344,7 @@ please see styles_device_defaults.xml. <item name="android:textColor">#66000000</item> </style> - <style name="Widget.StatusBar.Material.ProgressBar" parent="Widget.Material.Light.ProgressBar.Horizontal"> - </style> + <style name="Widget.StatusBar.Material.ProgressBar" parent="Widget.Material.Light.ProgressBar.Horizontal" /> <style name="Widget.StatusBar.Material.ProgressBar.Media"> <item name="android:progressDrawable">@drawable/notification_material_media_progress</item> @@ -963,12 +962,17 @@ please see styles_device_defaults.xml. <!-- Window title --> <style name="WindowTitleBackground.Material"> <item name="background">@null</item> + <item name="paddingStart">16dp</item> + <item name="paddingEnd">16dp</item> + <item name="paddingTop">16dp</item> </style> <style name="WindowTitle.Material"> <item name="singleLine">true</item> <item name="textAppearance">@style/TextAppearance.Material.WindowTitle</item> <item name="shadowRadius">0</item> + <item name="ellipsize">end</item> + <item name="textAlignment">viewStart</item> </style> <style name="DialogWindowTitle.Material"> diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml index 6b7d86100899..27c8754ad31c 100644 --- a/core/res/res/values/themes_device_defaults.xml +++ b/core/res/res/values/themes_device_defaults.xml @@ -555,4 +555,7 @@ easier. <style name="Theme.DeviceDefault.Light.SearchBar" parent="Theme.Material.Light.SearchBar" /> + <!-- DeviceDefault theme for a window that should look like the Settings app. --> + <style name="Theme.DeviceDefault.Settings" parent="Theme.Material.Settings" /> + </resources> diff --git a/core/res/res/values/themes_material.xml b/core/res/res/values/themes_material.xml index 1304d2b2aa0f..a42996a4cf54 100644 --- a/core/res/res/values/themes_material.xml +++ b/core/res/res/values/themes_material.xml @@ -154,7 +154,7 @@ please see themes_device_defaults.xml. <item name="windowContentOverlay">@null</item> <item name="windowShowWallpaper">false</item> <item name="windowTitleStyle">@style/WindowTitle.Material</item> - <item name="windowTitleSize">25dip</item> + <item name="windowTitleSize">@dimen/action_bar_default_height_material</item> <item name="windowTitleBackgroundStyle">@style/WindowTitleBackground.Material</item> <item name="windowContentTransitions">false</item> <item name="windowAnimationStyle">@style/Animation.Material.Activity</item> @@ -503,7 +503,7 @@ please see themes_device_defaults.xml. <item name="windowContentOverlay">@drawable/ab_solid_shadow_material</item> <item name="windowShowWallpaper">false</item> <item name="windowTitleStyle">@style/WindowTitle.Material</item> - <item name="windowTitleSize">25dip</item> + <item name="windowTitleSize">@dimen/action_bar_default_height_material</item> <item name="windowTitleBackgroundStyle">@style/WindowTitleBackground.Material</item> <item name="windowAnimationStyle">@style/Animation.Material.Activity</item> <item name="windowSoftInputMode">stateUnspecified|adjustUnspecified</item> @@ -1006,7 +1006,7 @@ please see themes_device_defaults.xml. <style name="Theme.Material.Dialog"> <item name="windowFrame">@null</item> <item name="windowTitleStyle">@style/DialogWindowTitle.Material</item> - <item name="windowBackground">@drawable/dialog_background_material</item> + <item name="windowBackground">@drawable/dialog_background_shadow_material</item> <item name="windowIsFloating">true</item> <item name="windowContentOverlay">@null</item> <item name="windowAnimationStyle">@style/Animation.Material.Dialog</item> @@ -1102,18 +1102,15 @@ please see themes_device_defaults.xml. <!-- Theme for a window that will be displayed either full-screen on smaller screens (small, normal) or as a dialog on larger screens (large, xlarge). --> - <style name="Theme.Material.DialogWhenLarge" parent="@style/Theme.Material"> - </style> + <style name="Theme.Material.DialogWhenLarge" parent="@style/Theme.Material" /> <!-- Theme for a window without a title bar that will be displayed either full-screen on smaller screens (small, normal) or as a dialog on larger screens (large, xlarge). --> - <style name="Theme.Material.DialogWhenLarge.NoActionBar" parent="@style/Theme.Material.NoActionBar"> - </style> + <style name="Theme.Material.DialogWhenLarge.NoActionBar" parent="@style/Theme.Material.NoActionBar" /> <!-- Theme for a presentation window on a secondary display. --> - <style name="Theme.Material.Dialog.Presentation" parent="@style/Theme.Material.NoActionBar.Fullscreen"> - </style> + <style name="Theme.Material.Dialog.Presentation" parent="@style/Theme.Material.NoActionBar.Fullscreen" /> <!-- Light material dialog themes --> @@ -1125,7 +1122,7 @@ please see themes_device_defaults.xml. <style name="Theme.Material.Light.Dialog"> <item name="windowFrame">@null</item> <item name="windowTitleStyle">@style/DialogWindowTitle.Material.Light</item> - <item name="windowBackground">?attr/colorBackground</item> + <item name="windowBackground">@drawable/dialog_background_shadow_material</item> <item name="windowIsFloating">true</item> <item name="windowContentOverlay">@null</item> <item name="windowAnimationStyle">@style/Animation.Material.Dialog</item> @@ -1189,15 +1186,12 @@ please see themes_device_defaults.xml. <!-- Theme for a window that will be displayed either full-screen on smaller screens (small, normal) or as a dialog on larger screens (large, xlarge). --> - <style name="Theme.Material.Light.DialogWhenLarge" parent="@style/Theme.Material.Light"> - </style> + <style name="Theme.Material.Light.DialogWhenLarge" parent="@style/Theme.Material.Light" /> <!-- Theme for a window without an action bar that will be displayed either full-screen on smaller screens (small, normal) or as a dialog on larger screens (large, xlarge). --> - <style name="Theme.Material.Light.DialogWhenLarge.NoActionBar" - parent="@style/Theme.Material.Light.NoActionBar"> - </style> + <style name="Theme.Material.Light.DialogWhenLarge.NoActionBar" parent="@style/Theme.Material.Light.NoActionBar" /> <!-- Material light theme for alert dialog windows, which is used by the {@link android.app.AlertDialog} class. This is basically a dialog @@ -1219,8 +1213,7 @@ please see themes_device_defaults.xml. </style> <!-- Theme for a presentation window on a secondary display. --> - <style name="Theme.Material.Light.Dialog.Presentation" parent="@style/Theme.Material.Light.NoActionBar.Fullscreen" > - </style> + <style name="Theme.Material.Light.Dialog.Presentation" parent="@style/Theme.Material.Light.NoActionBar.Fullscreen" /> <!-- Default material (dark) for windows that want to have the user's selected wallpaper appear behind them. --> @@ -1236,4 +1229,11 @@ please see themes_device_defaults.xml. <item name="windowNoTitle">true</item> </style> + <!-- Default theme for Settings and activities launched from Settings. --> + <style name="Theme.Material.Settings" parent="@style/Theme.Material.Light.DarkActionBar"> + <item name="colorPrimary">@color/material_blue_grey_900</item> + <item name="colorPrimaryDark">@color/material_blue_grey_950</item> + <item name="colorAccent">@color/material_dark_teal_A400</item> + </style> + </resources> |
