Merge "Adding migration Clings. (Bug 11973614)" into jb-ub-now-kermit (234b506f) · Commits · e / os / android_packages_apps_Trebuchet

proguard.flags

+3 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,9 @@
		public void onClickAllAppsButton(android.view.View);
		public void onClickAppMarketButton(android.view.View);
		public void dismissFirstRunCling(android.view.View);
		public void dismissMigrationClingCopyApps(android.view.View);
		public void dismissMigrationClingUseDefault(android.view.View);
		public void dismissMigrationWorkspaceCling(android.view.View);
		public void dismissWorkspaceCling(android.view.View);
		public void dismissAllAppsCling(android.view.View);
		}

res/layout-port/launcher.xml

+10 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,16 @@
		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"

res/layout-port/migration_cling.xml

0 → 100644

+93 −0

Original line number	Diff line number	Diff line
		<?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">
		<FrameLayout
		android:id="@+id/content"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical">

		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="top"
		android:layout_marginStart="25dp"
		android:layout_marginEnd="25dp"
		android:orientation="vertical">
		<TextView
		style="@style/ClingAltTitleText"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_gravity="top"
		android:layout_marginBottom="10dp"
		android:gravity="center"
		android:text="@string/first_run_cling_title" />

		<ImageView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center_horizontal"
		android:src="@drawable/cling_arrow_up" />
		<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/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:layout_marginStart="25dp"
		android:layout_marginEnd="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>

res/layout-port/migration_workspace_cling.xml

0 → 100644

+70 −0

Original line number	Diff line number	Diff line
		<?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_marginRight="20dp"
		android:layout_gravity="bottom\|right"
		android:onClick="dismissMigrationWorkspaceCling" />
		</FrameLayout>
		</com.android.launcher3.Cling>

res/values/strings.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -216,6 +216,14 @@ s -->
		<string name="first_run_cling_search_bar_hint"></string>
		<!-- The description of how to use the workspace [CHAR_LIMIT=60] -->
		<string name="first_run_cling_create_screens_hint">Create more screens for apps and folders</string>
		<!-- The title text for the migration cling [CHAR_LIMIT=30] -->
		<string name="migration_cling_title">Copy your apps?</string>
		<!-- The description of what migration does [CHAR_LIMIT=60] -->
		<string name="migration_cling_description">Import apps and folders from your old Home screens?</string>
		<!-- The description of the button to migrate apps from another launcher [CHAR_LIMIT=30] -->
		<string name="migration_cling_copy_apps">COPY APPS</string>
		<!-- The description of the button to use the default launcher layout [CHAR_LIMIT=30] -->
		<string name="migration_cling_use_default">USE DEFAULT</string>
		<!-- The title text for the workspace cling [CHAR_LIMIT=30] -->
		<string name="workspace_cling_title">Organize your space</string>
		<!-- The description of how to use the workspace [CHAR_LIMIT=70] -->