diff options
author | Michael Jurka <mikejurka@google.com> | 2011-02-18 19:22:12 -0800 |
---|---|---|
committer | Michael Jurka <mikejurka@google.com> | 2011-02-23 19:48:35 -0800 |
commit | 3c38d561e6976ffc54eda61ed669870bbb8ec207 (patch) | |
tree | 147bf68962aa77cb3b7de3caa984b7e821bd6cba /res | |
parent | b8f9746f32be06ba0940afc035ecf3b77bec008c (diff) | |
download | android_packages_apps_Trebuchet-3c38d561e6976ffc54eda61ed669870bbb8ec207.tar.gz android_packages_apps_Trebuchet-3c38d561e6976ffc54eda61ed669870bbb8ec207.tar.bz2 android_packages_apps_Trebuchet-3c38d561e6976ffc54eda61ed669870bbb8ec207.zip |
Refactoring layout of launcher
- Only one layout of launcher for landspace/portrait now
- Programmatically vertically centering the shrunken workspace screens rather than using a custom value
Change-Id: Ib689b4031f122b9a1b2bc1ca711b91320619bebd
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-xlarge-port/launcher.xml | 212 | ||||
-rw-r--r-- | res/layout-xlarge/launcher.xml (renamed from res/layout-xlarge-land/launcher.xml) | 12 | ||||
-rw-r--r-- | res/values-xlarge-land/dimens.xml | 5 | ||||
-rw-r--r-- | res/values-xlarge-port/dimens.xml | 5 | ||||
-rw-r--r-- | res/values-xlarge/dimens.xml | 5 |
5 files changed, 16 insertions, 223 deletions
diff --git a/res/layout-xlarge-port/launcher.xml b/res/layout-xlarge-port/launcher.xml deleted file mode 100644 index 4c83fdabf..000000000 --- a/res/layout-xlarge-port/launcher.xml +++ /dev/null @@ -1,212 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<com.android.launcher2.DragLayer - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - - android:id="@+id/drag_layer" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <!-- 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="64dp"> - - <include android:id="@+id/cell1" layout="@layout/workspace_screen" /> - <include android:id="@+id/cell2" layout="@layout/workspace_screen" /> - <include android:id="@+id/cell3" layout="@layout/workspace_screen" /> - <include android:id="@+id/cell4" layout="@layout/workspace_screen" /> - <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" - android:layout_height="?android:attr/actionBarSize" - android:layout_gravity="top"> - - <!-- Global search icon --> - <ImageView - android:id="@+id/search_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:paddingLeft="@dimen/toolbar_button_horizontal_padding" - android:paddingRight="@dimen/toolbar_button_horizontal_padding" - android:paddingTop="@dimen/toolbar_button_vertical_padding" - android:paddingBottom="@dimen/toolbar_button_vertical_padding" - android:src="@drawable/ic_generic_search" - android:background="@drawable/button_bg" - android:onClick="onClickSearchButton" - android:focusable="true" - android:clickable="true" /> - - <ImageView - android:id="@+id/search_divider" - android:src="@drawable/divider_launcher_holo" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_toRightOf="@id/search_button" - android:paddingTop="@dimen/toolbar_button_vertical_padding" - android:paddingBottom="@dimen/toolbar_button_vertical_padding" - - android:onClick="onClickSearchButton" - android:focusable="false" - android:clickable="true" /> - - <!-- Voice search icon --> - <ImageView - android:id="@+id/voice_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@id/search_divider" - android:paddingLeft="@dimen/toolbar_button_horizontal_padding" - android:paddingRight="@dimen/toolbar_button_horizontal_padding" - android:paddingTop="@dimen/toolbar_button_vertical_padding" - android:paddingBottom="@dimen/toolbar_button_vertical_padding" - android:src="@drawable/ic_voice_search" - android:background="@drawable/button_bg" - android:onClick="onClickVoiceButton" - android:focusable="true" - android:clickable="true"/> - - <ImageView - android:id="@+id/configure_button" - android:src="@drawable/ic_home_add_holo_dark" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:paddingLeft="@dimen/toolbar_button_horizontal_padding" - android:paddingRight="@dimen/toolbar_button_horizontal_padding" - android:paddingTop="@dimen/toolbar_button_vertical_padding" - android:paddingBottom="@dimen/toolbar_button_vertical_padding" - android:background="@drawable/button_bg" - - android:focusable="true" - android:clickable="true" /> - <ImageView - android:id="@+id/divider" - android:src="@drawable/divider_launcher_holo" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/configure_button" - android:paddingTop="@dimen/toolbar_button_vertical_padding" - android:paddingBottom="@dimen/toolbar_button_vertical_padding" - - android:focusable="false" - android:clickable="true" /> - <TextView - android:id="@+id/all_apps_button" - android:text="@string/all_apps_button_label" - android:drawablePadding="@dimen/all_apps_button_drawable_padding" - android:drawableLeft="@drawable/ic_home_all_apps_holo_dark" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/divider" - android:paddingLeft="@dimen/toolbar_button_horizontal_padding" - android:paddingRight="@dimen/toolbar_button_horizontal_padding" - android:paddingTop="@dimen/all_apps_button_vertical_padding" - android:paddingBottom="@dimen/all_apps_button_vertical_padding" - android:background="@drawable/button_bg" - - android:gravity="center_horizontal|center_vertical" - android:textColor="#CCFFFFFF" - android:textSize="18sp" - - android:shadowColor="#DA000000" - android:shadowDx="0.0" - android:shadowDy="0.0" - android:shadowRadius="2.5" - - android:focusable="true" - android:clickable="true" /> - <ImageView - android:id="@+id/divider_during_drag" - android:src="@drawable/divider_launcher_holo" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_toLeftOf="@id/configure_button" - android:paddingTop="@dimen/toolbar_button_vertical_padding" - android:paddingBottom="@dimen/toolbar_button_vertical_padding" - android:visibility="gone"/> - <com.android.launcher2.DeleteZone - android:id="@+id/delete_zone" - android:text="@string/delete_zone_label_workspace" - android:drawablePadding="@dimen/delete_zone_drawable_padding" - android:drawableLeft="@drawable/delete_zone_selector" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignRight="@id/configure_button" - android:paddingLeft="@dimen/toolbar_button_horizontal_padding" - android:paddingRight="@dimen/toolbar_button_horizontal_padding" - android:paddingTop="@dimen/toolbar_button_vertical_padding" - android:paddingBottom="@dimen/toolbar_button_vertical_padding" - android:background="@drawable/button_bg" - - android:gravity="center_horizontal|center_vertical" - android:textColor="@color/workspace_all_apps_and_delete_zone_text_color" - android:textSize="18sp" - android:shadowColor="@color/workspace_all_apps_and_delete_zone_text_shadow_color" - android:shadowDx="0.0" - android:shadowDy="0.0" - android:shadowRadius="2.0" - - android:visibility="gone" - launcher:direction="horizontal" /> - </RelativeLayout> - - <TabHost - android:id="@+id/customization_drawer" - android:layout_width="match_parent" - android:layout_height="800dp" - android:layout_gravity="bottom"> - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <TabWidget - android:id="@android:id/tabs" - 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" - android:layout_width="match_parent" - android:layout_height="650dp"> - </FrameLayout> - </LinearLayout> - </TabHost> -</com.android.launcher2.DragLayer> diff --git a/res/layout-xlarge-land/launcher.xml b/res/layout-xlarge/launcher.xml index 590787fc7..7f2b8e169 100644 --- a/res/layout-xlarge-land/launcher.xml +++ b/res/layout-xlarge/launcher.xml @@ -32,7 +32,7 @@ launcher:defaultScreen="2" launcher:cellCountX="8" launcher:cellCountY="7" - launcher:pageSpacing="50dp"> + launcher:pageSpacing="@dimen/workspace_page_spacing"> <include android:id="@+id/cell1" layout="@layout/workspace_screen" /> <include android:id="@+id/cell2" layout="@layout/workspace_screen" /> @@ -70,7 +70,7 @@ android:onClick="onClickSearchButton" android:focusable="true" android:clickable="true" /> - + <ImageView android:id="@+id/search_divider" android:src="@drawable/divider_launcher_holo" @@ -139,7 +139,7 @@ android:paddingTop="@dimen/all_apps_button_vertical_padding" android:paddingBottom="@dimen/all_apps_button_vertical_padding" android:background="@drawable/button_bg" - + android:gravity="center_horizontal|center_vertical" android:textColor="#CCFFFFFF" android:textSize="18sp" @@ -159,7 +159,7 @@ android:layout_toLeftOf="@id/configure_button" android:paddingTop="@dimen/toolbar_button_vertical_padding" android:paddingBottom="@dimen/toolbar_button_vertical_padding" - android:visibility="gone"/> + android:visibility="gone" /> <com.android.launcher2.DeleteZone android:id="@+id/delete_zone" android:text="@string/delete_zone_label_workspace" @@ -189,7 +189,7 @@ <TabHost android:id="@+id/customization_drawer" android:layout_width="match_parent" - android:layout_height="480dp" + android:layout_height="@dimen/customization_drawer_height" android:layout_gravity="bottom"> <LinearLayout android:orientation="vertical" @@ -197,7 +197,7 @@ android:layout_height="match_parent"> <TabWidget android:id="@android:id/tabs" - android:layout_width="952dp" + android:layout_width="@dimen/customization_drawer_tab_widget_width" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:background="@drawable/tab_unselected_holo" diff --git a/res/values-xlarge-land/dimens.xml b/res/values-xlarge-land/dimens.xml index 51037f5b0..ccea6eb71 100644 --- a/res/values-xlarge-land/dimens.xml +++ b/res/values-xlarge-land/dimens.xml @@ -22,4 +22,9 @@ <!-- Width/height gap overrides for the workspace --> <dimen name="workspace_width_gap">32dp</dimen> <dimen name="workspace_height_gap">2dp</dimen> + + <dimen name="workspace_page_spacing">50dp</dimen> + + <dimen name="customization_drawer_height">480dp</dimen> + <dimen name="customization_drawer_tab_widget_width">952dp</dimen> </resources>
\ No newline at end of file diff --git a/res/values-xlarge-port/dimens.xml b/res/values-xlarge-port/dimens.xml index baa31aace..eca8f4472 100644 --- a/res/values-xlarge-port/dimens.xml +++ b/res/values-xlarge-port/dimens.xml @@ -22,4 +22,9 @@ <!-- Width/height gap overrides for the workspace --> <dimen name="workspace_width_gap">0dp</dimen> <dimen name="workspace_height_gap">32dp</dimen> + + <dimen name="workspace_page_spacing">64dp</dimen> + + <dimen name="customization_drawer_height">800dp</dimen> + <dimen name="customization_drawer_tab_widget_width">700dp</dimen> </resources>
\ No newline at end of file diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml index c4988e42e..421c9e389 100644 --- a/res/values-xlarge/dimens.xml +++ b/res/values-xlarge/dimens.xml @@ -37,11 +37,6 @@ <dimen name="allAppsSmallScreenVerticalMarginLandscape">30dip</dimen> <dimen name="allAppsSmallScreenVerticalMarginPortrait">60dip</dimen> - <!-- 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">90dip</dimen> - <dimen name="customizeSmallScreenVerticalMarginPortrait">180dip</dimen> - <dimen name="delete_zone_drawable_padding">8dip</dimen> <dimen name="all_apps_button_drawable_padding">0dip</dimen> <dimen name="all_apps_button_vertical_padding">4dip</dimen> |