diff options
Diffstat (limited to 'res/layout-sw600dp-port')
-rw-r--r-- | res/layout-sw600dp-port/all_apps_cling.xml | 44 | ||||
-rw-r--r-- | res/layout-sw600dp-port/folder_cling.xml | 46 | ||||
-rw-r--r-- | res/layout-sw600dp-port/workspace_cling.xml | 56 |
3 files changed, 75 insertions, 71 deletions
diff --git a/res/layout-sw600dp-port/all_apps_cling.xml b/res/layout-sw600dp-port/all_apps_cling.xml deleted file mode 100644 index 507af512f..000000000 --- a/res/layout-sw600dp-port/all_apps_cling.xml +++ /dev/null @@ -1,44 +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.launcher2.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res/com.android.launcher" - launcher:drawIdentifier="large_all_apps_portrait"> - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginTop="100dp" - android:layout_marginLeft="0dp"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/all_apps_cling_title" - android:layout_marginTop="0dp" - android:text="@string/all_apps_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/all_apps_cling_add_item" - android:layout_width="340dp" - android:layout_height="wrap_content" - android:layout_marginTop="45dp" - android:text="@string/all_apps_cling_add_item" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="95dp" - android:onClick="dismissAllAppsCling" /> - </FrameLayout> -</com.android.launcher2.Cling>
\ No newline at end of file diff --git a/res/layout-sw600dp-port/folder_cling.xml b/res/layout-sw600dp-port/folder_cling.xml new file mode 100644 index 000000000..017d0fde9 --- /dev/null +++ b/res/layout-sw600dp-port/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="480dp" + 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-sw600dp-port/workspace_cling.xml b/res/layout-sw600dp-port/workspace_cling.xml index 0b9477c46..2eae0fc93 100644 --- a/res/layout-sw600dp-port/workspace_cling.xml +++ b/res/layout-sw600dp-port/workspace_cling.xml @@ -16,39 +16,41 @@ <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="large_workspace_portrait"> + launcher:drawIdentifier="workspace_large"> <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="60dp" - android:layout_marginTop="30dp" - android:layout_gravity="left|center_vertical"> - <TextView - style="@style/ClingTitleText" - android:id="@+id/workspace_cling_title" - android:layout_marginTop="20dp" - android:text="@string/workspace_cling_title" /> - <TextView - style="@style/ClingText" - android:id="@+id/workspace_cling_move_item" - android:layout_width="wrap_content" + 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:layout_marginTop="65dp" - android:text="@string/workspace_cling_move_item" /> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="95dp" - android:onClick="dismissWorkspaceCling" /> + 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="200dp" + android:layout_width="180dp" android:layout_height="wrap_content" - android:layout_gravity="right|top" - android:layout_marginRight="160dp" - android:layout_marginTop="30dp" - android:gravity="left" + android:layout_marginTop="15dp" + android:layout_marginRight="150dp" + 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 |