From f3a942751a836ac91941bc8bc5d49442025431a9 Mon Sep 17 00:00:00 2001 From: Amin Shaikh Date: Tue, 29 Jan 2019 18:22:14 -0500 Subject: [PATCH] Consolidate 3 phone icons into one. ic_bt_cellphone, ic_volume_voice, ic_phone_24dp -> ic_phone Bug: 122263617 Test: make Change-Id: Id3a518209e78d1f51b3cc1945bcbeba1bdcb2e23 --- .../{ic_bt_cellphone.xml => ic_phone.xml} | 0 core/res/res/values/symbols.xml | 2 +- .../settingslib/bluetooth/BluetoothUtils.java | 2 +- .../settingslib/bluetooth/MapClientProfile.java | 2 +- .../android/settingslib/bluetooth/MapProfile.java | 2 +- .../settingslib/bluetooth/PbapClientProfile.java | 2 +- .../settingslib/bluetooth/PbapServerProfile.java | 2 +- .../android/settingslib/bluetooth/SapProfile.java | 2 +- .../settingslib/media/PhoneMediaDevice.java | 2 +- .../android/settingslib/drawer/TileUtilsTest.java | 2 +- .../graph/BluetoothDeviceLayerDrawableTest.java | 2 +- .../SystemUI/res/drawable-hdpi/ic_phone_24dp.png | Bin 444 -> 0 bytes .../SystemUI/res/drawable-mdpi/ic_phone_24dp.png | Bin 333 -> 0 bytes .../SystemUI/res/drawable-xhdpi/ic_phone_24dp.png | Bin 530 -> 0 bytes .../res/drawable-xxhdpi/ic_phone_24dp.png | Bin 736 -> 0 bytes .../res/drawable-xxxhdpi/ic_phone_24dp.png | Bin 904 -> 0 bytes .../SystemUI/res/layout/keyguard_bottom_area.xml | 2 +- .../statusbar/phone/KeyguardBottomAreaView.java | 3 ++- .../android/systemui/volume/VolumeDialogImpl.java | 3 ++- 19 files changed, 15 insertions(+), 13 deletions(-) rename core/res/res/drawable/{ic_bt_cellphone.xml => ic_phone.xml} (100%) delete mode 100644 packages/SystemUI/res/drawable-hdpi/ic_phone_24dp.png delete mode 100644 packages/SystemUI/res/drawable-mdpi/ic_phone_24dp.png delete mode 100644 packages/SystemUI/res/drawable-xhdpi/ic_phone_24dp.png delete mode 100644 packages/SystemUI/res/drawable-xxhdpi/ic_phone_24dp.png delete mode 100644 packages/SystemUI/res/drawable-xxxhdpi/ic_phone_24dp.png diff --git a/core/res/res/drawable/ic_bt_cellphone.xml b/core/res/res/drawable/ic_phone.xml similarity index 100% rename from core/res/res/drawable/ic_bt_cellphone.xml rename to core/res/res/drawable/ic_phone.xml diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 09d6c26db87d5..ca8e226a9911e 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1424,7 +1424,7 @@ - + diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java index a8a0b6df95c66..081f8a099cf56 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java @@ -68,7 +68,7 @@ public class BluetoothUtils { case BluetoothClass.Device.Major.PHONE: return new Pair<>( getBluetoothDrawable(context, - com.android.internal.R.drawable.ic_bt_cellphone, level, + com.android.internal.R.drawable.ic_phone, level, iconScale), context.getString(R.string.bluetooth_talkback_phone)); diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java index 0afc878bcc64b..d4dda329fa634 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java @@ -200,7 +200,7 @@ public final class MapClientProfile implements LocalBluetoothProfile { } public int getDrawableResource(BluetoothClass btClass) { - return com.android.internal.R.drawable.ic_bt_cellphone; + return com.android.internal.R.drawable.ic_phone; } protected void finalize() { diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java index bea944cb323db..b2a9a6a282318 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java @@ -196,7 +196,7 @@ public class MapProfile implements LocalBluetoothProfile { } public int getDrawableResource(BluetoothClass btClass) { - return com.android.internal.R.drawable.ic_bt_cellphone; + return com.android.internal.R.drawable.ic_phone; } protected void finalize() { diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java index 4a27715d8681e..a2da4fb30e392 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapClientProfile.java @@ -192,7 +192,7 @@ public final class PbapClientProfile implements LocalBluetoothProfile { } public int getDrawableResource(BluetoothClass btClass) { - return com.android.internal.R.drawable.ic_bt_cellphone; + return com.android.internal.R.drawable.ic_phone; } protected void finalize() { diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapServerProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapServerProfile.java index 165af2c751d47..17104e4e96cd9 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapServerProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/PbapServerProfile.java @@ -135,7 +135,7 @@ public class PbapServerProfile implements LocalBluetoothProfile { } public int getDrawableResource(BluetoothClass btClass) { - return com.android.internal.R.drawable.ic_bt_cellphone; + return com.android.internal.R.drawable.ic_phone; } protected void finalize() { diff --git a/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java b/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java index 9e9c5b92fbfe3..9b733f2e0e507 100644 --- a/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java +++ b/packages/SettingsLib/src/com/android/settingslib/bluetooth/SapProfile.java @@ -196,7 +196,7 @@ final class SapProfile implements LocalBluetoothProfile { } public int getDrawableResource(BluetoothClass btClass) { - return com.android.internal.R.drawable.ic_bt_cellphone; + return com.android.internal.R.drawable.ic_phone; } protected void finalize() { diff --git a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java index 01003aae6590a..8ec2a7f90f66f 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/PhoneMediaDevice.java @@ -52,7 +52,7 @@ public class PhoneMediaDevice extends MediaDevice { @Override public int getIcon() { //TODO(b/117129183): This is not final icon for phone device, just for demo. - return com.android.internal.R.drawable.ic_bt_cellphone; + return com.android.internal.R.drawable.ic_phone; } @Override diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java index b379b54c605b1..c8927110b0974 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/drawer/TileUtilsTest.java @@ -253,7 +253,7 @@ public class TileUtilsTest { resolveInfo.activityInfo.metaData = new Bundle(oldMetadata); resolveInfo.activityInfo.metaData.putInt(META_DATA_PREFERENCE_ICON, - com.android.internal.R.drawable.ic_bt_cellphone); + com.android.internal.R.drawable.ic_phone); outTiles.clear(); TileUtils.getTilesForAction(mContext, UserHandle.CURRENT, IA_SETTINGS_ACTION, addedCache, null /* defaultCategory */, outTiles, false /* usePriority */); diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java index c6c2a4418357d..2113d479b9892 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/graph/BluetoothDeviceLayerDrawableTest.java @@ -31,7 +31,7 @@ import org.robolectric.RuntimeEnvironment; @RunWith(RobolectricTestRunner.class) public class BluetoothDeviceLayerDrawableTest { - private static final int RES_ID = com.android.internal.R.drawable.ic_bt_cellphone; + private static final int RES_ID = com.android.internal.R.drawable.ic_phone; private static final int BATTERY_LEVEL = 15; private static final float BATTERY_ICON_SCALE = 0.75f; private static final int BATTERY_ICON_PADDING_TOP = 6; diff --git a/packages/SystemUI/res/drawable-hdpi/ic_phone_24dp.png b/packages/SystemUI/res/drawable-hdpi/ic_phone_24dp.png deleted file mode 100644 index a6a644888d22d0dbb76308dd6904541475ef8387..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 444 zcmV;t0Ym004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 zVoOIv0RM-N%)bBt0Xa!TK~zY`?bJO>LopPG@#ktmM8ub&lelzu_jM5c7`4)Vv7i?MKWNH=gfTxT*#@opUhdI?%D&LC1#QRk z+~@T8LVY~9m;<^sF*z|zkuF`{#u0>fM)c9WMi5GRXp#^iWL{5|5QGM!T4NS%G|oWRD45bDP46hOx7_4S6Fo+k-*%fF5lweBoc6VX;-`;;_Kah9I z)5S5w;&gI?#Fhs#hwBagoPOXwr!78!_rIi7=j9J#>k{n>rOq8NjZySFthA$TKhK{d z86Hj96$cLZ^{^GT-A{O0E-BK%dt#SxHP%4hQ-Yb%PeEJ27)~Fdoh|JIvV@eqe*OS%$Ga ZgJ)lI@eRXI^MSr%@O1TaS?83{1OV$+bVC3D diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_phone_24dp.png b/packages/SystemUI/res/drawable-xhdpi/ic_phone_24dp.png deleted file mode 100644 index cd9ff60b432147b42716bce029dc970f3422b142..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 530 zcmV+t0`2{YP)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 zVoOIv0RM-N%)bBt0gp*UK~z}7?bbU;LQx#Y@oxoDDeWyb1igj=rJ+rF(PIdLf(j&v z#^$0WsGzArlK(#T*MHoLC79L^rBA7<>2FJT>GER{~fRQ_qoTv=YNE1 zRZF%exIyJz3C1OXR6)E#k(2~J4S=Fi4#*e*pB#`h0)9E*$_R|g0TCmxE(dHGffG3( zWCUKQlLFd}fave&*0_RZIbgpi{*|EQUY;q4e`8p7+|~1t7e6FFQNud^oe>)&yH5kl zwoZj(2RO6^4C*xmZ4qY<5XWN&=+;M1*wz|0_1Cm$2WaA2?_|FnqK#*Vc%s)1F~^TX zr06K|885BWR!*$wPNWGKCszi=BS)+;Mh`9SPmbN3sXAY9Z7+51h5em6i3J2{Vs z@#;HMCH_SzF5IqSRrf-XU;u#0lJSar_q~`Un-dUaiI0-;6#?MmyiBA301a%EeeZt* z0G*uL1pxdUu2Qcej(PRjt447ud>* Uq6P_6F8}}l07*qoM6N<$f`qi!mjD0& diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_phone_24dp.png b/packages/SystemUI/res/drawable-xxhdpi/ic_phone_24dp.png deleted file mode 100644 index 3c546e5753246aa75b80efb444d13c09c2871b5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 736 zcmV<60w4W}P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 zVoOIv0RM-N%)bBt0$oW&K~!ko?b*#sR8bhm@vku|QT9eJ6ck8Cv=Wi1O(g_vqFnR` zM4-Jba?vJeQ44d^!WK1xP(lz^ z#&Djn%&ycwAK?s8YuS6$v*2+CZ8-n~0nRK-?fbJveg#M!mC!Oi3V^0rX%E`#t)i|< zxJOR|pr7ot2W{nhfHX#(J?WA+ZCQIzEgw8myFKZk_xR7zWKZh$?$HFBtw9-{d89F$ z62#xxW<1hsR$G%=nfFL8U=Pi#O9E82_@9H@$=TQ`spg*8N)59miRbM`WZ-_*MmYT<$Kkl2%w6h= z3_M9|;1@Lvmc(()B(;{#gvwio004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00002 zVoOIv0RM-N%)bBt0|iM$K~#9!?c2*slu;PR@$Yzz3^Xc2%odqlNQ{P%46Q}9Driwg zw?)u0A}GX?T9mYFBa{)*1*CP*iA z=lA{r^L*x<_sqEsxVX5uxVX5uxR|n-8}#E%^7PY0fz84G+)`JZvogR5zt}*sFnz* zvjAL{2&l9GbV>y5umB7*OCBI<0q}^*17tE{0jQMNiFzymZ4vmfpDKKWBmD&8?a^ z<##b(_U>Gf=5IgVgyJ>%D9GV}@_WfcMdlfQ&R*&G_JbyM?^%YT_~%3yQI@+C0HYM? z0&MfOL5sFFc;q8&)&(Jz6+^b3OoQmHKFmRR=&rRM2|?-j0bK2Z<==b zNdUkueguAeGfSsceo_EX%*((6eo;G(@{0Duy!yN?0^0A+OO20#iGhV6MpfLKatU|2H%AeWQ8)eMMrsB+F(Pb=D` z?P{bDrHZ!D|57+Eb$cd*GOD@7n>cqe=E&b^%4R)#IYu4LbkM^`J~NI-Um_RvE-o%E eE-o%Ey7L=EYb~#7Sq#4b0000 diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 2e9d9bcda61ef..2fa941567cf1f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -862,7 +862,8 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL R.string.accessibility_voice_assist_button); } else { mIconState.isVisible = mUserSetupComplete && showAffordance && isPhoneVisible(); - mIconState.drawable = mContext.getDrawable(R.drawable.ic_phone_24dp); + mIconState.drawable = mContext.getDrawable( + com.android.internal.R.drawable.ic_phone); mIconState.contentDescription = mContext.getString( R.string.accessibility_phone_button); } diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java index b5883052c9a27..c903ab500f62e 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java @@ -255,7 +255,8 @@ public class VolumeDialogImpl implements VolumeDialog { addRow(STREAM_ALARM, R.drawable.ic_volume_alarm, R.drawable.ic_volume_alarm_mute, true, false); addRow(AudioManager.STREAM_VOICE_CALL, - R.drawable.ic_volume_voice, R.drawable.ic_volume_voice, false, false); + com.android.internal.R.drawable.ic_phone, + com.android.internal.R.drawable.ic_phone, false, false); addRow(AudioManager.STREAM_BLUETOOTH_SCO, R.drawable.ic_volume_bt_sco, R.drawable.ic_volume_bt_sco, false, false); addRow(AudioManager.STREAM_SYSTEM, R.drawable.ic_volume_system,