From 1f0c596563584a3929651d7ac3493f974b3d2eac Mon Sep 17 00:00:00 2001 From: John Spurlock Date: Tue, 3 Sep 2013 12:04:38 -0400 Subject: [PATCH] Remove unused status bar icon stat_sys_secure. It was moved behind an undocumented setting three yrs ago. Bug:10502089 Change-Id: Icef0e3deaa9b09afab98bbb76520b47a16da2069 --- .../res/res/drawable-hdpi/stat_sys_secure.png | Bin 761 -> 0 bytes .../res/res/drawable-ldpi/stat_sys_secure.png | Bin 407 -> 0 bytes .../res/res/drawable-mdpi/stat_sys_secure.png | Bin 622 -> 0 bytes .../res/drawable-xhdpi/stat_sys_secure.png | Bin 929 -> 0 bytes .../res/drawable-xxhdpi/stat_sys_secure.png | Bin 702 -> 0 bytes core/res/res/values/strings.xml | 5 ---- core/res/res/values/symbols.xml | 2 -- .../keyguard/KeyguardViewMediator.java | 22 ------------------ 8 files changed, 29 deletions(-) delete mode 100644 core/res/res/drawable-hdpi/stat_sys_secure.png delete mode 100644 core/res/res/drawable-ldpi/stat_sys_secure.png delete mode 100644 core/res/res/drawable-mdpi/stat_sys_secure.png delete mode 100644 core/res/res/drawable-xhdpi/stat_sys_secure.png delete mode 100755 core/res/res/drawable-xxhdpi/stat_sys_secure.png diff --git a/core/res/res/drawable-hdpi/stat_sys_secure.png b/core/res/res/drawable-hdpi/stat_sys_secure.png deleted file mode 100644 index 5e979dba1e898d8482a623890d5802eef89b686d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 761 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8JTQwCkZiqrgAx!GHzew}e*Ti|l$$nAM6rhewzQu5HNHdTU+>yc^y zl}l5tJ}+jk+Z;B1+N;OUQmY+i{)o}N+UmbI&%okS-}|des~+(hz6;xOt@zH9CytZX zf311gXca!c<7b}h%!>UNKL_dbBpF0>2-mN!+R?Ur;%z47g3Xfq+moMfvm-~$ zKNTnQ9^dnHg2XN3(+Y7Pj~~0f@BXP}$GiOkwWd297#ivtnCKcBh8S2{85&ucTIw2@TNxNszW-^7q9HdwB{QuO zw+4<)j;%lqG9Vj*^V3So6N^$A98>a>QWe}Xi&D$;i?WLqoP$jZw>~xls$=kU^>bP0 Hl+XkKfZ{na diff --git a/core/res/res/drawable-ldpi/stat_sys_secure.png b/core/res/res/drawable-ldpi/stat_sys_secure.png deleted file mode 100644 index 096aa95cb23554cac907d3775bc387c76ba1fac1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 407 zcmeAS@N?(olHy`uVBq!ia0vp^oIoth!2%>-Tz#Jgq?nSt-CY>|xA&jf50WnMh%5%u z9$@TtGTRO$SXSVe4x)irm?79`Z7`5A-_yl0MB?(?2^)D283?$>>u4`p;4xA0MuTWX z<2)tP(lQP`0nG`QjF_|yxTkEJ;(cIQflOe)Q}5;fOLke;%IbuOz1@|3`f&k!07LF| z^SrC(x#s<|E{Y^@8J}Al{NwAJKTBjzFiMW&K!x|kN z!WXRWeEc*~m|H=&=wj!WYOY7eTz(}-GVc(%r1$r%eJ$gL8?FXL6H;1%PE{>&jVMV; zEJ?LWE=mPb3`Pcq2D*lZx&}rehK5!KCRWC#x(4P}1_l$wSKUU@kei>9nO2Eg!vilN yP{>GvYzWRzD=AMbN@Z|N$xljE@XSq2PYp^$T diff --git a/core/res/res/drawable-mdpi/stat_sys_secure.png b/core/res/res/drawable-mdpi/stat_sys_secure.png deleted file mode 100644 index da3e318f914f3ea713c2c8a5f1c0ce6cdcb57632..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 622 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1rX+877l!}s{b%+Ad7K3vkw8&y zArNM~bhqvgNU*HHF&#*Q^)giWEM3OHz!>D|;uvCa`tGESevchQT+jEY3vzq3@i%l$ z4LfZf@R_}aQ|Dk!qvZa-8e)84S)Y2>tfJ+*1??(A&L z z{BXO-mEr5Iov;x&nmhk$cDby?-7hXzYYjiLc|2;2+M(>$Z1ExJulC#}Hx}11i~mt{ zPC3D?en6};-G7cX#~r`jTss&at#QqKRi6>2DP6of@Gfg^1H*!{>4CEs?VZcJS2pa& zL0RVnjwjO`j@h1eP+6|<^M+1_n%wIDb5{t<%b1>T_Ro5HV&nB^Ngln2QWJVvcp~N( z+e{GF$a||;Pi!jBt@XMBjXhuV7$Vt2 z4p@5k*bB@sO#2l2lVK0j?4F}eM}$_H0E1ez#5JPCxhOTUBr`uxAtW<5mBCQo*ihfl zP*1{i4p4zANI^k%6J1u7QcJp<#%DrIn$Pm8qq!fw`4|LFN0OmM9u> z^HVa@DsgMz*yPv>)F1=0Aviy+q&%@GmBBG3KPgqgEwd=KJijQrSiw2iv~cTVGoU&K MPgg&ebxsLQ01|BCmjD0& diff --git a/core/res/res/drawable-xhdpi/stat_sys_secure.png b/core/res/res/drawable-xhdpi/stat_sys_secure.png deleted file mode 100644 index bef2fd726e40a47239abe8fa419ba6795e27481e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 929 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}trX+877l!}s{b%+Ad7K3vk;M!Q z+(IDCcKfnz$52J2-w_pT=#sIAr0#W5t}@Y@;t^MoA*j_vSO={ z6MjDD@6qZC4bx|P^Xr17W#67}yanPD*El7pEU{r)X2G#q@4<;i8TLDxn_uXi&rN7z z-hb=7&2z)`mMrJ}!0y2erte%6ZwaY%y#DiTwf(aq zNxKk_FM`_-yk9jvLcBBR2*->`jOYJM<7KQ-?aBSNx97fuf|7oTzF%U{D`n63DVrXh z;aGh1hJS5f;i5UALj5M~3)OqFY0ne(Tamr&Y{K0u0hv$y-es?x2D zUd+ zCB!XsbSh=45+y-b88jqdRYwMhZTe^sPks zQfP_mGW%ISXCH39VEUK)Otx%p;_7>4nJ za0`JjKhyC8yf0Kn9gBfU=sIqaSW-L^LEa`z{3UtuKOk4En$A4 z@RDJ=fYkyPuLiy#rxyyc304NOJ6M7bJ{O2Tapa%2yPwg_|7kUo!&g7=RmryTR7q^x zxx0kvdLJvNjz@uf?u;OHn<|BAyWLJc;CPtsj} zabk`7PK^ofId`55xfInl%}8E!FV9WjWUiuN`;|Enz84FZzj(0xjAQL5(}vV$Md+OWi!J0e*KuN?P)k$VUje%`QoGY37iSm?hhjCl2o)A;w3BpB<-JK z&S1sB&9M4k)rpSJLU*}Zo?o?8%RCmode)PuBda9lKe^o_qrbVUaR2$h60b82EA#|@ zf4#-J^3}^7_g&MSiySuzew@8p)TKyu((@2Y_SzL*lWJX#$5x33+t2Qw67+(T|Kk1q zf@fC+|N7znkZaY^$-3LZ1w&QBH+hF%h{&ve_O6Wec4uWuVAO>h^Oow}xgN1+;o`|T z=PDDfiS>nVl47@9zTgsb7WZ*$uZ!WleJtKf`&Ink=v(E@_vF^`NN{B07K)f~pov9H zWrIQ^C}0KZt}+yK$48yKE+38}fkiE;LJ$A*J3T1g8hu0*V%t9k39XGeDiwU4z%<0* M>FVdQ&MBb@0074hp#T5? diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 4b32e2be3f41e..3c38d537ad3eb 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -3970,11 +3970,6 @@ Share with - - - - Device locked. - ", " diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index f008b10475d75..4d6776c0c3055 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1244,7 +1244,6 @@ - @@ -1307,7 +1306,6 @@ - diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java index 597fb3bf76381..e746f72f22361 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewMediator.java @@ -153,8 +153,6 @@ public class KeyguardViewMediator { private AlarmManager mAlarmManager; private AudioManager mAudioManager; private StatusBarManager mStatusBarManager; - private boolean mShowLockIcon; - private boolean mShowingLockIcon; private boolean mSwitchingUser; private boolean mSystemReady; @@ -494,7 +492,6 @@ public class KeyguardViewMediator { mLockPatternUtils); final ContentResolver cr = mContext.getContentResolver(); - mShowLockIcon = (Settings.System.getInt(cr, "show_status_bar_lock", 0) == 1); mScreenOn = mPM.isScreenOn(); @@ -1227,25 +1224,6 @@ public class KeyguardViewMediator { if (mStatusBarManager == null) { Log.w(TAG, "Could not get status bar manager"); } else { - if (mShowLockIcon) { - // Give feedback to user when secure keyguard is active and engaged - if (mShowing && isSecure()) { - if (!mShowingLockIcon) { - String contentDescription = mContext.getString( - com.android.internal.R.string.status_bar_device_locked); - mStatusBarManager.setIcon("secure", - com.android.internal.R.drawable.stat_sys_secure, 0, - contentDescription); - mShowingLockIcon = true; - } - } else { - if (mShowingLockIcon) { - mStatusBarManager.removeIcon("secure"); - mShowingLockIcon = false; - } - } - } - // Disable aspects of the system/status/navigation bars that must not be re-enabled by // windows that appear on top, ever int flags = StatusBarManager.DISABLE_NONE;