summaryrefslogtreecommitdiff
path: root/java/com/android/dialer/precall
diff options
context:
space:
mode:
authortwyen <twyen@google.com>2017-11-17 10:43:38 -0800
committerzachh <zachh@google.com>2017-11-18 07:34:52 +0000
commitc170e2df0230f46e06ed066becc0001f5b8eb44e (patch)
treeb825f0bb82fa6b1a4c1c7016772b6ae22b8b05e1 /java/com/android/dialer/precall
parent450c96108c73569dbe13a9e91dc35b34e940aecc (diff)
Implement suggested SIM
This CL adds a module that can query providers to aid users choosing which SIM to call with. Bug: 64214592 Test: MotoSuggestionProviderTest PiperOrigin-RevId: 176129303 Change-Id: Idb6314ad7f5a1bcd20b5b9173d3bfd873383cc84
Diffstat (limited to 'java/com/android/dialer/precall')
-rw-r--r--java/com/android/dialer/precall/impl/CallingAccountSelector.java64
1 files changed, 58 insertions, 6 deletions
diff --git a/java/com/android/dialer/precall/impl/CallingAccountSelector.java b/java/com/android/dialer/precall/impl/CallingAccountSelector.java
index d763c7a5f..e0fe0c488 100644
--- a/java/com/android/dialer/precall/impl/CallingAccountSelector.java
+++ b/java/com/android/dialer/precall/impl/CallingAccountSelector.java
@@ -44,6 +44,8 @@ import com.android.dialer.precall.PreCallCoordinator;
import com.android.dialer.precall.PreCallCoordinator.PendingAction;
import com.android.dialer.preferredsim.PreferredSimFallbackContract;
import com.android.dialer.preferredsim.PreferredSimFallbackContract.PreferredSim;
+import com.android.dialer.preferredsim.suggestion.SimSuggestionComponent;
+import com.android.dialer.preferredsim.suggestion.SuggestionProvider.Suggestion;
import com.google.common.base.Optional;
import java.util.List;
import java.util.Set;
@@ -84,7 +86,7 @@ public class CallingAccountSelector implements PreCallAction {
}
switch (builder.getUri().getScheme()) {
case PhoneAccount.SCHEME_VOICEMAIL:
- showDialog(coordinator, coordinator.startPendingAction(), null);
+ showDialog(coordinator, coordinator.startPendingAction(), null, null, null);
break;
case PhoneAccount.SCHEME_TEL:
processPreferredAccount(coordinator);
@@ -128,7 +130,17 @@ public class CallingAccountSelector implements PreCallAction {
pendingAction.finish();
return;
}
- showDialog(coordinator, pendingAction, result.dataId.orNull());
+ if (result.suggestion.isPresent()) {
+ LogUtil.i(
+ "CallingAccountSelector.processPreferredAccount",
+ "SIM suggested: " + result.suggestion.get().reason);
+ }
+ showDialog(
+ coordinator,
+ pendingAction,
+ result.dataId.orNull(),
+ phoneNumber,
+ result.suggestion.orNull());
}))
.build()
.executeParallel(activity);
@@ -136,7 +148,11 @@ public class CallingAccountSelector implements PreCallAction {
@MainThread
private void showDialog(
- PreCallCoordinator coordinator, PendingAction pendingAction, @Nullable String dataId) {
+ PreCallCoordinator coordinator,
+ PendingAction pendingAction,
+ @Nullable String dataId,
+ @Nullable String number,
+ @Nullable Suggestion unusedSuggestion) { // TODO(twyen): incoporate suggestion in dialog
Assert.isMainThread();
selectPhoneAccountDialogFragment =
SelectPhoneAccountDialogFragment.newInstance(
@@ -146,7 +162,7 @@ public class CallingAccountSelector implements PreCallAction {
.getActivity()
.getSystemService(TelecomManager.class)
.getCallCapablePhoneAccounts(),
- new SelectedListener(coordinator, pendingAction, dataId),
+ new SelectedListener(coordinator, pendingAction, dataId, number),
null /* call ID */);
selectPhoneAccountDialogFragment.show(
coordinator.getActivity().getFragmentManager(), TAG_CALLING_ACCOUNT_SELECTOR);
@@ -169,6 +185,8 @@ public class CallingAccountSelector implements PreCallAction {
* preferred account is to be set it should be stored in this row
*/
Optional<String> dataId = Optional.absent();
+
+ Optional<Suggestion> suggestion = Optional.absent();
}
private static class PreferredAccountWorker
@@ -189,6 +207,12 @@ public class CallingAccountSelector implements PreCallAction {
if (result.dataId.isPresent()) {
result.phoneAccountHandle = getPreferredAccount(context, result.dataId.get());
}
+ if (!result.phoneAccountHandle.isPresent()) {
+ result.suggestion =
+ SimSuggestionComponent.get(context)
+ .getSuggestionProvider()
+ .getSuggestion(context, phoneNumber);
+ }
return result;
}
}
@@ -257,14 +281,17 @@ public class CallingAccountSelector implements PreCallAction {
private final PreCallCoordinator coordinator;
private final PreCallCoordinator.PendingAction listener;
private final String dataId;
+ private final String number;
public SelectedListener(
@NonNull PreCallCoordinator builder,
@NonNull PreCallCoordinator.PendingAction listener,
- @Nullable String dataId) {
+ @Nullable String dataId,
+ @Nullable String number) {
this.coordinator = Assert.isNotNull(builder);
this.listener = Assert.isNotNull(listener);
this.dataId = dataId;
+ this.number = number;
}
@MainThread
@@ -282,7 +309,11 @@ public class CallingAccountSelector implements PreCallAction {
new WritePreferredAccountWorkerInput(
coordinator.getActivity(), dataId, selectedAccountHandle));
}
-
+ DialerExecutorComponent.get(coordinator.getActivity())
+ .dialerExecutorFactory()
+ .createNonUiTaskBuilder(new UserSelectionReporter(selectedAccountHandle, number))
+ .build()
+ .executeParallel(coordinator.getActivity());
listener.finish();
}
@@ -297,6 +328,27 @@ public class CallingAccountSelector implements PreCallAction {
}
}
+ private static class UserSelectionReporter implements Worker<Context, Void> {
+
+ private final String number;
+ private final PhoneAccountHandle phoneAccountHandle;
+
+ public UserSelectionReporter(
+ @NonNull PhoneAccountHandle phoneAccountHandle, @Nullable String number) {
+ this.phoneAccountHandle = Assert.isNotNull(phoneAccountHandle);
+ this.number = Assert.isNotNull(number);
+ }
+
+ @Nullable
+ @Override
+ public Void doInBackground(@NonNull Context context) throws Throwable {
+ SimSuggestionComponent.get(context)
+ .getSuggestionProvider()
+ .reportUserSelection(context, number, phoneAccountHandle);
+ return null;
+ }
+ }
+
private static class WritePreferredAccountWorkerInput {
private final Context context;
private final String dataId;