diff options
28 files changed, 181 insertions, 11 deletions
diff --git a/api/current.xml b/api/current.xml index 3de7fca4c3d1..bcc80aca7abc 100644 --- a/api/current.xml +++ b/api/current.xml @@ -16641,6 +16641,39 @@ visibility="public" > </field> +<field name="Theme_Holo" + type="int" + transient="false" + volatile="false" + value="16973974" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="Theme_Holo_NoTitleBar" + type="int" + transient="false" + volatile="false" + value="16973976" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="Theme_Holo_NoTitleBar_Fullscreen" + type="int" + transient="false" + volatile="false" + value="16973977" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="Theme_InputMethod" type="int" transient="false" @@ -16663,6 +16696,39 @@ visibility="public" > </field> +<field name="Theme_Light_Holo" + type="int" + transient="false" + volatile="false" + value="16973975" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="Theme_Light_Holo_NoTitleBar" + type="int" + transient="false" + volatile="false" + value="16973978" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="Theme_Light_Holo_NoTitleBar_Fullscreen" + type="int" + transient="false" + volatile="false" + value="16973979" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="Theme_Light_NoTitleBar" type="int" transient="false" diff --git a/core/res/res/drawable-hdpi/textfield_default_holo_dark.9.png b/core/res/res/drawable-hdpi/textfield_default_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..c67d04d2b687 --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_default_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/textfield_default_holo_light.9.png b/core/res/res/drawable-hdpi/textfield_default_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..1292ebfb64f5 --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_default_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/textfield_disabled_holo_dark.9.png b/core/res/res/drawable-hdpi/textfield_disabled_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..a39982afca6e --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_disabled_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/textfield_disabled_holo_light.9.png b/core/res/res/drawable-hdpi/textfield_disabled_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..1f224b9448fa --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_disabled_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/textfield_disabled_selected_holo_dark.9.png b/core/res/res/drawable-hdpi/textfield_disabled_selected_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..66f18cc0d9ed --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_disabled_selected_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/textfield_disabled_selected_holo_light.9.png b/core/res/res/drawable-hdpi/textfield_disabled_selected_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..2664384c3076 --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_disabled_selected_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/textfield_pressed_holo_dark.9.png b/core/res/res/drawable-hdpi/textfield_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..bbf53c5070ed --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_pressed_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/textfield_pressed_holo_light.9.png b/core/res/res/drawable-hdpi/textfield_pressed_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..ce49b8d5dffd --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_pressed_holo_light.9.png diff --git a/core/res/res/drawable-hdpi/textfield_selected_holo_dark.9.png b/core/res/res/drawable-hdpi/textfield_selected_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..bbf53c5070ed --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_selected_holo_dark.9.png diff --git a/core/res/res/drawable-hdpi/textfield_selected_holo_light.9.png b/core/res/res/drawable-hdpi/textfield_selected_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..ce49b8d5dffd --- /dev/null +++ b/core/res/res/drawable-hdpi/textfield_selected_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/textfield_default_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_default_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..a9a2cc68d8a8 --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_default_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_default_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_default_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..36003cfda488 --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_default_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/textfield_disabled_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_disabled_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..cec82dd0bab2 --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_disabled_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_disabled_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_disabled_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..8a9b11fb0f94 --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_disabled_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/textfield_disabled_selected_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_disabled_selected_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..545924c1352e --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_disabled_selected_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_disabled_selected_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_disabled_selected_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..53ee26c937b0 --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_disabled_selected_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/textfield_pressed_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_pressed_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..0e7c24db0066 --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_pressed_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_pressed_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_pressed_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..fee09a635847 --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_pressed_holo_light.9.png diff --git a/core/res/res/drawable-mdpi/textfield_selected_holo_dark.9.png b/core/res/res/drawable-mdpi/textfield_selected_holo_dark.9.png Binary files differnew file mode 100644 index 000000000000..0e7c24db0066 --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_selected_holo_dark.9.png diff --git a/core/res/res/drawable-mdpi/textfield_selected_holo_light.9.png b/core/res/res/drawable-mdpi/textfield_selected_holo_light.9.png Binary files differnew file mode 100644 index 000000000000..fee09a635847 --- /dev/null +++ b/core/res/res/drawable-mdpi/textfield_selected_holo_light.9.png diff --git a/core/res/res/drawable/edit_text_holo_dark.xml b/core/res/res/drawable/edit_text_holo_dark.xml new file mode 100644 index 000000000000..b7d24ffa0ac4 --- /dev/null +++ b/core/res/res/drawable/edit_text_holo_dark.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_window_focused="false" android:state_enabled="true" + android:drawable="@drawable/textfield_default_holo_dark" /> + <item android:state_window_focused="false" android:state_enabled="false" + android:drawable="@drawable/textfield_disabled_holo_dark" /> + <item android:state_pressed="true" android:drawable="@drawable/textfield_pressed_holo_dark" /> + <item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/textfield_selected_holo_dark" /> + <item android:state_enabled="true" android:drawable="@drawable/textfield_default_holo_dark" /> + <item android:state_focused="true" android:drawable="@drawable/textfield_disabled_selected_holo_dark" /> + <item android:drawable="@drawable/textfield_disabled_holo_dark" /> +</selector> + diff --git a/core/res/res/drawable/edit_text_holo_light.xml b/core/res/res/drawable/edit_text_holo_light.xml new file mode 100644 index 000000000000..dae39e32e283 --- /dev/null +++ b/core/res/res/drawable/edit_text_holo_light.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2010 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> + +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + <item android:state_window_focused="false" android:state_enabled="true" + android:drawable="@drawable/textfield_default_holo_light" /> + <item android:state_window_focused="false" android:state_enabled="false" + android:drawable="@drawable/textfield_disabled_holo_light" /> + <item android:state_pressed="true" android:drawable="@drawable/textfield_pressed_holo_light" /> + <item android:state_enabled="true" android:state_focused="true" android:drawable="@drawable/textfield_selected_holo_light" /> + <item android:state_enabled="true" android:drawable="@drawable/textfield_default_holo_light" /> + <item android:state_focused="true" android:drawable="@drawable/textfield_disabled_selected_holo_light" /> + <item android:drawable="@drawable/textfield_disabled_holo_light" /> +</selector> + diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 4fb303903e57..c65631de4b2e 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -124,10 +124,14 @@ <!-- Text color, typeface, size, and style for system search result subtitle. Defaults to primary inverse text color. --> <attr name="textAppearanceSearchResultSubtitle" format="reference" /> - <!-- Text color, typeface, size, and style for the text inside of a button. --> <attr name="textAppearanceButton" format="reference" /> + <!-- EditText text foreground color. --> + <attr name="editTextColor" format="reference|color" /> + <!-- EditText background drawable. --> + <attr name="editTextBackground" format="reference" /> + <!-- A styled string, specifying the style to be used for showing inline candidate text when composing with an input method. The text itself will be ignored, but the style spans will be applied diff --git a/core/res/res/values/colors.xml b/core/res/res/values/colors.xml index 3a0c6519fbdb..30c51844d377 100644 --- a/core/res/res/values/colors.xml +++ b/core/res/res/values/colors.xml @@ -39,7 +39,7 @@ <color name="background_dark">#ff101010</color> <color name="bright_foreground_dark">#ffefefef</color> <color name="bright_foreground_dark_disabled">#80ffffff</color> - <color name="bright_foreground_dark_inverse">@android:color/background_dark</color> + <color name="bright_foreground_dark_inverse">@android:color/dim_foreground_dark</color> <color name="dim_foreground_dark">#bebebe</color> <color name="dim_foreground_dark_disabled">#80bebebe</color> <color name="dim_foreground_dark_inverse">#323232</color> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 6aca3615d7c2..c89b4c090b3b 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1346,5 +1346,18 @@ the base class. --> <public type="layout" name="list_content" /> + <!-- A dark holographic theme. --> + <public type="style" name="Theme.Holo" /> + <!-- A light holographic theme. --> + <public type="style" name="Theme.Light.Holo" /> + <!-- Variant of the holographic (dark) theme with no title bar --> + <public type="style" name="Theme.Holo.NoTitleBar" /> + <!-- Variant of the holographic (dark) theme that has no title bar and fills the entire screen --> + <public type="style" name="Theme.Holo.NoTitleBar.Fullscreen" /> + <!-- Variant of the holographic light theme with no title bar --> + <public type="style" name="Theme.Light.Holo.NoTitleBar" /> + <!-- Variant of the holographic light theme that has no title bar and fills the entire screen --> + <public type="style" name="Theme.Light.Holo.NoTitleBar.Fullscreen" /> + <public type="string" name="selectTextMode" id="0x01040030" /> </resources> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 4294c22a7fc5..37b66d3099d1 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -425,9 +425,9 @@ <item name="android:focusable">true</item> <item name="android:focusableInTouchMode">true</item> <item name="android:clickable">true</item> - <item name="android:background">@android:drawable/edit_text</item> + <item name="android:background">?android:attr/editTextBackground</item> <item name="android:textAppearance">?android:attr/textAppearanceMediumInverse</item> - <item name="android:textColor">@android:color/primary_text_light</item> + <item name="android:textColor">?android:attr/editTextColor</item> <item name="android:gravity">center_vertical</item> </style> @@ -659,14 +659,10 @@ <style name="TextAppearance.DialogWindowTitle"> <item name="android:textSize">18sp</item> - <item name="android:textStyle">normal</item> - <item name="android:textColor">?textColorPrimary</item> </style> <style name="TextAppearance.Large"> <item name="android:textSize">22sp</item> - <item name="android:textStyle">normal</item> - <item name="android:textColor">?textColorPrimary</item> </style> <style name="TextAppearance.Large.Inverse"> @@ -678,8 +674,6 @@ <style name="TextAppearance.Medium"> <item name="android:textSize">18sp</item> - <item name="android:textStyle">normal</item> - <item name="android:textColor">?textColorPrimary</item> </style> <style name="TextAppearance.Medium.Inverse"> @@ -691,7 +685,6 @@ <style name="TextAppearance.Small"> <item name="android:textSize">14sp</item> - <item name="android:textStyle">normal</item> <item name="android:textColor">?textColorSecondary</item> </style> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 348a7de517db..c78705b415c3 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -69,6 +69,9 @@ <item name="textAppearanceButton">@android:style/TextAppearance.Widget.Button</item> + <item name="editTextColor">?android:attr/textColorPrimaryInverse</item> + <item name="editTextBackground">@android:drawable/edit_text</item> + <item name="candidatesTextStyleSpans">@android:string/candidates_style</item> <item name="textCheckMark">@android:drawable/indicator_check_mark_dark</item> @@ -257,6 +260,7 @@ <item name="textColorLink">@android:color/link_text_light</item> <item name="textColorLinkInverse">@android:color/link_text_dark</item> + <item name="editTextColor">?android:attr/textColorPrimary</item> <item name="popupWindowStyle">@android:style/Widget.PopupWindow</item> <item name="textCheckMark">@android:drawable/indicator_check_mark_light</item> @@ -570,4 +574,38 @@ <style name="Theme.NoTitleBar.OverlayActionModes"> <item name="android:windowActionModeOverlay">true</item> </style> + + <!-- New Honeycomb holographic theme. Dark version --> + <style name="Theme.Holo"> + <item name="editTextBackground">@android:drawable/edit_text_holo_dark</item> + <item name="editTextColor">?android:attr/textColorPrimary</item> + </style> + + <!-- New Honeycomb holographic theme. Light version --> + <style name="Theme.Light.Holo"> + <item name="editTextBackground">@android:drawable/edit_text_holo_light</item> + </style> + + <!-- Variant of the holo (dark) theme with no title bar --> + <style name="Theme.Holo.NoTitleBar"> + <item name="android:windowNoTitle">true</item> + </style> + + <!-- Variant of the holo (dark) theme that has no title bar and fills the entire screen --> + <style name="Theme.Holo.NoTitleBar.Fullscreen"> + <item name="android:windowFullscreen">true</item> + <item name="android:windowContentOverlay">@null</item> + </style> + + <!-- Variant of the holo light theme with no title bar --> + <style name="Theme.Light.Holo.NoTitleBar"> + <item name="android:windowNoTitle">true</item> + </style> + + <!-- Variant of the holo light theme that has no title bar and fills the entire screen --> + <style name="Theme.Light.Holo.NoTitleBar.Fullscreen"> + <item name="android:windowFullscreen">true</item> + <item name="android:windowContentOverlay">@null</item> + </style> + </resources> |
