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

Commit e28cde62 authored by Romain Guy's avatar Romain Guy Committed by Android (Google) Code Review
Browse files

Merge "Added Device Default Themes."

parents 01704e76 d31d3887

api/current.txt

+173 −0
Original line number Diff line number Diff line
@@ -1499,6 +1499,12 @@ package android { 
    field public static final int Animation_InputMethod = 16973910; // 0x1030056

    field public static final int Animation_Toast = 16973828; // 0x1030004

    field public static final int Animation_Translucent = 16973827; // 0x1030003

    field public static final int DeviceDefault_ButtonBar = 16974287; // 0x10301cf

    field public static final int DeviceDefault_ButtonBar_AlertDialog = 16974288; // 0x10301d0

    field public static final int DeviceDefault_Light_ButtonBar = 16974290; // 0x10301d2

    field public static final int DeviceDefault_Light_ButtonBar_AlertDialog = 16974291; // 0x10301d3

    field public static final int DeviceDefault_Light_SegmentedButton = 16974292; // 0x10301d4

    field public static final int DeviceDefault_SegmentedButton = 16974289; // 0x10301d1

    field public static final int Holo_ButtonBar = 16974053; // 0x10300e5

    field public static final int Holo_ButtonBar_AlertDialog = 16974055; // 0x10300e7

    field public static final int Holo_Light_ButtonBar = 16974054; // 0x10300e6
@@ -1513,6 +1519,40 @@ package android { 
    field public static final int MediaButton_Previous = 16973880; // 0x1030038

    field public static final int MediaButton_Rew = 16973884; // 0x103003c

    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

    field public static final int TextAppearance_DeviceDefault_Inverse = 16974254; // 0x10301ae

    field public static final int TextAppearance_DeviceDefault_Large = 16974255; // 0x10301af

    field public static final int TextAppearance_DeviceDefault_Large_Inverse = 16974256; // 0x10301b0

    field public static final int TextAppearance_DeviceDefault_Medium = 16974257; // 0x10301b1

    field public static final int TextAppearance_DeviceDefault_Medium_Inverse = 16974258; // 0x10301b2

    field public static final int TextAppearance_DeviceDefault_SearchResult_Subtitle = 16974262; // 0x10301b6

    field public static final int TextAppearance_DeviceDefault_SearchResult_Title = 16974261; // 0x10301b5

    field public static final int TextAppearance_DeviceDefault_Small = 16974259; // 0x10301b3

    field public static final int TextAppearance_DeviceDefault_Small_Inverse = 16974260; // 0x10301b4

    field public static final int TextAppearance_DeviceDefault_Widget = 16974265; // 0x10301b9

    field public static final int TextAppearance_DeviceDefault_Widget_ActionBar_Menu = 16974286; // 0x10301ce

    field public static final int TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle = 16974279; // 0x10301c7

    field public static final int TextAppearance_DeviceDefault_Widget_ActionBar_Subtitle_Inverse = 16974283; // 0x10301cb

    field public static final int TextAppearance_DeviceDefault_Widget_ActionBar_Title = 16974278; // 0x10301c6

    field public static final int TextAppearance_DeviceDefault_Widget_ActionBar_Title_Inverse = 16974282; // 0x10301ca

    field public static final int TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle = 16974281; // 0x10301c9

    field public static final int TextAppearance_DeviceDefault_Widget_ActionMode_Subtitle_Inverse = 16974285; // 0x10301cd

    field public static final int TextAppearance_DeviceDefault_Widget_ActionMode_Title = 16974280; // 0x10301c8

    field public static final int TextAppearance_DeviceDefault_Widget_ActionMode_Title_Inverse = 16974284; // 0x10301cc

    field public static final int TextAppearance_DeviceDefault_Widget_Button = 16974266; // 0x10301ba

    field public static final int TextAppearance_DeviceDefault_Widget_DropDownHint = 16974271; // 0x10301bf

    field public static final int TextAppearance_DeviceDefault_Widget_DropDownItem = 16974272; // 0x10301c0

    field public static final int TextAppearance_DeviceDefault_Widget_EditText = 16974274; // 0x10301c2

    field public static final int TextAppearance_DeviceDefault_Widget_IconMenu_Item = 16974267; // 0x10301bb

    field public static final int TextAppearance_DeviceDefault_Widget_PopupMenu = 16974275; // 0x10301c3

    field public static final int TextAppearance_DeviceDefault_Widget_PopupMenu_Large = 16974276; // 0x10301c4

    field public static final int TextAppearance_DeviceDefault_Widget_PopupMenu_Small = 16974277; // 0x10301c5

    field public static final int TextAppearance_DeviceDefault_Widget_TabWidget = 16974268; // 0x10301bc

    field public static final int TextAppearance_DeviceDefault_Widget_TextView = 16974269; // 0x10301bd

    field public static final int TextAppearance_DeviceDefault_Widget_TextView_PopupMenu = 16974270; // 0x10301be

    field public static final int TextAppearance_DeviceDefault_Widget_TextView_SpinnerItem = 16974273; // 0x10301c1

    field public static final int TextAppearance_DeviceDefault_WindowTitle = 16974263; // 0x10301b7

    field public static final int TextAppearance_DialogWindowTitle = 16973889; // 0x1030041

    field public static final int TextAppearance_Holo = 16974075; // 0x10300fb

    field public static final int TextAppearance_Holo_DialogWindowTitle = 16974103; // 0x1030117
@@ -1578,6 +1618,30 @@ package android { 
    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

    field public static final int Theme_DeviceDefault = 16974120; // 0x1030128

    field public static final int Theme_DeviceDefault_Dialog = 16974126; // 0x103012e

    field public static final int Theme_DeviceDefault_DialogWhenLarge = 16974134; // 0x1030136

    field public static final int Theme_DeviceDefault_DialogWhenLarge_NoActionBar = 16974135; // 0x1030137

    field public static final int Theme_DeviceDefault_Dialog_MinWidth = 16974127; // 0x103012f

    field public static final int Theme_DeviceDefault_Dialog_NoActionBar = 16974128; // 0x1030130

    field public static final int Theme_DeviceDefault_Dialog_NoActionBar_MinWidth = 16974129; // 0x1030131

    field public static final int Theme_DeviceDefault_InputMethod = 16974142; // 0x103013e

    field public static final int Theme_DeviceDefault_Light = 16974123; // 0x103012b

    field public static final int Theme_DeviceDefault_Light_DarkActionBar = 16974143; // 0x103013f

    field public static final int Theme_DeviceDefault_Light_Dialog = 16974130; // 0x1030132

    field public static final int Theme_DeviceDefault_Light_DialogWhenLarge = 16974136; // 0x1030138

    field public static final int Theme_DeviceDefault_Light_DialogWhenLarge_NoActionBar = 16974137; // 0x1030139

    field public static final int Theme_DeviceDefault_Light_Dialog_MinWidth = 16974131; // 0x1030133

    field public static final int Theme_DeviceDefault_Light_Dialog_NoActionBar = 16974132; // 0x1030134

    field public static final int Theme_DeviceDefault_Light_Dialog_NoActionBar_MinWidth = 16974133; // 0x1030135

    field public static final int Theme_DeviceDefault_Light_NoActionBar = 16974124; // 0x103012c

    field public static final int Theme_DeviceDefault_Light_NoActionBar_Fullscreen = 16974125; // 0x103012d

    field public static final int Theme_DeviceDefault_Light_Panel = 16974139; // 0x103013b

    field public static final int Theme_DeviceDefault_NoActionBar = 16974121; // 0x1030129

    field public static final int Theme_DeviceDefault_NoActionBar_Fullscreen = 16974122; // 0x103012a

    field public static final int Theme_DeviceDefault_Panel = 16974138; // 0x103013a

    field public static final int Theme_DeviceDefault_Wallpaper = 16974140; // 0x103013c

    field public static final int Theme_DeviceDefault_Wallpaper_NoTitleBar = 16974141; // 0x103013d

    field public static final int Theme_Dialog = 16973835; // 0x103000b

    field public static final int Theme_Holo = 16973931; // 0x103006b

    field public static final int Theme_Holo_Dialog = 16973935; // 0x103006f
@@ -1642,6 +1706,115 @@ package android { 
    field public static final int Widget_CompoundButton_RadioButton = 16973850; // 0x103001a

    field public static final int Widget_CompoundButton_Star = 16973851; // 0x103001b

    field public static final int Widget_DatePicker = 16974062; // 0x10300ee

    field public static final int Widget_DeviceDefault = 16974144; // 0x1030140

    field public static final int Widget_DeviceDefault_ActionBar = 16974187; // 0x103016b

    field public static final int Widget_DeviceDefault_ActionBar_Solid = 16974195; // 0x1030173

    field public static final int Widget_DeviceDefault_ActionBar_TabBar = 16974194; // 0x1030172

    field public static final int Widget_DeviceDefault_ActionBar_TabText = 16974193; // 0x1030171

    field public static final int Widget_DeviceDefault_ActionBar_TabView = 16974192; // 0x1030170

    field public static final int Widget_DeviceDefault_ActionButton = 16974182; // 0x1030166

    field public static final int Widget_DeviceDefault_ActionButton_CloseMode = 16974186; // 0x103016a

    field public static final int Widget_DeviceDefault_ActionButton_Overflow = 16974183; // 0x1030167

    field public static final int Widget_DeviceDefault_ActionButton_TextButton = 16974184; // 0x1030168

    field public static final int Widget_DeviceDefault_ActionMode = 16974185; // 0x1030169

    field public static final int Widget_DeviceDefault_AutoCompleteTextView = 16974151; // 0x1030147

    field public static final int Widget_DeviceDefault_Button = 16974145; // 0x1030141

    field public static final int Widget_DeviceDefault_Button_Borderless = 16974188; // 0x103016c

    field public static final int Widget_DeviceDefault_Button_Borderless_Small = 16974149; // 0x1030145

    field public static final int Widget_DeviceDefault_Button_Inset = 16974147; // 0x1030143

    field public static final int Widget_DeviceDefault_Button_Small = 16974146; // 0x1030142

    field public static final int Widget_DeviceDefault_Button_Toggle = 16974148; // 0x1030144

    field public static final int Widget_DeviceDefault_CalendarView = 16974190; // 0x103016e

    field public static final int Widget_DeviceDefault_CompoundButton_CheckBox = 16974152; // 0x1030148

    field public static final int Widget_DeviceDefault_CompoundButton_RadioButton = 16974169; // 0x1030159

    field public static final int Widget_DeviceDefault_CompoundButton_Star = 16974173; // 0x103015d

    field public static final int Widget_DeviceDefault_DatePicker = 16974191; // 0x103016f

    field public static final int Widget_DeviceDefault_DropDownItem = 16974177; // 0x1030161

    field public static final int Widget_DeviceDefault_DropDownItem_Spinner = 16974178; // 0x1030162

    field public static final int Widget_DeviceDefault_EditText = 16974154; // 0x103014a

    field public static final int Widget_DeviceDefault_ExpandableListView = 16974155; // 0x103014b

    field public static final int Widget_DeviceDefault_GridView = 16974156; // 0x103014c

    field public static final int Widget_DeviceDefault_HorizontalScrollView = 16974171; // 0x103015b

    field public static final int Widget_DeviceDefault_ImageButton = 16974157; // 0x103014d

    field public static final int Widget_DeviceDefault_Light = 16974196; // 0x1030174

    field public static final int Widget_DeviceDefault_Light_ActionBar = 16974243; // 0x10301a3

    field public static final int Widget_DeviceDefault_Light_ActionBar_Solid = 16974247; // 0x10301a7

    field public static final int Widget_DeviceDefault_Light_ActionBar_Solid_Inverse = 16974248; // 0x10301a8

    field public static final int Widget_DeviceDefault_Light_ActionBar_TabBar = 16974246; // 0x10301a6

    field public static final int Widget_DeviceDefault_Light_ActionBar_TabBar_Inverse = 16974249; // 0x10301a9

    field public static final int Widget_DeviceDefault_Light_ActionBar_TabText = 16974245; // 0x10301a5

    field public static final int Widget_DeviceDefault_Light_ActionBar_TabText_Inverse = 16974251; // 0x10301ab

    field public static final int Widget_DeviceDefault_Light_ActionBar_TabView = 16974244; // 0x10301a4

    field public static final int Widget_DeviceDefault_Light_ActionBar_TabView_Inverse = 16974250; // 0x10301aa

    field public static final int Widget_DeviceDefault_Light_ActionButton = 16974239; // 0x103019f

    field public static final int Widget_DeviceDefault_Light_ActionButton_CloseMode = 16974242; // 0x10301a2

    field public static final int Widget_DeviceDefault_Light_ActionButton_Overflow = 16974240; // 0x10301a0

    field public static final int Widget_DeviceDefault_Light_ActionMode = 16974241; // 0x10301a1

    field public static final int Widget_DeviceDefault_Light_ActionMode_Inverse = 16974252; // 0x10301ac

    field public static final int Widget_DeviceDefault_Light_AutoCompleteTextView = 16974203; // 0x103017b

    field public static final int Widget_DeviceDefault_Light_Button = 16974197; // 0x1030175

    field public static final int Widget_DeviceDefault_Light_Button_Borderless_Small = 16974201; // 0x1030179

    field public static final int Widget_DeviceDefault_Light_Button_Inset = 16974199; // 0x1030177

    field public static final int Widget_DeviceDefault_Light_Button_Small = 16974198; // 0x1030176

    field public static final int Widget_DeviceDefault_Light_Button_Toggle = 16974200; // 0x1030178

    field public static final int Widget_DeviceDefault_Light_CalendarView = 16974238; // 0x103019e

    field public static final int Widget_DeviceDefault_Light_CompoundButton_CheckBox = 16974204; // 0x103017c

    field public static final int Widget_DeviceDefault_Light_CompoundButton_RadioButton = 16974224; // 0x1030190

    field public static final int Widget_DeviceDefault_Light_CompoundButton_Star = 16974228; // 0x1030194

    field public static final int Widget_DeviceDefault_Light_DropDownItem = 16974232; // 0x1030198

    field public static final int Widget_DeviceDefault_Light_DropDownItem_Spinner = 16974233; // 0x1030199

    field public static final int Widget_DeviceDefault_Light_EditText = 16974206; // 0x103017e

    field public static final int Widget_DeviceDefault_Light_ExpandableListView = 16974207; // 0x103017f

    field public static final int Widget_DeviceDefault_Light_GridView = 16974208; // 0x1030180

    field public static final int Widget_DeviceDefault_Light_HorizontalScrollView = 16974226; // 0x1030192

    field public static final int Widget_DeviceDefault_Light_ImageButton = 16974209; // 0x1030181

    field public static final int Widget_DeviceDefault_Light_ListPopupWindow = 16974235; // 0x103019b

    field public static final int Widget_DeviceDefault_Light_ListView = 16974210; // 0x1030182

    field public static final int Widget_DeviceDefault_Light_ListView_DropDown = 16974205; // 0x103017d

    field public static final int Widget_DeviceDefault_Light_PopupMenu = 16974236; // 0x103019c

    field public static final int Widget_DeviceDefault_Light_PopupWindow = 16974211; // 0x1030183

    field public static final int Widget_DeviceDefault_Light_ProgressBar = 16974212; // 0x1030184

    field public static final int Widget_DeviceDefault_Light_ProgressBar_Horizontal = 16974213; // 0x1030185

    field public static final int Widget_DeviceDefault_Light_ProgressBar_Inverse = 16974217; // 0x1030189

    field public static final int Widget_DeviceDefault_Light_ProgressBar_Large = 16974216; // 0x1030188

    field public static final int Widget_DeviceDefault_Light_ProgressBar_Large_Inverse = 16974219; // 0x103018b

    field public static final int Widget_DeviceDefault_Light_ProgressBar_Small = 16974214; // 0x1030186

    field public static final int Widget_DeviceDefault_Light_ProgressBar_Small_Inverse = 16974218; // 0x103018a

    field public static final int Widget_DeviceDefault_Light_ProgressBar_Small_Title = 16974215; // 0x1030187

    field public static final int Widget_DeviceDefault_Light_RatingBar = 16974221; // 0x103018d

    field public static final int Widget_DeviceDefault_Light_RatingBar_Indicator = 16974222; // 0x103018e

    field public static final int Widget_DeviceDefault_Light_RatingBar_Small = 16974223; // 0x103018f

    field public static final int Widget_DeviceDefault_Light_ScrollView = 16974225; // 0x1030191

    field public static final int Widget_DeviceDefault_Light_SeekBar = 16974220; // 0x103018c

    field public static final int Widget_DeviceDefault_Light_Spinner = 16974227; // 0x1030193

    field public static final int Widget_DeviceDefault_Light_Tab = 16974237; // 0x103019d

    field public static final int Widget_DeviceDefault_Light_TabWidget = 16974229; // 0x1030195

    field public static final int Widget_DeviceDefault_Light_TextView = 16974202; // 0x103017a

    field public static final int Widget_DeviceDefault_Light_TextView_SpinnerItem = 16974234; // 0x103019a

    field public static final int Widget_DeviceDefault_Light_WebTextView = 16974230; // 0x1030196

    field public static final int Widget_DeviceDefault_Light_WebView = 16974231; // 0x1030197

    field public static final int Widget_DeviceDefault_ListPopupWindow = 16974180; // 0x1030164

    field public static final int Widget_DeviceDefault_ListView = 16974158; // 0x103014e

    field public static final int Widget_DeviceDefault_ListView_DropDown = 16974153; // 0x1030149

    field public static final int Widget_DeviceDefault_PopupMenu = 16974181; // 0x1030165

    field public static final int Widget_DeviceDefault_PopupWindow = 16974159; // 0x103014f

    field public static final int Widget_DeviceDefault_ProgressBar = 16974160; // 0x1030150

    field public static final int Widget_DeviceDefault_ProgressBar_Horizontal = 16974161; // 0x1030151

    field public static final int Widget_DeviceDefault_ProgressBar_Large = 16974164; // 0x1030154

    field public static final int Widget_DeviceDefault_ProgressBar_Small = 16974162; // 0x1030152

    field public static final int Widget_DeviceDefault_ProgressBar_Small_Title = 16974163; // 0x1030153

    field public static final int Widget_DeviceDefault_RatingBar = 16974166; // 0x1030156

    field public static final int Widget_DeviceDefault_RatingBar_Indicator = 16974167; // 0x1030157

    field public static final int Widget_DeviceDefault_RatingBar_Small = 16974168; // 0x1030158

    field public static final int Widget_DeviceDefault_ScrollView = 16974170; // 0x103015a

    field public static final int Widget_DeviceDefault_SeekBar = 16974165; // 0x1030155

    field public static final int Widget_DeviceDefault_Spinner = 16974172; // 0x103015c

    field public static final int Widget_DeviceDefault_Tab = 16974189; // 0x103016d

    field public static final int Widget_DeviceDefault_TabWidget = 16974174; // 0x103015e

    field public static final int Widget_DeviceDefault_TextView = 16974150; // 0x1030146

    field public static final int Widget_DeviceDefault_TextView_SpinnerItem = 16974179; // 0x1030163

    field public static final int Widget_DeviceDefault_WebTextView = 16974175; // 0x103015f

    field public static final int Widget_DeviceDefault_WebView = 16974176; // 0x1030160

    field public static final int Widget_DropDownItem = 16973867; // 0x103002b

    field public static final int Widget_DropDownItem_Spinner = 16973868; // 0x103002c

    field public static final int Widget_EditText = 16973859; // 0x1030023

core/res/res/values-large/themes.xml

+15 −0
Original line number Diff line number Diff line
@@ -16,6 +16,21 @@ 
** limitations under the License.

*/

-->



<!--

===============================================================

                        PLEASE READ

===============================================================



The Holo themes must not be modified in order to pass CTS.

Many related themes and styles depend on other values defined in this file.

If you would like to provide custom themes and styles for your device,

please see themes_device_defaults.xml.



===============================================================

                        PLEASE READ

===============================================================

 -->

<resources>

    <style name="Theme.Holo.DialogWhenLarge"

            parent="@android:style/Theme.Holo.Dialog.MinWidth">

core/res/res/values-large/themes_device_defaults.xml

0 → 100644
+48 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- Copyright (C) 2011 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<!--

===============================================================

                        PLEASE READ

===============================================================

This file contains the themes that are the Device Defaults.

If you want to edit themes to skin your device, do it here.

We recommend that you do not edit themes.xml and instead edit

this file.



Editing this file instead of themes.xml will greatly simplify

merges for future platform versions and CTS compliance will be

easier.

===============================================================

                        PLEASE READ

===============================================================

 -->

<resources>

    <style name="Theme.DeviceDefault.DialogWhenLarge"

            parent="@android:style/Theme.DeviceDefault.Dialog.MinWidth">

        <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>

    </style>

    <style name="Theme.DeviceDefault.DialogWhenLarge.NoActionBar"

            parent="@android:style/Theme.DeviceDefault.Dialog.NoActionBar.MinWidth">

        <item name="preferencePanelStyle">@style/PreferencePanel.Dialog</item>

    </style>

    <style name="Theme.DeviceDefault.Light.DialogWhenLarge"

            parent="@android:style/Theme.DeviceDefault.Light.Dialog.MinWidth">

    </style>

    <style name="Theme.DeviceDefault.Light.DialogWhenLarge.NoActionBar"

            parent="@android:style/Theme.DeviceDefault.Light.Dialog.NoActionBar.MinWidth">

    </style>

</resources>

core/res/res/values/public.xml

+177 −0

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/styles.xml

+14 −0
Original line number Diff line number Diff line
@@ -14,6 +14,20 @@ 
     limitations under the License.

-->



<!--

===============================================================

                        PLEASE READ

===============================================================



The Holo themes must not be modified in order to pass CTS.

Many related themes and styles depend on other values defined in this file.

If you would like to provide custom themes and styles for your device,

please see styles_device_defaults.xml.



===============================================================

                        PLEASE READ

===============================================================

 -->

<resources>

    <!-- Global Theme Styles -->

    <eat-comment />