Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f032d430 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Consolidate 3 phone icons into one."

parents 2c56686d f3a94275

core/res/res/values/symbols.xml

+1 −1
Original line number Diff line number Diff line
@@ -1424,7 +1424,7 @@ 
  <java-symbol type="drawable" name="ic_signal_cellular_alt_24px" />



  <java-symbol type="drawable" name="btn_borderless_rect" />

  <java-symbol type="drawable" name="ic_bt_cellphone" />

  <java-symbol type="drawable" name="ic_phone" />

  <java-symbol type="drawable" name="ic_bt_headphones_a2dp" />

  <java-symbol type="drawable" name="ic_bt_headset_hfp" />

  <java-symbol type="drawable" name="ic_bt_hearing_aid" />

packages/SettingsLib/src/com/android/settingslib/bluetooth/BluetoothUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -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));

packages/SettingsLib/src/com/android/settingslib/bluetooth/MapClientProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -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() {

packages/SettingsLib/src/com/android/settingslib/bluetooth/MapProfile.java

+1 −1
Original line number Diff line number Diff line
@@ -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() {