From 932eb8313cbd5334be7fdcd4df766493101c2a9b Mon Sep 17 00:00:00 2001
From: Andrew Sapperstein <asapperstein@google.com>
Date: Thu, 30 Jun 2016 18:10:09 -0700
Subject: [PATCH] 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
---
 res/drawable-hdpi/cling_bg.9.png              | Bin 1023 -> 0 bytes
 res/drawable-mdpi/cling_bg.9.png              | Bin 750 -> 0 bytes
 res/drawable-xhdpi/cling_bg.9.png             | Bin 1443 -> 0 bytes
 res/drawable-xxhdpi/cling_bg.9.png            | Bin 2458 -> 0 bytes
 res/layout-land/longpress_cling.xml           |  28 ---
 res/layout-port/longpress_cling.xml           |  18 --
 res/layout-sw600dp-port/longpress_cling.xml   |  28 ---
 res/layout/longpress_cling_content.xml        |  43 ----
 .../longpress_cling_welcome_content.xml       |  54 -----
 res/values-sw600dp/dimens.xml                 |   8 -
 res/values-sw720dp/dimens.xml                 |   4 -
 res/values/colors.xml                         |   1 -
 res/values/strings.xml                        |  18 --
 .../android/launcher3/BorderCropDrawable.java |  90 ---------
 src/com/android/launcher3/Launcher.java       |  53 +----
 src/com/android/launcher3/LauncherClings.java | 184 +-----------------
 16 files changed, 3 insertions(+), 526 deletions(-)
 delete mode 100644 res/drawable-hdpi/cling_bg.9.png
 delete mode 100644 res/drawable-mdpi/cling_bg.9.png
 delete mode 100644 res/drawable-xhdpi/cling_bg.9.png
 delete mode 100644 res/drawable-xxhdpi/cling_bg.9.png
 delete mode 100644 res/layout-land/longpress_cling.xml
 delete mode 100644 res/layout-port/longpress_cling.xml
 delete mode 100644 res/layout-sw600dp-port/longpress_cling.xml
 delete mode 100644 res/layout/longpress_cling_content.xml
 delete mode 100644 res/layout/longpress_cling_welcome_content.xml
 delete mode 100644 src/com/android/launcher3/BorderCropDrawable.java

