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-land | |
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-land')
-rw-r--r-- | res/layout-land/application.xml | 20 | ||||
-rw-r--r-- | res/layout-land/folder_icon.xml | 33 | ||||
-rw-r--r-- | res/layout-land/hotseat.xml | 36 | ||||
-rw-r--r-- | res/layout-land/launcher.xml | 25 | ||||
-rw-r--r-- | res/layout-land/search_bar.xml | 2 |
5 files changed, 7 insertions, 109 deletions
diff --git a/res/layout-land/application.xml b/res/layout-land/application.xml deleted file mode 100644 index d20e1be1e..000000000 --- a/res/layout-land/application.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/WorkspaceIcon.Landscape" - android:focusable="true" - android:background="@drawable/focusable_view_bg" /> diff --git a/res/layout-land/folder_icon.xml b/res/layout-land/folder_icon.xml deleted file mode 100644 index 32d729802..000000000 --- a/res/layout-land/folder_icon.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2008 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.FolderIcon - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:focusable="true" - android:background="@drawable/focusable_view_bg"> - <ImageView - android:id="@+id/preview_background" - android:layout_gravity="center_horizontal" - android:layout_width="@dimen/folder_preview_size" - android:layout_height="@dimen/folder_preview_size" - android:src="@drawable/portal_ring_inner_holo"/> - <com.android.launcher3.BubbleTextView - android:id="@+id/folder_icon_name" - style="@style/WorkspaceIcon.Landscape.Folder"/> -</com.android.launcher3.FolderIcon> diff --git a/res/layout-land/hotseat.xml b/res/layout-land/hotseat.xml deleted file mode 100644 index f2d2b00e7..000000000 --- a/res/layout-land/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="1" - launcher:cellCountY="@integer/hotseat_cell_count"> - <com.android.launcher3.CellLayout - android:id="@+id/layout" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:paddingTop="@dimen/button_bar_width_left_padding" - android:paddingBottom="@dimen/button_bar_width_right_padding" - android:paddingStart="@dimen/button_bar_height_top_padding" - android:paddingEnd="@dimen/button_bar_height_bottom_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/workspace_max_gap" /> -</com.android.launcher3.Hotseat> diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 3454ad49f..faf410be5 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -36,28 +36,13 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="center" - 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="@integer/config_workspaceDefaultScreen" - launcher:cellCountX="@integer/cell_count_x" - launcher:cellCountY="@integer/cell_count_y" launcher:pageSpacing="@dimen/workspace_page_spacing" - launcher:scrollIndicatorPaddingLeft="@dimen/qsb_bar_height" - launcher:scrollIndicatorPaddingRight="@dimen/button_bar_height" /> - - <include - android:id="@+id/qsb_divider" - layout="@layout/workspace_divider" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_marginStart="@dimen/qsb_bar_height" - android:layout_gravity="start" /> + launcher:pageIndicator="@id/page_indicator" /> <include layout="@layout/hotseat" android:id="@+id/hotseat" - android:layout_width="@dimen/button_bar_height_plus_padding" + android:layout_width="match_parent" android:layout_height="match_parent" android:layout_gravity="end" /> @@ -84,16 +69,18 @@ android:layout_height="match_parent" android:visibility="gone" /> + <!-- TODO: Fix <com.android.launcher3.DrawableStateProxyView android:id="@+id/voice_button_proxy" - android:layout_width="@dimen/qsb_bar_height" - android:layout_height="@dimen/app_icon_size" + android:layout_width="0dp" + android:layout_height="0dp" android:layout_gravity="top|start" android:layout_marginTop="64dp" 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-land/search_bar.xml b/res/layout-land/search_bar.xml index ab36361fe..d56e380d0 100644 --- a/res/layout-land/search_bar.xml +++ b/res/layout-land/search_bar.xml @@ -15,7 +15,7 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="@dimen/qsb_bar_height" + android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> <!-- Global search icon --> |