Snap for 4653637 from 0ab9ecd9ab93283a5bdcff6eb2ba7b4ee4a14657 to qt-release (56365a6e) · Commits · e / os / android_packages_apps_Dialer

java/com/android/contacts/common/res/layout/select_account_list_item.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -42,7 +42,7 @@
		android:orientation="vertical">
		<TextView
		android:id="@+id/label"
		android:layout_width="match_parent"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:includeFontPadding="false"
		android:textAppearance="?android:attr/textAppearanceMedium"
		@@ -57,7 +57,7 @@
		android:visibility="gone"/>
		<TextView
		android:id="@+id/hint"
		android:layout_width="match_parent"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:includeFontPadding="false"
		android:maxLines="1"

java/com/android/dialer/app/DialtactsActivity.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -1727,6 +1727,9 @@ public class DialtactsActivity extends TransactionSafeActivity
		clearSearchOnPause = true;
		}

		@Override
		public void requestingPermission() {}

		protected int getPreviouslySelectedTabIndex() {
		return previouslySelectedTabIndex;
		}

java/com/android/dialer/app/calllog/CallLogFragment.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -489,7 +489,10 @@ public class CallLogFragment extends Fragment
		@Override
		public void fetchCalls() {
		callLogQueryHandler.fetchCalls(callTypeFilter, dateLimit);
		if (!isCallLogActivity && getActivity() != null && !getActivity().isFinishing()) {
		if (!isCallLogActivity
		&& getActivity() != null
		&& !getActivity().isFinishing()
		&& FragmentUtils.getParent(this, CallLogFragmentListener.class) != null) {
		FragmentUtils.getParentUnsafe(this, CallLogFragmentListener.class).updateTabUnreadCounts();
		}
		}

java/com/android/dialer/calllog/ui/res/layout/new_call_log_fragment.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,6 +20,6 @@
		android:id="@+id/new_call_log_recycler_view"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:background="@color/background_dialer_light"
		android:background="@color/background_dialer_white"
		android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"
		android:clipToPadding="false"/>

java/com/android/dialer/dialpadview/SpecialCharSequenceMgr.java

+18 −13

Original line number	Diff line number	Diff line
		@@ -59,14 +59,15 @@ import com.android.contacts.common.widget.SelectPhoneAccountDialogFragment.Selec
		import com.android.dialer.common.Assert;
		import com.android.dialer.common.LogUtil;
		import com.android.dialer.compat.telephony.TelephonyManagerCompat;
		import com.android.dialer.configprovider.ConfigProviderBindings;
		import com.android.dialer.oem.MotorolaUtils;
		import com.android.dialer.telecom.TelecomUtil;
		import com.android.dialer.util.PermissionsUtil;
		import com.google.common.collect.ImmutableSet;
		import com.google.zxing.BarcodeFormat;
		import com.google.zxing.MultiFormatWriter;
		import com.google.zxing.WriterException;
		import com.google.zxing.common.BitMatrix;
		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.List;
		import java.util.Locale;
		@@ -93,17 +94,8 @@ public class SpecialCharSequenceMgr {
		private static final String ADN_NAME_COLUMN_NAME = "name";
		private static final int ADN_QUERY_TOKEN = -1;

		@VisibleForTesting
		static final List<String> TRANSSION_CODES =
		new ArrayList<String>() {
		{
		add("*#07#");
		add("*#87#");
		add("*#43#");
		add("*#2727#");
		add("*#88#");
		}
		};
		/** Comma separated MMI codes specific to OEM/device. */
		@VisibleForTesting static final String CONFIG_OEM_MMI_CODES_CSV = "oem_mmi_codes_csv";

		/**
		* Remembers the previous {@link QueryHandler} and cancel the operation when needed, to prevent
		@@ -172,7 +164,8 @@ public class SpecialCharSequenceMgr {
		TelephonyManagerCompat.handleSecretCode(context, secretCode);
		return true;
		}
		if (TRANSSION_CODES.contains(input)) {

		if (getOemSecretCodes(context).contains(input)) {
		String secretCode = input.substring(2, input.length() - 1);
		TelephonyManagerCompat.handleSecretCode(context, secretCode);
		return true;
		@@ -180,6 +173,18 @@ public class SpecialCharSequenceMgr {
		return false;
		}

		/**
		* Get the OEM codes from the config provider. The config provider should be aware of the device
		* and manufacturer.
		*/
		private static ImmutableSet<String> getOemSecretCodes(Context context) {
		String csv = ConfigProviderBindings.get(context).getString(CONFIG_OEM_MMI_CODES_CSV, null);
		if (TextUtils.isEmpty(csv)) {
		return ImmutableSet.of();
		}
		return ImmutableSet.copyOf(csv.split(","));
		}

		/**
		* Handle ADN requests by filling in the SIM contact number into the requested EditText.
		*