summaryrefslogtreecommitdiff
path: root/java/com/android/incallui
diff options
context:
space:
mode:
Diffstat (limited to 'java/com/android/incallui')
-rw-r--r--java/com/android/incallui/InCallActivity.java92
-rw-r--r--java/com/android/incallui/call/DialerCall.java16
2 files changed, 89 insertions, 19 deletions
diff --git a/java/com/android/incallui/InCallActivity.java b/java/com/android/incallui/InCallActivity.java
index f842aedf7..dee5e7eb1 100644
--- a/java/com/android/incallui/InCallActivity.java
+++ b/java/com/android/incallui/InCallActivity.java
@@ -39,6 +39,7 @@ import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.res.ResourcesCompat;
import android.support.v4.graphics.ColorUtils;
+import android.telecom.Call;
import android.telecom.CallAudioState;
import android.telecom.PhoneAccountHandle;
import android.telephony.TelephonyManager;
@@ -56,14 +57,19 @@ import com.android.dialer.animation.AnimUtils;
import com.android.dialer.animation.AnimationListenerAdapter;
import com.android.dialer.common.Assert;
import com.android.dialer.common.LogUtil;
+import com.android.dialer.common.concurrent.DialerExecutorComponent;
import com.android.dialer.common.concurrent.ThreadUtil;
import com.android.dialer.compat.ActivityCompat;
import com.android.dialer.compat.CompatUtils;
import com.android.dialer.configprovider.ConfigProviderBindings;
+import com.android.dialer.logging.DialerImpression.Type;
import com.android.dialer.logging.Logger;
import com.android.dialer.logging.ScreenEvent;
import com.android.dialer.metrics.Metrics;
import com.android.dialer.metrics.MetricsComponent;
+import com.android.dialer.preferredsim.PreferredAccountRecorder;
+import com.android.dialer.preferredsim.PreferredAccountWorker;
+import com.android.dialer.preferredsim.suggestion.SuggestionProvider;
import com.android.dialer.util.ViewUtil;
import com.android.incallui.answer.bindings.AnswerBindings;
import com.android.incallui.answer.protocol.AnswerScreen;
@@ -124,8 +130,8 @@ public class InCallActivity extends TransactionSafeFragmentActivity
private final InternationalCallOnWifiCallback internationalCallOnWifiCallback =
new InternationalCallOnWifiCallback();
- private final SelectPhoneAccountListener selectPhoneAccountListener =
- new SelectPhoneAccountListener();
+
+ private SelectPhoneAccountListener selectPhoneAccountListener;
private Animation dialpadSlideInAnimation;
private Animation dialpadSlideOutAnimation;
@@ -179,6 +185,8 @@ public class InCallActivity extends TransactionSafeFragmentActivity
Trace.beginSection("InCallActivity.onCreate");
super.onCreate(bundle);
+ selectPhoneAccountListener = new SelectPhoneAccountListener(getApplicationContext());
+
if (bundle != null) {
didShowAnswerScreen = bundle.getBoolean(KeysForSavedInstance.DID_SHOW_ANSWER_SCREEN);
didShowInCallScreen = bundle.getBoolean(KeysForSavedInstance.DID_SHOW_IN_CALL_SCREEN);
@@ -358,22 +366,59 @@ public class InCallActivity extends TransactionSafeFragmentActivity
return false;
}
- Bundle extras = waitingForAccountCall.getIntentExtras();
- List<PhoneAccountHandle> phoneAccountHandles =
- extras == null
- ? new ArrayList<>()
- : extras.getParcelableArrayList(android.telecom.Call.AVAILABLE_PHONE_ACCOUNTS);
-
- selectPhoneAccountDialogFragment =
- SelectPhoneAccountDialogFragment.newInstance(
- R.string.select_phone_account_for_calls,
- true /* canSetDefault */,
- 0 /* setDefaultResId */,
- phoneAccountHandles,
- selectPhoneAccountListener,
- waitingForAccountCall.getId(),
- null /* hints */);
- selectPhoneAccountDialogFragment.show(getFragmentManager(), Tags.SELECT_ACCOUNT_FRAGMENT);
+ DialerExecutorComponent.get(this)
+ .dialerExecutorFactory()
+ .createNonUiTaskBuilder(new PreferredAccountWorker(waitingForAccountCall.getNumber()))
+ .onSuccess(
+ (result -> {
+ if (result.getPhoneAccountHandle().isPresent()) {
+ Logger.get(this).logImpression(Type.DUAL_SIM_SELECTION_PREFERRED_USED);
+ selectPhoneAccountListener.onPhoneAccountSelected(
+ result.getPhoneAccountHandle().get(), false, waitingForAccountCall.getId());
+ return;
+ }
+ if (result.getSuggestion().isPresent()) {
+ LogUtil.i(
+ "CallingAccountSelector.processPreferredAccount",
+ "SIM suggested: " + result.getSuggestion().get().reason);
+ if (result.getSuggestion().get().shouldAutoSelect) {
+ Logger.get(this).logImpression(Type.DUAL_SIM_SELECTION_SUGGESTION_AUTO_SELECTED);
+ LogUtil.i(
+ "CallingAccountSelector.processPreferredAccount", "Auto selected suggestion");
+ selectPhoneAccountListener.onPhoneAccountSelected(
+ result.getSuggestion().get().phoneAccountHandle,
+ false,
+ waitingForAccountCall.getId());
+ return;
+ }
+ }
+ Bundle extras = waitingForAccountCall.getIntentExtras();
+ List<PhoneAccountHandle> phoneAccountHandles =
+ extras == null
+ ? new ArrayList<>()
+ : extras.getParcelableArrayList(Call.AVAILABLE_PHONE_ACCOUNTS);
+
+ waitingForAccountCall.setPreferredAccountRecorder(
+ new PreferredAccountRecorder(
+ waitingForAccountCall.getNumber(),
+ result.getSuggestion().orNull(),
+ result.getDataId().orNull()));
+ selectPhoneAccountDialogFragment =
+ SelectPhoneAccountDialogFragment.newInstance(
+ R.string.select_phone_account_for_calls,
+ result.getDataId().isPresent() /* canSetDefault */,
+ R.string.select_phone_account_for_calls_remember /* setDefaultResId */,
+ phoneAccountHandles,
+ selectPhoneAccountListener,
+ waitingForAccountCall.getId(),
+ SuggestionProvider.buildHint(
+ this, phoneAccountHandles, result.getSuggestion().orNull() /* hints */));
+ selectPhoneAccountDialogFragment.show(
+ getFragmentManager(), Tags.SELECT_ACCOUNT_FRAGMENT);
+ }))
+ .build()
+ .executeParallel(this);
+
return true;
}
@@ -1650,6 +1695,12 @@ public class InCallActivity extends TransactionSafeFragmentActivity
extends SelectPhoneAccountDialogFragment.SelectPhoneAccountListener {
private static final String TAG = SelectPhoneAccountListener.class.getCanonicalName();
+ private final Context appContext;
+
+ SelectPhoneAccountListener(Context appContext) {
+ this.appContext = appContext;
+ }
+
@Override
public void onPhoneAccountSelected(
PhoneAccountHandle selectedAccountHandle, boolean setDefault, String callId) {
@@ -1657,7 +1708,10 @@ public class InCallActivity extends TransactionSafeFragmentActivity
LogUtil.i(TAG, "Phone account select with call:\n%s", call);
if (call != null) {
- call.phoneAccountSelected(selectedAccountHandle, setDefault);
+ call.phoneAccountSelected(selectedAccountHandle, false);
+ if (call.getPreferredAccountRecorder() != null) {
+ call.getPreferredAccountRecorder().record(appContext, selectedAccountHandle, setDefault);
+ }
}
}
diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java
index 30d2bcb5e..5d2b1471d 100644
--- a/java/com/android/incallui/call/DialerCall.java
+++ b/java/com/android/incallui/call/DialerCall.java
@@ -71,6 +71,7 @@ import com.android.dialer.logging.ContactLookupResult;
import com.android.dialer.logging.ContactLookupResult.Type;
import com.android.dialer.logging.DialerImpression;
import com.android.dialer.logging.Logger;
+import com.android.dialer.preferredsim.PreferredAccountRecorder;
import com.android.dialer.telecom.TelecomCallUtil;
import com.android.dialer.telecom.TelecomUtil;
import com.android.dialer.theme.R;
@@ -181,6 +182,8 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa
private volatile boolean feedbackRequested = false;
+ @Nullable private PreferredAccountRecorder preferredAccountRecorder;
+
public static String getNumberFromHandle(Uri handle) {
return handle == null ? "" : handle.getSchemeSpecificPart();
}
@@ -1529,6 +1532,19 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa
}
/**
+ * If the in call UI has shown the phone account selection dialog for the call, the {@link
+ * PreferredAccountRecorder} to record the result from the dialog.
+ */
+ @Nullable
+ public PreferredAccountRecorder getPreferredAccountRecorder() {
+ return preferredAccountRecorder;
+ }
+
+ public void setPreferredAccountRecorder(PreferredAccountRecorder preferredAccountRecorder) {
+ this.preferredAccountRecorder = preferredAccountRecorder;
+ }
+
+ /**
* Specifies whether a number is in the call history or not. {@link #CALL_HISTORY_STATUS_UNKNOWN}
* means there is no result.
*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-15 08:07:26 +0000