diff options
Diffstat (limited to 'res/layout-land')
| -rw-r--r-- | res/layout-land/first_run_cling.xml | 97 | ||||
| -rw-r--r-- | res/layout-land/folder_cling.xml | 65 | ||||
| -rw-r--r-- | res/layout-land/launcher.xml | 39 | ||||
| -rw-r--r-- | res/layout-land/longpress_cling.xml | 27 | ||||
| -rw-r--r-- | res/layout-land/migration_cling.xml | 141 | ||||
| -rw-r--r-- | res/layout-land/migration_workspace_cling.xml | 70 | ||||
| -rw-r--r-- | res/layout-land/workspace_cling.xml | 108 |
7 files changed, 104 insertions, 443 deletions
diff --git a/res/layout-land/first_run_cling.xml b/res/layout-land/first_run_cling.xml deleted file mode 100644 index 9baee64b7..000000000 --- a/res/layout-land/first_run_cling.xml +++ /dev/null @@ -1,97 +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.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - android:layout_width="match_parent" - android:layout_height="match_parent" - launcher:drawIdentifier="first_run_portrait"> - <FrameLayout - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <LinearLayout - android:id="@+id/bubble_content" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginLeft="100dp" - android:layout_marginRight="100dp" - android:orientation="vertical"> - <TextView - style="@style/ClingAltTitleText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_marginBottom="10dp" - android:text="@string/first_run_cling_title" - android:textColor="#FFFFFFFF" - android:textSize="30sp" - android:gravity="center" /> - <TextView - style="@style/ClingAltTitleText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:text="@string/first_run_cling_description" - android:textColor="#80000000" - android:textSize="16sp" - android:gravity="center" /> - </LinearLayout> - <TextView - style="@style/ClingHintText" - android:id="@+id/search_bar_hint" - android:layout_width="160dp" - android:layout_height="wrap_content" - android:layout_gravity="top|end" - android:layout_marginEnd="10dp" - android:layout_marginTop="65dp" - android:visibility="gone" - android:drawableTop="@drawable/cling_arrow_up" - android:drawablePadding="5dp" - android:text="@string/first_run_cling_search_bar_hint" /> - <TextView - style="@style/ClingHintText" - android:id="@+id/custom_content_hint" - android:layout_width="160dp" - android:layout_height="wrap_content" - android:layout_gravity="top" - android:layout_marginStart="10dp" - android:layout_marginTop="100dp" - android:visibility="gone" - android:drawableStart="@drawable/cling_arrow_left" - android:drawablePadding="10dp" - android:text="@string/first_run_cling_custom_content_hint" /> - <TextView - style="@style/ClingHintText" - android:layout_width="160dp" - android:layout_height="wrap_content" - android:layout_gravity="bottom|end" - android:layout_marginEnd="10dp" - android:layout_marginBottom="85dp" - android:drawableEnd="@drawable/cling_arrow_right" - android:drawablePadding="5dp" - android:text="@string/first_run_cling_create_screens_hint" /> - </FrameLayout> - <Button - style="@style/ClingButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="15dp" - android:layout_marginEnd="20dp" - android:layout_gravity="bottom|end" - android:onClick="dismissFirstRunCling" /> -</com.android.launcher3.Cling> diff --git a/res/layout-land/folder_cling.xml b/res/layout-land/folder_cling.xml deleted file mode 100644 index 5dd372973..000000000 --- a/res/layout-land/folder_cling.xml +++ /dev/null @@ -1,65 +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.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - launcher:drawIdentifier="folder_landscape"> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="15dp" - android:layout_marginEnd="15dp" - android:layout_marginTop="10dp" - android:layout_marginBottom="10dp"> - <LinearLayout - android:id="@+id/folder_bubble" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="20dp" - android:paddingRight="20dp" - android:paddingTop="20dp" - android:paddingBottom="20dp" - android:orientation="vertical" - android:background="@drawable/cling"> - <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" /> - </LinearLayout> - <ImageView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/cling_arrow_down" /> - </LinearLayout> - </FrameLayout> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginBottom="15dp" - android:layout_marginEnd="20dp" - android:layout_gravity="bottom|right" - android:onClick="dismissFolderCling" /> -</com.android.launcher3.Cling> diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 779160925..8cd867366 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -30,6 +30,11 @@ android:layout_height="match_parent" android:fitsSystemWindows="true"> + <com.android.launcher3.FocusIndicatorView + android:id="@+id/focus_indicator" + android:layout_width="52dp" + android:layout_height="52dp" /> + <!-- The workspace contains 5 screens of cells --> <com.android.launcher3.Workspace android:id="@+id/workspace" @@ -52,40 +57,6 @@ android:id="@+id/overview_panel" android:visibility="gone" /> - <!-- 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 - top of that view. --> - <com.android.launcher3.ScrimView - android:id="@+id/cling_scrim" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> - <include layout="@layout/first_run_cling" - android:id="@+id/first_run_cling" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> - <include layout="@layout/migration_cling" - android:id="@+id/migration_cling" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> - <include layout="@layout/migration_workspace_cling" - android:id="@+id/migration_workspace_cling" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" /> - <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" /> - <include layout="@layout/apps_customize_pane" android:id="@+id/apps_customize_pane" android:layout_width="match_parent" diff --git a/res/layout-land/longpress_cling.xml b/res/layout-land/longpress_cling.xml new file mode 100644 index 000000000..93bbc077a --- /dev/null +++ b/res/layout-land/longpress_cling.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" + android:id="@+id/longpress_cling" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/cling_scrim_background" + android:orientation="vertical" > + + <Space + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" /> + + <FrameLayout + android:id="@+id/cling_content" + android:layout_width="360dp" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:background="@drawable/cling_bg" /> + + <Space + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="2" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout-land/migration_cling.xml b/res/layout-land/migration_cling.xml index 343f43f1f..307cba8a8 100644 --- a/res/layout-land/migration_cling.xml +++ b/res/layout-land/migration_cling.xml @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- + 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. @@ -13,88 +14,90 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.launcher3.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/migration_cling" android:layout_width="match_parent" android:layout_height="match_parent" - launcher:drawIdentifier="migration_landscape"> + android:background="#FF009688" + android:baselineAligned="false" + android:gravity="center_vertical" > + <FrameLayout - android:id="@+id/content" - android:layout_width="match_parent" + android:layout_width="0dp" android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_weight="1" > - <LinearLayout - android:layout_width="match_parent" + <ImageView + android:layout_width="@dimen/cling_migration_bg_size" + android:layout_height="@dimen/cling_migration_bg_size" + android:layout_gravity="center" + android:background="@drawable/bg_migration_cling" /> + + <ImageView + android:layout_width="@dimen/cling_migration_logo_width" + android:layout_height="@dimen/cling_migration_logo_height" + android:layout_gravity="center" + android:src="@drawable/ic_migration" /> + </FrameLayout> + + <LinearLayout + android:layout_width="@dimen/cling_migration_content_width" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/cling_migration_content_margin" + android:orientation="vertical" + android:paddingLeft="24dp" + android:paddingRight="24dp" > + + <TextView + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="top" - android:orientation="vertical"> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="top" - android:gravity="center" - android:text="@string/first_run_cling_title" - android:textSize="42dp" - android:textColor="#FFffffff" /> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="10dp" - android:layout_marginBottom="0dp" - android:layout_gravity="center_horizontal" - android:src="@drawable/on_boarding_welcome" /> + android:paddingBottom="8dp" + android:text="@string/first_run_cling_title" + android:textColor="#E1000000" + android:textSize="34sp" /> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:src="@drawable/cling_arrow_up" /> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="25dp" - android:layout_marginRight="25dp" - android:paddingLeft="25dp" - android:paddingRight="25dp" - android:paddingTop="20dp" - android:paddingBottom="20dp" - android:orientation="vertical" - android:background="@drawable/cling"> - <TextView - style="@style/ClingTitleText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/migration_cling_title" /> - <TextView - style="@style/ClingText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/migration_cling_description" /> - </LinearLayout> - </LinearLayout> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="sans-serif-medium" + android:text="@string/migration_cling_title" + android:textColor="#E1000000" + android:textSize="20sp" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="24dp" + android:text="@string/migration_cling_description" + android:textColor="#99000000" + android:textSize="16sp" /> <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:layout_marginLeft="25dp" - android:layout_marginRight="25dp" - android:layout_marginBottom="25dp" - android:orientation="vertical"> + android:layout_height="wrap_content" > + <Button - style="@style/ClingButton" - android:layout_width="match_parent" + android:id="@+id/cling_dismiss_migration_copy_apps" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_weight="1" + android:fontFamily="sans-serif-medium" android:text="@string/migration_cling_copy_apps" - android:onClick="dismissMigrationClingCopyApps" /> + android:textColor="#FFFFFFFF" + android:textSize="14sp" /> + <Button - style="@style/ClingButton" - android:layout_width="match_parent" + android:id="@+id/cling_dismiss_migration_use_default" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_weight="1" + android:fontFamily="sans-serif-medium" android:text="@string/migration_cling_use_default" - android:onClick="dismissMigrationClingUseDefault" /> + android:textColor="#deFFFFFF" + android:textSize="14sp" /> </LinearLayout> - </FrameLayout> -</com.android.launcher3.Cling> + </LinearLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout-land/migration_workspace_cling.xml b/res/layout-land/migration_workspace_cling.xml deleted file mode 100644 index 1148be45f..000000000 --- a/res/layout-land/migration_workspace_cling.xml +++ /dev/null @@ -1,70 +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.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - android:layout_width="match_parent" - android:layout_height="match_parent" - launcher:drawIdentifier="migration_workspace_landscape"> - <LinearLayout - android:id="@+id/content" - android:layout_width="400dp" - android:layout_height="wrap_content" - android:layout_gravity="end|center_vertical" - android:paddingEnd="60dp" - android:paddingRight="60dp" - android:orientation="vertical"> - <LinearLayout - android:id="@+id/migration_workspace_cling_bubble" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginRight="4dp" - android:paddingLeft="20dp" - android:paddingRight="20dp" - android:paddingTop="20dp" - android:paddingBottom="20dp" - android:orientation="vertical" - android:background="@drawable/cling"> - <TextView - style="@style/ClingTitleText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/workspace_cling_title" /> - <TextView - style="@style/ClingText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/workspace_cling_move_item" /> - </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:src="@drawable/cling_arrow_end" /> - </LinearLayout> - <Button - style="@style/ClingButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="5dp" - android:layout_gravity="right" - android:onClick="dismissMigrationWorkspaceCling" /> - </LinearLayout> -</com.android.launcher3.Cling> diff --git a/res/layout-land/workspace_cling.xml b/res/layout-land/workspace_cling.xml deleted file mode 100644 index d3b07d74d..000000000 --- a/res/layout-land/workspace_cling.xml +++ /dev/null @@ -1,108 +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.Cling - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3" - android:layout_width="match_parent" - android:layout_height="match_parent" - launcher:drawIdentifier="workspace_landscape"> - <FrameLayout - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <LinearLayout - android:id="@+id/workspace_cling_bubble" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="top" - android:layout_marginStart="25dp" - android:layout_marginEnd="25dp" - android:layout_marginTop="30dp" - android:orientation="vertical"> - <LinearLayout - android:paddingLeft="20dp" - android:paddingRight="20dp" - android:paddingTop="20dp" - android:paddingBottom="20dp" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:background="@drawable/cling"> - <TextView - style="@style/ClingTitleText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/workspace_cling_title" /> - <TextView - style="@style/ClingText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/workspace_cling_move_item" /> - </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:src="@drawable/cling_arrow_down" /> - </LinearLayout> - - <LinearLayout - android:id="@+id/focused_hotseat_app_bubble" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|left" - android:layout_marginLeft="25dp" - android:layout_marginBottom="90dp" - android:orientation="vertical" - android:visibility="gone"> - <LinearLayout - android:paddingLeft="20dp" - android:paddingRight="20dp" - android:paddingTop="20dp" - android:paddingBottom="20dp" - android:layout_width="240dp" - android:layout_height="wrap_content" - android:orientation="vertical" - android:background="@drawable/cling"> - <TextView - android:id="@+id/focused_hotseat_app_title" - style="@style/ClingTitleText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - <TextView - android:id="@+id/focused_hotseat_app_description" - style="@style/ClingText" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - </LinearLayout> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="left" - android:layout_marginLeft="78dp" - android:src="@drawable/cling_arrow_down" /> - </LinearLayout> - </FrameLayout> - - <Button - style="@style/ClingButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="15dp" - android:layout_marginRight="20dp" - android:layout_gravity="bottom|right" - android:onClick="dismissWorkspaceCling" /> -</com.android.launcher3.Cling> |