diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2014-08-22 16:09:37 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2014-08-25 11:38:02 -0700 |
commit | 424418bb50ccf5d9270650b70cc51f423da51a65 (patch) | |
tree | 23c7b40d02e7b4dfda6395b7b30ea6305a27dd1a /res | |
parent | dec12adb6dba114ad2feedce3a9f3ce0c178fc04 (diff) | |
download | android_packages_apps_Trebuchet-424418bb50ccf5d9270650b70cc51f423da51a65.tar.gz android_packages_apps_Trebuchet-424418bb50ccf5d9270650b70cc51f423da51a65.tar.bz2 android_packages_apps_Trebuchet-424418bb50ccf5d9270650b70cc51f423da51a65.zip |
Updating clings, removing ununsed clings
issue: 16127412
Change-Id: I1d18515765100ff10d33439b3ac39ebfc5da35c7
Diffstat (limited to 'res')
37 files changed, 340 insertions, 1671 deletions
diff --git a/res/drawable-nodpi/ic_migration.png b/res/drawable-nodpi/ic_migration.png Binary files differnew file mode 100644 index 000000000..c282cd283 --- /dev/null +++ b/res/drawable-nodpi/ic_migration.png diff --git a/res/drawable/bg_migration_cling.xml b/res/drawable/bg_migration_cling.xml new file mode 100644 index 000000000..bfff5a41a --- /dev/null +++ b/res/drawable/bg_migration_cling.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval" > + + <gradient + android:endColor="#00ffeb3a" + android:gradientRadius="50%p" + android:startColor="#80ffeb3a" + android:type="radial" /> + +</shape>
\ No newline at end of file diff --git a/res/drawable/cling_arrow_end.xml b/res/drawable/cling_arrow_end.xml deleted file mode 100644 index 3f63c7d24..000000000 --- a/res/drawable/cling_arrow_end.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/cling_arrow_right" - android:autoMirrored="true"> -</bitmap> diff --git a/res/drawable/cling_arrow_start.xml b/res/drawable/cling_arrow_start.xml deleted file mode 100644 index ebe91830d..000000000 --- a/res/drawable/cling_arrow_start.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 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. ---> -<bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/cling_arrow_left" - android:autoMirrored="true"> -</bitmap> diff --git a/res/drawable/cling_button_bg.xml b/res/drawable/cling_button_bg.xml deleted file mode 100644 index 7bf6ce79f..000000000 --- a/res/drawable/cling_button_bg.xml +++ /dev/null @@ -1,20 +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. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true" android:drawable="@drawable/cling_button_pressed" /> - <item android:drawable="@drawable/cling_button" /> -</selector> 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 0af9e59aa..c812373d3 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -65,31 +65,6 @@ 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" diff --git a/res/layout-land/longpress_cling.xml b/res/layout-land/longpress_cling.xml new file mode 100644 index 000000000..ffae0bead --- /dev/null +++ b/res/layout-land/longpress_cling.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout 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" > + + <com.android.launcher3.ClearCircleLayout + android:id="@+id/cling_longpress_hole" + android:layout_width="match_parent" + android:layout_height="match_parent" + launcher:holeLocation="page_indicator" /> + + <FrameLayout + android:id="@+id/cling_content" + android:layout_width="360dp" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:background="#FF009688" + android:elevation="6dp" /> + +</FrameLayout>
\ No newline at end of file diff --git a/res/layout-land/migration_cling.xml b/res/layout-land/migration_cling.xml index 343f43f1f..cc446fb68 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,89 @@ 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="280dp" + android:layout_height="wrap_content" + 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-condensed" + 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="#E1000000" + 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" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_weight="1" + android:fontFamily="sans-serif-condensed" + android:id="@+id/cling_dismiss_migration_copy_apps" 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" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_weight="1" + android:fontFamily="sans-serif-condensed" + android:id="@+id/cling_dismiss_migration_use_default" 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> diff --git a/res/layout-port/first_run_cling.xml b/res/layout-port/first_run_cling.xml deleted file mode 100644 index ac3939cfd..000000000 --- a/res/layout-port/first_run_cling.xml +++ /dev/null @@ -1,100 +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:gravity="center" /> - <TextView - style="@style/ClingAltText" - 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:gravity="center" /> - </LinearLayout> - <TextView - style="@style/ClingHintText" - android:id="@+id/search_bar_hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top|end" - android:layout_marginEnd="10dp" - android:layout_marginTop="65dp" - android:gravity="center_horizontal" - android:maxWidth="160dp" - 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="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top|start" - android:layout_marginStart="10dp" - android:layout_marginEnd="10dp" - android:layout_marginTop="100dp" - android:maxWidth="160dp" - android:visibility="gone" - android:drawableStart="@drawable/cling_arrow_start" - android:drawablePadding="10dp" - android:text="@string/first_run_cling_custom_content_hint" /> - <TextView - style="@style/ClingHintText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|end" - android:layout_marginEnd="10dp" - android:layout_marginBottom="85dp" - android:maxWidth="180dp" - android:drawableEnd="@drawable/cling_arrow_end" - 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-port/folder_cling.xml b/res/layout-port/folder_cling.xml deleted file mode 100644 index 1a1b11fce..000000000 --- a/res/layout-port/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_portrait"> - <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-port/launcher.xml b/res/layout-port/launcher.xml index 46e0c0f4c..3b9b803e4 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -73,31 +73,6 @@ 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" /> <!-- This is the search bar voice button proxy view. It allows us to have a larger touch target than the microphone constrained by the search bar bounds. --> diff --git a/res/layout-port/longpress_cling.xml b/res/layout-port/longpress_cling.xml new file mode 100644 index 000000000..ec0321f5e --- /dev/null +++ b/res/layout-port/longpress_cling.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout 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" > + + <com.android.launcher3.ClearCircleLayout + android:id="@+id/cling_longpress_hole" + android:layout_width="match_parent" + android:layout_height="match_parent" + launcher:holeLocation="center_screen" /> + + <FrameLayout + android:id="@+id/cling_content" + android:layout_width="360dp" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:background="#FF009688" + android:elevation="6dp" + android:tag="slide_from_bottom" /> + +</FrameLayout>
\ No newline at end of file diff --git a/res/layout-port/migration_cling.xml b/res/layout-port/migration_cling.xml index 1bffe6c82..5251e7bf6 100644 --- a/res/layout-port/migration_cling.xml +++ b/res/layout-port/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,92 @@ 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" +<FrameLayout 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_portrait"> - <FrameLayout - android:id="@+id/content" + android:background="#FF009688" > + + <RelativeLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" > + + <ImageView + android:layout_width="@dimen/cling_migration_bg_size" + android:layout_height="@dimen/cling_migration_bg_size" + android:layout_below="@+id/ic_cling_migration" + android:layout_centerHorizontal="true" + android:layout_marginTop="@dimen/cling_migration_bg_shift" + android:src="@drawable/bg_migration_cling" /> + + <ImageView + android:id="@+id/ic_cling_migration" + android:layout_width="@dimen/cling_migration_logo_width" + android:layout_height="@dimen/cling_migration_logo_height" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:src="@drawable/ic_migration" /> <LinearLayout - android:layout_width="match_parent" + android:layout_width="280dp" android:layout_height="wrap_content" - android:layout_gravity="top" - android:orientation="vertical"> + android:layout_below="@+id/ic_cling_migration" + android:orientation="vertical" + android:paddingLeft="24dp" + android:paddingRight="24dp" > + <TextView - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="top" - android:gravity="center" + android:paddingBottom="8dp" android:text="@string/first_run_cling_title" - android:textSize="42dp" - android:textColor="#FFffffff" /> - <ImageView + android:textColor="#E1000000" + android:textSize="34sp" /> + + <TextView 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:fontFamily="sans-serif-condensed" + android:text="@string/migration_cling_title" + android:textColor="#E1000000" + android:textSize="20sp" /> - <ImageView + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:src="@drawable/cling_arrow_up" /> + android:paddingBottom="24dp" + android:text="@string/migration_cling_description" + android:textColor="#E1000000" + android:textSize="16sp" /> + <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" > + + <Button + android:id="@+id/cling_dismiss_migration_copy_apps" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="0dp" android:layout_height="wrap_content" - android:text="@string/migration_cling_title" /> - <TextView - style="@style/ClingText" - android:layout_width="match_parent" + android:layout_weight="1" + android:fontFamily="sans-serif-condensed" + android:text="@string/migration_cling_copy_apps" + android:textColor="#FFFFFFFF" + android:textSize="14sp" /> + + <Button + android:id="@+id/cling_dismiss_migration_use_default" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="0dp" android:layout_height="wrap_content" - android:text="@string/migration_cling_description" /> + android:layout_weight="1" + android:fontFamily="sans-serif-condensed" + android:text="@string/migration_cling_use_default" + android:textColor="#deFFFFFF" + android:textSize="14sp" /> </LinearLayout> </LinearLayout> + </RelativeLayout> - <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"> - <Button - style="@style/ClingButton" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/migration_cling_copy_apps" - android:onClick="dismissMigrationClingCopyApps" /> - <Button - style="@style/ClingButton" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/migration_cling_use_default" - android:onClick="dismissMigrationClingUseDefault" /> - </LinearLayout> - </FrameLayout> -</com.android.launcher3.Cling> +</FrameLayout>
\ No newline at end of file diff --git a/res/layout-port/migration_workspace_cling.xml b/res/layout-port/migration_workspace_cling.xml deleted file mode 100644 index 576bb41f2..000000000 --- a/res/layout-port/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_portrait"> - <FrameLayout - android:id="@+id/content" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <LinearLayout - android:id="@+id/migration_workspace_cling_bubble" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:layout_marginStart="25dp" - android:layout_marginEnd="25dp" - 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> - - <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|right" - android:onClick="dismissMigrationWorkspaceCling" /> - </FrameLayout> -</com.android.launcher3.Cling> diff --git a/res/layout-port/workspace_cling.xml b/res/layout-port/workspace_cling.xml deleted file mode 100644 index 624568668..000000000 --- a/res/layout-port/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_portrait"> - <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> diff --git a/res/layout-sw600dp-port/first_run_cling.xml b/res/layout-sw600dp-port/first_run_cling.xml deleted file mode 100644 index d80c084ab..000000000 --- a/res/layout-sw600dp-port/first_run_cling.xml +++ /dev/null @@ -1,100 +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:gravity="center" /> - <TextView - style="@style/ClingAltText" - 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:gravity="center" /> - </LinearLayout> - <TextView - style="@style/ClingHintText" - android:id="@+id/search_bar_hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top|end" - android:layout_marginEnd="30dp" - android:layout_marginTop="80dp" - android:gravity="center_horizontal" - android:maxWidth="160dp" - android:visibility="gone" - android:drawableTop="@drawable/cling_arrow_up" - android:drawablePadding="10dp" - android:text="@string/first_run_cling_search_bar_hint" /> - <TextView - style="@style/ClingHintText" - android:id="@+id/custom_content_hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top|start" - android:layout_marginStart="30dp" - android:layout_marginTop="120dp" - android:gravity="start" - android:maxWidth="160dp" - android:visibility="gone" - android:drawableStart="@drawable/cling_arrow_start" - android:drawablePadding="10dp" - android:text="@string/first_run_cling_custom_content_hint" /> - <TextView - style="@style/ClingHintText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|end" - android:layout_marginEnd="30dp" - android:layout_marginBottom="120dp" - android:maxWidth="180dp" - android:drawableEnd="@drawable/cling_arrow_end" - android:drawablePadding="10dp" - 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="30dp" - android:layout_marginEnd="30dp" - android:layout_gravity="bottom|end" - android:onClick="dismissFirstRunCling" /> -</com.android.launcher3.Cling> diff --git a/res/layout-sw600dp-port/longpress_cling.xml b/res/layout-sw600dp-port/longpress_cling.xml new file mode 100644 index 000000000..4b4cf9109 --- /dev/null +++ b/res/layout-sw600dp-port/longpress_cling.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout 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" > + + <com.android.launcher3.ClearCircleLayout + android:id="@+id/cling_longpress_hole" + android:layout_width="match_parent" + android:layout_height="match_parent" + launcher:holeLocation="center_screen" /> + + <FrameLayout + android:id="@+id/cling_content" + android:layout_width="360dp" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal|top" + android:background="#FF009688" + android:elevation="6dp" + android:tag="slide_from_top" /> + +</FrameLayout>
\ No newline at end of file diff --git a/res/layout-sw600dp-port/migration_workspace_cling.xml b/res/layout-sw600dp-port/migration_workspace_cling.xml deleted file mode 100644 index eb13137a1..000000000 --- a/res/layout-sw600dp-port/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_large_portrait"> - <FrameLayout - android:id="@+id/content" - android:layout_width="480dp" - android:layout_height="match_parent" - android:layout_gravity="bottom|center_horizontal"> - <LinearLayout - android:id="@+id/migration_workspace_cling_bubble" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:layout_marginStart="25dp" - android:layout_marginEnd="25dp" - android:orientation="vertical"> - <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_horizontal" - android:src="@drawable/cling_arrow_down" /> - <Button - style="@style/ClingButton" - android:id="@+id/dismiss_migration_workspace_cling_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:onClick="dismissMigrationWorkspaceCling" /> - </LinearLayout> - </FrameLayout> -</com.android.launcher3.Cling> diff --git a/res/layout-sw600dp/first_run_cling.xml b/res/layout-sw600dp/first_run_cling.xml deleted file mode 100644 index 295765b6e..000000000 --- a/res/layout-sw600dp/first_run_cling.xml +++ /dev/null @@ -1,100 +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_landscape"> - <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:gravity="center" /> - <TextView - style="@style/ClingAltText" - 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:gravity="center" /> - </LinearLayout> - <TextView - style="@style/ClingHintText" - android:id="@+id/search_bar_hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top|start" - android:layout_marginStart="60dp" - android:layout_marginTop="105dp" - android:gravity="start" - android:maxWidth="160dp" - android:visibility="gone" - android:drawableStart="@drawable/cling_arrow_start" - android:drawablePadding="10dp" - android:text="@string/first_run_cling_search_bar_hint" /> - <TextView - style="@style/ClingHintText" - android:id="@+id/custom_content_hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top|start" - android:layout_marginStart="60dp" - android:layout_marginTop="200dp" - android:gravity="start" - android:maxWidth="160dp" - android:visibility="gone" - android:drawableStart="@drawable/cling_arrow_start" - android:drawablePadding="10dp" - android:text="@string/first_run_cling_custom_content_hint" /> - <TextView - style="@style/ClingHintText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="bottom|end" - android:layout_marginEnd="30dp" - android:layout_marginBottom="120dp" - android:maxWidth="180dp" - android:drawableEnd="@drawable/cling_arrow_end" - android:drawablePadding="10dp" - 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="30dp" - android:layout_marginEnd="30dp" - android:layout_gravity="bottom|end" - android:onClick="dismissFirstRunCling" /> -</com.android.launcher3.Cling> diff --git a/res/layout-sw600dp/folder_cling.xml b/res/layout-sw600dp/folder_cling.xml deleted file mode 100644 index f21aef4e4..000000000 --- a/res/layout-sw600dp/folder_cling.xml +++ /dev/null @@ -1,66 +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_large"> - <LinearLayout - android:id="@+id/folder_bubble" - android:layout_width="300dp" - android:layout_height="match_parent" - android:layout_gravity="left|top" - android:paddingTop="28dp" - android:paddingRight="10dp" - android:orientation="vertical"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <ImageView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:src="@drawable/cling_arrow_start" /> - <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: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> - </LinearLayout> - <Button - style="@style/ClingButton" - android:id="@+id/cling_dismiss" - android:layout_marginTop="5dp" - android:layout_gravity="right" - android:onClick="dismissFolderCling" /> - </LinearLayout> -</com.android.launcher3.Cling> diff --git a/res/layout-sw600dp/migration_cling.xml b/res/layout-sw600dp/migration_cling.xml deleted file mode 100644 index 19def6a56..000000000 --- a/res/layout-sw600dp/migration_cling.xml +++ /dev/null @@ -1,98 +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_portrait"> - <LinearLayout - android:id="@+id/content" - android:layout_width="360dp" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:orientation="vertical"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="top" - android:layout_marginBottom="15dp" - android:orientation="vertical"> - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - 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" /> - - <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="4dp" - android:layout_marginRight="4dp" - 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> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:orientation="vertical"> - <Button - style="@style/ClingButton" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/migration_cling_copy_apps" - android:onClick="dismissMigrationClingCopyApps" /> - <Button - style="@style/ClingButton" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/migration_cling_use_default" - android:onClick="dismissMigrationClingUseDefault" /> - </LinearLayout> - </LinearLayout> -</com.android.launcher3.Cling> diff --git a/res/layout-sw600dp/workspace_cling.xml b/res/layout-sw600dp/workspace_cling.xml deleted file mode 100644 index 63b5522ca..000000000 --- a/res/layout-sw600dp/workspace_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" - android:layout_width="match_parent" - android:layout_height="match_parent" - launcher:drawIdentifier="workspace_large"> - <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="400dp" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal|bottom" - 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: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" /> - <Button - style="@style/ClingButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:onClick="dismissWorkspaceCling" /> - </LinearLayout> - </FrameLayout> -</com.android.launcher3.Cling> diff --git a/res/layout-sw720dp/first_run_cling.xml b/res/layout-sw720dp/first_run_cling.xml deleted file mode 100644 index c43d8d32e..000000000 --- a/res/layout-sw720dp/first_run_cling.xml +++ /dev/null @@ -1,98 +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:gravity="center" /> - <TextView - style="@style/ClingAltText" - 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:gravity="center" /> - </LinearLayout> - <TextView - style="@style/ClingHintText" - android:id="@+id/search_bar_hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="top|end" - android:layout_marginEnd="120dp" - android:layout_marginTop="80dp" - android:gravity="center_horizontal" - android:maxWidth="160dp" - android:visibility="gone" - android:drawableTop="@drawable/cling_arrow_up" - android:drawablePadding="10dp" - android:text="@string/first_run_cling_search_bar_hint" /> - <TextView - style="@style/ClingHintText" - android:id="@+id/custom_content_hint" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical|start" - android:layout_marginStart="30dp" - android:gravity="start" - android:maxWidth="160dp" - android:visibility="gone" - android:drawableStart="@drawable/cling_arrow_start" - android:drawablePadding="10dp" - android:text="@string/first_run_cling_custom_content_hint" /> - <TextView - style="@style/ClingHintText" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical|end" - android:layout_marginEnd="30dp" - android:maxWidth="180dp" - android:drawableEnd="@drawable/cling_arrow_end" - android:drawablePadding="10dp" - 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="30dp" - android:layout_marginEnd="40dp" - android:layout_gravity="bottom|end" - android:onClick="dismissFirstRunCling" /> -</com.android.launcher3.Cling> diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index f8b843773..463a64fc6 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -74,31 +74,6 @@ 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" /> <com.android.launcher3.DrawableStateProxyView android:id="@+id/voice_button_proxy" diff --git a/res/layout-sw720dp/longpress_cling.xml b/res/layout-sw720dp/longpress_cling.xml new file mode 100644 index 000000000..ffae0bead --- /dev/null +++ b/res/layout-sw720dp/longpress_cling.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout 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" > + + <com.android.launcher3.ClearCircleLayout + android:id="@+id/cling_longpress_hole" + android:layout_width="match_parent" + android:layout_height="match_parent" + launcher:holeLocation="page_indicator" /> + + <FrameLayout + android:id="@+id/cling_content" + android:layout_width="360dp" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:background="#FF009688" + android:elevation="6dp" /> + +</FrameLayout>
\ No newline at end of file diff --git a/res/layout-sw720dp/migration_workspace_cling.xml b/res/layout-sw720dp/migration_workspace_cling.xml deleted file mode 100644 index eb13137a1..000000000 --- a/res/layout-sw720dp/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_large_portrait"> - <FrameLayout - android:id="@+id/content" - android:layout_width="480dp" - android:layout_height="match_parent" - android:layout_gravity="bottom|center_horizontal"> - <LinearLayout - android:id="@+id/migration_workspace_cling_bubble" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:layout_marginStart="25dp" - android:layout_marginEnd="25dp" - android:orientation="vertical"> - <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_horizontal" - android:src="@drawable/cling_arrow_down" /> - <Button - style="@style/ClingButton" - android:id="@+id/dismiss_migration_workspace_cling_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right" - android:onClick="dismissMigrationWorkspaceCling" /> - </LinearLayout> - </FrameLayout> -</com.android.launcher3.Cling> diff --git a/res/layout/longpress_cling_content.xml b/res/layout/longpress_cling_content.xml new file mode 100644 index 000000000..16bb49357 --- /dev/null +++ b/res/layout/longpress_cling_content.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="48dp" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/workspace_cling_longpress_title" + android:textColor="#E1000000" + android:textSize="24sp" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:text="@string/workspace_cling_longpress_description" + android:textColor="#E1000000" + android:textSize="16sp" /> + + <Button + android:id="@+id/cling_dismiss_longpress_info" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end" + android:layout_marginTop="24dp" + android:fontFamily="sans-serif-condensed" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:text="@string/workspace_cling_longpress_dismiss" + android:textColor="#FFFFFFFF" + android:textSize="14sp" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/layout/longpress_cling_welcome_content.xml b/res/layout/longpress_cling_welcome_content.xml new file mode 100644 index 000000000..4b3410b5e --- /dev/null +++ b/res/layout/longpress_cling_welcome_content.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="48dp" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="16dp" + android:text="@string/first_run_cling_title" + android:textColor="#E1000000" + android:textSize="34sp" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="sans-serif-condensed" + android:text="@string/workspace_cling_longpress_title" + android:textColor="#E1000000" + android:textSize="20sp" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/workspace_cling_longpress_description" + android:textColor="#E1000000" + android:textSize="16sp" /> + + <Button + android:id="@+id/cling_dismiss_longpress_info" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end" + android:layout_marginTop="24dp" + android:fontFamily="sans-serif-condensed" + android:paddingLeft="24dp" + android:paddingRight="24dp" + android:text="@string/workspace_cling_longpress_dismiss" + android:textColor="#FFFFFFFF" + android:textSize="14sp" /> + +</LinearLayout>
\ No newline at end of file diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 8d6c7f4e3..68f476dc5 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -23,4 +23,11 @@ <dimen name="app_widget_preview_label_margin_top">8dp</dimen> <dimen name="app_widget_preview_label_margin_left">@dimen/app_widget_preview_padding_left</dimen> <dimen name="app_widget_preview_label_margin_right">@dimen/app_widget_preview_padding_right</dimen> + +<!-- Cling --> + <dimen name="cling_migration_logo_height">400dp</dimen> + <dimen name="cling_migration_logo_width">274dp</dimen> + <dimen name="cling_migration_bg_size">600dp</dimen> + <dimen name="cling_migration_bg_shift">-300dp</dimen> + </resources> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 0db60c95c..a2bdafcd8 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -25,17 +25,15 @@ <attr name="sourceViewId" format="integer" /> </declare-styleable> - <!-- Cling specific attributes. These attributes are used to customize + <!-- ClearCircleLayout specific attributes. These attributes are used to customize the cling in XML files. --> - <declare-styleable name="Cling"> + <declare-styleable name="ClearCircleLayout"> <!-- Used to identify how to draw the cling bg --> - <attr name="drawIdentifier" format="string" /> + <attr name="holeLocation" format="string" /> </declare-styleable> - <!-- Page Indicator specific attributes. These attributes are used to customize - the cling in XML files. --> + <!-- Page Indicator specific attributes. --> <declare-styleable name="PageIndicator"> - <!-- Used to identify how to draw the cling bg --> <attr name="windowSize" format="integer" /> </declare-styleable> diff --git a/res/values/colors.xml b/res/values/colors.xml index 8aa2184e5..7ddb1e47f 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -37,5 +37,4 @@ <color name="outline_color">#FFFFFFFF</color> <color name="widget_text_panel">#FF374248</color> - <color name="first_run_cling_circle_background_color">#64b1ea</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b2e183c63..4fd8faba2 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -29,6 +29,11 @@ <dimen name="dynamic_grid_overview_bar_spacer_width">68dp</dimen> <!-- Cling --> + <dimen name="cling_migration_logo_height">240dp</dimen> + <dimen name="cling_migration_logo_width">165dp</dimen> + <dimen name="cling_migration_bg_size">400dp</dimen> + <dimen name="cling_migration_bg_shift">-200dp</dimen> + <dimen name="clingPunchThroughGraphicCenterRadius">94dp</dimen> <dimen name="folderClingMarginTop">20dp</dimen> <!-- The offset for the text in the cling --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 056930604..77ebc12d9 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -18,53 +18,6 @@ --> <resources> - <style name="ClingButton"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:paddingTop">15dp</item> - <item name="android:paddingBottom">15dp</item> - <item name="android:paddingLeft">50dp</item> - <item name="android:paddingRight">50dp</item> - <item name="android:text">@string/cling_dismiss</item> - <item name="android:textColor">#ffffff</item> - <item name="android:textStyle">bold</item> - <item name="android:textSize">16sp</item> - <item name="android:background">@drawable/cling_button_bg</item> - </style> - <style name="ClingTitleText"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_marginBottom">5dp</item> - <item name="android:textSize">@dimen/cling_title_text_size</item> - <item name="android:textColor">#ffffff</item> - <item name="android:fontFamily">sans-serif-condensed</item> - </style> - <style name="ClingText"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">@dimen/cling_text_size</item> - <item name="android:textColor">#80000000</item> - <item name="android:lineSpacingMultiplier">1.1</item> - </style> - <style name="ClingAltTitleText"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">@dimen/cling_alt_title_text_size</item> - <item name="android:textColor">#49C0EC</item> - </style> - <style name="ClingAltText"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">@dimen/cling_alt_text_size</item> - <item name="android:textColor">#49C0EC</item> - </style> - <style name="ClingHintText"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:textSize">@dimen/cling_hint_text_size</item> - <item name="android:textColor">#80ffffff</item> - <item name="android:fontFamily">sans-serif-condensed</item> - </style> <style name="WorkspaceIcon"> <item name="android:layout_width">match_parent</item> |