diff options
88 files changed, 642 insertions, 1689 deletions
diff --git a/api/current.txt b/api/current.txt index 97c1c74267df..9a52d26f36d1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -379,6 +379,12 @@ package android { field public static final int colorActivatedHighlight = 16843664; // 0x1010390 field public static final int colorBackground = 16842801; // 0x1010031 field public static final int colorBackgroundCacheHint = 16843435; // 0x10102ab + field public static final int colorButtonNormal = 16843781; // 0x1010405 + field public static final int colorButtonNormalColored = 16843783; // 0x1010407 + field public static final int colorButtonPressed = 16843782; // 0x1010406 + field public static final int colorButtonPressedColored = 16843784; // 0x1010408 + field public static final int colorControlActivated = 16843780; // 0x1010404 + field public static final int colorControlNormal = 16843779; // 0x1010403 field public static final int colorFocusedHighlight = 16843663; // 0x101038f field public static final int colorForeground = 16842800; // 0x1010030 field public static final int colorForegroundInverse = 16843270; // 0x1010206 @@ -1661,12 +1667,6 @@ package android { field public static final int MediaButton_Play = 16973882; // 0x103003a field public static final int MediaButton_Previous = 16973880; // 0x1030038 field public static final int MediaButton_Rew = 16973884; // 0x103003c - field public static final int Quantum_ButtonBar = 16974498; // 0x10302a2 - field public static final int Quantum_ButtonBar_AlertDialog = 16974497; // 0x10302a1 - field public static final int Quantum_Light_ButtonBar = 16974501; // 0x10302a5 - field public static final int Quantum_Light_ButtonBar_AlertDialog = 16974500; // 0x10302a4 - field public static final int Quantum_Light_SegmentedButton = 16974502; // 0x10302a6 - field public static final int Quantum_SegmentedButton = 16974499; // 0x10302a3 field public static final int TextAppearance = 16973886; // 0x103003e field public static final int TextAppearance_DeviceDefault = 16974253; // 0x10301ad field public static final int TextAppearance_DeviceDefault_DialogWindowTitle = 16974264; // 0x10301b8 @@ -1756,25 +1756,21 @@ package android { field public static final int TextAppearance_Quantum_Widget = 16974330; // 0x10301fa field public static final int TextAppearance_Quantum_Widget_ActionBar_Menu = 16974331; // 0x10301fb field public static final int TextAppearance_Quantum_Widget_ActionBar_Subtitle = 16974332; // 0x10301fc - field public static final int TextAppearance_Quantum_Widget_ActionBar_Subtitle_Inverse = 16974333; // 0x10301fd - field public static final int TextAppearance_Quantum_Widget_ActionBar_Title = 16974334; // 0x10301fe - field public static final int TextAppearance_Quantum_Widget_ActionBar_Title_Inverse = 16974335; // 0x10301ff - field public static final int TextAppearance_Quantum_Widget_ActionMode_Subtitle = 16974336; // 0x1030200 - field public static final int TextAppearance_Quantum_Widget_ActionMode_Subtitle_Inverse = 16974337; // 0x1030201 - field public static final int TextAppearance_Quantum_Widget_ActionMode_Title = 16974338; // 0x1030202 - field public static final int TextAppearance_Quantum_Widget_ActionMode_Title_Inverse = 16974339; // 0x1030203 - field public static final int TextAppearance_Quantum_Widget_Button = 16974340; // 0x1030204 - field public static final int TextAppearance_Quantum_Widget_DropDownHint = 16974341; // 0x1030205 - field public static final int TextAppearance_Quantum_Widget_DropDownItem = 16974342; // 0x1030206 - field public static final int TextAppearance_Quantum_Widget_EditText = 16974343; // 0x1030207 - field public static final int TextAppearance_Quantum_Widget_IconMenu_Item = 16974344; // 0x1030208 - field public static final int TextAppearance_Quantum_Widget_PopupMenu = 16974345; // 0x1030209 - field public static final int TextAppearance_Quantum_Widget_PopupMenu_Large = 16974346; // 0x103020a - field public static final int TextAppearance_Quantum_Widget_PopupMenu_Small = 16974347; // 0x103020b - field public static final int TextAppearance_Quantum_Widget_TabWidget = 16974348; // 0x103020c - field public static final int TextAppearance_Quantum_Widget_TextView = 16974349; // 0x103020d - field public static final int TextAppearance_Quantum_Widget_TextView_PopupMenu = 16974350; // 0x103020e - field public static final int TextAppearance_Quantum_Widget_TextView_SpinnerItem = 16974351; // 0x103020f + field public static final int TextAppearance_Quantum_Widget_ActionBar_Title = 16974333; // 0x10301fd + field public static final int TextAppearance_Quantum_Widget_ActionMode_Subtitle = 16974334; // 0x10301fe + field public static final int TextAppearance_Quantum_Widget_ActionMode_Title = 16974335; // 0x10301ff + field public static final int TextAppearance_Quantum_Widget_Button = 16974336; // 0x1030200 + field public static final int TextAppearance_Quantum_Widget_DropDownHint = 16974337; // 0x1030201 + field public static final int TextAppearance_Quantum_Widget_DropDownItem = 16974338; // 0x1030202 + field public static final int TextAppearance_Quantum_Widget_EditText = 16974339; // 0x1030203 + field public static final int TextAppearance_Quantum_Widget_IconMenu_Item = 16974340; // 0x1030204 + field public static final int TextAppearance_Quantum_Widget_PopupMenu = 16974341; // 0x1030205 + field public static final int TextAppearance_Quantum_Widget_PopupMenu_Large = 16974342; // 0x1030206 + field public static final int TextAppearance_Quantum_Widget_PopupMenu_Small = 16974343; // 0x1030207 + field public static final int TextAppearance_Quantum_Widget_TabWidget = 16974344; // 0x1030208 + field public static final int TextAppearance_Quantum_Widget_TextView = 16974345; // 0x1030209 + field public static final int TextAppearance_Quantum_Widget_TextView_PopupMenu = 16974346; // 0x103020a + field public static final int TextAppearance_Quantum_Widget_TextView_SpinnerItem = 16974347; // 0x103020b field public static final int TextAppearance_Quantum_WindowTitle = 16974329; // 0x10301f9 field public static final int TextAppearance_Small = 16973894; // 0x1030046 field public static final int TextAppearance_Small_Inverse = 16973895; // 0x1030047 @@ -1870,34 +1866,34 @@ package android { field public static final int Theme_NoTitleBar_Fullscreen = 16973831; // 0x1030007 field public static final int Theme_NoTitleBar_OverlayActionModes = 16973930; // 0x103006a field public static final int Theme_Panel = 16973913; // 0x1030059 - field public static final int Theme_Quantum = 16974352; // 0x1030210 - field public static final int Theme_Quantum_Dialog = 16974353; // 0x1030211 - field public static final int Theme_Quantum_DialogWhenLarge = 16974357; // 0x1030215 - field public static final int Theme_Quantum_DialogWhenLarge_NoActionBar = 16974358; // 0x1030216 - field public static final int Theme_Quantum_Dialog_MinWidth = 16974354; // 0x1030212 - field public static final int Theme_Quantum_Dialog_NoActionBar = 16974355; // 0x1030213 - field public static final int Theme_Quantum_Dialog_NoActionBar_MinWidth = 16974356; // 0x1030214 - field public static final int Theme_Quantum_InputMethod = 16974359; // 0x1030217 - field public static final int Theme_Quantum_Light = 16974367; // 0x103021f - field public static final int Theme_Quantum_Light_DarkActionBar = 16974368; // 0x1030220 - field public static final int Theme_Quantum_Light_Dialog = 16974369; // 0x1030221 - field public static final int Theme_Quantum_Light_DialogWhenLarge = 16974373; // 0x1030225 - field public static final int Theme_Quantum_Light_DialogWhenLarge_NoActionBar = 16974374; // 0x1030226 - field public static final int Theme_Quantum_Light_Dialog_MinWidth = 16974370; // 0x1030222 - field public static final int Theme_Quantum_Light_Dialog_NoActionBar = 16974371; // 0x1030223 - field public static final int Theme_Quantum_Light_Dialog_NoActionBar_MinWidth = 16974372; // 0x1030224 - field public static final int Theme_Quantum_Light_NoActionBar = 16974375; // 0x1030227 - field public static final int Theme_Quantum_Light_NoActionBar_Fullscreen = 16974376; // 0x1030228 - field public static final int Theme_Quantum_Light_NoActionBar_Overscan = 16974377; // 0x1030229 - field public static final int Theme_Quantum_Light_NoActionBar_TranslucentDecor = 16974378; // 0x103022a - field public static final int Theme_Quantum_Light_Panel = 16974379; // 0x103022b - field public static final int Theme_Quantum_NoActionBar = 16974360; // 0x1030218 - field public static final int Theme_Quantum_NoActionBar_Fullscreen = 16974361; // 0x1030219 - field public static final int Theme_Quantum_NoActionBar_Overscan = 16974362; // 0x103021a - field public static final int Theme_Quantum_NoActionBar_TranslucentDecor = 16974363; // 0x103021b - field public static final int Theme_Quantum_Panel = 16974364; // 0x103021c - field public static final int Theme_Quantum_Wallpaper = 16974365; // 0x103021d - field public static final int Theme_Quantum_Wallpaper_NoTitleBar = 16974366; // 0x103021e + field public static final int Theme_Quantum = 16974348; // 0x103020c + field public static final int Theme_Quantum_Dialog = 16974349; // 0x103020d + field public static final int Theme_Quantum_DialogWhenLarge = 16974353; // 0x1030211 + field public static final int Theme_Quantum_DialogWhenLarge_NoActionBar = 16974354; // 0x1030212 + field public static final int Theme_Quantum_Dialog_MinWidth = 16974350; // 0x103020e + field public static final int Theme_Quantum_Dialog_NoActionBar = 16974351; // 0x103020f + field public static final int Theme_Quantum_Dialog_NoActionBar_MinWidth = 16974352; // 0x1030210 + field public static final int Theme_Quantum_InputMethod = 16974355; // 0x1030213 + field public static final int Theme_Quantum_Light = 16974363; // 0x103021b + field public static final int Theme_Quantum_Light_DarkActionBar = 16974364; // 0x103021c + field public static final int Theme_Quantum_Light_Dialog = 16974365; // 0x103021d + field public static final int Theme_Quantum_Light_DialogWhenLarge = 16974369; // 0x1030221 + field public static final int Theme_Quantum_Light_DialogWhenLarge_NoActionBar = 16974370; // 0x1030222 + field public static final int Theme_Quantum_Light_Dialog_MinWidth = 16974366; // 0x103021e + field public static final int Theme_Quantum_Light_Dialog_NoActionBar = 16974367; // 0x103021f + field public static final int Theme_Quantum_Light_Dialog_NoActionBar_MinWidth = 16974368; // 0x1030220 + field public static final int Theme_Quantum_Light_NoActionBar = 16974371; // 0x1030223 + field public static final int Theme_Quantum_Light_NoActionBar_Fullscreen = 16974372; // 0x1030224 + field public static final int Theme_Quantum_Light_NoActionBar_Overscan = 16974373; // 0x1030225 + field public static final int Theme_Quantum_Light_NoActionBar_TranslucentDecor = 16974374; // 0x1030226 + field public static final int Theme_Quantum_Light_Panel = 16974375; // 0x1030227 + field public static final int Theme_Quantum_NoActionBar = 16974356; // 0x1030214 + field public static final int Theme_Quantum_NoActionBar_Fullscreen = 16974357; // 0x1030215 + field public static final int Theme_Quantum_NoActionBar_Overscan = 16974358; // 0x1030216 + field public static final int Theme_Quantum_NoActionBar_TranslucentDecor = 16974359; // 0x1030217 + field public static final int Theme_Quantum_Panel = 16974360; // 0x1030218 + field public static final int Theme_Quantum_Wallpaper = 16974361; // 0x1030219 + field public static final int Theme_Quantum_Wallpaper_NoTitleBar = 16974362; // 0x103021a field public static final int Theme_Translucent = 16973839; // 0x103000f field public static final int Theme_Translucent_NoTitleBar = 16973840; // 0x1030010 field public static final int Theme_Translucent_NoTitleBar_Fullscreen = 16973841; // 0x1030011 @@ -2185,127 +2181,128 @@ package android { field public static final int Widget_ProgressBar_Large_Inverse = 16973916; // 0x103005c field public static final int Widget_ProgressBar_Small = 16973854; // 0x103001e field public static final int Widget_ProgressBar_Small_Inverse = 16973917; // 0x103005d - field public static final int Widget_Quantum = 16974380; // 0x103022c - field public static final int Widget_Quantum_ActionBar = 16974381; // 0x103022d - field public static final int Widget_Quantum_ActionBar_Solid = 16974382; // 0x103022e - field public static final int Widget_Quantum_ActionBar_TabBar = 16974383; // 0x103022f - field public static final int Widget_Quantum_ActionBar_TabText = 16974384; // 0x1030230 - field public static final int Widget_Quantum_ActionBar_TabView = 16974385; // 0x1030231 - field public static final int Widget_Quantum_ActionButton = 16974386; // 0x1030232 - field public static final int Widget_Quantum_ActionButton_CloseMode = 16974387; // 0x1030233 - field public static final int Widget_Quantum_ActionButton_Overflow = 16974388; // 0x1030234 - field public static final int Widget_Quantum_ActionButton_TextButton = 16974389; // 0x1030235 - field public static final int Widget_Quantum_ActionMode = 16974390; // 0x1030236 - field public static final int Widget_Quantum_AutoCompleteTextView = 16974391; // 0x1030237 - field public static final int Widget_Quantum_Button = 16974392; // 0x1030238 - field public static final int Widget_Quantum_Button_Borderless = 16974393; // 0x1030239 - field public static final int Widget_Quantum_Button_Borderless_Small = 16974394; // 0x103023a - field public static final int Widget_Quantum_Button_Inset = 16974395; // 0x103023b - field public static final int Widget_Quantum_Button_Paper = 16974503; // 0x10302a7 - field public static final int Widget_Quantum_Button_Paper_Color = 16974504; // 0x10302a8 - field public static final int Widget_Quantum_Button_Small = 16974396; // 0x103023c - field public static final int Widget_Quantum_Button_Toggle = 16974397; // 0x103023d - field public static final int Widget_Quantum_CalendarView = 16974398; // 0x103023e - field public static final int Widget_Quantum_CheckedTextView = 16974399; // 0x103023f - field public static final int Widget_Quantum_CompoundButton_CheckBox = 16974400; // 0x1030240 - field public static final int Widget_Quantum_CompoundButton_RadioButton = 16974401; // 0x1030241 - field public static final int Widget_Quantum_CompoundButton_Star = 16974402; // 0x1030242 - field public static final int Widget_Quantum_DatePicker = 16974403; // 0x1030243 - field public static final int Widget_Quantum_DropDownItem = 16974404; // 0x1030244 - field public static final int Widget_Quantum_DropDownItem_Spinner = 16974405; // 0x1030245 - field public static final int Widget_Quantum_EditText = 16974406; // 0x1030246 - field public static final int Widget_Quantum_ExpandableListView = 16974407; // 0x1030247 - field public static final int Widget_Quantum_FastScroll = 16974408; // 0x1030248 - field public static final int Widget_Quantum_FragmentBreadCrumbs = 16974409; // 0x1030249 - field public static final int Widget_Quantum_GridView = 16974410; // 0x103024a - field public static final int Widget_Quantum_HorizontalScrollView = 16974411; // 0x103024b - field public static final int Widget_Quantum_ImageButton = 16974412; // 0x103024c - field public static final int Widget_Quantum_Light = 16974436; // 0x1030264 - field public static final int Widget_Quantum_Light_ActionBar = 16974437; // 0x1030265 - field public static final int Widget_Quantum_Light_ActionBar_Solid = 16974438; // 0x1030266 - field public static final int Widget_Quantum_Light_ActionBar_Solid_Inverse = 16974439; // 0x1030267 - field public static final int Widget_Quantum_Light_ActionBar_TabBar = 16974440; // 0x1030268 - field public static final int Widget_Quantum_Light_ActionBar_TabBar_Inverse = 16974441; // 0x1030269 - field public static final int Widget_Quantum_Light_ActionBar_TabText = 16974442; // 0x103026a - field public static final int Widget_Quantum_Light_ActionBar_TabText_Inverse = 16974443; // 0x103026b - field public static final int Widget_Quantum_Light_ActionBar_TabView = 16974444; // 0x103026c - field public static final int Widget_Quantum_Light_ActionBar_TabView_Inverse = 16974445; // 0x103026d - field public static final int Widget_Quantum_Light_ActionButton = 16974446; // 0x103026e - field public static final int Widget_Quantum_Light_ActionButton_CloseMode = 16974447; // 0x103026f - field public static final int Widget_Quantum_Light_ActionButton_Overflow = 16974448; // 0x1030270 - field public static final int Widget_Quantum_Light_ActionMode = 16974450; // 0x1030272 - field public static final int Widget_Quantum_Light_ActionMode_Inverse = 16974449; // 0x1030271 - field public static final int Widget_Quantum_Light_AutoCompleteTextView = 16974451; // 0x1030273 - field public static final int Widget_Quantum_Light_Button = 16974452; // 0x1030274 - field public static final int Widget_Quantum_Light_Button_Borderless_Small = 16974453; // 0x1030275 - field public static final int Widget_Quantum_Light_Button_Inset = 16974454; // 0x1030276 - field public static final int Widget_Quantum_Light_Button_Paper = 16974505; // 0x10302a9 - field public static final int Widget_Quantum_Light_Button_Paper_Color = 16974506; // 0x10302aa - field public static final int Widget_Quantum_Light_Button_Small = 16974455; // 0x1030277 - field public static final int Widget_Quantum_Light_Button_Toggle = 16974456; // 0x1030278 - field public static final int Widget_Quantum_Light_CalendarView = 16974457; // 0x1030279 - field public static final int Widget_Quantum_Light_CheckedTextView = 16974458; // 0x103027a - field public static final int Widget_Quantum_Light_CompoundButton_CheckBox = 16974459; // 0x103027b - field public static final int Widget_Quantum_Light_CompoundButton_RadioButton = 16974460; // 0x103027c - field public static final int Widget_Quantum_Light_CompoundButton_Star = 16974461; // 0x103027d - field public static final int Widget_Quantum_Light_DropDownItem = 16974462; // 0x103027e - field public static final int Widget_Quantum_Light_DropDownItem_Spinner = 16974463; // 0x103027f - field public static final int Widget_Quantum_Light_EditText = 16974464; // 0x1030280 - field public static final int Widget_Quantum_Light_ExpandableListView = 16974465; // 0x1030281 - field public static final int Widget_Quantum_Light_FastScroll = 16974466; // 0x1030282 - field public static final int Widget_Quantum_Light_FragmentBreadCrumbs = 16974467; // 0x1030283 - field public static final int Widget_Quantum_Light_GridView = 16974468; // 0x1030284 - field public static final int Widget_Quantum_Light_HorizontalScrollView = 16974469; // 0x1030285 - field public static final int Widget_Quantum_Light_ImageButton = 16974470; // 0x1030286 - field public static final int Widget_Quantum_Light_ListPopupWindow = 16974471; // 0x1030287 - field public static final int Widget_Quantum_Light_ListView = 16974472; // 0x1030288 - field public static final int Widget_Quantum_Light_ListView_DropDown = 16974473; // 0x1030289 - field public static final int Widget_Quantum_Light_MediaRouteButton = 16974474; // 0x103028a - field public static final int Widget_Quantum_Light_PopupMenu = 16974475; // 0x103028b - field public static final int Widget_Quantum_Light_PopupWindow = 16974476; // 0x103028c - field public static final int Widget_Quantum_Light_ProgressBar = 16974477; // 0x103028d - field public static final int Widget_Quantum_Light_ProgressBar_Horizontal = 16974478; // 0x103028e - field public static final int Widget_Quantum_Light_ProgressBar_Inverse = 16974479; // 0x103028f - field public static final int Widget_Quantum_Light_ProgressBar_Large = 16974480; // 0x1030290 - field public static final int Widget_Quantum_Light_ProgressBar_Large_Inverse = 16974481; // 0x1030291 - field public static final int Widget_Quantum_Light_ProgressBar_Small = 16974482; // 0x1030292 - field public static final int Widget_Quantum_Light_ProgressBar_Small_Inverse = 16974483; // 0x1030293 - field public static final int Widget_Quantum_Light_ProgressBar_Small_Title = 16974484; // 0x1030294 - field public static final int Widget_Quantum_Light_RatingBar = 16974485; // 0x1030295 - field public static final int Widget_Quantum_Light_RatingBar_Indicator = 16974486; // 0x1030296 - field public static final int Widget_Quantum_Light_RatingBar_Small = 16974487; // 0x1030297 - field public static final int Widget_Quantum_Light_ScrollView = 16974488; // 0x1030298 - field public static final int Widget_Quantum_Light_SeekBar = 16974489; // 0x1030299 - field public static final int Widget_Quantum_Light_Spinner = 16974490; // 0x103029a - field public static final int Widget_Quantum_Light_Tab = 16974491; // 0x103029b - field public static final int Widget_Quantum_Light_TabWidget = 16974492; // 0x103029c - field public static final int Widget_Quantum_Light_TextView = 16974493; // 0x103029d - field public static final int Widget_Quantum_Light_TextView_SpinnerItem = 16974494; // 0x103029e - field public static final int Widget_Quantum_Light_WebTextView = 16974495; // 0x103029f - field public static final int Widget_Quantum_Light_WebView = 16974496; // 0x10302a0 - field public static final int Widget_Quantum_ListPopupWindow = 16974413; // 0x103024d - field public static final int Widget_Quantum_ListView = 16974414; // 0x103024e - field public static final int Widget_Quantum_ListView_DropDown = 16974415; // 0x103024f - field public static final int Widget_Quantum_MediaRouteButton = 16974416; // 0x1030250 - field public static final int Widget_Quantum_PopupMenu = 16974417; // 0x1030251 - field public static final int Widget_Quantum_PopupWindow = 16974418; // 0x1030252 - field public static final int Widget_Quantum_ProgressBar = 16974419; // 0x1030253 - field public static final int Widget_Quantum_ProgressBar_Horizontal = 16974420; // 0x1030254 - field public static final int Widget_Quantum_ProgressBar_Large = 16974421; // 0x1030255 - field public static final int Widget_Quantum_ProgressBar_Small = 16974422; // 0x1030256 - field public static final int Widget_Quantum_ProgressBar_Small_Title = 16974423; // 0x1030257 - field public static final int Widget_Quantum_RatingBar = 16974424; // 0x1030258 - field public static final int Widget_Quantum_RatingBar_Indicator = 16974425; // 0x1030259 - field public static final int Widget_Quantum_RatingBar_Small = 16974426; // 0x103025a - field public static final int Widget_Quantum_ScrollView = 16974427; // 0x103025b - field public static final int Widget_Quantum_SeekBar = 16974428; // 0x103025c - field public static final int Widget_Quantum_Spinner = 16974429; // 0x103025d - field public static final int Widget_Quantum_Tab = 16974430; // 0x103025e - field public static final int Widget_Quantum_TabWidget = 16974431; // 0x103025f - field public static final int Widget_Quantum_TextView = 16974432; // 0x1030260 - field public static final int Widget_Quantum_TextView_SpinnerItem = 16974433; // 0x1030261 - field public static final int Widget_Quantum_WebTextView = 16974434; // 0x1030262 - field public static final int Widget_Quantum_WebView = 16974435; // 0x1030263 + field public static final int Widget_Quantum = 16974376; // 0x1030228 + field public static final int Widget_Quantum_ActionBar = 16974377; // 0x1030229 + field public static final int Widget_Quantum_ActionBar_Solid = 16974378; // 0x103022a + field public static final int Widget_Quantum_ActionBar_TabBar = 16974379; // 0x103022b + field public static final int Widget_Quantum_ActionBar_TabText = 16974380; // 0x103022c + field public static final int Widget_Quantum_ActionBar_TabView = 16974381; // 0x103022d + field public static final int Widget_Quantum_ActionButton = 16974382; // 0x103022e + field public static final int Widget_Quantum_ActionButton_CloseMode = 16974383; // 0x103022f + field public static final int Widget_Quantum_ActionButton_Overflow = 16974384; // 0x1030230 + field public static final int Widget_Quantum_ActionButton_TextButton = 16974385; // 0x1030231 + field public static final int Widget_Quantum_ActionMode = 16974386; // 0x1030232 + field public static final int Widget_Quantum_AutoCompleteTextView = 16974387; // 0x1030233 + field public static final int Widget_Quantum_Button = 16974388; // 0x1030234 + field public static final int Widget_Quantum_ButtonBar = 16974394; // 0x103023a + field public static final int Widget_Quantum_ButtonBar_AlertDialog = 16974395; // 0x103023b + field public static final int Widget_Quantum_Button_Borderless = 16974389; // 0x1030235 + field public static final int Widget_Quantum_Button_Borderless_Small = 16974390; // 0x1030236 + field public static final int Widget_Quantum_Button_Inset = 16974391; // 0x1030237 + field public static final int Widget_Quantum_Button_Paper = 16974494; // 0x103029e + field public static final int Widget_Quantum_Button_Paper_Color = 16974495; // 0x103029f + field public static final int Widget_Quantum_Button_Small = 16974392; // 0x1030238 + field public static final int Widget_Quantum_Button_Toggle = 16974393; // 0x1030239 + field public static final int Widget_Quantum_CalendarView = 16974396; // 0x103023c + field public static final int Widget_Quantum_CheckedTextView = 16974397; // 0x103023d + field public static final int Widget_Quantum_CompoundButton_CheckBox = 16974398; // 0x103023e + field public static final int Widget_Quantum_CompoundButton_RadioButton = 16974399; // 0x103023f + field public static final int Widget_Quantum_CompoundButton_Star = 16974400; // 0x1030240 + field public static final int Widget_Quantum_DatePicker = 16974401; // 0x1030241 + field public static final int Widget_Quantum_DropDownItem = 16974402; // 0x1030242 + field public static final int Widget_Quantum_DropDownItem_Spinner = 16974403; // 0x1030243 + field public static final int Widget_Quantum_EditText = 16974404; // 0x1030244 + field public static final int Widget_Quantum_ExpandableListView = 16974405; // 0x1030245 + field public static final int Widget_Quantum_FastScroll = 16974406; // 0x1030246 + field public static final int Widget_Quantum_FragmentBreadCrumbs = 16974407; // 0x1030247 + field public static final int Widget_Quantum_GridView = 16974408; // 0x1030248 + field public static final int Widget_Quantum_HorizontalScrollView = 16974409; // 0x1030249 + field public static final int Widget_Quantum_ImageButton = 16974410; // 0x103024a + field public static final int Widget_Quantum_Light = 16974435; // 0x1030263 + field public static final int Widget_Quantum_Light_ActionBar = 16974436; // 0x1030264 + field public static final int Widget_Quantum_Light_ActionBar_Solid = 16974437; // 0x1030265 + field public static final int Widget_Quantum_Light_ActionBar_TabBar = 16974438; // 0x1030266 + field public static final int Widget_Quantum_Light_ActionBar_TabText = 16974439; // 0x1030267 + field public static final int Widget_Quantum_Light_ActionBar_TabView = 16974440; // 0x1030268 + field public static final int Widget_Quantum_Light_ActionButton = 16974441; // 0x1030269 + field public static final int Widget_Quantum_Light_ActionButton_CloseMode = 16974442; // 0x103026a + field public static final int Widget_Quantum_Light_ActionButton_Overflow = 16974443; // 0x103026b + field public static final int Widget_Quantum_Light_ActionMode = 16974444; // 0x103026c + field public static final int Widget_Quantum_Light_AutoCompleteTextView = 16974445; // 0x103026d + field public static final int Widget_Quantum_Light_Button = 16974446; // 0x103026e + field public static final int Widget_Quantum_Light_ButtonBar = 16974451; // 0x1030273 + field public static final int Widget_Quantum_Light_ButtonBar_AlertDialog = 16974452; // 0x1030274 + field public static final int Widget_Quantum_Light_Button_Borderless_Small = 16974447; // 0x103026f + field public static final int Widget_Quantum_Light_Button_Inset = 16974448; // 0x1030270 + field public static final int Widget_Quantum_Light_Button_Paper = 16974496; // 0x10302a0 + field public static final int Widget_Quantum_Light_Button_Paper_Color = 16974497; // 0x10302a1 + field public static final int Widget_Quantum_Light_Button_Small = 16974449; // 0x1030271 + field public static final int Widget_Quantum_Light_Button_Toggle = 16974450; // 0x1030272 + field public static final int Widget_Quantum_Light_CalendarView = 16974453; // 0x1030275 + field public static final int Widget_Quantum_Light_CheckedTextView = 16974454; // 0x1030276 + field public static final int Widget_Quantum_Light_CompoundButton_CheckBox = 16974455; // 0x1030277 + field public static final int Widget_Quantum_Light_CompoundButton_RadioButton = 16974456; // 0x1030278 + field public static final int Widget_Quantum_Light_CompoundButton_Star = 16974457; // 0x1030279 + field public static final int Widget_Quantum_Light_DropDownItem = 16974458; // 0x103027a + field public static final int Widget_Quantum_Light_DropDownItem_Spinner = 16974459; // 0x103027b + field public static final int Widget_Quantum_Light_EditText = 16974460; // 0x103027c + field public static final int Widget_Quantum_Light_ExpandableListView = 16974461; // 0x103027d + field public static final int Widget_Quantum_Light_FastScroll = 16974462; // 0x103027e + field public static final int Widget_Quantum_Light_FragmentBreadCrumbs = 16974463; // 0x103027f + field public static final int Widget_Quantum_Light_GridView = 16974464; // 0x1030280 + field public static final int Widget_Quantum_Light_HorizontalScrollView = 16974465; // 0x1030281 + field public static final int Widget_Quantum_Light_ImageButton = 16974466; // 0x1030282 + field public static final int Widget_Quantum_Light_ListPopupWindow = 16974467; // 0x1030283 + field public static final int Widget_Quantum_Light_ListView = 16974468; // 0x1030284 + field public static final int Widget_Quantum_Light_ListView_DropDown = 16974469; // 0x1030285 + field public static final int Widget_Quantum_Light_MediaRouteButton = 16974470; // 0x1030286 + field public static final int Widget_Quantum_Light_PopupMenu = 16974471; // 0x1030287 + field public static final int Widget_Quantum_Light_PopupWindow = 16974472; // 0x1030288 + field public static final int Widget_Quantum_Light_ProgressBar = 16974473; // 0x1030289 + field public static final int Widget_Quantum_Light_ProgressBar_Horizontal = 16974474; // 0x103028a + field public static final int Widget_Quantum_Light_ProgressBar_Inverse = 16974475; // 0x103028b + field public static final int Widget_Quantum_Light_ProgressBar_Large = 16974476; // 0x103028c + field public static final int Widget_Quantum_Light_ProgressBar_Large_Inverse = 16974477; // 0x103028d + field public static final int Widget_Quantum_Light_ProgressBar_Small = 16974478; // 0x103028e + field public static final int Widget_Quantum_Light_ProgressBar_Small_Inverse = 16974479; // 0x103028f + field public static final int Widget_Quantum_Light_ProgressBar_Small_Title = 16974480; // 0x1030290 + field public static final int Widget_Quantum_Light_RatingBar = 16974481; // 0x1030291 + field public static final int Widget_Quantum_Light_RatingBar_Indicator = 16974482; // 0x1030292 + field public static final int Widget_Quantum_Light_RatingBar_Small = 16974483; // 0x1030293 + field public static final int Widget_Quantum_Light_ScrollView = 16974484; // 0x1030294 + field public static final int Widget_Quantum_Light_SeekBar = 16974485; // 0x1030295 + field public static final int Widget_Quantum_Light_SegmentedButton = 16974486; // 0x1030296 + field public static final int Widget_Quantum_Light_Spinner = 16974487; // 0x1030297 + field public static final int Widget_Quantum_Light_Tab = 16974488; // 0x1030298 + field public static final int Widget_Quantum_Light_TabWidget = 16974489; // 0x1030299 + field public static final int Widget_Quantum_Light_TextView = 16974490; // 0x103029a + field public static final int Widget_Quantum_Light_TextView_SpinnerItem = 16974491; // 0x103029b + field public static final int Widget_Quantum_Light_WebTextView = 16974492; // 0x103029c + field public static final int Widget_Quantum_Light_WebView = 16974493; // 0x103029d + field public static final int Widget_Quantum_ListPopupWindow = 16974411; // 0x103024b + field public static final int Widget_Quantum_ListView = 16974412; // 0x103024c + field public static final int Widget_Quantum_ListView_DropDown = 16974413; // 0x103024d + field public static final int Widget_Quantum_MediaRouteButton = 16974414; // 0x103024e + field public static final int Widget_Quantum_PopupMenu = 16974415; // 0x103024f + field public static final int Widget_Quantum_PopupWindow = 16974416; // 0x1030250 + field public static final int Widget_Quantum_ProgressBar = 16974417; // 0x1030251 + field public static final int Widget_Quantum_ProgressBar_Horizontal = 16974418; // 0x1030252 + field public static final int Widget_Quantum_ProgressBar_Large = 16974419; // 0x1030253 + field public static final int Widget_Quantum_ProgressBar_Small = 16974420; // 0x1030254 + field public static final int Widget_Quantum_ProgressBar_Small_Title = 16974421; // 0x1030255 + field public static final int Widget_Quantum_RatingBar = 16974422; // 0x1030256 + field public static final int Widget_Quantum_RatingBar_Indicator = 16974423; // 0x1030257 + field public static final int Widget_Quantum_RatingBar_Small = 16974424; // 0x1030258 + field public static final int Widget_Quantum_ScrollView = 16974425; // 0x1030259 + field public static final int Widget_Quantum_SeekBar = 16974426; // 0x103025a + field public static final int Widget_Quantum_SegmentedButton = 16974427; // 0x103025b + field public static final int Widget_Quantum_Spinner = 16974428; // 0x103025c + field public static final int Widget_Quantum_Tab = 16974429; // 0x103025d + field public static final int Widget_Quantum_TabWidget = 16974430; // 0x103025e + field public static final int Widget_Quantum_TextView = 16974431; // 0x103025f + field public static final int Widget_Quantum_TextView_SpinnerItem = 16974432; // 0x1030260 + field public static final int Widget_Quantum_WebTextView = 16974433; // 0x1030261 + field public static final int Widget_Quantum_WebView = 16974434; // 0x1030262 field public static final int Widget_RatingBar = 16973857; // 0x1030021 field public static final int Widget_ScrollView = 16973869; // 0x103002d field public static final int Widget_SeekBar = 16973856; // 0x1030020 diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java index d7199ff87b79..9fb2846a4ba5 100644 --- a/core/java/android/content/res/TypedArray.java +++ b/core/java/android/content/res/TypedArray.java @@ -793,10 +793,9 @@ public class TypedArray { public int[] extractThemeAttrs() { int[] attrs = null; - final int N = getIndexCount(); + final int N = length(); for (int i = 0; i < N; i++) { - final int index = getIndex(i); - final int attrId = getThemeAttributeId(index, 0); + final int attrId = getThemeAttributeId(i, 0); if (attrId != 0) { if (attrs == null) { attrs = new int[N]; diff --git a/core/res/res/drawable/background_cache_hint_selector_holo_dark.xml b/core/res/res/color/background_cache_hint_selector_holo_dark.xml index b18c5b7111e9..b18c5b7111e9 100644 --- a/core/res/res/drawable/background_cache_hint_selector_holo_dark.xml +++ b/core/res/res/color/background_cache_hint_selector_holo_dark.xml diff --git a/core/res/res/drawable/background_cache_hint_selector_holo_light.xml b/core/res/res/color/background_cache_hint_selector_holo_light.xml index 9d80944d6cad..9d80944d6cad 100644 --- a/core/res/res/drawable/background_cache_hint_selector_holo_light.xml +++ b/core/res/res/color/background_cache_hint_selector_holo_light.xml diff --git a/core/res/res/drawable/background_cache_hint_selector_quantum_dark.xml b/core/res/res/color/background_cache_hint_selector_quantum_dark.xml index ab6650177da1..ab6650177da1 100644 --- a/core/res/res/drawable/background_cache_hint_selector_quantum_dark.xml +++ b/core/res/res/color/background_cache_hint_selector_quantum_dark.xml diff --git a/core/res/res/drawable/background_cache_hint_selector_quantum_light.xml b/core/res/res/color/background_cache_hint_selector_quantum_light.xml index fb940a9038ac..fb940a9038ac 100644 --- a/core/res/res/drawable/background_cache_hint_selector_quantum_light.xml +++ b/core/res/res/color/background_cache_hint_selector_quantum_light.xml diff --git a/core/res/res/drawable/ab_transparent_quantum_dark.xml b/core/res/res/drawable/ab_transparent_quantum.xml index 9ac2fc0a082d..495bfb6d59c7 100644 --- a/core/res/res/drawable/ab_transparent_quantum_dark.xml +++ b/core/res/res/drawable/ab_transparent_quantum.xml @@ -16,4 +16,4 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ab_transparent_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/ab_transparent_quantum_light.xml b/core/res/res/drawable/ab_transparent_quantum_light.xml deleted file mode 100644 index bc49848ae582..000000000000 --- a/core/res/res/drawable/ab_transparent_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ab_transparent_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/activated_background_quantum_dark.xml b/core/res/res/drawable/activated_background_quantum.xml index a9e3fea64639..e06c9f22f7e5 100644 --- a/core/res/res/drawable/activated_background_quantum_dark.xml +++ b/core/res/res/drawable/activated_background_quantum.xml @@ -15,6 +15,10 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_activated="true" android:drawable="@color/control_activated_foreground_quantum_dark" /> - <item android:drawable="@color/transparent" /> + <item android:state_activated="true"> + <color android:color="?attr/colorControlActivated" /> + </item> + <item> + <color android:color="@color/transparent" /> + </item> </selector> diff --git a/core/res/res/drawable/activated_background_quantum_light.xml b/core/res/res/drawable/activated_background_quantum_light.xml deleted file mode 100644 index 5d10ea2b1beb..000000000000 --- a/core/res/res/drawable/activated_background_quantum_light.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_activated="true" android:drawable="@color/control_activated_foreground_quantum_light" /> - <item android:drawable="@color/transparent" /> -</selector> diff --git a/core/res/res/drawable/btn_borderless_quantum_dark.xml b/core/res/res/drawable/btn_borderless_quantum.xml index 2c0d3b7688f7..703fd1128e71 100644 --- a/core/res/res/drawable/btn_borderless_quantum_dark.xml +++ b/core/res/res/drawable/btn_borderless_quantum.xml @@ -15,5 +15,5 @@ --> <touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/btn_default_pressed_quantum_dark" + android:tint="?attr/colorButtonPressed" android:mask="@drawable/btn_qntm_alpha" /> diff --git a/core/res/res/drawable/btn_borderless_quantum_light.xml b/core/res/res/drawable/btn_borderless_quantum_light.xml deleted file mode 100644 index 2faec207e0a7..000000000000 --- a/core/res/res/drawable/btn_borderless_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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. ---> - -<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/btn_default_pressed_quantum_light" - android:mask="@drawable/btn_qntm_alpha" /> diff --git a/core/res/res/drawable/btn_check_quantum_dark.xml b/core/res/res/drawable/btn_check_quantum.xml index a35bec44001b..6ceba60028ad 100644 --- a/core/res/res/drawable/btn_check_quantum_dark.xml +++ b/core/res/res/drawable/btn_check_quantum.xml @@ -17,18 +17,18 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_checked="true" android:state_pressed="true"> <bitmap android:src="@drawable/btn_check_on_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_checked="true"> <bitmap android:src="@drawable/btn_check_on_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_pressed="true"> <bitmap android:src="@drawable/btn_check_off_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item> <bitmap android:src="@drawable/btn_check_off_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/drawable/btn_check_quantum_light.xml b/core/res/res/drawable/btn_check_quantum_light.xml deleted file mode 100644 index 8588fce0dea6..000000000000 --- a/core/res/res/drawable/btn_check_quantum_light.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_checked="true" android:state_pressed="true"> - <bitmap android:src="@drawable/btn_check_on_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_checked="true"> - <bitmap android:src="@drawable/btn_check_on_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_pressed="true"> - <bitmap android:src="@drawable/btn_check_off_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item> - <bitmap android:src="@drawable/btn_check_off_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> -</selector> diff --git a/core/res/res/drawable/btn_color_quantum_dark.xml b/core/res/res/drawable/btn_color_quantum.xml index 0507755a822f..e923003e0fef 100644 --- a/core/res/res/drawable/btn_color_quantum_dark.xml +++ b/core/res/res/drawable/btn_color_quantum.xml @@ -15,15 +15,15 @@ --> <touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/theme_color_300"> + android:tint="?attr/colorButtonPressedColored"> <selector> <item android:state_enabled="false"> <nine-patch android:src="@drawable/btn_qntm_alpha" - android:tint="@color/btn_default_normal_quantum_dark" /> + android:tint="?attr/colorButtonNormal" /> </item> <item> <nine-patch android:src="@drawable/btn_qntm_alpha" - android:tint="@color/theme_color_500" /> + android:tint="?attr/colorButtonNormalColored" /> </item> </selector> </touch-feedback> diff --git a/core/res/res/drawable/btn_color_quantum_light.xml b/core/res/res/drawable/btn_color_quantum_light.xml deleted file mode 100644 index 9166b8d66899..000000000000 --- a/core/res/res/drawable/btn_color_quantum_light.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?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. ---> - -<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/theme_color_700"> - <selector> - <item android:state_enabled="false"> - <nine-patch android:src="@drawable/btn_qntm_alpha" - android:tint="@color/btn_default_normal_quantum_dark" /> - </item> - <item> - <nine-patch android:src="@drawable/btn_qntm_alpha" - android:tint="@color/theme_color_500" /> - </item> - </selector> -</touch-feedback> diff --git a/core/res/res/drawable/btn_default_quantum_dark.xml b/core/res/res/drawable/btn_default_quantum.xml index 29c3e24c1fd7..4cb8301373ce 100644 --- a/core/res/res/drawable/btn_default_quantum_dark.xml +++ b/core/res/res/drawable/btn_default_quantum.xml @@ -15,7 +15,7 @@ --> <touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/btn_default_pressed_quantum_dark"> + android:tint="?attr/colorButtonPressed"> <nine-patch android:src="@drawable/btn_qntm_alpha" - android:tint="@color/btn_default_normal_quantum_dark" /> + android:tint="?attr/colorButtonNormal" /> </touch-feedback> diff --git a/core/res/res/drawable/btn_default_quantum_light.xml b/core/res/res/drawable/btn_default_quantum_light.xml deleted file mode 100644 index c6e828c8c279..000000000000 --- a/core/res/res/drawable/btn_default_quantum_light.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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. ---> - -<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/btn_default_pressed_quantum_light"> - <nine-patch android:src="@drawable/btn_qntm_alpha" - android:tint="@color/btn_default_normal_quantum_light" /> -</touch-feedback> diff --git a/core/res/res/drawable/btn_radio_quantum_dark.xml b/core/res/res/drawable/btn_radio_quantum.xml index 54f4f9a4abda..152e3d350ef8 100644 --- a/core/res/res/drawable/btn_radio_quantum_dark.xml +++ b/core/res/res/drawable/btn_radio_quantum.xml @@ -17,18 +17,18 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_checked="true" android:state_enabled="true" android:state_pressed="true"> <bitmap android:src="@drawable/btn_radio_on_pressed_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_checked="true"> <bitmap android:src="@drawable/btn_radio_on_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_enabled="true" android:state_pressed="true"> <bitmap android:src="@drawable/btn_radio_off_pressed_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item> <bitmap android:src="@drawable/btn_radio_off_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/drawable/btn_radio_quantum_light.xml b/core/res/res/drawable/btn_radio_quantum_light.xml deleted file mode 100644 index c1ace70b5f93..000000000000 --- a/core/res/res/drawable/btn_radio_quantum_light.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_checked="true" android:state_enabled="true" android:state_pressed="true"> - <bitmap android:src="@drawable/btn_radio_on_pressed_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_checked="true"> - <bitmap android:src="@drawable/btn_radio_on_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_enabled="true" android:state_pressed="true"> - <bitmap android:src="@drawable/btn_radio_off_pressed_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item> - <bitmap android:src="@drawable/btn_radio_off_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> -</selector> diff --git a/core/res/res/drawable/btn_star_quantum_dark.xml b/core/res/res/drawable/btn_star_quantum.xml index 7b26a3cecfbf..512cd57515a1 100644 --- a/core/res/res/drawable/btn_star_quantum_dark.xml +++ b/core/res/res/drawable/btn_star_quantum.xml @@ -17,14 +17,14 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_checked="true"> <bitmap android:src="@drawable/btn_star_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_pressed="true"> <bitmap android:src="@drawable/btn_star_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item> <bitmap android:src="@drawable/btn_star_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/drawable/btn_star_quantum_light.xml b/core/res/res/drawable/btn_star_quantum_light.xml deleted file mode 100644 index df2cc91958bb..000000000000 --- a/core/res/res/drawable/btn_star_quantum_light.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_checked="true"> - <bitmap android:src="@drawable/btn_star_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_pressed="true"> - <bitmap android:src="@drawable/btn_star_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item> - <bitmap android:src="@drawable/btn_star_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> -</selector> diff --git a/core/res/res/drawable/edit_text_quantum_dark.xml b/core/res/res/drawable/edit_text_quantum.xml index ea3fc52d12dd..d1f9831fb478 100644 --- a/core/res/res/drawable/edit_text_quantum_dark.xml +++ b/core/res/res/drawable/edit_text_quantum.xml @@ -17,26 +17,26 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_window_focused="false" android:state_enabled="true"> <nine-patch android:src="@drawable/textfield_default_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> <item android:state_window_focused="false" android:state_enabled="false"> <nine-patch android:src="@drawable/textfield_default_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> <item android:state_enabled="true" android:state_focused="true"> <nine-patch android:src="@drawable/textfield_activated_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_enabled="true" android:state_activated="true"> <nine-patch android:src="@drawable/textfield_activated_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_enabled="true"> <nine-patch android:src="@drawable/textfield_default_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> <item> <nine-patch android:src="@drawable/textfield_default_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/drawable/edit_text_quantum_light.xml b/core/res/res/drawable/edit_text_quantum_light.xml deleted file mode 100644 index dd7fe5399013..000000000000 --- a/core/res/res/drawable/edit_text_quantum_light.xml +++ /dev/null @@ -1,42 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_window_focused="false" android:state_enabled="true"> - <nine-patch android:src="@drawable/textfield_default_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> - <item android:state_window_focused="false" android:state_enabled="false"> - <nine-patch android:src="@drawable/textfield_default_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> - <item android:state_enabled="true" android:state_focused="true"> - <nine-patch android:src="@drawable/textfield_activated_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_enabled="true" android:state_activated="true"> - <nine-patch android:src="@drawable/textfield_activated_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_enabled="true"> - <nine-patch android:src="@drawable/textfield_default_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> - <item> - <nine-patch android:src="@drawable/textfield_default_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> -</selector> diff --git a/core/res/res/drawable/expander_group_quantum_dark.xml b/core/res/res/drawable/expander_group_quantum.xml index 7250e01270af..48245ea31609 100644 --- a/core/res/res/drawable/expander_group_quantum_dark.xml +++ b/core/res/res/drawable/expander_group_quantum.xml @@ -17,10 +17,10 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_expanded="true"> <nine-patch android:src="@drawable/expander_close_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> <item> <nine-patch android:src="@drawable/expander_open_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/drawable/expander_group_quantum_light.xml b/core/res/res/drawable/expander_group_quantum_light.xml deleted file mode 100644 index 62af983a9937..000000000000 --- a/core/res/res/drawable/expander_group_quantum_light.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_expanded="true"> - <nine-patch android:src="@drawable/expander_close_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> - <item> - <nine-patch android:src="@drawable/expander_open_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> -</selector> diff --git a/core/res/res/drawable/fastscroll_thumb_quantum_dark.xml b/core/res/res/drawable/fastscroll_thumb_quantum.xml index 53c7fddb5455..496b2ae7d69d 100644 --- a/core/res/res/drawable/fastscroll_thumb_quantum_dark.xml +++ b/core/res/res/drawable/fastscroll_thumb_quantum.xml @@ -17,10 +17,10 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true"> <bitmap android:src="@drawable/fastscroll_thumb_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item> <bitmap android:src="@drawable/fastscroll_thumb_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/drawable/fastscroll_thumb_quantum_light.xml b/core/res/res/drawable/fastscroll_thumb_quantum_light.xml deleted file mode 100644 index 3bc87e9d38cb..000000000000 --- a/core/res/res/drawable/fastscroll_thumb_quantum_light.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true"> - <bitmap android:src="@drawable/fastscroll_thumb_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item> - <bitmap android:src="@drawable/fastscroll_thumb_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> -</selector> diff --git a/core/res/res/drawable/fastscroll_track_quantum_light.xml b/core/res/res/drawable/fastscroll_track_quantum.xml index 627c079e268f..59c35db83e1c 100644 --- a/core/res/res/drawable/fastscroll_track_quantum_light.xml +++ b/core/res/res/drawable/fastscroll_track_quantum.xml @@ -16,4 +16,4 @@ <nine-patch xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/fastscroll_track_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/fastscroll_track_quantum_dark.xml b/core/res/res/drawable/fastscroll_track_quantum_dark.xml deleted file mode 100644 index 0ae57d270f29..000000000000 --- a/core/res/res/drawable/fastscroll_track_quantum_dark.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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/fastscroll_track_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_ab_back_quantum_dark.xml b/core/res/res/drawable/ic_ab_back_quantum.xml index 628d53e711a4..65c7584413bb 100644 --- a/core/res/res/drawable/ic_ab_back_quantum_dark.xml +++ b/core/res/res/drawable/ic_ab_back_quantum.xml @@ -17,4 +17,4 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_ab_back_qntm_am_alpha" android:autoMirrored="true" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/ic_ab_back_quantum_light.xml b/core/res/res/drawable/ic_ab_back_quantum_light.xml deleted file mode 100644 index 01f53620cdb0..000000000000 --- a/core/res/res/drawable/ic_ab_back_quantum_light.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_ab_back_qntm_am_alpha" - android:autoMirrored="true" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_cab_done_quantum_dark.xml b/core/res/res/drawable/ic_cab_done_quantum.xml index 472996e794e3..97495a82a6e8 100644 --- a/core/res/res/drawable/ic_cab_done_quantum_dark.xml +++ b/core/res/res/drawable/ic_cab_done_quantum.xml @@ -16,4 +16,4 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_cab_done_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/ic_cab_done_quantum_light.xml b/core/res/res/drawable/ic_cab_done_quantum_light.xml deleted file mode 100644 index d70a3f160627..000000000000 --- a/core/res/res/drawable/ic_cab_done_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_cab_done_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_dialog_alert_quantum_light.xml b/core/res/res/drawable/ic_dialog_alert_quantum.xml index 8b8cb0cb6fe8..05f3630860d0 100644 --- a/core/res/res/drawable/ic_dialog_alert_quantum_light.xml +++ b/core/res/res/drawable/ic_dialog_alert_quantum.xml @@ -16,4 +16,4 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_dialog_alert_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/ic_dialog_alert_quantum_dark.xml b/core/res/res/drawable/ic_dialog_alert_quantum_dark.xml deleted file mode 100644 index 8b8cb0cb6fe8..000000000000 --- a/core/res/res/drawable/ic_dialog_alert_quantum_dark.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_dialog_alert_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> diff --git a/core/res/res/drawable/ic_find_next_quantum_dark.xml b/core/res/res/drawable/ic_find_next_quantum.xml index 929bea339454..fee196cab19a 100644 --- a/core/res/res/drawable/ic_find_next_quantum_dark.xml +++ b/core/res/res/drawable/ic_find_next_quantum.xml @@ -16,4 +16,4 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_find_next_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/ic_find_next_quantum_light.xml b/core/res/res/drawable/ic_find_next_quantum_light.xml deleted file mode 100644 index 9c2032797ec5..000000000000 --- a/core/res/res/drawable/ic_find_next_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_find_next_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_find_previous_quantum_dark.xml b/core/res/res/drawable/ic_find_previous_quantum.xml index e944223bf8b4..28f887a0fae1 100644 --- a/core/res/res/drawable/ic_find_previous_quantum_dark.xml +++ b/core/res/res/drawable/ic_find_previous_quantum.xml @@ -16,4 +16,4 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_find_previous_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/ic_find_previous_quantum_light.xml b/core/res/res/drawable/ic_find_previous_quantum_light.xml deleted file mode 100644 index b037094e1f18..000000000000 --- a/core/res/res/drawable/ic_find_previous_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_find_previous_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_menu_copy_quantum_dark.xml b/core/res/res/drawable/ic_menu_copy_quantum.xml index 285b75218be7..5f6ce5102ced 100644 --- a/core/res/res/drawable/ic_menu_copy_quantum_dark.xml +++ b/core/res/res/drawable/ic_menu_copy_quantum.xml @@ -16,5 +16,5 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_menu_copy_qntm_am_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" + android:tint="?attr/colorControlNormal" android:autoMirrored="true" /> diff --git a/core/res/res/drawable/ic_menu_copy_quantum_light.xml b/core/res/res/drawable/ic_menu_copy_quantum_light.xml deleted file mode 100644 index a40b219523a5..000000000000 --- a/core/res/res/drawable/ic_menu_copy_quantum_light.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_menu_copy_qntm_am_alpha" - android:tint="@color/control_normal_foreground_quantum_light" - android:autoMirrored="true" /> diff --git a/core/res/res/drawable/ic_menu_cut_quantum_dark.xml b/core/res/res/drawable/ic_menu_cut_quantum.xml index 563400bd1365..1e4996e5a3d2 100644 --- a/core/res/res/drawable/ic_menu_cut_quantum_dark.xml +++ b/core/res/res/drawable/ic_menu_cut_quantum.xml @@ -16,4 +16,4 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_menu_cut_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/ic_menu_cut_quantum_light.xml b/core/res/res/drawable/ic_menu_cut_quantum_light.xml deleted file mode 100644 index 36c9442168ae..000000000000 --- a/core/res/res/drawable/ic_menu_cut_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_menu_cut_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_menu_find_quantum_dark.xml b/core/res/res/drawable/ic_menu_find_quantum.xml index 88034637eac3..a69c673ccbec 100644 --- a/core/res/res/drawable/ic_menu_find_quantum_dark.xml +++ b/core/res/res/drawable/ic_menu_find_quantum.xml @@ -16,4 +16,4 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_menu_find_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/ic_menu_find_quantum_light.xml b/core/res/res/drawable/ic_menu_find_quantum_light.xml deleted file mode 100644 index 9b3bd73dd24c..000000000000 --- a/core/res/res/drawable/ic_menu_find_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_menu_find_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_menu_moreoverflow_quantum_dark.xml b/core/res/res/drawable/ic_menu_moreoverflow_quantum.xml index 9f39a6839ba6..7d3fcac636f3 100644 --- a/core/res/res/drawable/ic_menu_moreoverflow_quantum_dark.xml +++ b/core/res/res/drawable/ic_menu_moreoverflow_quantum.xml @@ -16,4 +16,4 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_menu_moreoverflow_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/ic_menu_moreoverflow_quantum_light.xml b/core/res/res/drawable/ic_menu_moreoverflow_quantum_light.xml deleted file mode 100644 index e15eaec9fc09..000000000000 --- a/core/res/res/drawable/ic_menu_moreoverflow_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_menu_moreoverflow_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_menu_paste_quantum_dark.xml b/core/res/res/drawable/ic_menu_paste_quantum.xml index 7033404e6490..f590904912a3 100644 --- a/core/res/res/drawable/ic_menu_paste_quantum_dark.xml +++ b/core/res/res/drawable/ic_menu_paste_quantum.xml @@ -16,5 +16,5 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_menu_paste_qntm_am_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" + android:tint="?attr/colorControlNormal" android:autoMirrored="true" /> diff --git a/core/res/res/drawable/ic_menu_paste_quantum_light.xml b/core/res/res/drawable/ic_menu_paste_quantum_light.xml deleted file mode 100644 index 155ec346cef3..000000000000 --- a/core/res/res/drawable/ic_menu_paste_quantum_light.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_menu_paste_qntm_am_alpha" - android:tint="@color/control_normal_foreground_quantum_light" - android:autoMirrored="true" /> diff --git a/core/res/res/drawable/ic_menu_search_quantum_dark.xml b/core/res/res/drawable/ic_menu_search_quantum.xml index 1c6efcd330fe..2ca8c2063442 100644 --- a/core/res/res/drawable/ic_menu_search_quantum_dark.xml +++ b/core/res/res/drawable/ic_menu_search_quantum.xml @@ -16,4 +16,4 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_menu_search_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/ic_menu_search_quantum_light.xml b/core/res/res/drawable/ic_menu_search_quantum_light.xml deleted file mode 100644 index ba6efb6e3aa6..000000000000 --- a/core/res/res/drawable/ic_menu_search_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_menu_search_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_menu_selectall_quantum_dark.xml b/core/res/res/drawable/ic_menu_selectall_quantum.xml index c1d3e699b5c4..fd72ebf2ab7d 100644 --- a/core/res/res/drawable/ic_menu_selectall_quantum_dark.xml +++ b/core/res/res/drawable/ic_menu_selectall_quantum.xml @@ -16,4 +16,4 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_menu_selectall_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/ic_menu_selectall_quantum_light.xml b/core/res/res/drawable/ic_menu_selectall_quantum_light.xml deleted file mode 100644 index 4de8962234fd..000000000000 --- a/core/res/res/drawable/ic_menu_selectall_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_menu_selectall_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/ic_menu_share_quantum_dark.xml b/core/res/res/drawable/ic_menu_share_quantum.xml index a7c5afcde2e2..f44e06c2ead1 100644 --- a/core/res/res/drawable/ic_menu_share_quantum_dark.xml +++ b/core/res/res/drawable/ic_menu_share_quantum.xml @@ -16,4 +16,4 @@ <bitmap xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/ic_menu_share_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/ic_menu_share_quantum_light.xml b/core/res/res/drawable/ic_menu_share_quantum_light.xml deleted file mode 100644 index 9257c25c4423..000000000000 --- a/core/res/res/drawable/ic_menu_share_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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. ---> - -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/ic_menu_share_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/item_background_borderless_quantum_light.xml b/core/res/res/drawable/item_background_borderless_quantum_light.xml deleted file mode 100644 index 09f6ae92d2ce..000000000000 --- a/core/res/res/drawable/item_background_borderless_quantum_light.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?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. ---> - -<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/darker_gray" /> diff --git a/core/res/res/drawable/item_background_borderless_quantum_dark.xml b/core/res/res/drawable/item_background_quantum.xml index 3f328501e658..f668ca037f2c 100644 --- a/core/res/res/drawable/item_background_borderless_quantum_dark.xml +++ b/core/res/res/drawable/item_background_quantum.xml @@ -15,4 +15,4 @@ --> <touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/lighter_gray" /> + android:tint="?attr/colorButtonPressed" /> diff --git a/core/res/res/drawable/item_background_quantum_dark.xml b/core/res/res/drawable/item_background_quantum_dark.xml deleted file mode 100644 index 3f328501e658..000000000000 --- a/core/res/res/drawable/item_background_quantum_dark.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?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. ---> - -<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/lighter_gray" /> diff --git a/core/res/res/drawable/item_background_quantum_light.xml b/core/res/res/drawable/item_background_quantum_light.xml deleted file mode 100644 index 09f6ae92d2ce..000000000000 --- a/core/res/res/drawable/item_background_quantum_light.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?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. ---> - -<touch-feedback xmlns:android="http://schemas.android.com/apk/res/android" - android:tint="@color/darker_gray" /> diff --git a/core/res/res/drawable/list_divider_quantum_dark.xml b/core/res/res/drawable/list_divider_quantum.xml index 9d05b2f4e1d5..e3d4ba275cf4 100644 --- a/core/res/res/drawable/list_divider_quantum_dark.xml +++ b/core/res/res/drawable/list_divider_quantum.xml @@ -16,4 +16,4 @@ <nine-patch xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/list_divider_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/list_divider_quantum_light.xml b/core/res/res/drawable/list_divider_quantum_light.xml deleted file mode 100644 index d312e2d05d75..000000000000 --- a/core/res/res/drawable/list_divider_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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/list_divider_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/list_section_divider_quantum_dark.xml b/core/res/res/drawable/list_section_divider_quantum.xml index 6344c7eee634..87a1439e88ee 100644 --- a/core/res/res/drawable/list_section_divider_quantum_dark.xml +++ b/core/res/res/drawable/list_section_divider_quantum.xml @@ -16,4 +16,4 @@ <nine-patch xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/list_section_divider_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/list_section_divider_quantum_light.xml b/core/res/res/drawable/list_section_divider_quantum_light.xml deleted file mode 100644 index 98ede3878000..000000000000 --- a/core/res/res/drawable/list_section_divider_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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/list_section_divider_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/progress_horizontal_quantum_dark.xml b/core/res/res/drawable/progress_horizontal_quantum.xml index fb4b67eac067..1c2d494ce142 100644 --- a/core/res/res/drawable/progress_horizontal_quantum_dark.xml +++ b/core/res/res/drawable/progress_horizontal_quantum.xml @@ -17,18 +17,18 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@id/background"> <nine-patch android:src="@drawable/progress_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> <item android:id="@id/secondaryProgress"> <scale android:scaleWidth="100%"> <nine-patch android:src="@drawable/progress_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </scale> </item> <item android:id="@id/progress"> <scale android:scaleWidth="100%"> <nine-patch android:src="@drawable/progress_primary_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </scale> </item> </layer-list> diff --git a/core/res/res/drawable/progress_horizontal_quantum_light.xml b/core/res/res/drawable/progress_horizontal_quantum_light.xml deleted file mode 100644 index 1ceb2e23ae18..000000000000 --- a/core/res/res/drawable/progress_horizontal_quantum_light.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> - -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:id="@id/background"> - <nine-patch android:src="@drawable/progress_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> - <item android:id="@id/secondaryProgress"> - <scale android:scaleWidth="100%"> - <nine-patch android:src="@drawable/progress_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </scale> - </item> - <item android:id="@id/progress"> - <scale android:scaleWidth="100%"> - <nine-patch android:src="@drawable/progress_primary_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </scale> - </item> -</layer-list> diff --git a/core/res/res/drawable/scrollbar_handle_quantum_dark.xml b/core/res/res/drawable/scrollbar_handle_quantum.xml index 2d4e37dcb422..f2de25259418 100644 --- a/core/res/res/drawable/scrollbar_handle_quantum_dark.xml +++ b/core/res/res/drawable/scrollbar_handle_quantum.xml @@ -16,4 +16,4 @@ <nine-patch xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/scrollbar_handle_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> diff --git a/core/res/res/drawable/scrollbar_handle_quantum_light.xml b/core/res/res/drawable/scrollbar_handle_quantum_light.xml deleted file mode 100644 index d4d4b8d4390a..000000000000 --- a/core/res/res/drawable/scrollbar_handle_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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/scrollbar_handle_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> diff --git a/core/res/res/drawable/scrubber_control_selector_quantum_dark.xml b/core/res/res/drawable/scrubber_control_selector_quantum.xml index 521bccafe22f..e31c2c159137 100644 --- a/core/res/res/drawable/scrubber_control_selector_quantum_dark.xml +++ b/core/res/res/drawable/scrubber_control_selector_quantum.xml @@ -17,10 +17,10 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="true" android:state_pressed="true"> <bitmap android:src="@drawable/scrubber_control_on_pressed_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item> <bitmap android:src="@drawable/scrubber_control_on_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/drawable/scrubber_control_selector_quantum_light.xml b/core/res/res/drawable/scrubber_control_selector_quantum_light.xml deleted file mode 100644 index 8d009b713fb1..000000000000 --- a/core/res/res/drawable/scrubber_control_selector_quantum_light.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="true" android:state_pressed="true"> - <bitmap android:src="@drawable/scrubber_control_on_pressed_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item> - <bitmap android:src="@drawable/scrubber_control_on_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> -</selector> diff --git a/core/res/res/drawable/scrubber_progress_horizontal_quantum_dark.xml b/core/res/res/drawable/scrubber_progress_horizontal_quantum.xml index fa0d631219ed..7b124acd6dbe 100644 --- a/core/res/res/drawable/scrubber_progress_horizontal_quantum_dark.xml +++ b/core/res/res/drawable/scrubber_progress_horizontal_quantum.xml @@ -17,10 +17,10 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_pressed="true"> <bitmap android:src="@drawable/scrubber_primary_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item> <bitmap android:src="@drawable/scrubber_primary_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/drawable/scrubber_progress_horizontal_quantum_light.xml b/core/res/res/drawable/scrubber_progress_horizontal_quantum_light.xml deleted file mode 100644 index 053f54258b24..000000000000 --- a/core/res/res/drawable/scrubber_progress_horizontal_quantum_light.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true"> - <bitmap android:src="@drawable/scrubber_primary_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item> - <bitmap android:src="@drawable/scrubber_primary_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> -</selector> diff --git a/core/res/res/drawable/spinner_background_quantum_dark.xml b/core/res/res/drawable/spinner_background_quantum.xml index d1e740769c85..727a78f9e119 100644 --- a/core/res/res/drawable/spinner_background_quantum_dark.xml +++ b/core/res/res/drawable/spinner_background_quantum.xml @@ -18,14 +18,14 @@ android:autoMirrored="true"> <item android:state_checked="true"> <nine-patch android:src="@drawable/spinner_qntm_am_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_pressed="true"> <nine-patch android:src="@drawable/spinner_qntm_am_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item> <nine-patch android:src="@drawable/spinner_qntm_am_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/drawable/spinner_background_quantum_light.xml b/core/res/res/drawable/spinner_background_quantum_light.xml deleted file mode 100644 index b01628decfb1..000000000000 --- a/core/res/res/drawable/spinner_background_quantum_light.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android" - android:autoMirrored="true"> - <item android:state_checked="true"> - <nine-patch android:src="@drawable/spinner_qntm_am_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_pressed="true"> - <nine-patch android:src="@drawable/spinner_qntm_am_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item> - <nine-patch android:src="@drawable/spinner_qntm_am_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> -</selector> diff --git a/core/res/res/drawable/switch_inner_quantum_dark.xml b/core/res/res/drawable/switch_inner_quantum.xml index 927a55e56ded..915377e98b6a 100644 --- a/core/res/res/drawable/switch_inner_quantum_dark.xml +++ b/core/res/res/drawable/switch_inner_quantum.xml @@ -17,18 +17,18 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_checked="true" android:state_pressed="true"> <nine-patch android:src="@drawable/switch_on_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_checked="true"> <nine-patch android:src="@drawable/switch_on_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_pressed="true"> <nine-patch android:src="@drawable/switch_off_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item> <nine-patch android:src="@drawable/switch_off_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/drawable/switch_inner_quantum_light.xml b/core/res/res/drawable/switch_inner_quantum_light.xml deleted file mode 100644 index b5aa47b6d179..000000000000 --- a/core/res/res/drawable/switch_inner_quantum_light.xml +++ /dev/null @@ -1,34 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_checked="true" android:state_pressed="true"> - <nine-patch android:src="@drawable/switch_on_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_checked="true"> - <nine-patch android:src="@drawable/switch_on_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_pressed="true"> - <nine-patch android:src="@drawable/switch_off_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item> - <nine-patch android:src="@drawable/switch_off_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> -</selector> diff --git a/core/res/res/drawable/switch_track_quantum_dark.xml b/core/res/res/drawable/switch_track_quantum.xml index c018bd245083..8c4e6b7114f5 100644 --- a/core/res/res/drawable/switch_track_quantum_dark.xml +++ b/core/res/res/drawable/switch_track_quantum.xml @@ -17,10 +17,10 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_checked="true"> <nine-patch android:src="@drawable/switch_track_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item> <nine-patch android:src="@drawable/switch_track_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/drawable/switch_track_quantum_light.xml b/core/res/res/drawable/switch_track_quantum_light.xml deleted file mode 100644 index ab87a5732a3a..000000000000 --- a/core/res/res/drawable/switch_track_quantum_light.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_checked="true"> - <nine-patch android:src="@drawable/switch_track_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item> - <nine-patch android:src="@drawable/switch_track_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> -</selector> diff --git a/core/res/res/drawable/tab_indicator_quantum_dark.xml b/core/res/res/drawable/tab_indicator_quantum.xml index 9b57c33ab1c4..6fabe23b5cc3 100644 --- a/core/res/res/drawable/tab_indicator_quantum_dark.xml +++ b/core/res/res/drawable/tab_indicator_quantum.xml @@ -17,27 +17,27 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_selected="true" android:state_pressed="true"> <nine-patch android:src="@drawable/tab_indicator_selected_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_selected="true" android:state_focused="true"> <nine-patch android:src="@drawable/tab_indicator_selected_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_selected="true"> <nine-patch android:src="@drawable/tab_indicator_selected_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> <item android:state_pressed="true"> <nine-patch android:src="@drawable/tab_indicator_normal_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item android:state_focused="true"> <nine-patch android:src="@drawable/tab_indicator_normal_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> </item> <item> <nine-patch android:src="@drawable/tab_indicator_normal_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_dark" /> + android:tint="?attr/colorControlNormal" /> </item> </selector> diff --git a/core/res/res/drawable/tab_indicator_quantum_light.xml b/core/res/res/drawable/tab_indicator_quantum_light.xml deleted file mode 100644 index 371322a8e0e8..000000000000 --- a/core/res/res/drawable/tab_indicator_quantum_light.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_selected="true" android:state_pressed="true"> - <nine-patch android:src="@drawable/tab_indicator_selected_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_selected="true" android:state_focused="true"> - <nine-patch android:src="@drawable/tab_indicator_selected_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_selected="true"> - <nine-patch android:src="@drawable/tab_indicator_selected_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> - - <item android:state_pressed="true"> - <nine-patch android:src="@drawable/tab_indicator_normal_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item android:state_focused="true"> - <nine-patch android:src="@drawable/tab_indicator_normal_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> - </item> - <item> - <nine-patch android:src="@drawable/tab_indicator_normal_qntm_alpha" - android:tint="@color/control_normal_foreground_quantum_light" /> - </item> -</selector> diff --git a/core/res/res/drawable/text_cursor_quantum_dark.xml b/core/res/res/drawable/text_cursor_quantum.xml index bd0d66fd2174..23d4ae0318c8 100644 --- a/core/res/res/drawable/text_cursor_quantum_dark.xml +++ b/core/res/res/drawable/text_cursor_quantum.xml @@ -16,4 +16,4 @@ <nine-patch xmlns:android="http://schemas.android.com/apk/res/android" android:src="@drawable/text_cursor_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_dark" /> + android:tint="?attr/colorControlActivated" /> diff --git a/core/res/res/drawable/text_cursor_quantum_light.xml b/core/res/res/drawable/text_cursor_quantum_light.xml deleted file mode 100644 index 0ec7f01d3f94..000000000000 --- a/core/res/res/drawable/text_cursor_quantum_light.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?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/text_cursor_qntm_alpha" - android:tint="@color/control_activated_foreground_quantum_light" /> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 4d272ee174bd..0cdaba805907 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -910,6 +910,16 @@ <!-- Drawable for WebView find-on-page dialogue's "previous" button. @hide --> <attr name="findOnPagePreviousDrawable" format="reference" /> + <!-- ============= --> + <!-- Color palette --> + <!-- ============= --> + <attr name="colorControlNormal" format="color" /> + <attr name="colorControlActivated" format="color" /> + <attr name="colorButtonNormal" format="color" /> + <attr name="colorButtonPressed" format="color" /> + <attr name="colorButtonNormalColored" format="color" /> + <attr name="colorButtonPressedColored" format="color" /> + </declare-styleable> <!-- **************************************************************** --> diff --git a/core/res/res/values/colors_quantum.xml b/core/res/res/values/colors_quantum.xml index c8083f49d7e7..d10f7c06aae2 100644 --- a/core/res/res/values/colors_quantum.xml +++ b/core/res/res/values/colors_quantum.xml @@ -148,13 +148,13 @@ <!-- Text & foreground colors --> - <color name="primary_text_quantum_light">#ff000000</color> - <color name="secondary_text_quantum_light">#de000000</color> - <color name="tertiary_text_quantum_light">#8a000000</color> + <color name="primary_text_quantum_light">#de000000</color> + <color name="secondary_text_quantum_light">#8a000000</color> + <color name="tertiary_text_quantum_light">#4d000000</color> - <color name="primary_text_quantum_dark">#ffffffff</color> - <color name="secondary_text_quantum_dark">#deffffff</color> - <color name="tertiary_text_quantum_dark">#8affffff</color> + <color name="primary_text_quantum_dark">#deffffff</color> + <color name="secondary_text_quantum_dark">#8affffff</color> + <color name="tertiary_text_quantum_dark">#4dffffff</color> <!-- "Theme" colors to be replaced by attrs when available --> <color name="theme_color_100">@color/quantum_teal_100</color> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 64cdc05c4c72..d0dadf372815 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2115,6 +2115,12 @@ <public type="attr" name="transitionGroup" /> <public type="attr" name="requiredForProfile"/> <public type="attr" name="pinned" /> + <public type="attr" name="colorControlNormal" /> + <public type="attr" name="colorControlActivated" /> + <public type="attr" name="colorButtonNormal" /> + <public type="attr" name="colorButtonPressed" /> + <public type="attr" name="colorButtonNormalColored" /> + <public type="attr" name="colorButtonPressedColored" /> <public type="dimen" name="recents_thumbnail_height" /> <public type="dimen" name="recents_thumbnail_width" /> @@ -2147,13 +2153,9 @@ <public type="style" name="TextAppearance.Quantum.Widget" /> <public type="style" name="TextAppearance.Quantum.Widget.ActionBar.Menu" /> <public type="style" name="TextAppearance.Quantum.Widget.ActionBar.Subtitle" /> - <public type="style" name="TextAppearance.Quantum.Widget.ActionBar.Subtitle.Inverse" /> <public type="style" name="TextAppearance.Quantum.Widget.ActionBar.Title" /> - <public type="style" name="TextAppearance.Quantum.Widget.ActionBar.Title.Inverse" /> <public type="style" name="TextAppearance.Quantum.Widget.ActionMode.Subtitle" /> - <public type="style" name="TextAppearance.Quantum.Widget.ActionMode.Subtitle.Inverse" /> <public type="style" name="TextAppearance.Quantum.Widget.ActionMode.Title" /> - <public type="style" name="TextAppearance.Quantum.Widget.ActionMode.Title.Inverse" /> <public type="style" name="TextAppearance.Quantum.Widget.Button" /> <public type="style" name="TextAppearance.Quantum.Widget.DropDownHint" /> <public type="style" name="TextAppearance.Quantum.Widget.DropDownItem" /> @@ -2215,6 +2217,8 @@ <public type="style" name="Widget.Quantum.Button.Inset" /> <public type="style" name="Widget.Quantum.Button.Small" /> <public type="style" name="Widget.Quantum.Button.Toggle" /> + <public type="style" name="Widget.Quantum.ButtonBar" /> + <public type="style" name="Widget.Quantum.ButtonBar.AlertDialog" /> <public type="style" name="Widget.Quantum.CalendarView" /> <public type="style" name="Widget.Quantum.CheckedTextView" /> <public type="style" name="Widget.Quantum.CompoundButton.CheckBox" /> @@ -2246,6 +2250,7 @@ <public type="style" name="Widget.Quantum.RatingBar.Small" /> <public type="style" name="Widget.Quantum.ScrollView" /> <public type="style" name="Widget.Quantum.SeekBar" /> + <public type="style" name="Widget.Quantum.SegmentedButton" /> <public type="style" name="Widget.Quantum.Spinner" /> <public type="style" name="Widget.Quantum.Tab" /> <public type="style" name="Widget.Quantum.TabWidget" /> @@ -2257,17 +2262,12 @@ <public type="style" name="Widget.Quantum.Light" /> <public type="style" name="Widget.Quantum.Light.ActionBar" /> <public type="style" name="Widget.Quantum.Light.ActionBar.Solid" /> - <public type="style" name="Widget.Quantum.Light.ActionBar.Solid.Inverse" /> <public type="style" name="Widget.Quantum.Light.ActionBar.TabBar" /> - <public type="style" name="Widget.Quantum.Light.ActionBar.TabBar.Inverse" /> <public type="style" name="Widget.Quantum.Light.ActionBar.TabText" /> - <public type="style" name="Widget.Quantum.Light.ActionBar.TabText.Inverse" /> <public type="style" name="Widget.Quantum.Light.ActionBar.TabView" /> - <public type="style" name="Widget.Quantum.Light.ActionBar.TabView.Inverse" /> <public type="style" name="Widget.Quantum.Light.ActionButton" /> <public type="style" name="Widget.Quantum.Light.ActionButton.CloseMode" /> <public type="style" name="Widget.Quantum.Light.ActionButton.Overflow" /> - <public type="style" name="Widget.Quantum.Light.ActionMode.Inverse" /> <public type="style" name="Widget.Quantum.Light.ActionMode" /> <public type="style" name="Widget.Quantum.Light.AutoCompleteTextView" /> <public type="style" name="Widget.Quantum.Light.Button" /> @@ -2275,6 +2275,8 @@ <public type="style" name="Widget.Quantum.Light.Button.Inset" /> <public type="style" name="Widget.Quantum.Light.Button.Small" /> <public type="style" name="Widget.Quantum.Light.Button.Toggle" /> + <public type="style" name="Widget.Quantum.Light.ButtonBar" /> + <public type="style" name="Widget.Quantum.Light.ButtonBar.AlertDialog" /> <public type="style" name="Widget.Quantum.Light.CalendarView" /> <public type="style" name="Widget.Quantum.Light.CheckedTextView" /> <public type="style" name="Widget.Quantum.Light.CompoundButton.CheckBox" /> @@ -2308,6 +2310,7 @@ <public type="style" name="Widget.Quantum.Light.RatingBar.Small" /> <public type="style" name="Widget.Quantum.Light.ScrollView" /> <public type="style" name="Widget.Quantum.Light.SeekBar" /> + <public type="style" name="Widget.Quantum.Light.SegmentedButton" /> <public type="style" name="Widget.Quantum.Light.Spinner" /> <public type="style" name="Widget.Quantum.Light.Tab" /> <public type="style" name="Widget.Quantum.Light.TabWidget" /> @@ -2316,14 +2319,6 @@ <public type="style" name="Widget.Quantum.Light.WebTextView" /> <public type="style" name="Widget.Quantum.Light.WebView" /> - <public type="style" name="Quantum.ButtonBar.AlertDialog" /> - <public type="style" name="Quantum.ButtonBar" /> - <public type="style" name="Quantum.SegmentedButton" /> - - <public type="style" name="Quantum.Light.ButtonBar.AlertDialog" /> - <public type="style" name="Quantum.Light.ButtonBar" /> - <public type="style" name="Quantum.Light.SegmentedButton" /> - <public type="style" name="Widget.Quantum.Button.Paper" /> <public type="style" name="Widget.Quantum.Button.Paper.Color" /> diff --git a/core/res/res/values/styles_quantum.xml b/core/res/res/values/styles_quantum.xml index 44cdb5f4fbce..2020feaab261 100644 --- a/core/res/res/values/styles_quantum.xml +++ b/core/res/res/values/styles_quantum.xml @@ -30,7 +30,7 @@ please see styles_device_defaults.xml. --> <resources> <!-- Preference styles --> - <eat-comment /> + <eat-comment/> <style name="Preference.Quantum"> <item name="layout">@layout/preference_holo</item> @@ -90,16 +90,98 @@ please see styles_device_defaults.xml. <!-- Text styles --> - <style name="TextAppearance.Quantum" parent="TextAppearance"/> + <style name="TextAppearance.Quantum"> + <item name="textColor">?textColorPrimary</item> + <item name="textColorHint">?textColorHint</item> + <item name="textColorHighlight">?textColorHighlight</item> + <item name="textColorLink">?textColorLink</item> + <item name="textSize">@dimen/text_size_body_1_quantum</item> + <item name="fontFamily">@string/font_family_body_1_quantum</item> + </style> + + <style name="TextAppearance.Quantum.Display4"> + <item name="textSize">@dimen/text_size_display_4_quantum</item> + <item name="fontFamily">@string/font_family_display_4_quantum</item> + <item name="textColor">?textColorSecondary</item> + </style> + + <style name="TextAppearance.Quantum.Display3"> + <item name="textSize">@dimen/text_size_display_3_quantum</item> + <item name="fontFamily">@string/font_family_display_3_quantum</item> + <item name="textColor">?textColorSecondary</item> + </style> + + <style name="TextAppearance.Quantum.Display2"> + <item name="textSize">@dimen/text_size_display_2_quantum</item> + <item name="fontFamily">@string/font_family_display_2_quantum</item> + <item name="textColor">?textColorSecondary</item> + </style> + + <style name="TextAppearance.Quantum.Display1"> + <item name="textSize">@dimen/text_size_display_1_quantum</item> + <item name="fontFamily">@string/font_family_display_1_quantum</item> + <item name="textColor">?textColorSecondary</item> + </style> + + <style name="TextAppearance.Quantum.Headline"> + <item name="textSize">@dimen/text_size_headline_quantum</item> + <item name="fontFamily">@string/font_family_headline_quantum</item> + <item name="textColor">?textColorPrimary</item> + </style> + + <style name="TextAppearance.Quantum.Title"> + <item name="textSize">@dimen/text_size_title_quantum</item> + <item name="fontFamily">@string/font_family_title_quantum</item> + <item name="textColor">?textColorPrimary</item> + </style> + + <style name="TextAppearance.Quantum.Subhead"> + <item name="textSize">@dimen/text_size_subhead_quantum</item> + <item name="fontFamily">@string/font_family_subhead_quantum</item> + <item name="textColor">?textColorPrimary</item> + </style> + + <style name="TextAppearance.Quantum.Body2"> + <item name="textSize">@dimen/text_size_body_2_quantum</item> + <item name="fontFamily">@string/font_family_body_2_quantum</item> + <item name="textColor">?textColorPrimary</item> + </style> + + <style name="TextAppearance.Quantum.Body1"> + <item name="textSize">@dimen/text_size_body_1_quantum</item> + <item name="fontFamily">@string/font_family_body_1_quantum</item> + <item name="textColor">?textColorPrimary</item> + </style> + + <style name="TextAppearance.Quantum.Caption"> + <item name="textSize">@dimen/text_size_caption_quantum</item> + <item name="fontFamily">@string/font_family_caption_quantum</item> + <item name="textColor">?textColorSecondary</item> + </style> + + <style name="TextAppearance.Quantum.Menu"> + <item name="textSize">@dimen/text_size_menu_quantum</item> + <item name="fontFamily">@string/font_family_menu_quantum</item> + <item name="textColor">?textColorPrimary</item> + </style> + + <style name="TextAppearance.Quantum.Button"> + <item name="textSize">@dimen/text_size_button_quantum</item> + <item name="fontFamily">@string/font_family_button_quantum</item> + <item name="textAllCaps">true</item> + <item name="textColor">?textColorPrimary</item> + </style> + + <!-- Deprecated text styles --> - <style name="TextAppearance.Quantum.Inverse" parent="TextAppearance.Inverse"> + <style name="TextAppearance.Quantum.Inverse"> <item name="textColor">?attr/textColorPrimaryInverse</item> <item name="textColorHint">?attr/textColorHintInverse</item> <item name="textColorHighlight">?attr/textColorHighlightInverse</item> <item name="textColorLink">?attr/textColorLinkInverse</item> </style> - <style name="TextAppearance.Quantum.Large" parent="TextAppearance.Large"/> + <style name="TextAppearance.Quantum.Large" parent="TextAppearance.Quantum.Headline" /> <style name="TextAppearance.Quantum.Large.Inverse"> <item name="textColor">?attr/textColorPrimaryInverse</item> @@ -108,7 +190,7 @@ please see styles_device_defaults.xml. <item name="textColorLink">?attr/textColorLinkInverse</item> </style> - <style name="TextAppearance.Quantum.Medium" parent="TextAppearance.Medium"/> + <style name="TextAppearance.Quantum.Medium" parent="TextAppearance.Quantum.Body1" /> <style name="TextAppearance.Quantum.Medium.Inverse"> <item name="textColor">?attr/textColorSecondaryInverse</item> @@ -117,65 +199,50 @@ please see styles_device_defaults.xml. <item name="textColorLink">?attr/textColorLinkInverse</item> </style> - <style name="TextAppearance.Quantum.Small" parent="TextAppearance.Small"/> + <style name="TextAppearance.Quantum.Small" parent="TextAppearance.Quantum.Caption" /> <style name="TextAppearance.Quantum.Small.Inverse"> - <item name="textColor">?attr/textColorSecondaryInverse</item> + <item name="textColor">?attr/textColorTertiaryInverse</item> <item name="textColorHint">?attr/textColorHintInverse</item> <item name="textColorHighlight">?attr/textColorHighlightInverse</item> <item name="textColorLink">?attr/textColorLinkInverse</item> </style> <style name="TextAppearance.Quantum.SearchResult"> - <item name="textStyle">normal</item> - <item name="textColor">?attr/textColorPrimary</item> - <item name="textColorHint">?attr/textColorHint</item> - </style> - - <style name="TextAppearance.Quantum.SearchResult.Title"> - <item name="textSize">18sp</item> </style> - <style name="TextAppearance.Quantum.SearchResult.Subtitle"> - <item name="textSize">14sp</item> - <item name="textColor">?attr/textColorSecondary</item> - </style> + <style name="TextAppearance.Quantum.SearchResult.Title" parent="TextAppearance.Quantum.Title" /> + <style name="TextAppearance.Quantum.SearchResult.Subtitle" parent="TextAppearance.Quantum.Subhead" /> - <style name="TextAppearance.Quantum.Widget" parent="TextAppearance.Widget"/> - - <style name="TextAppearance.Quantum.Widget.Button"> - <item name="fontFamily">@string/font_family_button_quantum</item> - <item name="textSize">@dimen/text_size_button_quantum</item> - <item name="textAllCaps">true</item> - <item name="textColor">?attr/textColorPrimary</item> - <item name="textStyle">normal</item> - </style> + <style name="TextAppearance.Quantum.Widget"/> + <style name="TextAppearance.Quantum.Widget.Button" parent="TextAppearance.Quantum.Button" /> <style name="TextAppearance.Quantum.Widget.EditText"> - <item name="textColor">?textColorPrimaryInverse</item> - <item name="textColorHint">?textColorHintInverse</item> + <item name="textColor">?attr/textColorPrimaryInverse</item> + <item name="textColorHint">?attr/textColorHintInverse</item> </style> - <style name="TextAppearance.Quantum.Widget.Switch" parent="TextAppearance.Quantum.Small"> - <item name="textColor">@color/secondary_text_quantum_dark</item> + <style name="TextAppearance.Quantum.Widget.Switch"> + <item name="textSize">14sp</item> </style> - <style name="TextAppearance.Quantum.Widget.PopupMenu" parent="TextAppearance.Widget.PopupMenu"> - <item name="textColor">?attr/textColorPrimary</item> - </style> + <style name="TextAppearance.Quantum.Widget.PopupMenu"/> <style name="TextAppearance.Quantum.Widget.PopupMenu.Large"> - <item name="textSize">18sp</item> + <item name="fontFamily">@string/font_family_menu_quantum</item> + <item name="textSize">@dimen/text_size_menu_quantum</item>> </style> <style name="TextAppearance.Quantum.Widget.PopupMenu.Small"> - <item name="textSize">14sp</item> + <item name="fontFamily">@string/font_family_menu_quantum</item> + <item name="textSize">@dimen/text_size_menu_quantum</item>> </style> <style name="TextAppearance.Quantum.Widget.DropDownHint"> - <item name="textColor">?attr/textColorPrimary</item> - <item name="textSize">14sp</item> + <item name="fontFamily">@string/font_family_menu_quantum</item> + <item name="textSize">@dimen/text_size_menu_quantum</item>> </style> + <style name="TextAppearance.Quantum.Widget.IconMenu.Item" parent="TextAppearance.Quantum.Small"> <item name="textColor">?attr/textColorPrimary</item> </style> @@ -194,10 +261,11 @@ please see styles_device_defaults.xml. </style> <style name="TextAppearance.Quantum.Widget.TextView.PopupMenu"> - <item name="textSize">18sp</item> + <item name="fontFamily">@string/font_family_menu_quantum</item> + <item name="textSize">@dimen/text_size_menu_quantum</item> </style> - <style name="TextAppearance.Quantum.Widget.TextView.SpinnerItem" /> + <style name="TextAppearance.Quantum.Widget.TextView.SpinnerItem"/> <style name="TextAppearance.Quantum.Widget.DropDownItem"> <item name="textColor">?attr/textColorPrimaryDisableOnly</item> @@ -223,106 +291,85 @@ please see styles_device_defaults.xml. <item name="textSize">@dimen/action_bar_subtitle_text_size_quantum</item> </style> - <style name="TextAppearance.Quantum.Widget.ActionBar.Title.Inverse" parent="TextAppearance.Quantum.Medium.Inverse"> - <item name="textSize">@dimen/action_bar_title_text_size_quantum</item> - </style> - - <style name="TextAppearance.Quantum.Widget.ActionBar.Subtitle.Inverse" parent="TextAppearance.Quantum.Small.Inverse"> - <item name="textSize">@dimen/action_bar_subtitle_text_size_quantum</item> - </style> - <style name="TextAppearance.Quantum.Widget.ActionBar.Menu" parent="TextAppearance.Quantum.Small"> - <item name="textSize">12sp</item> - <item name="textStyle">bold</item> + <item name="fontFamily">@string/font_family_menu_quantum</item> + <item name="textSize">@dimen/text_size_menu_quantum</item>> <item name="textColor">?attr/actionMenuTextColor</item> <item name="textAllCaps">@bool/config_actionMenuItemAllCaps</item> </style> - <style name="TextAppearance.Quantum.Widget.ActionMode.Title.Inverse" parent="TextAppearance.Quantum.Medium.Inverse"> - <item name="textSize">@dimen/action_bar_title_text_size_quantum</item> - </style> - - <style name="TextAppearance.Quantum.Widget.ActionMode.Subtitle.Inverse" parent="TextAppearance.Quantum.Small.Inverse"> - <item name="textSize">@dimen/action_bar_subtitle_text_size_quantum</item> - </style> - <style name="TextAppearance.Quantum.WindowTitle"> <item name="textColor">?attr/textColorPrimary</item> - <item name="textSize">14sp</item> - <item name="textStyle">bold</item> + <item name="fontFamily">@string/font_family_headline_quantum</item> + <item name="textSize">@dimen/text_size_headline_quantum</item> </style> <style name="TextAppearance.Quantum.DialogWindowTitle"> - <item name="textSize">22sp</item> + <item name="fontFamily">@string/font_family_headline_quantum</item> + <item name="textSize">@dimen/text_size_headline_quantum</item> <item name="textColor">?attr/textColorPrimary</item> </style> - <style name="TextAppearance.Quantum.CalendarViewWeekDayView" parent="TextAppearance.Small.CalendarViewWeekDayView"> + <style name="TextAppearance.Quantum.CalendarViewWeekDayView" parent="TextAppearance.Quantum.Small"> + <item name="textStyle">bold</item> <item name="textColor">#505050</item> </style> - <!-- Light text styles --> - <style name="TextAppearance.Quantum.Light" parent="TextAppearance.Quantum"/> + <style name="TextAppearance.Quantum.TimePicker.TimeLabel" parent="TextAppearance.Quantum"> + <item name="textSize">@dimen/timepicker_time_label_size</item> + <item name="textColor">@color/timepicker_default_text_color_quantum_dark</item> + </style> - <style name="TextAppearance.Quantum.Light.Inverse" parent="TextAppearance.Quantum.Inverse" /> + <style name="TextAppearance.Quantum.TimePicker.AmPmLabel" parent="TextAppearance.Quantum"> + <item name="textSize">@dimen/timepicker_ampm_label_size</item> + <item name="textAllCaps">true</item> + <item name="textColor">@color/timepicker_default_text_color_quantum_dark</item> + <item name="textStyle">bold</item> + </style> + <!-- Light text styles --> + <style name="TextAppearance.Quantum.Light" parent="TextAppearance.Quantum"/> + <style name="TextAppearance.Quantum.Light.Inverse" parent="TextAppearance.Quantum.Inverse"/> <style name="TextAppearance.Quantum.Light.Large" parent="TextAppearance.Quantum.Large"/> - + <style name="TextAppearance.Quantum.Light.Large.Inverse" parent="TextAppearance.Quantum.Large.Inverse"/> <style name="TextAppearance.Quantum.Light.Medium" parent="TextAppearance.Quantum.Medium"/> - + <style name="TextAppearance.Quantum.Light.Medium.Inverse" parent="TextAppearance.Quantum.Medium.Inverse"/> <style name="TextAppearance.Quantum.Light.Small" parent="TextAppearance.Quantum.Small"/> - - <style name="TextAppearance.Quantum.Light.Large.Inverse" parent="TextAppearance.Quantum.Large.Inverse" /> - - <style name="TextAppearance.Quantum.Light.Medium.Inverse" parent="TextAppearance.Quantum.Medium.Inverse" /> - - <style name="TextAppearance.Quantum.Light.Small.Inverse" parent="TextAppearance.Quantum.Small.Inverse" /> - - <style name="TextAppearance.Quantum.Light.SearchResult" parent="TextAppearance.Quantum.SearchResult" /> - - <style name="TextAppearance.Quantum.Light.SearchResult.Title" parent="TextAppearance.Quantum.SearchResult.Title" /> - - <style name="TextAppearance.Quantum.Light.SearchResult.Subtitle" parent="TextAppearance.Quantum.SearchResult.Subtitle" /> - - <style name="TextAppearance.Quantum.Light.Widget" parent="TextAppearance.Widget"/> - - <style name="TextAppearance.Quantum.Light.Widget.Button" parent="TextAppearance.Quantum.Widget.Button" /> - - <style name="TextAppearance.Quantum.Light.Widget.EditText" parent="TextAppearance.Quantum.Widget.EditText" /> - - <style name="TextAppearance.Quantum.Light.Widget.Switch" parent="TextAppearance.Quantum.Small"> - <item name="textColor">@color/secondary_text_quantum_dark</item> - </style> - + <style name="TextAppearance.Quantum.Light.Small.Inverse" parent="TextAppearance.Quantum.Small.Inverse"/> + <style name="TextAppearance.Quantum.Light.SearchResult" parent="TextAppearance.Quantum.SearchResult"/> + <style name="TextAppearance.Quantum.Light.SearchResult.Title" parent="TextAppearance.Quantum.SearchResult.Title"/> + <style name="TextAppearance.Quantum.Light.SearchResult.Subtitle" parent="TextAppearance.Quantum.SearchResult.Subtitle"/> + <style name="TextAppearance.Quantum.Light.Widget" parent="TextAppearance.Quantum.Widget"/> + <style name="TextAppearance.Quantum.Light.Widget.Button" parent="TextAppearance.Quantum.Widget.Button"/> + <style name="TextAppearance.Quantum.Light.Widget.EditText" parent="TextAppearance.Quantum.Widget.EditText"/> + <style name="TextAppearance.Quantum.Light.Widget.Switch" parent="TextAppearance.Quantum.Widget.Switch"/> <style name="TextAppearance.Quantum.Light.Widget.PopupMenu" parent="TextAppearance.Quantum.Widget.PopupMenu"/> - <style name="TextAppearance.Quantum.Light.Widget.PopupMenu.Large" parent="TextAppearance.Quantum.Widget.PopupMenu.Large"/> - <style name="TextAppearance.Quantum.Light.Widget.PopupMenu.Small" parent="TextAppearance.Quantum.Widget.PopupMenu.Small"/> - <style name="TextAppearance.Quantum.Light.Widget.DropDownHint" parent="TextAppearance.Quantum.Widget.DropDownHint"/> + <style name="TextAppearance.Quantum.Light.Widget.ActionMode.Title" parent="TextAppearance.Quantum.Widget.ActionMode.Title"/> + <style name="TextAppearance.Quantum.Light.Widget.ActionMode.Subtitle" parent="TextAppearance.Quantum.Widget.ActionMode.Subtitle"/> + <style name="TextAppearance.Quantum.Light.WindowTitle" parent="TextAppearance.Quantum.WindowTitle"/> + <style name="TextAppearance.Quantum.Light.DialogWindowTitle" parent="TextAppearance.Quantum.DialogWindowTitle"/> + <style name="TextAppearance.Quantum.Light.CalendarViewWeekDayView" parent="TextAppearance.Quantum.CalendarViewWeekDayView"/> - <style name="TextAppearance.Quantum.Light.Widget.ActionMode.Title" parent="TextAppearance.Widget.ActionMode.Title"/> - - <style name="TextAppearance.Quantum.Light.Widget.ActionMode.Subtitle" parent="TextAppearance.Widget.ActionMode.Subtitle"/> - - <style name="TextAppearance.Quantum.Light.WindowTitle" parent="TextAppearance.Quantum.WindowTitle" /> - - <style name="TextAppearance.Quantum.Light.DialogWindowTitle" parent="TextAppearance.Quantum.DialogWindowTitle" /> + <style name="TextAppearance.Quantum.Light.TimePicker.TimeLabel" parent="TextAppearance.Quantum.TimePicker.TimeLabel"> + <item name="textColor">@color/timepicker_default_text_color_quantum_light</item> + </style> - <style name="TextAppearance.Quantum.Light.CalendarViewWeekDayView" parent="TextAppearance.Small.CalendarViewWeekDayView"/> + <style name="TextAppearance.Quantum.Light.TimePicker.AmPmLabel" parent="TextAppearance.Quantum.TimePicker.AmPmLabel"> + <item name="textColor">@color/timepicker_default_text_color_quantum_light</item> + </style> <!-- Widget Styles --> - - <style name="Quantum" /> - <style name="Quantum.Light" /> - + <style name="Quantum"/> + <style name="Quantum.Light"/> <style name="Widget.Quantum" parent="Widget" /> <!-- Bordered ink button --> <style name="Widget.Quantum.Button" parent="Widget.Button"> - <item name="background">@drawable/btn_default_quantum_dark</item> + <item name="background">@drawable/btn_default_quantum</item> <item name="textAppearance">?attr/textAppearanceButton</item> <item name="minHeight">48dip</item> <item name="minWidth">96dip</item> @@ -341,12 +388,12 @@ please see styles_device_defaults.xml. <!-- Bordered paper button with color --> <style name="Widget.Quantum.Button.Paper.Color"> - <item name="background">@drawable/btn_color_quantum_dark</item> + <item name="background">@drawable/btn_color_quantum</item> </style> <!-- Borderless ink button --> <style name="Widget.Quantum.Button.Borderless"> - <item name="background">@drawable/btn_borderless_quantum_dark</item> + <item name="background">@drawable/btn_borderless_quantum</item> </style> <!-- Small borderless ink button --> @@ -359,6 +406,7 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.Button.Borderless.Paper"> <!-- TODO: Specify pressed state animation. --> </style> + <style name="Widget.Quantum.Button.Inset"> <item name="background">@drawable/button_inset</item> </style> @@ -371,7 +419,7 @@ please see styles_device_defaults.xml. <item name="minHeight">48dip</item> </style> - <style name="Quantum.ButtonBar" parent="ButtonBar"> + <style name="Widget.Quantum.ButtonBar"> <item name="paddingTop">0dip</item> <item name="paddingStart">0dip</item> <item name="paddingEnd">0dip</item> @@ -382,15 +430,17 @@ please see styles_device_defaults.xml. <item name="background">@null</item> </style> - <style name="Quantum.SegmentedButton" parent="SegmentedButton"> - <item name="background">@drawable/btn_group_holo_dark</item> - </style> - - <style name="Quantum.ButtonBar.AlertDialog"> + <style name="Widget.Quantum.ButtonBar.AlertDialog"> <item name="background">@null</item> <item name="dividerPadding">0dp</item> </style> + <style name="Widget.Quantum.ButtonBar.Button"/> + + <style name="Widget.Quantum.SegmentedButton" parent="SegmentedButton"> + <item name="background">@drawable/btn_group_holo_dark</item> + </style> + <style name="Widget.Quantum.StackView"> <item name="resOutColor">@color/holo_blue_light</item> <item name="clickColor">@color/holo_blue_light</item> @@ -398,17 +448,20 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.TextView" parent="Widget.TextView"/> - <style name="Widget.Quantum.CheckedTextView" parent="Widget.CheckedTextView"/> - <style name="Widget.Quantum.TextView.ListSeparator" parent="Widget.TextView.ListSeparator"> - <item name="background">@drawable/list_section_divider_quantum_dark</item> + <item name="background">@drawable/list_section_divider_quantum</item> <item name="textAllCaps">true</item> </style> - <style name="Widget.Quantum.TextSelectHandle" parent="Widget.TextSelectHandle"/> + <style name="Widget.Quantum.TextView.SpinnerItem" parent="Widget.TextView.SpinnerItem"> + <item name="textAppearance">@style/TextAppearance.Quantum.Widget.TextView.SpinnerItem</item> + <item name="paddingStart">8dp</item> + <item name="paddingEnd">8dp</item> + </style> + <style name="Widget.Quantum.CheckedTextView" parent="Widget.CheckedTextView"/> + <style name="Widget.Quantum.TextSelectHandle" parent="Widget.TextSelectHandle"/> <style name="Widget.Quantum.TextSuggestionsPopupWindow" parent="Widget.TextSuggestionsPopupWindow"/> - <style name="Widget.Quantum.AbsListView" parent="Widget.AbsListView"/> <style name="Widget.Quantum.AutoCompleteTextView" parent="Widget.AutoCompleteTextView"> @@ -417,31 +470,38 @@ please see styles_device_defaults.xml. </style> <style name="Widget.Quantum.CompoundButton" parent="Widget.CompoundButton"/> - <style name="Widget.Quantum.CompoundButton.CheckBox" parent="Widget.CompoundButton.CheckBox"/> + <style name="Widget.Quantum.CompoundButton.RadioButton" parent="Widget.CompoundButton.RadioButton"/> - <style name="Widget.Quantum.ListView.DropDown"/> + <style name="Widget.Quantum.CompoundButton.Star" parent="Widget.CompoundButton.Star"> + <item name="button">@drawable/btn_star_quantum</item> + </style> + + <style name="Widget.Quantum.CompoundButton.Switch"> + <item name="track">@drawable/switch_track_quantum</item> + <item name="thumb">@drawable/switch_inner_quantum</item> + <item name="switchTextAppearance">@style/TextAppearance.Quantum.Widget.Switch</item> + <item name="textOn"></item> + <item name="textOff"></item> + <item name="thumbTextPadding">12dip</item> + <item name="switchMinWidth">72dip</item> + <item name="switchPadding">16dip</item> + </style> <style name="Widget.Quantum.EditText" parent="Widget.EditText"/> <style name="Widget.Quantum.ExpandableListView" parent="Widget.Quantum.ListView"> - <item name="groupIndicator">@drawable/expander_group_quantum_dark</item> + <item name="groupIndicator">@drawable/expander_group_quantum</item> <item name="indicatorLeft">?attr/expandableListPreferredItemIndicatorLeft</item> <item name="indicatorRight">?attr/expandableListPreferredItemIndicatorRight</item> <item name="childDivider">?attr/listDivider</item> </style> <style name="Widget.Quantum.ExpandableListView.White"/> - <style name="Widget.Quantum.FragmentBreadCrumbs" parent="Widget.FragmentBreadCrumbs"/> - <style name="Widget.Quantum.Gallery" parent="Widget.Gallery"/> - <style name="Widget.Quantum.GestureOverlayView" parent="Widget.GestureOverlayView"/> - - <style name="Widget.Quantum.GridView" parent="Widget.GridView"> - <item name="listSelector">?attr/selectableItemBackground</item> - </style> + <style name="Widget.Quantum.GridView" parent="Widget.GridView"/> <style name="Widget.Quantum.CalendarView" parent="Widget.CalendarView"> <item name="selectedWeekBackgroundColor">#330099FF</item> @@ -454,7 +514,7 @@ please see styles_device_defaults.xml. </style> <style name="Widget.Quantum.ImageButton" parent="Widget.ImageButton"> - <item name="background">@drawable/btn_default_quantum_dark</item> + <item name="background">@drawable/btn_default_quantum</item> </style> <style name="Widget.Quantum.NumberPicker" parent="Widget.NumberPicker"> @@ -489,7 +549,6 @@ please see styles_device_defaults.xml. </style> <style name="Widget.Quantum.ActivityChooserView" parent="Widget.ActivityChooserView"/> - <style name="Widget.Quantum.ImageWell" parent="Widget.ImageWell"/> <style name="Widget.Quantum.ListView" parent="Widget.ListView"> @@ -497,6 +556,7 @@ please see styles_device_defaults.xml. <item name="listSelector">?attr/listChoiceBackgroundIndicator</item> </style> + <style name="Widget.Quantum.ListView.DropDown"/> <style name="Widget.Quantum.ListView.White"/> <style name="Widget.Quantum.PopupWindow" parent="Widget.PopupWindow"/> @@ -510,8 +570,10 @@ please see styles_device_defaults.xml. <item name="indeterminateDrawable">@drawable/progress_medium_holo</item> </style> + <style name="Widget.Quantum.ProgressBar.Inverse"/> + <style name="Widget.Quantum.ProgressBar.Horizontal" parent="Widget.ProgressBar.Horizontal"> - <item name="progressDrawable">@drawable/progress_horizontal_quantum_dark</item> + <item name="progressDrawable">@drawable/progress_horizontal_quantum</item> <item name="indeterminateDrawable">@drawable/progress_indeterminate_horizontal_holo</item> <item name="minHeight">16dip</item> <item name="maxHeight">16dip</item> @@ -521,25 +583,22 @@ please see styles_device_defaults.xml. <item name="indeterminateDrawable">@drawable/progress_small_holo</item> </style> + <style name="Widget.Quantum.ProgressBar.Small.Inverse"/> <style name="Widget.Quantum.ProgressBar.Small.Title"/> <style name="Widget.Quantum.ProgressBar.Large" parent="Widget.ProgressBar.Large"> <item name="indeterminateDrawable">@drawable/progress_large_holo</item> </style> - <style name="Widget.Quantum.ProgressBar.Inverse"/> - - <style name="Widget.Quantum.ProgressBar.Small.Inverse"/> - <style name="Widget.Quantum.ProgressBar.Large.Inverse"/> <style name="Widget.Quantum.SeekBar"> <item name="indeterminateOnly">false</item> - <item name="progressDrawable">@drawable/scrubber_progress_horizontal_quantum_dark</item> - <item name="indeterminateDrawable">@drawable/scrubber_progress_horizontal_quantum_dark</item> + <item name="progressDrawable">@drawable/scrubber_progress_horizontal_quantum</item> + <item name="indeterminateDrawable">@drawable/scrubber_progress_horizontal_quantum</item> <item name="minHeight">13dip</item> <item name="maxHeight">13dip</item> - <item name="thumb">@drawable/scrubber_control_selector_quantum_dark</item> + <item name="thumb">@drawable/scrubber_control_selector_quantum</item> <item name="thumbOffset">16dip</item> <item name="focusable">true</item> <item name="paddingStart">16dip</item> @@ -566,14 +625,11 @@ please see styles_device_defaults.xml. <item name="maxHeight">16dip</item> </style> - <style name="Widget.Quantum.CompoundButton.RadioButton" parent="Widget.CompoundButton.RadioButton"/> - <style name="Widget.Quantum.ScrollView" parent="Widget.ScrollView"/> - <style name="Widget.Quantum.HorizontalScrollView" parent="Widget.HorizontalScrollView"/> <style name="Widget.Quantum.Spinner" parent="Widget.Spinner.DropDown"> - <item name="background">@drawable/spinner_background_quantum_dark</item> + <item name="background">@drawable/spinner_background_quantum</item> <item name="dropDownSelector">@drawable/list_selector_holo_dark</item> <item name="popupBackground">?attr/colorBackground</item> <item name="dropDownVerticalOffset">0dip</item> @@ -587,11 +643,7 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.Spinner.DropDown"/> <style name="Widget.Quantum.Spinner.DropDown.ActionBar"> - <item name="background">@drawable/spinner_background_quantum_dark</item> - </style> - - <style name="Widget.Quantum.CompoundButton.Star" parent="Widget.CompoundButton.Star"> - <item name="button">@drawable/btn_star_quantum_dark</item> + <item name="background">@drawable/spinner_background_quantum</item> </style> <style name="Widget.Quantum.TabWidget" parent="Widget.TabWidget"> @@ -606,7 +658,7 @@ please see styles_device_defaults.xml. </style> <style name="Widget.Quantum.Tab" parent="Widget.Quantum.ActionBar.TabView"> - <item name="background">@drawable/tab_indicator_quantum_dark</item> + <item name="background">@drawable/tab_indicator_quantum</item> <item name="layout_width">0dip</item> <item name="layout_weight">1</item> <item name="minWidth">80dip</item> @@ -628,24 +680,12 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.DropDownItem.Spinner"/> - <style name="Widget.Quantum.TextView.SpinnerItem" parent="Widget.TextView.SpinnerItem"> - <item name="textAppearance">@style/TextAppearance.Quantum.Widget.TextView.SpinnerItem</item> - <item name="paddingStart">8dp</item> - <item name="paddingEnd">8dp</item> - </style> - <style name="Widget.Quantum.KeyboardView" parent="Widget.KeyboardView"/> - <style name="Widget.Quantum.QuickContactBadge.WindowSmall" parent="Widget.QuickContactBadge.WindowSmall"/> - <style name="Widget.Quantum.QuickContactBadge.WindowMedium" parent="Widget.QuickContactBadge.WindowMedium"/> - <style name="Widget.Quantum.QuickContactBadge.WindowLarge" parent="Widget.QuickContactBadge.WindowLarge"/> - <style name="Widget.Quantum.QuickContactBadgeSmall.WindowSmall" parent="Widget.QuickContactBadgeSmall.WindowSmall"/> - <style name="Widget.Quantum.QuickContactBadgeSmall.WindowMedium" parent="Widget.QuickContactBadgeSmall.WindowMedium"/> - <style name="Widget.Quantum.QuickContactBadgeSmall.WindowLarge" parent="Widget.QuickContactBadgeSmall.WindowLarge"/> <style name="Widget.Quantum.ListPopupWindow" parent="Widget.ListPopupWindow"> @@ -658,12 +698,6 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.PopupMenu" parent="Widget.Quantum.ListPopupWindow"/> - <style name="Widget.Quantum.ButtonBar"> - <item name="divider">?attr/dividerVertical</item> - </style> - - <style name="Widget.Quantum.ButtonBar.Button"/> - <style name="Widget.Quantum.ActionButton" parent="Widget.ActionButton"> <item name="minWidth">@dimen/action_button_min_width</item> <item name="gravity">center</item> @@ -673,8 +707,12 @@ please see styles_device_defaults.xml. <item name="maxLines">2</item> </style> + <style name="Widget.Quantum.ActionButton.CloseMode"> + <item name="background">@drawable/btn_cab_done_holo_dark</item> + </style> + <style name="Widget.Quantum.ActionButton.Overflow"> - <item name="src">@drawable/ic_menu_moreoverflow_quantum_dark</item> + <item name="src">@drawable/ic_menu_moreoverflow_quantum</item> <item name="background">?attr/actionBarItemBackground</item> <item name="contentDescription">@string/action_menu_overflow_description</item> </style> @@ -682,7 +720,7 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.ActionButton.TextButton" parent="Widget.Quantum.ButtonBar.Button"/> <style name="Widget.Quantum.ActionBar.TabView" parent="Widget.ActionBar.TabView"> - <item name="background">@drawable/tab_indicator_quantum_dark</item> + <item name="background">@drawable/tab_indicator_quantum</item> <item name="paddingStart">16dip</item> <item name="paddingEnd">16dip</item> </style> @@ -703,19 +741,10 @@ please see styles_device_defaults.xml. <item name="maxLines">2</item> </style> - <style name="Widget.Quantum.ActionMode" parent="Widget.ActionMode"> - <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionMode.Title</item> - <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionMode.Subtitle</item> - </style> - - <style name="Widget.Quantum.ActionButton.CloseMode"> - <item name="background">@drawable/btn_cab_done_holo_dark</item> - </style> - <style name="Widget.Quantum.ActionBar" parent="Widget.ActionBar"> <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Title</item> <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Subtitle</item> - <item name="background">@drawable/ab_transparent_quantum_dark</item> + <item name="background">@drawable/ab_transparent_quantum</item> <item name="backgroundStacked">@drawable/ab_stacked_transparent_dark_holo</item> <item name="backgroundSplit">@drawable/ab_bottom_transparent_dark_holo</item> <item name="divider">?attr/dividerVertical</item> @@ -738,61 +767,43 @@ please see styles_device_defaults.xml. <item name="itemPadding">8dip</item> </style> - <style name="Widget.Quantum.CompoundButton.Switch"> - <item name="track">@drawable/switch_track_quantum_dark</item> - <item name="thumb">@drawable/switch_inner_quantum_dark</item> - <item name="switchTextAppearance">@style/TextAppearance.Quantum.Widget.Switch</item> - <item name="textOn"></item> - <item name="textOff"></item> - <item name="thumbTextPadding">12dip</item> - <item name="switchMinWidth">72dip</item> - <item name="switchPadding">16dip</item> - </style> - - <!-- Light widget styles --> - - <style name="Widget.Quantum.Light" parent="Widget" /> - - <!-- Bordered ink button --> - <style name="Widget.Quantum.Light.Button" parent="Widget.Quantum.Button"> - <item name="background">@drawable/btn_default_quantum_light</item> - <item name="textAppearance">?attr/textAppearanceButton</item> - <item name="minHeight">48dip</item> - <item name="minWidth">96dip</item> - </style> - - <!-- Small bordered ink button --> - <style name="Widget.Quantum.Light.Button.Small"> - <item name="minHeight">48dip</item> - <item name="minWidth">48dip</item> + <style name="Widget.Quantum.ActionMode" parent="Widget.ActionMode"> + <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionMode.Title</item> + <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionMode.Subtitle</item> </style> - <!-- Bordered paper button --> - <style name="Widget.Quantum.Light.Button.Paper"> - <!-- TODO: Specify pressed state animation. --> + <style name="Widget.Quantum.FastScroll" parent="Widget.FastScroll"> + <item name="thumbMinWidth">0dp</item> + <item name="thumbMinHeight">0dp</item> </style> - <!-- Bordered paper button with color --> - <style name="Widget.Quantum.Light.Button.Paper.Color"> - <item name="background">@drawable/btn_color_quantum_light</item> + <style name="Widget.Quantum.PreferenceFrameLayout"> + <item name="borderTop">0dip</item> + <item name="borderBottom">@dimen/preference_fragment_padding_bottom</item> + <item name="borderLeft">?attr/preferenceFragmentPaddingSide</item> + <item name="borderRight">?attr/preferenceFragmentPaddingSide</item> </style> - <!-- Borderless ink button --> - <style name="Widget.Quantum.Light.Button.Borderless"> - <item name="background">@drawable/btn_borderless_quantum_light</item> + <style name="Widget.Quantum.MediaRouteButton"> + <item name="background">?attr/selectableItemBackground</item> + <item name="externalRouteEnabledDrawable">@drawable/ic_media_route_holo_dark</item> + <item name="minWidth">56dp</item> + <item name="minHeight">48dp</item> + <item name="focusable">true</item> + <item name="contentDescription">@string/media_route_button_content_description</item> </style> - <!-- Small borderless ink button --> - <style name="Widget.Quantum.Light.Button.Borderless.Small"> - <item name="minHeight">48dip</item> - <item name="minWidth">48dip</item> - </style> + <!-- Light widget styles --> - <!-- Borderless paper button --> - <style name="Widget.Quantum.Light.Button.Borderless.Paper"> - <!-- TODO: Specify pressed state animation. --> - </style> - <style name="Widget.Quantum.Light.Button.Inset"/> + <style name="Widget.Quantum.Light" parent="Widget.Quantum"/> + <style name="Widget.Quantum.Light.Button" parent="Widget.Quantum.Button"/> + <style name="Widget.Quantum.Light.Button.Small" parent="Widget.Quantum.Button.Small"/> + <style name="Widget.Quantum.Light.Button.Paper" parent="Widget.Quantum.Button.Paper"/> + <style name="Widget.Quantum.Light.Button.Paper.Color" parent="Widget.Quantum.Button.Paper.Color"/> + <style name="Widget.Quantum.Light.Button.Borderless" parent="Widget.Quantum.Button.Borderless"/> + <style name="Widget.Quantum.Light.Button.Borderless.Small" parent="Widget.Quantum.Button.Borderless.Small"/> + <style name="Widget.Quantum.Light.Button.Borderless.Paper" parent="Widget.Quantum.Button.Borderless.Paper"/> + <style name="Widget.Quantum.Light.Button.Inset" parent="Widget.Quantum.Button.Inset"/> <style name="Widget.Quantum.Light.Button.Toggle"> <item name="background">@drawable/btn_toggle_holo_light</item> @@ -802,63 +813,36 @@ please see styles_device_defaults.xml. <item name="minHeight">48dip</item> </style> - <style name="Quantum.Light.ButtonBar" parent="Quantum.ButtonBar"/> + <style name="Widget.Quantum.Light.ButtonBar" parent="Widget.Quantum.ButtonBar"/> + <style name="Widget.Quantum.Light.ButtonBar.AlertDialog" parent="Widget.Quantum.ButtonBar.AlertDialog"/> - <style name="Quantum.Light.ButtonBar.AlertDialog"> - <item name="background">@null</item> - <item name="dividerPadding">0dp</item> - </style> - - <style name="Quantum.Light.SegmentedButton" parent="SegmentedButton"> + <style name="Widget.Quantum.Light.SegmentedButton" parent="Widget.Quantum.SegmentedButton"> <item name="background">@drawable/btn_group_holo_light</item> </style> - <style name="Widget.Quantum.Light.TextView" parent="Widget.TextView"/> - - <style name="Widget.Quantum.Light.CheckedTextView" parent="Widget.CheckedTextView"/> - - <style name="Widget.Quantum.Light.TextView.ListSeparator" parent="Widget.TextView.ListSeparator"> - <item name="background">@drawable/list_section_divider_quantum_light</item> - <item name="textAllCaps">true</item> - </style> - - <style name="Widget.Quantum.Light.TextSelectHandle" parent="Widget.TextSelectHandle"/> - - <style name="Widget.Quantum.Light.TextSuggestionsPopupWindow" parent="Widget.TextSuggestionsPopupWindow"/> - - <style name="Widget.Quantum.Light.AbsListView" parent="Widget.AbsListView"/> + <style name="Widget.Quantum.Light.TextView" parent="Widget.Quantum.TextView"/> + <style name="Widget.Quantum.Light.TextView.ListSeparator" parent="Widget.Quantum.TextView.ListSeparator"/> + <style name="Widget.Quantum.Light.TextView.SpinnerItem" parent="Widget.Quantum.TextView.SpinnerItem"/> + <style name="Widget.Quantum.Light.CheckedTextView" parent="Widget.Quantum.CheckedTextView"/> + <style name="Widget.Quantum.Light.TextSelectHandle" parent="Widget.Quantum.TextSelectHandle"/> + <style name="Widget.Quantum.Light.TextSuggestionsPopupWindow" parent="Widget.Quantum.TextSuggestionsPopupWindow"/> + <style name="Widget.Quantum.Light.AbsListView" parent="Widget.Quantum.AbsListView"/> <style name="Widget.Quantum.Light.AutoCompleteTextView" parent="Widget.AutoCompleteTextView"> <item name="dropDownSelector">@drawable/list_selector_holo_light</item> <item name="popupBackground">?attr/colorBackground</item> </style> - <style name="Widget.Quantum.Light.CompoundButton.CheckBox" parent="Widget.CompoundButton.CheckBox"/> - - <style name="Widget.Quantum.Light.ListView.DropDown"/> - + <style name="Widget.Quantum.Light.CompoundButton.CheckBox" parent="Widget.Quantum.CompoundButton.CheckBox"/> + <style name="Widget.Quantum.Light.ListView.DropDown" parent="Widget.Quantum.ListView.DropDown"/> <style name="Widget.Quantum.Light.EditText" parent="Widget.Quantum.EditText"/> - - <style name="Widget.Quantum.Light.ExpandableListView" parent="Widget.Quantum.Light.ListView"> - <item name="groupIndicator">@drawable/expander_group_quantum_light</item> - <item name="indicatorLeft">?attr/expandableListPreferredItemIndicatorLeft</item> - <item name="indicatorRight">?attr/expandableListPreferredItemIndicatorRight</item> - <item name="childDivider">?attr/listDivider</item> - </style> - - <style name="Widget.Quantum.Light.ExpandableListView.White"/> - - <style name="Widget.Quantum.Light.FragmentBreadCrumbs" parent="Widget.FragmentBreadCrumbs"/> - - <style name="Widget.Quantum.Light.Gallery" parent="Widget.Gallery"/> - - <style name="Widget.Quantum.Light.GestureOverlayView" parent="Widget.GestureOverlayView"/> - + <style name="Widget.Quantum.Light.ExpandableListView" parent="Widget.Quantum.ExpandableListView"/> + <style name="Widget.Quantum.Light.ExpandableListView.White" parent="Widget.Quantum.ExpandableListView.White"/> + <style name="Widget.Quantum.Light.FragmentBreadCrumbs" parent="Widget.Quantum.FragmentBreadCrumbs"/> + <style name="Widget.Quantum.Light.Gallery" parent="Widget.Quantum.Gallery"/> + <style name="Widget.Quantum.Light.GestureOverlayView" parent="Widget.Quantum.GestureOverlayView"/> <style name="Widget.Quantum.Light.GridView" parent="Widget.Quantum.GridView"/> - - <style name="Widget.Quantum.Light.ImageButton" parent="Widget.Quantum.ImageButton"> - <item name="background">@drawable/btn_default_quantum_light</item> - </style> + <style name="Widget.Quantum.Light.ImageButton" parent="Widget.Quantum.ImageButton"/> <style name="Widget.Quantum.Light.CalendarView" parent="Widget.CalendarView"> <item name="selectedWeekBackgroundColor">#330066ff</item> @@ -892,13 +876,10 @@ please see styles_device_defaults.xml. <item name="background">@drawable/ab_share_pack_holo_light</item> </style> - <style name="Widget.Quantum.Light.ImageWell" parent="Widget.ImageWell"/> - + <style name="Widget.Quantum.Light.ImageWell" parent="Widget.Quantum.ImageWell"/> <style name="Widget.Quantum.Light.ListView" parent="Widget.Quantum.ListView"/> - - <style name="Widget.Quantum.Light.ListView.White"/> - - <style name="Widget.Quantum.Light.PopupWindow" parent="Widget.PopupWindow"/> + <style name="Widget.Quantum.Light.ListView.White" parent="Widget.Quantum.ListView.White"/> + <style name="Widget.Quantum.Light.PopupWindow" parent="Widget.Quantum.PopupWindow"/> <style name="Widget.Quantum.Light.PopupWindow.ActionMode"> <item name="popupBackground">@color/white</item> @@ -906,28 +887,14 @@ please see styles_device_defaults.xml. </style> <style name="Widget.Quantum.Light.ProgressBar" parent="Widget.Quantum.ProgressBar"/> - - <style name="Widget.Quantum.Light.ProgressBar.Horizontal" parent="Widget.Quantum.ProgressBar.Horizontal"> - <item name="progressDrawable">@drawable/progress_horizontal_quantum_light</item> - </style> - + <style name="Widget.Quantum.Light.ProgressBar.Horizontal" parent="Widget.Quantum.ProgressBar.Horizontal"/> <style name="Widget.Quantum.Light.ProgressBar.Small" parent="Widget.Quantum.ProgressBar.Small"/> - <style name="Widget.Quantum.Light.ProgressBar.Small.Title" parent="Widget.Quantum.ProgressBar.Small.Title"/> - <style name="Widget.Quantum.Light.ProgressBar.Large" parent="Widget.Quantum.ProgressBar.Large"/> - <style name="Widget.Quantum.Light.ProgressBar.Inverse" parent="Widget.Quantum.ProgressBar.Inverse"/> - <style name="Widget.Quantum.Light.ProgressBar.Small.Inverse" parent="Widget.Quantum.ProgressBar.Small.Inverse"/> - <style name="Widget.Quantum.Light.ProgressBar.Large.Inverse" parent="Widget.Quantum.ProgressBar.Large.Inverse"/> - - <style name="Widget.Quantum.Light.SeekBar" parent="Widget.Quantum.SeekBar"> - <item name="progressDrawable">@drawable/scrubber_progress_horizontal_quantum_light</item> - <item name="indeterminateDrawable">@drawable/scrubber_progress_horizontal_quantum_light</item> - <item name="thumb">@drawable/scrubber_control_selector_quantum_light</item> - </style> + <style name="Widget.Quantum.Light.SeekBar" parent="Widget.Quantum.SeekBar"/> <style name="Widget.Quantum.Light.RatingBar" parent="Widget.RatingBar"> <item name="progressDrawable">@drawable/ratingbar_full_holo_light</item> @@ -948,14 +915,12 @@ please see styles_device_defaults.xml. <item name="maxHeight">16dip</item> </style> - <style name="Widget.Quantum.Light.CompoundButton.RadioButton" parent="Widget.CompoundButton.RadioButton"/> - - <style name="Widget.Quantum.Light.ScrollView" parent="Widget.ScrollView"/> - - <style name="Widget.Quantum.Light.HorizontalScrollView" parent="Widget.HorizontalScrollView"/> + <style name="Widget.Quantum.Light.CompoundButton.RadioButton" parent="Widget.Quantum.CompoundButton.RadioButton"/> + <style name="Widget.Quantum.Light.ScrollView" parent="Widget.Quantum.ScrollView"/> + <style name="Widget.Quantum.Light.HorizontalScrollView" parent="Widget.Quantum.HorizontalScrollView"/> <style name="Widget.Quantum.Light.Spinner" parent="Widget.Quantum.Spinner"> - <item name="background">@drawable/spinner_background_quantum_light</item> + <item name="background">@drawable/spinner_background_quantum</item> <item name="dropDownSelector">@drawable/list_selector_holo_light</item> <item name="popupBackground">?attr/colorBackground</item> <item name="dropDownVerticalOffset">0dip</item> @@ -964,41 +929,21 @@ please see styles_device_defaults.xml. <item name="popupPromptView">@layout/simple_dropdown_hint</item> </style> - <style name="Widget.Quantum.Light.Spinner.DropDown"/> - - <style name="Widget.Quantum.Light.Spinner.DropDown.ActionBar"> - <item name="background">@drawable/spinner_background_quantum_light</item> - </style> - - <style name="Widget.Quantum.Light.CompoundButton.Star" parent="Widget.CompoundButton.Star"> - <item name="button">@drawable/btn_star_quantum_light</item> - </style> - + <style name="Widget.Quantum.Light.Spinner.DropDown" parent="Widget.Quantum.Spinner.DropDown"/> + <style name="Widget.Quantum.Light.Spinner.DropDown.ActionBar" parent="Widget.Quantum.Spinner.DropDown.ActionBar"/> + <style name="Widget.Quantum.Light.CompoundButton.Star" parent="Widget.Quantum.CompoundButton.Star"/> <style name="Widget.Quantum.Light.TabWidget" parent="Widget.Quantum.TabWidget"/> - - <style name="Widget.Quantum.Light.WebTextView" parent="Widget.WebTextView"/> - - <style name="Widget.Quantum.Light.WebView" parent="Widget.WebView"/> - + <style name="Widget.Quantum.Light.WebTextView" parent="Widget.Quantum.WebTextView"/> + <style name="Widget.Quantum.Light.WebView" parent="Widget.Quantum.WebView"/> <style name="Widget.Quantum.Light.DropDownItem" parent="Widget.Quantum.DropDownItem"/> - - <style name="Widget.Quantum.Light.DropDownItem.Spinner"/> - - <style name="Widget.Quantum.Light.TextView.SpinnerItem" parent="Widget.Quantum.TextView.SpinnerItem"/> - - <style name="Widget.Quantum.Light.KeyboardView" parent="Widget.KeyboardView"/> - - <style name="Widget.Quantum.Light.QuickContactBadge.WindowSmall" parent="Widget.QuickContactBadge.WindowSmall"/> - - <style name="Widget.Quantum.Light.QuickContactBadge.WindowMedium" parent="Widget.QuickContactBadge.WindowMedium"/> - - <style name="Widget.Quantum.Light.QuickContactBadge.WindowLarge" parent="Widget.QuickContactBadge.WindowLarge"/> - - <style name="Widget.Quantum.Light.QuickContactBadgeSmall.WindowSmall" parent="Widget.QuickContactBadgeSmall.WindowSmall"/> - - <style name="Widget.Quantum.Light.QuickContactBadgeSmall.WindowMedium" parent="Widget.QuickContactBadgeSmall.WindowMedium"/> - - <style name="Widget.Quantum.Light.QuickContactBadgeSmall.WindowLarge" parent="Widget.QuickContactBadgeSmall.WindowLarge"/> + <style name="Widget.Quantum.Light.DropDownItem.Spinner" parent="Widget.Quantum.DropDownItem.Spinner"/> + <style name="Widget.Quantum.Light.KeyboardView" parent="Widget.Quantum.KeyboardView"/> + <style name="Widget.Quantum.Light.QuickContactBadge.WindowSmall" parent="Widget.Quantum.QuickContactBadge.WindowSmall"/> + <style name="Widget.Quantum.Light.QuickContactBadge.WindowMedium" parent="Widget.Quantum.QuickContactBadge.WindowMedium"/> + <style name="Widget.Quantum.Light.QuickContactBadge.WindowLarge" parent="Widget.Quantum.QuickContactBadge.WindowLarge"/> + <style name="Widget.Quantum.Light.QuickContactBadgeSmall.WindowSmall" parent="Widget.Quantum.QuickContactBadgeSmall.WindowSmall"/> + <style name="Widget.Quantum.Light.QuickContactBadgeSmall.WindowMedium" parent="Widget.Quantum.QuickContactBadgeSmall.WindowMedium"/> + <style name="Widget.Quantum.Light.QuickContactBadgeSmall.WindowLarge" parent="Widget.Quantum.QuickContactBadgeSmall.WindowLarge"/> <style name="Widget.Quantum.Light.ListPopupWindow" parent="Widget.ListPopupWindow"> <item name="dropDownSelector">@drawable/list_selector_holo_light</item> @@ -1011,44 +956,17 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.Light.PopupMenu" parent="Widget.Quantum.Light.ListPopupWindow"/> <style name="Widget.Quantum.Light.ActionButton" parent="Widget.Quantum.ActionButton"/> - - <style name="Widget.Quantum.Light.ActionButton.Overflow"> - <item name="src">@drawable/ic_menu_moreoverflow_quantum_light</item> - <item name="contentDescription">@string/action_menu_overflow_description</item> - </style> - - <style name="Widget.Quantum.Light.ActionBar.TabView" parent="Widget.Quantum.ActionBar.TabView"> - <item name="background">@drawable/tab_indicator_quantum_light</item> - </style> - - <style name="Widget.Quantum.Light.Tab" parent="Widget.Quantum.Light.ActionBar.TabView"> - <item name="layout_width">0dip</item> - <item name="layout_weight">1</item> - <item name="minWidth">80dip</item> - </style> - + <style name="Widget.Quantum.Light.ActionButton.Overflow" parent="Widget.Quantum.ActionButton.Overflow"/> + <style name="Widget.Quantum.Light.Tab" parent="Widget.Quantum.Tab"/> + <style name="Widget.Quantum.Light.ActionBar.TabView" parent="Widget.Quantum.ActionBar.TabView"/> <style name="Widget.Quantum.Light.ActionBar.TabBar" parent="Widget.Quantum.ActionBar.TabBar"/> - <style name="Widget.Quantum.Light.ActionBar.TabText" parent="Widget.Quantum.ActionBar.TabText"/> - <style name="Widget.Quantum.Light.ActionBar.TabView.Inverse"/> - - <style name="Widget.Quantum.Light.ActionBar.TabBar.Inverse"/> - - <style name="Widget.Quantum.Light.ActionBar.TabText.Inverse"> - <item name="textColor">?attr/textColorPrimaryInverse</item> - </style> - <style name="Widget.Quantum.Light.ActionMode" parent="Widget.Quantum.ActionMode"> <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionMode.Title</item> <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionMode.Subtitle</item> </style> - <style name="Widget.Quantum.Light.ActionMode.Inverse" parent="Widget.ActionMode"> - <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionMode.Title.Inverse</item> - <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionMode.Subtitle.Inverse</item> - </style> - <style name="Widget.Quantum.Light.ActionButton.CloseMode"> <item name="background">@drawable/btn_cab_done_holo_light</item> </style> @@ -1056,10 +974,10 @@ please see styles_device_defaults.xml. <style name="Widget.Quantum.Light.ActionBar" parent="Widget.Quantum.ActionBar"> <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Title</item> <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Subtitle</item> - <item name="background">@drawable/ab_transparent_quantum_light</item> + <item name="background">@drawable/ab_transparent_quantum</item> <item name="backgroundStacked">@drawable/ab_stacked_transparent_light_holo</item> <item name="backgroundSplit">@drawable/ab_bottom_transparent_light_holo</item> - <item name="homeAsUpIndicator">@drawable/ic_ab_back_quantum_light</item> + <item name="homeAsUpIndicator">@drawable/ic_ab_back_quantum</item> <item name="progressBarStyle">@style/Widget.Quantum.Light.ProgressBar.Horizontal</item> <item name="indeterminateProgressStyle">@style/Widget.Quantum.Light.ProgressBar</item> </style> @@ -1077,36 +995,20 @@ please see styles_device_defaults.xml. <item name="itemPadding">8dip</item> </style> - <style name="Widget.Quantum.Light.ActionBar.Solid.Inverse"> - <item name="titleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Title.Inverse</item> - <item name="subtitleTextStyle">@style/TextAppearance.Quantum.Widget.ActionBar.Subtitle.Inverse</item> - <item name="background">@drawable/ab_solid_dark_holo</item> - <item name="backgroundStacked">@drawable/ab_stacked_solid_dark_holo</item> - <item name="backgroundSplit">@drawable/ab_bottom_solid_inverse_holo</item> - <item name="divider">@drawable/list_divider_quantum_dark</item> - <item name="progressBarStyle">@style/Widget.Quantum.ProgressBar.Horizontal</item> - <item name="indeterminateProgressStyle">@style/Widget.Quantum.ProgressBar</item> - <item name="progressBarPadding">32dip</item> - <item name="itemPadding">8dip</item> + <style name="Widget.Quantum.Light.CompoundButton.Switch" parent="Widget.Quantum.CompoundButton.Switch"> + <item name="switchTextAppearance">@style/TextAppearance.Quantum.Light.Widget.Switch</item> </style> - <style name="Widget.Quantum.Light.CompoundButton.Switch" parent="Widget.CompoundButton.Switch"> - <item name="track">@drawable/switch_track_quantum_light</item> - <item name="thumb">@drawable/switch_inner_quantum_light</item> - <item name="switchTextAppearance">@style/TextAppearance.Quantum.Light.Widget.Switch</item> - <item name="textOn"></item> - <item name="textOff"></item> - <item name="thumbTextPadding">12dip</item> - <item name="switchMinWidth">96dip</item> - <item name="switchPadding">16dip</item> + <style name="Widget.Quantum.Light.FastScroll" parent="Widget.Quantum.FastScroll"/> + + <style name="Widget.Quantum.Light.MediaRouteButton" parent="Widget.Quantum.MediaRouteButton"> + <item name="externalRouteEnabledDrawable">@drawable/ic_media_route_holo_light</item> </style> <!-- Animation Styles --> <style name="Animation.Quantum" parent="Animation"/> - <style name="Animation.Quantum.Activity" parent="Animation.Activity"/> - <style name="Animation.Quantum.Dialog" parent="Animation.Dialog"/> <!-- Dialog styles --> @@ -1131,7 +1033,7 @@ please see styles_device_defaults.xml. <item name="singleChoiceItemLayout">@layout/select_dialog_singlechoice_holo</item> </style> - <style name="AlertDialog.Quantum.Light" /> + <style name="AlertDialog.Quantum.Light"/> <!-- Window title --> <style name="WindowTitleBackground.Quantum"> @@ -1152,60 +1054,7 @@ please see styles_device_defaults.xml. </style> <style name="DialogWindowTitle.Quantum.Light"> - <item name="maxLines">1</item> - <item name="scrollHorizontally">true</item> <item name="textAppearance">@style/TextAppearance.Quantum.Light.DialogWindowTitle</item> </style> - <style name="Widget.Quantum.PreferenceFrameLayout"> - <item name="borderTop">0dip</item> - <item name="borderBottom">@dimen/preference_fragment_padding_bottom</item> - <item name="borderLeft">?attr/preferenceFragmentPaddingSide</item> - <item name="borderRight">?attr/preferenceFragmentPaddingSide</item> - </style> - - <style name="Widget.Quantum.MediaRouteButton"> - <item name="background">?attr/selectableItemBackground</item> - <item name="externalRouteEnabledDrawable">@drawable/ic_media_route_holo_dark</item> - <item name="minWidth">56dp</item> - <item name="minHeight">48dp</item> - <item name="focusable">true</item> - <item name="contentDescription">@string/media_route_button_content_description</item> - </style> - - <style name="Widget.Quantum.Light.MediaRouteButton" parent="Widget.Quantum.MediaRouteButton"> - <item name="externalRouteEnabledDrawable">@drawable/ic_media_route_holo_light</item> - </style> - - <style name="TextAppearance.Quantum.TimePicker.TimeLabel" parent="TextAppearance.Quantum"> - <item name="textSize">@dimen/timepicker_time_label_size</item> - <item name="textColor">@color/timepicker_default_text_color_quantum_dark</item> - </style> - - <style name="TextAppearance.Quantum.TimePicker.AmPmLabel" parent="TextAppearance.Quantum"> - <item name="textSize">@dimen/timepicker_ampm_label_size</item> - <item name="textAllCaps">true</item> - <item name="textColor">@color/timepicker_default_text_color_quantum_dark</item> - <item name="textStyle">bold</item> - </style> - - <style name="TextAppearance.Quantum.Light.TimePicker.TimeLabel" parent="TextAppearance.Quantum.Light"> - <item name="textSize">@dimen/timepicker_time_label_size</item> - <item name="textColor">@color/timepicker_default_text_color_quantum_light</item> - </style> - - <style name="TextAppearance.Quantum.Light.TimePicker.AmPmLabel" parent="TextAppearance.Quantum.Light"> - <item name="textSize">@dimen/timepicker_ampm_label_size</item> - <item name="textAllCaps">true</item> - <item name="textColor">@color/timepicker_default_text_color_quantum_light</item> - <item name="textStyle">bold</item> - </style> - - <style name="Widget.Quantum.FastScroll" parent="Widget.FastScroll"> - <item name="thumbMinWidth">0dp</item> - <item name="thumbMinHeight">0dp</item> - </style> - - <style name="Widget.Quantum.Light.FastScroll" parent="Widget.Quantum.FastScroll"/> - </resources> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 4a0158e66c83..3c4e848f6a05 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -927,7 +927,7 @@ please see themes_device_defaults.xml. <item name="colorForeground">@android:color/bright_foreground_holo_dark</item> <item name="colorForegroundInverse">@android:color/bright_foreground_inverse_holo_dark</item> <item name="colorBackground">@android:color/background_holo_dark</item> - <item name="colorBackgroundCacheHint">@android:drawable/background_cache_hint_selector_holo_dark</item> + <item name="colorBackgroundCacheHint">@android:color/background_cache_hint_selector_holo_dark</item> <item name="disabledAlpha">0.5</item> <item name="backgroundDimAmount">0.6</item> @@ -1256,7 +1256,7 @@ please see themes_device_defaults.xml. <item name="colorForeground">@android:color/bright_foreground_holo_light</item> <item name="colorForegroundInverse">@android:color/bright_foreground_inverse_holo_light</item> <item name="colorBackground">@android:color/background_holo_light</item> - <item name="colorBackgroundCacheHint">@android:drawable/background_cache_hint_selector_holo_light</item> + <item name="colorBackgroundCacheHint">@android:color/background_cache_hint_selector_holo_light</item> <item name="disabledAlpha">0.5</item> <item name="backgroundDimAmount">0.6</item> diff --git a/core/res/res/values/themes_quantum.xml b/core/res/res/values/themes_quantum.xml index d2eee2864779..24abd55b19e9 100644 --- a/core/res/res/values/themes_quantum.xml +++ b/core/res/res/values/themes_quantum.xml @@ -45,7 +45,7 @@ please see themes_device_defaults.xml. <item name="colorForeground">@color/bright_foreground_quantum_dark</item> <item name="colorForegroundInverse">@color/bright_foreground_quantum_light</item> <item name="colorBackground">@color/background_quantum_dark</item> - <item name="colorBackgroundCacheHint">@drawable/background_cache_hint_selector_quantum_dark</item> + <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_quantum_dark</item> <item name="disabledAlpha">0.5</item> <item name="backgroundDimAmount">0.6</item> @@ -81,7 +81,7 @@ please see themes_device_defaults.xml. <item name="textAppearanceButton">@style/TextAppearance.Quantum.Widget.Button</item> <item name="editTextColor">?attr/textColorPrimary</item> - <item name="editTextBackground">@drawable/edit_text_quantum_dark</item> + <item name="editTextBackground">@drawable/edit_text_quantum</item> <item name="candidatesTextStyleSpans">@string/candidates_style</item> @@ -100,9 +100,9 @@ please see themes_device_defaults.xml. <item name="switchStyle">@style/Widget.Quantum.CompoundButton.Switch</item> <item name="mediaRouteButtonStyle">@style/Widget.Quantum.MediaRouteButton</item> - <item name="selectableItemBackground">@drawable/item_background_quantum_dark</item> + <item name="selectableItemBackground">@drawable/item_background_quantum</item> <item name="borderlessButtonStyle">@style/Widget.Quantum.Button.Borderless</item> - <item name="homeAsUpIndicator">@drawable/ic_ab_back_quantum_dark</item> + <item name="homeAsUpIndicator">@drawable/ic_ab_back_quantum</item> <!-- List attributes --> <item name="listPreferredItemHeight">64dip</item> @@ -117,17 +117,17 @@ please see themes_device_defaults.xml. <!-- @hide --> <item name="searchResultListItemHeight">58dip</item> - <item name="listDivider">@drawable/list_divider_quantum_dark</item> + <item name="listDivider">@drawable/list_divider_quantum</item> <item name="listSeparatorTextViewStyle">@style/Widget.Quantum.TextView.ListSeparator</item> - <item name="listChoiceIndicatorSingle">@drawable/btn_radio_quantum_dark</item> - <item name="listChoiceIndicatorMultiple">@drawable/btn_check_quantum_dark</item> + <item name="listChoiceIndicatorSingle">@drawable/btn_radio_quantum</item> + <item name="listChoiceIndicatorMultiple">@drawable/btn_check_quantum</item> <item name="listChoiceBackgroundIndicator">@drawable/list_selector_holo_dark</item> - <item name="activatedBackgroundIndicator">@drawable/activated_background_quantum_dark</item> + <item name="activatedBackgroundIndicator">@drawable/activated_background_quantum</item> - <item name="listDividerAlertDialog">@drawable/list_divider_quantum_dark</item> + <item name="listDividerAlertDialog">@drawable/list_divider_quantum</item> <item name="expandableListPreferredItemPaddingLeft">40dip</item> <item name="expandableListPreferredChildPaddingLeft">?attr/expandableListPreferredItemPaddingLeft</item> @@ -136,8 +136,8 @@ please see themes_device_defaults.xml. <item name="expandableListPreferredItemIndicatorRight">0dip</item> <item name="expandableListPreferredChildIndicatorLeft">?attr/expandableListPreferredItemIndicatorLeft</item> <item name="expandableListPreferredChildIndicatorRight">?attr/expandableListPreferredItemIndicatorRight</item> - <item name="findOnPageNextDrawable">@drawable/ic_find_next_quantum_dark</item> - <item name="findOnPagePreviousDrawable">@drawable/ic_find_previous_quantum_dark</item> + <item name="findOnPageNextDrawable">@drawable/ic_find_next_quantum</item> + <item name="findOnPagePreviousDrawable">@drawable/ic_find_previous_quantum</item> <!-- Gallery attributes --> <item name="galleryItemBackground">@drawable/gallery_item_background</item> @@ -170,7 +170,7 @@ please see themes_device_defaults.xml. <item name="alertDialogTheme">@style/Theme.Quantum.Dialog.Alert</item> <item name="alertDialogStyle">@style/AlertDialog.Quantum</item> <item name="alertDialogCenterButtons">false</item> - <item name="alertDialogIcon">@drawable/ic_dialog_alert_quantum_dark</item> + <item name="alertDialogIcon">@drawable/ic_dialog_alert_quantum</item> <!-- Presentation attributes --> <item name="presentationTheme">@style/Theme.Quantum.Dialog.Presentation</item> @@ -194,8 +194,8 @@ please see themes_device_defaults.xml. <item name="scrollbarFadeDuration">250</item> <item name="scrollbarDefaultDelayBeforeFade">300</item> <item name="scrollbarSize">10dip</item> - <item name="scrollbarThumbHorizontal">@drawable/scrollbar_handle_quantum_dark</item> - <item name="scrollbarThumbVertical">@drawable/scrollbar_handle_quantum_dark</item> + <item name="scrollbarThumbHorizontal">@drawable/scrollbar_handle_quantum</item> + <item name="scrollbarThumbVertical">@drawable/scrollbar_handle_quantum</item> <item name="scrollbarTrackHorizontal">@null</item> <item name="scrollbarTrackVertical">@null</item> @@ -205,7 +205,7 @@ please see themes_device_defaults.xml. <item name="textSelectHandle">@drawable/text_select_handle_middle</item> <item name="textSelectHandleWindowStyle">@style/Widget.Quantum.TextSelectHandle</item> <item name="textSuggestionsWindowStyle">@style/Widget.Quantum.TextSuggestionsPopupWindow</item> - <item name="textCursorDrawable">@drawable/text_cursor_quantum_dark</item> + <item name="textCursorDrawable">@drawable/text_cursor_quantum</item> <!-- Widget styles --> <item name="absListViewStyle">@style/Widget.Quantum.AbsListView</item> @@ -290,7 +290,7 @@ please see themes_device_defaults.xml. <item name="actionOverflowButtonStyle">@style/Widget.Quantum.ActionButton.Overflow</item> <item name="actionModeBackground">@color/theme_color_700</item> <item name="actionModeSplitBackground">@color/theme_color_700</item> - <item name="actionModeCloseDrawable">@drawable/ic_cab_done_quantum_dark</item> + <item name="actionModeCloseDrawable">@drawable/ic_cab_done_quantum</item> <item name="actionBarTabStyle">@style/Widget.Quantum.ActionBar.TabView</item> <item name="actionBarTabBarStyle">@style/Widget.Quantum.ActionBar.TabBar</item> <item name="actionBarTabTextStyle">@style/Widget.Quantum.ActionBar.TabText</item> @@ -300,21 +300,21 @@ please see themes_device_defaults.xml. <item name="actionBarSize">@dimen/action_bar_default_height</item> <item name="actionModePopupWindowStyle">@style/Widget.Quantum.PopupWindow.ActionMode</item> <item name="actionBarWidgetTheme">@null</item> - <item name="actionBarItemBackground">@drawable/item_background_borderless_quantum_dark</item> + <item name="actionBarItemBackground">@drawable/item_background_quantum</item> - <item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum_dark</item> - <item name="actionModeCopyDrawable">@drawable/ic_menu_copy_quantum_dark</item> - <item name="actionModePasteDrawable">@drawable/ic_menu_paste_quantum_dark</item> - <item name="actionModeSelectAllDrawable">@drawable/ic_menu_selectall_quantum_dark</item> - <item name="actionModeShareDrawable">@drawable/ic_menu_share_quantum_dark</item> - <item name="actionModeFindDrawable">@drawable/ic_menu_find_quantum_dark</item> - <item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_quantum_dark</item> + <item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum</item> + <item name="actionModeCopyDrawable">@drawable/ic_menu_copy_quantum</item> + <item name="actionModePasteDrawable">@drawable/ic_menu_paste_quantum</item> + <item name="actionModeSelectAllDrawable">@drawable/ic_menu_selectall_quantum</item> + <item name="actionModeShareDrawable">@drawable/ic_menu_share_quantum</item> + <item name="actionModeFindDrawable">@drawable/ic_menu_find_quantum</item> + <item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_quantum</item> <item name="dividerVertical">?attr/listDivider</item> <item name="dividerHorizontal">?attr/listDivider</item> - <item name="buttonBarStyle">@style/Quantum.ButtonBar</item> + <item name="buttonBarStyle">@style/Widget.Quantum.ButtonBar</item> <item name="buttonBarButtonStyle">?attr/borderlessButtonStyle</item> - <item name="segmentedButtonStyle">@style/Quantum.SegmentedButton</item> + <item name="segmentedButtonStyle">@style/Widget.Quantum.SegmentedButton</item> <!-- SearchView attributes --> <item name="searchDropdownBackground">@drawable/search_dropdown_dark</item> @@ -349,11 +349,20 @@ please see themes_device_defaults.xml. <item name="datePickerStyle">@style/Widget.Quantum.DatePicker</item> <!-- TODO: This belongs in a FastScroll style --> - <item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_quantum_light</item> + <item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_quantum</item> <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_dark</item> <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_dark</item> - <item name="fastScrollTrackDrawable">@drawable/fastscroll_track_quantum_dark</item> + <item name="fastScrollTrackDrawable">@drawable/fastscroll_track_quantum</item> <item name="fastScrollOverlayPosition">atThumb</item> + + <!-- Color palette --> + <item name="colorControlNormal">@color/control_normal_foreground_quantum_dark</item> + <item name="colorControlActivated">@color/control_activated_foreground_quantum_dark</item> + <item name="colorButtonNormal">@color/btn_default_normal_quantum_dark</item> + <item name="colorButtonPressed">@color/btn_default_pressed_quantum_dark</item> + <!-- TODO: Remove these attrs and move into button style. --> + <item name="colorButtonNormalColored">@color/theme_color_500</item> + <item name="colorButtonPressedColored">@color/theme_color_300</item> </style> <!-- Quantum Paper theme (light version). --> @@ -361,7 +370,7 @@ please see themes_device_defaults.xml. <item name="colorForeground">@color/bright_foreground_quantum_light</item> <item name="colorForegroundInverse">@color/bright_foreground_quantum_dark</item> <item name="colorBackground">@color/background_quantum_light</item> - <item name="colorBackgroundCacheHint">@drawable/background_cache_hint_selector_quantum_light</item> + <item name="colorBackgroundCacheHint">@color/background_cache_hint_selector_quantum_light</item> <item name="disabledAlpha">0.5</item> <item name="backgroundDimAmount">0.6</item> @@ -398,7 +407,7 @@ please see themes_device_defaults.xml. <item name="textAppearanceButton">@style/TextAppearance.Quantum.Light.Widget.Button</item> <item name="editTextColor">?attr/textColorPrimary</item> - <item name="editTextBackground">@drawable/edit_text_quantum_light</item> + <item name="editTextBackground">@drawable/edit_text_quantum</item> <item name="candidatesTextStyleSpans">@string/candidates_style</item> @@ -418,9 +427,9 @@ please see themes_device_defaults.xml. <item name="switchStyle">@style/Widget.Quantum.Light.CompoundButton.Switch</item> <item name="mediaRouteButtonStyle">@style/Widget.Quantum.Light.MediaRouteButton</item> - <item name="selectableItemBackground">@drawable/item_background_quantum_light</item> + <item name="selectableItemBackground">@drawable/item_background_quantum</item> <item name="borderlessButtonStyle">@style/Widget.Quantum.Light.Button.Borderless</item> - <item name="homeAsUpIndicator">@drawable/ic_ab_back_quantum_light</item> + <item name="homeAsUpIndicator">@drawable/ic_ab_back_quantum</item> <!-- List attributes --> <item name="listPreferredItemHeight">64dip</item> @@ -435,15 +444,15 @@ please see themes_device_defaults.xml. <!-- @hide --> <item name="searchResultListItemHeight">58dip</item> - <item name="listDivider">@drawable/list_divider_quantum_light</item> + <item name="listDivider">@drawable/list_divider_quantum</item> <item name="listSeparatorTextViewStyle">@style/Widget.Quantum.Light.TextView.ListSeparator</item> - <item name="listChoiceIndicatorSingle">@drawable/btn_radio_quantum_light</item> - <item name="listChoiceIndicatorMultiple">@drawable/btn_check_quantum_light</item> + <item name="listChoiceIndicatorSingle">@drawable/btn_radio_quantum</item> + <item name="listChoiceIndicatorMultiple">@drawable/btn_check_quantum</item> <item name="listChoiceBackgroundIndicator">@drawable/list_selector_holo_light</item> - <item name="activatedBackgroundIndicator">@drawable/activated_background_quantum_light</item> + <item name="activatedBackgroundIndicator">@drawable/activated_background_quantum</item> <item name="expandableListPreferredItemPaddingLeft">40dip</item> <item name="expandableListPreferredChildPaddingLeft">?attr/expandableListPreferredItemPaddingLeft</item> @@ -453,9 +462,9 @@ please see themes_device_defaults.xml. <item name="expandableListPreferredChildIndicatorLeft">?attr/expandableListPreferredItemIndicatorLeft</item> <item name="expandableListPreferredChildIndicatorRight">?attr/expandableListPreferredItemIndicatorRight</item> - <item name="listDividerAlertDialog">@drawable/list_divider_quantum_light</item> - <item name="findOnPageNextDrawable">@drawable/ic_find_next_quantum_light</item> - <item name="findOnPagePreviousDrawable">@drawable/ic_find_previous_quantum_light</item> + <item name="listDividerAlertDialog">@drawable/list_divider_quantum</item> + <item name="findOnPageNextDrawable">@drawable/ic_find_next_quantum</item> + <item name="findOnPagePreviousDrawable">@drawable/ic_find_previous_quantum</item> <!-- Gallery attributes --> <item name="galleryItemBackground">@drawable/gallery_item_background</item> @@ -487,7 +496,7 @@ please see themes_device_defaults.xml. <item name="alertDialogTheme">@style/Theme.Quantum.Light.Dialog.Alert</item> <item name="alertDialogStyle">@style/AlertDialog.Quantum.Light</item> <item name="alertDialogCenterButtons">false</item> - <item name="alertDialogIcon">@drawable/ic_dialog_alert_quantum_light</item> + <item name="alertDialogIcon">@drawable/ic_dialog_alert_quantum</item> <!-- Presentation attributes --> <item name="presentationTheme">@style/Theme.Quantum.Light.Dialog.Presentation</item> @@ -511,8 +520,8 @@ please see themes_device_defaults.xml. <item name="scrollbarFadeDuration">250</item> <item name="scrollbarDefaultDelayBeforeFade">300</item> <item name="scrollbarSize">10dip</item> - <item name="scrollbarThumbHorizontal">@drawable/scrollbar_handle_quantum_light</item> - <item name="scrollbarThumbVertical">@drawable/scrollbar_handle_quantum_light</item> + <item name="scrollbarThumbHorizontal">@drawable/scrollbar_handle_quantum</item> + <item name="scrollbarThumbVertical">@drawable/scrollbar_handle_quantum</item> <item name="scrollbarTrackHorizontal">@null</item> <item name="scrollbarTrackVertical">@null</item> @@ -522,7 +531,7 @@ please see themes_device_defaults.xml. <item name="textSelectHandle">@drawable/text_select_handle_middle</item> <item name="textSelectHandleWindowStyle">@style/Widget.Quantum.TextSelectHandle</item> <item name="textSuggestionsWindowStyle">@style/Widget.Quantum.Light.TextSuggestionsPopupWindow</item> - <item name="textCursorDrawable">@drawable/text_cursor_quantum_light</item> + <item name="textCursorDrawable">@drawable/text_cursor_quantum</item> <!-- Widget styles --> <item name="absListViewStyle">@style/Widget.Quantum.Light.AbsListView</item> @@ -610,7 +619,7 @@ please see themes_device_defaults.xml. <item name="actionOverflowButtonStyle">@style/Widget.Quantum.Light.ActionButton.Overflow</item> <item name="actionModeBackground">@drawable/cab_background_top_holo_light</item> <item name="actionModeSplitBackground">@drawable/cab_background_bottom_holo_light</item> - <item name="actionModeCloseDrawable">@drawable/ic_cab_done_quantum_light</item> + <item name="actionModeCloseDrawable">@drawable/ic_cab_done_quantum</item> <item name="actionBarTabStyle">@style/Widget.Quantum.Light.ActionBar.TabView</item> <item name="actionBarTabBarStyle">@style/Widget.Quantum.Light.ActionBar.TabBar</item> <item name="actionBarTabTextStyle">@style/Widget.Quantum.Light.ActionBar.TabText</item> @@ -620,21 +629,21 @@ please see themes_device_defaults.xml. <item name="actionBarSize">@dimen/action_bar_default_height</item> <item name="actionModePopupWindowStyle">@style/Widget.Quantum.Light.PopupWindow.ActionMode</item> <item name="actionBarWidgetTheme">@null</item> - <item name="actionBarItemBackground">@drawable/item_background_borderless_quantum_light</item> + <item name="actionBarItemBackground">@drawable/item_background_quantum</item> - <item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum_light</item> - <item name="actionModeCopyDrawable">@drawable/ic_menu_copy_quantum_light</item> - <item name="actionModePasteDrawable">@drawable/ic_menu_paste_quantum_light</item> - <item name="actionModeSelectAllDrawable">@drawable/ic_menu_selectall_quantum_light</item> - <item name="actionModeShareDrawable">@drawable/ic_menu_share_quantum_light</item> - <item name="actionModeFindDrawable">@drawable/ic_menu_find_quantum_light</item> - <item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_quantum_light</item> + <item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum</item> + <item name="actionModeCopyDrawable">@drawable/ic_menu_copy_quantum</item> + <item name="actionModePasteDrawable">@drawable/ic_menu_paste_quantum</item> + <item name="actionModeSelectAllDrawable">@drawable/ic_menu_selectall_quantum</item> + <item name="actionModeShareDrawable">@drawable/ic_menu_share_quantum</item> + <item name="actionModeFindDrawable">@drawable/ic_menu_find_quantum</item> + <item name="actionModeWebSearchDrawable">@drawable/ic_menu_search_quantum</item> <item name="dividerVertical">?attr/listDivider</item> <item name="dividerHorizontal">?attr/listDivider</item> - <item name="buttonBarStyle">@style/Quantum.Light.ButtonBar</item> + <item name="buttonBarStyle">@style/Widget.Quantum.Light.ButtonBar</item> <item name="buttonBarButtonStyle">?attr/borderlessButtonStyle</item> - <item name="segmentedButtonStyle">@style/Quantum.Light.SegmentedButton</item> + <item name="segmentedButtonStyle">@style/Widget.Quantum.Light.SegmentedButton</item> <!-- SearchView attributes --> <item name="searchDropdownBackground">@drawable/search_dropdown_light</item> @@ -665,11 +674,20 @@ please see themes_device_defaults.xml. <!-- DatePicker style --> <item name="datePickerStyle">@style/Widget.Quantum.Light.DatePicker</item> - <item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_quantum_light</item> + <item name="fastScrollThumbDrawable">@drawable/fastscroll_thumb_quantum</item> <item name="fastScrollPreviewBackgroundLeft">@drawable/fastscroll_label_left_holo_light</item> <item name="fastScrollPreviewBackgroundRight">@drawable/fastscroll_label_right_holo_light</item> - <item name="fastScrollTrackDrawable">@drawable/fastscroll_track_quantum_light</item> + <item name="fastScrollTrackDrawable">@drawable/fastscroll_track_quantum</item> <item name="fastScrollOverlayPosition">atThumb</item> + + <!-- Color palette --> + <item name="colorControlNormal">@color/control_normal_foreground_quantum_light</item> + <item name="colorControlActivated">@color/control_activated_foreground_quantum_light</item> + <item name="colorButtonNormal">@color/btn_default_normal_quantum_light</item> + <item name="colorButtonPressed">@color/btn_default_pressed_quantum_light</item> + <!-- TODO: Remove these attrs and move into button style. --> + <item name="colorButtonNormalColored">@color/theme_color_500</item> + <item name="colorButtonPressedColored">@color/theme_color_700</item> </style> <!-- Variant of the quantum (light) theme that has a solid (opaque) action bar @@ -841,7 +859,7 @@ please see themes_device_defaults.xml. <item name="colorBackgroundCacheHint">@null</item> - <item name="buttonBarStyle">@style/Quantum.ButtonBar.AlertDialog</item> + <item name="buttonBarStyle">@style/Widget.Quantum.ButtonBar.AlertDialog</item> <item name="borderlessButtonStyle">@style/Widget.Quantum.Button.Borderless.Small</item> <item name="textAppearance">@style/TextAppearance.Quantum</item> @@ -963,7 +981,7 @@ please see themes_device_defaults.xml. <item name="colorBackgroundCacheHint">@null</item> - <item name="buttonBarStyle">@style/Quantum.Light.ButtonBar.AlertDialog</item> + <item name="buttonBarStyle">@style/Widget.Quantum.Light.ButtonBar.AlertDialog</item> <item name="borderlessButtonStyle">@style/Widget.Quantum.Light.Button.Borderless.Small</item> <item name="textAppearance">@style/TextAppearance.Quantum.Light</item> |