diff options
| author | Winson Chung <winsonc@google.com> | 2011-06-01 11:36:23 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-01 11:36:23 -0700 |
| commit | 045dca8b1181e070daa3b896bc68f6a1742bf9b1 (patch) | |
| tree | deac46f1d79b807ca94c70693bba94b897f3679d /res | |
| parent | 0e120dbcc1617309f1aaa66f2cb44e162f605b70 (diff) | |
| parent | 6a26e5bed48bf64996aef3ea1db4767ee147640e (diff) | |
| download | android_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')
| -rw-r--r-- | res/layout/apps_customize_pane.xml | 4 | ||||
| -rw-r--r-- | res/values/attrs.xml | 4 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
3 files changed, 3 insertions, 9 deletions
diff --git a/res/layout/apps_customize_pane.xml b/res/layout/apps_customize_pane.xml index e22ba12c6..7083bf855 100644 --- a/res/layout/apps_customize_pane.xml +++ b/res/layout/apps_customize_pane.xml @@ -94,9 +94,7 @@ launcher:widgetCellWidthGap="@dimen/apps_customize_widget_cell_width_gap" launcher:widgetCellHeightGap="@dimen/apps_customize_widget_cell_height_gap" launcher:widgetCountX="@integer/apps_customize_widget_cell_count_x" - launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" - launcher:wallpaperCountX="@integer/apps_customize_wallpaper_cell_count_x" - launcher:wallpaperCountY="@integer/apps_customize_wallpaper_cell_count_y" /> + launcher:widgetCountY="@integer/apps_customize_widget_cell_count_y" /> </FrameLayout> </LinearLayout> </com.android.launcher2.AppsCustomizeTabHost> 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> |