diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-05-23 15:55:41 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-05-23 16:00:09 -0700 |
commit | ded0fdba52d94f8c841598a14dbece36a2f1849c (patch) | |
tree | 98911b25737775e8ea128ee86f3e4606062e641b /res | |
parent | 33c2ed341e376bf8778cf10a98ace072e2ea3bbe (diff) | |
download | android_packages_apps_Trebuchet-ded0fdba52d94f8c841598a14dbece36a2f1849c.tar.gz android_packages_apps_Trebuchet-ded0fdba52d94f8c841598a14dbece36a2f1849c.tar.bz2 android_packages_apps_Trebuchet-ded0fdba52d94f8c841598a14dbece36a2f1849c.zip |
Removing logic for workspace migration from Launcher2
Change-Id: I8a121d74862f665c58406f8d5c7eb1263e7ccff3
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-nodpi/ic_migration.png | bin | 73676 -> 0 bytes | |||
-rw-r--r-- | res/drawable/bg_migration_cling.xml | 11 | ||||
-rw-r--r-- | res/layout-land/migration_cling.xml | 106 | ||||
-rw-r--r-- | res/layout-port/migration_cling.xml | 109 | ||||
-rw-r--r-- | res/values/strings.xml | 3 |
5 files changed, 0 insertions, 229 deletions
diff --git a/res/drawable-nodpi/ic_migration.png b/res/drawable-nodpi/ic_migration.png Binary files differdeleted file mode 100644 index 14f8721d8..000000000 --- a/res/drawable-nodpi/ic_migration.png +++ /dev/null diff --git a/res/drawable/bg_migration_cling.xml b/res/drawable/bg_migration_cling.xml deleted file mode 100644 index bfff5a41a..000000000 --- a/res/drawable/bg_migration_cling.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?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/layout-land/migration_cling.xml b/res/layout-land/migration_cling.xml deleted file mode 100644 index 269c1aee6..000000000 --- a/res/layout-land/migration_cling.xml +++ /dev/null @@ -1,106 +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. ---> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto" - android:id="@+id/migration_cling" - android:layout_width="match_parent" - android:layout_height="match_parent" - launcher:layout_ignoreInsets="true" - android:background="#FF009688" - android:baselineAligned="false" - android:gravity="center_vertical" > - - <FrameLayout - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" > - - <ImageView - android:layout_width="@dimen/cling_migration_bg_size" - android:layout_height="@dimen/cling_migration_bg_size" - android:layout_gravity="center" - android:background="@drawable/bg_migration_cling" /> - - <ImageView - android:layout_width="@dimen/cling_migration_logo_width" - android:layout_height="@dimen/cling_migration_logo_height" - android:layout_gravity="center" - android:src="@drawable/ic_migration" /> - </FrameLayout> - - <LinearLayout - android:layout_width="@dimen/cling_migration_content_width" - android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/cling_migration_content_margin" - android:layout_marginRight="@dimen/cling_migration_content_margin" - android:orientation="vertical" - android:paddingLeft="24dp" - android:paddingRight="24dp" > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingBottom="8dp" - 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-medium" - android:text="@string/migration_cling_title" - android:textColor="#E1000000" - android:textSize="20sp" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingBottom="24dp" - android:text="@string/migration_cling_description" - android:textColor="#99000000" - android:textSize="16sp" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <Button - android:id="@+id/cling_dismiss_migration_copy_apps" - style="?android:attr/buttonBarButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:fontFamily="sans-serif-medium" - android:text="@string/migration_cling_copy_apps" - android: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:layout_weight="1" - android:fontFamily="sans-serif-medium" - android:text="@string/migration_cling_use_default" - android:textColor="#deFFFFFF" - android:textSize="14sp" /> - </LinearLayout> - </LinearLayout> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout-port/migration_cling.xml b/res/layout-port/migration_cling.xml deleted file mode 100644 index 3f696a216..000000000 --- a/res/layout-port/migration_cling.xml +++ /dev/null @@ -1,109 +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. ---> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto" - android:id="@+id/migration_cling" - android:layout_width="match_parent" - android:layout_height="match_parent" - launcher:layout_ignoreInsets="true" - android:background="#FF009688" > - - <RelativeLayout - android:layout_width="match_parent" - 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="@dimen/cling_migration_content_width" - android:layout_height="wrap_content" - android:layout_below="@+id/ic_cling_migration" - android:layout_marginStart="@dimen/cling_migration_content_margin" - android:layout_marginLeft="@dimen/cling_migration_content_margin" - android:orientation="vertical" - android:paddingLeft="24dp" - android:paddingRight="24dp" > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingBottom="8dp" - 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-medium" - android:text="@string/migration_cling_title" - android:textColor="#E1000000" - android:textSize="20sp" /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingBottom="24dp" - android:text="@string/migration_cling_description" - android:textColor="#99000000" - android:textSize="16sp" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <Button - android:id="@+id/cling_dismiss_migration_copy_apps" - style="?android:attr/buttonBarButtonStyle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:fontFamily="sans-serif-medium" - android:text="@string/migration_cling_copy_apps" - android: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:layout_weight="1" - android:fontFamily="sans-serif-medium" - android:text="@string/migration_cling_use_default" - android:textColor="#deFFFFFF" - android:textSize="14sp" /> - </LinearLayout> - </LinearLayout> - </RelativeLayout> - -</FrameLayout>
\ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 4c9d0b5fa..e675a92c5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -21,9 +21,6 @@ <!-- General --> <skip /> - <!-- URI used to import old favorites. [DO NOT TRANSLATE] --> - <string name="old_launcher_provider_uri" translatable="false">content://com.android.launcher2.settings/favorites?notify=true</string> - <!-- Application name --> <string name="app_name">Launcher3</string> <!-- Default folder name --> |