diff options
| -rw-r--r-- | api/current.txt | 234 | ||||
| -rw-r--r-- | core/res/res/values/colors.xml | 88 | ||||
| -rw-r--r-- | core/res/res/values/colors_holo.xml | 123 | ||||
| -rw-r--r-- | core/res/res/values/colors_legacy.xml | 45 | ||||
| -rw-r--r-- | core/res/res/values/colors_quantum.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 4 | ||||
| -rw-r--r-- | core/res/res/values/styles_quantum.xml | 18 | ||||
| -rw-r--r-- | core/res/res/values/themes.xml | 32 | ||||
| -rw-r--r-- | core/res/res/values/themes_quantum.xml | 3 |
9 files changed, 319 insertions, 232 deletions
diff --git a/api/current.txt b/api/current.txt index 6e702ee..1b5ea62 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1858,28 +1858,28 @@ package android { field public static final int TextAppearance_Medium = 16973892; // 0x1030044 field public static final int TextAppearance_Medium_Inverse = 16973893; // 0x1030045 field public static final int TextAppearance_Quantum = 16974352; // 0x1030210 - field public static final int TextAppearance_Quantum_Body1 = 16974546; // 0x10302d2 - field public static final int TextAppearance_Quantum_Body2 = 16974545; // 0x10302d1 - field public static final int TextAppearance_Quantum_Button = 16974549; // 0x10302d5 - field public static final int TextAppearance_Quantum_Caption = 16974547; // 0x10302d3 + field public static final int TextAppearance_Quantum_Body1 = 16974542; // 0x10302ce + field public static final int TextAppearance_Quantum_Body2 = 16974541; // 0x10302cd + field public static final int TextAppearance_Quantum_Button = 16974545; // 0x10302d1 + field public static final int TextAppearance_Quantum_Caption = 16974543; // 0x10302cf field public static final int TextAppearance_Quantum_DialogWindowTitle = 16974353; // 0x1030211 - field public static final int TextAppearance_Quantum_Display1 = 16974541; // 0x10302cd - field public static final int TextAppearance_Quantum_Display2 = 16974540; // 0x10302cc - field public static final int TextAppearance_Quantum_Display3 = 16974539; // 0x10302cb - field public static final int TextAppearance_Quantum_Display4 = 16974538; // 0x10302ca - field public static final int TextAppearance_Quantum_Headline = 16974542; // 0x10302ce + field public static final int TextAppearance_Quantum_Display1 = 16974537; // 0x10302c9 + field public static final int TextAppearance_Quantum_Display2 = 16974536; // 0x10302c8 + field public static final int TextAppearance_Quantum_Display3 = 16974535; // 0x10302c7 + field public static final int TextAppearance_Quantum_Display4 = 16974534; // 0x10302c6 + field public static final int TextAppearance_Quantum_Headline = 16974538; // 0x10302ca field public static final int TextAppearance_Quantum_Inverse = 16974354; // 0x1030212 field public static final int TextAppearance_Quantum_Large = 16974355; // 0x1030213 field public static final int TextAppearance_Quantum_Large_Inverse = 16974356; // 0x1030214 field public static final int TextAppearance_Quantum_Medium = 16974357; // 0x1030215 field public static final int TextAppearance_Quantum_Medium_Inverse = 16974358; // 0x1030216 - field public static final int TextAppearance_Quantum_Menu = 16974548; // 0x10302d4 + field public static final int TextAppearance_Quantum_Menu = 16974544; // 0x10302d0 field public static final int TextAppearance_Quantum_SearchResult_Subtitle = 16974359; // 0x1030217 field public static final int TextAppearance_Quantum_SearchResult_Title = 16974360; // 0x1030218 field public static final int TextAppearance_Quantum_Small = 16974361; // 0x1030219 field public static final int TextAppearance_Quantum_Small_Inverse = 16974362; // 0x103021a - field public static final int TextAppearance_Quantum_Subhead = 16974544; // 0x10302d0 - field public static final int TextAppearance_Quantum_Title = 16974543; // 0x10302cf + field public static final int TextAppearance_Quantum_Subhead = 16974540; // 0x10302cc + field public static final int TextAppearance_Quantum_Title = 16974539; // 0x10302cb field public static final int TextAppearance_Quantum_Widget = 16974364; // 0x103021c field public static final int TextAppearance_Quantum_Widget_ActionBar_Menu = 16974365; // 0x103021d field public static final int TextAppearance_Quantum_Widget_ActionBar_Subtitle = 16974366; // 0x103021e @@ -2329,118 +2329,114 @@ package android { field public static final int Widget_Quantum_ActionMode = 16974423; // 0x1030257 field public static final int Widget_Quantum_AutoCompleteTextView = 16974424; // 0x1030258 field public static final int Widget_Quantum_Button = 16974425; // 0x1030259 - field public static final int Widget_Quantum_ButtonBar = 16974433; // 0x1030261 - field public static final int Widget_Quantum_ButtonBar_AlertDialog = 16974434; // 0x1030262 + field public static final int Widget_Quantum_ButtonBar = 16974431; // 0x103025f + field public static final int Widget_Quantum_ButtonBar_AlertDialog = 16974432; // 0x1030260 field public static final int Widget_Quantum_Button_Borderless = 16974426; // 0x103025a field public static final int Widget_Quantum_Button_Borderless_Small = 16974427; // 0x103025b field public static final int Widget_Quantum_Button_Inset = 16974428; // 0x103025c - field public static final int Widget_Quantum_Button_Paper = 16974431; // 0x103025f - field public static final int Widget_Quantum_Button_Paper_Color = 16974432; // 0x1030260 field public static final int Widget_Quantum_Button_Small = 16974429; // 0x103025d field public static final int Widget_Quantum_Button_Toggle = 16974430; // 0x103025e - field public static final int Widget_Quantum_CalendarView = 16974435; // 0x1030263 - field public static final int Widget_Quantum_CheckedTextView = 16974436; // 0x1030264 - field public static final int Widget_Quantum_CompoundButton_CheckBox = 16974437; // 0x1030265 - field public static final int Widget_Quantum_CompoundButton_RadioButton = 16974438; // 0x1030266 - field public static final int Widget_Quantum_CompoundButton_Star = 16974439; // 0x1030267 - field public static final int Widget_Quantum_DatePicker = 16974440; // 0x1030268 - field public static final int Widget_Quantum_DropDownItem = 16974441; // 0x1030269 - field public static final int Widget_Quantum_DropDownItem_Spinner = 16974442; // 0x103026a - field public static final int Widget_Quantum_EditText = 16974443; // 0x103026b - field public static final int Widget_Quantum_ExpandableListView = 16974444; // 0x103026c - field public static final int Widget_Quantum_FastScroll = 16974445; // 0x103026d - field public static final int Widget_Quantum_FragmentBreadCrumbs = 16974446; // 0x103026e - field public static final int Widget_Quantum_GridView = 16974447; // 0x103026f - field public static final int Widget_Quantum_HorizontalScrollView = 16974448; // 0x1030270 - field public static final int Widget_Quantum_ImageButton = 16974449; // 0x1030271 - field public static final int Widget_Quantum_Light = 16974475; // 0x103028b - field public static final int Widget_Quantum_Light_ActionBar = 16974476; // 0x103028c - field public static final int Widget_Quantum_Light_ActionBar_Solid = 16974477; // 0x103028d - field public static final int Widget_Quantum_Light_ActionBar_TabBar = 16974478; // 0x103028e - field public static final int Widget_Quantum_Light_ActionBar_TabText = 16974479; // 0x103028f - field public static final int Widget_Quantum_Light_ActionBar_TabView = 16974480; // 0x1030290 - field public static final int Widget_Quantum_Light_ActionButton = 16974481; // 0x1030291 - field public static final int Widget_Quantum_Light_ActionButton_CloseMode = 16974482; // 0x1030292 - field public static final int Widget_Quantum_Light_ActionButton_Overflow = 16974483; // 0x1030293 - field public static final int Widget_Quantum_Light_ActionMode = 16974484; // 0x1030294 - field public static final int Widget_Quantum_Light_AutoCompleteTextView = 16974485; // 0x1030295 - field public static final int Widget_Quantum_Light_Button = 16974486; // 0x1030296 - field public static final int Widget_Quantum_Light_ButtonBar = 16974494; // 0x103029e - field public static final int Widget_Quantum_Light_ButtonBar_AlertDialog = 16974495; // 0x103029f - field public static final int Widget_Quantum_Light_Button_Borderless = 16974487; // 0x1030297 - field public static final int Widget_Quantum_Light_Button_Borderless_Small = 16974488; // 0x1030298 - field public static final int Widget_Quantum_Light_Button_Inset = 16974489; // 0x1030299 - field public static final int Widget_Quantum_Light_Button_Paper = 16974492; // 0x103029c - field public static final int Widget_Quantum_Light_Button_Paper_Color = 16974493; // 0x103029d - field public static final int Widget_Quantum_Light_Button_Small = 16974490; // 0x103029a - field public static final int Widget_Quantum_Light_Button_Toggle = 16974491; // 0x103029b - field public static final int Widget_Quantum_Light_CalendarView = 16974496; // 0x10302a0 - field public static final int Widget_Quantum_Light_CheckedTextView = 16974497; // 0x10302a1 - field public static final int Widget_Quantum_Light_CompoundButton_CheckBox = 16974498; // 0x10302a2 - field public static final int Widget_Quantum_Light_CompoundButton_RadioButton = 16974499; // 0x10302a3 - field public static final int Widget_Quantum_Light_CompoundButton_Star = 16974500; // 0x10302a4 - field public static final int Widget_Quantum_Light_DropDownItem = 16974501; // 0x10302a5 - field public static final int Widget_Quantum_Light_DropDownItem_Spinner = 16974502; // 0x10302a6 - field public static final int Widget_Quantum_Light_EditText = 16974503; // 0x10302a7 - field public static final int Widget_Quantum_Light_ExpandableListView = 16974504; // 0x10302a8 - field public static final int Widget_Quantum_Light_FastScroll = 16974505; // 0x10302a9 - field public static final int Widget_Quantum_Light_FragmentBreadCrumbs = 16974506; // 0x10302aa - field public static final int Widget_Quantum_Light_GridView = 16974507; // 0x10302ab - field public static final int Widget_Quantum_Light_HorizontalScrollView = 16974508; // 0x10302ac - field public static final int Widget_Quantum_Light_ImageButton = 16974509; // 0x10302ad - field public static final int Widget_Quantum_Light_ListPopupWindow = 16974510; // 0x10302ae - field public static final int Widget_Quantum_Light_ListView = 16974511; // 0x10302af - field public static final int Widget_Quantum_Light_ListView_DropDown = 16974512; // 0x10302b0 - field public static final int Widget_Quantum_Light_MediaRouteButton = 16974513; // 0x10302b1 - field public static final int Widget_Quantum_Light_PopupMenu = 16974514; // 0x10302b2 - field public static final int Widget_Quantum_Light_PopupWindow = 16974515; // 0x10302b3 - field public static final int Widget_Quantum_Light_ProgressBar = 16974516; // 0x10302b4 - field public static final int Widget_Quantum_Light_ProgressBar_Horizontal = 16974517; // 0x10302b5 - field public static final int Widget_Quantum_Light_ProgressBar_Inverse = 16974518; // 0x10302b6 - field public static final int Widget_Quantum_Light_ProgressBar_Large = 16974519; // 0x10302b7 - field public static final int Widget_Quantum_Light_ProgressBar_Large_Inverse = 16974520; // 0x10302b8 - field public static final int Widget_Quantum_Light_ProgressBar_Small = 16974521; // 0x10302b9 - field public static final int Widget_Quantum_Light_ProgressBar_Small_Inverse = 16974522; // 0x10302ba - field public static final int Widget_Quantum_Light_ProgressBar_Small_Title = 16974523; // 0x10302bb - field public static final int Widget_Quantum_Light_RatingBar = 16974524; // 0x10302bc - field public static final int Widget_Quantum_Light_RatingBar_Indicator = 16974525; // 0x10302bd - field public static final int Widget_Quantum_Light_RatingBar_Small = 16974526; // 0x10302be - field public static final int Widget_Quantum_Light_ScrollView = 16974527; // 0x10302bf - field public static final int Widget_Quantum_Light_SeekBar = 16974528; // 0x10302c0 - field public static final int Widget_Quantum_Light_SegmentedButton = 16974529; // 0x10302c1 - field public static final int Widget_Quantum_Light_Spinner = 16974531; // 0x10302c3 - field public static final int Widget_Quantum_Light_StackView = 16974530; // 0x10302c2 - field public static final int Widget_Quantum_Light_Tab = 16974532; // 0x10302c4 - field public static final int Widget_Quantum_Light_TabWidget = 16974533; // 0x10302c5 - field public static final int Widget_Quantum_Light_TextView = 16974534; // 0x10302c6 - field public static final int Widget_Quantum_Light_TextView_SpinnerItem = 16974535; // 0x10302c7 - field public static final int Widget_Quantum_Light_WebTextView = 16974536; // 0x10302c8 - field public static final int Widget_Quantum_Light_WebView = 16974537; // 0x10302c9 - field public static final int Widget_Quantum_ListPopupWindow = 16974450; // 0x1030272 - field public static final int Widget_Quantum_ListView = 16974451; // 0x1030273 - field public static final int Widget_Quantum_ListView_DropDown = 16974452; // 0x1030274 - field public static final int Widget_Quantum_MediaRouteButton = 16974453; // 0x1030275 - field public static final int Widget_Quantum_PopupMenu = 16974454; // 0x1030276 - field public static final int Widget_Quantum_PopupWindow = 16974455; // 0x1030277 - field public static final int Widget_Quantum_ProgressBar = 16974456; // 0x1030278 - field public static final int Widget_Quantum_ProgressBar_Horizontal = 16974457; // 0x1030279 - field public static final int Widget_Quantum_ProgressBar_Large = 16974458; // 0x103027a - field public static final int Widget_Quantum_ProgressBar_Small = 16974459; // 0x103027b - field public static final int Widget_Quantum_ProgressBar_Small_Title = 16974460; // 0x103027c - field public static final int Widget_Quantum_RatingBar = 16974461; // 0x103027d - field public static final int Widget_Quantum_RatingBar_Indicator = 16974462; // 0x103027e - field public static final int Widget_Quantum_RatingBar_Small = 16974463; // 0x103027f - field public static final int Widget_Quantum_ScrollView = 16974464; // 0x1030280 - field public static final int Widget_Quantum_SeekBar = 16974465; // 0x1030281 - field public static final int Widget_Quantum_SegmentedButton = 16974466; // 0x1030282 - field public static final int Widget_Quantum_Spinner = 16974468; // 0x1030284 - field public static final int Widget_Quantum_StackView = 16974467; // 0x1030283 - field public static final int Widget_Quantum_Tab = 16974469; // 0x1030285 - field public static final int Widget_Quantum_TabWidget = 16974470; // 0x1030286 - field public static final int Widget_Quantum_TextView = 16974471; // 0x1030287 - field public static final int Widget_Quantum_TextView_SpinnerItem = 16974472; // 0x1030288 - field public static final int Widget_Quantum_WebTextView = 16974473; // 0x1030289 - field public static final int Widget_Quantum_WebView = 16974474; // 0x103028a + field public static final int Widget_Quantum_CalendarView = 16974433; // 0x1030261 + field public static final int Widget_Quantum_CheckedTextView = 16974434; // 0x1030262 + field public static final int Widget_Quantum_CompoundButton_CheckBox = 16974435; // 0x1030263 + field public static final int Widget_Quantum_CompoundButton_RadioButton = 16974436; // 0x1030264 + field public static final int Widget_Quantum_CompoundButton_Star = 16974437; // 0x1030265 + field public static final int Widget_Quantum_DatePicker = 16974438; // 0x1030266 + field public static final int Widget_Quantum_DropDownItem = 16974439; // 0x1030267 + field public static final int Widget_Quantum_DropDownItem_Spinner = 16974440; // 0x1030268 + field public static final int Widget_Quantum_EditText = 16974441; // 0x1030269 + field public static final int Widget_Quantum_ExpandableListView = 16974442; // 0x103026a + field public static final int Widget_Quantum_FastScroll = 16974443; // 0x103026b + field public static final int Widget_Quantum_FragmentBreadCrumbs = 16974444; // 0x103026c + field public static final int Widget_Quantum_GridView = 16974445; // 0x103026d + field public static final int Widget_Quantum_HorizontalScrollView = 16974446; // 0x103026e + field public static final int Widget_Quantum_ImageButton = 16974447; // 0x103026f + field public static final int Widget_Quantum_Light = 16974473; // 0x1030289 + field public static final int Widget_Quantum_Light_ActionBar = 16974474; // 0x103028a + field public static final int Widget_Quantum_Light_ActionBar_Solid = 16974475; // 0x103028b + field public static final int Widget_Quantum_Light_ActionBar_TabBar = 16974476; // 0x103028c + field public static final int Widget_Quantum_Light_ActionBar_TabText = 16974477; // 0x103028d + field public static final int Widget_Quantum_Light_ActionBar_TabView = 16974478; // 0x103028e + field public static final int Widget_Quantum_Light_ActionButton = 16974479; // 0x103028f + field public static final int Widget_Quantum_Light_ActionButton_CloseMode = 16974480; // 0x1030290 + field public static final int Widget_Quantum_Light_ActionButton_Overflow = 16974481; // 0x1030291 + field public static final int Widget_Quantum_Light_ActionMode = 16974482; // 0x1030292 + field public static final int Widget_Quantum_Light_AutoCompleteTextView = 16974483; // 0x1030293 + field public static final int Widget_Quantum_Light_Button = 16974484; // 0x1030294 + field public static final int Widget_Quantum_Light_ButtonBar = 16974490; // 0x103029a + field public static final int Widget_Quantum_Light_ButtonBar_AlertDialog = 16974491; // 0x103029b + field public static final int Widget_Quantum_Light_Button_Borderless = 16974485; // 0x1030295 + field public static final int Widget_Quantum_Light_Button_Borderless_Small = 16974486; // 0x1030296 + field public static final int Widget_Quantum_Light_Button_Inset = 16974487; // 0x1030297 + field public static final int Widget_Quantum_Light_Button_Small = 16974488; // 0x1030298 + field public static final int Widget_Quantum_Light_Button_Toggle = 16974489; // 0x1030299 + field public static final int Widget_Quantum_Light_CalendarView = 16974492; // 0x103029c + field public static final int Widget_Quantum_Light_CheckedTextView = 16974493; // 0x103029d + field public static final int Widget_Quantum_Light_CompoundButton_CheckBox = 16974494; // 0x103029e + field public static final int Widget_Quantum_Light_CompoundButton_RadioButton = 16974495; // 0x103029f + field public static final int Widget_Quantum_Light_CompoundButton_Star = 16974496; // 0x10302a0 + field public static final int Widget_Quantum_Light_DropDownItem = 16974497; // 0x10302a1 + field public static final int Widget_Quantum_Light_DropDownItem_Spinner = 16974498; // 0x10302a2 + field public static final int Widget_Quantum_Light_EditText = 16974499; // 0x10302a3 + field public static final int Widget_Quantum_Light_ExpandableListView = 16974500; // 0x10302a4 + field public static final int Widget_Quantum_Light_FastScroll = 16974501; // 0x10302a5 + field public static final int Widget_Quantum_Light_FragmentBreadCrumbs = 16974502; // 0x10302a6 + field public static final int Widget_Quantum_Light_GridView = 16974503; // 0x10302a7 + field public static final int Widget_Quantum_Light_HorizontalScrollView = 16974504; // 0x10302a8 + field public static final int Widget_Quantum_Light_ImageButton = 16974505; // 0x10302a9 + field public static final int Widget_Quantum_Light_ListPopupWindow = 16974506; // 0x10302aa + field public static final int Widget_Quantum_Light_ListView = 16974507; // 0x10302ab + field public static final int Widget_Quantum_Light_ListView_DropDown = 16974508; // 0x10302ac + field public static final int Widget_Quantum_Light_MediaRouteButton = 16974509; // 0x10302ad + field public static final int Widget_Quantum_Light_PopupMenu = 16974510; // 0x10302ae + field public static final int Widget_Quantum_Light_PopupWindow = 16974511; // 0x10302af + field public static final int Widget_Quantum_Light_ProgressBar = 16974512; // 0x10302b0 + field public static final int Widget_Quantum_Light_ProgressBar_Horizontal = 16974513; // 0x10302b1 + field public static final int Widget_Quantum_Light_ProgressBar_Inverse = 16974514; // 0x10302b2 + field public static final int Widget_Quantum_Light_ProgressBar_Large = 16974515; // 0x10302b3 + field public static final int Widget_Quantum_Light_ProgressBar_Large_Inverse = 16974516; // 0x10302b4 + field public static final int Widget_Quantum_Light_ProgressBar_Small = 16974517; // 0x10302b5 + field public static final int Widget_Quantum_Light_ProgressBar_Small_Inverse = 16974518; // 0x10302b6 + field public static final int Widget_Quantum_Light_ProgressBar_Small_Title = 16974519; // 0x10302b7 + field public static final int Widget_Quantum_Light_RatingBar = 16974520; // 0x10302b8 + field public static final int Widget_Quantum_Light_RatingBar_Indicator = 16974521; // 0x10302b9 + field public static final int Widget_Quantum_Light_RatingBar_Small = 16974522; // 0x10302ba + field public static final int Widget_Quantum_Light_ScrollView = 16974523; // 0x10302bb + field public static final int Widget_Quantum_Light_SeekBar = 16974524; // 0x10302bc + field public static final int Widget_Quantum_Light_SegmentedButton = 16974525; // 0x10302bd + field public static final int Widget_Quantum_Light_Spinner = 16974527; // 0x10302bf + field public static final int Widget_Quantum_Light_StackView = 16974526; // 0x10302be + field public static final int Widget_Quantum_Light_Tab = 16974528; // 0x10302c0 + field public static final int Widget_Quantum_Light_TabWidget = 16974529; // 0x10302c1 + field public static final int Widget_Quantum_Light_TextView = 16974530; // 0x10302c2 + field public static final int Widget_Quantum_Light_TextView_SpinnerItem = 16974531; // 0x10302c3 + field public static final int Widget_Quantum_Light_WebTextView = 16974532; // 0x10302c4 + field public static final int Widget_Quantum_Light_WebView = 16974533; // 0x10302c5 + field public static final int Widget_Quantum_ListPopupWindow = 16974448; // 0x1030270 + field public static final int Widget_Quantum_ListView = 16974449; // 0x1030271 + field public static final int Widget_Quantum_ListView_DropDown = 16974450; // 0x1030272 + field public static final int Widget_Quantum_MediaRouteButton = 16974451; // 0x1030273 + field public static final int Widget_Quantum_PopupMenu = 16974452; // 0x1030274 + field public static final int Widget_Quantum_PopupWindow = 16974453; // 0x1030275 + field public static final int Widget_Quantum_ProgressBar = 16974454; // 0x1030276 + field public static final int Widget_Quantum_ProgressBar_Horizontal = 16974455; // 0x1030277 + field public static final int Widget_Quantum_ProgressBar_Large = 16974456; // 0x1030278 + field public static final int Widget_Quantum_ProgressBar_Small = 16974457; // 0x1030279 + field public static final int Widget_Quantum_ProgressBar_Small_Title = 16974458; // 0x103027a + field public static final int Widget_Quantum_RatingBar = 16974459; // 0x103027b + field public static final int Widget_Quantum_RatingBar_Indicator = 16974460; // 0x103027c + field public static final int Widget_Quantum_RatingBar_Small = 16974461; // 0x103027d + field public static final int Widget_Quantum_ScrollView = 16974462; // 0x103027e + field public static final int Widget_Quantum_SeekBar = 16974463; // 0x103027f + field public static final int Widget_Quantum_SegmentedButton = 16974464; // 0x1030280 + field public static final int Widget_Quantum_Spinner = 16974466; // 0x1030282 + field public static final int Widget_Quantum_StackView = 16974465; // 0x1030281 + field public static final int Widget_Quantum_Tab = 16974467; // 0x1030283 + field public static final int Widget_Quantum_TabWidget = 16974468; // 0x1030284 + field public static final int Widget_Quantum_TextView = 16974469; // 0x1030285 + field public static final int Widget_Quantum_TextView_SpinnerItem = 16974470; // 0x1030286 + field public static final int Widget_Quantum_WebTextView = 16974471; // 0x1030287 + field public static final int Widget_Quantum_WebView = 16974472; // 0x1030288 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/res/res/values/colors.xml b/core/res/res/values/colors.xml index 441fd94..761170d 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -71,11 +71,7 @@ <drawable name="editbox_dropdown_dark_frame">@drawable/editbox_dropdown_background_dark</drawable> <drawable name="editbox_dropdown_light_frame">@drawable/editbox_dropdown_background</drawable> - <drawable name="dialog_holo_dark_frame">@drawable/dialog_full_holo_dark</drawable> - <drawable name="dialog_holo_light_frame">@drawable/dialog_full_holo_light</drawable> - <drawable name="input_method_fullscreen_background">#fff9f9f9</drawable> - <drawable name="input_method_fullscreen_background_holo">@drawable/screen_background_holo_dark</drawable> <color name="input_method_navigation_guard">#ff000000</color> <!-- For date picker widget --> @@ -122,76 +118,8 @@ <!-- FaceLock --> <color name="facelock_spotlight_mask">#CC000000</color> - <!-- For holo theme --> - <drawable name="screen_background_holo_light">#fff3f3f3</drawable> - <drawable name="screen_background_holo_dark">#ff000000</drawable> - <color name="background_holo_dark">#ff000000</color> - <color name="background_holo_light">#fff3f3f3</color> - <color name="bright_foreground_holo_dark">@android:color/background_holo_light</color> - <color name="bright_foreground_holo_light">@android:color/background_holo_dark</color> - <color name="bright_foreground_disabled_holo_dark">#ff4c4c4c</color> - <color name="bright_foreground_disabled_holo_light">#ffb2b2b2</color> - <color name="bright_foreground_inverse_holo_dark">@android:color/bright_foreground_holo_light</color> - <color name="bright_foreground_inverse_holo_light">@android:color/bright_foreground_holo_dark</color> - <color name="dim_foreground_holo_dark">#bebebe</color> - <color name="dim_foreground_disabled_holo_dark">#80bebebe</color> - <color name="dim_foreground_inverse_holo_dark">#323232</color> - <color name="dim_foreground_inverse_disabled_holo_dark">#80323232</color> - <color name="hint_foreground_holo_dark">#808080</color> - <color name="dim_foreground_holo_light">#323232</color> - <color name="dim_foreground_disabled_holo_light">#80323232</color> - <color name="dim_foreground_inverse_holo_light">#bebebe</color> - <color name="dim_foreground_inverse_disabled_holo_light">#80bebebe</color> - <color name="hint_foreground_holo_light">#808080</color> - <color name="highlighted_text_holo_dark">#6633b5e5</color> - <color name="highlighted_text_holo_light">#6633b5e5</color> - <color name="link_text_holo_dark">#5c5cff</color> - <color name="link_text_holo_light">#0000ee</color> - <color name="micro_text_light">#434343</color> - <!-- Group buttons --> - <eat-comment /> - <color name="group_button_dialog_pressed_holo_dark">#46c5c1ff</color> - <color name="group_button_dialog_focused_holo_dark">#2699cc00</color> - - <color name="group_button_dialog_pressed_holo_light">#ffffffff</color> - <color name="group_button_dialog_focused_holo_light">#4699cc00</color> - - <!-- Highlight colors for the legacy themes --> - <eat-comment /> - <color name="legacy_pressed_highlight">#fffeaa0c</color> - <color name="legacy_selected_highlight">#fff17a0a</color> - <color name="legacy_long_pressed_highlight">#ffffffff</color> - - <!-- General purpose colors for Holo-themed elements --> - <eat-comment /> - - <!-- A light Holo shade of blue --> - <color name="holo_blue_light">#ff33b5e5</color> - <!-- A light Holo shade of gray --> - <color name="holo_gray_light">#33999999</color> - <!-- A light Holo shade of green --> - <color name="holo_green_light">#ff99cc00</color> - <!-- A light Holo shade of red --> - <color name="holo_red_light">#ffff4444</color> - <!-- A dark Holo shade of blue --> - <color name="holo_blue_dark">#ff0099cc</color> - <!-- A dark Holo shade of green --> - <color name="holo_green_dark">#ff669900</color> - <!-- A dark Holo shade of red --> - <color name="holo_red_dark">#ffcc0000</color> - <!-- A Holo shade of purple --> - <color name="holo_purple">#ffaa66cc</color> - <!-- A light Holo shade of orange --> - <color name="holo_orange_light">#ffffbb33</color> - <!-- A dark Holo shade of orange --> - <color name="holo_orange_dark">#ffff8800</color> - <!-- A really bright Holo shade of blue --> - <color name="holo_blue_bright">#ff00ddff</color> - <!-- A really bright Holo shade of gray --> - <color name="holo_gray_bright">#33CCCCCC</color> - <drawable name="notification_template_icon_bg">#3333B5E5</drawable> <drawable name="notification_template_icon_low_bg">#0cffffff</drawable> @@ -206,21 +134,5 @@ <color name="accessibility_focus_highlight">#80ffff00</color> - <!-- New TimePicker colors --> - <color name="timepicker_default_background_holo_light">@android:color/white</color> - <color name="timepicker_default_background_holo_dark">#ff303030</color> - - <color name="timepicker_default_text_color_holo_light">#8c8c8c</color> - <color name="timepicker_default_text_color_holo_dark">@android:color/white</color> - - <color name="timepicker_default_disabled_color_holo_light">#7f000000</color> - <color name="timepicker_default_disabled_color_holo_dark">#7f08c8c8</color> - - <color name="timepicker_default_ampm_selected_background_color_holo_light">@android:color/holo_blue_light</color> - <color name="timepicker_default_ampm_selected_background_color_holo_dark">@android:color/holo_blue_light</color> - - <color name="timepicker_default_ampm_unselected_background_color_holo_light">@android:color/white</color> - <color name="timepicker_default_ampm_unselected_background_color_holo_dark">@android:color/transparent</color> - </resources> diff --git a/core/res/res/values/colors_holo.xml b/core/res/res/values/colors_holo.xml new file mode 100644 index 0000000..d1f4e38 --- /dev/null +++ b/core/res/res/values/colors_holo.xml @@ -0,0 +1,123 @@ +<?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. +--> + +<!-- Colors specific to Holo themes. --> +<resources> + + <drawable name="dialog_holo_dark_frame">@drawable/dialog_full_holo_dark</drawable> + <drawable name="dialog_holo_light_frame">@drawable/dialog_full_holo_light</drawable> + <drawable name="input_method_fullscreen_background_holo">@drawable/screen_background_holo_dark</drawable> + + <drawable name="screen_background_holo_light">#fff3f3f3</drawable> + <drawable name="screen_background_holo_dark">#ff000000</drawable> + + <color name="background_holo_dark">#ff000000</color> + <color name="background_holo_light">#fff3f3f3</color> + <color name="bright_foreground_holo_dark">@color/background_holo_light</color> + <color name="bright_foreground_holo_light">@color/background_holo_dark</color> + <color name="bright_foreground_disabled_holo_dark">#ff4c4c4c</color> + <color name="bright_foreground_disabled_holo_light">#ffb2b2b2</color> + <color name="bright_foreground_inverse_holo_dark">@color/bright_foreground_holo_light</color> + <color name="bright_foreground_inverse_holo_light">@color/bright_foreground_holo_dark</color> + <color name="dim_foreground_holo_dark">#bebebe</color> + <color name="dim_foreground_disabled_holo_dark">#80bebebe</color> + <color name="dim_foreground_inverse_holo_dark">#323232</color> + <color name="dim_foreground_inverse_disabled_holo_dark">#80323232</color> + <color name="hint_foreground_holo_dark">#808080</color> + <color name="dim_foreground_holo_light">#323232</color> + <color name="dim_foreground_disabled_holo_light">#80323232</color> + <color name="dim_foreground_inverse_holo_light">#bebebe</color> + <color name="dim_foreground_inverse_disabled_holo_light">#80bebebe</color> + <color name="hint_foreground_holo_light">#808080</color> + <color name="highlighted_text_holo_dark">#6633b5e5</color> + <color name="highlighted_text_holo_light">#6633b5e5</color> + <color name="link_text_holo_dark">#5c5cff</color> + <color name="link_text_holo_light">#0000ee</color> + + <!-- General purpose colors for Holo-themed elements --> + <eat-comment /> + + <!-- A light Holo shade of blue --> + <color name="holo_blue_light">#ff33b5e5</color> + <!-- A light Holo shade of gray --> + <color name="holo_gray_light">#33999999</color> + <!-- A light Holo shade of green --> + <color name="holo_green_light">#ff99cc00</color> + <!-- A light Holo shade of red --> + <color name="holo_red_light">#ffff4444</color> + <!-- A dark Holo shade of blue --> + <color name="holo_blue_dark">#ff0099cc</color> + <!-- A dark Holo shade of green --> + <color name="holo_green_dark">#ff669900</color> + <!-- A dark Holo shade of red --> + <color name="holo_red_dark">#ffcc0000</color> + <!-- A Holo shade of purple --> + <color name="holo_purple">#ffaa66cc</color> + <!-- A light Holo shade of orange --> + <color name="holo_orange_light">#ffffbb33</color> + <!-- A dark Holo shade of orange --> + <color name="holo_orange_dark">#ffff8800</color> + <!-- A really bright Holo shade of blue --> + <color name="holo_blue_bright">#ff00ddff</color> + <!-- A really bright Holo shade of gray --> + <color name="holo_gray_bright">#33CCCCCC</color> + + <!-- Forward compatibility for Quantum-style theme colors --> + <eat-comment /> + + <color name="holo_primary_dark">#ff000000</color> + <color name="holo_primary">#ffe6e6e6</color> + <color name="holo_primary_light">#ffffffff</color> + <color name="holo_control_activated">@color/holo_blue_light</color> + <color name="holo_control_normal">#39cccccc</color> + <color name="holo_button_pressed">#59f0f0f0</color> + <color name="holo_button_normal">#bd292f34</color> + + <color name="holo_light_primary_dark">#ff000000</color> + <color name="holo_light_primary">#ffe6e6e6</color> + <color name="holo_light_primary_light">#ffffffff</color> + <color name="holo_light_control_activated">@color/holo_control_activated</color> + <color name="holo_light_control_normal">#dacccccc</color> + <color name="holo_light_button_pressed">#66666666</color> + <color name="holo_light_button_normal">#b3cccccc</color> + + <!-- Group buttons --> + <eat-comment /> + + <color name="group_button_dialog_pressed_holo_dark">#46c5c1ff</color> + <color name="group_button_dialog_focused_holo_dark">#2699cc00</color> + + <color name="group_button_dialog_pressed_holo_light">#ffffffff</color> + <color name="group_button_dialog_focused_holo_light">#4699cc00</color> + + <!-- Time picker --> + <eat-comment /> + + <color name="timepicker_default_background_holo_light">@color/white</color> + <color name="timepicker_default_background_holo_dark">#ff303030</color> + + <color name="timepicker_default_text_color_holo_light">#8c8c8c</color> + <color name="timepicker_default_text_color_holo_dark">@color/white</color> + + <color name="timepicker_default_disabled_color_holo_light">#7f000000</color> + <color name="timepicker_default_disabled_color_holo_dark">#7f08c8c8</color> + + <color name="timepicker_default_ampm_selected_background_color_holo_light">@color/holo_blue_light</color> + <color name="timepicker_default_ampm_selected_background_color_holo_dark">@color/holo_blue_light</color> + + <color name="timepicker_default_ampm_unselected_background_color_holo_light">@color/white</color> + <color name="timepicker_default_ampm_unselected_background_color_holo_dark">@color/transparent</color> +</resources> diff --git a/core/res/res/values/colors_legacy.xml b/core/res/res/values/colors_legacy.xml new file mode 100644 index 0000000..48d4b42 --- /dev/null +++ b/core/res/res/values/colors_legacy.xml @@ -0,0 +1,45 @@ +<?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. +--> + +<!-- Colors specific to pre-Holo themes. --> +<resources> + + <!-- Highlight colors for the legacy themes --> + <eat-comment /> + + <color name="legacy_pressed_highlight">#fffeaa0c</color> + <color name="legacy_selected_highlight">#fff17a0a</color> + <color name="legacy_long_pressed_highlight">#ffffffff</color> + + <!-- Forward compatibility for Quantum-style theme colors --> + <eat-comment /> + + <color name="legacy_primary_dark">#ff000000</color> + <color name="legacy_primary">#ffe6e6e6</color> + <color name="legacy_primary_light">#ffffffff</color> + <color name="legacy_control_activated">#ff90df25</color> + <color name="legacy_control_normal">#99ffffff</color> + <color name="legacy_button_pressed">#fffea50b</color> + <color name="legacy_button_normal">#f3dbdbdb</color> + + <color name="legacy_light_primary_dark">@color/legacy_primary_dark</color> + <color name="legacy_light_primary">@color/legacy_primary</color> + <color name="legacy_light_primary_light">@color/legacy_primary_light</color> + <color name="legacy_light_control_activated">@color/legacy_control_activated</color> + <color name="legacy_light_control_normal">#99000000</color> + <color name="legacy_light_button_pressed">@color/legacy_button_pressed</color> + <color name="legacy_light_button_normal">@color/legacy_button_normal</color> +</resources> diff --git a/core/res/res/values/colors_quantum.xml b/core/res/res/values/colors_quantum.xml index f8f192f..7171450 100644 --- a/core/res/res/values/colors_quantum.xml +++ b/core/res/res/values/colors_quantum.xml @@ -14,6 +14,7 @@ limitations under the License. --> +<!-- Colors specific to Quantum themes. --> <resources> <color name="background_quantum_dark">@color/black</color> <color name="background_quantum_light">@color/white</color> @@ -40,6 +41,7 @@ <color name="highlighted_text_quantum_light">#660097a7</color> <!-- Primary & accent colors --> + <eat-comment /> <color name="quantum_red_100">#fff4c7c3</color> <color name="quantum_red_300">#ffe67c73</color> @@ -98,6 +100,7 @@ <color name="quantum_deep_orange_A400">#ffff1744</color> <!-- Neutral colors --> + <eat-comment /> <color name="quantum_grey_50">#fffafafa</color> <color name="quantum_grey_100">#fff5f5f5</color> @@ -117,6 +120,7 @@ <color name="quantum_brown_700">#ff5d4037</color> <!-- Text & foreground colors --> + <eat-comment /> <color name="primary_text_default_quantum_light">#de000000</color> <color name="secondary_text_quantum_light">#8a000000</color> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 22c2b05..ec73b9f 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2285,8 +2285,6 @@ <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.Button.Paper" /> - <public type="style" name="Widget.Quantum.Button.Paper.Color" /> <public type="style" name="Widget.Quantum.ButtonBar" /> <public type="style" name="Widget.Quantum.ButtonBar.AlertDialog" /> <public type="style" name="Widget.Quantum.CalendarView" /> @@ -2347,8 +2345,6 @@ <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.Button.Paper" /> - <public type="style" name="Widget.Quantum.Light.Button.Paper.Color" /> <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" /> diff --git a/core/res/res/values/styles_quantum.xml b/core/res/res/values/styles_quantum.xml index 23172c1..7679420 100644 --- a/core/res/res/values/styles_quantum.xml +++ b/core/res/res/values/styles_quantum.xml @@ -372,16 +372,6 @@ please see styles_device_defaults.xml. <item name="minWidth">48dip</item> </style> - <!-- Bordered paper button --> - <style name="Widget.Quantum.Button.Paper"> - <!-- TODO: Specify pressed state animation. --> - </style> - - <!-- Bordered paper button with color --> - <style name="Widget.Quantum.Button.Paper.Color"> - <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</item> @@ -393,11 +383,6 @@ please see styles_device_defaults.xml. <item name="minWidth">48dip</item> </style> - <!-- Borderless paper button --> - <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> @@ -784,11 +769,8 @@ please see styles_device_defaults.xml. <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"> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 7b3d5e3..6f4e7d0 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -53,6 +53,14 @@ please see themes_device_defaults.xml. <item name="colorMultiSelectHighlight">@color/legacy_selected_highlight</item> <item name="colorActivatedHighlight">@color/legacy_selected_highlight</item> + <item name="colorPrimaryDark">@color/legacy_primary_dark</item> + <item name="colorPrimary">@color/legacy_primary</item> + <item name="colorPrimaryLight">@color/legacy_primary_light</item> + <item name="colorControlActivated">@color/legacy_control_activated</item> + <item name="colorControlNormal">@color/legacy_control_normal</item> + <item name="colorButtonPressed">@color/legacy_button_pressed</item> + <item name="colorButtonNormal">@color/legacy_button_normal</item> + <item name="disabledAlpha">0.5</item> <item name="backgroundDimAmount">0.6</item> @@ -437,6 +445,14 @@ please see themes_device_defaults.xml. <item name="colorBackground">@android:color/background_light</item> <item name="colorForeground">@color/bright_foreground_light</item> <item name="colorForegroundInverse">@android:color/bright_foreground_light_inverse</item> + + <item name="colorPrimaryDark">@color/legacy_light_primary_dark</item> + <item name="colorPrimary">@color/legacy_light_primary</item> + <item name="colorPrimaryLight">@color/legacy_light_primary_light</item> + <item name="colorControlActivated">@color/legacy_light_control_activated</item> + <item name="colorControlNormal">@color/legacy_light_control_normal</item> + <item name="colorButtonPressed">@color/legacy_light_button_pressed</item> + <item name="colorButtonNormal">@color/legacy_light_button_normal</item> <item name="textColorPrimary">@android:color/primary_text_light</item> <item name="textColorSecondary">@android:color/secondary_text_light</item> @@ -937,6 +953,14 @@ please see themes_device_defaults.xml. <item name="colorMultiSelectHighlight">@color/holo_green_light</item> <item name="colorActivatedHighlight">@color/holo_blue_dark</item> + <item name="colorPrimaryDark">@color/holo_primary_dark</item> + <item name="colorPrimary">@color/holo_primary</item> + <item name="colorPrimaryLight">@color/holo_primary_light</item> + <item name="colorControlActivated">@color/holo_control_activated</item> + <item name="colorControlNormal">@color/holo_control_normal</item> + <item name="colorButtonPressed">@color/holo_button_pressed</item> + <item name="colorButtonNormal">@color/holo_button_normal</item> + <!-- Text styles --> <item name="textAppearance">@android:style/TextAppearance.Holo</item> <item name="textAppearanceInverse">@android:style/TextAppearance.Holo.Inverse</item> @@ -1268,6 +1292,14 @@ please see themes_device_defaults.xml. <item name="colorMultiSelectHighlight">@color/holo_green_light</item> <item name="colorActivatedHighlight">@color/holo_blue_dark</item> + <item name="colorPrimaryDark">@color/holo_light_primary_dark</item> + <item name="colorPrimary">@color/holo_light_primary</item> + <item name="colorPrimaryLight">@color/holo_light_primary_light</item> + <item name="colorControlActivated">@color/holo_light_control_activated</item> + <item name="colorControlNormal">@color/holo_light_control_normal</item> + <item name="colorButtonPressed">@color/holo_light_button_pressed</item> + <item name="colorButtonNormal">@color/holo_light_button_normal</item> + <!-- Text styles --> <item name="textAppearance">@android:style/TextAppearance.Holo.Light</item> <item name="textAppearanceInverse">@android:style/TextAppearance.Holo.Light.Inverse</item> diff --git a/core/res/res/values/themes_quantum.xml b/core/res/res/values/themes_quantum.xml index e3ac1ad..c0bd18b 100644 --- a/core/res/res/values/themes_quantum.xml +++ b/core/res/res/values/themes_quantum.xml @@ -717,9 +717,6 @@ please see themes_device_defaults.xml. <item name="colorControlActivated">?attr/colorPrimary</item> <item name="colorButtonNormal">@color/quantum_grey_100</item> <item name="colorButtonPressed">@color/quantum_grey_500</item> - <!-- TODO: Remove these attrs and move into button style. --> - <item name="colorButtonNormalColored">?attr/colorPrimary</item> - <item name="colorButtonPressedColored">?attr/colorPrimaryDark</item> </style> <style name="ThemeOverlay" /> |