summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorAndrew Sapperstein <asapperstein@google.com>2016-06-30 18:10:09 -0700
committerAndrew Sapperstein <asapperstein@google.com>2016-07-01 10:23:20 -0700
commit932eb8313cbd5334be7fdcd4df766493101c2a9b (patch)
tree5648bb3a046f43de50a4117f35b185b66f37bf6b /res
parent8b9cb08b02d71e2d6b8734a294f3411c81022b5d (diff)
downloadandroid_packages_apps_Trebuchet-932eb8313cbd5334be7fdcd4df766493101c2a9b.tar.gz
android_packages_apps_Trebuchet-932eb8313cbd5334be7fdcd4df766493101c2a9b.tar.bz2
android_packages_apps_Trebuchet-932eb8313cbd5334be7fdcd4df766493101c2a9b.zip
Delete all* references to launcher clings.
Launcher clings are dead. Delete all the code and resources associated with them. * Did not delete the actual code the marks the cling as dismissed since it's used in db upgrade and backup/restore paths. Figured we probably want to keep that. Change-Id: I28841b4a430187b62b239afeb64bee81a798e259 Fixes: 29461092
Diffstat (limited to 'res')
-rw-r--r--res/drawable-hdpi/cling_bg.9.pngbin1023 -> 0 bytes
-rw-r--r--res/drawable-mdpi/cling_bg.9.pngbin750 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/cling_bg.9.pngbin1443 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/cling_bg.9.pngbin2458 -> 0 bytes
-rw-r--r--res/layout-land/longpress_cling.xml28
-rw-r--r--res/layout-port/longpress_cling.xml18
-rw-r--r--res/layout-sw600dp-port/longpress_cling.xml28
-rw-r--r--res/layout/longpress_cling_content.xml43
-rw-r--r--res/layout/longpress_cling_welcome_content.xml54
-rw-r--r--res/values-sw600dp/dimens.xml8
-rw-r--r--res/values-sw720dp/dimens.xml4
-rw-r--r--res/values/colors.xml1
-rw-r--r--res/values/strings.xml18
13 files changed, 0 insertions, 202 deletions
diff --git a/res/drawable-hdpi/cling_bg.9.png b/res/drawable-hdpi/cling_bg.9.png
deleted file mode 100644
index fb101f4d4..000000000
--- a/res/drawable-hdpi/cling_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/cling_bg.9.png b/res/drawable-mdpi/cling_bg.9.png
deleted file mode 100644
index 6384f29cb..000000000
--- a/res/drawable-mdpi/cling_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/cling_bg.9.png b/res/drawable-xhdpi/cling_bg.9.png
deleted file mode 100644
index 7d8b1f0d3..000000000
--- a/res/drawable-xhdpi/cling_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/cling_bg.9.png b/res/drawable-xxhdpi/cling_bg.9.png
deleted file mode 100644
index d31ea7092..000000000
--- a/res/drawable-xxhdpi/cling_bg.9.png
+++ /dev/null
Binary files differ
diff --git a/res/layout-land/longpress_cling.xml b/res/layout-land/longpress_cling.xml
deleted file mode 100644
index 9672dd8a0..000000000
--- a/res/layout-land/longpress_cling.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res-auto"
- android:id="@+id/longpress_cling"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- launcher:layout_ignoreInsets="true"
- android:background="@color/cling_scrim_background"
- android:orientation="vertical" >
-
- <Space
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1" />
-
- <FrameLayout
- android:id="@+id/cling_content"
- android:layout_width="360dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:background="@drawable/cling_bg" />
-
- <Space
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="2" />
-
-</LinearLayout> \ No newline at end of file
diff --git a/res/layout-port/longpress_cling.xml b/res/layout-port/longpress_cling.xml
deleted file mode 100644
index c0b526713..000000000
--- a/res/layout-port/longpress_cling.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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"
- android:id="@+id/longpress_cling"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- launcher:layout_ignoreInsets="true"
- android:background="@color/cling_scrim_background" >
-
- <FrameLayout
- android:id="@+id/cling_content"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="top"
- android:background="@drawable/cling_bg"
- android:tag="crop_bg_top_and_sides" />
-
-</FrameLayout> \ No newline at end of file
diff --git a/res/layout-sw600dp-port/longpress_cling.xml b/res/layout-sw600dp-port/longpress_cling.xml
deleted file mode 100644
index c4573d535..000000000
--- a/res/layout-sw600dp-port/longpress_cling.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:launcher="http://schemas.android.com/apk/res-auto"
- android:id="@+id/longpress_cling"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- launcher:layout_ignoreInsets="true"
- android:background="@color/cling_scrim_background"
- android:orientation="vertical" >
-
- <Space
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="1" />
-
- <FrameLayout
- android:id="@+id/cling_content"
- android:layout_width="360dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:background="@drawable/cling_bg" />
-
- <Space
- android:layout_width="match_parent"
- android:layout_height="0dp"
- android:layout_weight="3" />
-
-</LinearLayout> \ No newline at end of file
diff --git a/res/layout/longpress_cling_content.xml b/res/layout/longpress_cling_content.xml
deleted file mode 100644
index 47a8e9797..000000000
--- a/res/layout/longpress_cling_content.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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:paddingBottom="24dp"
- android:paddingTop="36dp" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="36dp"
- android:paddingRight="36dp"
- 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:paddingLeft="36dp"
- android:paddingRight="36dp"
- android:text="@string/workspace_cling_longpress_description"
- android:textColor="#99000000"
- 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_marginRight="12dp"
- android:layout_marginTop="27dp"
- android:fontFamily="sans-serif-medium"
- 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
deleted file mode 100644
index dd4f8d767..000000000
--- a/res/layout/longpress_cling_welcome_content.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?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:paddingBottom="24dp"
- android:paddingTop="36dp" >
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:paddingLeft="36dp"
- android:paddingRight="36dp"
- 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:layout_marginBottom="5.3dp"
- android:fontFamily="sans-serif-medium"
- android:paddingLeft="36dp"
- android:paddingRight="36dp"
- 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:paddingLeft="36dp"
- android:paddingRight="36dp"
- android:text="@string/workspace_cling_longpress_description"
- android:textColor="#99000000"
- 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_marginRight="12dp"
- android:layout_marginTop="27dp"
- android:fontFamily="sans-serif-medium"
- 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 e5f2d829b..85a436cf9 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -26,14 +26,6 @@
<dimen name="all_apps_background_canvas_height">525dp</dimen>
<dimen name="all_apps_icon_width_gap">36dp</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>
- <dimen name="cling_migration_content_margin">64dp</dimen>
- <dimen name="cling_migration_content_width">280dp</dimen>
-
<!-- Widget tray -->
<dimen name="widget_section_indent">56dp</dimen>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 789f4533c..c2d20a310 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -22,8 +22,4 @@
<dimen name="all_apps_empty_search_message_top_offset">64dp</dimen>
<dimen name="all_apps_empty_search_bg_top_offset">180dp</dimen>
-<!-- Cling -->
- <dimen name="cling_migration_content_margin">96dp</dimen>
- <dimen name="cling_migration_content_width">320dp</dimen>
-
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 44e77e22b..d1b7a0c35 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -22,7 +22,6 @@
over the delete target or the info target -->
<color name="delete_target_hover_tint">#FFC1C1C1</color>
<color name="uninstall_target_hover_tint">#FFF0592B</color>
- <color name="cling_scrim_background">#80000000</color>
<color name="focused_background">#80c6c5c5</color>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 4e5fcff81..9eabf7177 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -121,24 +121,6 @@
<!-- Description for a new page on homescreen[CHAR_LIMIT=none] -->
<string name="workspace_new_page">New home screen page</string>
- <!-- Clings -->
- <!-- The title text for the workspace cling [CHAR_LIMIT=30] -->
- <string name="first_run_cling_title">Welcome</string>
- <!-- The title text for the migration cling [CHAR_LIMIT=30] -->
- <string name="migration_cling_title">Copy your app icons</string>
- <!-- The description of what migration does [CHAR_LIMIT=70] -->
- <string name="migration_cling_description">Import icons 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 ICONS</string>
- <!-- The description of the button to use the default launcher layout [CHAR_LIMIT=30] -->
- <string name="migration_cling_use_default">START FRESH</string>
- <!-- The title text for workspace longpress action [CHAR_LIMIT=40] -->
- <string name="workspace_cling_longpress_title">Wallpapers, widgets, &amp; settings</string>
- <!-- The description of how to use the workspace [CHAR_LIMIT=70] -->
- <string name="workspace_cling_longpress_description">Touch &amp; hold background to customize</string>
- <!-- The description of the button to dismiss the cling [CHAR_LIMIT=30] -->
- <string name="workspace_cling_longpress_dismiss">GOT IT</string>
-
<!-- Folder accessibility -->
<!-- The format string for when a folder is opened, speaks the dimensions -->
<string name="folder_opened">Folder opened, <xliff:g id="width" example="5">%1$d</xliff:g> by <xliff:g id="height" example="3">%2$d</xliff:g></string>