summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2012-09-30 15:31:06 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2012-09-30 16:20:52 -0700
commitb023a587adf9ca49f0cc33c5607b535c11efeb2b (patch)
treeaee11a130710bee008a9f97f73911c2d3193d6d4 /core
parent62ea4363362526d32b48f920601d3b4e27a117bb (diff)
downloadframeworks_base-b023a587adf9ca49f0cc33c5607b535c11efeb2b.zip
frameworks_base-b023a587adf9ca49f0cc33c5607b535c11efeb2b.tar.gz
frameworks_base-b023a587adf9ca49f0cc33c5607b535c11efeb2b.tar.bz2
Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
- add CheckedTextViewStyle with "viewStart" as default text alignment - fix some typos Change-Id: Ia8161c48faf579c89ba5ed49a436e4269178b8c1
Diffstat (limited to 'core')
-rw-r--r--core/java/android/widget/CheckedTextView.java2
-rwxr-xr-xcore/res/res/values/attrs.xml2
-rw-r--r--core/res/res/values/public.xml10
-rw-r--r--core/res/res/values/styles.xml12
-rw-r--r--core/res/res/values/styles_device_defaults.xml6
-rw-r--r--core/res/res/values/themes.xml7
-rw-r--r--core/res/res/values/themes_device_defaults.xml2
7 files changed, 32 insertions, 9 deletions
diff --git a/core/java/android/widget/CheckedTextView.java b/core/java/android/widget/CheckedTextView.java
index d6fd4ff..e74e37c 100644
--- a/core/java/android/widget/CheckedTextView.java
+++ b/core/java/android/widget/CheckedTextView.java
@@ -55,7 +55,7 @@ public class CheckedTextView extends TextView implements Checkable {
}
public CheckedTextView(Context context, AttributeSet attrs) {
- this(context, attrs, 0);
+ this(context, attrs, R.attr.checkedTextViewStyle);
}
public CheckedTextView(Context context, AttributeSet attrs, int defStyle) {
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index ea89633..9ce7f8a 100755
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -483,6 +483,8 @@
<attr name="autoCompleteTextViewStyle" format="reference" />
<!-- Default Checkbox style. -->
<attr name="checkboxStyle" format="reference" />
+ <!-- Default CheckedTextView style. -->
+ <attr name="checkedTextViewStyle" format="reference" />
<!-- Default ListView style for drop downs. -->
<attr name="dropDownListViewStyle" format="reference" />
<!-- Default EditText style. -->
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 76fa2b0..ffc09de 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2018,10 +2018,10 @@
<public type="attr" name="permissionGroupFlags" id="0x010103c5" />
<public type="attr" name="labelFor" id="0x010103c6" />
<public type="attr" name="permissionFlags" id="0x010103c7" />
-
-
-<!-- ===============================================================
- Resources added in next version of platform
- =============================================================== -->
+ <public type="attr" name="checkedTextViewStyle" />
+ <public type="style" name="Widget.Holo.CheckedTextView" />
+ <public type="style" name="Widget.Holo.Light.CheckedTextView" />
+ <public type="style" name="Widget.DeviceDefault.CheckedTextView" />
+ <public type="style" name="Widget.DeviceDefault.Light.CheckedTextView" />
</resources>
diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml
index 74e2425..4371aec 100644
--- a/core/res/res/values/styles.xml
+++ b/core/res/res/values/styles.xml
@@ -464,7 +464,11 @@ please see styles_device_defaults.xml.
<item name="android:textEditSuggestionItemLayout">?android:attr/textEditSuggestionItemLayout</item>
<item name="android:textCursorDrawable">?android:attr/textCursorDrawable</item>
</style>
-
+
+ <style name="Widget.CheckedTextView">
+ <item name="android:textAlignment">viewStart</item>
+ </style>
+
<style name="Widget.TextView.ListSeparator">
<item name="android:background">@android:drawable/dark_header_dither</item>
<item name="android:layout_width">match_parent</item>
@@ -1589,6 +1593,9 @@ please see styles_device_defaults.xml.
<style name="Widget.Holo.TextView" parent="Widget.TextView">
</style>
+ <style name="Widget.Holo.CheckedTextView" parent="Widget.CheckedTextView">
+ </style>
+
<style name="Widget.Holo.TextView.ListSeparator" parent="Widget.TextView.ListSeparator">
<item name="android:background">@android:drawable/list_section_divider_holo_dark</item>
<item name="android:textAllCaps">true</item>
@@ -2017,6 +2024,9 @@ please see styles_device_defaults.xml.
<style name="Widget.Holo.Light.TextView" parent="Widget.TextView">
</style>
+ <style name="Widget.Holo.Light.CheckedTextView" parent="Widget.CheckedTextView">
+ </style>
+
<style name="Widget.Holo.Light.TextView.ListSeparator" parent="Widget.TextView.ListSeparator">
<item name="android:background">@android:drawable/list_section_divider_holo_light</item>
<item name="android:textAllCaps">true</item>
diff --git a/core/res/res/values/styles_device_defaults.xml b/core/res/res/values/styles_device_defaults.xml
index d465356..edeba02 100644
--- a/core/res/res/values/styles_device_defaults.xml
+++ b/core/res/res/values/styles_device_defaults.xml
@@ -50,6 +50,9 @@ easier.
<style name="Widget.DeviceDefault.TextView" parent="Widget.Holo.TextView" >
</style>
+ <style name="Widget.DeviceDefault.CheckedTextView" parent="Widget.Holo.CheckedTextView" >
+
+ </style>
<style name="Widget.DeviceDefault.AutoCompleteTextView" parent="Widget.Holo.AutoCompleteTextView" >
</style>
@@ -288,6 +291,9 @@ easier.
<style name="Widget.DeviceDefault.Light.TextView" parent="Widget.Holo.Light.TextView" >
</style>
+ <style name="Widget.DeviceDefault.Light.CheckedTextView" parent="Widget.Holo.Light.CheckedTextView" >
+
+ </style>
<style name="Widget.DeviceDefault.Light.AutoCompleteTextView" parent="Widget.Holo.Light.AutoCompleteTextView" >
</style>
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index 215551b..2a0a84b 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -241,6 +241,7 @@ please see themes_device_defaults.xml.
<item name="absListViewStyle">@android:style/Widget.AbsListView</item>
<item name="autoCompleteTextViewStyle">@android:style/Widget.AutoCompleteTextView</item>
<item name="checkboxStyle">@android:style/Widget.CompoundButton.CheckBox</item>
+ <item name="checkedTextViewStyle">@android:style/Widget.CheckedTextView</item>
<item name="dropDownListViewStyle">@android:style/Widget.ListView.DropDown</item>
<item name="editTextStyle">@android:style/Widget.EditText</item>
<item name="expandableListViewStyle">@android:style/Widget.ExpandableListView</item>
@@ -874,12 +875,12 @@ please see themes_device_defaults.xml.
<p>This is the default system theme for apps that target API level 11 - 13. Starting
with API level 14, the default system theme is supplied by {@link #Theme_DeviceDefault},
which might apply a different style on different devices. If you want to ensure that your
- app consistenly uses the Holo theme at all times, you must explicitly declare it in your
+ app consistently uses the Holo theme at all times, you must explicitly declare it in your
manifest. For example, {@code &lt;application android:theme="@android:style/Theme.Holo"&gt;}.
For more information, read <a
href="http://android-developers.blogspot.com/2012/01/holo-everywhere.html">Holo
Everywhere</a>.</p>
- <p>The widgets in the holographic theme are translucent on their brackground, so
+ <p>The widgets in the holographic theme are translucent on their background, so
applications must ensure that any background they use with this theme is itself
dark; otherwise, it will be difficult to see the widgets. This UI style also includes a
full action bar by default.</p>
@@ -1069,6 +1070,7 @@ please see themes_device_defaults.xml.
<item name="absListViewStyle">@android:style/Widget.Holo.AbsListView</item>
<item name="autoCompleteTextViewStyle">@android:style/Widget.Holo.AutoCompleteTextView</item>
<item name="checkboxStyle">@android:style/Widget.Holo.CompoundButton.CheckBox</item>
+ <item name="checkedTextViewStyle">@android:style/Widget.Holo.CheckedTextView</item>
<item name="dropDownListViewStyle">@android:style/Widget.Holo.ListView.DropDown</item>
<item name="editTextStyle">@android:style/Widget.Holo.EditText</item>
<item name="expandableListViewStyle">@android:style/Widget.Holo.ExpandableListView</item>
@@ -1382,6 +1384,7 @@ please see themes_device_defaults.xml.
<item name="absListViewStyle">@android:style/Widget.Holo.Light.AbsListView</item>
<item name="autoCompleteTextViewStyle">@android:style/Widget.Holo.Light.AutoCompleteTextView</item>
<item name="checkboxStyle">@android:style/Widget.Holo.Light.CompoundButton.CheckBox</item>
+ <item name="checkedTextViewStyle">@android:style/Widget.Holo.Light.CheckedTextView</item>
<item name="dropDownListViewStyle">@android:style/Widget.Holo.ListView.DropDown</item>
<item name="editTextStyle">@android:style/Widget.Holo.Light.EditText</item>
<item name="expandableListViewStyle">@android:style/Widget.Holo.Light.ExpandableListView</item>
diff --git a/core/res/res/values/themes_device_defaults.xml b/core/res/res/values/themes_device_defaults.xml
index 2a2b9e0..afbde9e 100644
--- a/core/res/res/values/themes_device_defaults.xml
+++ b/core/res/res/values/themes_device_defaults.xml
@@ -104,6 +104,7 @@ easier.
<item name="absListViewStyle">@android:style/Widget.DeviceDefault.AbsListView</item>
<item name="autoCompleteTextViewStyle">@android:style/Widget.DeviceDefault.AutoCompleteTextView</item>
<item name="checkboxStyle">@android:style/Widget.DeviceDefault.CompoundButton.CheckBox</item>
+ <item name="checkedTextViewStyle">@android:style/Widget.DeviceDefault.CheckedTextView</item>
<item name="dropDownListViewStyle">@android:style/Widget.DeviceDefault.ListView.DropDown</item>
<item name="editTextStyle">@android:style/Widget.DeviceDefault.EditText</item>
<item name="expandableListViewStyle">@android:style/Widget.DeviceDefault.ExpandableListView</item>
@@ -261,6 +262,7 @@ easier.
<item name="absListViewStyle">@android:style/Widget.DeviceDefault.Light.AbsListView</item>
<item name="autoCompleteTextViewStyle">@android:style/Widget.DeviceDefault.Light.AutoCompleteTextView</item>
<item name="checkboxStyle">@android:style/Widget.DeviceDefault.Light.CompoundButton.CheckBox</item>
+ <item name="checkedTextViewStyle">@android:style/Widget.DeviceDefault.Light.CheckedTextView</item>
<item name="dropDownListViewStyle">@android:style/Widget.DeviceDefault.ListView.DropDown</item>
<item name="editTextStyle">@android:style/Widget.DeviceDefault.Light.EditText</item>
<item name="expandableListViewStyle">@android:style/Widget.DeviceDefault.Light.ExpandableListView</item>