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/layout-sw720dp | |
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/layout-sw720dp')
-rw-r--r-- | res/layout-sw720dp/first_run_cling.xml | 98 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 25 | ||||
-rw-r--r-- | res/layout-sw720dp/longpress_cling.xml | 22 | ||||
-rw-r--r-- | res/layout-sw720dp/migration_workspace_cling.xml | 70 |
4 files changed, 22 insertions, 193 deletions
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> |