diff options
author | Winson Chung <winsonc@google.com> | 2011-10-25 13:55:19 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-25 13:55:19 -0700 |
commit | 2dac580d5288067061fc6d598072050be4263df7 (patch) | |
tree | a1d75c278f7e5de10274c38aba8821acb8426536 /res | |
parent | 4f3cb091d6ded1e31db8dd21f019073a7cc9a2e2 (diff) | |
parent | f8c1b58b8f8b320cfe52b82559d2199be249cb6a (diff) | |
download | android_packages_apps_Trebuchet-2dac580d5288067061fc6d598072050be4263df7.tar.gz android_packages_apps_Trebuchet-2dac580d5288067061fc6d598072050be4263df7.tar.bz2 android_packages_apps_Trebuchet-2dac580d5288067061fc6d598072050be4263df7.zip |
Merge "Fixing small tablet issues" into ics-mr1
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-sw600dp/market_button.xml | 8 | ||||
-rw-r--r-- | res/layout-sw600dp/wallpaper_item.xml | 8 | ||||
-rw-r--r-- | res/layout/qsb_bar.xml | 3 | ||||
-rw-r--r-- | res/values-sw600dp/styles.xml | 12 | ||||
-rw-r--r-- | res/values/styles.xml | 5 |
5 files changed, 20 insertions, 16 deletions
diff --git a/res/layout-sw600dp/market_button.xml b/res/layout-sw600dp/market_button.xml index ad5f6da0d..3f313190f 100644 --- a/res/layout-sw600dp/market_button.xml +++ b/res/layout-sw600dp/market_button.xml @@ -19,13 +19,15 @@ style="@style/MarketButton" android:onClick="onClickAppMarketButton" android:gravity="center" - android:paddingLeft="@dimen/toolbar_button_horizontal_padding" - android:paddingRight="@dimen/toolbar_button_horizontal_padding" + android:paddingLeft="10dp" + android:paddingRight="10dp" android:drawablePadding="10dp" android:text="@string/market" android:contentDescription="@string/market" android:textColor="@color/workspace_all_apps_and_delete_zone_text_color" - android:textSize="18sp" + android:textStyle="bold" + android:textSize="14sp" + android:textAllCaps="true" android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color" android:shadowDx="0.0" android:shadowDy="0.0" diff --git a/res/layout-sw600dp/wallpaper_item.xml b/res/layout-sw600dp/wallpaper_item.xml index 9a596cb8d..9461e3b55 100644 --- a/res/layout-sw600dp/wallpaper_item.xml +++ b/res/layout-sw600dp/wallpaper_item.xml @@ -16,13 +16,11 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/live_wallpaper_grid_item_padding"> - <ImageView xmlns:android="http://schemas.android.com/apk/res/android" + android:background="@drawable/wallpaper_gallery_item"> + <ImageView android:id="@+id/wallpaper_image" android:layout_width="@dimen/wallpaper_chooser_grid_width" android:layout_height="@dimen/wallpaper_chooser_grid_height" android:scaleType="centerCrop" - android:adjustViewBounds="false" - android:focusable="false" - android:padding="0dp" /> + android:focusable="true" /> </FrameLayout>
\ No newline at end of file diff --git a/res/layout/qsb_bar.xml b/res/layout/qsb_bar.xml index c58836ed8..c2179ce38 100644 --- a/res/layout/qsb_bar.xml +++ b/res/layout/qsb_bar.xml @@ -17,8 +17,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" style="@style/QSBBar" - android:focusable="false" - android:background="@drawable/search_bg_panel"> + android:focusable="false"> <!-- Search buttons container --> <include android:id="@+id/qsb_search_bar" diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml index 060900295..d17125c82 100644 --- a/res/values-sw600dp/styles.xml +++ b/res/values-sw600dp/styles.xml @@ -75,14 +75,18 @@ <item name="android:textSize">13sp</item> </style> <style name="TabIndicator.AppsCustomize"> - <item name="android:paddingLeft">40dp</item> - <item name="android:paddingRight">40dp</item> - <item name="android:paddingTop">10dp</item> + <item name="android:paddingTop">16dp</item> <item name="android:paddingBottom">20dp</item> - <item name="android:textSize">20sp</item> + <item name="android:textSize">14sp</item> </style> <!-- QSB Search / Drop Target bar --> + <style name="QSBBar"> + <item name="android:orientation">horizontal</item> + <item name="android:layout_width">match_parent</item> + <item name="android:layout_height">@dimen/qsb_bar_height</item> + <item name="android:layout_gravity">top|center_horizontal</item> + </style> <style name="SearchDropTargetBar"> <item name="android:orientation">horizontal</item> <item name="android:layout_width">match_parent</item> diff --git a/res/values/styles.xml b/res/values/styles.xml index f575f0057..981d5bef5 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -116,6 +116,7 @@ <item name="android:layout_width">match_parent</item> <item name="android:layout_height">@dimen/qsb_bar_height</item> <item name="android:layout_gravity">top|center_horizontal</item> + <item name="android:background">@drawable/search_bg_panel</item> </style> <style name="SearchDropTargetBar"> <item name="android:orientation">horizontal</item> @@ -158,8 +159,8 @@ <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">match_parent</item> <item name="android:gravity">center</item> - <item name="android:paddingLeft">35dp</item> - <item name="android:paddingRight">35dp</item> + <item name="android:paddingLeft">30dp</item> + <item name="android:paddingRight">30dp</item> <item name="android:background">@drawable/tab_widget_indicator_selector</item> <item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:textSize">12sp</item> |