summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPin Ting <pinting@google.com>2012-07-26 13:31:11 -0700
committerPin Ting <pinting@google.com>2012-07-26 16:42:54 -0700
commit2408a5f4f7216c4d6c398592c353bf449c55cf6b (patch)
tree79bc6b40eb7acb1c2fe31a77278b3ceb48a8f870
parent52dfb17e3c93b3762130ec8912c6e16c9dea0edc (diff)
downloadandroid_packages_apps_Gallery2-2408a5f4f7216c4d6c398592c353bf449c55cf6b.tar.gz
android_packages_apps_Gallery2-2408a5f4f7216c4d6c398592c353bf449c55cf6b.tar.bz2
android_packages_apps_Gallery2-2408a5f4f7216c4d6c398592c353bf449c55cf6b.zip
Remove dependency on android.widget.Switch.
Bug:6706782 Change-Id: I9a86f9fbcb45c9def18f325e95ef6cfcd63edaff
-rw-r--r--res/values-v14/styles.xml1
-rw-r--r--res/values/attrs.xml1
-rw-r--r--res/values/styles.xml1
3 files changed, 3 insertions, 0 deletions
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index d14ad0899..b6d6e437b 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -17,5 +17,6 @@
<resources>
<style name="Theme.GalleryBase" parent="android:Theme.Holo">
<item name="listPreferredItemHeightSmall">?android:attr/listPreferredItemHeightSmall</item>
+ <item name="switchStyle">@android:style/Widget.CompoundButton</item>
</style>
</resources>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index f9c3d2486..94d5b72de 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -16,5 +16,6 @@
<resources>
<declare-styleable name="Theme.GalleryBase">
<attr name="listPreferredItemHeightSmall" format="dimension" />
+ <attr name="switchStyle" format="reference" />
</declare-styleable>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 7389318ce..3239f681d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,6 +17,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<style name="Theme.GalleryBase" parent="android:Theme.Holo">
<item name="listPreferredItemHeightSmall">48dp</item>
+ <item name="switchStyle">@android:style/Widget.CompoundButton</item>
</style>
<style name="Theme.Gallery" parent="Theme.GalleryBase">
<item name="android:displayOptions"></item>