diff options
103 files changed, 397 insertions, 297 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c04885412..777faa3a5 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -17,8 +17,8 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.dialer" coreApp="true" - android:versionCode="20500" - android:versionName="2.05.00"> + android:versionCode="20501" + android:versionName="2.05.01"> <uses-sdk android:minSdkVersion="23" diff --git a/InCallUI/res/layout/call_card_fragment.xml b/InCallUI/res/layout/call_card_fragment.xml index 09e148512..03bbe87b8 100644 --- a/InCallUI/res/layout/call_card_fragment.xml +++ b/InCallUI/res/layout/call_card_fragment.xml @@ -44,21 +44,22 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" /> - <!-- Secondary "Call info" block, for the background ("on hold") call. --> - <include layout="@layout/secondary_call_info" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="bottom" /> - </LinearLayout> <!-- Placeholder for the dialpad which is replaced with the dialpad fragment when shown. --> <FrameLayout android:id="@+id/answer_and_dialpad_container" android:layout_width="match_parent" - android:elevation="7dp" + android:elevation="@dimen/dialpad_elevation" android:layout_height="match_parent" /> + <!-- Secondary "Call info" block, for the background ("on hold") call. --> + <include layout="@layout/secondary_call_info" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:elevation="4dp" + android:layout_alignParentBottom="true" /> + <FrameLayout android:id="@+id/floating_end_call_action_button_container" android:layout_width="@dimen/end_call_floating_action_button_diameter" @@ -77,6 +78,33 @@ </FrameLayout> + <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. --> + <FrameLayout + android:id="@+id/progressSpinner" + android:background="#63000000" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:visibility="gone" > + + <ProgressBar + android:id="@+id/progress_bar" + style="@android:style/Widget.Material.ProgressBar" + android:layout_gravity="center" + android:layout_width="48dp" + android:layout_height="48dp" + android:indeterminate="true" /> + + </FrameLayout> + + <fragment android:name="com.android.incallui.VideoCallFragment" + android:layout_alignParentStart="true" + android:layout_gravity="start|center_vertical" + android:id="@+id/videoCallFragment" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + <FrameLayout android:layout_height="match_parent" android:layout_width="0dp" @@ -125,33 +153,6 @@ android:layout_height="wrap_content" android:layout_alignTop="@id/photoLarge" /> - <!-- Progress spinner, useful for indicating pending operations such as upgrade to video. --> - <FrameLayout - android:id="@+id/progressSpinner" - android:background="#63000000" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_centerHorizontal="true" - android:layout_centerVertical="true" - android:visibility="gone" > - - <ProgressBar - android:id="@+id/progress_bar" - style="@android:style/Widget.Material.ProgressBar" - android:layout_gravity="center" - android:layout_width="48dp" - android:layout_height="48dp" - android:indeterminate="true" /> - - </FrameLayout> - - <fragment android:name="com.android.incallui.VideoCallFragment" - android:layout_alignParentStart="true" - android:layout_gravity="start|center_vertical" - android:id="@+id/videoCallFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - </FrameLayout> </RelativeLayout> diff --git a/InCallUI/res/layout/video_call_views.xml b/InCallUI/res/layout/video_call_views.xml index b0c6ce2ad..d514f6df1 100644 --- a/InCallUI/res/layout/video_call_views.xml +++ b/InCallUI/res/layout/video_call_views.xml @@ -29,7 +29,7 @@ <FrameLayout android:id="@+id/previewVideoContainer" android:layout_width="70dp" - android:layout_height="120dp" + android:layout_height="0dp" android:layout_gravity="bottom|right" android:layout_margin="@dimen/video_preview_margin" > diff --git a/InCallUI/res/values-h600dp/dimens.xml b/InCallUI/res/values-h600dp/dimens.xml index 12f48d9b5..dda755a3e 100644 --- a/InCallUI/res/values-h600dp/dimens.xml +++ b/InCallUI/res/values-h600dp/dimens.xml @@ -16,9 +16,16 @@ --> <resources> + <!-- Whether or not this layout displays a large photo. --> + <bool name="has_large_photo">true</bool> + <dimen name="call_banner_height">90dp</dimen> <dimen name="end_call_button_margin_bottom">15dp</dimen> <dimen name="floating_action_button_vertical_offset">-24dp</dimen> + + <dimen name="dialpad_elevation">2dp</dimen> + + <dimen name="video_preview_margin">20dp</dimen> </resources> diff --git a/InCallUI/res/values-w600dp-land/dimens.xml b/InCallUI/res/values-w600dp-land/dimens.xml index 59a5a9a87..112ec5f09 100644 --- a/InCallUI/res/values-w600dp-land/dimens.xml +++ b/InCallUI/res/values-w600dp-land/dimens.xml @@ -16,11 +16,20 @@ --> <resources> + <!-- Whether or not this layout displays a large photo. --> + <bool name="has_large_photo">true</bool> + <!-- Whether or not the landscape mode layout is currently being used --> <bool name="is_layout_landscape">true</bool> + <!-- Height and width of the in-call buttons. --> <dimen name="in_call_button_dimension">40dp</dimen> + <!-- Margin underneath the call buttons. This is used only in landscape mode and is sized so that the call buttons are center aligned with the end call button. --> <dimen name="call_buttons_bottom_margin">30dp</dimen> + + <dimen name="dialpad_elevation">2dp</dimen> + + <dimen name="video_preview_margin">20dp</dimen> </resources> diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml index d6c47a2c7..59da7860a 100644 --- a/InCallUI/res/values/dimens.xml +++ b/InCallUI/res/values/dimens.xml @@ -16,6 +16,9 @@ --> <resources> + <!-- Whether or not this layout displays a large photo. --> + <bool name="has_large_photo">false</bool> + <!-- Whether or not the landscape mode layout is currently being used --> <bool name="is_layout_landscape">false</bool> @@ -57,7 +60,7 @@ <!-- Height and width of the in-call buttons. --> <dimen name="in_call_button_dimension">48dp</dimen> - <dimen name="primary_call_elevation">5dp</dimen> + <dimen name="primary_call_elevation">0dp</dimen> <dimen name="dialpad_elevation">2dp</dimen> <!-- The InCallUI dialpad will sometimes want digits sizes that are different from dialer. @@ -114,7 +117,7 @@ width of the preview. When in landscape, this is the height. --> <dimen name="video_preview_small_dimension">90dp</dimen> - <dimen name="video_preview_margin">20dp</dimen> + <dimen name="video_preview_margin">0dp</dimen> <dimen name="end_call_floating_action_button_diameter">72dp</dimen> <dimen name="end_call_floating_action_button_small_diameter">56dp</dimen> diff --git a/InCallUI/src/com/android/incallui/AnswerPresenter.java b/InCallUI/src/com/android/incallui/AnswerPresenter.java index 6e1fb3cfb..2bd3629e7 100644 --- a/InCallUI/src/com/android/incallui/AnswerPresenter.java +++ b/InCallUI/src/com/android/incallui/AnswerPresenter.java @@ -77,7 +77,7 @@ public class AnswerPresenter extends Presenter<AnswerPresenter.AnswerUi> showAnswerUi(false); Log.d(this, "declining upgrade request id: "); CallList.getInstance().removeCallUpdateListener(mCallId, this); - InCallPresenter.getInstance().declineUpgradeRequest(getUi().getContext()); + InCallPresenter.getInstance().declineUpgradeRequest(); } if (!call.getId().equals(mCallId)) { // A new call is coming in. diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index 1a9f283b1..ad7269059 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -115,6 +115,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr private int mFabNormalDiameter; private int mFabSmallDiameter; private boolean mIsLandscape; + private boolean mHasLargePhoto; private boolean mIsDialpadShowing; // Primary caller info @@ -1333,7 +1334,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr int offsetY = 0; if (!mIsDialpadShowing) { offsetY = mFloatingActionButtonVerticalOffset; - if (mSecondaryCallInfo.isShown()) { + if (mSecondaryCallInfo.isShown() && mHasLargePhoto) { offsetY -= mSecondaryCallInfo.getHeight(); } } @@ -1363,6 +1364,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr } mIsLandscape = getResources().getBoolean(R.bool.is_layout_landscape); + mHasLargePhoto = getResources().getBoolean(R.bool.has_large_photo); final ViewGroup parent = ((ViewGroup) mPrimaryCallCardContainer.getParent()); final ViewTreeObserver observer = parent.getViewTreeObserver(); diff --git a/InCallUI/src/com/android/incallui/CallCardPresenter.java b/InCallUI/src/com/android/incallui/CallCardPresenter.java index 7749118de..2acdc470f 100644 --- a/InCallUI/src/com/android/incallui/CallCardPresenter.java +++ b/InCallUI/src/com/android/incallui/CallCardPresenter.java @@ -278,7 +278,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> mPrimary.getState() == Call.State.INCOMING); updatePrimaryDisplayInfo(); maybeStartSearch(mPrimary, true); - mPrimary.setSessionModificationState(Call.SessionModificationState.NO_REQUEST); + maybeClearSessionModificationState(mPrimary); } if (previousPrimary != null && mPrimary == null) { @@ -298,7 +298,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> mSecondary.getState() == Call.State.INCOMING); updateSecondaryDisplayInfo(); maybeStartSearch(mSecondary, false); - mSecondary.setSessionModificationState(Call.SessionModificationState.NO_REQUEST); + maybeClearSessionModificationState(mSecondary); } // Start/stop timers. @@ -563,6 +563,13 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> } } + private void maybeClearSessionModificationState(Call call) { + if (call.getSessionModificationState() != + Call.SessionModificationState.RECEIVED_UPGRADE_TO_VIDEO_REQUEST) { + call.setSessionModificationState(Call.SessionModificationState.NO_REQUEST); + } + } + /** * Starts a query for more contact data for the save primary and secondary calls. */ diff --git a/InCallUI/src/com/android/incallui/InCallPresenter.java b/InCallUI/src/com/android/incallui/InCallPresenter.java index f50da8dbd..c51a561bf 100644 --- a/InCallUI/src/com/android/incallui/InCallPresenter.java +++ b/InCallUI/src/com/android/incallui/InCallPresenter.java @@ -78,7 +78,8 @@ import java.util.concurrent.atomic.AtomicBoolean; * TODO: This class has become more of a state machine at this point. Consider renaming. */ public class InCallPresenter implements CallList.Listener, - CircularRevealFragment.OnCircularRevealCompleteListener { + CircularRevealFragment.OnCircularRevealCompleteListener, + InCallVideoCallCallbackNotifier.SessionModificationListener { private static final String EXTRA_FIRST_TIME_SHOWN = "com.android.incallui.intent.extra.FIRST_TIME_SHOWN"; @@ -387,6 +388,7 @@ public class InCallPresenter implements CallList.Listener, mCallList.addListener(this); VideoPauseController.getInstance().setUp(this); + InCallVideoCallCallbackNotifier.getInstance().addSessionModificationListener(this); mFilteredQueryHandler = new FilteredNumberAsyncQueryHandler(context.getContentResolver()); mTelephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE); @@ -413,6 +415,7 @@ public class InCallPresenter implements CallList.Listener, mTelephonyManager.listen(mPhoneStateListener, PhoneStateListener.LISTEN_NONE); VideoPauseController.getInstance().tearDown(); + InCallVideoCallCallbackNotifier.getInstance().removeSessionModificationListener(this); } private void attemptFinishActivity() { @@ -726,6 +729,17 @@ public class InCallPresenter implements CallList.Listener, } } + @Override + public void onUpgradeToVideoRequest(Call call, int videoState) { + Log.d(this, "onUpgradeToVideoRequest call = " + call + " video state = " + videoState); + + if (call == null) { + return; + } + + call.setRequestedVideoState(videoState); + } + /** * Given the call list, return the state in which the in-call screen should be. */ @@ -980,6 +994,14 @@ public class InCallPresenter implements CallList.Listener, } } + /*package*/ + void declineUpgradeRequest() { + // Pass mContext if InCallActivity is destroyed. + // Ex: When user pressed back key while in active call and + // then modify request is received followed by MT call. + declineUpgradeRequest(mInCallActivity != null ? mInCallActivity : mContext); + } + /** * Returns true if the incall app is the foreground application. */ diff --git a/InCallUI/src/com/android/incallui/InCallVideoCallCallback.java b/InCallUI/src/com/android/incallui/InCallVideoCallCallback.java index 76f8c09fc..99e6d5129 100644 --- a/InCallUI/src/com/android/incallui/InCallVideoCallCallback.java +++ b/InCallUI/src/com/android/incallui/InCallVideoCallCallback.java @@ -55,10 +55,8 @@ public class InCallVideoCallCallback extends VideoCall.Callback { boolean wasVideoCall = VideoUtils.isVideoCall(previousVideoState); boolean isVideoCall = VideoUtils.isVideoCall(newVideoState); - // Check for upgrades to video and downgrades to audio. - if (wasVideoCall && !isVideoCall) { - InCallVideoCallCallbackNotifier.getInstance().downgradeToAudio(mCall); - } else if (previousVideoState != newVideoState) { + // Check for upgrades to video. + if (!wasVideoCall && isVideoCall && previousVideoState != newVideoState) { InCallVideoCallCallbackNotifier.getInstance().upgradeToVideoRequest(mCall, newVideoState); } @@ -93,21 +91,8 @@ public class InCallVideoCallCallback extends VideoCall.Callback { Call.SessionModificationState.REQUEST_FAILED); } } - InCallVideoCallCallbackNotifier.getInstance().upgradeToVideoFail(status, mCall); - } else if (requestedProfile != null && responseProfile != null) { - boolean modifySucceeded = requestedProfile.getVideoState() == - responseProfile.getVideoState(); - boolean isVideoCall = VideoUtils.isVideoCall(responseProfile.getVideoState()); - if (modifySucceeded && isVideoCall) { - InCallVideoCallCallbackNotifier.getInstance().upgradeToVideoSuccess(mCall); - } else if (!modifySucceeded && isVideoCall) { - InCallVideoCallCallbackNotifier.getInstance().upgradeToVideoFail(status, mCall); - } else if (modifySucceeded && !isVideoCall) { - InCallVideoCallCallbackNotifier.getInstance().downgradeToAudio(mCall); - } - } else { - Log.d(this, "onSessionModifyResponseReceived request and response Profiles are null"); } + // Finally clear the outstanding request. mCall.setSessionModificationState(Call.SessionModificationState.NO_REQUEST); } diff --git a/InCallUI/src/com/android/incallui/InCallVideoCallCallbackNotifier.java b/InCallUI/src/com/android/incallui/InCallVideoCallCallbackNotifier.java index dfb645bfc..bb7529205 100644 --- a/InCallUI/src/com/android/incallui/InCallVideoCallCallbackNotifier.java +++ b/InCallUI/src/com/android/incallui/InCallVideoCallCallbackNotifier.java @@ -135,39 +135,6 @@ public class InCallVideoCallCallbackNotifier { } /** - * Inform listeners of a successful response to a video request for a call. - * - * @param call The call. - */ - public void upgradeToVideoSuccess(Call call) { - for (SessionModificationListener listener : mSessionModificationListeners) { - listener.onUpgradeToVideoSuccess(call); - } - } - - /** - * Inform listeners of an unsuccessful response to a video request for a call. - * - * @param call The call. - */ - public void upgradeToVideoFail(int status, Call call) { - for (SessionModificationListener listener : mSessionModificationListeners) { - listener.onUpgradeToVideoFail(status, call); - } - } - - /** - * Inform listeners of a downgrade to audio. - * - * @param call The call. - */ - public void downgradeToAudio(Call call) { - for (SessionModificationListener listener : mSessionModificationListeners) { - listener.onDowngradeToAudio(call); - } - } - - /** * Inform listeners of a call session event. * * @param event The call session event. @@ -240,41 +207,16 @@ public class InCallVideoCallCallbackNotifier { } /** - * Listener interface for any class that wants to be notified of upgrade to video and downgrade - * to audio session modification requests. + * Listener interface for any class that wants to be notified of upgrade to video request. */ public interface SessionModificationListener { /** * Called when a peer request is received to upgrade an audio-only call to a video call. * * @param call The call the request was received for. - * @param videoState The video state that the request wants to upgrade to. + * @param videoState The requested video state. */ public void onUpgradeToVideoRequest(Call call, int videoState); - - /** - * Called when a request to a peer to upgrade an audio-only call to a video call is - * successful. - * - * @param call The call the request was successful for. - */ - public void onUpgradeToVideoSuccess(Call call); - - /** - * Called when a request to a peer to upgrade an audio-only call to a video call is - * NOT successful. This can be if the peer chooses rejects the the video call, or if the - * peer does not support video calling, or if there is some error in sending the request. - * - * @param call The call the request was successful for. - */ - public void onUpgradeToVideoFail(int status, Call call); - - /** - * Called when a call has been downgraded to audio-only. - * - * @param call The call which was downgraded to audio-only. - */ - public void onDowngradeToAudio(Call call); } /** diff --git a/InCallUI/src/com/android/incallui/VideoCallPresenter.java b/InCallUI/src/com/android/incallui/VideoCallPresenter.java index ebdf82048..2b6bc09a2 100644 --- a/InCallUI/src/com/android/incallui/VideoCallPresenter.java +++ b/InCallUI/src/com/android/incallui/VideoCallPresenter.java @@ -68,7 +68,6 @@ import java.util.Objects; public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi> implements IncomingCallListener, InCallOrientationListener, InCallStateListener, InCallDetailsListener, SurfaceChangeListener, VideoEventListener, - InCallVideoCallCallbackNotifier.SessionModificationListener, InCallPresenter.InCallEventListener { public static final String TAG = "VideoCallPresenter"; @@ -241,7 +240,6 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi // Register for surface and video events from {@link InCallVideoCallListener}s. InCallVideoCallCallbackNotifier.getInstance().addSurfaceChangeListener(this); InCallVideoCallCallbackNotifier.getInstance().addVideoEventListener(this); - InCallVideoCallCallbackNotifier.getInstance().addSessionModificationListener(this); mCurrentVideoState = VideoProfile.STATE_AUDIO_ONLY; mCurrentCallState = Call.State.INVALID; } @@ -268,7 +266,6 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi InCallVideoCallCallbackNotifier.getInstance().removeSurfaceChangeListener(this); InCallVideoCallCallbackNotifier.getInstance().removeVideoEventListener(this); - InCallVideoCallCallbackNotifier.getInstance().removeSessionModificationListener(this); } /** @@ -992,57 +989,6 @@ public class VideoCallPresenter extends Presenter<VideoCallPresenter.VideoCallUi } /** - * Handles an incoming upgrade to video request. - * - * @param call The call the request was received for. - * @param videoState The video state that the request wants to upgrade to. - */ - @Override - public void onUpgradeToVideoRequest(Call call, int videoState) { - Log.d(this, "onUpgradeToVideoRequest call = " + call + " new video state = " + videoState); - if (mPrimaryCall == null || !Call.areSame(mPrimaryCall, call)) { - Log.w(this, "UpgradeToVideoRequest received for non-primary call"); - } - - if (call == null) { - return; - } - - call.setRequestedVideoState(videoState); - } - - @Override - public void onUpgradeToVideoSuccess(Call call) { - Log.d(this, "onUpgradeToVideoSuccess call=" + call); - if (mPrimaryCall == null || !Call.areSame(mPrimaryCall, call)) { - Log.w(this, "UpgradeToVideoSuccess received for non-primary call"); - } - - if (call == null) { - return; - } - } - - @Override - public void onUpgradeToVideoFail(int status, Call call) { - Log.d(this, "onUpgradeToVideoFail call=" + call); - if (mPrimaryCall == null || !Call.areSame(mPrimaryCall, call)) { - Log.w(this, "UpgradeToVideoFail received for non-primary call"); - } - - if (call == null) { - return; - } - } - - @Override - public void onDowngradeToAudio(Call call) { - call.setSessionModificationState(Call.SessionModificationState.NO_REQUEST); - // exit video mode - exitVideoMode(); - } - - /** * Sets the preview surface size based on the current device orientation. * See: {@link InCallOrientationEventListener#SCREEN_ORIENTATION_0}, * {@link InCallOrientationEventListener#SCREEN_ORIENTATION_90}, diff --git a/InCallUI/src/com/android/incallui/VideoPauseController.java b/InCallUI/src/com/android/incallui/VideoPauseController.java index 070448ee9..a529d20d3 100644 --- a/InCallUI/src/com/android/incallui/VideoPauseController.java +++ b/InCallUI/src/com/android/incallui/VideoPauseController.java @@ -27,8 +27,7 @@ import com.google.common.base.Preconditions; * This class is responsible for generating video pause/resume requests when the InCall UI is sent * to the background and subsequently brought back to the foreground. */ -class VideoPauseController implements InCallStateListener, IncomingCallListener, - SessionModificationListener { +class VideoPauseController implements InCallStateListener, IncomingCallListener { private static final String TAG = "VideoPauseController"; /** @@ -105,7 +104,6 @@ class VideoPauseController implements InCallStateListener, IncomingCallListener, mInCallPresenter = Preconditions.checkNotNull(inCallPresenter); mInCallPresenter.addListener(this); mInCallPresenter.addIncomingCallListener(this); - InCallVideoCallCallbackNotifier.getInstance().addSessionModificationListener(this); } /** @@ -114,7 +112,6 @@ class VideoPauseController implements InCallStateListener, IncomingCallListener, */ public void tearDown() { log("tearDown..."); - InCallVideoCallCallbackNotifier.getInstance().removeSessionModificationListener(this); mInCallPresenter.removeListener(this); mInCallPresenter.removeIncomingCallListener(this); clear(); @@ -260,46 +257,6 @@ class VideoPauseController implements InCallStateListener, IncomingCallListener, } /** - * Handles requests to upgrade to video. - * - * @param call The call the request was received for. - * @param videoState The video state that the request wants to upgrade to. - */ - @Override - public void onUpgradeToVideoRequest(Call call, int videoState) { - // Not used. - } - - /** - * Handles successful upgrades to video. - * @param call The call the request was successful for. - */ - @Override - public void onUpgradeToVideoSuccess(Call call) { - // Not used. - } - - /** - * Handles a failure to upgrade a call to video. - * - * @param status The failure status. - * @param call The call the request was successful for. - */ - @Override - public void onUpgradeToVideoFail(int status, Call call) { - // TODO (ims-vt) Automatically bring in call ui to foreground. - } - - /** - * Handles a downgrade of a call to audio-only. - * - * @param call The call which was downgraded to audio-only. - */ - @Override - public void onDowngradeToAudio(Call call) { - } - - /** * Called when UI is brought to the foreground. Sends a session modification request to resume * the outgoing video. */ diff --git a/res/drawable/blocked_contact.xml b/res/drawable/blocked_contact.xml index 2e7343710..0957585b4 100644 --- a/res/drawable/blocked_contact.xml +++ b/res/drawable/blocked_contact.xml @@ -25,7 +25,7 @@ </shape> </item> - <item android:drawable="@drawable/ic_block_24dp" + <item android:drawable="@drawable/ic_report_24dp" android:width="18dp" android:height="18dp" android:gravity="center" /> diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 379c574cc..6239ccba7 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Skakel die Kontakte-toestemmings aan om jou kontakte te deursoek."</string> <string name="permission_place_call" msgid="2101287782615887547">"Skakel die foontoestemming aan om \'n oproep te maak."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Foonprogram het nie toestemming om stelselinstellings te stel nie."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 54d6400a1..c670cf87d 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"የእርስዎን እውቂያዎች ለመከታተል የእውቂያዎች ፍቃዶችን ያብሩ።"</string> <string name="permission_place_call" msgid="2101287782615887547">"ስልክ ለመደወል የስልክ ፍቃዱን ያብሩ።"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"የስልክ መተግበሪያ ወደ የስርዓት ቅንብሮች የመጻፍ ፍቃድ የለውም።"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index fe792e075..ea2e3ae6e 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -260,4 +260,6 @@ <string name="permission_no_search" msgid="84152933267902056">"للبحث عن جهات الاتصال، عليك تشغيل أذونات جهات الاتصال."</string> <string name="permission_place_call" msgid="2101287782615887547">"لإجراء مكالمة، شغِّل إذن الهاتف."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"ليس لدى تطبيق الهاتف إذن لتعديل إعدادات النظام."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-az-rAZ/strings.xml b/res/values-az-rAZ/strings.xml index badbe84f7..c8a061446 100644 --- a/res/values-az-rAZ/strings.xml +++ b/res/values-az-rAZ/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Kontaktlarınızı axtarmaq üçün, Kontakt icazələrini aktiv edin."</string> <string name="permission_place_call" msgid="2101287782615887547">"Zəng etmək üçün, Telefon icazəsini aktivləşdirin."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Telefon tətbiqinin sistem ayarlarına yazmaq icazəsi yoxdur."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index 44b6570fa..6ab3d627b 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -254,4 +254,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Da biste pretražili kontakte, uključite dozvole za Kontakte."</string> <string name="permission_place_call" msgid="2101287782615887547">"Da biste uputili poziv, uključite dozvolu za Telefon."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Aplikacija Telefon nema dozvolu za upisivanje u sistemska podešavanja."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index c9f3240c0..f71054cab 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"За да търсите в контактите си, включете разрешенията за тях."</string> <string name="permission_place_call" msgid="2101287782615887547">"За да извършите обаждане, включете разрешението за Телефон."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Приложението Телефон няма разрешение да записва в системните настройки."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn-rBD/strings.xml index b0b915149..2cad4fbd6 100644 --- a/res/values-bn-rBD/strings.xml +++ b/res/values-bn-rBD/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"আপনার পরিচিতিগুলি অনুসন্ধান করতে, পরিচিতির অনুমতিগুলি চালু করুন।"</string> <string name="permission_place_call" msgid="2101287782615887547">"একটি কল করতে, ফোনের অনুমতি চালু করুন।"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"ফোনের অ্যাপ্লিকেশানকে সিস্টেম সেটিংসে লেখার অনুমতি দেওয়া হয়নি।"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-bs-rBA/strings.xml b/res/values-bs-rBA/strings.xml index ebf293b99..4feffa3bf 100644 --- a/res/values-bs-rBA/strings.xml +++ b/res/values-bs-rBA/strings.xml @@ -461,4 +461,6 @@ <skip /> <!-- no translation found for toast_cannot_write_system_settings (5614246168296606709) --> <skip /> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 018dd8d49..8e5172173 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Per cercar els teus contactes, activa els permisos de Contactes."</string> <string name="permission_place_call" msgid="2101287782615887547">"Activa el permís Telèfon per fer una trucada."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"L\'aplicació Telèfon no té permís per escriure a la configuració del sistema."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 8094db482..f50c837c8 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -256,4 +256,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Chcete-li vyhledat kontakty, zapněte oprávnění Kontakty."</string> <string name="permission_place_call" msgid="2101287782615887547">"Chcete-li uskutečnit hovor, aktivujte oprávnění Telefon."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Aplikace Telefon nemá oprávnění provádět zápis do nastavení systému."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index b66235ba2..fecded9de 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Hvis du vil søge i dine kontaktpersoner, skal du slå tilladelserne Kontaktpersoner til."</string> <string name="permission_place_call" msgid="2101287782615887547">"Slå tilladelsen Telefon til for at foretage et opkald."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Opkaldsappen har ikke tilladelse til at ændre systemindstillinger."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 229059e4a..3226babab 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Aktiviere die Berechtigungen \"Kontakte\", um deine Kontakte zu suchen."</string> <string name="permission_place_call" msgid="2101287782615887547">"Aktiviere die Berechtigung \"Telefon\", um einen Anruf zu tätigen."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Die App \"Telefon\" ist nicht berechtigt, die Systemeinstellungen zu überschreiben."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index ee2108aaf..f823f859c 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Για να κάνετε αναζήτηση στις επαφές σας, ενεργοποιήστε τις άδειες \"Επαφές\"."</string> <string name="permission_place_call" msgid="2101287782615887547">"Για να πραγματοποιήσετε μια κλήση, ενεργοποιήστε την άδεια τηλεφώνου."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Η εφαρμογή \"Τηλέφωνο\" δεν έχει άδεια εγγραφής στις ρυθμίσεις συστήματος."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 30d69c26c..4209d8d48 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"To search your contacts, turn on the Contacts permissions."</string> <string name="permission_place_call" msgid="2101287782615887547">"To place a call, turn on the Phone permission."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Phone app does not have permission to write to system settings."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 30d69c26c..4209d8d48 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"To search your contacts, turn on the Contacts permissions."</string> <string name="permission_place_call" msgid="2101287782615887547">"To place a call, turn on the Phone permission."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Phone app does not have permission to write to system settings."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 30d69c26c..4209d8d48 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"To search your contacts, turn on the Contacts permissions."</string> <string name="permission_place_call" msgid="2101287782615887547">"To place a call, turn on the Phone permission."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Phone app does not have permission to write to system settings."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index ca2435e72..7f180baee 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Para buscar contactos, activa el permiso Contactos."</string> <string name="permission_place_call" msgid="2101287782615887547">"Para realizar una llamada, activa el permiso Teléfono."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"La aplicación de teléfono no tiene permiso para modificar la configuración del sistema."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 0f5e16a29..d60634995 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Para poder buscar tus contactos, activa los permisos de contactos."</string> <string name="permission_place_call" msgid="2101287782615887547">"Para hacer una llamada, activa el permiso de la aplicación Teléfono."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"La aplicación Teléfono no tiene permiso para editar los ajustes del sistema."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 1e1f46a84..0222d47cf 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Kontaktide otsimiseks lülitage sisse kontaktiload."</string> <string name="permission_place_call" msgid="2101287782615887547">"Helistamiseks lülitage sisse telefoniluba."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Telefonirakendusel pole luba süsteemiseadetesse kirjutada."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-eu-rES/strings.xml b/res/values-eu-rES/strings.xml index 811813e9e..8164d4449 100644 --- a/res/values-eu-rES/strings.xml +++ b/res/values-eu-rES/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Kontaktuak bilatzeko, aktibatu kontaktuak atzitzeko baimenak."</string> <string name="permission_place_call" msgid="2101287782615887547">"Deiak egiteko, aktibatu Telefonoa erabiltzeko baimena."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Telefonoaren aplikazioak ez du baimenik sistemaren ezarpenetan ezer idazteko."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index dfdedb081..c0522caf9 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -131,7 +131,7 @@ <string name="dialog_phone_call_prohibited_message" msgid="5730565540182492608">"تماس با این شماره ممکن نیست"</string> <string name="dialog_voicemail_not_ready_message" msgid="4384716252789515378">"برای راهاندازی پست صوتی به منو > تنظیمات بروید."</string> <string name="dialog_voicemail_airplane_mode_message" msgid="530922773669546093">"برای تماس با پست صوتی، ابتدا حالت هواپیما را غیرفعال کنید."</string> - <string name="contact_list_loading" msgid="5488620820563977329">"در حال بارگیری..."</string> + <string name="contact_list_loading" msgid="5488620820563977329">"در حال بارکردن…"</string> <string name="imei" msgid="3045126336951684285">"IMEI"</string> <string name="meid" msgid="6210568493746275750">"MEID"</string> <string name="simContacts_emptyLoading" msgid="6700035985448642408">"در حال بارگیری سیم کارت..."</string> @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"برای جستجوی مخاطبینتان، مجوزهای مخاطبین را روشن کنید."</string> <string name="permission_place_call" msgid="2101287782615887547">"برای برقراری تماس، مجوز «تلفن» را روشن کنید."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"برنامه تلفن اجازه نوشتن در تنظیمات سیستم را ندارد."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index bb1dc9769..37e31ac6a 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Jos haluat hakea kontaktejasi, ota käyttöön kontaktien käyttöoikeudet."</string> <string name="permission_place_call" msgid="2101287782615887547">"Jos haluat soittaa puheluja, ota Puhelin-käyttöoikeus käyttöön."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Puhelinsovelluksella ei ole oikeutta muokata järjestelmän asetuksia."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 501fd1b61..b862c25ba 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Pour rechercher vos contacts et les lieux à proximité, activez les autorisations Contacts."</string> <string name="permission_place_call" msgid="2101287782615887547">"Pour faire un appel, activez l\'autorisation Téléphone."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"L\'application Téléphone n\'est pas autorisée à modifier les paramètres du système."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 90beefa71..4b1d2c218 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Pour rechercher vos contacts, activez l\'autorisation Contacts."</string> <string name="permission_place_call" msgid="2101287782615887547">"Pour passer un appel, activez l\'autorisation Téléphone."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"L\'application Téléphone n\'est pas autorisée à modifier les paramètres du système."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml index 09bca9b4b..39bd4f428 100644 --- a/res/values-gl-rES/strings.xml +++ b/res/values-gl-rES/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Para buscar os teus contactos, activa os permisos de Contactos."</string> <string name="permission_place_call" msgid="2101287782615887547">"Para facer unha chamada, activa o permiso de Teléfono."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"A aplicación Teléfono non ten permiso para modificar a configuración do sistema."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu-rIN/strings.xml index 0f8e29407..9fbd58696 100644 --- a/res/values-gu-rIN/strings.xml +++ b/res/values-gu-rIN/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"તમારા સંપર્કો શોધવા માટે, સંપર્કોની પરવાનગીઓ ચાલુ કરો."</string> <string name="permission_place_call" msgid="2101287782615887547">"કૉલ કરવા માટે, ફોન પરવાનગી ચાલુ કરો."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"ફોન એપ્લિકેશનને સિસ્ટમ સેટિંગ્સ પર લખવાની પરવાનગી નથી."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index bf2a9cbe8..cd2331687 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"अपने संपर्कों की खोज करने के लिए, संपर्क अनुमतियों को चालू करें."</string> <string name="permission_place_call" msgid="2101287782615887547">"कॉल करने के लिए, फ़ोन अनुमति चालू करें."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"फ़ोन ऐप को सिस्टम सेटिंग में लिखने की अनुमति नहीं है."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 123d3ce38..ee7cb7b7d 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -254,4 +254,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Da biste pretraživali kontakte, uključite dopuštenja za kontakte."</string> <string name="permission_place_call" msgid="2101287782615887547">"Da biste nazvali nekog, uključite dopuštenje za telefon."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Aplikacija Telefon nema dopuštenje za pisanje u postavke sustava."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index d57425579..9432ddf25 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"A névjegyek kereséséhez adja meg a Névjegyek engedélyeket."</string> <string name="permission_place_call" msgid="2101287782615887547">"Hívásindításhoz kapcsolja be a Telefon engedélyt."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"A Telefon alkalmazásnak nincs engedélye szerkeszteni a rendszerbeállításokat."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 1027c208f..3cfb29ffc 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Կոնտակտները որոնելու համար միացրեք Կոնտակտների թույլտվությունները:"</string> <string name="permission_place_call" msgid="2101287782615887547">"Զանգ կատարելու համար միացրեք Հեռախոսի թույլտվությունը:"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Հեռախոս հավելվածը համակարգի կարգավորումները գրելու թույլտվություն չունի:"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index ad8926ec7..e3f245381 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Untuk menelusuri kontak, aktifkan izin Kontak."</string> <string name="permission_place_call" msgid="2101287782615887547">"Untuk melakukan panggilan, aktifkan izin Telepon."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Aplikasi telepon tidak memiliki izin untuk menulis ke setelan sistem."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-is-rIS/strings.xml b/res/values-is-rIS/strings.xml index dc476e70d..6658b2aca 100644 --- a/res/values-is-rIS/strings.xml +++ b/res/values-is-rIS/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Kveiktu á heimildunum fyrir tengiliði til að leita að tengiliðum."</string> <string name="permission_place_call" msgid="2101287782615887547">"Kveiktu á heimild símaforritsins til að hringja símtal."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Símaforritið hefur ekki heimild til að breyta kerfisstillingum."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index fa281cfc6..7be777144 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Per cercare nei tuoi contatti, attiva le autorizzazioni Contatti."</string> <string name="permission_place_call" msgid="2101287782615887547">"Per fare una chiamata, attiva l\'autorizzazione sul telefono."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"L\'app Telefono non dispone dell\'autorizzazione per modificare le impostazioni di sistema."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index cc7427b79..d6a6d7847 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -256,4 +256,6 @@ <string name="permission_no_search" msgid="84152933267902056">"כדי לחפש באנשי הקשר, הפעל את ההרשאה \'אנשי קשר\'."</string> <string name="permission_place_call" msgid="2101287782615887547">"כדי להתקשר, הפעל את ההרשאה \'טלפון\'."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"לאפליקציית הטלפון אין הרשאה לכתוב בהגדרות המערכת."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 7bd2bad98..bf5245caf 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"連絡先を検索するには、連絡先権限をONにしてください。"</string> <string name="permission_place_call" msgid="2101287782615887547">"電話をかけるには、電話権限をONにしてください。"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"電話アプリにはシステム設定への書き込み権限がありません。"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index d4bc4a230..c655d6955 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"თქვენი კონტაქტების მოსაძებნად ჩართეთ კონტაქტების ნებართვები."</string> <string name="permission_place_call" msgid="2101287782615887547">"ზარის განსახორციელებლად, ჩართეთ ტელეფონის ნებართვა."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"ტელეფონის აპს სისტემის პარამეტრებში ჩაწერის ნებართვა არ აქვს."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk-rKZ/strings.xml index bbc44a4c7..29e63de41 100644 --- a/res/values-kk-rKZ/strings.xml +++ b/res/values-kk-rKZ/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Контактілерді іздеу үшін \"Контактілер\" рұқсаттарын қосыңыз."</string> <string name="permission_place_call" msgid="2101287782615887547">"Қоңырауды шалу үшін \"Телефон\" рұқсатын қосыңыз."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Телефон қолданбасында жүйелік параметрлерге жазуға рұқсат жоқ."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index a74ffc2dc..3ca9aa2ee 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"ដើម្បីស្វែងរកទំនាក់ទំនងរបស់អ្នក សូមបើកសិទ្ធិអនុញ្ញាតទំនាក់ទំនង។"</string> <string name="permission_place_call" msgid="2101287782615887547">"ដើម្បីធ្វើការហៅទូរស័ព្ទ សូមបើកសិទ្ធិអនុញ្ញាតកម្មវិធីហៅទូរស័ព្ទ។"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"កម្មវិធីទូរស័ព្ទមិនមានសិទ្ធិអនុញ្ញាតដើម្បីសរសេរការកំណត់ប្រព័ន្ធទេ។"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn-rIN/strings.xml index bcac9e11a..80275fddf 100644 --- a/res/values-kn-rIN/strings.xml +++ b/res/values-kn-rIN/strings.xml @@ -253,4 +253,6 @@ <string name="permission_no_search" msgid="84152933267902056">"ನಿಮ್ಮ ಸಂಪರ್ಕಗಳನ್ನು ಹುಡುಕಲು, ಸಂಪರ್ಕಗಳ ಅನುಮತಿಗಳನ್ನು ಆನ್ ಮಾಡಿ."</string> <string name="permission_place_call" msgid="2101287782615887547">"ಕರೆ ಮಾಡಲು, ಫೋನ್ ಅನುಮತಿಯನ್ನು ಆನ್ ಮಾಡಿ."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"ಸಿಸ್ಟಂ ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಬರೆಯಲು ಫೋನ್ ಅಪ್ಲಿಕೇಶನ್ ಅನುಮತಿಯನ್ನು ಹೊಂದಿಲ್ಲ."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 51f9099a5..277808048 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"주소록을 검색하려면 주소록 권한을 사용하도록 설정하세요."</string> <string name="permission_place_call" msgid="2101287782615887547">"전화를 걸려면 전화 권한을 사용하도록 설정하세요."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"전화 앱은 시스템 설정에 쓸 수 있는 권한이 없습니다."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky-rKG/strings.xml index aba037e0d..0badcfd30 100644 --- a/res/values-ky-rKG/strings.xml +++ b/res/values-ky-rKG/strings.xml @@ -276,4 +276,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Байланыштарыңызды издөө үчүн, Байланыштарга уруксатты күйгүзүңүз."</string> <string name="permission_place_call" msgid="2101287782615887547">"Чалуу үчүн, \"Телефон\" колдонмосуна уруксат бериңиз."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Телефон колдонмосунун Тутум жөндөөлөрүнө жазууга уруксаты жок."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index e990d15bc..7167e3972 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"ເພື່ອຄົ້ນຫາລາຍາຊື່ຂອງທ່ານ, ໃຫ້ເປີດການອະນຸຍາດລາຍຊື່."</string> <string name="permission_place_call" msgid="2101287782615887547">"ເພື່ອເຮັດການໂທ, ເປີດການອະນຸຍາດໂທລະສັບ."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"ແອັບໂທລະສັບບໍ່ມີການອະນຸຍາດໃຫ້ຂຽນໃສ່ການຕັ້ງຄ່າລະບົບ."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 9571154df..818d50306 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -256,4 +256,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Kad galėtumėte ieškoti kontaktų, įjunkite Kontaktų leidimus."</string> <string name="permission_place_call" msgid="2101287782615887547">"Jei norite paskambinti, įjunkite Telefono programos leidimą."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Telefono programa neturi leidimo keisti sistemos nustatymų."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index ac7592dd8..84164c4e2 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -254,4 +254,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Lai meklētu savas kontaktpersonas, ieslēdziet atļauju Kontaktpersonas."</string> <string name="permission_place_call" msgid="2101287782615887547">"Lai veiktu zvanu, ieslēdziet atļauju Tālrunis."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Tālruņa lietotnei nav atļaujas rakstīt sistēmas iestatījumos."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk-rMK/strings.xml index d50eb6a65..58c753abc 100644 --- a/res/values-mk-rMK/strings.xml +++ b/res/values-mk-rMK/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"За да ги пребарувате контактите, вклучете ги дозволите за контакти."</string> <string name="permission_place_call" msgid="2101287782615887547">"За да воспоставите повик, вклучете ја дозволата за телефон."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Апликацијата на телефонот нема дозвола да пишува во поставките на системот."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml-rIN/strings.xml index 14dca668e..8e3ec3bbd 100644 --- a/res/values-ml-rIN/strings.xml +++ b/res/values-ml-rIN/strings.xml @@ -82,7 +82,7 @@ <string name="description_rate_decrease" msgid="3161652589401708284">"പ്ലേബാക്ക് നിരക്ക് കുറയ്ക്കുക"</string> <string name="description_rate_increase" msgid="6324606574127052385">"പ്ലേബാക്ക് നിരക്ക് വർദ്ധിപ്പിക്കുക"</string> <string name="action_menu_call_history_description" msgid="9018442816219748968">"കോള് ചരിത്രം"</string> - <string name="action_menu_overflow_description" msgid="2303272250613084574">"കൂടുതല് ഓപ്ഷനുകള്"</string> + <string name="action_menu_overflow_description" msgid="2303272250613084574">"കൂടുതൽ ഓപ്ഷനുകള്"</string> <string name="action_menu_dialpad_button" msgid="1425910318049008136">"ഡയൽ പാഡ്"</string> <string name="menu_show_outgoing_only" msgid="1965570298133301970">"ഔട്ട്ഗോയിംഗ് മാത്രം കാണിക്കുക"</string> <string name="menu_show_incoming_only" msgid="7534206815238877417">"ഇൻകമിംഗ് മാത്രം കാണിക്കുക"</string> @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"നിങ്ങളുടെ കോൺടാക്റ്റുകൾ തിരയുന്നതിന് കോൺടാക്റ്റുകൾക്കുള്ള അനുമതികൾ ഓണാക്കുക."</string> <string name="permission_place_call" msgid="2101287782615887547">"കോൾ വിളിക്കുന്നതിന്, \'ഫോൺ\' അനുമതി ഓണാക്കുക."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"സിസ്റ്റം ക്രമീകരണത്തിലേക്ക് എഴുതാൻ ഫോൺ ആപ്പിന് അനുമതിയില്ല."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index 48a55356a..acf0b72ae 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Харилцагчаа хайхын тулд, Харилцагчийн жагсаалтын зөвшөөрлийг идэвхжүүлнэ үү."</string> <string name="permission_place_call" msgid="2101287782615887547">"Залгахын тулд Утасны зөвшөөрлийг идэвхжүүлнэ үү."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Гар утасны апп-д системийн тохиргоо бичих зөвшөөрөл алга."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml index 503bca430..c60c94f70 100644 --- a/res/values-mr-rIN/strings.xml +++ b/res/values-mr-rIN/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"आपले संपर्क शोधण्यासाठी, संपर्क परवानग्या चालू करा."</string> <string name="permission_place_call" msgid="2101287782615887547">"कॉल करण्यासाठी, फोन परवानगी चालू करा."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"फोन अॅपला सिस्टीम सेटिंग्जमध्ये लिहिण्याची परवानगी नाही."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index 30c5a097a..2dd6f05b2 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Untuk mencari kenalan anda, hidupkan kebenaran Kenalan."</string> <string name="permission_place_call" msgid="2101287782615887547">"Untuk membuat panggilan, hidupkan kebenaran Telefon."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Apl telefon tiada kebenaran untuk menulis ke tetapan sistem."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-my-rMM/strings.xml b/res/values-my-rMM/strings.xml index 69f9efe05..eaf1fa972 100644 --- a/res/values-my-rMM/strings.xml +++ b/res/values-my-rMM/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"သင့်အဆက်အသွယ်များကို ရှာဖွေရန်၊ အဆက်အသွယ်ခွင့်ပြုချက်များကို ဖွင့်ပါ။"</string> <string name="permission_place_call" msgid="2101287782615887547">"ဖုန်းခေါ်ဆိုရန်၊ ဖုန်းခွင့်ပြုချက်ကိုဖွင့်ပါ။"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"ဖုန်း အက်ပ်ဆီတွင် စနစ် ဆက်တင်များသို့ ရေးသားခွင့် မရှိပါ။"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 49f5dcd7e..336cc2370 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"For å søke i kontaktene dine, slå på tillatelser for Kontakter."</string> <string name="permission_place_call" msgid="2101287782615887547">"For å ringe, slå på Telefon-tillatelsen."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Telefonappen har ikke tillatelse til å skrive til systeminnstillinger."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne-rNP/strings.xml index 3c6f5c619..6d32dad87 100644 --- a/res/values-ne-rNP/strings.xml +++ b/res/values-ne-rNP/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"तपाईँको सम्पर्कहरू खोज गर्न सम्पर्क अनुमतिहरू सक्रिय गर्नुहोस्।"</string> <string name="permission_place_call" msgid="2101287782615887547">"कल गर्न फोन अनुमति सक्रिय गर्नुहोस्।"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"प्रणाली सेटिङहरूमा लेख्न फोन अनुप्रयोगसँग अनुमति छैन।"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 03741947c..7099b3115 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Als je naar contacten wilt zoeken, schakel je de contacttoestemming in."</string> <string name="permission_place_call" msgid="2101287782615887547">"Als je iemand wilt bellen, schakel je de machtiging voor Telefoon in."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Telefoon-app heeft geen toestemming om systeeminstellingen te schrijven."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa-rIN/strings.xml index 849d95dc3..5f42d3da2 100644 --- a/res/values-pa-rIN/strings.xml +++ b/res/values-pa-rIN/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"ਆਪਣੇ ਸੰਪਰਕਾਂ ਦੀ ਖੋਜ ਕਰਨ ਲਈ,, ਸੰਪਰਕ ਅਨੁਮਤੀਆਂ ਨੂੰ ਚਾਲੂ ਕਰੋ।"</string> <string name="permission_place_call" msgid="2101287782615887547">"ਕਾਲ ਕਰਨ ਲਈ, ਫ਼ੋਨ ਅਨੁਮਤੀ ਚਾਲੂ ਕਰੋ।"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"ਫ਼ੋਨ ਐਪ ਦੇ ਕੋਲ ਸਿਸਟਮ ਸੈਟਿੰਗਜ਼ ਵਿੱਚ ਲਿੱਖਣ ਦੀ ਅਨੁਮਤੀ ਨਹੀਂ ਹੁੰਦੀ ਹੈ।"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index d4209fecc..8e5486bcc 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -256,4 +256,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Aby wyszukać kontakty, włącz uprawnienia Kontakty."</string> <string name="permission_place_call" msgid="2101287782615887547">"Aby nawiązać połączenie, włącz uprawnienie Telefon."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Aplikacja Telefon nie ma uprawnień do zapisu w ustawieniach systemowych."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 1fb46283a..5ba85b099 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Para pesquisar seus contatos, ative as permissões para \"Contatos\"."</string> <string name="permission_place_call" msgid="2101287782615887547">"Para fazer uma chamada, ative a permissão para o app Telefone."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"O app Telefone não tem permissão para gravar nas configurações do sistema."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 29f89ab58..779229f22 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Para pesquisar os seus contactos, ative as autorizações Contactos."</string> <string name="permission_place_call" msgid="2101287782615887547">"Para efetuar uma chamada, ative a autorização Telemóvel."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"A aplicação Telefone não tem autorização para gravar nas definições do sistema."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 1fb46283a..5ba85b099 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Para pesquisar seus contatos, ative as permissões para \"Contatos\"."</string> <string name="permission_place_call" msgid="2101287782615887547">"Para fazer uma chamada, ative a permissão para o app Telefone."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"O app Telefone não tem permissão para gravar nas configurações do sistema."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index ae1b8b0ba..d5c947482 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -88,8 +88,8 @@ <string name="menu_show_outgoing_only" msgid="1965570298133301970">"Numai apelurile efectuate"</string> <string name="menu_show_incoming_only" msgid="7534206815238877417">"Numai apelurile primite"</string> <string name="menu_show_missed_only" msgid="154473166059743996">"Numai apelurile nepreluate"</string> - <string name="menu_show_voicemails_only" msgid="1898421289561435703">"Afişaţi numai mesajele vocale"</string> - <string name="menu_show_all_calls" msgid="7560347482073345885">"Afişaţi toate apelurile"</string> + <string name="menu_show_voicemails_only" msgid="1898421289561435703">"Afișați numai mesajele vocale"</string> + <string name="menu_show_all_calls" msgid="7560347482073345885">"Afișați toate apelurile"</string> <string name="add_2sec_pause" msgid="9214012315201040129">"Adăugați o pauză de 2 secunde"</string> <string name="add_wait" msgid="3360818652790319634">"Adăugați interval de așteptare"</string> <string name="dialer_settings_label" msgid="4305043242594150479">"Setări"</string> @@ -111,7 +111,7 @@ <string name="type_blocked" msgid="3521686227115330015">"Apel blocat"</string> <string name="actionIncomingCall" msgid="6028930669817038600">"Apeluri de intrare"</string> <string name="description_call_log_play_button" msgid="651182125650429846">"Redați mesajul vocal"</string> - <string name="description_view_contact" msgid="5205669345700598415">"Afişaţi persoana din agendă <xliff:g id="NAME">%1$s</xliff:g>"</string> + <string name="description_view_contact" msgid="5205669345700598415">"Afișați persoana din agendă <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_call" msgid="3443678121983852666">"Apelați pe <xliff:g id="NAME">%1$s</xliff:g>"</string> <string name="description_contact_details" msgid="51229793651342809">"Detalii de contact pentru <xliff:g id="NAMEORNUMBER">%1$s</xliff:g>"</string> <string name="description_num_calls" msgid="1601505153694540074">"<xliff:g id="NUMBEROFCALLS">%1$s</xliff:g> (de) apeluri."</string> @@ -254,4 +254,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Pentru a căuta în persoanele de contact, activați permisiunea Agendă."</string> <string name="permission_place_call" msgid="2101287782615887547">"Pentru a apela, activați permisiunea Telefon."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Aplicația Telefon nu are permisiunea să modifice setările de sistem."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 397ca15c3..1b233f767 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -256,4 +256,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Для поиска контактов включите разрешение \"Контакты\"."</string> <string name="permission_place_call" msgid="2101287782615887547">"Чтобы позвонить, предоставьте приложению разрешение \"Телефон\"."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"У приложения \"Телефон\" нет разрешения на изменение системных настроек."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-si-rLK/strings.xml b/res/values-si-rLK/strings.xml index ac0899078..28ab4e459 100644 --- a/res/values-si-rLK/strings.xml +++ b/res/values-si-rLK/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"ඔබේ සම්බන්ධතා සෙවීමට, සම්බන්ධතා අවසර ක්රියාත්මක කරන්න."</string> <string name="permission_place_call" msgid="2101287782615887547">"ඇමතුමක් ලබා ගැනීමට, දුරකථන අවසරය ක්රියාත්මක කරන්න."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"දුරකථන යෙදුමට පද්ධති සැකසීම් වෙත ලිවීමට අවසර නැත."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index ede96f125..d39c047cc 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -256,4 +256,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Ak chcete hľadať kontakty, zapnite povolenie Kontakty."</string> <string name="permission_place_call" msgid="2101287782615887547">"Ak chcete volať, zapnite povolenie Telefón."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Telefónna aplikácia nemá povolenie na zápis do nastavení systému."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index b0d1dae03..a97d07ebd 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -256,4 +256,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Če želite iskati po stikih, vklopite dovoljenje za stike."</string> <string name="permission_place_call" msgid="2101287782615887547">"Če želite klicati, vklopite dovoljenje za telefon."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Aplikacija Telefon nima dovoljenja za pisanje v sistemske nastavitve."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq-rAL/strings.xml index 32e04892f..ba72d622d 100644 --- a/res/values-sq-rAL/strings.xml +++ b/res/values-sq-rAL/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Për të kërkuar kontaktet, aktivizo lejet e Kontakteve"</string> <string name="permission_place_call" msgid="2101287782615887547">"Për të kryer një telefonatë, aktivizo lejen e Telefonit."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Aplikacionet e telefonit nuk kanë leje të shkruajnë në cilësimet e sistemit."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 32bacd81c..76646958d 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -254,4 +254,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Да бисте претражили контакте, укључите дозволе за Контакте."</string> <string name="permission_place_call" msgid="2101287782615887547">"Да бисте упутили позив, укључите дозволу за Телефон."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Апликација Телефон нема дозволу за уписивање у системска подешавања."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 04b855835..bac5f93b6 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Aktivera behörigheter för Kontakter om du vill söka bland kontakterna."</string> <string name="permission_place_call" msgid="2101287782615887547">"Du måste aktivera behörigheten Telefon för att kunna ringa."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Telefonappen har inte skrivbehörighet i systeminställningarna."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 38a1f8869..fae5da0af 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Ili utafute anwani zako, washa ruhusa za Anwani."</string> <string name="permission_place_call" msgid="2101287782615887547">"Ili upige simu, washa ruhusa ya Simu."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Programu ya simu haina ruhusa ya kuandika kwenye mipangilio ya mfumo."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta-rIN/strings.xml index 9d72a27cc..75038c2cf 100644 --- a/res/values-ta-rIN/strings.xml +++ b/res/values-ta-rIN/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"தொடர்புகளைத் தேட, தொடர்புகள் அனுமதிகளை இயக்கவும்."</string> <string name="permission_place_call" msgid="2101287782615887547">"அழைக்க, ஃபோன் அனுமதியை இயக்கவும்."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"முறைமை அமைப்புகளில் எழுதுவதற்கான அனுமதி ஃபோன் பயன்பாட்டுக்கு இல்லை."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-te-rIN/strings.xml b/res/values-te-rIN/strings.xml index 5077e23e6..d5fcd0ee9 100644 --- a/res/values-te-rIN/strings.xml +++ b/res/values-te-rIN/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"మీ పరిచయాలను శోధించడానికి, పరిచయాల అనుమతులను ఆన్ చేయండి."</string> <string name="permission_place_call" msgid="2101287782615887547">"కాల్ చేయడానికి, ఫోన్ అనుమతిని ఆన్ చేయండి."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"సిస్టమ్ సెట్టింగ్లకు వ్రాయడం కోసం ఫోన్ అనువర్తనానికి అనుమతి లేదు."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 2bd3589b6..de3c415de 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"หากต้องการค้นหารายชื่อติดต่อ ให้เปิดสิทธิ์เข้าถึงรายชื่อติดต่อ"</string> <string name="permission_place_call" msgid="2101287782615887547">"หากต้องการโทรออก ให้เปิดสิทธิ์เข้าถึงโทรศัพท์"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"แอปโทรศัพท์ไม่ได้รับอนุญาตให้เขียนไปยังการตั้งค่าระบบ"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index cf3771896..04de7db79 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Upang hanapin ang iyong mga contact, i-on ang mga pahintulot sa Mga Contact."</string> <string name="permission_place_call" msgid="2101287782615887547">"Upang tumawag, i-on ang pahintulot ng Telepono."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Walang pahintulot ang app ng Telepono na mag-write sa mga setting ng system."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index c528f4d51..b2000cc1b 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Kişilerinizde arama yapmak için Kişiler izinlerini açın."</string> <string name="permission_place_call" msgid="2101287782615887547">"Telefon etmek için Telefon iznini açın."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Telefon uygulamasının sistem ayarlarına yazma izni yok."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 001ecc7ad..d52729b12 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -256,4 +256,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Щоб шукати контакти, увімкніть дозвіл \"Контакти\"."</string> <string name="permission_place_call" msgid="2101287782615887547">"Щоб зателефонувати, увімкніть дозвіл \"Телефон\"."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Додаток Телефон не має дозволу змінювати системні налаштування."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur-rPK/strings.xml index bc0d7de6d..6e5f8eb81 100644 --- a/res/values-ur-rPK/strings.xml +++ b/res/values-ur-rPK/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"اپنے رابطوں کو تلاش کرنے کیلئے رابطوں کی اجازتیں آن کریں۔"</string> <string name="permission_place_call" msgid="2101287782615887547">"کال کرنے کیلئے فون کی اجازت آن کریں۔"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"فون ایپ کے پاس سسٹم ترتیبات کو لکھنے کی اجازت نہیں ہے۔"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml index 1ec0c8f84..7f241de3b 100644 --- a/res/values-uz-rUZ/strings.xml +++ b/res/values-uz-rUZ/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Kontaktlarni qidirish uchun “Kontaktlar” ruxsatnomasini yoqing."</string> <string name="permission_place_call" msgid="2101287782615887547">"Qo‘ng‘iroq qilish uchun “Telefon” ruxsatnomasini yoqing."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Telefon ilovasida tizim sozlamalarini o‘zgartirish uchun ruxsat yo‘q."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 26295277a..6c4c7df02 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Để tìm kiếm liên hệ của bạn, hãy bật quyền đối với Danh bạ."</string> <string name="permission_place_call" msgid="2101287782615887547">"Để thực hiện cuộc gọi, bật quyền đối với Điện thoại."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Ứng dụng Điện thoại không có quyền ghi vào cài đặt hệ thống."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index bbc04239c..817bc70f2 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"要搜索您的联系人，请开启“通讯录”权限。"</string> <string name="permission_place_call" msgid="2101287782615887547">"要拨打电话，请开启“电话”权限。"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"电话应用不具备写入系统设置的权限。"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 2223dfc24..79bad780d 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"如要搜尋聯絡人，請開啟「通訊錄」權限。"</string> <string name="permission_place_call" msgid="2101287782615887547">"如要撥打電話，請開放「手機」權限。"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"手機應用程式沒有系統設定的寫入權限。"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 16bb03cf5..d433d000f 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"如要搜尋您的聯絡人，請開啟「聯絡人」存取權限。"</string> <string name="permission_place_call" msgid="2101287782615887547">"如要撥打電話，請開啟「電話」存取權限。"</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"電話應用程式的權限不足，無法寫入系統設定。"</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 0dd3e93a3..9d48bfc62 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -252,4 +252,6 @@ <string name="permission_no_search" msgid="84152933267902056">"Ukuze useshe oxhumana nabo, vula izimvume zoxhumana nabo."</string> <string name="permission_place_call" msgid="2101287782615887547">"Ukuze ubeke ikholi, vula imvume yefoni."</string> <string name="toast_cannot_write_system_settings" msgid="5614246168296606709">"Uhlelo lokusebenza lefoni alinayo imvume yokubhalela kuzilungiselelo zesistimu."</string> + <!-- no translation found for blocked_number_call_log_label (8912042441473014712) --> + <skip /> </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index 75d05ac99..38fd6b39a 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -124,7 +124,7 @@ <color name="divider_line_color">#D8D8D8</color> <!-- Colors for blocked numbers list --> - <color name="blocked_contact_background">#afafaf</color> + <color name="blocked_contact_background">@android:color/holo_red_dark</color> <color name="blocked_number_primary_text_color">@color/dialtacts_primary_text_color</color> <color name="blocked_number_secondary_text_color">@color/dialtacts_secondary_text_color</color> <color name="blocked_number_icon_tint">#616161</color> diff --git a/res/values/strings.xml b/res/values/strings.xml index ed88b960f..6d2bd5ef5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -995,4 +995,7 @@ <!-- Shown as a message that notifies the user that the Phone app cannot write to system settings, which is why the system settings app is being launched directly instead. [CHAR LIMIT=NONE]--> <string name="toast_cannot_write_system_settings">Phone app does not have permission to write to system settings.</string> + + <!-- Label under the name of a blocked number in the call log. [CHAR LIMIT=15] --> + <string name="blocked_number_call_log_label">Blocked</string> </resources> diff --git a/src/com/android/dialer/calllog/CallLogAdapter.java b/src/com/android/dialer/calllog/CallLogAdapter.java index af77d8621..372c7bd9b 100644 --- a/src/com/android/dialer/calllog/CallLogAdapter.java +++ b/src/com/android/dialer/calllog/CallLogAdapter.java @@ -35,6 +35,8 @@ import android.telecom.PhoneAccountHandle; import android.telephony.PhoneNumberUtils; import android.telephony.TelephonyManager; import android.text.TextUtils; +import android.util.ArrayMap; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.View.AccessibilityDelegate; @@ -54,18 +56,20 @@ import com.android.dialer.database.FilteredNumberAsyncQueryHandler; import com.android.dialer.filterednumber.BlockNumberDialogFragment.Callback; import com.android.dialer.logging.InteractionEvent; import com.android.dialer.logging.Logger; +import com.android.dialer.service.ExtendedBlockingButtonRenderer; import com.android.dialer.util.PhoneNumberUtil; import com.android.dialer.voicemail.VoicemailPlaybackPresenter; -import com.android.incallui.CallerInfo; import java.util.HashMap; +import java.util.Map; /** * Adapter class to fill in data for the Call Log. */ public class CallLogAdapter extends GroupingListAdapter implements CallLogGroupBuilder.GroupCreator, - VoicemailPlaybackPresenter.OnVoicemailDeletedListener { + VoicemailPlaybackPresenter.OnVoicemailDeletedListener, + ExtendedBlockingButtonRenderer.Listener { /** Interface used to initiate a refresh of the content. */ public interface CallFetcher { @@ -93,6 +97,7 @@ public class CallLogAdapter extends GroupingListAdapter protected final VoicemailPlaybackPresenter mVoicemailPlaybackPresenter; private final CallFetcher mCallFetcher; private final FilteredNumberAsyncQueryHandler mFilteredNumberAsyncQueryHandler; + private final Map<String, Boolean> mBlockedNumberCache = new ArrayMap<>(); protected ContactInfoCache mContactInfoCache; @@ -293,6 +298,24 @@ public class CallLogAdapter extends GroupingListAdapter } } + @Override + public void onBlockedNumber(String number,String countryIso) { + String cacheKey = PhoneNumberUtils.formatNumberToE164(number, countryIso); + if (!TextUtils.isEmpty(cacheKey)) { + mBlockedNumberCache.put(cacheKey, true); + notifyDataSetChanged(); + } + } + + @Override + public void onUnblockedNumber( String number, String countryIso) { + String cacheKey = PhoneNumberUtils.formatNumberToE164(number, countryIso); + if (!TextUtils.isEmpty(cacheKey)) { + mBlockedNumberCache.put(cacheKey, false); + notifyDataSetChanged(); + } + } + /** * Requery on background thread when {@link Cursor} changes. */ @@ -364,6 +387,7 @@ public class CallLogAdapter extends GroupingListAdapter CallLogListItemViewHolder viewHolder = CallLogListItemViewHolder.create( view, mContext, + this, mExpandCollapseListener, mCallLogCache, mCallLogListItemHelper, diff --git a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java index e60dd2728..cfc937547 100644 --- a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java +++ b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java @@ -27,9 +27,11 @@ import android.provider.ContactsContract.CommonDataKinds.Phone; import android.support.v7.widget.CardView; import android.support.v7.widget.RecyclerView; import android.telecom.PhoneAccountHandle; +import android.telephony.PhoneNumberUtils; import android.text.BidiFormatter; import android.text.TextDirectionHeuristics; import android.text.TextUtils; +import android.util.Log; import android.view.ContextMenu; import android.view.MenuItem; import android.view.View; @@ -63,8 +65,9 @@ import com.android.dialer.voicemail.VoicemailPlaybackPresenter; import com.android.dialerbind.ObjectFactory; import com.google.common.collect.Lists; -import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Set; /** * This is an object containing references to views contained by the call log list item. This @@ -74,7 +77,7 @@ import java.util.List; */ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, MenuItem.OnMenuItemClickListener, - View.OnCreateContextMenuListener { + View.OnCreateContextMenuListener { /** The root view of the call log list item */ public final View rootView; @@ -196,23 +199,29 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder */ public ContactInfo info; + /** + * Whether the current log entry is a blocked number or not. Used in updatePhoto() + */ + public boolean isBlocked; + private final Context mContext; private final CallLogCache mCallLogCache; private final CallLogListItemHelper mCallLogListItemHelper; private final VoicemailPlaybackPresenter mVoicemailPlaybackPresenter; private final FilteredNumberAsyncQueryHandler mFilteredNumberAsyncQueryHandler; + private final BlockNumberDialogFragment.Callback mFilteredNumberDialogCallback; private final int mPhotoSize; - private ViewStub mExtendedBlockingViewStub; - private ExtendedBlockingButtonRenderer mExtendedBlockingButtonRenderer; + private final ExtendedBlockingButtonRenderer mExtendedBlockingButtonRenderer; private View.OnClickListener mExpandCollapseListener; private boolean mVoicemailPrimaryActionButtonClicked; private CallLogListItemViewHolder( Context context, + ExtendedBlockingButtonRenderer.Listener eventListener, View.OnClickListener expandCollapseListener, CallLogCache callLogCache, CallLogListItemHelper callLogListItemHelper, @@ -244,7 +253,6 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder this.dayGroupHeader = dayGroupHeader; this.primaryActionButtonView = primaryActionButtonView; this.workIconView = (ImageView) rootView.findViewById(R.id.work_profile_icon); - Resources resources = mContext.getResources(); mPhotoSize = mContext.getResources().getDimensionPixelSize(R.dimen.contact_photo_size); @@ -259,20 +267,23 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder primaryActionButtonView.setOnClickListener(this); primaryActionView.setOnClickListener(mExpandCollapseListener); primaryActionView.setOnCreateContextMenuListener(this); + mExtendedBlockingButtonRenderer = + ObjectFactory.newExtendedBlockingButtonRenderer(mContext, eventListener); } public static CallLogListItemViewHolder create( View view, Context context, + ExtendedBlockingButtonRenderer.Listener eventListener, View.OnClickListener expandCollapseListener, CallLogCache callLogCache, CallLogListItemHelper callLogListItemHelper, VoicemailPlaybackPresenter voicemailPlaybackPresenter, FilteredNumberAsyncQueryHandler filteredNumberAsyncQueryHandler, BlockNumberDialogFragment.Callback filteredNumberDialogCallback) { - return new CallLogListItemViewHolder( context, + eventListener, expandCollapseListener, callLogCache, callLogListItemHelper, @@ -415,8 +426,6 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder mExtendedBlockingViewStub = (ViewStub) actionsView.findViewById(R.id.extended_blocking_actions_container); - mExtendedBlockingButtonRenderer = ObjectFactory - .newExtendedBlockingButtonRenderer(mContext, mExtendedBlockingViewStub); } bindActionButtons(); @@ -556,13 +565,22 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder callWithNoteButtonView, detailsButtonView, voicemailPlaybackView); - List<View> blockedNumberVisibleViews = new ArrayList<>(); + + List<View> blockedNumberVisibleViews = Lists.newArrayList(detailsButtonView); List<View> extendedBlockingVisibleViews = Lists.newArrayList(detailsButtonView); - mExtendedBlockingButtonRenderer.setCompleteListItemViews(completeLogListItems); - mExtendedBlockingButtonRenderer.setFilteredNumberViews(blockedNumberVisibleViews); - mExtendedBlockingButtonRenderer.setExtendedFilteredViews(extendedBlockingVisibleViews); - mExtendedBlockingButtonRenderer.render(number, countryIso); + ExtendedBlockingButtonRenderer.ViewHolderInfo viewHolderInfo = + new ExtendedBlockingButtonRenderer.ViewHolderInfo( + completeLogListItems, + extendedBlockingVisibleViews, + blockedNumberVisibleViews, + number, + countryIso, + nameOrNumber.toString(), + displayNumber); + mExtendedBlockingButtonRenderer.setViewHolderInfo(viewHolderInfo); + + mExtendedBlockingButtonRenderer.render(mExtendedBlockingViewStub); } } @@ -607,6 +625,13 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder public void updatePhoto() { quickContactView.assignContactUri(info.lookupUri); + if (isBlocked && !TextUtils.isEmpty(number) /* maybe a private number ? */) { + quickContactView.setImageDrawable(mContext.getDrawable(R.drawable.blocked_contact)); + phoneCallDetailsViews.callLocationAndDate.setText( + mContext.getString(R.string.blocked_number_call_log_label)); + return; + } + final boolean isVoicemail = mCallLogCache.isVoicemailNumber(accountHandle, number); int contactType = ContactPhotoManager.TYPE_DEFAULT; if (isVoicemail) { @@ -670,6 +695,7 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder CallLogListItemViewHolder viewHolder = new CallLogListItemViewHolder( context, + null, null /* expandCollapseListener */, callLogCache, new CallLogListItemHelper(phoneCallDetailsHelper, resources, callLogCache), @@ -689,4 +715,4 @@ public final class CallLogListItemViewHolder extends RecyclerView.ViewHolder return viewHolder; } -} +}
\ No newline at end of file diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java index d1a0be0a1..82395b6f8 100644 --- a/src/com/android/dialer/list/SearchFragment.java +++ b/src/com/android/dialer/list/SearchFragment.java @@ -275,7 +275,8 @@ public class SearchFragment extends PhoneNumberPickerFragment { DialerUtils.startActivityWithErrorToast(getActivity(), intent); break; case DialerPhoneNumberListAdapter.SHORTCUT_MAKE_VIDEO_CALL: - number = adapter.getQueryString(); + number = TextUtils.isEmpty(mAddToContactNumber) ? + adapter.getQueryString() : mAddToContactNumber; listener = getOnPhoneNumberPickerListener(); if (listener != null && !checkForProhibitedPhoneNumber(number)) { listener.onPickPhoneNumber(number, true /* isVideoCall */, diff --git a/src/com/android/dialer/service/ExtendedBlockingButtonRenderer.java b/src/com/android/dialer/service/ExtendedBlockingButtonRenderer.java index 9ce844776..5ff373288 100644 --- a/src/com/android/dialer/service/ExtendedBlockingButtonRenderer.java +++ b/src/com/android/dialer/service/ExtendedBlockingButtonRenderer.java @@ -1,6 +1,24 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + package com.android.dialer.service; +import android.support.annotation.Nullable; import android.view.View; +import android.view.ViewStub; import java.util.List; @@ -9,15 +27,47 @@ import java.util.List; */ public interface ExtendedBlockingButtonRenderer { - /** - * Renders buttons for a phone number. - */ - void render(String number, String countryIso); + final class ViewHolderInfo { - void setCompleteListItemViews(List<View> views); + public final List<View> completeListItemViews; + public final List<View> extendedBlockedViews; + public final List<View> blockedNumberViews; + public final String phoneNumber; + public final String countryIso; + public final String nameOrNumber; + public final String displayNumber; - void setExtendedFilteredViews(List<View> views); + public ViewHolderInfo( + /* All existing views amongst the list item actions, even if invisible */ + List<View> completeListItemViews, + /* Views that should be seen if the number is in the blacklist */ + List<View> extendedBlockedViews, + /* Views that should be seen if the number is in the extended blacklist */ + List<View> blockedNumberViews, + String phoneNumber, + String countryIso, + String nameOrNumber, + String displayNumber) { - void setFilteredNumberViews(List<View> views); + this.completeListItemViews = completeListItemViews; + this.extendedBlockedViews = extendedBlockedViews; + this.blockedNumberViews = blockedNumberViews; + this.phoneNumber = phoneNumber; + this.countryIso = countryIso; + this.nameOrNumber = nameOrNumber; + this.displayNumber = displayNumber; + } + } + + interface Listener { + void onBlockedNumber(String number, @Nullable String countryIso); + void onUnblockedNumber(String number, @Nullable String countryIso); + } + + /** + * Renders buttons for a phone number. + */ + void render(ViewStub viewStub); + void setViewHolderInfo(ViewHolderInfo info); } diff --git a/src/com/android/dialer/service/ExtendedBlockingManager.java b/src/com/android/dialer/service/ExtendedBlockingManager.java deleted file mode 100644 index 3257a72c5..000000000 --- a/src/com/android/dialer/service/ExtendedBlockingManager.java +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2016 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License - */ - -package com.android.dialer.service; - -import android.support.annotation.Nullable; - -/** - * Manager of extended blocking events. It notifies all listeners of all blocking-related events. - */ -public interface ExtendedBlockingManager { - - interface ButtonRendererListener { - void onBlockedNumber(String number, @Nullable String countryIso); - void onUnblockedNumber(String number, @Nullable String countryIso); - } - - void addButtonRendererListener(@Nullable ButtonRendererListener listener); - - void removeButtonRendererListener(@Nullable ButtonRendererListener listener); - - void notifyOnBlockedNumber(String number, @Nullable String countryIso); - - void notifyOnUnblockedNumber(String number, @Nullable String countryIso); -} diff --git a/src/com/android/dialerbind/ObjectFactory.java b/src/com/android/dialerbind/ObjectFactory.java index 51b8fbc44..31255a26d 100644 --- a/src/com/android/dialerbind/ObjectFactory.java +++ b/src/com/android/dialerbind/ObjectFactory.java @@ -27,7 +27,6 @@ import com.android.dialer.calllog.ContactInfoHelper; import com.android.dialer.list.RegularSearchFragment; import com.android.dialer.logging.Logger; import com.android.dialer.service.CachedNumberLookupService; -import com.android.dialer.service.ExtendedBlockingManager; import com.android.dialer.service.ExtendedBlockingButtonRenderer; import com.android.dialer.voicemail.VoicemailPlaybackPresenter; @@ -47,13 +46,7 @@ public class ObjectFactory { @Nullable public static ExtendedBlockingButtonRenderer newExtendedBlockingButtonRenderer( - Context context, - ViewStub stub) { - return null; - } - - @Nullable - public static ExtendedBlockingManager getExtendedBlockingManager() { + Context context, ExtendedBlockingButtonRenderer.Listener listener) { return null; } |