diff options
author | Winson Chung <winsonc@google.com> | 2013-08-12 16:19:28 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2013-08-20 10:56:05 -0700 |
commit | 5f8afe6280eae34620067696173e71943e1a30a3 (patch) | |
tree | eb0ebdf56f2ad0950894424a49de9d1e8dc832e0 /res/layout-sw720dp | |
parent | 8a6870101c3d99257fc050d11bb69f50f5240622 (diff) | |
download | android_packages_apps_Trebuchet-5f8afe6280eae34620067696173e71943e1a30a3.tar.gz android_packages_apps_Trebuchet-5f8afe6280eae34620067696173e71943e1a30a3.tar.bz2 android_packages_apps_Trebuchet-5f8afe6280eae34620067696173e71943e1a30a3.zip |
Initial Changes for Dynamic Grid
Change-Id: I9e6f1e5167791cf8dc140778dfa447f86424e9bf
Diffstat (limited to 'res/layout-sw720dp')
-rw-r--r-- | res/layout-sw720dp/hotseat.xml | 36 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 22 | ||||
-rw-r--r-- | res/layout-sw720dp/search_bar.xml | 16 | ||||
-rw-r--r-- | res/layout-sw720dp/workspace.xml | 33 |
4 files changed, 13 insertions, 94 deletions
diff --git a/res/layout-sw720dp/hotseat.xml b/res/layout-sw720dp/hotseat.xml deleted file mode 100644 index f69f68d95..000000000 --- a/res/layout-sw720dp/hotseat.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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.launcher3.Hotseat - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:cellCountX="@integer/hotseat_cell_count" - launcher:cellCountY="1"> - <com.android.launcher3.CellLayout - android:id="@+id/layout" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_gravity="center" - android:paddingTop="@dimen/button_bar_height_top_padding" - android:paddingBottom="@dimen/button_bar_height_bottom_padding" - android:paddingStart="@dimen/button_bar_width_left_padding" - android:paddingEnd="@dimen/button_bar_width_right_padding" - - launcher:cellWidth="@dimen/hotseat_cell_width" - launcher:cellHeight="@dimen/hotseat_cell_height" - launcher:widthGap="@dimen/hotseat_width_gap" - launcher:heightGap="@dimen/hotseat_height_gap" - launcher:maxGap="@dimen/hotseat_width_gap" /> -</com.android.launcher3.Hotseat> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 82f01788a..fee0198ed 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -35,25 +35,15 @@ android:id="@+id/workspace" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingStart="@dimen/workspace_left_padding" - android:paddingEnd="@dimen/workspace_right_padding" - android:paddingTop="@dimen/workspace_top_padding" - android:paddingBottom="@dimen/workspace_bottom_padding" - android:layout_gravity="center" launcher:defaultScreen="@integer/config_workspaceDefaultScreen" - launcher:cellCountX="@integer/cell_count_x" - launcher:cellCountY="@integer/cell_count_y" launcher:pageSpacing="@dimen/workspace_page_spacing" - launcher:pageIndicator="@id/page_indicator" - launcher:scrollIndicatorPaddingLeft="@dimen/workspace_divider_padding_left" - launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right"> + launcher:pageIndicator="@id/page_indicator"> </com.android.launcher3.Workspace> <include layout="@layout/hotseat" android:id="@+id/hotseat" android:layout_width="match_parent" - android:layout_height="@dimen/button_bar_height_plus_padding" - android:layout_gravity="bottom" /> + android:layout_height="match_parent" /> <include android:id="@+id/qsb_bar" @@ -70,8 +60,7 @@ layout="@layout/page_indicator" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="bottom|center_horizontal" - android:layout_marginBottom="@dimen/button_bar_height_plus_padding" /> + android:layout_gravity="center_horizontal" /> <!-- The Workspace cling must appear under the AppsCustomizePagedView below to ensure that it is still visible during the transition to AllApps and doesn't overlay on @@ -90,9 +79,8 @@ <com.android.launcher3.DrawableStateProxyView android:id="@+id/voice_button_proxy" - android:layout_width="80dp" - android:layout_height="@dimen/qsb_bar_height" - android:layout_marginEnd="@dimen/qsb_voice_proxy_padding_right" + android:layout_width="0dp" + android:layout_height="0dp" android:layout_gravity="top|end" android:clickable="true" android:onClick="onClickVoiceButton" diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/search_bar.xml index 44c969bef..69dd61aa2 100644 --- a/res/layout-sw720dp/search_bar.xml +++ b/res/layout-sw720dp/search_bar.xml @@ -17,9 +17,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" style="@style/SearchDropTargetBar" - android:layout_width="match_parent" - android:layout_height="@dimen/search_bar_height" - android:layout_gravity="bottom|center_horizontal" android:background="@drawable/search_frame"> <!-- Global search icon --> <com.android.launcher3.HolographicLinearLayout @@ -29,8 +26,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center_vertical" + android:layout_centerVertical="true" android:layout_alignParentStart="true" - android:layout_alignParentTop="true" android:layout_toStartOf="@+id/voice_button_container" android:paddingStart="8dp" android:onClick="onClickSearchButton" @@ -41,6 +38,8 @@ android:id="@+id/search_button" android:layout_width="wrap_content" android:layout_height="match_parent" + android:layout_gravity="start" + android:scaleType="fitCenter" android:src="@drawable/ic_home_search_normal_holo" android:adjustViewBounds="true" /> </com.android.launcher3.HolographicLinearLayout> @@ -50,21 +49,22 @@ style="@style/SearchButton" launcher:sourceImageViewId="@+id/voice_button" android:id="@+id/voice_button_container" - android:layout_width="@dimen/search_bar_height" + android:layout_width="@dimen/app_icon_size" android:layout_height="match_parent" android:layout_gravity="center_vertical" + android:layout_centerVertical="true" android:layout_alignParentEnd="true" - android:layout_alignParentTop="true" android:paddingEnd="8dp" - android:gravity="end" android:onClick="onClickVoiceButton" android:focusable="true" android:clickable="true" android:contentDescription="@string/accessibility_voice_search_button"> <ImageView android:id="@+id/voice_button" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_gravity="end" + android:scaleType="fitCenter" android:src="@drawable/ic_home_voice_search_holo" android:adjustViewBounds="true" /> </com.android.launcher3.HolographicLinearLayout> diff --git a/res/layout-sw720dp/workspace.xml b/res/layout-sw720dp/workspace.xml deleted file mode 100644 index 00ed529e0..000000000 --- a/res/layout-sw720dp/workspace.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<!-- The workspace contains 5 screens of cells --> - -<com.android.launcher3.Workspace - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - android:paddingStart="@dimen/workspace_left_padding" - android:paddingEnd="@dimen/workspace_right_padding" - android:paddingTop="@dimen/workspace_top_padding" - android:paddingBottom="@dimen/workspace_bottom_padding" - launcher:defaultScreen="2" - launcher:pageSpacing="@dimen/workspace_page_spacing"> - <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.launcher3.Workspace> |