From 4cbf046bf9fd1b4a40563a960a758e0a02b90538 Mon Sep 17 00:00:00 2001
From: Sunny Goyal <sunnygoyal@google.com>
Date: Thu, 28 Aug 2014 16:19:39 -0700
Subject: [PATCH] Updating content of page description frequently.

> Removing unused search icon page indicator

issue: 17256565

Change-Id: I95158cf68f98b2af847cefb4d126468b908301e2
---
 res/drawable-hdpi/custom_content_page.png     | Bin 1353 -> 0 bytes
 res/drawable-mdpi/custom_content_page.png     | Bin 1227 -> 0 bytes
 res/drawable-xhdpi/custom_content_page.png    | Bin 1297 -> 0 bytes
 .../custom_content_page_indicator_marker.xml  |  39 ------------------
 src/com/android/launcher3/PagedView.java      |   7 +++-
 src/com/android/launcher3/Workspace.java      |   3 --
 6 files changed, 5 insertions(+), 44 deletions(-)
 delete mode 100644 res/drawable-hdpi/custom_content_page.png
 delete mode 100644 res/drawable-mdpi/custom_content_page.png
 delete mode 100644 res/drawable-xhdpi/custom_content_page.png
 delete mode 100644 res/layout/custom_content_page_indicator_marker.xml

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

