am ea5ce408: am 15f704e7: Merge "Fix issue #23122445: Add 420 density" into mnc-dev

* commit 'ea5ce4080be58a8092df38a49d828e4281497dc4':
  Fix issue #23122445: Add 420 density

diff --combined api/system-current.txt
index 14d4e3e,a9bc944..4b062f0
--- 1/api/system-current.txt
--- 2/api/system-current.txt
+++ b/api/system-current.txt
@@@ -32713,22 -32713,17 +32713,22 @@@ package android.telecom 
      field public static final java.lang.String ACTION_PHONE_ACCOUNT_REGISTERED = "android.telecom.action.PHONE_ACCOUNT_REGISTERED";
      field public static final java.lang.String ACTION_SHOW_CALL_ACCESSIBILITY_SETTINGS = "android.telecom.action.SHOW_CALL_ACCESSIBILITY_SETTINGS";
      field public static final java.lang.String ACTION_SHOW_CALL_SETTINGS = "android.telecom.action.SHOW_CALL_SETTINGS";
 +    field public static final java.lang.String ACTION_SHOW_MISSED_CALLS_NOTIFICATION = "android.telecom.action.SHOW_MISSED_CALLS_NOTIFICATION";
      field public static final java.lang.String ACTION_SHOW_RESPOND_VIA_SMS_SETTINGS = "android.telecom.action.SHOW_RESPOND_VIA_SMS_SETTINGS";
      field public static final char DTMF_CHARACTER_PAUSE = 44; // 0x002c ','
      field public static final char DTMF_CHARACTER_WAIT = 59; // 0x003b ';'
 +    field public static final java.lang.String EXTRA_CALL_BACK_INTENT = "android.telecom.extra.CALL_BACK_INTENT";
      field public static final java.lang.String EXTRA_CALL_BACK_NUMBER = "android.telecom.extra.CALL_BACK_NUMBER";
      field public static final java.lang.String EXTRA_CALL_DISCONNECT_CAUSE = "android.telecom.extra.CALL_DISCONNECT_CAUSE";
      field public static final java.lang.String EXTRA_CALL_DISCONNECT_MESSAGE = "android.telecom.extra.CALL_DISCONNECT_MESSAGE";
      field public static final java.lang.String EXTRA_CALL_SUBJECT = "android.telecom.extra.CALL_SUBJECT";
      field public static final java.lang.String EXTRA_CHANGE_DEFAULT_DIALER_PACKAGE_NAME = "android.telecom.extra.CHANGE_DEFAULT_DIALER_PACKAGE_NAME";
 +    field public static final java.lang.String EXTRA_CLEAR_MISSED_CALLS_INTENT = "android.telecom.extra.CLEAR_MISSED_CALLS_INTENT";
      field public static final java.lang.String EXTRA_CONNECTION_SERVICE = "android.telecom.extra.CONNECTION_SERVICE";
      field public static final java.lang.String EXTRA_INCOMING_CALL_ADDRESS = "android.telecom.extra.INCOMING_CALL_ADDRESS";
      field public static final java.lang.String EXTRA_INCOMING_CALL_EXTRAS = "android.telecom.extra.INCOMING_CALL_EXTRAS";
 +    field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telecom.extra.NOTIFICATION_COUNT";
 +    field public static final java.lang.String EXTRA_NOTIFICATION_PHONE_NUMBER = "android.telecom.extra.NOTIFICATION_PHONE_NUMBER";
      field public static final java.lang.String EXTRA_OUTGOING_CALL_EXTRAS = "android.telecom.extra.OUTGOING_CALL_EXTRAS";
      field public static final java.lang.String EXTRA_PHONE_ACCOUNT_HANDLE = "android.telecom.extra.PHONE_ACCOUNT_HANDLE";
      field public static final java.lang.String EXTRA_START_CALL_WITH_SPEAKERPHONE = "android.telecom.extra.START_CALL_WITH_SPEAKERPHONE";
@@@ -33428,7 -33423,6 +33428,7 @@@ package android.telephony 
      field public static final java.lang.String ACTION_CONFIGURE_VOICEMAIL = "android.telephony.action.CONFIGURE_VOICEMAIL";
      field public static final java.lang.String ACTION_PHONE_STATE_CHANGED = "android.intent.action.PHONE_STATE";
      field public static final java.lang.String ACTION_RESPOND_VIA_MESSAGE = "android.intent.action.RESPOND_VIA_MESSAGE";
 +    field public static final java.lang.String ACTION_SHOW_VOICEMAIL_NOTIFICATION = "android.telephony.action.SHOW_VOICEMAIL_NOTIFICATION";
      field public static final int CALL_STATE_IDLE = 0; // 0x0
      field public static final int CALL_STATE_OFFHOOK = 2; // 0x2
      field public static final int CALL_STATE_RINGING = 1; // 0x1
@@@ -33445,15 -33439,11 +33445,15 @@@
      field public static final int DATA_CONNECTING = 1; // 0x1
      field public static final int DATA_DISCONNECTED = 0; // 0x0
      field public static final int DATA_SUSPENDED = 3; // 0x3
 +    field public static final java.lang.String EXTRA_CALL_VOICEMAIL_INTENT = "android.telephony.extra.CALL_VOICEMAIL_INTENT";
      field public static final java.lang.String EXTRA_INCOMING_NUMBER = "incoming_number";
 +    field public static final java.lang.String EXTRA_LAUNCH_VOICEMAIL_SETTINGS_INTENT = "android.telephony.extra.LAUNCH_VOICEMAIL_SETTINGS_INTENT";
 +    field public static final java.lang.String EXTRA_NOTIFICATION_COUNT = "android.telephony.extra.NOTIFICATION_COUNT";
      field public static final java.lang.String EXTRA_STATE = "state";
      field public static final java.lang.String EXTRA_STATE_IDLE;
      field public static final java.lang.String EXTRA_STATE_OFFHOOK;
      field public static final java.lang.String EXTRA_STATE_RINGING;
 +    field public static final java.lang.String EXTRA_VOICEMAIL_NUMBER = "android.telephony.extra.VOICEMAIL_NUMBER";
      field public static final int NETWORK_TYPE_1xRTT = 7; // 0x7
      field public static final int NETWORK_TYPE_CDMA = 4; // 0x4
      field public static final int NETWORK_TYPE_EDGE = 2; // 0x2
@@@ -36260,6 -36250,7 +36260,7 @@@ package android.util 
      field public static final int DENSITY_280 = 280; // 0x118
      field public static final int DENSITY_360 = 360; // 0x168
      field public static final int DENSITY_400 = 400; // 0x190
+     field public static final int DENSITY_420 = 420; // 0x1a4
      field public static final int DENSITY_560 = 560; // 0x230
      field public static final int DENSITY_DEFAULT = 160; // 0xa0
      field public static final int DENSITY_HIGH = 240; // 0xf0