diff --git a/res/drawable-hdpi/cling_bg.9.png b/res/drawable-hdpi/cling_bg.9.png
deleted file mode 100644
index fb101f4d4a1d3dbb16a30ca486a3b00494ce49e1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1023
zcmV<b0|5MqP)<h;3K|Lk000e1NJLTq002n<002D*1^@s6;lM--000BVNkl<ZcmeI2
z1B`5G5QWcedu@%e#<OkP#@M#?Y#VDtYcp7TV{>f{YC4r<^v~`c_noTbi(6lx^WR3H
z3)9F1;`GP!meClK!O>cvYgi7<goUsYcEUk84T6KQ^Xs$l>(%rKvJf`DLoab9aSd@j
zbAti6j<}Y%itrIG7G^@{!-70+2hz4jVMkFac9)*Qu9CCZS$qz4g%|wP7F-N?DsvAY
zaq~Ldc5^g<+llKr5Vp=lX&gBlQnp3lK;?5dT=N&vXi(~Lu<AQx#+Sq8ydOX)C(Of5
z(o~Wxgo6?kM|biE(P((~lzxMu_s;=v4-v%mv#BJRxRWmIE!%H=LCk@wpD}yNMgT*I
z2(F!zeKe{hxv{70z#x;f3BXVyk}KyT%pyr7>6WxvB#9)EB$7muNNR&f5=o6BNs=Uz
zM3P7nNg~M*h$N9Dl0=e7lHa&RlKk&h`IC<S-4y@e%0IY@U4XRh5oGxJL9q*v6<-0j
zOT7!A+$!<<w@RWZQR!s*40e^Ar>&Cajgm{u<yO=Zd&=IS2mWV3y!c%uU!Xku8C2#z
zf$F?RQCsjZYTG>Ls@y|J+Oi(E>)R^n>VDFV(6pN{d-8oG^znWcRgap2w=sU?5@^~(
z0HU};x9HhV>Wxh|7e~~G)r%vsxBQX*s3{A23!{cEAVK#72qSLfH`v|wd8;<vdShqO
z+(M=eW|Irs*G6Jr`NMsjsCuf@dzdh4F$ua4Kqx2P!;LWO*qQ9rB~&wEB~eanUKvWF
zF87frN>Kh=Ed&K~mE7tBxc`QeN1`-1v0-@#iMrIw)vHH!{u>xMWIhWD;d90{00r^1
zOq7WdwRLqkiMrTJqW<+C(qo4&BtiEEfFOk^I-@|<V^RO~aK+xl_>qfSB<Q+85TvM{
z=EVAC!Pr}Vp@$Mh70Y`KqlV1q1O*37g4Bs(QJYqTlBjdt5_PEhUp|8ZUy!1DBx+@|
zsPpuK|JE<ae@MTHu_G3O1qD#WbX3noiCVWbh(-OS>yWO>d(~(OQi}qdSi6Kom7S&+
z|L1=vhy@Mte^WQ4Aoa(CjVnS})L)&RLH<K}=mH~EOh@%d)Ea-H&VbG+Ma5pms3G$V
zTQMEgyMxZClWl(F`v)}z&tv!l(@4-=0D_DtNJsTF2YrRP9lJ_OaG>e~9H{&R)%iy-
zdCX`M6bj&0;%dUFLy#d8Wyjr7K02p@uzFEALW6Dsa2?C>5)K_dWf)eJnPu6)zg;nQ
tPLByPEUOK@mK+%w85tRwMuYOdrU`wfIsa*bE*t;=002ovPDHLkV1kx<<dXmZ

diff --git a/res/drawable-mdpi/cling_bg.9.png b/res/drawable-mdpi/cling_bg.9.png
deleted file mode 100644
index 6384f29cb2923a582e341cd10e6ea37ab2ae30b9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 750
zcmV<K0ulX*P)<h;3K|Lk000e1NJLTq001%o001fo1^@s6@wx~{0008DNkl<ZcmeI$
z1B_fj90u@j9?v!xXVkXasHtt+wr$&tT`R2J#x`nm`+u9s^)%(;?d5&RckA8xJ<s6}
z<AVR<k>6(K>fcAA%2b7_QZ<uQ<zte52V-u4EURc(CjuSYr=o513^Z%tK$Ch-zqV<8
zCkk`ZpeV5b!l}9&B#1-^4GX8%#pY#4uyy%eY*}`X?mxihrT*{wMdvYY@DS*l6F{7S
z5v>^+t(!*D;7?=6s_#^n>AGRjBh)Br1;EbNj9l4frC?~EbZlGk)O-lut;=7ceT%*T
z3aGJspK+Cks2JQU5Fq^k6!OhW6+tqpCd7hR5DVh6)`$hMAQr@ec(4{EJrE&*I3Ibz
z=Og)|`G^r2EgKs%#G~|~ZzhC%$NEKgQN5rA0Gnur$mi^mhB*_9v1!RVY+iPjZqH-m
z;)~c&(o5L1^ftDy`s9_tZd>sNYZu(0UZX)@{`tGqHS>>SM8EFPR09!1)kJf4=Eg`&
zMYbaZ^=ihDJ|1~lNyu>~yPIuKL8lId^u-6U!^4=ZD_&vR=ncqBYlP&4T-Y-*N`5z&
znwk_3S&9S@%J&TkzX>b-zpYYL-DNBY1AAoBn%T!Oo<gigLTnuX>C_0SR_^y@UWWe<
zM>3`vM>vmQ48+vY>kuDX8$c>w;xc>_jv3U`!0hFie?*L0>n}uUj7pnX8a6H2!!du0
zScAA2e<Dg@00WaMz=#o3My*C{bgfbd2|WJA^zUY1c8f8k5R*r)LQIqx;de~Gt|^4s
zCBhKmB_UQKI?_xC0j5u91G9q${;|S!(&P~<5EWSyK#J)Q0!%VtwiDn3KVv_q9eW9_
ziRvas2rzxSBx2oyiP*SgA7+gog!ot|fCOrYX%Pa9f*@T-QhX>F3*`V!fG~9!uf)qx
gwPMAJ%Ul)b2hLG|;T*5<?EnA(07*qoM6N<$f?PdU%K!iX

diff --git a/res/drawable-xhdpi/cling_bg.9.png b/res/drawable-xhdpi/cling_bg.9.png
deleted file mode 100644
index 7d8b1f0d3abff8bb63daac4f7baf09534c0f02fa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1443
zcmV;U1zh@xP)<h;3K|Lk000e1NJLTq003bC002=41^@s6!hFaM000GQNkl<ZcmeI5
z18|*b6o%jA+K64djn~F#ZL79zM73>=u{LK%YkS99+seL8Pdnda{`rIdR=MZQJZ+Mu
z7w>b=`L4eI!eKQF=~H^$wK6)6lIrj?iOaxki{c`gLPn~>cM}is5kCo%kR?ix1SBV~
z<mT>-kPM6P10+J?BuR3GJU}t>$RXL1QCu<$h!9u1L>L|5CSJs&LEL*w2^LJf0!wGy
zhlNvzVcw(>m^FShW{w+!8RN#LJu?lajJgjuU403%61@PFkOGn=GJNe4VT>Rz@^V60
zJpE#9sDB)r8^6Vtre=E-=JW^F*L{xJ6PBPbzY0KaQYsx1mX645PZxNIpH>H8Q^QL<
z@&7d74zjV~JB+w{D%`G00DYw^vPi(b8)PjITLG+?Ka?l<vxeG9>SjHPc<cfILr71O
zC*9z-lOSsWd?bW5OX@XD2drNFAxHWZ0BT4-Qbc0LNNR3NLYNX7HB3hmJ`xGFq(3R{
zhy=e%NV$XovM$7lFYP3#1eI`Q8cR?Kib_xkib_xkib_xkib_xkiUSGFT|k0LP;?xr
z1VtsN1VtsN1VtsN1VtsN1VtsN1VtsNg!Dw;2B{K^{Rs^krUO<j`k-C=6YO{DEEvHP
z`$YroBz3bNN5X!mPTPCdW{xYzriNE_&sxV}Za-n{{d3@US4kI?8hh5-BSA(|kFp3F
z=HA2;d;^=Ce$#N<#ox^9Yb=?u4Sjl?Bbx@xNNz{A(aK1YP2|10M=*1IHAmAVE;O64
za^Y5fy$wzCcB1hJb9cd--B`QyWnQSi&d4w~)P04eGatgDX@?o;K`fiK5B0P6pkdB#
zi|e`*0)KBcCJw(J{dx@s&`s8X91<mdV|RahHj|48SszG<#7LH$XaOlCMHUpp<to8#
z*Pc%i51(lwDBw$sA6kcG{2~C=WH9MNy31H8vY=2XAo(O$vWk<iDZsi5>_xaOWJJVl
z%z`*ckR;sh91Ojq2J4qSBqGj?4wx{kUIbK;0TO<Jakzw-4N=J_BzgHHKbI-M$w5X;
zAwC=Y$Ax*lF)mP*SYLPgi`Y>AH3c*vnYa)@CFy6(^OywdCq4_j2A<R(?L}m?1J`lP
z?(uoUoRj4gabz_8ecB3`NC8<b0xFDM_}L^v{N^p%9y7O7d+;f9l=<QFg?THhpom9K
zHxU%@4R0ikBA{I6f3eK;5b>Jh#GX@K_6xlKXh%@QhPp>j8xb4ojtWQ~7tq&Qfb)P)
zM-h)Pgnv$P2YgEbO-RP=JHQao6-7LL%0z6e{|=K30kQ^kAptfbWU)3xJRu@Zwt(d#
zpn~+V5RhpK=(-}j$3)aWd9p-M!1tImLIj{Zodnp6n9$M@Pcfu_Ppp83A6f(?%nm?t
zItj25;W;Ma8K)v_1pJ7}BUT_0b08o+M3i$hJ!|vSd8!2TO>+S@B0NV#3@zu}elAra
zDBx!bSc!P_0$TxQsR(x%<6A^L?^whp5fF>EdMctV0V=`|cZ-N2PDDrttUxSsfePsC
z13HiAXh&?Y6=5S_Bu7w8JHW9Bx%=9F5i)|Nj9i6;3P|-+9F-hRFPI{11tjBE0>VxN
zs0hE0B8FE{#EaG<M8NdXE0L8rztxj**(nsDA~@%(WU>CYm4F{GdqM+pvugniB)vp{
z*#R!3q*O!*;~p4*HH%j<__xWYSiAITOdmS}1-S#{4OXQjpCm{q^#W9c4;dK&ln;#K
z?wh(}=p6%bZcQnIfqdgL43Z>D0>qR05u_sA#M|l<O~M8t;{zkysS}`O|IQBs2X8IW
xO5wXdGERE<T3T9KT3T9KT3TAoZJ>0p{s+!`T`E!s?k4~M002ovPDHLkV1l!oZiWB=

diff --git a/res/drawable-xxhdpi/cling_bg.9.png b/res/drawable-xxhdpi/cling_bg.9.png
deleted file mode 100644
index d31ea70926c84971e98db66e92b305e4dc6592a1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2458
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
Yf813lySm=q<^TWy07*qoM6N<$f@|oCh5!Hn

diff --git a/res/layout-land/longpress_cling.xml b/res/layout-land/longpress_cling.xml
deleted file mode 100644
index 9672dd8a05..0000000000
--- 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 c0b526713a..0000000000
--- 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 c4573d5354..0000000000
--- 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 47a8e97976..0000000000
--- 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 dd4f8d7679..0000000000
--- 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 e5f2d829bf..85a436cf92 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 789f4533cc..c2d20a3101 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 44e77e22b2..d1b7a0c351 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 4e5fcff817..9eabf71777 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>
diff --git a/src/com/android/launcher3/BorderCropDrawable.java b/src/com/android/launcher3/BorderCropDrawable.java
deleted file mode 100644
index caf497d9b5..0000000000
--- a/src/com/android/launcher3/BorderCropDrawable.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright (C) 2014 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.
- */
-
-package com.android.launcher3;
-
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-
-public class BorderCropDrawable extends Drawable {
-
-    private final Drawable mChild;
-    private final Rect mBoundsShift;
-    private final Rect mPadding;
-
-    BorderCropDrawable(Drawable child, boolean cropLeft,
-            boolean cropTop, boolean cropRight, boolean cropBottom) {
-        mChild = child;
-
-        mBoundsShift = new Rect();
-        mPadding = new Rect();
-        mChild.getPadding(mPadding);
-
-        if (cropLeft) {
-            mBoundsShift.left = -mPadding.left;
-            mPadding.left = 0;
-        }
-        if (cropTop) {
-            mBoundsShift.top = -mPadding.top;
-            mPadding.top = 0;
-        }
-        if (cropRight) {
-            mBoundsShift.right = mPadding.right;
-            mPadding.right = 0;
-        }
-        if (cropBottom) {
-            mBoundsShift.bottom = mPadding.bottom;
-            mPadding.bottom = 0;
-        }
-    }
-
-    @Override
-    protected void onBoundsChange(Rect bounds) {
-        mChild.setBounds(
-                bounds.left + mBoundsShift.left,
-                bounds.top + mBoundsShift.top,
-                bounds.right + mBoundsShift.right,
-                bounds.bottom + mBoundsShift.bottom);
-    }
-
-    @Override
-    public boolean getPadding(Rect padding) {
-        padding.set(mPadding);
-        return (padding.left | padding.top | padding.right | padding.bottom) != 0;
-    }
-
-    @Override
-    public void draw(Canvas canvas) {
-        mChild.draw(canvas);
-    }
-
-    @Override
-    public int getOpacity() {
-        return mChild.getOpacity();
-    }
-
-    @Override
-    public void setAlpha(int alpha) {
-        mChild.setAlpha(alpha);
-    }
-
-    @Override
-    public void setColorFilter(ColorFilter cf) {
-        mChild.setColorFilter(cf);
-    }
-}
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index f143847df8..9e3dfb4533 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -293,8 +293,6 @@ public class Launcher extends Activity
     /** Maps launcher activity components to their list of shortcut ids. */
     private MultiHashMap<ComponentKey, String> mDeepShortcutMap = new MultiHashMap<>();
 
-    private LauncherClings mClings;
-
     private View.OnTouchListener mHapticFeedbackTouchListener;
 
     // Related to the auto-advancing of widgets
@@ -3362,18 +3360,6 @@ public class Launcher extends Activity
         return anim;
     }
 
-    public void onLauncherClingShown() {
-        // When a launcher cling appears, it should cover the underlying layers, so their focus
-        // should be blocked.
-        if (mDragLayer.getDescendantFocusability() != ViewGroup.FOCUS_BLOCK_DESCENDANTS) {
-            mDragLayer.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);
-        }
-    }
-
-    public void onLauncherClingDismissed() {
-        mDragLayer.setDescendantFocusability(ViewGroup.FOCUS_AFTER_DESCENDANTS);
-    }
-
     public void enterSpringLoadedDragMode() {
         if (LOGD) Log.d(TAG, String.format("enterSpringLoadedDragMode [mState=%s", mState.name()));
         if (isStateSpringLoaded()) {
@@ -3994,8 +3980,7 @@ public class Launcher extends Activity
 
     private boolean canRunNewAppsAnimation() {
         long diff = System.currentTimeMillis() - mDragController.getLastGestureUpTime();
-        return diff > (NEW_APPS_ANIMATION_INACTIVE_TIMEOUT_SECONDS * 1000)
-                && (mClings == null || !mClings.isVisible());
+        return diff > (NEW_APPS_ANIMATION_INACTIVE_TIMEOUT_SECONDS * 1000);
     }
 
     private ValueAnimator createNewAppBounceAnimation(View v, int i) {
@@ -4369,42 +4354,6 @@ public class Launcher extends Activity
         }
     }
 
-    public void dismissIntroScreen() {
-        markIntroScreenDismissed();
-        if (showFirstRunActivity()) {
-            // We delay hiding the intro view until the first run activity is showing. This
-            // avoids a blip.
-            mWorkspace.postDelayed(new Runnable() {
-                @Override
-                public void run() {
-                    mDragLayer.dismissOverlayView();
-                    showFirstRunClings();
-                }
-            }, ACTIVITY_START_DELAY);
-        } else {
-            mDragLayer.dismissOverlayView();
-            showFirstRunClings();
-        }
-        changeWallpaperVisiblity(true);
-    }
-
-    private void markIntroScreenDismissed() {
-        SharedPreferences.Editor editor = mSharedPrefs.edit();
-        editor.putBoolean(INTRO_SCREEN_DISMISSED, true);
-        editor.apply();
-    }
-
-    @Thunk void showFirstRunClings() {
-        // The two first run cling paths are mutually exclusive, if the launcher is preinstalled
-        // on the device, then we always show the first run cling experience (or if there is no
-        // launcher2). Otherwise, we prompt the user upon started for migration
-        LauncherClings launcherClings = new LauncherClings(this);
-        if (launcherClings.shouldShowFirstRunOrMigrationClings()) {
-            mClings = launcherClings;
-            launcherClings.showLongPressCling(true);
-        }
-    }
-
     // TODO: These method should be a part of LauncherSearchCallback
     @TargetApi(Build.VERSION_CODES.LOLLIPOP)
     public ItemInfo createAppDragInfo(Intent appLaunchIntent) {
diff --git a/src/com/android/launcher3/LauncherClings.java b/src/com/android/launcher3/LauncherClings.java
index f0e95938a8..c1282b51c1 100644
--- a/src/com/android/launcher3/LauncherClings.java
+++ b/src/com/android/launcher3/LauncherClings.java
@@ -16,192 +16,12 @@
 
 package com.android.launcher3;
 
-import android.animation.ObjectAnimator;
-import android.animation.PropertyValuesHolder;
-import android.annotation.TargetApi;
-import android.app.ActivityManager;
 import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.os.Bundle;
-import android.os.UserManager;
-import android.provider.Settings;
-import android.view.KeyEvent;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnKeyListener;
-import android.view.View.OnLongClickListener;
-import android.view.ViewGroup;
-import android.view.ViewTreeObserver.OnGlobalLayoutListener;
-import android.view.accessibility.AccessibilityManager;
 
-import com.android.launcher3.util.Thunk;
-
-public class LauncherClings implements OnClickListener, OnKeyListener {
+@Deprecated
+public class LauncherClings {
     private static final String WORKSPACE_CLING_DISMISSED_KEY = "cling_gel.workspace.dismissed";
 
-    private static final String TAG_CROP_TOP_AND_SIDES = "crop_bg_top_and_sides";
-
-    private static final int SHOW_CLING_DURATION = 250;
-    private static final int DISMISS_CLING_DURATION = 200;
-
-    @Thunk Launcher mLauncher;
-    private LayoutInflater mInflater;
-    @Thunk boolean mIsVisible;
-
-    /** Ctor */
-    public LauncherClings(Launcher launcher) {
-        mLauncher = launcher;
-        mInflater = LayoutInflater.from(mLauncher);
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v.getId() == R.id.cling_dismiss_longpress_info) {
-            dismissLongPressCling();
-        }
-    }
-
-    @Override
-    public boolean onKey(View v, int keyCode, KeyEvent event) {
-        if (event.isPrintingKey()) {
-            // Should ignore all printing keys, otherwise they come to the search box.
-            return true;
-        }
-        if (keyCode == KeyEvent.KEYCODE_MENU) {
-            // Menu key goes to the overview mode similar to longpress, therefore it needs to
-            // dismiss the clings.
-            dismissLongPressCling();
-        }
-        return false;
-    }
-
-    public void showLongPressCling(boolean showWelcome) {
-        mIsVisible = true;
-        ViewGroup root = (ViewGroup) mLauncher.findViewById(R.id.launcher);
-        View cling = mInflater.inflate(R.layout.longpress_cling, root, false);
-
-        cling.setOnLongClickListener(new OnLongClickListener() {
-
-            @Override
-            public boolean onLongClick(View v) {
-                mLauncher.showOverviewMode(true);
-                dismissLongPressCling();
-                return true;
-            }
-        });
-
-        final ViewGroup content = (ViewGroup) cling.findViewById(R.id.cling_content);
-        mInflater.inflate(showWelcome ? R.layout.longpress_cling_welcome_content
-                : R.layout.longpress_cling_content, content);
-        final View button = content.findViewById(R.id.cling_dismiss_longpress_info);
-        button.setOnClickListener(this);
-        button.setOnKeyListener(this);
-
-        if (TAG_CROP_TOP_AND_SIDES.equals(content.getTag())) {
-            Drawable bg = new BorderCropDrawable(mLauncher.getResources().getDrawable(R.drawable.cling_bg),
-                    true, true, true, false);
-            content.setBackground(bg);
-        }
-
-        mLauncher.onLauncherClingShown();
-        root.addView(cling);
-
-        if (showWelcome) {
-            // This is the first cling being shown. No need to animate.
-            return;
-        }
-
-        // Animate
-        content.getViewTreeObserver().addOnGlobalLayoutListener(new OnGlobalLayoutListener() {
-
-            @Override
-            public void onGlobalLayout() {
-                content.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-
-                ObjectAnimator anim;
-                if (TAG_CROP_TOP_AND_SIDES.equals(content.getTag())) {
-                    content.setTranslationY(-content.getMeasuredHeight());
-                    anim = LauncherAnimUtils.ofFloat(content, View.TRANSLATION_Y, 0);
-                } else {
-                    content.setScaleX(0);
-                    content.setScaleY(0);
-                    PropertyValuesHolder scaleX = PropertyValuesHolder.ofFloat(View.SCALE_X, 1);
-                    PropertyValuesHolder scaleY = PropertyValuesHolder.ofFloat(View.SCALE_Y, 1);
-                    anim = LauncherAnimUtils.ofPropertyValuesHolder(content, scaleX, scaleY);
-                }
-
-                anim.setDuration(SHOW_CLING_DURATION);
-                anim.setInterpolator(new LogDecelerateInterpolator(100, 0));
-                anim.start();
-            }
-        });
-    }
-
-    @Thunk void dismissLongPressCling() {
-        Runnable dismissCb = new Runnable() {
-            public void run() {
-                final View cling = mLauncher.findViewById(R.id.longpress_cling);
-                // To catch cases where siblings of top-level views are made invisible, just check whether
-                // the cling is directly set to GONE before dismissing it.
-                if (cling != null && cling.getVisibility() != View.GONE) {
-                    final Runnable cleanUpClingCb = new Runnable() {
-                        public void run() {
-                            cling.setVisibility(View.GONE);
-                            mLauncher.getSharedPrefs().edit()
-                                    .putBoolean(WORKSPACE_CLING_DISMISSED_KEY, true)
-                                    .apply();
-                            mIsVisible = false;
-                            mLauncher.onLauncherClingDismissed();
-                        }
-                    };
-                    cling.animate().alpha(0).setDuration(DISMISS_CLING_DURATION)
-                            .withEndAction(cleanUpClingCb);
-                }
-            }
-        };
-        mLauncher.getWorkspace().post(dismissCb);
-    }
-
-    public boolean isVisible() {
-        return mIsVisible;
-    }
-
-    /** Returns whether the clings are enabled or should be shown */
-    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR2)
-    private boolean areClingsEnabled() {
-        // disable clings when running in a test harness
-        if(ActivityManager.isRunningInTestHarness()) return false;
-
-        // Disable clings for accessibility when explore by touch is enabled
-        final AccessibilityManager a11yManager = (AccessibilityManager) mLauncher.getSystemService(
-                Launcher.ACCESSIBILITY_SERVICE);
-        if (a11yManager.isTouchExplorationEnabled()) {
-            return false;
-        }
-
-        // Restricted secondary users (child mode) will potentially have very few apps
-        // seeded when they start up for the first time. Clings won't work well with that
-        if (Utilities.ATLEAST_JB_MR2) {
-            UserManager um = (UserManager) mLauncher.getSystemService(Context.USER_SERVICE);
-            Bundle restrictions = um.getUserRestrictions();
-            if (restrictions.getBoolean(UserManager.DISALLOW_MODIFY_ACCOUNTS, false)) {
-                return false;
-            }
-        }
-        if (Settings.Secure.getInt(mLauncher.getContentResolver(),
-                Settings.Secure.SKIP_FIRST_USE_HINTS, 0) == 1) {
-            return false;
-        }
-        return true;
-    }
-
-    public boolean shouldShowFirstRunOrMigrationClings() {
-        return areClingsEnabled() &&
-            !mLauncher.getSharedPrefs().getBoolean(WORKSPACE_CLING_DISMISSED_KEY, false);
-    }
-
     public static void markFirstRunClingDismissed(Context ctx) {
         Utilities.getPrefs(ctx).edit()
                 .putBoolean(WORKSPACE_CLING_DISMISSED_KEY, true)