diff options
author | Andrew Flynn <flynn@google.com> | 2012-02-29 13:33:22 -0800 |
---|---|---|
committer | Andrew Flynn <flynn@google.com> | 2012-02-29 17:30:37 -0800 |
commit | 0dca1ec41479a74f8da080224fa0c7eacab674d6 (patch) | |
tree | bad4a2d319a11c4da938122bd994485a59d0dc2a /res/layout-sw720dp | |
parent | 79b79dd57911b9f79d4fb872e70d37ee90b0cc64 (diff) | |
download | packages_apps_trebuchet-0dca1ec41479a74f8da080224fa0c7eacab674d6.zip packages_apps_trebuchet-0dca1ec41479a74f8da080224fa0c7eacab674d6.tar.gz packages_apps_trebuchet-0dca1ec41479a74f8da080224fa0c7eacab674d6.tar.bz2 |
New small/large screen division for Launcher.
Previously the dp division between the two was set at 600dp
(7" tablets). This has now been bumped up to 720dp
(10" tablets).
Change-Id: I1f0419e504fc3bb606156c1cf6fbe03956274184
Diffstat (limited to 'res/layout-sw720dp')
-rw-r--r-- | res/layout-sw720dp/all_apps_cling.xml | 46 | ||||
-rw-r--r-- | res/layout-sw720dp/external_widget_drop_list_item.xml | 39 | ||||
-rw-r--r-- | res/layout-sw720dp/folder_cling.xml | 46 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 54 | ||||
-rw-r--r-- | res/layout-sw720dp/market_button.xml | 36 | ||||
-rw-r--r-- | res/layout-sw720dp/search_bar.xml | 76 | ||||
-rw-r--r-- | res/layout-sw720dp/wallpaper_item.xml | 26 | ||||
-rw-r--r-- | res/layout-sw720dp/workspace.xml | 30 | ||||
-rw-r--r-- | res/layout-sw720dp/workspace_cling.xml | 56 | ||||
-rw-r--r-- | res/layout-sw720dp/workspace_screen.xml | 33 |
10 files changed, 442 insertions, 0 deletions
diff --git a/res/layout-sw720dp/all_apps_cling.xml b/res/layout-sw720dp/all_apps_cling.xml new file mode 100644 index 0000000..7079b21 --- /dev/null +++ b/res/layout-sw720dp/all_apps_cling.xml @@ -0,0 +1,46 @@ +<?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.Cling + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + launcher:drawIdentifier="all_apps_large"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="@dimen/cling_text_block_offset_x" + android:layout_marginTop="@dimen/cling_text_block_offset_y"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/all_apps_cling_title" + android:text="@string/all_apps_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/all_apps_cling_add_item" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/all_apps_cling_add_item" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginTop="15dp" + android:onClick="dismissAllAppsCling" /> + </LinearLayout> + </FrameLayout> +</com.android.launcher2.Cling> diff --git a/res/layout-sw720dp/external_widget_drop_list_item.xml b/res/layout-sw720dp/external_widget_drop_list_item.xml new file mode 100644 index 0000000..84f40ed --- /dev/null +++ b/res/layout-sw720dp/external_widget_drop_list_item.xml @@ -0,0 +1,39 @@ +<?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. +--> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + + android:layout_width="match_parent" + android:layout_height="64dp"> + <ImageView + android:id="@+id/provider_icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginLeft="20dp" + android:maxWidth="32dp" + android:maxHeight="32dp" + android:scaleType="fitCenter" + android:src="@drawable/ic_launcher_application" /> + <TextView + android:id="@+id/provider" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="5dp" + android:gravity="center_vertical" + android:textSize="18sp" /> +</LinearLayout> diff --git a/res/layout-sw720dp/folder_cling.xml b/res/layout-sw720dp/folder_cling.xml new file mode 100644 index 0000000..4188804 --- /dev/null +++ b/res/layout-sw720dp/folder_cling.xml @@ -0,0 +1,46 @@ +<?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.Cling + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + launcher:drawIdentifier="folder_large"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="@dimen/cling_text_block_offset_x" + android:layout_marginTop="@dimen/cling_text_block_offset_y"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/folder_cling_title" + android:text="@string/folder_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/folder_cling_create_folder" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/folder_cling_create_folder" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginTop="15dp" + android:onClick="dismissFolderCling" /> + </LinearLayout> + </FrameLayout> +</com.android.launcher2.Cling> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml new file mode 100644 index 0000000..94c69a6 --- /dev/null +++ b/res/layout-sw720dp/launcher.xml @@ -0,0 +1,54 @@ +<?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" + android:focusable="false"> + + <include layout="@layout/workspace" + android:id="@+id/workspace" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <include layout="@layout/qsb_bar" + android:id="@+id/qsb_bar" + android:layout_width="match_parent" + android:layout_height="@dimen/qsb_bar_height" + android:layout_gravity="top" /> + + <include layout="@layout/apps_customize_pane" + android:id="@+id/apps_customize_pane" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="invisible" /> + + <include layout="@layout/workspace_cling" + android:id="@+id/workspace_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> + + <include layout="@layout/folder_cling" + android:id="@+id/folder_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" /> +</com.android.launcher2.DragLayer> diff --git a/res/layout-sw720dp/market_button.xml b/res/layout-sw720dp/market_button.xml new file mode 100644 index 0000000..4ccecd9 --- /dev/null +++ b/res/layout-sw720dp/market_button.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. +--> +<TextView + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + style="@style/MarketButton" + android:onClick="onClickAppMarketButton" + android:gravity="center" + android:paddingLeft="32dp" + android:paddingRight="32dp" + android:drawablePadding="10dp" + android:text="@string/market" + android:contentDescription="@string/market" + android:textColor="@color/workspace_all_apps_and_delete_zone_text_color" + android:textStyle="bold" + android:textSize="14sp" + android:textAllCaps="true" + 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:focusable="true" + android:clickable="true" /> diff --git a/res/layout-sw720dp/search_bar.xml b/res/layout-sw720dp/search_bar.xml new file mode 100644 index 0000000..ebaf960 --- /dev/null +++ b/res/layout-sw720dp/search_bar.xml @@ -0,0 +1,76 @@ +<?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. +--> +<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"> + <!-- Global search icon --> + <com.android.launcher2.HolographicImageView + style="@style/SearchButton" + android:id="@+id/search_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:src="@drawable/ic_home_search_normal_holo" + 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" /> + + <!-- 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" + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_toLeftOf="@+id/all_apps_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:src="@drawable/ic_home_all_apps_holo_dark" + + android:focusable="true" + android:clickable="true" + android:contentDescription="@string/accessibility_all_apps_button" /> +</RelativeLayout>
\ No newline at end of file diff --git a/res/layout-sw720dp/wallpaper_item.xml b/res/layout-sw720dp/wallpaper_item.xml new file mode 100644 index 0000000..9461e3b --- /dev/null +++ b/res/layout-sw720dp/wallpaper_item.xml @@ -0,0 +1,26 @@ +<?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. +--> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="@drawable/wallpaper_gallery_item"> + <ImageView + android:id="@+id/wallpaper_image" + android:layout_width="@dimen/wallpaper_chooser_grid_width" + android:layout_height="@dimen/wallpaper_chooser_grid_height" + android:scaleType="centerCrop" + android:focusable="true" /> +</FrameLayout>
\ No newline at end of file diff --git a/res/layout-sw720dp/workspace.xml b/res/layout-sw720dp/workspace.xml new file mode 100644 index 0000000..327afaf --- /dev/null +++ b/res/layout-sw720dp/workspace.xml @@ -0,0 +1,30 @@ +<?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.launcher2.Workspace + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + android:paddingTop="@dimen/workspace_content_large_only_top_margin" + 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.launcher2.Workspace>
\ No newline at end of file diff --git a/res/layout-sw720dp/workspace_cling.xml b/res/layout-sw720dp/workspace_cling.xml new file mode 100644 index 0000000..264b1e0 --- /dev/null +++ b/res/layout-sw720dp/workspace_cling.xml @@ -0,0 +1,56 @@ +<?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.Cling + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + launcher:drawIdentifier="workspace_large"> + <FrameLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginLeft="@dimen/cling_text_block_offset_x" + android:layout_marginTop="@dimen/cling_text_block_offset_y"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + <TextView + style="@style/ClingTitleText" + android:id="@+id/workspace_cling_title" + android:text="@string/workspace_cling_title" /> + <TextView + style="@style/ClingText" + android:id="@+id/workspace_cling_move_item" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/workspace_cling_move_item" /> + <Button + style="@style/ClingButton" + android:id="@+id/cling_dismiss" + android:layout_marginTop="15dp" + android:onClick="dismissWorkspaceCling" /> + </LinearLayout> + </FrameLayout> + <TextView + style="@style/ClingText" + android:id="@+id/workspace_cling_open_all_apps" + android:layout_width="180dp" + android:layout_height="wrap_content" + android:layout_marginTop="90dp" + android:layout_marginRight="130dp" + android:layout_gravity="right" + android:gravity="right" + android:text="@string/workspace_cling_open_all_apps" /> +</com.android.launcher2.Cling>
\ No newline at end of file diff --git a/res/layout-sw720dp/workspace_screen.xml b/res/layout-sw720dp/workspace_screen.xml new file mode 100644 index 0000000..52f9def --- /dev/null +++ b/res/layout-sw720dp/workspace_screen.xml @@ -0,0 +1,33 @@ +<?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.launcher2.CellLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" + + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingLeft="@dimen/workspace_left_padding" + android:paddingRight="@dimen/workspace_right_padding" + android:paddingTop="@dimen/workspace_top_padding" + android:paddingBottom="@dimen/workspace_bottom_padding" + android:hapticFeedbackEnabled="false" + + launcher:cellWidth="@dimen/workspace_cell_width" + launcher:cellHeight="@dimen/workspace_cell_height" + launcher:widthGap="@dimen/workspace_width_gap" + launcher:heightGap="@dimen/workspace_height_gap" + launcher:maxGap="@dimen/workspace_max_gap" /> |