diff options
Diffstat (limited to 'res/layout-sw720dp')
| -rw-r--r-- | res/layout-sw720dp/hotseat.xml | 36 | ||||
| -rw-r--r-- | res/layout-sw720dp/launcher.xml | 67 | ||||
| -rw-r--r-- | res/layout-sw720dp/search_bar.xml | 79 |
3 files changed, 133 insertions, 49 deletions
diff --git a/res/layout-sw720dp/hotseat.xml b/res/layout-sw720dp/hotseat.xml new file mode 100644 index 000000000..bcd5b9d82 --- /dev/null +++ b/res/layout-sw720dp/hotseat.xml @@ -0,0 +1,36 @@ +<?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.launcher2.Hotseat + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + launcher:cellCountX="@integer/hotseat_cell_count" + launcher:cellCountY="1"> + <com.android.launcher2.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:paddingLeft="@dimen/button_bar_width_left_padding" + android:paddingRight="@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.launcher2.Hotseat> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index 65149f29a..9ddb1355c 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2010 The Android Open Source Project +<!-- Copyright (C) 2007 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. @@ -16,22 +16,73 @@ <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:background="@drawable/workspace_bg" android:layout_width="match_parent" - android:layout_height="match_parent" - android:focusable="false"> + android:layout_height="match_parent"> - <include layout="@layout/workspace" + <!-- Keep these behind the workspace so that they are not visible when + we go into AllApps --> + <include + android:id="@+id/dock_divider" + layout="@layout/workspace_divider" + android:layout_width="@dimen/workspace_divider_width" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/button_bar_height" + android:layout_gravity="bottom|center_horizontal" /> + <include + android:id="@+id/paged_view_indicator" + layout="@layout/scroll_indicator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_marginBottom="@dimen/button_bar_height" /> + + <!-- 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:layout_height="match_parent" + android:paddingLeft="@dimen/workspace_left_padding" + android:paddingRight="@dimen/workspace_right_padding" + android:paddingTop="@dimen/workspace_top_padding" + android:paddingBottom="@dimen/workspace_bottom_padding" + launcher:defaultScreen="2" + launcher:cellCountX="@integer/cell_count_x" + launcher:cellCountY="@integer/cell_count_y" + launcher:pageSpacing="@dimen/workspace_page_spacing" + launcher:scrollIndicatorPaddingLeft="@dimen/workspace_divider_padding_left" + launcher:scrollIndicatorPaddingRight="@dimen/workspace_divider_padding_right"> - <include layout="@layout/qsb_bar" - android:id="@+id/qsb_bar" + <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/hotseat" + android:id="@+id/hotseat" android:layout_width="match_parent" + android:layout_height="@dimen/button_bar_height_plus_padding" + android:layout_gravity="bottom" /> + + <include + android:id="@+id/qsb_bar" + layout="@layout/qsb_bar" /> + + <com.android.launcher2.DrawableStateProxyView + android:id="@+id/voice_button_proxy" + android:layout_width="80dp" android:layout_height="@dimen/qsb_bar_height" - android:layout_gravity="top" /> + android:layout_marginRight="@dimen/qsb_voice_proxy_padding_right" + android:layout_gravity="top|right" + android:clickable="true" + android:onClick="onClickVoiceButton" + android:importantForAccessibility="no" + launcher:sourceViewId="@+id/voice_button" /> <include layout="@layout/apps_customize_pane" android:id="@+id/apps_customize_pane" diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/search_bar.xml index 55ec959de..8f58fe61f 100644 --- a/res/layout-sw720dp/search_bar.xml +++ b/res/layout-sw720dp/search_bar.xml @@ -15,60 +15,57 @@ --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" style="@style/SearchDropTargetBar" android:layout_width="match_parent" - android:layout_height="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.launcher2.HolographicImageView + <com.android.launcher2.HolographicLinearLayout style="@style/SearchButton" - android:id="@+id/search_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + launcher:sourceImageViewId="@+id/search_button" + android:id="@+id/search_button_container" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_vertical" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:src="@drawable/ic_home_search_normal_holo" + android:layout_toLeftOf="@+id/voice_button_container" + android:paddingLeft="8dp" android:onClick="onClickSearchButton" android:focusable="true" android:clickable="true" - android:contentDescription="@string/accessibility_search_button" /> - - <ImageView - style="@style/SearchButtonDivider" - android:id="@+id/search_divider" - android:layout_toRightOf="@+id/search_button" - android:src="@drawable/divider_launcher_holo" - android:onClick="onClickSearchButton" - android:focusable="false" - android:clickable="true" /> + android:contentDescription="@string/accessibility_search_button"> + <ImageView + android:id="@+id/search_button" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:src="@drawable/ic_home_search_normal_holo" + android:adjustViewBounds="true" /> + </com.android.launcher2.HolographicLinearLayout> <!-- Voice search icon --> - <com.android.launcher2.HolographicImageView - style="@style/SearchButton.Voice" - android:id="@+id/voice_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_toRightOf="@+id/search_divider" - android:src="@drawable/ic_home_voice_search_holo" - android:onClick="onClickVoiceButton" - android:focusable="true" - android:clickable="true" - android:contentDescription="@string/accessibility_voice_search_button" /> - - <!-- AppsCustomize icon --> - <com.android.launcher2.HolographicImageView - android:id="@+id/all_apps_button" - android:onClick="onClickAllAppsButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + <com.android.launcher2.HolographicLinearLayout + style="@style/SearchButton" + launcher:sourceImageViewId="@+id/voice_button" + android:id="@+id/voice_button_container" + android:layout_width="@dimen/search_bar_height" + android:layout_height="match_parent" + android:layout_gravity="center_vertical" android:layout_alignParentRight="true" android:layout_alignParentTop="true" - 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:src="@drawable/ic_home_all_apps_holo_dark" - + android:paddingRight="8dp" + android:gravity="right" + android:onClick="onClickVoiceButton" android:focusable="true" android:clickable="true" - android:contentDescription="@string/accessibility_all_apps_button" /> + android:contentDescription="@string/accessibility_voice_search_button"> + <ImageView + android:id="@+id/voice_button" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:src="@drawable/ic_home_voice_search_holo" + android:adjustViewBounds="true" /> + </com.android.launcher2.HolographicLinearLayout> </RelativeLayout> |