summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-06-01 11:36:23 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-01 11:36:23 -0700
commit045dca8b1181e070daa3b896bc68f6a1742bf9b1 (patch)
treedeac46f1d79b807ca94c70693bba94b897f3679d /res/values
parent0e120dbcc1617309f1aaa66f2cb44e162f605b70 (diff)
parent6a26e5bed48bf64996aef3ea1db4767ee147640e (diff)
downloadandroid_packages_apps_Trebuchet-045dca8b1181e070daa3b896bc68f6a1742bf9b1.tar.gz
android_packages_apps_Trebuchet-045dca8b1181e070daa3b896bc68f6a1742bf9b1.tar.bz2
android_packages_apps_Trebuchet-045dca8b1181e070daa3b896bc68f6a1742bf9b1.zip
Merge "Removing wallpapers tab, adding shop icon back."
Diffstat (limited to 'res/values')
-rw-r--r--res/values/attrs.xml4
-rw-r--r--res/values/styles.xml4
2 files changed, 2 insertions, 6 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 75b93bf0d..ae1b7f732 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -120,10 +120,6 @@
<attr name="widgetCountX" format="integer" />
<!-- Number of widgets vertically -->
<attr name="widgetCountY" format="integer" />
- <!-- Number of wallpaper pickers horizontally -->
- <attr name="wallpaperCountX" format="integer" />
- <!-- Number of wallpaper pickers vertically -->
- <attr name="wallpaperCountY" format="integer" />
</declare-styleable>
<!-- CustomizePagedView specific attributes. These attributes are used to customize
diff --git a/res/values/styles.xml b/res/values/styles.xml
index c3e6ce97a..196b48ba3 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -103,8 +103,8 @@
</style>
<style name="MarketButton">
- <item name="android:paddingRight">20dp</item>
- <item name="android:text">@string/market</item>
+ <item name="android:paddingLeft">5dp</item>
+ <item name="android:paddingRight">5dp</item>
<item name="android:textColor">@color/workspace_all_apps_and_delete_zone_text_color</item>
<item name="android:textSize">18sp</item>
<item name="android:shadowColor">@color/workspace_all_apps_and_delete_zone_text_shadow_color</item>