literal 1353
zcmbVMeM}o=7;mL81`e1a4l!^!Og1OIkJ8Tzm6cu(y3vZXZY-0@aedof;6AuJ)`PHw
zEg8wO7$a(iE+I~rNeC<?i;0Y=sG0MFxNLuniA%)D=GHA5GqaJ5CB6p~H6i=MyWG9+
z``q(;p5OCzN1MX+oARE?Gnq`Af(>*tT(=lcZVr6Ur@V`BDb)fkT11L#DOLd{UrcHT
zNKjxCpc$~So~~~}jmeai<fAQGOQ@0JBmrX$9ZVNwh&GvOYIT|AI)H|>g9I;n(Lbg>
zM-e{eMfW&DL`e37B;U}hfJkpR%Jp_|o)}vDB2uGM(0~9m7SV-HQKfV*x@?z%dqa$)
z$g+yo;YC+SwS<}wzoY=ffe}`YaFU4Aj*)i4WA{`cHi9H@(uNZ*D@jle7e$cB>V-mY
zN-Rz_)6A+bc=Do2O_M1cPo+{=sv47&1WtN99-Oe@Hk%b{Sk)d;V|A;jR%R^FK;;x(
z)_6%o42x{L)UA0@$aEzHK@Nr142$Y&qF~B!ot1GCBXB`5;#$^LwPx@SjdiuvXpao=
zW}r&l3J2>Eugrj9?jG&PP=su#mlPfrh3%vzu3G@27Nor>{DQ^!7{$0;3`x4|gv&-a
z-6ZMuIcdMIn)cZ29v4kGGd9-4I$Z(USy$}}1e_#E25i27JHRjw!sm9>*?rYS1{)Mr
zjTJeN@ykQMt61kFv6No{tR^W@N$SjWKvPoEBsD3?h(F@MNF>B^yl6;_0<FYL1BE{T
zVvHgQ$a01$ejNq`=_dXYx!doAx4YWo_jnke16{?&{!i9$NCr3B<6rHP5y2ibwrkA~
z4{PHCL^v}F9FBbp8{mAJQ$gAn)#vWKvuoE^JBp7aE;H$@*H5ND$ln}znI`7z&fR2+
zmOd5(K1=HhdE2+8N6RXbeW%H<)$5j>b61~hI(O?x;oMB@hnY`*3u{{jMo+LKSp947
z-+%1<fkN-a$eG*Q$GiJRET0XQoE7$!4qVzheg9#tIb5D~tgYnn{+v&;6Z4MV`a9y@
z-IV#q$wtdlOXG)Zy1AmQXzWnwL}B{P9qD3{nOt<cbDnN|;}oA=rS_He#YfFtdE?=T
zyzRuoU6*XiYui}W|JE2bm=1ScI37Ayzqwz%^5Nix)7itnKd6}fX6WMEpd@!__KEy!
z7&BcY-_32<DK7qG-rf1?*wlB$tw6L7=nvluTx++M>nJ&G(LXw<ZnXS0xzJk>{i5)8
z<*ljXH?qsxwm$#L`GP%1H{829#1k{|sbBdk?|vDY$RCd6Hzb_h32*vp%d?j*7u=v~
zx`xuDMCk1G{lSS*`!7#g%KzN|{lSwDeqI>PU&<p)v!{~xMq0<W8b7ySAWWaBYdicm
DeF@X7

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

literal 1227
zcmbVMZD`zN96#Bt^-AT0G4KTzvqD97$@APxE{PYnG`ZW(?P_;DXmyM(%{{$~ZSuq<
z_0n$m;X0h+3&VodPdczzWlAe3ZdJQ(zA%S6aDK23-IVr=V#SHz3)3g<T~#RiU_$ad
z&p-d)|Nr~H<?*i0ovq<p!=X^9HMdJGkTnuK%}wOJ<;q_gS#I$%y<RsS@T!`FLUIZB
zBPwTVWmG^~Y2=}^C>;uIs2IgwuQ$I()UnBEfez!FHbI9%>FvI)>4V6l`cc`iBzk#v
zj;4%~ME4}~Aa5(EV(c1qQ1@tOQ6C-Dg%Z8}9xCmN#DIxBjq=SQ%N2czUa>2ZeIRCO
zYDL8xl;~Abz4<Om!49I542bH0gA|uwU;+pUVH*_#5U?=Df>aa&F_{tpr0N$<yg8)-
zv7lz_zQ{?UE1qYIEL*KsnQENDPML**Ah00D#$r*T5p_o_PxGUeyR~6KMXv4`wr60A
z3M^{<c-WI@!gMtR)6VDD3|nqJQ6y!ouh}eQ0Bf2-Tr1kHS3v*JSXbLEj@XDTAQuli
zI;qFN)&`j5?%Iw5MZ!kB&oM|*v>_Gi!zQx4oGQ`e3sW*mVm6h^LYPW`R19!DguKkD
ziX2ykSVBmtfNR)T4-4Ze$7N+Xli^|zW@2)N&t$VnAoIzNgd7JAY|e5$&C*fBuR;9Q
zvBEX6qT(RU!%h+7p+*OERj`NM3brYwJIO#Qujz&rNP+^b#;YR7co>zk4mPQk42#A(
z3;^W8e<J4<j@*1)Py`_>C+Rx2^nbF(5;APi9{*~WhKTfFuw83@a#$N5WRaP1$Z%Y}
z`Tl)muzt&_a?xLSe|%=}bXVlaH!b;&V`KA^R&Dp>=94GHaP8@<6V}NuXU4~$P>l8?
zO?O-mH`d<y<!-+1v9{XS4O>Pg4laMRIC1c;JHzg7f9b=w=T0fY*((>@a{b5Od?tJT
z@TNzOMdnU}#NJK&H`|{+zwI24|9A=87bJLyvZsF7Q9C2~<r9aa>G??0^ovWcrjLHz
zcc8WJ=zQk~51gNh@7;Ka$H^~V?rXnvVY;XJ-sRc5e((AIx|!OIdoJ(%>c^?+*@2sW
z1!LHMcCN*J?WxN%Z)|w?wx2(Fp*;EALi57$RQu;2Pvn+%Jo?ImKczp5%aPmJ@Wn;u
c&lV6`yp;d;yK_&z7yMpwnNIcfjsvy70a<mVL;wH)

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

literal 1297
zcmbVMZEVzJ9Iult<7658BoZ`TH=Ur@mwRpN&fQDz*m2xBZfCe;Xx8gJ+ckG>Z*9lD
zIEY)O#1SJ?;gi8*F)$ed1EXZlIm8c4qh>}IKoetP{D4CTF`4+ur`z4sWZ{Et+UI%x
z{r&#$|Gv@@*;!}WYC;gCF4)dR;ffkhZ4G>D#o`}uc}Vxi^-iTn&+#fiJV_-1(4fTk
zf+*mVg}yn^iXiu=#8_O9hj+7rBH_G&!ShlUvJs@UEuZCuG|<rm=oMub_WMVlV5pdM
zVSDXiGMx2+l-OQWL1!@%6N+hpNn&kJqpf)sDv*HAqj@PKYi!<yt>|Up-VhTQx&qPD
zE^O7Qc(?=gDJnqiIB6D02ZcIpIAtRl8}lS;At{oeEClH^QzUD5vLuC;FAQ2!lRa#d
z3zTialM74fdX^=KTrP*_thl1~5){KQ1Zg2G7BfVcwSuhkd9$oFRWxuw6I3y)i;9dI
z8u^6Mue&hl>1qg4HXL44ENkUN!ITksK1)zINl20r*9uzGqu?Jm)<tWvLKYBFpeg;T
z0PE4yR3XFM-P@1>gx;{vs3I&1pWzgtUjnio<Xjm1f+xi!8*n-U6y>y$P7CRvDT?+u
zIG@MLF%}!+<VZ(F$9i0c)6Y4)R;%CdpeV|3@%U+fAYdmwwB2j-Sjh@EC~G<|3!q|G
zgm%kZ%RRZQPX)ZLs4+#!R63v|rRa*5QnIM8(~eVUm={FZkQfD8jh6$exE~|~sv@B)
z8D_<GJRm8W{7>Yx&jD}R%J>*2;IU(6Zu0+RjeyP&Mtl6LT`D5jgT{8P`Qc%0e1HsR
zMuo#MdEI>uLGEh{a-LZJ#^T;d)2HO-S26m#?OiVob$t+#4-U57tk*S7JKgC#;rlRh
z>)UrvE>-PJCB_;Ww55_dKm9^(dE{{4w(Cw|Zf4u4yLt1*Gnu)mvyzC<hc<nU&s|uw
zS6L^UI;e(Ap&y#3N~R<6(Bh-RjV<n*JN6tHnjMV2x8t|lO!WeN>dxibTD9;*-@-e1
z-!JZ~4*cRzQ`JMU=ePW|&vWp`>uCDY<@YB-nP-m<@7p@!_8#v#^y9C+Gt1vc+9&pp
z9!>9>4tLLT6a3G|E;2Po?w&ajdSKU`0o&uFSH`#0P~-KsYsjGKwbYjnUpbcO8n-^y
zc%Xaa@W~A=3)79a62r~)A6LII|5hn*s_yjX&kY3soT+<C-Dsu9E(rdy^M$J|1Ep`?
wy!LWz_Rwc9-aS8a{K4CA?`d9I-tb7(Cd69`R)6u;Io9||1^p53thamUZ?Vn3+yDRo

diff --git a/res/layout/custom_content_page_indicator_marker.xml b/res/layout/custom_content_page_indicator_marker.xml
deleted file mode 100644
index 8fe3f8fdf2..0000000000
--- a/res/layout/custom_content_page_indicator_marker.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2013 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.PageIndicatorMarker
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:launcher="http://schemas.android.com/apk/res-auto/com.android.launcher3"
-    android:layout_width="16dp"
-    android:layout_height="16dp"
-    android:layout_gravity="center_vertical">
-    <ImageView
-        android:id="@+id/inactive"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerInside"
-        android:src="@drawable/custom_content_page"
-        />
-    <ImageView
-        android:id="@+id/active"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerInside"
-        android:src="@drawable/custom_content_page"
-        android:alpha="0"
-        android:scaleX="0.5"
-        android:scaleY="0.5"
-        />
-</com.android.launcher3.PageIndicatorMarker>
diff --git a/src/com/android/launcher3/PagedView.java b/src/com/android/launcher3/PagedView.java
index 0434faff5b..48fc0c98f5 100644
--- a/src/com/android/launcher3/PagedView.java
+++ b/src/com/android/launcher3/PagedView.java
@@ -594,8 +594,11 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
 
     private void updatePageIndicator() {
         // Update the page indicator (when we aren't reordering)
-        if (mPageIndicator != null && !isReordering(false)) {
-            mPageIndicator.setActiveMarker(getNextPage());
+        if (mPageIndicator != null) {
+            mPageIndicator.setContentDescription(getPageIndicatorDescription());
+            if (!isReordering(false)) {
+                mPageIndicator.setActiveMarker(getNextPage());
+            }
         }
     }
     protected void pageBeginMoving() {
diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java
index 9d97306179..f19cad5d2f 100644
--- a/src/com/android/launcher3/Workspace.java
+++ b/src/com/android/launcher3/Workspace.java
@@ -1274,9 +1274,6 @@ public class Workspace extends SmoothPagedView
                 mLauncher.updateVoiceButtonProxyVisible(false);
             }
         }
-        if (getPageIndicator() != null) {
-            getPageIndicator().setContentDescription(getPageIndicatorDescription());
-        }
     }
 
     protected CustomContentCallbacks getCustomContentCallbacks() {