Merge "Fix action bar menu inflation context" into lmp-preview-dev
This commit is contained in:
Alan Viverette
committed by
Android (Google) Code Review
Android (Google) Code Review
commit
ef8f79a928
271
api/current.txt
271
api/current.txt
@@ -1862,28 +1862,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 = 16974348; // 0x103020c
|
||||
field public static final int TextAppearance_Quantum_Body1 = 16974545; // 0x10302d1
|
||||
field public static final int TextAppearance_Quantum_Body2 = 16974544; // 0x10302d0
|
||||
field public static final int TextAppearance_Quantum_Button = 16974548; // 0x10302d4
|
||||
field public static final int TextAppearance_Quantum_Caption = 16974546; // 0x10302d2
|
||||
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_DialogWindowTitle = 16974349; // 0x103020d
|
||||
field public static final int TextAppearance_Quantum_Display1 = 16974540; // 0x10302cc
|
||||
field public static final int TextAppearance_Quantum_Display2 = 16974539; // 0x10302cb
|
||||
field public static final int TextAppearance_Quantum_Display3 = 16974538; // 0x10302ca
|
||||
field public static final int TextAppearance_Quantum_Display4 = 16974537; // 0x10302c9
|
||||
field public static final int TextAppearance_Quantum_Headline = 16974541; // 0x10302cd
|
||||
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_Inverse = 16974350; // 0x103020e
|
||||
field public static final int TextAppearance_Quantum_Large = 16974351; // 0x103020f
|
||||
field public static final int TextAppearance_Quantum_Large_Inverse = 16974352; // 0x1030210
|
||||
field public static final int TextAppearance_Quantum_Medium = 16974353; // 0x1030211
|
||||
field public static final int TextAppearance_Quantum_Medium_Inverse = 16974354; // 0x1030212
|
||||
field public static final int TextAppearance_Quantum_Menu = 16974547; // 0x10302d3
|
||||
field public static final int TextAppearance_Quantum_Menu = 16974548; // 0x10302d4
|
||||
field public static final int TextAppearance_Quantum_SearchResult_Subtitle = 16974355; // 0x1030213
|
||||
field public static final int TextAppearance_Quantum_SearchResult_Title = 16974356; // 0x1030214
|
||||
field public static final int TextAppearance_Quantum_Small = 16974357; // 0x1030215
|
||||
field public static final int TextAppearance_Quantum_Small_Inverse = 16974358; // 0x1030216
|
||||
field public static final int TextAppearance_Quantum_Subhead = 16974543; // 0x10302cf
|
||||
field public static final int TextAppearance_Quantum_Title = 16974542; // 0x10302ce
|
||||
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_Widget = 16974360; // 0x1030218
|
||||
field public static final int TextAppearance_Quantum_Widget_ActionBar_Menu = 16974361; // 0x1030219
|
||||
field public static final int TextAppearance_Quantum_Widget_ActionBar_Subtitle = 16974362; // 0x103021a
|
||||
@@ -1932,9 +1932,10 @@ package android {
|
||||
field public static final int Theme = 16973829; // 0x1030005
|
||||
field public static final int ThemeOverlay = 16974412; // 0x103024c
|
||||
field public static final int ThemeOverlay_Quantum = 16974413; // 0x103024d
|
||||
field public static final int ThemeOverlay_Quantum_ActionBarWidget = 16974416; // 0x1030250
|
||||
field public static final int ThemeOverlay_Quantum_Dark = 16974415; // 0x103024f
|
||||
field public static final int ThemeOverlay_Quantum_Light = 16974414; // 0x103024e
|
||||
field public static final int ThemeOverlay_Quantum_ActionBar = 16974414; // 0x103024e
|
||||
field public static final int ThemeOverlay_Quantum_Dark = 16974416; // 0x1030250
|
||||
field public static final int ThemeOverlay_Quantum_Dark_ActionBar = 16974417; // 0x1030251
|
||||
field public static final int ThemeOverlay_Quantum_Light = 16974415; // 0x103024f
|
||||
field public static final int Theme_Black = 16973832; // 0x1030008
|
||||
field public static final int Theme_Black_NoTitleBar = 16973833; // 0x1030009
|
||||
field public static final int Theme_Black_NoTitleBar_Fullscreen = 16973834; // 0x103000a
|
||||
@@ -2324,126 +2325,126 @@ 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 = 16974417; // 0x1030251
|
||||
field public static final int Widget_Quantum_ActionBar = 16974418; // 0x1030252
|
||||
field public static final int Widget_Quantum_ActionBar_Solid = 16974419; // 0x1030253
|
||||
field public static final int Widget_Quantum_ActionBar_TabBar = 16974420; // 0x1030254
|
||||
field public static final int Widget_Quantum_ActionBar_TabText = 16974421; // 0x1030255
|
||||
field public static final int Widget_Quantum_ActionBar_TabView = 16974422; // 0x1030256
|
||||
field public static final int Widget_Quantum_ActionButton = 16974423; // 0x1030257
|
||||
field public static final int Widget_Quantum_ActionButton_CloseMode = 16974424; // 0x1030258
|
||||
field public static final int Widget_Quantum_ActionButton_Overflow = 16974425; // 0x1030259
|
||||
field public static final int Widget_Quantum_ActionMode = 16974426; // 0x103025a
|
||||
field public static final int Widget_Quantum_AutoCompleteTextView = 16974427; // 0x103025b
|
||||
field public static final int Widget_Quantum_Button = 16974428; // 0x103025c
|
||||
field public static final int Widget_Quantum_ButtonBar = 16974434; // 0x1030262
|
||||
field public static final int Widget_Quantum_ButtonBar_AlertDialog = 16974435; // 0x1030263
|
||||
field public static final int Widget_Quantum_Button_Borderless = 16974429; // 0x103025d
|
||||
field public static final int Widget_Quantum_Button_Borderless_Small = 16974430; // 0x103025e
|
||||
field public static final int Widget_Quantum_Button_Inset = 16974431; // 0x103025f
|
||||
field public static final int Widget_Quantum_Button_Small = 16974432; // 0x1030260
|
||||
field public static final int Widget_Quantum_Button_Toggle = 16974433; // 0x1030261
|
||||
field public static final int Widget_Quantum_CalendarView = 16974436; // 0x1030264
|
||||
field public static final int Widget_Quantum_CheckedTextView = 16974437; // 0x1030265
|
||||
field public static final int Widget_Quantum_CompoundButton_CheckBox = 16974438; // 0x1030266
|
||||
field public static final int Widget_Quantum_CompoundButton_RadioButton = 16974439; // 0x1030267
|
||||
field public static final int Widget_Quantum_CompoundButton_Star = 16974440; // 0x1030268
|
||||
field public static final int Widget_Quantum_DatePicker = 16974441; // 0x1030269
|
||||
field public static final int Widget_Quantum_DropDownItem = 16974442; // 0x103026a
|
||||
field public static final int Widget_Quantum_DropDownItem_Spinner = 16974443; // 0x103026b
|
||||
field public static final int Widget_Quantum_EditText = 16974444; // 0x103026c
|
||||
field public static final int Widget_Quantum_ExpandableListView = 16974445; // 0x103026d
|
||||
field public static final int Widget_Quantum_FastScroll = 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 = 16974476; // 0x103028c
|
||||
field public static final int Widget_Quantum_Light_ActionBar = 16974477; // 0x103028d
|
||||
field public static final int Widget_Quantum_Light_ActionBar_Solid = 16974478; // 0x103028e
|
||||
field public static final int Widget_Quantum_Light_ActionBar_TabBar = 16974479; // 0x103028f
|
||||
field public static final int Widget_Quantum_Light_ActionBar_TabText = 16974480; // 0x1030290
|
||||
field public static final int Widget_Quantum_Light_ActionBar_TabView = 16974481; // 0x1030291
|
||||
field public static final int Widget_Quantum_Light_ActionButton = 16974482; // 0x1030292
|
||||
field public static final int Widget_Quantum_Light_ActionButton_CloseMode = 16974483; // 0x1030293
|
||||
field public static final int Widget_Quantum_Light_ActionButton_Overflow = 16974484; // 0x1030294
|
||||
field public static final int Widget_Quantum_Light_ActionMode = 16974485; // 0x1030295
|
||||
field public static final int Widget_Quantum_Light_AutoCompleteTextView = 16974486; // 0x1030296
|
||||
field public static final int Widget_Quantum_Light_Button = 16974487; // 0x1030297
|
||||
field public static final int Widget_Quantum_Light_ButtonBar = 16974493; // 0x103029d
|
||||
field public static final int Widget_Quantum_Light_ButtonBar_AlertDialog = 16974494; // 0x103029e
|
||||
field public static final int Widget_Quantum_Light_Button_Borderless = 16974488; // 0x1030298
|
||||
field public static final int Widget_Quantum_Light_Button_Borderless_Small = 16974489; // 0x1030299
|
||||
field public static final int Widget_Quantum_Light_Button_Inset = 16974490; // 0x103029a
|
||||
field public static final int Widget_Quantum_Light_Button_Small = 16974491; // 0x103029b
|
||||
field public static final int Widget_Quantum_Light_Button_Toggle = 16974492; // 0x103029c
|
||||
field public static final int Widget_Quantum_Light_CalendarView = 16974495; // 0x103029f
|
||||
field public static final int Widget_Quantum_Light_CheckedTextView = 16974496; // 0x10302a0
|
||||
field public static final int Widget_Quantum_Light_CompoundButton_CheckBox = 16974497; // 0x10302a1
|
||||
field public static final int Widget_Quantum_Light_CompoundButton_RadioButton = 16974498; // 0x10302a2
|
||||
field public static final int Widget_Quantum_Light_CompoundButton_Star = 16974499; // 0x10302a3
|
||||
field public static final int Widget_Quantum_Light_DropDownItem = 16974500; // 0x10302a4
|
||||
field public static final int Widget_Quantum_Light_DropDownItem_Spinner = 16974501; // 0x10302a5
|
||||
field public static final int Widget_Quantum_Light_EditText = 16974502; // 0x10302a6
|
||||
field public static final int Widget_Quantum_Light_ExpandableListView = 16974503; // 0x10302a7
|
||||
field public static final int Widget_Quantum_Light_FastScroll = 16974504; // 0x10302a8
|
||||
field public static final int Widget_Quantum_Light_GridView = 16974505; // 0x10302a9
|
||||
field public static final int Widget_Quantum_Light_HorizontalScrollView = 16974506; // 0x10302aa
|
||||
field public static final int Widget_Quantum_Light_ImageButton = 16974507; // 0x10302ab
|
||||
field public static final int Widget_Quantum_Light_ListPopupWindow = 16974508; // 0x10302ac
|
||||
field public static final int Widget_Quantum_Light_ListView = 16974509; // 0x10302ad
|
||||
field public static final int Widget_Quantum_Light_ListView_DropDown = 16974510; // 0x10302ae
|
||||
field public static final int Widget_Quantum_Light_MediaRouteButton = 16974511; // 0x10302af
|
||||
field public static final int Widget_Quantum_Light_PopupMenu = 16974512; // 0x10302b0
|
||||
field public static final int Widget_Quantum_Light_PopupMenu_Overflow = 16974513; // 0x10302b1
|
||||
field public static final int Widget_Quantum_Light_PopupWindow = 16974514; // 0x10302b2
|
||||
field public static final int Widget_Quantum_Light_ProgressBar = 16974515; // 0x10302b3
|
||||
field public static final int Widget_Quantum_Light_ProgressBar_Horizontal = 16974516; // 0x10302b4
|
||||
field public static final int Widget_Quantum_Light_ProgressBar_Inverse = 16974517; // 0x10302b5
|
||||
field public static final int Widget_Quantum_Light_ProgressBar_Large = 16974518; // 0x10302b6
|
||||
field public static final int Widget_Quantum_Light_ProgressBar_Large_Inverse = 16974519; // 0x10302b7
|
||||
field public static final int Widget_Quantum_Light_ProgressBar_Small = 16974520; // 0x10302b8
|
||||
field public static final int Widget_Quantum_Light_ProgressBar_Small_Inverse = 16974521; // 0x10302b9
|
||||
field public static final int Widget_Quantum_Light_ProgressBar_Small_Title = 16974522; // 0x10302ba
|
||||
field public static final int Widget_Quantum_Light_RatingBar = 16974523; // 0x10302bb
|
||||
field public static final int Widget_Quantum_Light_RatingBar_Indicator = 16974524; // 0x10302bc
|
||||
field public static final int Widget_Quantum_Light_RatingBar_Small = 16974525; // 0x10302bd
|
||||
field public static final int Widget_Quantum_Light_ScrollView = 16974526; // 0x10302be
|
||||
field public static final int Widget_Quantum_Light_SeekBar = 16974527; // 0x10302bf
|
||||
field public static final int Widget_Quantum_Light_SegmentedButton = 16974528; // 0x10302c0
|
||||
field public static final int Widget_Quantum_Light_Spinner = 16974530; // 0x10302c2
|
||||
field public static final int Widget_Quantum_Light_StackView = 16974529; // 0x10302c1
|
||||
field public static final int Widget_Quantum_Light_Tab = 16974531; // 0x10302c3
|
||||
field public static final int Widget_Quantum_Light_TabWidget = 16974532; // 0x10302c4
|
||||
field public static final int Widget_Quantum_Light_TextView = 16974533; // 0x10302c5
|
||||
field public static final int Widget_Quantum_Light_TextView_SpinnerItem = 16974534; // 0x10302c6
|
||||
field public static final int Widget_Quantum_Light_WebTextView = 16974535; // 0x10302c7
|
||||
field public static final int Widget_Quantum_Light_WebView = 16974536; // 0x10302c8
|
||||
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_PopupMenu_Overflow = 16974455; // 0x1030277
|
||||
field public static final int Widget_Quantum_PopupWindow = 16974456; // 0x1030278
|
||||
field public static final int Widget_Quantum_ProgressBar = 16974457; // 0x1030279
|
||||
field public static final int Widget_Quantum_ProgressBar_Horizontal = 16974458; // 0x103027a
|
||||
field public static final int Widget_Quantum_ProgressBar_Large = 16974459; // 0x103027b
|
||||
field public static final int Widget_Quantum_ProgressBar_Small = 16974460; // 0x103027c
|
||||
field public static final int Widget_Quantum_ProgressBar_Small_Title = 16974461; // 0x103027d
|
||||
field public static final int Widget_Quantum_RatingBar = 16974462; // 0x103027e
|
||||
field public static final int Widget_Quantum_RatingBar_Indicator = 16974463; // 0x103027f
|
||||
field public static final int Widget_Quantum_RatingBar_Small = 16974464; // 0x1030280
|
||||
field public static final int Widget_Quantum_ScrollView = 16974465; // 0x1030281
|
||||
field public static final int Widget_Quantum_SeekBar = 16974466; // 0x1030282
|
||||
field public static final int Widget_Quantum_SegmentedButton = 16974467; // 0x1030283
|
||||
field public static final int Widget_Quantum_Spinner = 16974469; // 0x1030285
|
||||
field public static final int Widget_Quantum_StackView = 16974468; // 0x1030284
|
||||
field public static final int Widget_Quantum_Tab = 16974470; // 0x1030286
|
||||
field public static final int Widget_Quantum_TabWidget = 16974471; // 0x1030287
|
||||
field public static final int Widget_Quantum_TextView = 16974472; // 0x1030288
|
||||
field public static final int Widget_Quantum_TextView_SpinnerItem = 16974473; // 0x1030289
|
||||
field public static final int Widget_Quantum_WebTextView = 16974474; // 0x103028a
|
||||
field public static final int Widget_Quantum_WebView = 16974475; // 0x103028b
|
||||
field public static final int Widget_Quantum = 16974418; // 0x1030252
|
||||
field public static final int Widget_Quantum_ActionBar = 16974419; // 0x1030253
|
||||
field public static final int Widget_Quantum_ActionBar_Solid = 16974420; // 0x1030254
|
||||
field public static final int Widget_Quantum_ActionBar_TabBar = 16974421; // 0x1030255
|
||||
field public static final int Widget_Quantum_ActionBar_TabText = 16974422; // 0x1030256
|
||||
field public static final int Widget_Quantum_ActionBar_TabView = 16974423; // 0x1030257
|
||||
field public static final int Widget_Quantum_ActionButton = 16974424; // 0x1030258
|
||||
field public static final int Widget_Quantum_ActionButton_CloseMode = 16974425; // 0x1030259
|
||||
field public static final int Widget_Quantum_ActionButton_Overflow = 16974426; // 0x103025a
|
||||
field public static final int Widget_Quantum_ActionMode = 16974427; // 0x103025b
|
||||
field public static final int Widget_Quantum_AutoCompleteTextView = 16974428; // 0x103025c
|
||||
field public static final int Widget_Quantum_Button = 16974429; // 0x103025d
|
||||
field public static final int Widget_Quantum_ButtonBar = 16974435; // 0x1030263
|
||||
field public static final int Widget_Quantum_ButtonBar_AlertDialog = 16974436; // 0x1030264
|
||||
field public static final int Widget_Quantum_Button_Borderless = 16974430; // 0x103025e
|
||||
field public static final int Widget_Quantum_Button_Borderless_Small = 16974431; // 0x103025f
|
||||
field public static final int Widget_Quantum_Button_Inset = 16974432; // 0x1030260
|
||||
field public static final int Widget_Quantum_Button_Small = 16974433; // 0x1030261
|
||||
field public static final int Widget_Quantum_Button_Toggle = 16974434; // 0x1030262
|
||||
field public static final int Widget_Quantum_CalendarView = 16974437; // 0x1030265
|
||||
field public static final int Widget_Quantum_CheckedTextView = 16974438; // 0x1030266
|
||||
field public static final int Widget_Quantum_CompoundButton_CheckBox = 16974439; // 0x1030267
|
||||
field public static final int Widget_Quantum_CompoundButton_RadioButton = 16974440; // 0x1030268
|
||||
field public static final int Widget_Quantum_CompoundButton_Star = 16974441; // 0x1030269
|
||||
field public static final int Widget_Quantum_DatePicker = 16974442; // 0x103026a
|
||||
field public static final int Widget_Quantum_DropDownItem = 16974443; // 0x103026b
|
||||
field public static final int Widget_Quantum_DropDownItem_Spinner = 16974444; // 0x103026c
|
||||
field public static final int Widget_Quantum_EditText = 16974445; // 0x103026d
|
||||
field public static final int Widget_Quantum_ExpandableListView = 16974446; // 0x103026e
|
||||
field public static final int Widget_Quantum_FastScroll = 16974447; // 0x103026f
|
||||
field public static final int Widget_Quantum_GridView = 16974448; // 0x1030270
|
||||
field public static final int Widget_Quantum_HorizontalScrollView = 16974449; // 0x1030271
|
||||
field public static final int Widget_Quantum_ImageButton = 16974450; // 0x1030272
|
||||
field public static final int Widget_Quantum_Light = 16974477; // 0x103028d
|
||||
field public static final int Widget_Quantum_Light_ActionBar = 16974478; // 0x103028e
|
||||
field public static final int Widget_Quantum_Light_ActionBar_Solid = 16974479; // 0x103028f
|
||||
field public static final int Widget_Quantum_Light_ActionBar_TabBar = 16974480; // 0x1030290
|
||||
field public static final int Widget_Quantum_Light_ActionBar_TabText = 16974481; // 0x1030291
|
||||
field public static final int Widget_Quantum_Light_ActionBar_TabView = 16974482; // 0x1030292
|
||||
field public static final int Widget_Quantum_Light_ActionButton = 16974483; // 0x1030293
|
||||
field public static final int Widget_Quantum_Light_ActionButton_CloseMode = 16974484; // 0x1030294
|
||||
field public static final int Widget_Quantum_Light_ActionButton_Overflow = 16974485; // 0x1030295
|
||||
field public static final int Widget_Quantum_Light_ActionMode = 16974486; // 0x1030296
|
||||
field public static final int Widget_Quantum_Light_AutoCompleteTextView = 16974487; // 0x1030297
|
||||
field public static final int Widget_Quantum_Light_Button = 16974488; // 0x1030298
|
||||
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 = 16974489; // 0x1030299
|
||||
field public static final int Widget_Quantum_Light_Button_Borderless_Small = 16974490; // 0x103029a
|
||||
field public static final int Widget_Quantum_Light_Button_Inset = 16974491; // 0x103029b
|
||||
field public static final int Widget_Quantum_Light_Button_Small = 16974492; // 0x103029c
|
||||
field public static final int Widget_Quantum_Light_Button_Toggle = 16974493; // 0x103029d
|
||||
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_GridView = 16974506; // 0x10302aa
|
||||
field public static final int Widget_Quantum_Light_HorizontalScrollView = 16974507; // 0x10302ab
|
||||
field public static final int Widget_Quantum_Light_ImageButton = 16974508; // 0x10302ac
|
||||
field public static final int Widget_Quantum_Light_ListPopupWindow = 16974509; // 0x10302ad
|
||||
field public static final int Widget_Quantum_Light_ListView = 16974510; // 0x10302ae
|
||||
field public static final int Widget_Quantum_Light_ListView_DropDown = 16974511; // 0x10302af
|
||||
field public static final int Widget_Quantum_Light_MediaRouteButton = 16974512; // 0x10302b0
|
||||
field public static final int Widget_Quantum_Light_PopupMenu = 16974513; // 0x10302b1
|
||||
field public static final int Widget_Quantum_Light_PopupMenu_Overflow = 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 = 16974451; // 0x1030273
|
||||
field public static final int Widget_Quantum_ListView = 16974452; // 0x1030274
|
||||
field public static final int Widget_Quantum_ListView_DropDown = 16974453; // 0x1030275
|
||||
field public static final int Widget_Quantum_MediaRouteButton = 16974454; // 0x1030276
|
||||
field public static final int Widget_Quantum_PopupMenu = 16974455; // 0x1030277
|
||||
field public static final int Widget_Quantum_PopupMenu_Overflow = 16974456; // 0x1030278
|
||||
field public static final int Widget_Quantum_PopupWindow = 16974457; // 0x1030279
|
||||
field public static final int Widget_Quantum_ProgressBar = 16974458; // 0x103027a
|
||||
field public static final int Widget_Quantum_ProgressBar_Horizontal = 16974459; // 0x103027b
|
||||
field public static final int Widget_Quantum_ProgressBar_Large = 16974460; // 0x103027c
|
||||
field public static final int Widget_Quantum_ProgressBar_Small = 16974461; // 0x103027d
|
||||
field public static final int Widget_Quantum_ProgressBar_Small_Title = 16974462; // 0x103027e
|
||||
field public static final int Widget_Quantum_RatingBar = 16974463; // 0x103027f
|
||||
field public static final int Widget_Quantum_RatingBar_Indicator = 16974464; // 0x1030280
|
||||
field public static final int Widget_Quantum_RatingBar_Small = 16974465; // 0x1030281
|
||||
field public static final int Widget_Quantum_ScrollView = 16974466; // 0x1030282
|
||||
field public static final int Widget_Quantum_SeekBar = 16974467; // 0x1030283
|
||||
field public static final int Widget_Quantum_SegmentedButton = 16974468; // 0x1030284
|
||||
field public static final int Widget_Quantum_Spinner = 16974470; // 0x1030286
|
||||
field public static final int Widget_Quantum_StackView = 16974469; // 0x1030285
|
||||
field public static final int Widget_Quantum_Tab = 16974471; // 0x1030287
|
||||
field public static final int Widget_Quantum_TabWidget = 16974472; // 0x1030288
|
||||
field public static final int Widget_Quantum_TextView = 16974473; // 0x1030289
|
||||
field public static final int Widget_Quantum_TextView_SpinnerItem = 16974474; // 0x103028a
|
||||
field public static final int Widget_Quantum_WebTextView = 16974475; // 0x103028b
|
||||
field public static final int Widget_Quantum_WebView = 16974476; // 0x103028c
|
||||
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
|
||||
|
||||
@@ -2274,9 +2274,10 @@
|
||||
|
||||
<public type="style" name="ThemeOverlay" />
|
||||
<public type="style" name="ThemeOverlay.Quantum" />
|
||||
<public type="style" name="ThemeOverlay.Quantum.ActionBar" />
|
||||
<public type="style" name="ThemeOverlay.Quantum.Light" />
|
||||
<public type="style" name="ThemeOverlay.Quantum.Dark" />
|
||||
<public type="style" name="ThemeOverlay.Quantum.ActionBarWidget" />
|
||||
<public type="style" name="ThemeOverlay.Quantum.Dark.ActionBar" />
|
||||
|
||||
<public type="style" name="Widget.Quantum" />
|
||||
<public type="style" name="Widget.Quantum.ActionBar" />
|
||||
|
||||
@@ -306,8 +306,8 @@ please see themes_device_defaults.xml.
|
||||
<item name="actionBarStyle">@style/Widget.Quantum.ActionBar.Solid</item>
|
||||
<item name="actionBarSize">@dimen/action_bar_default_height_quantum</item>
|
||||
<item name="actionModePopupWindowStyle">@style/Widget.Quantum.PopupWindow.ActionMode</item>
|
||||
<item name="actionBarWidgetTheme">@style/ThemeOverlay.Quantum.ActionBarWidget</item>
|
||||
<item name="actionBarTheme">@null</item>
|
||||
<item name="actionBarWidgetTheme">@null</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.Quantum.ActionBar</item>
|
||||
<item name="actionBarItemBackground">?attr/selectableItemBackgroundBorderless</item>
|
||||
|
||||
<item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum</item>
|
||||
@@ -652,8 +652,8 @@ please see themes_device_defaults.xml.
|
||||
<item name="actionBarStyle">@style/Widget.Quantum.Light.ActionBar.Solid</item>
|
||||
<item name="actionBarSize">@dimen/action_bar_default_height_quantum</item>
|
||||
<item name="actionModePopupWindowStyle">@style/Widget.Quantum.Light.PopupWindow.ActionMode</item>
|
||||
<item name="actionBarWidgetTheme">@style/ThemeOverlay.Quantum.ActionBarWidget</item>
|
||||
<item name="actionBarTheme">@null</item>
|
||||
<item name="actionBarWidgetTheme">@null</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.Quantum.ActionBar</item>
|
||||
<item name="actionBarItemBackground">?attr/selectableItemBackgroundBorderless</item>
|
||||
|
||||
<item name="actionModeCutDrawable">@drawable/ic_menu_cut_quantum</item>
|
||||
@@ -728,8 +728,8 @@ please see themes_device_defaults.xml.
|
||||
with an inverse color profile. The dark action bar sharply stands out against
|
||||
the light content. -->
|
||||
<style name="Theme.Quantum.Light.DarkActionBar">
|
||||
<item name="actionBarWidgetTheme">@style/ThemeOverlay.Quantum.ActionBarWidget</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.Quantum.Dark</item>
|
||||
<item name="actionBarWidgetTheme">@null</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.Quantum.Dark.ActionBar</item>
|
||||
</style>
|
||||
|
||||
<style name="ThemeOverlay" />
|
||||
@@ -810,7 +810,14 @@ please see themes_device_defaults.xml.
|
||||
|
||||
<!-- Theme overlay that replaces the normal control color, which by default is the same as the
|
||||
secondary text color, with the primary text color. -->
|
||||
<style name="ThemeOverlay.Quantum.ActionBarWidget">
|
||||
<style name="ThemeOverlay.Quantum.ActionBar">
|
||||
<item name="colorControlNormal">?attr/textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<!-- Theme overlay that replaces colors with their dark versions and replaces the normal
|
||||
control color, which by default is the same as the secondary text color, with the primary
|
||||
text color. -->
|
||||
<style name="ThemeOverlay.Quantum.Dark.ActionBar">
|
||||
<item name="colorControlNormal">?attr/textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
|
||||
@@ -46,6 +46,7 @@ import android.content.pm.ActivityInfo;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.res.Configuration;
|
||||
import android.content.res.Resources;
|
||||
import android.content.res.Resources.Theme;
|
||||
import android.content.res.TypedArray;
|
||||
import android.graphics.Canvas;
|
||||
import android.graphics.Color;
|
||||
@@ -1159,22 +1160,41 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback {
|
||||
protected boolean initializePanelMenu(final PanelFeatureState st) {
|
||||
Context context = getContext();
|
||||
|
||||
// If we have an action bar, initialize the menu with a context themed for it.
|
||||
// If we have an action bar, initialize the menu with the right theme.
|
||||
if ((st.featureId == FEATURE_OPTIONS_PANEL || st.featureId == FEATURE_ACTION_BAR) &&
|
||||
mDecorContentParent != null) {
|
||||
TypedValue outValue = new TypedValue();
|
||||
Resources.Theme currentTheme = context.getTheme();
|
||||
currentTheme.resolveAttribute(com.android.internal.R.attr.actionBarWidgetTheme,
|
||||
outValue, true);
|
||||
final int targetThemeRes = outValue.resourceId;
|
||||
// TODO: We should pull the theme directly from the ActionBar.
|
||||
final TypedValue outValue = new TypedValue();
|
||||
final Theme baseTheme = context.getTheme();
|
||||
baseTheme.resolveAttribute(com.android.internal.R.attr.actionBarTheme, outValue, true);
|
||||
|
||||
if (targetThemeRes != 0 && context.getThemeResId() != targetThemeRes) {
|
||||
context = new ContextThemeWrapper(context, targetThemeRes);
|
||||
Theme widgetTheme = null;
|
||||
if (outValue.resourceId != 0) {
|
||||
widgetTheme = context.getResources().newTheme();
|
||||
widgetTheme.setTo(baseTheme);
|
||||
widgetTheme.applyStyle(outValue.resourceId, true);
|
||||
widgetTheme.resolveAttribute(
|
||||
com.android.internal.R.attr.actionBarWidgetTheme, outValue, true);
|
||||
} else {
|
||||
baseTheme.resolveAttribute(
|
||||
com.android.internal.R.attr.actionBarWidgetTheme, outValue, true);
|
||||
}
|
||||
|
||||
if (outValue.resourceId != 0) {
|
||||
if (widgetTheme == null) {
|
||||
widgetTheme = context.getResources().newTheme();
|
||||
widgetTheme.setTo(baseTheme);
|
||||
}
|
||||
widgetTheme.applyStyle(outValue.resourceId, true);
|
||||
}
|
||||
|
||||
if (widgetTheme != null) {
|
||||
context = new ContextThemeWrapper(context, 0);
|
||||
context.getTheme().setTo(widgetTheme);
|
||||
}
|
||||
}
|
||||
|
||||
final MenuBuilder menu = new MenuBuilder(context);
|
||||
|
||||
menu.setCallback(this);
|
||||
st.setMenu(menu);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user