Merge "Fix some text styling for Holo.Light" (81eeecc3) · Commits · e / os / android_frameworks_base

core/res/res/color/widget_edittext_holo_light.xml

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		<?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_focused="false" android:color="@android:color/bright_foreground_dark"/> <!-- unfocused -->
		<item android:color="@android:color/bright_foreground_dark"/>
		</selector>

core/res/res/values/styles.xml

+21 −1

Original line number	Diff line number	Diff line
		@@ -1091,6 +1091,14 @@
		<style name="TextAppearance.Holo.Widget.PopupMenu.Small" parent="TextAppearance.Widget.PopupMenu.Small">
		</style>

		<style name="TextAppearance.Holo.Widget.ActionBar.Title"
		parent="TextAppearance.Holo.Medium">
		</style>

		<style name="TextAppearance.Holo.Widget.ActionBar.Subtitle"
		parent="TextAppearance.Holo.Small">
		</style>

		<style name="TextAppearance.Holo.Widget.ActionMode">
		</style>

		@@ -1168,6 +1176,11 @@
		<style name="TextAppearance.Holo.Light.Widget.Button">
		</style>

		<style name="TextAppearance.Holo.Light.Widget.EditText">
		<item name="android:textColor">@color/widget_edittext_holo_light</item>
		<item name="android:textColorHint">@android:color/hint_foreground_holo_dark</item>
		</style>

		<style name="TextAppearance.Holo.Light.Widget.PopupMenu" parent="TextAppearance.Holo.Widget.PopupMenu">
		</style>

		@@ -1402,6 +1415,9 @@
		</style>

		<style name="Widget.Holo.ActionBarView_TabText" parent="Widget.ActionBarView_TabText">
		<item name="android:textAppearance">@style/TextAppearance.Holo.Medium</item>
		<item name="android:textColor">?android:attr/textColorPrimary</item>
		<item name="android:textSize">18sp</item>
		</style>

		<style name="Widget.Holo.ActionMode" parent="Widget.ActionMode">
		@@ -1415,6 +1431,8 @@
		</style>

		<style name="Widget.Holo.ActionBar" parent="Widget.ActionBar">
		<item name="android:titleTextStyle">@android:style/TextAppearance.Holo.Widget.ActionBar.Title</item>
		<item name="android:subtitleTextStyle">@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle</item>
		</style>

		<!-- Light widget styles -->
		@@ -1445,7 +1463,7 @@
		<style name="Widget.Holo.Light.TextView" parent="Widget.TextView">
		</style>

		<style name="Widget.Holo.Light.TextView.ListSeparator">
		<style name="Widget.Holo.Light.TextView.ListSeparator" parent="Widget.TextView.ListSeparator">
		</style>

		<style name="Widget.Holo.Light.TextSelectHandle" parent="Widget.TextSelectHandle">
		@@ -1620,6 +1638,8 @@
		</style>

		<style name="Widget.Holo.Light.ActionBar" parent="Widget.ActionBar">
		<item name="android:titleTextStyle">@android:style/TextAppearance.Holo.Widget.ActionBar.Title</item>
		<item name="android:subtitleTextStyle">@android:style/TextAppearance.Holo.Widget.ActionBar.Subtitle</item>
		</style>

		<!-- Animation Styles -->

core/res/res/values/themes.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -884,7 +884,7 @@

		<item name="textAppearanceButton">@android:style/TextAppearance.Holo.Light.Widget.Button</item>

		<item name="editTextColor">?android:attr/textColorPrimaryInverse</item>
		<item name="editTextColor">?android:attr/textColorPrimary</item>
		<item name="editTextBackground">@android:drawable/edit_text_holo_light</item>

		<item name="candidatesTextStyleSpans">@android:string/candidates_style</item>