diff options
author | Winson Chung <winsonc@google.com> | 2010-10-28 16:07:04 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2010-11-01 16:10:49 -0700 |
commit | 7da1025bd7f15b04cf55c79b73e94e5e1bc959d9 (patch) | |
tree | f0c20ed38a4db0ee27d0d67b9618fb9a9a0cc777 /res | |
parent | 30110328a249a049673266bfce39ca9dcf650af9 (diff) | |
download | android_packages_apps_Trebuchet-7da1025bd7f15b04cf55c79b73e94e5e1bc959d9.tar.gz android_packages_apps_Trebuchet-7da1025bd7f15b04cf55c79b73e94e5e1bc959d9.tar.bz2 android_packages_apps_Trebuchet-7da1025bd7f15b04cf55c79b73e94e5e1bc959d9.zip |
Layout and spacing changes for AllApps/Customization drawer
- Also fixing issue where preview images in the customization drawer were not being scaled down
Change-Id: I83d1abf019d591954204b87a437eac2ff916dd54
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-mdpi/tab_unselected_holo.9.png | bin | 0 -> 128 bytes | |||
-rw-r--r-- | res/drawable-xlarge/all_apps_bg_gradient.9.png | bin | 0 -> 268 bytes | |||
-rw-r--r-- | res/drawable-xlarge/customize_bg_gradient.png | bin | 0 -> 304471 bytes | |||
-rw-r--r-- | res/layout-xlarge-land/all_apps_tabbed.xml | 5 | ||||
-rw-r--r-- | res/layout-xlarge-land/customization_drawer.xml | 8 | ||||
-rw-r--r-- | res/layout-xlarge-land/launcher.xml | 15 | ||||
-rw-r--r-- | res/layout-xlarge-port/all_apps_tabbed.xml | 8 | ||||
-rw-r--r-- | res/layout-xlarge-port/customization_drawer.xml | 6 | ||||
-rw-r--r-- | res/layout-xlarge-port/launcher.xml | 15 | ||||
-rw-r--r-- | res/layout-xlarge/all_apps_paged_view_application.xml | 2 | ||||
-rw-r--r-- | res/layout-xlarge/customize_paged_view_item.xml | 14 | ||||
-rw-r--r-- | res/layout-xlarge/customize_paged_view_widget.xml | 2 | ||||
-rw-r--r-- | res/values-xlarge/dimens.xml | 2 | ||||
-rw-r--r-- | res/values-xlarge/styles.xml | 4 |
14 files changed, 38 insertions, 43 deletions
diff --git a/res/drawable-mdpi/tab_unselected_holo.9.png b/res/drawable-mdpi/tab_unselected_holo.9.png Binary files differnew file mode 100644 index 000000000..848f3f133 --- /dev/null +++ b/res/drawable-mdpi/tab_unselected_holo.9.png diff --git a/res/drawable-xlarge/all_apps_bg_gradient.9.png b/res/drawable-xlarge/all_apps_bg_gradient.9.png Binary files differnew file mode 100644 index 000000000..8d88a7ec5 --- /dev/null +++ b/res/drawable-xlarge/all_apps_bg_gradient.9.png diff --git a/res/drawable-xlarge/customize_bg_gradient.png b/res/drawable-xlarge/customize_bg_gradient.png Binary files differnew file mode 100644 index 000000000..fb3ec90ee --- /dev/null +++ b/res/drawable-xlarge/customize_bg_gradient.png diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml index fd9d9cbf6..89a310477 100644 --- a/res/layout-xlarge-land/all_apps_tabbed.xml +++ b/res/layout-xlarge-land/all_apps_tabbed.xml @@ -22,9 +22,10 @@ android:layout_height="match_parent"> <TabWidget android:id="@android:id/tabs" - android:layout_width="wrap_content" + android:layout_width="952dp" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" + android:background="@drawable/tab_unselected_holo" android:tabStripEnabled="false" /> <FrameLayout android:id="@android:id/tabcontent" @@ -38,7 +39,7 @@ launcher:cellCountY="5" launcher:pageLayoutWidthGap="36dp" launcher:pageLayoutHeightGap="6dp" - launcher:pageLayoutPaddingTop="0dp" + launcher:pageLayoutPaddingTop="15dp" launcher:pageLayoutPaddingBottom="15dp" launcher:pageLayoutPaddingLeft="40dp" launcher:pageLayoutPaddingRight="40dp"> diff --git a/res/layout-xlarge-land/customization_drawer.xml b/res/layout-xlarge-land/customization_drawer.xml index 8c60e68ba..911525961 100644 --- a/res/layout-xlarge-land/customization_drawer.xml +++ b/res/layout-xlarge-land/customization_drawer.xml @@ -20,9 +20,11 @@ android:layout_width="match_parent" android:layout_height="match_parent" launcher:widgetCellCountX="16" - launcher:cellCountX="7" - launcher:cellCountY="4" - launcher:pageLayoutPaddingTop="10dp" + launcher:cellCountX="8" + launcher:cellCountY="3" + launcher:pageLayoutWidthGap="32dp" + launcher:pageLayoutHeightGap="12dp" + launcher:pageLayoutPaddingTop="40dp" launcher:pageLayoutPaddingBottom="25dp" launcher:pageLayoutPaddingLeft="20dp" launcher:pageLayoutPaddingRight="20dp" />
\ No newline at end of file diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml index f42d72bd4..e5ba3934c 100644 --- a/res/layout-xlarge-land/launcher.xml +++ b/res/layout-xlarge-land/launcher.xml @@ -26,7 +26,7 @@ layout="@layout/all_apps_tabbed" android:id="@+id/all_apps_view" android:layout_width="match_parent" - android:layout_height="600dip" + android:layout_height="600dp" android:layout_gravity="top"/> <!-- The workspace contains 5 screens of cells --> @@ -38,7 +38,7 @@ launcher:defaultScreen="2" launcher:cellCountX="8" launcher:cellCountY="7" - launcher:pageSpacing="32dip"> + launcher:pageSpacing="32dp"> <include android:id="@+id/cell1" layout="@layout/workspace_screen" /> <include android:id="@+id/cell2" layout="@layout/workspace_screen" /> @@ -86,7 +86,7 @@ android:layout_toLeftOf="@id/configure_button" android:layout_marginLeft="@dimen/toolbar_button_spacing" android:layout_marginRight="@dimen/toolbar_button_spacing" - android:textSize="18dip" + android:textSize="18dp" android:onClick="onClickAllAppsButton" android:focusable="true" @@ -131,20 +131,19 @@ <TabHost android:id="@android:id/tabhost" android:layout_width="match_parent" - android:layout_height="500dip" + android:layout_height="460dp" android:layout_gravity="bottom"> <LinearLayout android:orientation="vertical" - android:background="#40000000" android:layout_width="match_parent" android:layout_height="match_parent"> <TabWidget android:id="@android:id/tabs" - android:layout_width="wrap_content" + android:layout_width="952dp" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:tabStripEnabled="false" - android:paddingBottom="10dp" /> + android:background="@drawable/tab_unselected_holo" + android:tabStripEnabled="false" /> <FrameLayout android:id="@android:id/tabcontent" android:layout_width="match_parent" diff --git a/res/layout-xlarge-port/all_apps_tabbed.xml b/res/layout-xlarge-port/all_apps_tabbed.xml index d61c979de..65e3729fd 100644 --- a/res/layout-xlarge-port/all_apps_tabbed.xml +++ b/res/layout-xlarge-port/all_apps_tabbed.xml @@ -15,17 +15,17 @@ --> <com.android.launcher2.AllAppsTabbed xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - android:paddingTop="?android:attr/actionBarSize"> + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher"> <LinearLayout android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> <TabWidget android:id="@android:id/tabs" - android:layout_width="wrap_content" + android:layout_width="700dp" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" + android:background="@drawable/tab_unselected_holo" android:tabStripEnabled="false" /> <FrameLayout android:id="@android:id/tabcontent" @@ -39,7 +39,7 @@ launcher:cellCountY="7" launcher:pageLayoutWidthGap="36dp" launcher:pageLayoutHeightGap="36dp" - launcher:pageLayoutPaddingTop="0dp" + launcher:pageLayoutPaddingTop="25dp" launcher:pageLayoutPaddingBottom="10dp" launcher:pageLayoutPaddingLeft="20dp" launcher:pageLayoutPaddingRight="20dp"> diff --git a/res/layout-xlarge-port/customization_drawer.xml b/res/layout-xlarge-port/customization_drawer.xml index d3ca45741..28127ea67 100644 --- a/res/layout-xlarge-port/customization_drawer.xml +++ b/res/layout-xlarge-port/customization_drawer.xml @@ -21,10 +21,10 @@ android:layout_height="match_parent" launcher:widgetCellCountX="10" launcher:cellCountX="5" - launcher:cellCountY="5" + launcher:cellCountY="3" launcher:pageLayoutWidthGap="36dp" - launcher:pageLayoutHeightGap="36dp" - launcher:pageLayoutPaddingTop="25dp" + launcher:pageLayoutHeightGap="12dp" + launcher:pageLayoutPaddingTop="40dp" launcher:pageLayoutPaddingBottom="25dp" launcher:pageLayoutPaddingLeft="20dp" launcher:pageLayoutPaddingRight="20dp" /> diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml index 20debcaf4..13b69fee4 100644 --- a/res/layout-xlarge-port/launcher.xml +++ b/res/layout-xlarge-port/launcher.xml @@ -26,7 +26,7 @@ layout="@layout/all_apps_tabbed" android:id="@+id/all_apps_view" android:layout_width="match_parent" - android:layout_height="1040dip" + android:layout_height="1040dp" android:layout_gravity="top"/> <!-- The workspace contains 5 screens of cells --> @@ -38,7 +38,7 @@ launcher:defaultScreen="2" launcher:cellCountX="8" launcher:cellCountY="7" - launcher:pageSpacing="64dip"> + launcher:pageSpacing="64dp"> <include android:id="@+id/cell1" layout="@layout/workspace_screen" /> <include android:id="@+id/cell2" layout="@layout/workspace_screen" /> @@ -86,7 +86,7 @@ android:layout_toLeftOf="@id/configure_button" android:layout_marginLeft="@dimen/toolbar_button_spacing" android:layout_marginRight="@dimen/toolbar_button_spacing" - android:textSize="18dip" + android:textSize="18dp" android:onClick="onClickAllAppsButton" android:focusable="true" @@ -131,20 +131,19 @@ <TabHost android:id="@android:id/tabhost" android:layout_width="match_parent" - android:layout_height="800dip" + android:layout_height="800dp" android:layout_gravity="bottom"> <LinearLayout android:orientation="vertical" - android:background="#40000000" android:layout_width="match_parent" android:layout_height="match_parent"> <TabWidget android:id="@android:id/tabs" - android:layout_width="wrap_content" + android:layout_width="700dp" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:tabStripEnabled="false" - android:paddingBottom="10dp" /> + android:background="@drawable/tab_unselected_holo" + android:tabStripEnabled="false" /> <FrameLayout android:id="@android:id/tabcontent" android:layout_width="match_parent" diff --git a/res/layout-xlarge/all_apps_paged_view_application.xml b/res/layout-xlarge/all_apps_paged_view_application.xml index 48b571235..745822235 100644 --- a/res/layout-xlarge/all_apps_paged_view_application.xml +++ b/res/layout-xlarge/all_apps_paged_view_application.xml @@ -27,5 +27,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center_horizontal" + android:singleLine="false" + android:maxLines="1" style="@style/WorkspaceIcon.Portrait" /> diff --git a/res/layout-xlarge/customize_paged_view_item.xml b/res/layout-xlarge/customize_paged_view_item.xml index e42734506..bbc04d70e 100644 --- a/res/layout-xlarge/customize_paged_view_item.xml +++ b/res/layout-xlarge/customize_paged_view_item.xml @@ -26,15 +26,7 @@ android:id="@+id/customize_icon" android:layout_width="match_parent" android:layout_height="match_parent" - android:gravity="center_horizontal" - android:paddingTop="2dip" + android:singleLine="false" + android:maxLines="1" - android:textColor="#FFFFFFFF" - android:textSize="14sp" - android:shadowColor="#FF000000" - android:shadowDx="0.0" - android:shadowDy="1.0" - android:shadowRadius="1.0" - - android:maxLines="2" - android:fadingEdge="horizontal" /> + style="@style/WorkspaceIcon.Landscape" /> diff --git a/res/layout-xlarge/customize_paged_view_widget.xml b/res/layout-xlarge/customize_paged_view_widget.xml index cfc0ca0d9..fab2a9b87 100644 --- a/res/layout-xlarge/customize_paged_view_widget.xml +++ b/res/layout-xlarge/customize_paged_view_widget.xml @@ -18,7 +18,7 @@ xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" android:layout_width="wrap_content" - android:layout_height="425dp" + android:layout_height="365dp" android:paddingLeft="12.5dp" android:paddingRight="12.5dp" android:paddingBottom="50dp" diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml index aa602be1c..742b59a01 100644 --- a/res/values-xlarge/dimens.xml +++ b/res/values-xlarge/dimens.xml @@ -39,7 +39,7 @@ <!-- Vertical spacing between edge of screen and mini cell layouts when they are minimized to the top when the customization drawer is showing --> - <dimen name="customizeSmallScreenVerticalMarginLandscape">70dip</dimen> + <dimen name="customizeSmallScreenVerticalMarginLandscape">90dip</dimen> <dimen name="customizeSmallScreenVerticalMarginPortrait">180dip</dimen> <dimen name="toolbar_padding">10dip</dimen> diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml index bf79b4d86..83cdbccb5 100644 --- a/res/values-xlarge/styles.xml +++ b/res/values-xlarge/styles.xml @@ -29,11 +29,11 @@ <style name="WorkspaceIcon.Portrait"> <item name="android:drawablePadding">0dip</item> - <item name="android:paddingTop">1dip</item> + <item name="android:paddingTop">0dip</item> </style> <style name="WorkspaceIcon.Landscape"> <item name="android:drawablePadding">0dip</item> - <item name="android:paddingTop">1dip</item> + <item name="android:paddingTop">0dip</item> </style> </resources> |