From 975393515b8b5e0699142fafcb78214f1873e38f Mon Sep 17 00:00:00 2001 From: wangqi Date: Mon, 25 Sep 2017 11:15:16 -0700 Subject: Update text of call back number in emergency calls. Screeshot: Before: https://screenshot.googleplex.com/bnByOaCTV4O After: https://screenshot.googleplex.com/v0vhkuuvT28 Bug: 38347145 Test: manual PiperOrigin-RevId: 169933363 Change-Id: Ia3728be488ff329531c171b03a3045f1839d1d5e --- java/com/android/incallui/CallCardPresenter.java | 4 +++- java/com/android/incallui/call/DialerCall.java | 11 +++++++++++ java/com/android/incallui/contactgrid/BottomRow.java | 5 +---- java/com/android/incallui/contactgrid/res/values/strings.xml | 7 +++---- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/java/com/android/incallui/CallCardPresenter.java b/java/com/android/incallui/CallCardPresenter.java index 653b51aa5..15b04eaaf 100644 --- a/java/com/android/incallui/CallCardPresenter.java +++ b/java/com/android/incallui/CallCardPresenter.java @@ -52,6 +52,7 @@ import com.android.dialer.logging.DialerImpression; import com.android.dialer.logging.Logger; import com.android.dialer.multimedia.MultimediaData; import com.android.dialer.oem.MotorolaUtils; +import com.android.dialer.phonenumberutil.PhoneNumberHelper; import com.android.dialer.postcall.PostCall; import com.android.incallui.ContactInfoCache.ContactCacheEntry; import com.android.incallui.ContactInfoCache.ContactInfoCacheCallback; @@ -466,7 +467,8 @@ public class CallCardPresenter getCallStateIcon(), getGatewayNumber(), shouldShowCallSubject(mPrimary) ? mPrimary.getCallSubject() : null, - mPrimary.getCallbackNumber(), + PhoneNumberHelper.formatNumber( + mPrimary.getCallbackNumber(), mPrimary.getSimCountryIso()), mPrimary.hasProperty(Details.PROPERTY_WIFI), mPrimary.isConferenceCall() && !mPrimary.hasProperty(Details.PROPERTY_GENERIC_CONFERENCE), diff --git a/java/com/android/incallui/call/DialerCall.java b/java/com/android/incallui/call/DialerCall.java index a9bad5b58..4f31dadf4 100644 --- a/java/com/android/incallui/call/DialerCall.java +++ b/java/com/android/incallui/call/DialerCall.java @@ -1182,6 +1182,17 @@ public class DialerCall implements VideoTechListener, StateChangedListener, Capa return callbackNumber; } + public String getSimCountryIso() { + String simCountryIso = + TelephonyManagerCompat.getTelephonyManagerForPhoneAccountHandle( + mContext, getAccountHandle()) + .getSimCountryIso(); + if (!TextUtils.isEmpty(simCountryIso)) { + simCountryIso = simCountryIso.toUpperCase(Locale.US); + } + return simCountryIso; + } + @Override public void onVideoTechStateChanged() { update(); diff --git a/java/com/android/incallui/contactgrid/BottomRow.java b/java/com/android/incallui/contactgrid/BottomRow.java index 6068cc0e5..91f08ef3e 100644 --- a/java/com/android/incallui/contactgrid/BottomRow.java +++ b/java/com/android/incallui/contactgrid/BottomRow.java @@ -103,10 +103,7 @@ public class BottomRow { } } else if (!TextUtils.isEmpty(state.callbackNumber)) { // This is used for carriers like Project Fi to show the callback number for emergency calls. - label = - context.getString( - R.string.contact_grid_callback_number, - PhoneNumberUtils.formatNumber(state.callbackNumber)); + label = context.getString(R.string.contact_grid_callback_number, state.callbackNumber); isTimerVisible = false; } else { label = getLabelForPhoneNumber(primaryInfo); diff --git a/java/com/android/incallui/contactgrid/res/values/strings.xml b/java/com/android/incallui/contactgrid/res/values/strings.xml index 63037dc31..eba4abf30 100644 --- a/java/com/android/incallui/contactgrid/res/values/strings.xml +++ b/java/com/android/incallui/contactgrid/res/values/strings.xml @@ -80,8 +80,7 @@ Suspected spam caller - - Callback number: %1$s + + This phone\'s number: %1$s -- cgit v1.2.3 From 38424bff03c90b93837c8c9e25a4a6041071e1e4 Mon Sep 17 00:00:00 2001 From: mdooley Date: Mon, 25 Sep 2017 11:16:18 -0700 Subject: Tweaking verizon's voicemail TOS text Change verizon's ToS title to use the string 'visual voicemail' This change seems a bit strange since the verizon legal text uses the string 'Visual Voice Mail', but the title uses 'visual voice mail' screen shots: https://drive.google.com/open?id=0B9o_KvtLkcuIR1lmaUF4OXk1SnFLdS1fbFpfMlFieWlTQ25v https://drive.google.com/open?id=0B9o_KvtLkcuIRURWd0hhYjc4NUdKQ1hzM2RIcG5fSmlHcGhJ Bug: 37340510 Test: update unit tests PiperOrigin-RevId: 169933539 Change-Id: Idba526293604b7a27083a91b86825ef66ce23bcd --- java/com/android/dialer/app/voicemail/error/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml index 3917cf8a2..1ac48138d 100644 --- a/java/com/android/dialer/app/voicemail/error/res/values/strings.xml +++ b/java/com/android/dialer/app/voicemail/error/res/values/strings.xml @@ -136,8 +136,8 @@ +18009220204 (800) 922–0204 - Turn on Visual Voice Mail - %1$s\n\nBy turning on Visual Voice Mail you agree to the Verizon Wireless terms and conditions:\n\n%2$s + Turn on visual voicemail + %1$s\n\nBy turning on visual voicemail you agree to the Verizon Wireless terms and conditions:\n\n%2$s Turn on visual voicemail %s -- cgit v1.2.3 From a8d660986f87fbfdcd7310fbc7ec0b20c3b56b10 Mon Sep 17 00:00:00 2001 From: weijiaxu Date: Mon, 25 Sep 2017 11:22:09 -0700 Subject: Upgrade and refactor latency test over Dialer. Now it has Incall UI latency besides app launch latency. Alert functionality is not included in this cl. Add a new idlingResource for incall ui and a new method called waitForInCallUiShown in DialerCallEspresso. Add UiListener interface in CallList and insert uilisteners on onCallAdded() and onInCallUiShown(). Also, a g3doc page has been created in http://cl/168901452 to show the dashboards. Test: Run on a local device PiperOrigin-RevId: 169934618 Change-Id: I0ea10aca051c62cd8252ee5a3c9dfbce81316a33 --- java/com/android/incallui/call/CallList.java | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/java/com/android/incallui/call/CallList.java b/java/com/android/incallui/call/CallList.java index 1f2c4c6ec..8d6620628 100644 --- a/java/com/android/incallui/call/CallList.java +++ b/java/com/android/incallui/call/CallList.java @@ -79,6 +79,8 @@ public class CallList implements DialerCallDelegate { private final Set mPendingDisconnectCalls = Collections.newSetFromMap(new ConcurrentHashMap(8, 0.9f, 1)); + + private UiListener mUiListeners; /** Handles the timeout for destroying disconnected calls. */ private final Handler mHandler = new Handler() { @@ -116,6 +118,9 @@ public class CallList implements DialerCallDelegate { public void onCallAdded( final Context context, final android.telecom.Call telecomCall, LatencyReport latencyReport) { Trace.beginSection("CallList.onCallAdded"); + if (mUiListeners != null) { + mUiListeners.onCallAdded(); + } final DialerCall call = new DialerCall(context, this, telecomCall, latencyReport, true /* registerCallback */); if (getFirstCall() != null) { @@ -377,6 +382,10 @@ public class CallList implements DialerCallDelegate { listener.onCallListChange(this); } + public void setUiListener(UiListener uiListener) { + mUiListeners = uiListener; + } + public void removeListener(@Nullable Listener listener) { if (listener != null) { mListeners.remove(listener); @@ -727,6 +736,9 @@ public class CallList implements DialerCallDelegate { for (DialerCall call : mCallById.values()) { call.getLatencyReport().onInCallUiShown(forFullScreenIntent); } + if (mUiListeners != null) { + mUiListeners.onInCallUiShown(); + } } /** Listener interface for any class that wants to be notified of changes to the call list. */ @@ -775,6 +787,16 @@ public class CallList implements DialerCallDelegate { void onInternationalCallOnWifi(@NonNull DialerCall call); } + /** UiListener interface for measuring incall latency.(used by testing only) */ + public interface UiListener { + + /** Called when a new call gets added into call list from IncallServiceImpl */ + void onCallAdded(); + + /** Called in the end of onResume method of IncallActivityCommon. */ + void onInCallUiShown(); + } + private class DialerCallListenerImpl implements DialerCallListener { @NonNull private final DialerCall mCall; -- cgit v1.2.3 From 727f602e81db45b2840836fd7206114da81f08e1 Mon Sep 17 00:00:00 2001 From: twyen Date: Mon, 25 Sep 2017 13:35:19 -0700 Subject: Use help center for GoogleDialer about The about in settings is removed in google dialer, it is accessed through the dialtacts overflow "Help & feedback" instead: https://screenshot.googleplex.com/9L1kdQz6c2B https://screenshot.googleplex.com/FqqdG6X9JTR Note that help articles has not been migrated at this moment. Features in the original about is placed in the overflow https://screenshot.googleplex.com/OmCVPqwGBM9 Version info is stock google help https://screenshot.googleplex.com/EdveVnXUSML Privacy policy/Terms of service opens the browser to the link we had before Open source license opens the same license activity in about. Bug: 34872689 Test: manual PiperOrigin-RevId: 169953610 Change-Id: Ib1c25ddecbf28293b447112cb280a8f9788692d3 --- java/com/android/dialer/about/AndroidManifest.xml | 16 +++++++++++++++- .../dialer/app/settings/DialerSettingsActivity.java | 15 +++++++++++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/java/com/android/dialer/about/AndroidManifest.xml b/java/com/android/dialer/about/AndroidManifest.xml index 85c750826..3d5067ade 100644 --- a/java/com/android/dialer/about/AndroidManifest.xml +++ b/java/com/android/dialer/about/AndroidManifest.xml @@ -1,10 +1,24 @@ + target, boolean isPrimaryUser) { @@ -208,6 +210,11 @@ public class DialerSettingsActivity extends AppCompatPreferenceActivity { return result; } + /** Whether "about" should be shown in settings. Override to hide about. */ + public boolean showAbout() { + return true; + } + /** * Returns {@code true} or {@code false} based on whether the display options setting should be * shown. For languages such as Chinese, Japanese, or Korean, display options aren't useful since -- cgit v1.2.3