Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17c3c90e authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Pushing in boilerplate Quantum and Quantum.Light styles"

parents 53d45be3 65f31d41

api/current.txt

+185 −7
Original line number Diff line number Diff line
@@ -1647,6 +1647,12 @@ 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
@@ -1722,6 +1728,40 @@ package android { 
    field public static final int TextAppearance_Large_Inverse = 16973891; // 0x1030043

    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 = 16974318; // 0x10301ee

    field public static final int TextAppearance_Quantum_DialogWindowTitle = 16974319; // 0x10301ef

    field public static final int TextAppearance_Quantum_Inverse = 16974320; // 0x10301f0

    field public static final int TextAppearance_Quantum_Large = 16974321; // 0x10301f1

    field public static final int TextAppearance_Quantum_Large_Inverse = 16974322; // 0x10301f2

    field public static final int TextAppearance_Quantum_Medium = 16974323; // 0x10301f3

    field public static final int TextAppearance_Quantum_Medium_Inverse = 16974324; // 0x10301f4

    field public static final int TextAppearance_Quantum_SearchResult_Subtitle = 16974325; // 0x10301f5

    field public static final int TextAppearance_Quantum_SearchResult_Title = 16974326; // 0x10301f6

    field public static final int TextAppearance_Quantum_Small = 16974327; // 0x10301f7

    field public static final int TextAppearance_Quantum_Small_Inverse = 16974328; // 0x10301f8

    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_WindowTitle = 16974329; // 0x10301f9

    field public static final int TextAppearance_Small = 16973894; // 0x1030046

    field public static final int TextAppearance_Small_Inverse = 16973895; // 0x1030047

    field public static final int TextAppearance_StatusBar_EventContent = 16973927; // 0x1030067
@@ -1816,8 +1856,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 = 16974318; // 0x10301ee

    field public static final int Theme_Quantum_NoActionBar = 16974319; // 0x10301ef

    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_Translucent = 16973839; // 0x103000f

    field public static final int Theme_Translucent_NoTitleBar = 16973840; // 0x1030010

    field public static final int Theme_Translucent_NoTitleBar_Fullscreen = 16973841; // 0x1030011
@@ -2105,11 +2171,123 @@ 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_Button = 16974320; // 0x10301f0

    field public static final int Widget_Quantum_Button_Borderless = 16974322; // 0x10301f2

    field public static final int Widget_Quantum_Button_Borderless_Small = 16974323; // 0x10301f3

    field public static final int Widget_Quantum_Button_Small = 16974321; // 0x10301f1

    field public static final int Widget_Quantum_ImageButton = 16974324; // 0x10301f4

    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_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_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_RatingBar = 16973857; // 0x1030021

    field public static final int Widget_ScrollView = 16973869; // 0x103002d

    field public static final int Widget_SeekBar = 16973856; // 0x1030020

core/res/res/values/public.xml

+186 −2

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/styles.xml

+1 −48
Original line number Diff line number Diff line
@@ -2408,16 +2408,6 @@ please see styles_device_defaults.xml. 
    <style name="Animation.Holo.Dialog" parent="Animation.Dialog">

    </style>



    <style name="Animation.Quantum" parent="Animation.Holo">

    </style>



    <style name="Animation.Quantum.Activity" parent="Animation.Holo.Activity">

        <item name="activityOpenEnterAnimation">@null</item>

        <item name="activityOpenExitAnimation">@null</item>

        <item name="activityCloseEnterAnimation">@null</item>

        <item name="activityCloseExitAnimation">@anim/fade_out</item>

    </style>



    <!-- Dialog styles -->



    <style name="AlertDialog.Holo" parent="AlertDialog">
@@ -2534,13 +2524,8 @@ please see styles_device_defaults.xml. 
        <item name="android:contentDescription">@android:string/media_route_button_content_description</item>

    </style>



    <style name="Widget.Holo.Light.MediaRouteButton">

        <item name="android:background">?android:attr/selectableItemBackground</item>

    <style name="Widget.Holo.Light.MediaRouteButton" parent="Widget.Holo.MediaRouteButton">

        <item name="android:externalRouteEnabledDrawable">@drawable/ic_media_route_holo_light</item>

        <item name="android:minWidth">56dp</item>

        <item name="android:minHeight">48dp</item>

        <item name="android:focusable">true</item>

        <item name="android:contentDescription">@android:string/media_route_button_content_description</item>

    </style>



    <!-- Keyguard PIN pad styles -->
@@ -2623,36 +2608,4 @@ please see styles_device_defaults.xml. 
    <style name="Widget.Holo.Light.FastScroll" parent="Widget.Holo.FastScroll">

    </style>



    <!-- Begin Quantum styles -->



    <style name="Widget.Quantum" parent="Widget.Holo.Light">

    </style>



    <style name="Widget.Quantum.Button" parent="Widget.Holo.Light.Button">

        <item name="android:background">@android:drawable/btn_default_quantum</item>

    </style>



    <style name="Widget.Quantum.Button.Borderless">

        <item name="android:background">?android:attr/selectableItemBackground</item>

        <item name="android:paddingStart">4dip</item>

        <item name="android:paddingEnd">4dip</item>

    </style>



    <style name="Widget.Quantum.Button.Borderless.Small">

        <item name="android:textSize">14sp</item>

    </style>



    <style name="Widget.Quantum.Button.Small">

        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>

        <item name="android:textColor">@android:color/primary_text_holo_light</item>

        <item name="android:minHeight">48dip</item>

        <item name="android:minWidth">48dip</item>

    </style>



    <style name="Widget.Quantum.Button.Inset">

    </style>



    <style name="Widget.Quantum.ImageButton" parent="Widget.Holo.Light.ImageButton">

        <item name="android:background">@android:drawable/btn_default_quantum</item>

    </style>

</resources>

core/res/res/values/styles_device_defaults.xml

+238 −707

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/styles_quantum.xml

0 → 100644
+1242 −0

File added.

Preview size limit exceeded, changes collapsed.