Merge remote-tracking branch 'origin/lineage-21.0' into v1-u (b30c3371) · Commits · e / os / android_packages_apps_Contacts

res/values-v27/styles.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@
		<!-- Popup menu -->
		<item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
		<item name="android:navigationBarColor">@color/navigation_bar_bg</item>
		<item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>
		<item name="android:windowLightNavigationBar">@bool/isLight</item>
		<item name="android:windowLightStatusBar">@bool/isLight</item>
		</style>
		@@ -120,7 +119,6 @@
		<item name="android:popupMenuStyle">@style/PopupMenuStyleAppCompat</item>
		<item name="popupMenuStyle">@style/PopupMenuStyleAppCompat</item>
		<item name="android:navigationBarColor">@color/navigation_bar_bg</item>
		<item name="android:navigationBarDividerColor">@color/navigation_bar_divider</item>
		<item name="android:windowLightNavigationBar">@bool/isLight</item>
		<item name="android:windowLightStatusBar">@bool/isLight</item>
		</style>

res/values/lineage_colors.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -16,5 +16,4 @@
		-->
		<resources>
		<color name="navigation_bar_bg">@color/e_action_bar</color>
		<color name="navigation_bar_divider">@android:color/transparent</color>
		</resources>

src/com/android/contacts/lettertiles/LetterTileDrawable.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -205,10 +205,6 @@ public class LetterTileDrawable extends Drawable {
		}
		}

		private static boolean isEnglishLetter(final char c) {
		return ('A' <= c && c <= 'Z') \|\| ('a' <= c && c <= 'z');
		}

		@Override
		public void setAlpha(final int alpha) {
		mPaint.setAlpha(alpha);
		@@ -265,8 +261,8 @@ public class LetterTileDrawable extends Drawable {

		public LetterTileDrawable setLetterAndColorFromContactDetails(final String displayName,
		final String identifier) {
		if (displayName != null && displayName.length() > 0
		&& isEnglishLetter(displayName.charAt(0))) {
		if (displayName != null && !TextUtils.isEmpty(displayName)
		&& Character.isLetter(displayName.charAt(0))) {
		mLetter = Character.toUpperCase(displayName.charAt(0));
		} else {
		mLetter = null;

src/com/android/contacts/quickcontact/QuickContactActivity.java

+15 −13

Original line number	Diff line number	Diff line
		@@ -1629,7 +1629,7 @@ public class QuickContactActivity extends ContactsActivity {
		phoneContentDescription = com.android.contacts.util.ContactDisplayUtils
		.getTelephoneTtsSpannable(primaryContentDescription.toString(), header);
		iconResourceId = R.drawable.quantum_ic_phone_vd_theme_24;
		icon = res.getDrawable(iconResourceId);
		icon = context.getDrawable(iconResourceId);
		if (PhoneCapabilityTester.isPhone(context)) {
		intent = CallUtil.getCallIntent(phone.getNumber());
		intent.putExtra(EXTRA_ACTION_TYPE, ActionType.CALL);
		@@ -1638,7 +1638,7 @@ public class QuickContactActivity extends ContactsActivity {
		Uri.fromParts(ContactsUtils.SCHEME_SMSTO, phone.getNumber(), null));
		alternateIntent.putExtra(EXTRA_ACTION_TYPE, ActionType.SMS);

		alternateIcon = res.getDrawable(R.drawable.quantum_ic_message_vd_theme_24);
		alternateIcon = context.getDrawable(R.drawable.quantum_ic_message_vd_theme_24);
		alternateContentDescription.append(res.getString(R.string.sms_custom, header));
		smsContentDescription = com.android.contacts.util.ContactDisplayUtils
		.getTelephoneTtsSpannable(alternateContentDescription.toString(), header);
		@@ -1652,7 +1652,8 @@ public class QuickContactActivity extends ContactsActivity {
		boolean isPresent = (carrierPresence & Phone.CARRIER_PRESENCE_VT_CAPABLE) != 0;

		if (CallUtil.isCallWithSubjectSupported(context)) {
		thirdIcon = res.getDrawable(R.drawable.quantum_ic_perm_phone_msg_vd_theme_24);
		thirdIcon =
		context.getDrawable(R.drawable.quantum_ic_perm_phone_msg_vd_theme_24);
		thirdAction = Entry.ACTION_CALL_WITH_SUBJECT;
		thirdContentDescription =
		res.getString(R.string.call_with_a_note);
		@@ -1674,7 +1675,7 @@ public class QuickContactActivity extends ContactsActivity {
		thirdExtras.putString(CallSubjectDialog.ARG_NUMBER_LABEL,
		phoneLabel);
		} else if (isVideoEnabled && (!isPresenceEnabled \|\| isPresent)) {
		thirdIcon = res.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
		thirdIcon = context.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
		thirdAction = Entry.ACTION_INTENT;
		thirdIntent = CallUtil.getVideoCallIntent(phone.getNumber(),
		CALL_ORIGIN_QUICK_CONTACTS_ACTIVITY);
		@@ -1683,7 +1684,7 @@ public class QuickContactActivity extends ContactsActivity {
		res.getString(R.string.description_video_call);
		} else if (CallUtil.isTachyonEnabled(context)
		&& ((PhoneDataItem) dataItem).isTachyonReachable()) {
		thirdIcon = res.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
		thirdIcon = context.getDrawable(R.drawable.quantum_ic_videocam_vd_theme_24);
		thirdAction = Entry.ACTION_INTENT;
		thirdIntent = new Intent(TACHYON_CALL_ACTION);
		thirdIntent.setData(
		@@ -1711,7 +1712,7 @@ public class QuickContactActivity extends ContactsActivity {
		}
		primaryContentDescription.append(header);
		iconResourceId = R.drawable.quantum_ic_email_vd_theme_24;
		icon = res.getDrawable(iconResourceId);
		icon = context.getDrawable(iconResourceId);
		}
		} else if (dataItem instanceof StructuredPostalDataItem) {
		StructuredPostalDataItem postal = (StructuredPostalDataItem) dataItem;
		@@ -1733,11 +1734,11 @@ public class QuickContactActivity extends ContactsActivity {
		alternateIntent =
		StructuredPostalUtils.getViewPostalAddressIntent(postalAddress);
		alternateIntent.putExtra(EXTRA_ACTION_TYPE, ActionType.DIRECTIONS);
		alternateIcon = res.getDrawable(R.drawable.quantum_ic_directions_vd_theme_24);
		alternateIcon = context.getDrawable(R.drawable.quantum_ic_directions_vd_theme_24);
		alternateContentDescription.append(res.getString(
		R.string.content_description_directions)).append(" ").append(header);
		iconResourceId = R.drawable.quantum_ic_place_vd_theme_24;
		icon = res.getDrawable(iconResourceId);
		icon = context.getDrawable(iconResourceId);
		}
		} else if (dataItem instanceof SipAddressDataItem) {
		final SipAddressDataItem sip = (SipAddressDataItem) dataItem;
		@@ -1761,7 +1762,7 @@ public class QuickContactActivity extends ContactsActivity {
		}
		primaryContentDescription.append(header);
		iconResourceId = R.drawable.quantum_ic_dialer_sip_vd_theme_24;
		icon = res.getDrawable(iconResourceId);
		icon = context.getDrawable(iconResourceId);
		}
		} else if (dataItem instanceof StructuredNameDataItem) {
		// If the name is already set and this is not the super primary value then leave the
		@@ -1815,8 +1816,8 @@ public class QuickContactActivity extends ContactsActivity {
		// If a secondDataItem is available, use it to build an entry with
		// alternate actions
		if (secondDataItem != null) {
		icon = res.getDrawable(R.drawable.quantum_ic_hangout_vd_theme_24);
		alternateIcon = res.getDrawable(
		icon = context.getDrawable(R.drawable.quantum_ic_hangout_vd_theme_24);
		alternateIcon = context.getDrawable(
		R.drawable.quantum_ic_hangout_video_vd_theme_24);
		final HangoutsDataItemModel itemModel =
		new HangoutsDataItemModel(intent, alternateIntent,
		@@ -1831,9 +1832,10 @@ public class QuickContactActivity extends ContactsActivity {
		text = itemModel.text;
		} else {
		if (HANGOUTS_DATA_5_VIDEO.equals(intent.getDataString())) {
		icon = res.getDrawable(R.drawable.quantum_ic_hangout_video_vd_theme_24);
		icon = context.getDrawable(
		R.drawable.quantum_ic_hangout_video_vd_theme_24);
		} else {
		icon = res.getDrawable(R.drawable.quantum_ic_hangout_vd_theme_24);
		icon = context.getDrawable(R.drawable.quantum_ic_hangout_vd_theme_24);
		}
		}
		} else {