diff options
author | Adam Lesinski <adamlesinski@google.com> | 2010-11-04 16:15:23 -0700 |
---|---|---|
committer | Adam Lesinski <adamlesinski@google.com> | 2010-11-17 10:57:43 -0800 |
commit | 6b879f0a5885274a85333531e091283405d490cc (patch) | |
tree | eca43695425abca4fb465919aef7c4b295abc25d /res | |
parent | 61033d3d86fcae1f654f3fbfc9979d131e265d76 (diff) | |
download | android_packages_apps_Trebuchet-6b879f0a5885274a85333531e091283405d490cc.tar.gz android_packages_apps_Trebuchet-6b879f0a5885274a85333531e091283405d490cc.tar.bz2 android_packages_apps_Trebuchet-6b879f0a5885274a85333531e091283405d490cc.zip |
Layout tweaks in Launcher
-Removed All apps and Configure toolbar buttons
from Customization Drawer, removed Configure
button from All apps and added Market icon
to All apps
-Changed spacing of CellLayouts when scrolling
-Modified gap spacing in workspace layout
-Made workspace invisible in All apps but touching
the place where the workspace was takes you back
to workspace
Change-Id: I6e2579bfebeb8f1f80fdae07da442f6d399abe33
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-xlarge-mdpi/app_market_generic.png | bin | 2750 -> 957 bytes | |||
-rw-r--r-- | res/layout-xlarge-land/all_apps_tabbed.xml | 21 | ||||
-rw-r--r-- | res/layout-xlarge-land/launcher.xml | 32 | ||||
-rw-r--r-- | res/layout-xlarge-land/workspace_screen.xml | 8 | ||||
-rw-r--r-- | res/layout-xlarge-port/all_apps_tabbed.xml | 21 | ||||
-rw-r--r-- | res/layout-xlarge-port/launcher.xml | 17 | ||||
-rw-r--r-- | res/values-xlarge-land/dimens.xml | 6 | ||||
-rw-r--r-- | res/values-xlarge/dimens.xml | 5 | ||||
-rw-r--r-- | res/values-xlarge/styles.xml | 1 |
9 files changed, 64 insertions, 47 deletions
diff --git a/res/drawable-xlarge-mdpi/app_market_generic.png b/res/drawable-xlarge-mdpi/app_market_generic.png Binary files differindex 0ceaeefde..c093e2425 100644 --- a/res/drawable-xlarge-mdpi/app_market_generic.png +++ b/res/drawable-xlarge-mdpi/app_market_generic.png diff --git a/res/layout-xlarge-land/all_apps_tabbed.xml b/res/layout-xlarge-land/all_apps_tabbed.xml index 89a310477..8a0e8b843 100644 --- a/res/layout-xlarge-land/all_apps_tabbed.xml +++ b/res/layout-xlarge-land/all_apps_tabbed.xml @@ -20,13 +20,24 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - <TabWidget - android:id="@android:id/tabs" + <RelativeLayout android:layout_width="952dp" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:background="@drawable/tab_unselected_holo" - android:tabStripEnabled="false" /> + android:background="@drawable/tab_unselected_holo"> + <TabWidget + android:id="@android:id/tabs" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:tabStripEnabled="false" /> + <ImageView + android:id="@+id/market_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:onClick="onClickAppMarketButton" /> + </RelativeLayout> <FrameLayout android:id="@android:id/tabcontent" android:layout_width="match_parent" @@ -34,7 +45,7 @@ <com.android.launcher2.AllAppsPagedView android:id="@+id/all_apps_paged_view" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" launcher:cellCountX="7" launcher:cellCountY="5" launcher:pageLayoutWidthGap="36dp" diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge-land/launcher.xml index e5ba3934c..8e6f1fe4b 100644 --- a/res/layout-xlarge-land/launcher.xml +++ b/res/layout-xlarge-land/launcher.xml @@ -22,23 +22,17 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include - layout="@layout/all_apps_tabbed" - android:id="@+id/all_apps_view" - android:layout_width="match_parent" - android:layout_height="600dp" - android:layout_gravity="top"/> - <!-- The workspace contains 5 screens of cells --> <com.android.launcher2.Workspace android:id="@+id/workspace" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingTop="?android:attr/actionBarSize" + android:paddingBottom="10dp" launcher:defaultScreen="2" launcher:cellCountX="8" launcher:cellCountY="7" - launcher:pageSpacing="32dp"> + launcher:pageSpacing="50dp"> <include android:id="@+id/cell1" layout="@layout/workspace_screen" /> <include android:id="@+id/cell2" layout="@layout/workspace_screen" /> @@ -47,6 +41,13 @@ <include android:id="@+id/cell5" layout="@layout/workspace_screen" /> </com.android.launcher2.Workspace> + <include + layout="@layout/all_apps_tabbed" + android:id="@+id/all_apps_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="top" /> + <RelativeLayout android:id="@+id/all_apps_button_cluster" android:layout_width="fill_parent" @@ -92,25 +93,12 @@ android:focusable="true" android:clickable="true" /> - <!-- The button to bring up the installed app market. - The icon for this button will be dynamically set. --> - <ImageView - android:id="@+id/market_button" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_alignLeft="@id/all_apps_button" - - android:onClick="onClickAppMarketButton" - android:focusable="false" - android:clickable="false" - android:visibility="gone"/> - <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" android:src="@drawable/delete_zone_selector" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_alignLeft="@id/all_apps_button" + android:layout_alignRight="@id/all_apps_button" android:visibility="gone" launcher:direction="horizontal" /> diff --git a/res/layout-xlarge-land/workspace_screen.xml b/res/layout-xlarge-land/workspace_screen.xml index 64de05e82..e983b7920 100644 --- a/res/layout-xlarge-land/workspace_screen.xml +++ b/res/layout-xlarge-land/workspace_screen.xml @@ -26,7 +26,7 @@ launcher:cellHeight="@dimen/workspace_cell_height" launcher:widthGap="@dimen/workspace_width_gap" launcher:heightGap="@dimen/workspace_height_gap" - launcher:yAxisStartPadding="25dip" - launcher:yAxisEndPadding="25dip" - launcher:xAxisStartPadding="40dip" - launcher:xAxisEndPadding="40dip" /> + launcher:yAxisStartPadding="15dip" + launcher:yAxisEndPadding="15dip" + launcher:xAxisStartPadding="25dip" + launcher:xAxisEndPadding="25dip" /> diff --git a/res/layout-xlarge-port/all_apps_tabbed.xml b/res/layout-xlarge-port/all_apps_tabbed.xml index 65e3729fd..038a9a039 100644 --- a/res/layout-xlarge-port/all_apps_tabbed.xml +++ b/res/layout-xlarge-port/all_apps_tabbed.xml @@ -20,13 +20,24 @@ android:orientation="vertical" android:layout_width="match_parent" android:layout_height="match_parent"> - <TabWidget - android:id="@android:id/tabs" + <RelativeLayout android:layout_width="700dp" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:background="@drawable/tab_unselected_holo" - android:tabStripEnabled="false" /> + android:background="@drawable/tab_unselected_holo"> + <TabWidget + android:id="@android:id/tabs" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:tabStripEnabled="false" /> + <ImageView + android:id="@+id/market_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:onClick="onClickAppMarketButton" /> + </RelativeLayout> <FrameLayout android:id="@android:id/tabcontent" android:layout_width="match_parent" @@ -34,7 +45,7 @@ <com.android.launcher2.AllAppsPagedView android:id="@+id/all_apps_paged_view" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" launcher:cellCountX="5" launcher:cellCountY="7" launcher:pageLayoutWidthGap="36dp" diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml index 13b69fee4..a6fff4a58 100644 --- a/res/layout-xlarge-port/launcher.xml +++ b/res/layout-xlarge-port/launcher.xml @@ -22,19 +22,13 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <include - layout="@layout/all_apps_tabbed" - android:id="@+id/all_apps_view" - android:layout_width="match_parent" - android:layout_height="1040dp" - android:layout_gravity="top"/> - <!-- The workspace contains 5 screens of cells --> <com.android.launcher2.Workspace android:id="@+id/workspace" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingTop="?android:attr/actionBarSize" + android:paddingBottom="10dp" launcher:defaultScreen="2" launcher:cellCountX="8" launcher:cellCountY="7" @@ -47,6 +41,13 @@ <include android:id="@+id/cell5" layout="@layout/workspace_screen" /> </com.android.launcher2.Workspace> + <include + layout="@layout/all_apps_tabbed" + android:id="@+id/all_apps_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="top"/> + <RelativeLayout android:id="@+id/all_apps_button_cluster" android:layout_width="fill_parent" @@ -110,7 +111,7 @@ android:src="@drawable/delete_zone_selector" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_alignLeft="@id/all_apps_button" + android:layout_alignRight="@id/all_apps_button" android:visibility="gone" launcher:direction="horizontal" /> diff --git a/res/values-xlarge-land/dimens.xml b/res/values-xlarge-land/dimens.xml index db31cf1cf..51037f5b0 100644 --- a/res/values-xlarge-land/dimens.xml +++ b/res/values-xlarge-land/dimens.xml @@ -17,9 +17,9 @@ <resources> <!-- the area at the edge of the screen that makes the workspace go left or right while you're dragging. --> - <dimen name="scroll_zone">160dip</dimen> + <dimen name="scroll_zone">100dip</dimen> <!-- Width/height gap overrides for the workspace --> - <dimen name="workspace_width_gap">16dp</dimen> - <dimen name="workspace_height_gap">5dp</dimen> + <dimen name="workspace_width_gap">32dp</dimen> + <dimen name="workspace_height_gap">2dp</dimen> </resources>
\ No newline at end of file diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml index 667f0e310..d98674f6c 100644 --- a/res/values-xlarge/dimens.xml +++ b/res/values-xlarge/dimens.xml @@ -45,4 +45,9 @@ <dimen name="toolbar_padding">10dip</dimen> <dimen name="toolbar_button_spacing">20dip</dimen> + + <!-- height & width of the drop rectangle for the trash icon --> + <dimen name="delete_zone_size">50dip</dimen> + <dimen name="delete_zone_min_padding">10dip</dimen> + <dimen name="delete_zone_max_padding">20dip</dimen> </resources> diff --git a/res/values-xlarge/styles.xml b/res/values-xlarge/styles.xml index 83cdbccb5..fcbd9695d 100644 --- a/res/values-xlarge/styles.xml +++ b/res/values-xlarge/styles.xml @@ -35,5 +35,6 @@ <style name="WorkspaceIcon.Landscape"> <item name="android:drawablePadding">0dip</item> <item name="android:paddingTop">0dip</item> + <item name="android:includeFontPadding">false</item> </style> </resources> |