From 2ca4318cc1ee57dda907ba2069bd61d162b1baef Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 31 Aug 2017 06:57:16 -0700 Subject: Update Dialer source to latest internal Google revision. Previously, Android's Dialer app was developed in an internal Google source control system and only exported to public during AOSP drops. The Dialer team is now switching to a public development model similar to the telephony team. This CL represents all internal Google changes that were committed to Dialer between the public O release and today's tip of tree on internal master. This CL squashes those changes into a single commit. In subsequent changes, changes will be exported on a per-commit basis. Test: make, flash install, run Merged-In: I45270eaa8ce732d71a1bd84b08c7fa0e99af3160 Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8 PiperOrigin-RevId: 167068436 --- .../dialer/callcomposer/AndroidManifest.xml | 2 +- .../dialer/callcomposer/CallComposerActivity.java | 295 ++++++++++++++------- .../callcomposer/CameraComposerFragment.java | 44 +-- .../callcomposer/CopyAndResizeImageWorker.java | 29 +- .../dialer/callcomposer/GalleryCursorLoader.java | 12 +- .../callcomposer/MessageComposerFragment.java | 36 +-- .../dialer/callcomposer/camera/CameraManager.java | 146 ++++++---- .../callcomposer/camera/ImagePersistTask.java | 145 ---------- .../callcomposer/camera/ImagePersistWorker.java | 153 +++++++++++ .../camera/camerafocus/FocusOverlayManager.java | 2 +- .../callcomposer/camera/exif/ExifInterface.java | 2 +- .../callcomposer/camera/exif/ExifParser.java | 2 +- .../dialer/callcomposer/camera/exif/ExifTag.java | 2 +- .../cameraui/res/layout/camera_view.xml | 19 +- .../cameraui/res/values-af/strings.xml | 29 +- .../cameraui/res/values-am/strings.xml | 29 +- .../cameraui/res/values-ar/strings.xml | 29 +- .../cameraui/res/values-az/strings.xml | 29 +- .../cameraui/res/values-b+sr+Latn/strings.xml | 29 +- .../cameraui/res/values-be/strings.xml | 29 +- .../cameraui/res/values-bg/strings.xml | 29 +- .../cameraui/res/values-bn/strings.xml | 29 +- .../cameraui/res/values-bs/strings.xml | 29 +- .../cameraui/res/values-ca/strings.xml | 29 +- .../cameraui/res/values-cs/strings.xml | 29 +- .../cameraui/res/values-da/strings.xml | 29 +- .../cameraui/res/values-de/strings.xml | 29 +- .../cameraui/res/values-el/strings.xml | 29 +- .../cameraui/res/values-en-rAU/strings.xml | 29 +- .../cameraui/res/values-en-rGB/strings.xml | 29 +- .../cameraui/res/values-en-rIN/strings.xml | 29 +- .../cameraui/res/values-es-rUS/strings.xml | 29 +- .../cameraui/res/values-es/strings.xml | 29 +- .../cameraui/res/values-et/strings.xml | 29 +- .../cameraui/res/values-eu/strings.xml | 29 +- .../cameraui/res/values-fa/strings.xml | 29 +- .../cameraui/res/values-fi/strings.xml | 29 +- .../cameraui/res/values-fr-rCA/strings.xml | 29 +- .../cameraui/res/values-fr/strings.xml | 29 +- .../cameraui/res/values-gl/strings.xml | 29 +- .../cameraui/res/values-gu/strings.xml | 29 +- .../cameraui/res/values-hi/strings.xml | 29 +- .../cameraui/res/values-hr/strings.xml | 29 +- .../cameraui/res/values-hu/strings.xml | 29 +- .../cameraui/res/values-hy/strings.xml | 29 +- .../cameraui/res/values-in/strings.xml | 29 +- .../cameraui/res/values-is/strings.xml | 29 +- .../cameraui/res/values-it/strings.xml | 29 +- .../cameraui/res/values-iw/strings.xml | 29 +- .../cameraui/res/values-ja/strings.xml | 29 +- .../cameraui/res/values-ka/strings.xml | 29 +- .../cameraui/res/values-kk/strings.xml | 29 +- .../cameraui/res/values-km/strings.xml | 29 +- .../cameraui/res/values-kn/strings.xml | 29 +- .../cameraui/res/values-ko/strings.xml | 29 +- .../cameraui/res/values-ky/strings.xml | 29 +- .../cameraui/res/values-lo/strings.xml | 29 +- .../cameraui/res/values-lt/strings.xml | 29 +- .../cameraui/res/values-lv/strings.xml | 29 +- .../cameraui/res/values-mk/strings.xml | 29 +- .../cameraui/res/values-ml/strings.xml | 29 +- .../cameraui/res/values-mn/strings.xml | 29 +- .../cameraui/res/values-mr/strings.xml | 29 +- .../cameraui/res/values-ms/strings.xml | 29 +- .../cameraui/res/values-my/strings.xml | 29 +- .../cameraui/res/values-nb/strings.xml | 29 +- .../cameraui/res/values-ne/strings.xml | 29 +- .../cameraui/res/values-nl/strings.xml | 29 +- .../cameraui/res/values-no/strings.xml | 29 +- .../cameraui/res/values-pa/strings.xml | 29 +- .../cameraui/res/values-pl/strings.xml | 29 +- .../cameraui/res/values-pt-rBR/strings.xml | 29 +- .../cameraui/res/values-pt-rPT/strings.xml | 29 +- .../cameraui/res/values-pt/strings.xml | 29 +- .../cameraui/res/values-ro/strings.xml | 29 +- .../cameraui/res/values-ru/strings.xml | 29 +- .../cameraui/res/values-si/strings.xml | 29 +- .../cameraui/res/values-sk/strings.xml | 29 +- .../cameraui/res/values-sl/strings.xml | 29 +- .../cameraui/res/values-sq/strings.xml | 29 +- .../cameraui/res/values-sr/strings.xml | 29 +- .../cameraui/res/values-sv/strings.xml | 29 +- .../cameraui/res/values-sw/strings.xml | 29 +- .../cameraui/res/values-ta/strings.xml | 29 +- .../cameraui/res/values-te/strings.xml | 29 +- .../cameraui/res/values-th/strings.xml | 29 +- .../cameraui/res/values-tl/strings.xml | 29 +- .../cameraui/res/values-tr/strings.xml | 29 +- .../cameraui/res/values-uk/strings.xml | 29 +- .../cameraui/res/values-ur/strings.xml | 29 +- .../cameraui/res/values-uz/strings.xml | 29 +- .../cameraui/res/values-vi/strings.xml | 29 +- .../cameraui/res/values-zh-rCN/strings.xml | 29 +- .../cameraui/res/values-zh-rHK/strings.xml | 29 +- .../cameraui/res/values-zh-rTW/strings.xml | 29 +- .../cameraui/res/values-zu/strings.xml | 29 +- .../callcomposer/cameraui/res/values/dimens.xml | 2 +- .../callcomposer/cameraui/res/values/strings.xml | 33 ++- .../callcomposer/proto/call_composer_contact.proto | 18 -- .../res/layout/call_composer_activity.xml | 47 +++- .../res/layout/fragment_message_composer.xml | 3 +- .../dialer/callcomposer/res/values-af/strings.xml | 7 +- .../dialer/callcomposer/res/values-am/strings.xml | 7 +- .../dialer/callcomposer/res/values-ar/strings.xml | 7 +- .../dialer/callcomposer/res/values-az/strings.xml | 7 +- .../callcomposer/res/values-b+sr+Latn/strings.xml | 7 +- .../dialer/callcomposer/res/values-be/strings.xml | 7 +- .../dialer/callcomposer/res/values-bg/strings.xml | 7 +- .../dialer/callcomposer/res/values-bn/strings.xml | 7 +- .../dialer/callcomposer/res/values-bs/strings.xml | 7 +- .../dialer/callcomposer/res/values-ca/strings.xml | 11 +- .../dialer/callcomposer/res/values-cs/strings.xml | 7 +- .../dialer/callcomposer/res/values-da/strings.xml | 7 +- .../dialer/callcomposer/res/values-de/strings.xml | 7 +- .../dialer/callcomposer/res/values-el/strings.xml | 7 +- .../callcomposer/res/values-en-rAU/strings.xml | 7 +- .../callcomposer/res/values-en-rGB/strings.xml | 7 +- .../callcomposer/res/values-en-rIN/strings.xml | 7 +- .../callcomposer/res/values-es-rUS/strings.xml | 7 +- .../dialer/callcomposer/res/values-es/strings.xml | 7 +- .../dialer/callcomposer/res/values-et/strings.xml | 7 +- .../dialer/callcomposer/res/values-eu/strings.xml | 7 +- .../dialer/callcomposer/res/values-fa/strings.xml | 7 +- .../dialer/callcomposer/res/values-fi/strings.xml | 7 +- .../callcomposer/res/values-fr-rCA/strings.xml | 7 +- .../dialer/callcomposer/res/values-fr/strings.xml | 7 +- .../dialer/callcomposer/res/values-gl/strings.xml | 7 +- .../dialer/callcomposer/res/values-gu/strings.xml | 7 +- .../dialer/callcomposer/res/values-hi/strings.xml | 7 +- .../dialer/callcomposer/res/values-hr/strings.xml | 7 +- .../dialer/callcomposer/res/values-hu/strings.xml | 7 +- .../dialer/callcomposer/res/values-hy/strings.xml | 7 +- .../dialer/callcomposer/res/values-in/strings.xml | 7 +- .../dialer/callcomposer/res/values-is/strings.xml | 7 +- .../dialer/callcomposer/res/values-it/strings.xml | 7 +- .../dialer/callcomposer/res/values-iw/strings.xml | 7 +- .../dialer/callcomposer/res/values-ja/strings.xml | 7 +- .../dialer/callcomposer/res/values-ka/strings.xml | 7 +- .../dialer/callcomposer/res/values-kk/strings.xml | 7 +- .../dialer/callcomposer/res/values-km/strings.xml | 7 +- .../dialer/callcomposer/res/values-kn/strings.xml | 7 +- .../dialer/callcomposer/res/values-ko/strings.xml | 7 +- .../dialer/callcomposer/res/values-ky/strings.xml | 7 +- .../dialer/callcomposer/res/values-lo/strings.xml | 7 +- .../dialer/callcomposer/res/values-lt/strings.xml | 7 +- .../dialer/callcomposer/res/values-lv/strings.xml | 7 +- .../dialer/callcomposer/res/values-mk/strings.xml | 7 +- .../dialer/callcomposer/res/values-ml/strings.xml | 7 +- .../dialer/callcomposer/res/values-mn/strings.xml | 7 +- .../dialer/callcomposer/res/values-mr/strings.xml | 7 +- .../dialer/callcomposer/res/values-ms/strings.xml | 7 +- .../dialer/callcomposer/res/values-my/strings.xml | 7 +- .../dialer/callcomposer/res/values-nb/strings.xml | 7 +- .../dialer/callcomposer/res/values-ne/strings.xml | 7 +- .../dialer/callcomposer/res/values-nl/strings.xml | 7 +- .../dialer/callcomposer/res/values-no/strings.xml | 7 +- .../dialer/callcomposer/res/values-pa/strings.xml | 7 +- .../dialer/callcomposer/res/values-pl/strings.xml | 7 +- .../callcomposer/res/values-pt-rBR/strings.xml | 7 +- .../callcomposer/res/values-pt-rPT/strings.xml | 7 +- .../dialer/callcomposer/res/values-pt/strings.xml | 7 +- .../dialer/callcomposer/res/values-ro/strings.xml | 7 +- .../dialer/callcomposer/res/values-ru/strings.xml | 7 +- .../dialer/callcomposer/res/values-si/strings.xml | 7 +- .../dialer/callcomposer/res/values-sk/strings.xml | 7 +- .../dialer/callcomposer/res/values-sl/strings.xml | 7 +- .../dialer/callcomposer/res/values-sq/strings.xml | 7 +- .../dialer/callcomposer/res/values-sr/strings.xml | 7 +- .../dialer/callcomposer/res/values-sv/strings.xml | 7 +- .../dialer/callcomposer/res/values-sw/strings.xml | 9 +- .../dialer/callcomposer/res/values-ta/strings.xml | 7 +- .../dialer/callcomposer/res/values-te/strings.xml | 7 +- .../dialer/callcomposer/res/values-th/strings.xml | 7 +- .../dialer/callcomposer/res/values-tl/strings.xml | 7 +- .../dialer/callcomposer/res/values-tr/strings.xml | 7 +- .../dialer/callcomposer/res/values-uk/strings.xml | 7 +- .../dialer/callcomposer/res/values-ur/strings.xml | 7 +- .../dialer/callcomposer/res/values-uz/strings.xml | 7 +- .../dialer/callcomposer/res/values-vi/strings.xml | 7 +- .../callcomposer/res/values-zh-rCN/strings.xml | 7 +- .../callcomposer/res/values-zh-rHK/strings.xml | 7 +- .../callcomposer/res/values-zh-rTW/strings.xml | 7 +- .../dialer/callcomposer/res/values-zu/strings.xml | 7 +- .../dialer/callcomposer/res/values/colors.xml | 1 - .../dialer/callcomposer/res/values/dimens.xml | 16 +- .../dialer/callcomposer/res/values/strings.xml | 17 +- .../dialer/callcomposer/res/values/styles.xml | 5 +- .../dialer/callcomposer/util/BitmapResizer.java | 35 +-- 188 files changed, 2924 insertions(+), 1100 deletions(-) delete mode 100644 java/com/android/dialer/callcomposer/camera/ImagePersistTask.java create mode 100644 java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java delete mode 100644 java/com/android/dialer/callcomposer/proto/call_composer_contact.proto (limited to 'java/com/android/dialer/callcomposer') diff --git a/java/com/android/dialer/callcomposer/AndroidManifest.xml b/java/com/android/dialer/callcomposer/AndroidManifest.xml index 369db6f4a..cce71105f 100644 --- a/java/com/android/dialer/callcomposer/AndroidManifest.xml +++ b/java/com/android/dialer/callcomposer/AndroidManifest.xml @@ -17,7 +17,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" package="com.android.dialer.callcomposer"> - + { + LogUtil.i("CallComposerActivity.sessionStartedTimedOutRunnable", "session never started"); + setFailedResultAndFinish(); + }; + private final Runnable placeTelecomCallRunnable = + () -> { + LogUtil.i("CallComposerActivity.placeTelecomCallRunnable", "upload timed out."); + placeTelecomCall(); + }; + // Counter for the number of message sent updates received from EnrichedCallManager + private int messageSentCounter; + private boolean pendingCallStarted; + + private DialerContact contact; private Long sessionId = Session.NO_SESSION_ID; private TextView nameView; @@ -113,23 +141,25 @@ public class CallComposerActivity extends AppCompatActivity private View sendAndCall; private TextView sendAndCallText; + private ProgressBar loading; private ImageView cameraIcon; private ImageView galleryIcon; private ImageView messageIcon; - private ViewPager pager; + private LockableViewPager pager; private CallComposerPagerAdapter adapter; private FrameLayout background; private LinearLayout windowContainer; + private DialerExecutor copyAndResizeExecutor; private FastOutSlowInInterpolator interpolator; private boolean shouldAnimateEntrance = true; private boolean inFullscreenMode; private boolean isSendAndCallHidingOrHidden = true; - private boolean layoutChanged; + private boolean sendAndCallReady; private int currentIndex; - public static Intent newIntent(Context context, CallComposerContact contact) { + public static Intent newIntent(Context context, DialerContact contact) { Intent intent = new Intent(context, CallComposerActivity.class); ProtoParsers.put(intent, ARG_CALL_COMPOSER_CONTACT, contact); return intent; @@ -140,19 +170,20 @@ public class CallComposerActivity extends AppCompatActivity super.onCreate(savedInstanceState); setContentView(R.layout.call_composer_activity); - nameView = (TextView) findViewById(R.id.contact_name); - numberView = (TextView) findViewById(R.id.phone_number); - contactPhoto = (QuickContactBadge) findViewById(R.id.contact_photo); - cameraIcon = (ImageView) findViewById(R.id.call_composer_camera); - galleryIcon = (ImageView) findViewById(R.id.call_composer_photo); - messageIcon = (ImageView) findViewById(R.id.call_composer_message); - contactContainer = (RelativeLayout) findViewById(R.id.contact_bar); - pager = (ViewPager) findViewById(R.id.call_composer_view_pager); - background = (FrameLayout) findViewById(R.id.background); - windowContainer = (LinearLayout) findViewById(R.id.call_composer_container); - toolbar = (DialerToolbar) findViewById(R.id.toolbar); + nameView = findViewById(R.id.contact_name); + numberView = findViewById(R.id.phone_number); + contactPhoto = findViewById(R.id.contact_photo); + cameraIcon = findViewById(R.id.call_composer_camera); + galleryIcon = findViewById(R.id.call_composer_photo); + messageIcon = findViewById(R.id.call_composer_message); + contactContainer = findViewById(R.id.contact_bar); + pager = findViewById(R.id.call_composer_view_pager); + background = findViewById(R.id.background); + windowContainer = findViewById(R.id.call_composer_container); + toolbar = findViewById(R.id.toolbar); sendAndCall = findViewById(R.id.send_and_call_button); - sendAndCallText = (TextView) findViewById(R.id.send_and_call_text); + sendAndCallText = findViewById(R.id.send_and_call_text); + loading = findViewById(R.id.call_composer_loading); interpolator = new FastOutSlowInInterpolator(); adapter = @@ -162,7 +193,6 @@ public class CallComposerActivity extends AppCompatActivity pager.setAdapter(adapter); pager.addOnPageChangeListener(this); - background.addOnLayoutChangeListener(this); cameraIcon.setOnClickListener(this); galleryIcon.setOnClickListener(this); messageIcon.setOnClickListener(this); @@ -172,17 +202,13 @@ public class CallComposerActivity extends AppCompatActivity if (savedInstanceState != null) { shouldAnimateEntrance = savedInstanceState.getBoolean(ENTRANCE_ANIMATION_KEY); + sendAndCallReady = savedInstanceState.getBoolean(SEND_AND_CALL_READY_KEY); pager.onRestoreInstanceState(savedInstanceState.getParcelable(VIEW_PAGER_STATE_KEY)); currentIndex = savedInstanceState.getInt(CURRENT_INDEX_KEY); sessionId = savedInstanceState.getLong(SESSION_ID_KEY, Session.NO_SESSION_ID); onPageSelected(currentIndex); } - int adjustMode = - isLandscapeLayout() - ? LayoutParams.SOFT_INPUT_ADJUST_PAN - : LayoutParams.SOFT_INPUT_ADJUST_RESIZE; - getWindow().setSoftInputMode(adjustMode); // Since we can't animate the views until they are ready to be drawn, we use this listener to // track that and animate the call compose UI as soon as it's ready. ViewUtil.doOnPreDraw( @@ -194,13 +220,42 @@ public class CallComposerActivity extends AppCompatActivity }); setMediaIconSelected(currentIndex); + + copyAndResizeExecutor = + DialerExecutors.createUiTaskBuilder( + getFragmentManager(), + "copyAndResizeImageToSend", + new CopyAndResizeImageWorker(this.getApplicationContext())) + .onSuccess(this::onCopyAndResizeImageSuccess) + .onFailure(this::onCopyAndResizeImageFailure) + .build(); + } + + private void onCopyAndResizeImageSuccess(Pair output) { + Uri shareableUri = + FileProvider.getUriForFile( + CallComposerActivity.this, Constants.get().getFileProviderAuthority(), output.first); + + placeRCSCall( + MultimediaData.builder().setImage(grantUriPermission(shareableUri), output.second)); + } + + private void onCopyAndResizeImageFailure(Throwable throwable) { + // TODO(b/34279096) - gracefully handle message failure + LogUtil.e("CallComposerActivity.onCopyAndResizeImageFailure", "copy Failed", throwable); } @Override protected void onResume() { super.onResume(); getEnrichedCallManager().registerStateChangedListener(this); - if (sessionId == Session.NO_SESSION_ID) { + if (pendingCallStarted) { + // User went into incall ui and pressed disconnect before the image was done uploading. + // Kill the activity and cancel the telecom call. + timeoutHandler.removeCallbacks(placeTelecomCallRunnable); + setResult(RESULT_OK); + finish(); + } else if (sessionId == Session.NO_SESSION_ID) { LogUtil.i("CallComposerActivity.onResume", "creating new session"); sessionId = getEnrichedCallManager().startCallComposerSession(contact.getNumber()); } else if (getEnrichedCallManager().getSession(sessionId) == null) { @@ -218,11 +273,16 @@ public class CallComposerActivity extends AppCompatActivity } @Override - protected void onPause() { - super.onPause(); + protected void onDestroy() { + super.onDestroy(); getEnrichedCallManager().unregisterStateChangedListener(this); + timeoutHandler.removeCallbacksAndMessages(null); } + /** + * This listener is registered in onResume and removed in onDestroy, meaning that calls to this + * method can come after onStop and updates to UI could cause crashes. + */ @Override public void onEnrichedCallStateChanged() { refreshUiForCallComposerState(); @@ -240,12 +300,50 @@ public class CallComposerActivity extends AppCompatActivity "state: %s", StateExtension.toString(state)); - if (state == EnrichedCallManager.STATE_START_FAILED - || state == EnrichedCallManager.STATE_CLOSED) { - setFailedResultAndFinish(); + switch (state) { + case Session.STATE_STARTING: + timeoutHandler.postDelayed(sessionStartedTimedOut, getSessionStartedTimeoutMillis()); + if (sendAndCallReady) { + showLoadingUi(); + } + break; + case Session.STATE_STARTED: + timeoutHandler.removeCallbacks(sessionStartedTimedOut); + if (sendAndCallReady) { + sendAndCall(); + } + break; + case Session.STATE_START_FAILED: + case Session.STATE_CLOSED: + if (pendingCallStarted) { + placeTelecomCall(); + } else { + setFailedResultAndFinish(); + } + break; + case Session.STATE_MESSAGE_SENT: + if (++messageSentCounter == 3) { + // When we compose EC with images, there are 3 steps: + // 1. Message sent with no data + // 2. Image uploaded + // 3. url sent + // Once we receive 3 message sent updates, we know that we can proceed with the call. + timeoutHandler.removeCallbacks(placeTelecomCallRunnable); + placeTelecomCall(); + } + break; + case Session.STATE_MESSAGE_FAILED: + case Session.STATE_NONE: + default: + break; } } + @VisibleForTesting + public long getSessionStartedTimeoutMillis() { + return ConfigProviderBindings.get(this).getLong("ec_session_started_timeout", 10_000); + } + @Override protected void onNewIntent(Intent intent) { super.onNewIntent(intent); @@ -264,13 +362,15 @@ public class CallComposerActivity extends AppCompatActivity } else if (view == sendAndCall) { sendAndCall(); } else { - Assert.fail(); + throw Assert.createIllegalStateFailException("View on click not implemented: " + view); } } @Override public void sendAndCall() { if (!sessionReady()) { + sendAndCallReady = true; + showLoadingUi(); LogUtil.i("CallComposerActivity.onClick", "sendAndCall pressed, but the session isn't ready"); Logger.get(this) .logImpression( @@ -292,28 +392,8 @@ public class CallComposerActivity extends AppCompatActivity GalleryComposerFragment galleryComposerFragment = (GalleryComposerFragment) fragment; // If the current data is not a copy, make one. if (!galleryComposerFragment.selectedDataIsCopy()) { - DialerExecutors.createUiTaskBuilder( - getFragmentManager(), - "copyAndResizeImageToSend", - new CopyAndResizeImageWorker(this.getApplicationContext())) - .onSuccess( - output -> { - Uri shareableUri = - FileProvider.getUriForFile( - CallComposerActivity.this, - Constants.get().getFileProviderAuthority(), - output.first); - - builder.setImage(grantUriPermission(shareableUri), output.second); - placeRCSCall(builder); - }) - .onFailure( - throwable -> { - // TODO(b/34279096) - gracefully handle message failure - LogUtil.e("CallComposerActivity.onCopyFailed", "copy Failed", throwable); - }) - .build() - .executeParallel(galleryComposerFragment.getGalleryData().getFileUri()); + copyAndResizeExecutor.executeParallel( + galleryComposerFragment.getGalleryData().getFileUri()); } else { Uri shareableUri = FileProvider.getUriForFile( @@ -338,19 +418,65 @@ public class CallComposerActivity extends AppCompatActivity } } + private void showLoadingUi() { + loading.setVisibility(View.VISIBLE); + pager.setSwipingLocked(true); + } + private boolean sessionReady() { Session session = getEnrichedCallManager().getSession(sessionId); - if (session == null) { - return false; + return session != null && session.getState() == Session.STATE_STARTED; + } + + @VisibleForTesting + public void placeRCSCall(MultimediaData.Builder builder) { + MultimediaData data = builder.build(); + LogUtil.i("CallComposerActivity.placeRCSCall", "placing enriched call, data: " + data); + Logger.get(this).logImpression(DialerImpression.Type.CALL_COMPOSER_ACTIVITY_PLACE_RCS_CALL); + + getEnrichedCallManager().sendCallComposerData(sessionId, data); + maybeShowPrivacyToast(data); + if (data.hasImageData() + && ConfigProviderBindings.get(this).getBoolean("enable_delayed_ec_images", true) + && !TelecomUtil.isInCall(this)) { + timeoutHandler.postDelayed(placeTelecomCallRunnable, getRCSTimeoutMillis()); + startActivity( + CallPendingActivity.getIntent( + this, + contact.getNameOrNumber(), + contact.getDisplayNumber(), + contact.getNumberLabel(), + UriUtils.getLookupKeyFromUri(Uri.parse(contact.getContactUri())), + getString(R.string.call_composer_image_uploading), + Uri.parse(contact.getPhotoUri()), + sessionId)); + pendingCallStarted = true; + } else { + placeTelecomCall(); } + } - return session.getState() == EnrichedCallManager.STATE_STARTED; + private void maybeShowPrivacyToast(MultimediaData data) { + SharedPreferences preferences = + DialerUtils.getDefaultSharedPreferenceForDeviceProtectedStorageContext(this); + // Show a toast for privacy purposes if this is the first time a user uses call composer. + if (preferences.getBoolean(KEY_IS_FIRST_CALL_COMPOSE, true)) { + int privacyMessage = + data.hasImageData() ? R.string.image_sent_messages : R.string.message_sent_messages; + Toast toast = Toast.makeText(this, privacyMessage, Toast.LENGTH_LONG); + int yOffset = getResources().getDimensionPixelOffset(R.dimen.privacy_toast_y_offset); + toast.setGravity(Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM, 0, yOffset); + toast.show(); + preferences.edit().putBoolean(KEY_IS_FIRST_CALL_COMPOSE, false).apply(); + } } - private void placeRCSCall(MultimediaData.Builder builder) { - LogUtil.i("CallComposerActivity.placeRCSCall", "placing enriched call"); - Logger.get(this).logImpression(DialerImpression.Type.CALL_COMPOSER_ACTIVITY_PLACE_RCS_CALL); - getEnrichedCallManager().sendCallComposerData(sessionId, builder.build()); + @VisibleForTesting + public long getRCSTimeoutMillis() { + return ConfigProviderBindings.get(this).getLong("ec_image_upload_timeout", 15_000); + } + + private void placeTelecomCall() { TelecomUtil.placeCall( this, new CallIntentBuilder(contact.getNumber(), CallInitiationType.Type.CALL_COMPOSER).build()); @@ -360,7 +486,7 @@ public class CallComposerActivity extends AppCompatActivity /** Give permission to Messenger to view our image for RCS purposes. */ private Uri grantUriPermission(Uri uri) { - // TODO: Move this to the enriched call manager. + // TODO(sail): Move this to the enriched call manager. grantUriPermission( "com.google.android.apps.messaging", uri, Intent.FLAG_GRANT_READ_URI_PERMISSION); return uri; @@ -376,10 +502,6 @@ public class CallComposerActivity extends AppCompatActivity } if (currentIndex == CallComposerPagerAdapter.INDEX_MESSAGE) { UiUtil.hideKeyboardFrom(this, windowContainer); - } else if (position == CallComposerPagerAdapter.INDEX_MESSAGE - && inFullscreenMode - && !isLandscapeLayout()) { - UiUtil.openKeyboardFrom(this, windowContainer); } currentIndex = position; CallComposerFragment fragment = (CallComposerFragment) adapter.instantiateItem(pager, position); @@ -398,6 +520,7 @@ public class CallComposerActivity extends AppCompatActivity super.onSaveInstanceState(outState); outState.putParcelable(VIEW_PAGER_STATE_KEY, pager.onSaveInstanceState()); outState.putBoolean(ENTRANCE_ANIMATION_KEY, shouldAnimateEntrance); + outState.putBoolean(SEND_AND_CALL_READY_KEY, sendAndCallReady); outState.putInt(CURRENT_INDEX_KEY, currentIndex); outState.putLong(SESSION_ID_KEY, sessionId); } @@ -424,28 +547,6 @@ public class CallComposerActivity extends AppCompatActivity animateSendAndCall(fragment.shouldHide()); } - // To detect when the keyboard changes. - @Override - public void onLayoutChange( - View view, - int left, - int top, - int right, - int bottom, - int oldLeft, - int oldTop, - int oldRight, - int oldBottom) { - // To prevent infinite layout change loops - if (layoutChanged) { - layoutChanged = false; - return; - } - - layoutChanged = true; - showFullscreen(contactContainer.getTop() < 0 || inFullscreenMode); - } - /** * Reads arguments from the fragment arguments and populates the necessary instance variables. * Copied from {@link com.android.contacts.common.dialog.CallSubjectDialog}. @@ -456,14 +557,14 @@ public class CallComposerActivity extends AppCompatActivity byte[] bytes = Base64.decode(intent.getStringExtra(ARG_CALL_COMPOSER_CONTACT_BASE64), Base64.DEFAULT); try { - contact = CallComposerContact.parseFrom(bytes); + contact = DialerContact.parseFrom(bytes); } catch (InvalidProtocolBufferException e) { throw Assert.createAssertionFailException(e.toString()); } } else { contact = ProtoParsers.getTrusted( - intent, ARG_CALL_COMPOSER_CONTACT, CallComposerContact.getDefaultInstance()); + intent, ARG_CALL_COMPOSER_CONTACT, DialerContact.getDefaultInstance()); } updateContactInfo(); } @@ -634,12 +735,20 @@ public class CallComposerActivity extends AppCompatActivity public void onAnimationStart(Animator animation) { isSendAndCallHidingOrHidden = shouldHide; sendAndCall.setVisibility(View.VISIBLE); + cameraIcon.setVisibility(View.VISIBLE); + galleryIcon.setVisibility(View.VISIBLE); + messageIcon.setVisibility(View.VISIBLE); } @Override public void onAnimationEnd(Animator animation) { if (isSendAndCallHidingOrHidden) { sendAndCall.setVisibility(View.INVISIBLE); + } else { + // hide buttons to prevent overdrawing and talkback discoverability + cameraIcon.setVisibility(View.GONE); + galleryIcon.setVisibility(View.GONE); + messageIcon.setVisibility(View.GONE); } } diff --git a/java/com/android/dialer/callcomposer/CameraComposerFragment.java b/java/com/android/dialer/callcomposer/CameraComposerFragment.java index f65207fa3..a5c65fd9d 100644 --- a/java/com/android/dialer/callcomposer/CameraComposerFragment.java +++ b/java/com/android/dialer/callcomposer/CameraComposerFragment.java @@ -17,7 +17,6 @@ package com.android.dialer.callcomposer; import android.Manifest; -import android.Manifest.permission; import android.content.Intent; import android.content.pm.PackageManager; import android.graphics.drawable.Animatable; @@ -89,17 +88,17 @@ public class CameraComposerFragment extends CallComposerFragment LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle bundle) { View root = inflater.inflate(R.layout.fragment_camera_composer, container, false); permissionView = root.findViewById(R.id.permission_view); - loading = (ProgressBar) root.findViewById(R.id.loading); - cameraView = (CameraMediaChooserView) root.findViewById(R.id.camera_view); + loading = root.findViewById(R.id.loading); + cameraView = root.findViewById(R.id.camera_view); shutter = cameraView.findViewById(R.id.camera_shutter_visual); - exitFullscreen = (ImageButton) cameraView.findViewById(R.id.camera_exit_fullscreen); - fullscreen = (ImageButton) cameraView.findViewById(R.id.camera_fullscreen); - swapCamera = (ImageButton) cameraView.findViewById(R.id.swap_camera_button); - capture = (ImageButton) cameraView.findViewById(R.id.camera_capture_button); - cancel = (ImageButton) cameraView.findViewById(R.id.camera_cancel_button); - focus = (RenderOverlay) cameraView.findViewById(R.id.focus_visual); - preview = (CameraPreviewHost) cameraView.findViewById(R.id.camera_preview); - previewImageView = (ImageView) root.findViewById(R.id.preview_image_view); + exitFullscreen = cameraView.findViewById(R.id.camera_exit_fullscreen); + fullscreen = cameraView.findViewById(R.id.camera_fullscreen); + swapCamera = cameraView.findViewById(R.id.swap_camera_button); + capture = cameraView.findViewById(R.id.camera_capture_button); + cancel = cameraView.findViewById(R.id.camera_cancel_button); + focus = cameraView.findViewById(R.id.focus_visual); + preview = cameraView.findViewById(R.id.camera_preview); + previewImageView = root.findViewById(R.id.preview_image_view); exitFullscreen.setOnClickListener(this); fullscreen.setOnClickListener(this); @@ -107,11 +106,12 @@ public class CameraComposerFragment extends CallComposerFragment capture.setOnClickListener(this); cancel.setOnClickListener(this); - if (!PermissionsUtil.hasPermission(getContext(), permission.CAMERA)) { + + if (!PermissionsUtil.hasCameraPermissions(getContext())) { LogUtil.i("CameraComposerFragment.onCreateView", "Permission view shown."); Logger.get(getContext()).logImpression(DialerImpression.Type.CAMERA_PERMISSION_DISPLAYED); - ImageView permissionImage = (ImageView) permissionView.findViewById(R.id.permission_icon); - TextView permissionText = (TextView) permissionView.findViewById(R.id.permission_text); + ImageView permissionImage = permissionView.findViewById(R.id.permission_icon); + TextView permissionText = permissionView.findViewById(R.id.permission_text); allowPermission = permissionView.findViewById(R.id.allow); allowPermission.setOnClickListener(this); @@ -131,6 +131,9 @@ public class CameraComposerFragment extends CallComposerFragment } private void setupCamera() { + if (!PermissionsUtil.hasCameraPrivacyToastShown(getContext())) { + PermissionsUtil.showCameraPermissionToast(getContext()); + } CameraManager.get().setListener(this); preview.setShown(); CameraManager.get().setRenderOverlay(focus); @@ -323,7 +326,11 @@ public class CameraComposerFragment extends CallComposerFragment /** Updates the state of the buttons and overlays based on the current state of the view */ private void updateViewState() { Assert.isNotNull(cameraView); - Assert.isNotNull(getContext()); + if (isDetached() || getContext() == null) { + LogUtil.i( + "CameraComposerFragment.updateViewState", "Fragment detached, cannot update view state"); + return; + } boolean isCameraAvailable = CameraManager.get().isCameraAvailable(); boolean uriReadyOrProcessing = cameraUri != null || processingUri; @@ -336,6 +343,12 @@ public class CameraComposerFragment extends CallComposerFragment previewImageView.setVisibility(View.GONE); } + if (cameraDirection == CameraInfo.CAMERA_FACING_FRONT) { + swapCamera.setContentDescription(getString(R.string.description_camera_switch_camera_rear)); + } else { + swapCamera.setContentDescription(getString(R.string.description_camera_switch_camera_facing)); + } + if (cameraUri == null && isCameraAvailable) { CameraManager.get().resetPreview(); cancel.setVisibility(View.GONE); @@ -384,6 +397,7 @@ public class CameraComposerFragment extends CallComposerFragment Logger.get(getContext()).logImpression(DialerImpression.Type.CAMERA_PERMISSION_GRANTED); LogUtil.i("CameraComposerFragment.onRequestPermissionsResult", "Permission granted."); permissionView.setVisibility(View.GONE); + PermissionsUtil.setCameraPrivacyToastShown(getContext()); setupCamera(); } else if (requestCode == CAMERA_PERMISSION) { Logger.get(getContext()).logImpression(DialerImpression.Type.CAMERA_PERMISSION_DENIED); diff --git a/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java b/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java index aeb8e0388..725cea723 100644 --- a/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java +++ b/java/com/android/dialer/callcomposer/CopyAndResizeImageWorker.java @@ -21,6 +21,7 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.Bitmap.CompressFormat; import android.graphics.BitmapFactory; +import android.media.ExifInterface; import android.net.Uri; import android.os.Build.VERSION_CODES; import android.support.annotation.NonNull; @@ -47,17 +48,26 @@ class CopyAndResizeImageWorker implements Worker> { } /** - * @param input The input Uri is expected to be a image openable by {@link - * android.content.ContentResolver#openInputStream(Uri)}. + * @param input The filepath where the image is located. * @return a Pair where the File contains the resized image, and the String is the result File's * MIME type. */ @Nullable @Override public Pair doInBackground(@Nullable Uri input) throws Throwable { + // BitmapFactory.decodeStream strips exif data, so we need to save it here and apply it later. + int rotation = 0; + try { + rotation = + new ExifInterface(input.getPath()) + .getAttributeInt(ExifInterface.TAG_ORIENTATION, ExifInterface.ORIENTATION_NORMAL); + } catch (Exception ignored) { + // Couldn't get exif tags, not the end of the world + } + try (InputStream inputStream = context.getContentResolver().openInputStream(input)) { Bitmap bitmap = BitmapFactory.decodeStream(inputStream); - bitmap = BitmapResizer.resizeForEnrichedCalling(bitmap); + bitmap = BitmapResizer.resizeForEnrichedCalling(bitmap, exifToDegrees(rotation)); File outputFile = DialerUtils.createShareableFile(context); try (OutputStream outputStream = new FileOutputStream(outputFile)) { @@ -67,4 +77,17 @@ class CopyAndResizeImageWorker implements Worker> { } } } + + private static int exifToDegrees(int exifOrientation) { + switch (exifOrientation) { + case ExifInterface.ORIENTATION_ROTATE_90: + return 90; + case ExifInterface.ORIENTATION_ROTATE_180: + return 180; + case ExifInterface.ORIENTATION_ROTATE_270: + return 270; + default: + return 0; + } + } } diff --git a/java/com/android/dialer/callcomposer/GalleryCursorLoader.java b/java/com/android/dialer/callcomposer/GalleryCursorLoader.java index f9990e167..d33bfb398 100644 --- a/java/com/android/dialer/callcomposer/GalleryCursorLoader.java +++ b/java/com/android/dialer/callcomposer/GalleryCursorLoader.java @@ -16,7 +16,6 @@ package com.android.dialer.callcomposer; -import android.annotation.SuppressLint; import android.content.Context; import android.net.Uri; import android.provider.MediaStore.Files; @@ -28,7 +27,7 @@ import android.support.v4.content.CursorLoader; public class GalleryCursorLoader extends CursorLoader { public static final String MEDIA_SCANNER_VOLUME_EXTERNAL = "external"; public static final String[] ACCEPTABLE_IMAGE_TYPES = - new String[] {"image/jpeg", "image/jpg", "image/png", "image/gif", "image/webp"}; + new String[] {"image/jpeg", "image/jpg", "image/png", "image/webp"}; private static final Uri STORAGE_URI = Files.getContentUri(MEDIA_SCANNER_VOLUME_EXTERNAL); private static final String SORT_ORDER = Media.DATE_MODIFIED + " DESC"; @@ -44,11 +43,10 @@ public class GalleryCursorLoader extends CursorLoader { SORT_ORDER); } - @SuppressLint("DefaultLocale") private static String createSelection() { - return String.format( - "mime_type IN ('image/jpeg', 'image/jpg', 'image/png', 'image/gif', 'image/webp')" - + " AND media_type in (%d)", - FileColumns.MEDIA_TYPE_IMAGE); + return "mime_type IN ('image/jpeg', 'image/jpg', 'image/png', 'image/webp')" + + " AND media_type in (" + + FileColumns.MEDIA_TYPE_IMAGE + + ")"; } } diff --git a/java/com/android/dialer/callcomposer/MessageComposerFragment.java b/java/com/android/dialer/callcomposer/MessageComposerFragment.java index 2a342bb08..392f6e716 100644 --- a/java/com/android/dialer/callcomposer/MessageComposerFragment.java +++ b/java/com/android/dialer/callcomposer/MessageComposerFragment.java @@ -24,11 +24,8 @@ import android.text.TextUtils; import android.text.TextWatcher; import android.view.KeyEvent; import android.view.LayoutInflater; -import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; -import android.view.View.OnLongClickListener; -import android.view.View.OnTouchListener; import android.view.ViewGroup; import android.widget.EditText; import android.widget.TextView; @@ -36,17 +33,12 @@ import android.widget.TextView.OnEditorActionListener; /** Fragment used to compose call with message fragment. */ public class MessageComposerFragment extends CallComposerFragment - implements OnClickListener, - TextWatcher, - OnTouchListener, - OnLongClickListener, - OnEditorActionListener { + implements OnClickListener, TextWatcher, OnEditorActionListener { private static final String CHAR_LIMIT_KEY = "char_limit"; public static final int NO_CHAR_LIMIT = -1; private EditText customMessage; - private boolean isLongClick = false; private int charLimit; public static MessageComposerFragment newInstance(int charLimit) { @@ -73,8 +65,6 @@ public class MessageComposerFragment extends CallComposerFragment customMessage = (EditText) view.findViewById(R.id.custom_message); urgent.setOnClickListener(this); - customMessage.setOnTouchListener(this); - customMessage.setOnLongClickListener(this); customMessage.addTextChangedListener(this); customMessage.setOnEditorActionListener(this); if (charLimit != NO_CHAR_LIMIT) { @@ -118,30 +108,6 @@ public class MessageComposerFragment extends CallComposerFragment getListener().composeCall(this); } - /** - * EditTexts take two clicks to dispatch an onClick() event, so instead we add an onTouchListener - * to listen for them. The caveat to this is that it also requires listening for onLongClicks to - * distinguish whether a MotionEvent came from a click or a long click. - */ - @Override - public boolean onTouch(View view, MotionEvent event) { - if (event.getAction() == MotionEvent.ACTION_UP) { - if (isLongClick) { - isLongClick = false; - } else { - getListener().showFullscreen(true); - } - } - view.performClick(); - return false; - } - - @Override - public boolean onLongClick(View v) { - isLongClick = true; - return false; - } - @Override public boolean shouldHide() { return TextUtils.isEmpty(getMessage()); diff --git a/java/com/android/dialer/callcomposer/camera/CameraManager.java b/java/com/android/dialer/callcomposer/camera/CameraManager.java index 4cc08ba32..f79f6548c 100644 --- a/java/com/android/dialer/callcomposer/camera/CameraManager.java +++ b/java/com/android/dialer/callcomposer/camera/CameraManager.java @@ -35,6 +35,7 @@ import com.android.dialer.callcomposer.camera.camerafocus.FocusOverlayManager; import com.android.dialer.callcomposer.camera.camerafocus.RenderOverlay; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; +import com.android.dialer.common.concurrent.DialerExecutors; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -118,7 +119,7 @@ public class CameraManager implements FocusOverlayManager.Listener { /** * The task for opening the camera, so it doesn't block the UI thread Using AsyncTask rather than * SafeAsyncTask because the tasks need to be serialized, but don't need to be on the UI thread - * TODO: If we have other AyncTasks (not SafeAsyncTasks) this may contend and we may need + * TODO(blemmon): If we have other AyncTasks (not SafeAsyncTasks) this may contend and we may need * to create a dedicated thread, or synchronize the threads in the thread pool */ private AsyncTask mOpenCameraTask; @@ -457,9 +458,9 @@ public class CameraManager implements FocusOverlayManager.Listener { int height; if (mRotation == 90 || mRotation == 270) { // Is rotated, so swapping dimensions is desired - //noinspection SuspiciousNameCombination + // noinspection SuspiciousNameCombination width = size.height; - //noinspection SuspiciousNameCombination + // noinspection SuspiciousNameCombination height = size.width; } else { width = size.width; @@ -467,9 +468,20 @@ public class CameraManager implements FocusOverlayManager.Listener { } LogUtil.i( "CameraManager.onPictureTaken", "taken picture size: " + bytes.length + " bytes"); - new ImagePersistTask( - width, height, heightPercent, bytes, mCameraPreview.getContext(), callback) - .execute(); + DialerExecutors.createNonUiTaskBuilder( + new ImagePersistWorker( + width, height, heightPercent, bytes, mCameraPreview.getContext())) + .onSuccess( + (result) -> { + callback.onMediaReady( + result.getUri(), "image/jpeg", result.getWidth(), result.getHeight()); + }) + .onFailure( + (throwable) -> { + callback.onMediaFailed(new Exception("Persisting image failed", throwable)); + }) + .build() + .executeSerial(null); } }; @@ -509,62 +521,61 @@ public class CameraManager implements FocusOverlayManager.Listener { }.execute(); } - /** Updates the orientation of the camera to match the orientation of the device */ - private void updateCameraOrientation() { - if (mCamera == null || mCameraPreview == null || mTakingPicture) { - return; + /** + * Updates the orientation of the {@link Camera} w.r.t. the orientation of the device and the + * orientation that the physical camera is mounted on the device. + * + * @param camera that needs to be reorientated + * @param screenRotation rotation of the physical device + * @param cameraOrientation {@link CameraInfo#orientation} + * @param cameraIsFrontFacing {@link CameraInfo#CAMERA_FACING_FRONT} + * @return rotation that images returned from {@link + * android.hardware.Camera.PictureCallback#onPictureTaken(byte[], Camera)} will be rotated. + */ + @VisibleForTesting + static int updateCameraRotation( + @NonNull Camera camera, + int screenRotation, + int cameraOrientation, + boolean cameraIsFrontFacing) { + Assert.isNotNull(camera); + Assert.checkArgument(cameraOrientation % 90 == 0); + + int rotation = screenRotationToDegress(screenRotation); + boolean portrait = rotation == 0 || rotation == 180; + + if (!portrait && !cameraIsFrontFacing) { + rotation += 180; } + rotation += cameraOrientation; + rotation %= 360; - final WindowManager windowManager = - (WindowManager) mCameraPreview.getContext().getSystemService(Context.WINDOW_SERVICE); + // Rotate the camera + if (portrait && cameraIsFrontFacing) { + camera.setDisplayOrientation((rotation + 180) % 360); + } else { + camera.setDisplayOrientation(rotation); + } + + // Rotate the images returned when a picture is taken + Camera.Parameters params = camera.getParameters(); + params.setRotation(rotation); + camera.setParameters(params); + return rotation; + } - int degrees; - switch (windowManager.getDefaultDisplay().getRotation()) { + private static int screenRotationToDegress(int screenRotation) { + switch (screenRotation) { case Surface.ROTATION_0: - degrees = 0; - break; + return 0; case Surface.ROTATION_90: - degrees = 90; - break; + return 90; case Surface.ROTATION_180: - degrees = 180; - break; + return 180; case Surface.ROTATION_270: - degrees = 270; - break; + return 270; default: - throw Assert.createAssertionFailException(""); - } - - // The display orientation of the camera (this controls the preview image). - int orientation; - - // The clockwise rotation angle relative to the orientation of the camera. This affects - // pictures returned by the camera in Camera.PictureCallback. - int rotation; - if (mCameraInfo.facing == Camera.CameraInfo.CAMERA_FACING_FRONT) { - orientation = (mCameraInfo.orientation + degrees) % 360; - rotation = orientation; - // compensate the mirror but only for orientation - orientation = (360 - orientation) % 360; - } else { // back-facing - orientation = (mCameraInfo.orientation - degrees + 360) % 360; - rotation = orientation; - } - mRotation = rotation; - try { - mCamera.setDisplayOrientation(orientation); - final Camera.Parameters params = mCamera.getParameters(); - params.setRotation(rotation); - mCamera.setParameters(params); - } catch (final RuntimeException e) { - LogUtil.e( - "CameraManager.updateCameraOrientation", - "RuntimeException in CameraManager.updateCameraOrientation", - e); - if (mListener != null) { - mListener.onCameraError(ERROR_OPENING_CAMERA, e); - } + throw Assert.createIllegalStateFailException("Invalid surface rotation."); } } @@ -589,13 +600,19 @@ public class CameraManager implements FocusOverlayManager.Listener { mOrientationHandler.disable(); mOrientationHandler = null; } - // releaseMediaRecorder(true /* cleanupFile */); mFocusOverlayManager.onPreviewStopped(); return; } try { mCamera.stopPreview(); - updateCameraOrientation(); + if (!mTakingPicture) { + mRotation = + updateCameraRotation( + mCamera, + getScreenRotation(), + mCameraInfo.orientation, + mCameraInfo.facing == CameraInfo.CAMERA_FACING_FRONT); + } final Camera.Parameters params = mCamera.getParameters(); final Camera.Size pictureSize = chooseBestPictureSize(); @@ -644,6 +661,14 @@ public class CameraManager implements FocusOverlayManager.Listener { } } + private int getScreenRotation() { + return mCameraPreview + .getContext() + .getSystemService(WindowManager.class) + .getDefaultDisplay() + .getRotation(); + } + public boolean isCameraAvailable() { return mCamera != null && !mTakingPicture && mIsHardwareAccelerationSupported; } @@ -681,7 +706,14 @@ public class CameraManager implements FocusOverlayManager.Listener { @Override public void onOrientationChanged(final int orientation) { - updateCameraOrientation(); + if (!mTakingPicture) { + mRotation = + updateCameraRotation( + mCamera, + getScreenRotation(), + mCameraInfo.orientation, + mCameraInfo.facing == CameraInfo.CAMERA_FACING_FRONT); + } } } diff --git a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java b/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java deleted file mode 100644 index 31751e536..000000000 --- a/java/com/android/dialer/callcomposer/camera/ImagePersistTask.java +++ /dev/null @@ -1,145 +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.callcomposer.camera; - -import android.annotation.TargetApi; -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.Canvas; -import android.graphics.Matrix; -import android.net.Uri; -import android.os.Build.VERSION_CODES; -import android.support.v4.content.FileProvider; -import com.android.dialer.callcomposer.camera.exif.ExifInterface; -import com.android.dialer.callcomposer.camera.exif.ExifTag; -import com.android.dialer.callcomposer.util.BitmapResizer; -import com.android.dialer.common.Assert; -import com.android.dialer.common.concurrent.FallibleAsyncTask; -import com.android.dialer.constants.Constants; -import com.android.dialer.util.DialerUtils; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStream; - -/** Persisting image routine. */ -@TargetApi(VERSION_CODES.M) -public class ImagePersistTask extends FallibleAsyncTask { - private int mWidth; - private int mHeight; - private final float mHeightPercent; - private final byte[] mBytes; - private final Context mContext; - private final CameraManager.MediaCallback mCallback; - - ImagePersistTask( - final int width, - final int height, - final float heightPercent, - final byte[] bytes, - final Context context, - final CameraManager.MediaCallback callback) { - Assert.checkArgument(heightPercent >= 0 && heightPercent <= 1); - Assert.isNotNull(bytes); - Assert.isNotNull(context); - Assert.isNotNull(callback); - mWidth = width; - mHeight = height; - mHeightPercent = heightPercent; - mBytes = bytes; - mContext = context; - mCallback = callback; - } - - @Override - protected Uri doInBackgroundFallible(final Void... params) throws Exception { - File outputFile = DialerUtils.createShareableFile(mContext); - - try (OutputStream outputStream = new FileOutputStream(outputFile)) { - if (mHeightPercent != 1.0f) { - writeClippedBitmap(outputStream); - } else { - Bitmap bitmap = BitmapFactory.decodeByteArray(mBytes, 0, mBytes.length); - bitmap = BitmapResizer.resizeForEnrichedCalling(bitmap); - bitmap.compress(Bitmap.CompressFormat.JPEG, 90, outputStream); - } - } - - return FileProvider.getUriForFile( - mContext, Constants.get().getFileProviderAuthority(), outputFile); - } - - @Override - protected void onPostExecute(FallibleTaskResult result) { - if (result.isFailure()) { - mCallback.onMediaFailed(new Exception("Persisting image failed", result.getThrowable())); - } else { - mCallback.onMediaReady(result.getResult(), "image/jpeg", mWidth, mHeight); - } - } - - private void writeClippedBitmap(OutputStream outputStream) throws IOException { - int orientation = android.media.ExifInterface.ORIENTATION_UNDEFINED; - final ExifInterface exifInterface = new ExifInterface(); - try { - exifInterface.readExif(mBytes); - final Integer orientationValue = exifInterface.getTagIntValue(ExifInterface.TAG_ORIENTATION); - if (orientationValue != null) { - orientation = orientationValue.intValue(); - } - } catch (final IOException e) { - // Couldn't get exif tags, not the end of the world - } - Bitmap bitmap = BitmapFactory.decodeByteArray(mBytes, 0, mBytes.length); - final int clippedWidth; - final int clippedHeight; - if (ExifInterface.getOrientationParams(orientation).invertDimensions) { - Assert.checkState(mWidth == bitmap.getHeight()); - Assert.checkState(mHeight == bitmap.getWidth()); - clippedWidth = (int) (mHeight * mHeightPercent); - clippedHeight = mWidth; - } else { - Assert.checkState(mWidth == bitmap.getWidth()); - Assert.checkState(mHeight == bitmap.getHeight()); - clippedWidth = mWidth; - clippedHeight = (int) (mHeight * mHeightPercent); - } - final int offsetTop = (bitmap.getHeight() - clippedHeight) / 2; - final int offsetLeft = (bitmap.getWidth() - clippedWidth) / 2; - mWidth = clippedWidth; - mHeight = clippedHeight; - Bitmap clippedBitmap = - Bitmap.createBitmap(clippedWidth, clippedHeight, Bitmap.Config.ARGB_8888); - clippedBitmap.setDensity(bitmap.getDensity()); - final Canvas clippedBitmapCanvas = new Canvas(clippedBitmap); - final Matrix matrix = new Matrix(); - matrix.postTranslate(-offsetLeft, -offsetTop); - clippedBitmapCanvas.drawBitmap(bitmap, matrix, null /* paint */); - clippedBitmapCanvas.save(); - clippedBitmap = BitmapResizer.resizeForEnrichedCalling(clippedBitmap); - // EXIF data can take a big chunk of the file size and is often cleared by the - // carrier, only store orientation since that's critical - final ExifTag orientationTag = exifInterface.getTag(ExifInterface.TAG_ORIENTATION); - exifInterface.clearExif(); - exifInterface.setTag(orientationTag); - exifInterface.writeExif(clippedBitmap, outputStream); - - clippedBitmap.recycle(); - bitmap.recycle(); - } -} diff --git a/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java b/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java new file mode 100644 index 000000000..26b0bde00 --- /dev/null +++ b/java/com/android/dialer/callcomposer/camera/ImagePersistWorker.java @@ -0,0 +1,153 @@ +/* + * 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.callcomposer.camera; + +import android.annotation.TargetApi; +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; +import android.net.Uri; +import android.os.Build.VERSION_CODES; +import android.support.annotation.NonNull; +import android.support.v4.content.FileProvider; +import com.android.dialer.callcomposer.camera.ImagePersistWorker.Result; +import com.android.dialer.callcomposer.camera.exif.ExifInterface; +import com.android.dialer.callcomposer.util.BitmapResizer; +import com.android.dialer.common.Assert; +import com.android.dialer.common.concurrent.DialerExecutor.Worker; +import com.android.dialer.constants.Constants; +import com.android.dialer.util.DialerUtils; +import com.google.auto.value.AutoValue; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStream; + +/** Persisting image routine. */ +@TargetApi(VERSION_CODES.M) +public class ImagePersistWorker implements Worker { + private int mWidth; + private int mHeight; + private final float mHeightPercent; + private final byte[] mBytes; + private final Context mContext; + + @AutoValue + abstract static class Result { + + public static Builder builder() { + return new AutoValue_ImagePersistWorker_Result.Builder(); + } + + @NonNull + abstract Uri getUri(); + + abstract int getWidth(); + + abstract int getHeight(); + + @AutoValue.Builder + abstract static class Builder { + abstract Builder setUri(@NonNull Uri uri); + + abstract Builder setWidth(int width); + + abstract Builder setHeight(int height); + + abstract Result build(); + } + } + + ImagePersistWorker( + final int width, + final int height, + final float heightPercent, + final byte[] bytes, + final Context context) { + Assert.checkArgument(heightPercent >= 0 && heightPercent <= 1); + Assert.isNotNull(bytes); + Assert.isNotNull(context); + mWidth = width; + mHeight = height; + mHeightPercent = heightPercent; + mBytes = bytes; + mContext = context; + } + + @Override + public Result doInBackground(Void unused) throws Exception { + File outputFile = DialerUtils.createShareableFile(mContext); + + try (OutputStream outputStream = new FileOutputStream(outputFile)) { + writeClippedBitmap(outputStream); + } + + return Result.builder() + .setUri( + FileProvider.getUriForFile( + mContext, Constants.get().getFileProviderAuthority(), outputFile)) + .setWidth(mWidth) + .setHeight(mHeight) + .build(); + } + + private void writeClippedBitmap(OutputStream outputStream) throws IOException { + int orientation = android.media.ExifInterface.ORIENTATION_UNDEFINED; + final ExifInterface exifInterface = new ExifInterface(); + try { + exifInterface.readExif(mBytes); + final Integer orientationValue = exifInterface.getTagIntValue(ExifInterface.TAG_ORIENTATION); + if (orientationValue != null) { + orientation = orientationValue.intValue(); + } + } catch (final IOException e) { + // Couldn't get exif tags, not the end of the world + } + + ExifInterface.OrientationParams params = ExifInterface.getOrientationParams(orientation); + Bitmap bitmap = BitmapFactory.decodeByteArray(mBytes, 0, mBytes.length); + final int clippedWidth; + final int clippedHeight; + if (params.invertDimensions) { + Assert.checkState(mWidth == bitmap.getHeight()); + Assert.checkState(mHeight == bitmap.getWidth()); + clippedWidth = (int) (mHeight * mHeightPercent); + clippedHeight = mWidth; + } else { + Assert.checkState(mWidth == bitmap.getWidth()); + Assert.checkState(mHeight == bitmap.getHeight()); + clippedWidth = mWidth; + clippedHeight = (int) (mHeight * mHeightPercent); + } + + int offsetTop = (bitmap.getHeight() - clippedHeight) / 2; + int offsetLeft = (bitmap.getWidth() - clippedWidth) / 2; + mWidth = clippedWidth; + mHeight = clippedHeight; + + Bitmap clippedBitmap = + Bitmap.createBitmap(bitmap, offsetLeft, offsetTop, clippedWidth, clippedHeight); + clippedBitmap = BitmapResizer.resizeForEnrichedCalling(clippedBitmap, params.rotation); + // EXIF data can take a big chunk of the file size and we've already manually rotated our image, + // so remove all of the exif data. + exifInterface.clearExif(); + exifInterface.writeExif(clippedBitmap, outputStream); + + clippedBitmap.recycle(); + bitmap.recycle(); + } +} diff --git a/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java b/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java index 1c5ac380c..a5edf3309 100644 --- a/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java +++ b/java/com/android/dialer/callcomposer/camera/camerafocus/FocusOverlayManager.java @@ -389,7 +389,7 @@ public class FocusOverlayManager { focusIndicator.showStart(); } else { if (Parameters.FOCUS_MODE_CONTINUOUS_PICTURE.equals(mFocusMode)) { - // TODO: check HAL behavior and decide if this can be removed. + // TODO(blemmon): check HAL behavior and decide if this can be removed. focusIndicator.showSuccess(false); } else if (mState == STATE_SUCCESS) { focusIndicator.showSuccess(false); diff --git a/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java b/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java index 92dee1c94..1bf9519ad 100644 --- a/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java +++ b/java/com/android/dialer/callcomposer/camera/exif/ExifInterface.java @@ -286,7 +286,7 @@ public class ExifInterface { /** Wrapper class to define some orientation parameters. */ public static class OrientationParams { - int rotation = 0; + public int rotation = 0; int scaleX = 1; int scaleY = 1; public boolean invertDimensions = false; diff --git a/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java b/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java index 23d748c17..c728845a1 100644 --- a/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java +++ b/java/com/android/dialer/callcomposer/camera/exif/ExifParser.java @@ -499,7 +499,7 @@ public class ExifParser { mTiffStream.skip(4); return null; } - // TODO: handle numOfComp overflow + // TODO(blemmon): handle numOfComp overflow ExifTag tag = new ExifTag( tagId, diff --git a/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java b/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java index a254ae93b..9a03c103c 100644 --- a/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java +++ b/java/com/android/dialer/callcomposer/camera/exif/ExifTag.java @@ -187,7 +187,7 @@ public class ExifTag { /** Gets the component count of this tag. */ - // TODO: fix integer overflows with this + // TODO(blemmon): fix integer overflows with this int getComponentCount() { return mComponentCountActual; } diff --git a/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml b/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml index a4198fcf9..8169a3ded 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/layout/camera_view.xml @@ -24,7 +24,7 @@ + android:layout_height="wrap_content"> @@ -37,14 +37,14 @@ + android:layout_height="match_parent"/> + android:visibility="gone"/> + android:background="?android:selectableItemBackgroundBorderless" + android:contentDescription="@string/description_camera_switch_full_screen"/> + android:background="?android:selectableItemBackgroundBorderless" + android:contentDescription="@string/description_camera_switch_preview_screen"/> + android:contentDescription="@string/description_camera_take_picture"/> + android:background="@drawable/transparent_button_background"/> + android:contentDescription="@string/description_camera_cancel_photo" /> diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml index 3892a2089..f6326c1ad 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-af/strings.xml @@ -1,11 +1,26 @@ + + - "Skakel na volskerm-kamera oor" - "Knoppie is nou voorste kamera" - "Knoppie is nou agterste kamera" - "Stop video-opname" - "Gebruik tans voorste kamera" - "Gebruik tans agterste kamera" - "Neem foto" + "Skakel oor na volskerm-kamera" + "Skakel oor na kameravoorskou" + "Skakel oor na voorste kamera" + "Skakel oor na agterste kamera" + "Neem foto" + "Neem foto weer" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml index e2717986e..87c70c75b 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-am/strings.xml @@ -1,11 +1,26 @@ + + - "ወደ ሙሉ ማያ ገጽ ካሜራ ቀይር" - "አዝራር አሁን የፊት ካሜራ ነው" - "አዝራር አሁን የኋላ ካሜራ ነው" - "ቪዲዮ መቅዳትን አቁም" - "የፊት ካሜራ በመጠቀም ላይ" - "የኋላ ካሜራ በመጠቀም ላይ" - "ፎቶ ያንሱ" + "ወደ ሙሉ ማያ ገጽ ካሜራ ይቀይሩ" + "ወደ ካሜራ ቅድመ ዕይታ ይቀይሩ" + "ወደ የፊት ካሜራ ይቀይሩ" + "ወደ የኋላ ካሜራ ይቀይሩ" + "ፎቶ ያንሱ" + "ፎቶ በድጋሚ ያንሱ" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml index a045a1141..fa27db7b6 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ar/strings.xml @@ -1,11 +1,26 @@ + + - "التبديل إلى الكاميرا بملء الشاشة" - "يشير الزر الآن إلى الكاميرا الأمامية" - "يشير الزر الآن إلى الكاميرا الخلفية" - "إيقاف تسجيل الفيديو" - "استخدام الكاميرا الأمامية" - "استخدام الكاميرا الخلفية" - "التقاط صورة" + "التبديل إلى الكاميرا بملء الشاشة" + "التبديل إلى معاينة الكاميرا" + "تبديل إلى الكاميرا الأمامية" + "تبديل مرة أخرى إلى الكاميرا الأمامية" + "التقاط صورة" + "إعادة التقاط الصورة" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml index 514463c4d..bfbf204cd 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-az/strings.xml @@ -1,11 +1,26 @@ + + - "Tam ekranlı kameraya keçin" - "Düymə indi ön kameradır" - "Düymə indi arxa kameradır" - "Video qeydi dayandırın" - "Ön kamera istifadə olunur" - "Arxa kamera istifadə olunur" - "Fotoşəkil çəkin" + "Tam ekranlı kameraya keçin" + "Kamera önizləməsinə keçin" + "Ön kameraya keçin" + "Arxa kameraya keçin" + "Foto çəkin" + "Fotonu yenidən çəkin" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml index aad8d9dd8..565b18810 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-b+sr+Latn/strings.xml @@ -1,11 +1,26 @@ + + - "Pređite na prikaz kamere preko celog ekrana" - "Dugme sad aktivira prednju kameru" - "Dugme sad aktivira zadnju kameru" - "Zaustavite snimanje videa" - "Koristimo prednju kameru" - "Koristimo zadnju kameru" - "Snimite sliku" + "Prebacite na prikaz kamere preko celog ekrana" + "Prebacite na pregled kamere" + "Prebacite na prednju kameru" + "Prebacite na zadnju kameru" + "Snimite sliku" + "Ponovo snimite sliku" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml index 108ab7f63..f15bbb945 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-be/strings.xml @@ -1,11 +1,26 @@ + + - "Пераключыцца на поўнаэкранную камеру" - "Кнопка зараз замацавана за пярэдняй камерай" - "Кнопка зараз замацавана за задняй камерай" - "Спыніць запіс відэа" - "Выкарыстанне пярэдняй камеры" - "Выкарыстанне задняй камеры" - "Зрабіць фота" + "Пераключыцца на поўнаэкранную камеру" + "Пераключыцца ў рэжым перадпрагляду камеры" + "Пераключыцца на пярэднюю камеру" + "Пераключыцца на заднюю камеру" + "Зрабіць фота" + "Зрабіць фота яшчэ раз" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml index e965ed9b3..92352ffdb 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bg/strings.xml @@ -1,11 +1,26 @@ + + - "Превключване към камера на цял екран" - "Бутонът сега е за предната камера" - "Бутонът сега е за задната камера" - "Спиране на видеозаписа" - "Използва се предната камера" - "Използва се задната камера" - "Правене на снимка" + "Превключване към камера на цял екран" + "Превключване към визуализация на камерата" + "Превключване към предната камера" + "Превключване към задната камера." + "Снимане" + "Повторно снимане" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml index 447b7e36b..83774c767 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bn/strings.xml @@ -1,11 +1,26 @@ + + - "পূর্ণ স্ক্রীন ক্যামেরাতে পাল্টান" - "বোতামটিকে এখন সামনের ক্যামেরার জন্য ব্যবহার করা হবে" - "বোতামটিকে এখন পিছনের ক্যামেরার জন্য ব্যবহার করা হবে" - "ভিডিও রেকর্ডিং বন্ধ করুন" - "সামনের ক্যামেরা ব্যবহার করা হচ্ছে" - "পিছনের ক্যামেরা ব্যবহার করা হচ্ছে" - "ফটো তুলুন" + "সম্পূর্ণ স্ক্রীন জুড়ে ক্যামেরা খুলুন" + "ক্যামেরার পূর্বরূপ মোডে পাল্টান" + "সামনের ক্যামেরাতে পাল্টান" + "পিছনের ক্যামেরাতে পাল্টান" + "ফটো তুলুন" + "আবার ফটো তুলুন" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml index 8946f4f4d..c77a5de8d 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-bs/strings.xml @@ -1,11 +1,26 @@ + + - "Prebaci na kameru preko cijelog ekrana" - "Dugme je sada prednja kamera" - "Dugme je sada zadnja kamera" - "Zaustavi snimanje videozapisa" - "Koristi se prednja kamera" - "Koristi se zadnja kamera" - "Snimi fotografiju" + "Prebaci na kameru preko cijelog ekrana" + "Prebaci na pregled kamere" + "Prebaci na prednju kameru" + "Prebaci na stražnju kameru" + "Snimi fotografiju" + "Ponovo snimi fotografiju" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml index 6d8ffdc4e..39c069b88 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ca/strings.xml @@ -1,11 +1,26 @@ + + - "Canvia a la càmera en pantalla completa" - "El botó ara és la càmera frontal" - "El botó ara és la càmera posterior" - "Deixa d\'enregistrar el vídeo" - "S\'està utilitzant la càmera frontal" - "S\'està utilitzant la càmera posterior" - "Fes una foto" + "Canvia a la càmera en pantalla completa" + "Canvia a la previsualització de la càmera" + "Canvia a la càmera frontal" + "Canvia a la càmera posterior" + "Fes una foto" + "Torna a fer la foto" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml index 0e3110809..222eb812e 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-cs/strings.xml @@ -1,11 +1,26 @@ + + - "Přepnout na fotoaparát na celou obrazovku" - "Tlačítko nyní funguje pro přední fotoaparát" - "Tlačítko nyní funguje pro zadní fotoaparát" - "Zastavit natáčení videa" - "Používá se přední fotoaparát" - "Používá se zadní fotoaparát" - "Vyfotit" + "Přepnout na fotoaparát na celou obrazovku" + "Přepnout na náhled fotoaparátu" + "Přepnout na přední fotoaparát" + "Přepnout na zadní fotoaparát" + "Vyfotit" + "Znovu vyfotit" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml index ca5a79e89..0de7e0861 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-da/strings.xml @@ -1,11 +1,26 @@ + + - "Skift til kamera i fuld skærm" - "Knappen er nu frontkamera" - "Knappen er nu bagsidekamera" - "Stands optagelse af video" - "Bruger frontkameraet" - "Bruger bagsidekameraet" - "Tag billede" + "Skift til kamera i fuld skærm" + "Skift til forhåndsvisning af kamera" + "Skift til kamera på forsiden" + "Skift til kamera på bagsiden" + "Tag billede" + "Tag billedet om" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml index 53d22eba5..1b0d63906 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-de/strings.xml @@ -1,11 +1,26 @@ + + - "Zur Vollbildkamera wechseln" - "Schaltfläche ist jetzt Frontkamera" - "Schaltfläche ist jetzt Rückkamera" - "Videoaufzeichnung beenden" - "Frontkamera wird verwendet" - "Rückkamera wird verwendet" - "Foto aufnehmen" + "Zur Vollbildkamera wechseln" + "Zur Kameravorschau wechseln" + "Zur Frontkamera wechseln" + "Zur Rückkamera wechseln" + "Foto aufnehmen" + "Foto neu aufnehmen" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml index 5763dec95..d657f936f 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-el/strings.xml @@ -1,11 +1,26 @@ + + - "Εναλλαγή σε κάμερα πλήρους οθόνης" - "Το κουμπί είναι τώρα η μπροστινή κάμερα" - "Το κουμπί είναι τώρα η πίσω κάμερα" - "Διακοπή εγγραφής βίντεο" - "Χρήση μπροστινής κάμερας" - "Χρήση πίσω κάμερας" - "Λήψη φωτογραφίας" + "Εναλλαγή σε κάμερα πλήρους οθόνης" + "Εναλλαγή σε προεπισκόπηση κάμερας" + "Εναλλαγή σε κάμερα πρόσοψης" + "Εναλλαγή σε πίσω κάμερα" + "Λήψη φωτογραφίας" + "Επανάληψη λήψης φωτογραφίας" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml index 5b8b4aa26..9e76a69a5 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rAU/strings.xml @@ -1,11 +1,26 @@ + + - "Switch to full-screen camera" - "Button is now front-facing camera" - "Button is now rear-facing camera" - "Stop recording video" - "Using front-facing camera" - "Using rear-facing camera" - "Take photo" + "Switch to full-screen camera" + "Switch to camera preview" + "Switch to front-facing camera" + "Switch to rear-facing camera" + "Take photo" + "Retake photo" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml index 5b8b4aa26..9e76a69a5 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rGB/strings.xml @@ -1,11 +1,26 @@ + + - "Switch to full-screen camera" - "Button is now front-facing camera" - "Button is now rear-facing camera" - "Stop recording video" - "Using front-facing camera" - "Using rear-facing camera" - "Take photo" + "Switch to full-screen camera" + "Switch to camera preview" + "Switch to front-facing camera" + "Switch to rear-facing camera" + "Take photo" + "Retake photo" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml index 5b8b4aa26..9e76a69a5 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-en-rIN/strings.xml @@ -1,11 +1,26 @@ + + - "Switch to full-screen camera" - "Button is now front-facing camera" - "Button is now rear-facing camera" - "Stop recording video" - "Using front-facing camera" - "Using rear-facing camera" - "Take photo" + "Switch to full-screen camera" + "Switch to camera preview" + "Switch to front-facing camera" + "Switch to rear-facing camera" + "Take photo" + "Retake photo" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml index a98e74c08..f10356496 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-es-rUS/strings.xml @@ -1,11 +1,26 @@ + + - "Cambiar a cámara en pantalla completa" - "El botón cambió a la cámara frontal" - "El botón cambió a la cámara trasera" - "Detener la grabación de video" - "Usando la cámara frontal" - "Usando la cámara trasera" - "Tomar una foto" + "Cambiar a cámara en pantalla completa" + "Cambiar a vista previa de la cámara" + "Cambiar a cámara frontal" + "Cambiar a cámara trasera" + "Tomar foto" + "Volver a tomar foto" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml index 5c4391ebc..5afb8c8c3 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-es/strings.xml @@ -1,11 +1,26 @@ + + - "Cambiar a cámara en pantalla completa" - "El botón se usa ahora para la cámara frontal" - "El botón se usa ahora para la cámara trasera" - "Detener la grabación de vídeo" - "Estás utilizando la cámara frontal" - "Estás utilizando la cámara trasera" - "Hacer una foto" + "Cambiar a la cámara en pantalla completa" + "Cambiar a la vista previa de la cámara" + "Cambiar a la cámara frontal" + "Cambiar a la cámara trasera" + "Hacer una foto" + "Repetir la foto" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml index d82dcd5df..d4c37fee9 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-et/strings.xml @@ -1,11 +1,26 @@ + + - "Täisekraaniga kaamerale lülitamine" - "Nuppu kasutatakse nüüd esikaamera jaoks" - "Nuppu kasutatakse nüüd tagakaamera jaoks" - "Video salvestamise peatamine" - "Esikaamera kasutamine" - "Tagakaamera kasutamine" - "Foto jäädvustamine" + "Täisekraaniga kaamerale lülitumine" + "Kaamera eelvaatele lülitumine" + "Esikaamerale lülitumine" + "Tagakaamerale lülitumine" + "Foto jäädvustamine" + "Foto uuesti jäädvustamine" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml index b3c20c9e1..4271983ed 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-eu/strings.xml @@ -1,11 +1,26 @@ + + - "Erabili pantaila osoko kamera" - "Orain, aurreko kamera erabiltzeko da botoia" - "Orain, atzeko kamera erabiltzeko da botoia" - "Utzi bideoa grabatzeari" - "Aurreko kamera erabiltzen" - "Atzeko kamera erabiltzen" - "Atera argazkia" + "Erabili pantaila osoko kamera" + "Erabili kameraren aurrebista" + "Erabili aurreko kamera" + "Erabili atzeko kamera" + "Atera argazkia" + "Atera berriro argazkia" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml index 24e757bae..5d5877101 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fa/strings.xml @@ -1,11 +1,26 @@ + + - "جابه‌جایی به دوربین تمام صفحه" - "اکنون دکمه، دوربین جلو است" - "اکنون دکمه، دوربین عقب است" - "توقف ضبط ویدیو" - "استفاده از دوربین جلو" - "استفاده از دوربین عقب" - "عکس گرفتن" + "رفتن به دوربین تمام صفحه" + "رفتن به پیش‌نمایش دوربین" + "رفتن به دوربین جلو" + "رفتن به دوربین عقب" + "عکس گرفتن" + "عکس گرفتن مجدد" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml index 5a3ddd8ce..9d7cb0922 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fi/strings.xml @@ -1,11 +1,26 @@ + + - "Siirry koko näytön kameraan" - "Painikkeeseen on nyt määritetty etukamera." - "Painikkeeseen on nyt määritetty takakamera." - "Lopeta videon tallentaminen" - "Etukamera käytössä" - "Takakamera käytössä" - "Ota kuva" + "Siirry koko näytön kameraan" + "Siirry kameran esikatseluun" + "Vaihda etukameraan" + "Vaihda takakameraan" + "Ota kuva" + "Ota kuva uudelleen" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml index f0e644e18..b20284080 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fr-rCA/strings.xml @@ -1,11 +1,26 @@ + + - "Passer au mode plein écran de l\'appareil photo" - "Le bouton est maintenant utilisé pour l\'appareil photo avant" - "Le bouton est maintenant utilisé pour l\'appareil photo arrière" - "Arrêter l\'enregistrement vidéo" - "Utilisation de la caméra avant" - "Utilisation de la caméra arrière" - "Prendre une photo" + "Passer au mode Plein écran de l\'appareil photo" + "Passer au mode Aperçu de l\'appareil photo" + "Passer à l\'appareil photo avant" + "Passer à l\'appareil photo arrière" + "Prendre une photo" + "Reprendre la photo" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml index 72de07f44..a9cfe7124 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-fr/strings.xml @@ -1,11 +1,26 @@ + + - "Passer en caméra plein écran" - "Le bouton affiche désormais la caméra frontale." - "Le bouton affiche désormais la caméra arrière." - "Arrêter l\'enregistrement vidéo" - "Caméra frontale activée" - "Caméra arrière activée" - "Prendre une photo" + "Passer en mode plein écran" + "Passer en mode aperçu" + "Utiliser la caméra avant" + "Utiliser la caméra arrière" + "Prendre une photo" + "Reprendre la photo" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml index 2ab1ef04a..3568a0fc3 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-gl/strings.xml @@ -1,11 +1,26 @@ + + - "Cambiar á cámara de pantalla completa" - "Agora o botón é a cámara dianteira" - "Agora o botón é a cámara traseira" - "Deter gravación de vídeo" - "Estase utilizando a cámara frontal" - "Estase utilizando a cámara traseira" - "Tirar foto" + "Cambia á cámara de pantalla completa" + "Cambia á vista previa da cámara" + "Cambia á cámara frontal" + "Cambia á cámara traseira" + "Tira unha foto" + "Repite a foto" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml index 60780d940..88037b582 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-gu/strings.xml @@ -1,11 +1,26 @@ + + - "પૂર્ણ સ્ક્રીન કૅમેરા પર સ્વિચ કરો" - "બટન હવે આગળનો કૅમેરો છે" - "બટન હવે પાછળનો કૅમેરો છે" - "વિડિઓ રેકોર્ડિંગ બંધ કરો" - "આગળના કૅમેરાનો ઉપયોગ કરી રહ્યાં છે" - "પાછળના કૅમેરાનો ઉપયોગ કરી રહ્યાં છે" - "ફોટો લો" + "પૂર્ણ સ્ક્રીન કૅમેરા પર સ્વિચ કરો" + "કૅમેરા પૂર્વાવલોકન પર સ્વીચ કરો" + "ફ્ર્ન્ટ ફેસિંગ કૅમેરા પર સ્વિચ કરો" + "પાછળના કૅમેરા પર સ્વિચ કરો" + "ફોટો લો" + "ફોટો ફરીથી લો" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml index cf89a7d16..09a441f08 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hi/strings.xml @@ -1,11 +1,26 @@ + + - "पूर्ण स्क्रीन कैमरा पर स्विच करें" - "बटन अब सामने का कैमरा है" - "बटन अब पीछे का कैमरा है" - "वीडियो रिकॉर्ड करना बंद करें" - "आगे वाले कैमरे का उपयोग करना" - "पीछे वाले कैमरे का उपयोग करना" - "फ़ोटो लें" + "पूर्ण स्क्रीन कैमरे में बदलें" + "कैमरा पूर्वावलोकन में बदलें" + "सामने वाले कैमरे में बदलें" + "पीछे वाले कैमरे में बदलें" + "फ़ोटो लें" + "फि‍र से फ़ोटो लें" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml index 3d59fd40f..2dca9bd45 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hr/strings.xml @@ -1,11 +1,26 @@ + + - "Prebaci na fotoaparat na punom zaslonu" - "Gumb je sada za prednji fotoaparat" - "Gumb je sada za stražnji fotoaparat" - "Zaustavi snimanje videozapisa" - "Upotreba prednje kamere" - "Upotreba stražnje kamere" - "Snimi fotografiju" + "Prebaci na prikaz fotoaparata preko cijelog zaslona" + "Prebaci na pregled fotoaparata" + "Prebaci na prednji fotoaparat" + "Prebaci na stražnji fotoaparat" + "Snimi fotografiju" + "Ponovno snimi fotografiju" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml index 1639ca7d2..5007b3f73 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hu/strings.xml @@ -1,11 +1,26 @@ + + - "Váltás teljes képernyős kameranézetre" - "A gomb beállítása jelenleg: elülső kamera" - "A gomb beállítása jelenleg: hátsó kamera" - "Videofelvétel leállítása" - "Első kamera használata" - "Hátsó kamera használata" - "Fotó készítése" + "Váltás teljes képernyős kameranézetre" + "Váltás kamera-előnézetre" + "Váltás az első kamerára" + "Váltás a hátsó kamerára" + "Fotó készítése" + "Új felvétel" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml index 1da5c684d..2c1bd79e6 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-hy/strings.xml @@ -1,11 +1,26 @@ + + - "Միացնել լիաէկրան ռեժիմը" - "Կոճակն այժմ առջևի տեսախցիկը միացնելու կոճակն է" - "Կոճակն այժմ հետևի տեսախցիկը միացնելու կոճակն է" - "Դադարեցնել տեսագրումը" - "Օգտագործվում է առջևի տեսախցիկը" - "Օգտագործվում է հետևի տեսախցիկը" - "Լուսանկարել" + "Միացնել լիաէկրան ռեժիմը" + "Միացնել նախադիտման ռեժիմը" + "Միացնել առջևի տեսախցիկը" + "Միացնել հետևի տեսախցիկը" + "Լուսանկարել" + "Նորից լուսանկարել" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml index 6073d8e3e..4c922cd41 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-in/strings.xml @@ -1,11 +1,26 @@ + + - "Beralih ke kamera layar penuh" - "Tombol kini berfungsi untuk kamera depan" - "Tombol kini berfungsi untuk kamera belakang" - "Berhenti merekam video" - "Menggunakan kamera depan" - "Menggunakan kamera belakang" - "Ambil foto" + "Beralih ke kamera layar penuh" + "Beralih ke pratinjau kamera" + "Beralih ke kamera depan" + "Beralih ke kamera belakang" + "Ambil foto" + "Ambil ulang foto" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml index d16b2e206..c796d2295 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-is/strings.xml @@ -1,11 +1,26 @@ + + - "Skipta yfir í myndavél á öllum skjánum" - "Hnappurinn er nú fremri myndavél" - "Hnappurinn er nú aftari myndavél" - "Stöðva upptöku myndskeiðs" - "Notar fremri myndavél" - "Notar aftari myndavél" - "Taka mynd" + "Skipta yfir í myndavél á öllum skjánum" + "Skipta yfir í forskoðun á myndavél" + "Skipta yfir í fremri myndavél" + "Skipta yfir í aftari myndavél" + "Taka mynd" + "Taka mynd aftur" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml index 63fac0711..abf5d3f5e 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-it/strings.xml @@ -1,11 +1,26 @@ + + - "Passa alla fotocamera a schermo intero" - "Il pulsante viene ora utilizzato per la fotocamera frontale" - "Il pulsante viene ora utilizzato per la fotocamera posteriore" - "Interrompi registrazione video" - "In uso la fotocamera frontale" - "In uso la fotocamera posteriore" - "Scatta foto" + "Passa alla fotocamera a schermo intero" + "Passa all\'anteprima della fotocamera" + "Passa alla fotocamera anteriore" + "Passa alla fotocamera posteriore" + "Scatta foto" + "Scatta foto di nuovo" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml index 3db2e9461..e6aed2e96 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-iw/strings.xml @@ -1,11 +1,26 @@ + + - "מעבר למצלמה במסך מלא" - "הלחצן מוגדר עכשיו למצלמה הקדמית" - "הלחצן מוגדר עכשיו למצלמה האחורית" - "עצירה של צילום הווידאו" - "באמצעות המצלמה הקדמית" - "באמצעות המצלמה האחורית" - "צילום תמונה" + "מעבר למצלמה במסך מלא" + "מעבר לתצוגה מקדימה של המצלמה" + "מעבר למצלמה הקדמית" + "מעבר למצלמה האחורית" + "צילום תמונה" + "צילום מחדש של התמונה" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml index ffb3a1762..85ef3c8d7 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ja/strings.xml @@ -1,11 +1,26 @@ + + - "全画面カメラに切り替え" - "現在、ボタンは前面カメラになっています" - "現在、ボタンは背面カメラになっています" - "録画を停止" - "前面カメラを使用しています" - "背面カメラを使用しています" - "写真を撮る" + "全画面カメラに切り替えます" + "カメラのプレビューに切り替えます" + "前面カメラに切り替えます" + "背面カメラに切り替えます" + "写真を撮影します" + "写真を撮り直します" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml index 6a94b656c..edaf33ffe 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ka/strings.xml @@ -1,11 +1,26 @@ + + - "სრულეკრანიან კამერაზე გადართვა" - "ახლა ღილაკი გამოიყენება წინა კამერისთვის" - "ახლა ღილაკი გამოიყენება უკანა კამერისთვის" - "ვიდეოს ჩაწერის შეჩერება" - "თქვენ იყენებთ წინა კამერას" - "თქვენ იყენებთ უკანა კამერას" - "ფოტოს გადაღება" + "სრულეკრანიან კამერაზე გადართვა" + "კამერის წინასწარ ხედზე გადართვა" + "წინა კამერაზე გადართვა" + "უკანა კამერაზე გადართვა" + "ფოტოს გადაღება" + "ფოტოს ხელახლა გადაღება" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml index 22b89fdbf..795a06392 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-kk/strings.xml @@ -1,11 +1,26 @@ + + - "Толық экранды камераға ауысу" - "Түйме – енді алдыңғы камера" - "Түйме – енді артқы камера" - "Бейне жазуды тоқтату" - "Алдыңғы камера қолданылуда" - "Артқы камера қолданылуда" - "Суретке түсіру" + "Толық экранды камераға ауысу" + "Камераның алдын ала көру режиміне ауысу" + "Камераның анфас режиміне ауысу" + "Камераның қалыпты режиміне ауысу" + "Суретке түсіру" + "Суретке қайта түсіру" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml index dd547ddc4..377f885cb 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-km/strings.xml @@ -1,11 +1,26 @@ + + - "ប្ដូរ​ទៅ​កាមេរ៉ា​ពេញ​អេក្រង់" - "ឥឡូវ ប៊ូតុង​ស្ថិត​នៅ​​កាមេរ៉ា​មុខ" - "ឥឡូវ ប៊ូតុងស្ថិត​នៅ​កាមេរ៉ា​ក្រោយ" - "បញ្ឈប់​ការ​ថត​វីដេអូ" - "កំពុង​ប្រើ​ប្រាស់​កាមេរ៉ា​មុខ" - "កំពុង​ប្រើប្រាស់​​​កាមេរ៉ា​ក្រោយ" - "ថតរូប" + "ប្ដូរ​ទៅ​កាមេរ៉ា​ពេញ​អេក្រង់" + "ប្ដូរ​ទៅ​ការមើល​កាមេរ៉ា​សាកល្បង" + "ប្ដូរ​ទៅ​កាមេរ៉ា​ខាង​មុខ" + "ប្តូរទៅកាមេរ៉ាខាងក្រោយ" + "ថតរូប" + "ថតរូប​ឡើងវិញ" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml index 471cfc9db..1f5d1ea54 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-kn/strings.xml @@ -1,11 +1,26 @@ + + - "ಪೂರ್ಣ ಪರದೆ ಕ್ಯಾಮರಾಗೆ ಬದಲಿಸಿ" - "ಬಟನ್ ಈಗ ಮುಂಬದಿ ಕ್ಯಾಮರಾದಲ್ಲಿ" - "ಬಟನ್ ಈಗ ಹಿಂಬದಿ ಕ್ಯಾಮರಾದಲ್ಲಿ" - "ವೀಡಿಯೊ ರೆಕಾರ್ಡಿಂಗ್ ನಿಲ್ಲಿಸಿ" - "ಮುಂಬದಿ ಕ್ಯಾಮರಾ ಬಳಸಲಾಗುತ್ತಿದೆ" - "ಹಿಂಬದಿ ಕ್ಯಾಮರಾ ಬಳಸಲಾಗುತ್ತಿದೆ" - "ಫೋಟೋ ತೆಗೆಯಿರಿ" + "ಪೂರ್ಣ ಪರದೆ ಕ್ಯಾಮರಾಗೆ ಬದಲಿಸಿ" + "ಕ್ಯಾಮರಾ ಪೂರ್ವವೀಕ್ಷಣೆಗೆ ಬದಲಾಯಿಸಿ" + "ಮುಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ" + "ಹಿಂಬದಿಯ ಕ್ಯಾಮರಾಗೆ ಬದಲಾಯಿಸಿ" + "ಫೋಟೋ ತೆಗೆಯಿರಿ" + "ಫೋಟೋವನ್ನು ಮರುಸೆರೆಹಿಡಿಯಿರಿ" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml index bb5e64dbc..1b675e746 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ko/strings.xml @@ -1,11 +1,26 @@ + + - "전체화면 카메라로 전환" - "현재 버튼: 전면 카메라" - "현재 버튼: 후면 카메라" - "동영상 녹화 중지" - "전면 카메라 사용 중" - "후면 카메라 사용 중" - "사진 촬영" + "전체화면 카메라로 전환" + "카메라 미리보기로 전환" + "전면 카메라로 전환" + "후면 카메라로 전환" + "사진 찍기" + "사진 다시 찍기" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml index fca2893d8..771f5769d 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ky/strings.xml @@ -1,11 +1,26 @@ + + - "Камераны толук экранга которуу" - "Азыр баскычта \"Маңдайкы камера\" деп жазылып турат" - "Азыр баскычта \"Арткы камера\" деп жазылып турат" - "Видео жаздырууну токтотуу" - "Маңдайкы камера колдонулууда" - "Арткы камера колдонулууда" - "Сүрөткө тартуу" + "Камераны толук экранга которуу" + "Камераны алдын ала көрүү режимине которуу" + "Маңдайкы камерага которуу" + "Арткы камерага которуу" + "Сүрөткө тартуу" + "Кайра сүрөткө тартуу" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml index 0257e75aa..6bfdf4e76 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lo/strings.xml @@ -1,11 +1,26 @@ + + - "ສະຫຼັບໄປໃຊ້ກ້ອງແບບເຕັມຈໍ" - "ຕອນນີ້ເປັນປຸ່ມກ້ອງໜ້າແລ້ວ" - "ຕອນນີ້ເປັນປຸ່ມກ້ອງຫຼັງແລ້ວ" - "ຢຸດການບັນທຶກວິດີໂອ" - "ກຳລັງໃຊ້ກ້ອງໜ້າ" - "ກຳລັງໃຊ້ກ້ອງຫຼັງ" - "ຖ່າຍຮູບ" + "ສະຫຼັບໄປໃຊ້ກ້ອງແບບເຕັມຈໍ" + "ສະຫຼັບໄປໃຊ້ຕົວຢ່າງກ້ອງ" + "ສະຫຼັບໄປໃຊ້ກ້ອງໜ້າ" + "ສະຫຼັບໄປໃຊ້ກ້ອງຫຼັງ" + "ຖ່າຍຮູບ" + "ຖ່າຍຮູບໃໝ່" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml index 62c6de992..6ff3b0db6 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lt/strings.xml @@ -1,11 +1,26 @@ + + - "Perjungti į viso ekrano režimu veikiantį fotoaparatą" - "Dabar tai yra priekinio fotoaparato mygtukas" - "Dabar tai yra užpakalinio fotoaparato mygtukas" - "Sustabdyti vaizdo įrašymą" - "Naudojamas priekinis fotoaparatas" - "Naudojamas užpakalinis fotoaparatas" - "Fotografuoti" + "Perjungti į viso ekrano režimu veikiantį fotoaparatą" + "Perjungti į fotoaparato peržiūrą" + "Perjungti į priekinį fotoaparatą" + "Perjungti į užpakalinį fotoaparatą" + "Fotografuoti" + "Fotografuoti iš naujo" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml index 4800f6bb1..d6d4782fb 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-lv/strings.xml @@ -1,11 +1,26 @@ + + - "Pārslēgties uz pilnekrāna kameru" - "Poga tagad tiek izmantota priekšējai kamerai" - "Poga tagad tiek izmantota aizmugurējai kamerai" - "Pārtraukt videoklipa ierakstīšanu" - "Tiek izmantota priekšējā kamera" - "Tiek izmantota aizmugurējā kamera" - "Uzņemt fotoattēlu" + "Pārslēgt uz pilnekrāna kameru" + "Pārslēgt uz kameras priekšskatījumu" + "Pārslēgt uz priekšējo kameru" + "Pārslēgt uz aizmugurējo kameru" + "Uzņemt fotoattēlu" + "Atkārtoti uzņemt fotoattēlu" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml index 82c466fb4..a0f84a035 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mk/strings.xml @@ -1,11 +1,26 @@ + + - "Префрлете на камера на цел екран" - "Копчето е сега предна камера" - "Копчето е сега задна камера" - "Сопрете со снимање видео" - "Се користи предната камера" - "Се користи задната камера" - "Фотографирај" + "Префрлете на камера на цел екран" + "Префрлете на преглед на камера" + "Префрлете на предна камера" + "Префрлете на задна камера" + "Фотографирај" + "Фотографирај пак" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml index 0423da257..77c0a4f85 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ml/strings.xml @@ -1,11 +1,26 @@ + + - "പൂർണ്ണസ്ക്രീൻ ക്യാമറയിലേക്ക് മാറുക" - "ബട്ടൺ അമർത്തിയാൻ മുൻ ക്യാമറ ലഭിക്കും" - "ബട്ടൺ അമർത്തിയാൻ പിൻ ക്യാമറ ലഭിക്കും" - "വീഡിയോ റെക്കോർഡുചെയ്യൽ നിർത്തുക" - "മുൻവശത്തെ ക്യാമറ ഉപയോഗിക്കുന്നു" - "പിൻഭാഗത്തുള്ള ക്യാമറ ഉപയോഗിക്കുന്നു" - "ഫോട്ടോ എടുക്കുക" + "പൂർണ്ണസ്ക്രീൻ ക്യാമറയിലേക്ക് മാറുക" + "ക്യാമറ പ്രിവ്യൂവിലേക്ക് മാറുക" + "മുൻ ക്യാമറയിലേക്ക് മാറുക" + "പിൻ ക്യാമറയിലേക്ക് മാറുക" + "ഫോട്ടോ എടുക്കുക" + "ഫോട്ടോ വീണ്ടുമെടുക്കുക" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml index 024e00468..1894634ea 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mn/strings.xml @@ -1,11 +1,26 @@ + + - "Бүтэн дэлгэцийн камер руу сэлгэх" - "Товчлуур нь урд талын камер боллоо" - "Товчлуур нь ард талын камер боллоо" - "Видео бичилтийг зогсоох" - "Урд камер ашиглаж байна" - "Арын камер ашиглаж байна" - "Зураг авах" + "Бүтэн дэлгэцийн камер руу сэлгэх" + "Камерын урьдчилан үзэх рүү сэлгэх" + "Урд талын камер руу сэлгэх" + "Ар талын камер руу сэлгэх" + "Зураг авах" + "Зураг дахин авах" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml index bc9c2fb1d..24c1931d9 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-mr/strings.xml @@ -1,11 +1,26 @@ + + - "पूर्ण स्क्रीन कॅमेर्‍यावर स्विच करा" - "बटण आता पुढील कॅमेरा आहे" - "बटण आता मागील कॅमेरा आहे" - "व्हिडिओ रेकॉर्ड करणे थांबवा" - "समोरील कॅमेरा वापरत आहे" - "मागील कॅमेरा वापरत आहे" - "फोटो घ्‍या" + "पूर्ण स्क्रीन कॅमेर्‍यावर स्विच करा" + "कॅमेरा पूर्वावलोकनावर स्विच करा" + "समोरील कॅमऱ्यावर स्विच करा" + "मागील कॅमेर्‍यावर स्‍विच करा" + "फोटो घ्‍या" + "फोटो पुन्हा घ्या" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml index 3245b9c9f..44806f53e 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ms/strings.xml @@ -1,11 +1,26 @@ + + - "Tukar kepada kamera skrin penuh" - "Butang kini kamera depan" - "Butang kini kamera belakang" - "Berhenti merakam video" - "Menggunakan kamera depan" - "Menggunakan kamera belakang" - "Ambil foto" + "Beralih ke kamera skrin penuh" + "Beralih ke pratonton kamera" + "Beralih ke kamera menghadap depan" + "Beralih ke kamera menghadap belakang" + "Ambil foto" + "Ambil semula foto" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml index 884c0c896..7112abc7d 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-my/strings.xml @@ -1,11 +1,26 @@ + + - "မျက်နှာပြင်အပြည့်ကင်မရာသို့ ပြောင်းရန်" - "ခလုတ်မှာ အရှေ့ကင်မရာအတွက် ဖြစ်သွားပါပြီ" - "ခလုတ်မှာ အနောက်ကင်မရာအတွက် ဖြစ်သွားပါပြီ" - "ဗီဒီယိုရိုက်ကူးခြင်း ရပ်ရန်" - "အရှေ့ကင်မရာကို သုံးနေသည်" - "အနောက်ကင်မရာကို သုံးနေသည်" - "ဓာတ်ပုံရိုက်ရန်" + "မျက်နှာပြင်အပြည့်ကင်မရာသို့ ပြောင်းရန်" + "ကင်မရာအစမ်းကြည့်ရှုမှုသို့ ပြောင်းရန်" + "အရှေ့ကင်မရာသို့ ပြောင်းရန်" + "အနောက်ကင်မရာသို့ ပြောင်းရန်" + "ဓာတ်ပုံရိုက်ရန်" + "ဓာတ်ပုံပြန်ရိုက်ရန်" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml index bfa58ed61..5e5fb601e 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nb/strings.xml @@ -1,11 +1,26 @@ + + - "Bytt til fullskjermkamera" - "Nå er knappen frontkameraet" - "Nå er knappen det bakre kameraet" - "Slutt å filme" - "Bruker frontkameraet" - "Bruker det bakre kameraet" - "Ta et bilde" + "Bytt til fullskjermkamera" + "Bytt til forhåndsvisning for kamera" + "Bytt til frontkamera" + "Bytt til bakovervendt kamera" + "Ta bilde" + "Ta bilde på nytt" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml index 1362b328b..d8ea7954c 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ne/strings.xml @@ -1,11 +1,26 @@ + + - "पूर्ण स्क्रिन क्यामेरामा बदल्नुहोस्" - "बटन अब अगाडिको क्यामेराका लागि हो" - "बटन अब पछाडिको क्यामेराका लागि हो" - "भिडियो रेकर्ड रोक्नुहोस्" - "अगाडिको क्यामेरा प्रयोग गरिँदै" - "पछाडिको क्यामेरा प्रयोग गरिँदै" - "तस्बिर खिच्नुहोस्" + "पूर्ण स्क्रिन क्यामेरामा बदल्नुहोस्" + "क्यामेराको पूर्वावलोकन मोडमा बदल्नुहोस्" + "अगाडिपट्टिको क्यामेरामा बदल्नुहोस्" + "पछाडिपट्टिको क्यामेरामा बदल्नुहोस्" + "तस्बिर खिच्नुहोस्" + "पुन: तस्बिर खिच्नुहोस्" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml index 94f271875..0369fedaa 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-nl/strings.xml @@ -1,11 +1,26 @@ + + - "Overschakelen naar camera op volledig scherm" - "De knop wordt nu gebruikt voor de camera aan de voorzijde" - "De knop wordt nu gebruikt voor de camera aan de achterzijde" - "Video-opname stoppen" - "De camera aan de voorzijde wordt gebruikt" - "De camera aan de achterzijde wordt gebruikt" - "Foto maken" + "Overschakelen naar camera op volledig scherm" + "Overschakelen naar cameravoorbeeld" + "Overschakelen naar camera aan voorzijde" + "Overschakelen naar camera aan achterzijde" + "Foto maken" + "Foto opnieuw maken" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml index bfa58ed61..5e5fb601e 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-no/strings.xml @@ -1,11 +1,26 @@ + + - "Bytt til fullskjermkamera" - "Nå er knappen frontkameraet" - "Nå er knappen det bakre kameraet" - "Slutt å filme" - "Bruker frontkameraet" - "Bruker det bakre kameraet" - "Ta et bilde" + "Bytt til fullskjermkamera" + "Bytt til forhåndsvisning for kamera" + "Bytt til frontkamera" + "Bytt til bakovervendt kamera" + "Ta bilde" + "Ta bilde på nytt" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml index 4296c9804..e1247e071 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pa/strings.xml @@ -1,11 +1,26 @@ + + - "ਬਦਲੀ ਕਰਕੇ ਸੰਪੂਰਨ ਸਕ੍ਰੀਨ ਕੈਮਰਾ \'ਤੇ ਜਾਓ" - "ਬਟਨ ਹੁਣ ਮੂਹਰਲਾ ਕੈਮਰਾ ਹੈ" - "ਬਟਨ ਹੁਣ ਪਿਛਲਾ ਕੈਮਰਾ ਹੈ" - "ਵੀਡੀਓ ਰਿਕਾਰਡ ਕਰਨਾ ਬੰਦ ਕਰੋ" - "ਮੂਹਰਲਾ ਕੈਮਰਾ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ" - "ਪਿਛਲਾ ਕੈਮਰਾ ਵਰਤਿਆ ਜਾ ਰਿਹਾ ਹੈ" - "ਫ਼ੋਟੋ ਖਿੱਚੋ" + "ਬਦਲੀ ਕਰਕੇ ਸੰਪੂਰਨ ਸਕ੍ਰੀਨ ਕੈਮਰੇ \'ਤੇ ਜਾਓ" + "ਬਦਲੀ ਕਰਕੇ ਕੈਮਰਾ ਪੂਰਵ-ਝਲਕ \'ਤੇ ਜਾਓ" + "ਬਦਲੀ ਕਰਕੇ ਮੂਹਰਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ" + "ਬਦਲੀ ਕਰਕੇ ਪਿਛਲੇ ਕੈਮਰੇ \'ਤੇ ਜਾਓ" + "ਫ਼ੋਟੋ ਖਿੱਚੋ" + "ਫ਼ੋਟੋ ਮੁੜ-ਖਿੱਚੋ" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml index 0e03e2d87..b85afa6aa 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pl/strings.xml @@ -1,11 +1,26 @@ + + - "Włącz aparat pełnoekranowy" - "Przycisk włącza teraz przedni aparat" - "Przycisk włącza teraz tylny aparat" - "Zatrzymaj nagrywanie filmu" - "Używany jest przedni aparat" - "Używany jest tylny aparat" - "Zrób zdjęcie" + "Przełącz na aparat pełnoekranowy" + "Przełącz na podgląd aparatu" + "Przełącz na przedni aparat" + "Przełącz na tylny aparat" + "Zrób zdjęcie" + "Zrób nowe zdjęcie" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml index 7c1fa0723..59f457c43 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rBR/strings.xml @@ -1,11 +1,26 @@ + + - "Alternar para câmera em tela cheia" - "O botão agora está na câmera frontal" - "O botão agora está na câmera traseira" - "Parar gravação de vídeo" - "Usando a câmera frontal" - "Usando a câmera traseira" - "Tirar foto" + "Alternar para câmera em tela cheia" + "Alternar para visualização da câmera" + "Alternar para câmera frontal" + "Alternar para câmera traseira" + "Tirar foto" + "Tirar foto novamente" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml index 661b4d943..71f651dcb 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt-rPT/strings.xml @@ -1,11 +1,26 @@ + + - "Mudar para a câmara de ecrã completo" - "O botão é agora utilizado para a câmara frontal" - "O botão é agora utilizado para a câmara posterior" - "Parar a gravação de vídeo" - "A utilizar a câmara frontal" - "A utilizar a câmara posterior" - "Tirar foto" + "Mudar para a câmara de ecrã completo" + "Mudar para a pré-visualização da câmara" + "Mudar para a câmara frontal" + "Mudar para a câmara traseira" + "Tirar foto" + "Tirar nova foto" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml index 7c1fa0723..59f457c43 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-pt/strings.xml @@ -1,11 +1,26 @@ + + - "Alternar para câmera em tela cheia" - "O botão agora está na câmera frontal" - "O botão agora está na câmera traseira" - "Parar gravação de vídeo" - "Usando a câmera frontal" - "Usando a câmera traseira" - "Tirar foto" + "Alternar para câmera em tela cheia" + "Alternar para visualização da câmera" + "Alternar para câmera frontal" + "Alternar para câmera traseira" + "Tirar foto" + "Tirar foto novamente" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml index 98d00502b..f491f2887 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ro/strings.xml @@ -1,11 +1,26 @@ + + - "Comutați la camera pe ecran complet" - "Acum butonul este pentru camera foto frontală." - "Acum butonul este pentru camera foto posterioară." - "Opriți înregistrarea video" - "Este folosită camera foto frontală" - "Este folosită camera foto posterioară" - "Fotografiați" + "Comutați la camera pe ecran complet" + "Comutați la previzualizarea camerei" + "Comutați la camera frontală" + "Comutați la camera posterioară" + "Fotografiați" + "Refaceți fotografia" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml index a4c7206d0..9de3cabab 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ru/strings.xml @@ -1,11 +1,26 @@ + + - "Перейти в полноэкранный режим" - "Сейчас на кнопке написано: Фронтальная камера" - "Сейчас на кнопке написано: Основная камера" - "Остановить запись видео" - "Используется фронтальная камера" - "Используется основная камера" - "Сделать снимок" + "Переключиться в полноэкранный режим" + "Переключиться в режим предварительного просмотра" + "Переключиться на фронтальную камеру" + "Переключиться на основную камеру" + "Сделать снимок" + "Новый снимок" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml index 6cc5eef43..1747d1a37 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-si/strings.xml @@ -1,11 +1,26 @@ + + - "පූර්ණ තිර කැමරාව වෙත මාරුවීම" - "බොත්තම දැන් ඉදිරිපස කැමරාවයි" - "බොත්තම දැන් පිටුපස කැමරාවයි" - "වීඩියෝව පටිගත කිරීම නැවැත්වීම" - "ඉදිරිපස කැමරාව භාවිත කරමින්" - "පසුපස කැමරාව භාවිත කරමින්" - "ඡායාරූපය ගන්න" + "පූර්ණ තිර කැමරාව වෙත මාරුවීම" + "කැමරා පෙරදසුන වෙත මාරුවීම" + "ඉදිරිපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම" + "පසුපසට මුහුණලා ඇති කැමරාව වෙත මාරුවීම" + "ඡායාරූපය ගැනීම" + "ඡායාරූපය නැවත ගැනීම" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml index 916158bcc..a053e2f3b 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sk/strings.xml @@ -1,11 +1,26 @@ + + - "Prepnúť na fotoaparát na celej obrazovke" - "Tlačidlo sa nachádza v polohe Predný fotoaparát" - "Tlačidlo sa nachádza v polohe Zadný fotoaparát" - "Zastaviť zaznamenávanie videa" - "Používa sa predný fotoaparát" - "Používa sa zadný fotoaparát" - "Odfotiť" + "Prepnúť na fotoaparát na celej obrazovke" + "Prepnúť na ukážku z fotoaparátu" + "Prepnúť na predný fotoaparát" + "Prepnúť na zadný fotoaparát" + "Odfotiť" + "Znova odfotiť" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml index ef1fe2029..b50aaaea9 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sl/strings.xml @@ -1,11 +1,26 @@ + + - "Preklopi v celozaslonski način fotoaparata" - "Gumb zdaj upravlja sprednji fotoaparat" - "Gumb zdaj upravlja hrbtni fotoaparat" - "Ustavi snemanje videoposnetka" - "Uporaba fotoaparata spredaj" - "Uporaba fotoaparata zadaj" - "Posnemi fotografijo" + "Preklopi v celozaslonski način fotoaparata" + "Preklopi v predogled fotoaparata" + "Preklopi na fotoaparat na sprednji strani" + "Preklopi na fotoaparat na zadnji strani" + "Posnemi fotografijo" + "Znova posnemi fotografijo" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml index ff8cb8771..4be0317dc 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sq/strings.xml @@ -1,11 +1,26 @@ + + - "Kalo në kamerën me ekran të plotë" - "Butoni tani është kamera e përparme" - "Butoni tani është kamera e pasme" - "Ndalo regjistrimin e videos" - "Po përdor kamerën e përparme" - "Po përdor kamerën e pasme" - "Bëj një fotografi" + "Kalo në kamerën me ekran të plotë" + "Kalo te pamja paraprake e kamerës" + "Kalo te kamera e përparme" + "Kalo te kamera e pasme" + "Bëj një fotografi" + "Bëje përsëri fotografinë" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml index 17150b4f2..4afcbe914 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sr/strings.xml @@ -1,11 +1,26 @@ + + - "Пређите на приказ камере преко целог екрана" - "Дугме сад активира предњу камеру" - "Дугме сад активира задњу камеру" - "Зауставите снимање видеа" - "Користимо предњу камеру" - "Користимо задњу камеру" - "Снимите слику" + "Пребаците на приказ камере преко целог екрана" + "Пребаците на преглед камере" + "Пребаците на предњу камеру" + "Пребаците на задњу камеру" + "Снимите слику" + "Поново снимите слику" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml index 309147913..8bd00ccd9 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sv/strings.xml @@ -1,11 +1,26 @@ + + - "Byt till fullskärmskamera" - "Knappen är nu framåtvänd kamera" - "Knappen är nu bakåtvänd kamera" - "Sluta spela in video" - "Använder främre kamera" - "Använder bakre kamera" - "Ta en bild" + "Växla till helskärmskamera" + "Växla till förhandsgranskning i kameran" + "Växla till den framåtvända kameran" + "Växla till den bakåtvända kameran" + "Ta en bild" + "Ta en ny bild" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml index 8608b75a2..c951ac6a2 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-sw/strings.xml @@ -1,11 +1,26 @@ + + - "Badilisha utumie kamera ya skrini nzima" - "Kitufe hiki sasa ni kamera ya mbele" - "Kitufe hiki sasa ni kamera ya nyuma" - "Acha kurekodi video" - "Inatumia kamera ya mbele" - "Inatumia kamera ya nyuma" - "Piga picha" + "Badili utumie kamera ya skrini nzima" + "Badili utumie onyesha la kuchungulia la kamera" + "Badili utumie kamera ya mbele" + "Badili utumie kamera ya nyuma" + "Piga picha" + "Piga picha tena" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml index 9c42144e8..374cfcfe2 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ta/strings.xml @@ -1,11 +1,26 @@ + + - "முழுத் திரை கேமராவிற்கு மாறும்" - "இப்போது முன்புறக் கேமராவைக் குறிக்கும் பொத்தான்" - "இப்போது பின்புறக் கேமராவைக் குறிக்கும் பொத்தான்" - "வீடியோ ரெக்கார்டு செய்யப்படுவதை நிறுத்தும்" - "முன்பக்கக் கேமராவைப் பயன்படுத்துகிறீர்கள்" - "பின்பக்கக் கேமராவைப் பயன்படுத்துகிறீர்கள்" - "படமெடுக்கும்" + "முழுத் திரை கேமராவிற்கு மாறும் பொத்தான்" + "கேமரா மாதிரிக்காட்சிக்கு மாறும் பொத்தான்" + "முன்பக்க கேமராவிற்கு மாறும் பொத்தான்" + "பின்பக்க கேமராவிற்கு மாறும் பொத்தான்" + "படமெடுக்கும் பொத்தான்" + "மீண்டும் படமெடுக்கும் பொத்தான்" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml index 4587593b5..099fa67a7 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-te/strings.xml @@ -1,11 +1,26 @@ + + - "పూర్తి స్క్రీన్ కెమెరాకు మారుస్తుంది" - "బటన్ ఇప్పుడు ముందువైపు కెమెరాగా పని చేస్తోంది" - "బటన్ ఇప్పుడు వెనుకవైపు కెమెరాగా పని చేస్తోంది" - "వీడియో రికార్డింగ్‌ను ఆపివేస్తుంది" - "ముందు కెమెరాను ఉపయోగిస్తున్నాము" - "వెనుక కెమెరాను ఉపయోగిస్తున్నాము" - "ఫోటో తీస్తుంది" + "పూర్తి స్క్రీన్ కెమెరాకు మారుస్తుంది" + "కెమెరా పరిదృశ్యానికి మారుస్తుంది" + "ముందువైపు కెమెరాకు మారుస్తుంది" + "వెనుకవైపు కెమెరాకు మారుస్తుంది" + "ఫోటో తీస్తుంది" + "ఫోటోను మళ్లీ తీస్తుంది" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml index 9b1150f0e..62c69a3e5 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-th/strings.xml @@ -1,11 +1,26 @@ + + - "สลับไปยังกล้องแบบเต็มหน้าจอ" - "ขณะนี้ปุ่มเป็นกล้องหน้า" - "ขณะนี้ปุ่มเป็นกล้องหลัง" - "หยุดการบันทึกวิดีโอ" - "กำลังใช้กล้องหน้า" - "กำลังใช้กล้องหลัง" - "ถ่ายภาพ" + "เปลี่ยนเป็นกล้องแบบเต็มหน้าจอ" + "เปลี่ยนเป็นการแสดงตัวอย่างจากกล้อง" + "เปลี่ยนเป็นกล้องหน้า" + "เปลี่ยนเป็นกล้องหลัง" + "ถ่ายภาพ" + "ถ่ายภาพอีกครั้ง" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml index 5fd98c14d..2f6fb83c3 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-tl/strings.xml @@ -1,11 +1,26 @@ + + - "Lumilipat sa camera na full screen" - "Ang button ay para na sa camera sa harap" - "Ang button ay para na sa camera sa likod" - "Ihinihinto ang pagre-record ng video" - "Ginagamit ang camera sa harap" - "Ginagamit ang camera sa likuran" - "Kumuha ng larawan" + "Lumipat sa camera na full screen" + "Lumipat sa preview ng camera" + "Lumipat sa camera na nasa harap" + "Lumipat sa camera na nasa likod" + "Kumuha ng larawan" + "Kunang muli" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml index 80b0b940f..da54ac88d 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-tr/strings.xml @@ -1,11 +1,26 @@ + + - "Tam ekran kameraya geçer" - "Düğme artık ön kamera için kullanılıyor" - "Düğme artık arka kamera için kullanılıyor" - "Video kaydını durdurur" - "Ön kamera kullanılıyor" - "Arka kamera kullanılıyor" - "Fotoğraf çeker" + "Tam ekran kameraya geçer" + "Kamera önizlemesine geçer" + "Ön kameraya geçer" + "Arka kameraya geçer" + "Fotoğraf çeker" + "Fotoğrafı yeniden çeker" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml index c2506158f..cea540a9e 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-uk/strings.xml @@ -1,11 +1,26 @@ + + - "Показ зображення з камери на весь екран" - "Зараз це кнопка камери на передній панелі" - "Зараз це кнопка камери на задній панелі" - "Зупинення запису відео" - "Використання фронтальної камери" - "Використання задньої камери" - "Зйомка фото" + "Показ зображення з камери на весь екран" + "Попередній перегляд зображення з камери" + "Перейти до фронтальної камери" + "Перейти до задньої камери" + "Зробити фото" + "Зробити фото ще раз" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml index edd417856..585a55a03 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-ur/strings.xml @@ -1,11 +1,26 @@ + + - "پوری اسکرین کے کیمرہ پر سوئچ کریں" - "بٹن اب فرنٹ کیمرا ہے" - "بٹن اب بیک کیمرا ہے" - "ویڈیو ریکارڈ کرنے کو روکیں" - "فرنٹ کیمرا استعمال ہو رہا ہے" - "بیک کیمرا استعمال ہو رہا ہے" - "تصویر لیں" + "پوری اسکرین کے کیمرہ پر سوئچ کریں" + "کیمرہ پیش منظر پر سوئچ کریں" + "فرنٹ والے کیمرے پر سوئچ کریں" + "عقب والے کیمرے پر سوئچ کریں" + "تصویر لیں" + "دوبارہ تصویر لیں" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml index 037767359..8441d887c 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-uz/strings.xml @@ -1,11 +1,26 @@ + + - "To‘liq ekranli rejimga o‘tish" - "Endi bu old kamera tugmasi" - "Endi bu orqa kamera tugmasi" - "Videoga olishni to‘xtatish" - "Old kameradan foydalanilmoqda" - "Orqa kameradan foydalanilmoqda" - "Suratga olish" + "To‘liq ekranli rejimga o‘tish" + "Oldindan ko‘rish rejimiga o‘tish" + "Old kamerani yoqish" + "Orqa kamerani yoqish" + "Rasmga olish" + "Yangi rasmga olish" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml index 81a0e62c0..054666455 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-vi/strings.xml @@ -1,11 +1,26 @@ + + - "Chuyển sang máy ảnh toàn màn hình" - "Hiện tại, nút ở chế độ máy ảnh mặt trước" - "Hiện tại, nút ở chế độ máy ảnh mặt sau" - "Dừng quay video" - "Đang sử dụng máy ảnh trước" - "Đang sử dụng máy ảnh sau" - "Chụp ảnh" + "Chuyển sang máy ảnh toàn màn hình" + "Chuyển sang chế độ xem trước máy ảnh" + "Chuyển sang máy ảnh mặt trước" + "Chuyển sang máy ảnh mặt sau" + "Chụp ảnh" + "Chụp lại ảnh" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml index 311569c54..24e9c1a63 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rCN/strings.xml @@ -1,11 +1,26 @@ + + - "切换到全屏相机模式" - "点按按钮可切换到前置摄像头" - "点按按钮可切换到后置摄像头" - "停止录制视频" - "正在使用前置摄像头" - "正在使用后置摄像头" - "拍照" + "切换到全屏相机模式" + "切换到相机预览模式" + "切换到前置摄像头" + "切换到后置摄像头" + "拍照" + "重拍照片" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml index 890a18fc0..0310b10e6 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rHK/strings.xml @@ -1,11 +1,26 @@ + + - "切換至全屏攝像" - "按鈕目前為前置鏡頭" - "按鈕目前為後置鏡頭" - "停止錄製影片" - "使用前置鏡頭" - "使用後置鏡頭" - "拍照" + "切換至全螢幕相機" + "切換至相機預覽" + "切換至前置鏡頭" + "切換至後置鏡頭" + "拍照" + "重新拍照" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml index 30fa03bfe..d41ddda25 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zh-rTW/strings.xml @@ -1,11 +1,26 @@ + + - "切換至全螢幕相機" - "按鈕目前設定為前置鏡頭" - "按鈕目前設定為後置鏡頭" - "停止錄影" - "目前使用的是前置鏡頭" - "目前使用的是後置鏡頭" - "拍攝相片" + "切換至全螢幕相機" + "切換至相機預覽畫面" + "切換至前置鏡頭" + "切換至後置鏡頭" + "拍照" + "重新拍照" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml index 33a9284a4..6e147b7f9 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values-zu/strings.xml @@ -1,11 +1,26 @@ + + - "Shintshela kukhamera yesikrini esigcwele" - "Inkinobho manje iyikhamera yangaphambili" - "Inkinobho manje iyikhamera yangemuva" - "Misa ukurekhoda ividiyo" - "Isebenzisa ikhamera yangaphambili" - "Isebenzisa ikhamera yangemuva" - "Thatha isithombe" + "Shintshela kukhamera yesikrini esigcwele" + "Shintshela ekuhloleni kuqala kwekhamera" + "Shintshela kwikhamera yangaphambili" + "Shintshela kwikhamera ebheke emuva" + "Thatha isithombe" + "Thatha kabusha isithombe" diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml b/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml index 09d4a58fd..e3d5c2406 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values/dimens.xml @@ -16,7 +16,7 @@ --> 22dp - 46dp + 48dp 84dp 4dp \ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml b/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml index 999fe8f96..4db79683f 100644 --- a/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml +++ b/java/com/android/dialer/callcomposer/cameraui/res/values/strings.xml @@ -1,17 +1,30 @@ + - Switch to full screen camera + Switch to full screen camera + + Switch to camera preview - Button is now front camera + Switch to front facing camera - Button is now back camera - - Stop recording video - - Using front camera - - Using back camera + Switch to back facing camera - Take photo + Take photo + + Retake photo \ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/proto/call_composer_contact.proto b/java/com/android/dialer/callcomposer/proto/call_composer_contact.proto deleted file mode 100644 index 99766aac5..000000000 --- a/java/com/android/dialer/callcomposer/proto/call_composer_contact.proto +++ /dev/null @@ -1,18 +0,0 @@ -syntax = "proto2"; - -option java_package = "com.android.dialer.callcomposer"; -option java_multiple_files = true; -option optimize_for = LITE_RUNTIME; - -package com.android.dialer.callcomposer; - -message CallComposerContact { - optional fixed64 photo_id = 1; - optional string photo_uri = 2; - optional string contact_uri = 3; - optional string name_or_number = 4; - optional string number = 6; - optional string display_number = 7; - optional string number_label = 8; - optional int32 contact_type = 9; -} diff --git a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml index c3f1102d1..48d6368c2 100644 --- a/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml +++ b/java/com/android/dialer/callcomposer/res/layout/call_composer_activity.xml @@ -15,11 +15,11 @@ ~ limitations under the License --> + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/background" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/call_composer_background_color"> @@ -58,6 +62,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" + android:maxLines="1" + android:ellipsize="end" android:textColor="@color/background_dialer_white" android:textSize="@dimen/call_composer_number_text_size"/> @@ -70,10 +76,22 @@ android:background="@drawable/call_composer_contact_border"/> - + + + + + + + android:background="?android:attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/description_call_composer_camera"/> + android:background="?android:attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/description_call_composer_photo"/> + android:background="?android:attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/description_call_composer_message"/> @@ -70,7 +69,7 @@ android:background="@color/background_dialer_white" android:textCursorDrawable="@drawable/searchedittext_custom_cursor" android:layout_toStartOf="@+id/remaining_characters" - android:inputType="textShortMessage" + android:inputType="textShortMessage|textCapSentences" android:imeOptions="flagNoExtractUi|actionSend"/> "Deel en bel" "prent %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "prent" - "Neem \'n foto" "Kon nie kameraprent laai nie" "Laat toe" "Verleen toegang tot kamera om \'n foto te neem" "Verleen toegang tot media om \'n prent te deel" + "Neem \'n foto" + "Kies \'n foto" + "Stuur \'n boodskap" + "Foto is via Boodskappe gestuur" + "Boodskap is via Boodskappe gestuur" + "Stuur tans prent …" diff --git a/java/com/android/dialer/callcomposer/res/values-am/strings.xml b/java/com/android/dialer/callcomposer/res/values-am/strings.xml index c44249090..b41210953 100644 --- a/java/com/android/dialer/callcomposer/res/values-am/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-am/strings.xml @@ -25,9 +25,14 @@ "ያጋሩ እና ይደውሉ" "ምስል %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "ምስል" - "ፎቶ አንሳ" "የካሜራ ምስልን መጫን አልተቻለም" "ፍቀድ" "ፎቶ ያንሱ፣ ለካሜራ መዳረሻ ይስጡ" "አንድ ምስል ለማጋራት ለማህደረ መረጃ መዳረሻ ይስጡ" + "ፎቶ ያንሱ" + "ፎቶ ይምረጡ" + "መልዕክት ይላኩ" + "ፎቶ በመልዕክቶች በኩል ተልኳል" + "መልዕክት በመልዕክቶች በኩል ተልኳል" + "ምስል በመላክ ላይ…" diff --git a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml index ba43f0fd9..ee811bdd5 100644 --- a/java/com/android/dialer/callcomposer/res/values-ar/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ar/strings.xml @@ -25,9 +25,14 @@ "المشاركة والاتصال" "الصورة %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "صورة" - "التقاط صورة" "يتعذر تحميل صورة الكاميرا" "سماح" "لالتقاط صورة، يجب منح إذن بالدخول إلى الكاميرا" "لمشاركة صورة، يجب منح إذن بالدخول إلى الوسائط" + "التقاط صورة" + "اختيار صورة" + "إرسال رسالة" + "‏صورة مرسلة عبر Messages" + "‏رسالة مرسلة عبر Messages" + "جارٍ إرسال الصورة..." diff --git a/java/com/android/dialer/callcomposer/res/values-az/strings.xml b/java/com/android/dialer/callcomposer/res/values-az/strings.xml index 2f913d9bc..2d1a26c5a 100644 --- a/java/com/android/dialer/callcomposer/res/values-az/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-az/strings.xml @@ -25,9 +25,14 @@ "Paylaşın və zəng edin" "şəkil %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "şəkil" - "Şəkil çəkin" "Kamera şəklini yükləmək olmur" "İcazə verin" "Şəkil çəkmək üçün kameraya giriş icazəsi verin" "Şəkli paylaşmaq üçün Mediaya giriş icazəsi verin" + "Şəkil çəkin" + "Foto seçin" + "Mesaj göndərin" + "Foto Mesajlaşma tətbiqi vasitəsilə göndərildi" + "Mesaj Mesajlaşma tətbiqi vasitəsilə göndərildi" + "Şəkil göndərilir..." diff --git a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml index c357d506f..fbe93d2d5 100644 --- a/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-b+sr+Latn/strings.xml @@ -25,9 +25,14 @@ "Deli i pozovi" "slika, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "slika" - "Slikajte" "Učitavanje slike sa kamere nije uspelo" "Dozvoli" "Odobrite pristup Kameri da biste snimili sliku" "Odobrite pristup Medijima da biste delili sliku" + "Slikajte" + "Izaberite sliku" + "Pošaljite poruku" + "Slika je poslata preko Messages-a" + "Poruka je poslata preko Messages-a" + "Šalje se slika…" diff --git a/java/com/android/dialer/callcomposer/res/values-be/strings.xml b/java/com/android/dialer/callcomposer/res/values-be/strings.xml index bb3244b19..5197f714e 100644 --- a/java/com/android/dialer/callcomposer/res/values-be/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-be/strings.xml @@ -25,9 +25,14 @@ "Абагуліць і выклікаць" "відарыс %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "відарыс" - "Зрабіць фота" "Не ўдалося загрузіць відарыс з камеры" "Дазволіць" "Каб зрабіць фота, адкрыйце доступ да Камеры" "Каб абагуліць відарыс, адкрыйце доступ да медыяфайлаў" + "Зрабіць фота" + "Выбраць фота" + "Адправіць паведамленне" + "Фота адпраўлена праз праграму \"Паведамленні\"" + "Паведамленне адпраўлена праз праграму \"Паведамленні\"" + "Адпраўка відарыса..." diff --git a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml index 1bc05cd8b..7b431ce4e 100644 --- a/java/com/android/dialer/callcomposer/res/values-bg/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-bg/strings.xml @@ -25,9 +25,14 @@ "Споделяне и обаждане" "изображение от %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "изображение" - "Правене на снимка" "Изображението от камерата не можа да се зареди" "Разрешаване" "За да направите снимка, разрешете достъп до Камера" "За да споделите изображение, разрешете достъп до Медии" + "Правене на снимка" + "Избиране на снимка" + "Изпращане на съобщение" + "Снимката е изпратена чрез Messages" + "Съобщението е изпратено чрез Messages" + "Изображението се изпраща…" diff --git a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml index e991b3b34..17559b40c 100644 --- a/java/com/android/dialer/callcomposer/res/values-bn/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-bn/strings.xml @@ -25,9 +25,14 @@ "শেয়ার এবং কল করুন" "ছবি %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "ছবি" - "একটি ফটো তুলুন" "ক্যামেরার ছবি লোড করা গেল না" "অনুমতি দিন" "একটি ফটো নিতে, ক্যামেরাতে অ্যাক্সেস দিন" "কোনো ছবি শেয়ার করতে, মিডিয়াতে অ্যাক্সেস দিন" + "একটি ছবি তুলুন" + "একটি ফটো বেছে নিন" + "একটি বার্তা পাঠান" + "Messages এর সাহায্যে ফটো পাঠানো হয়েছে" + "Messages-এর সাহায্যে বার্তা পাঠানো হয়েছে" + "ফটো পাঠানো হচ্ছে…" diff --git a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml index 7d0b8d26f..d486f94e1 100644 --- a/java/com/android/dialer/callcomposer/res/values-bs/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-bs/strings.xml @@ -25,9 +25,14 @@ "Podijeli i pozovi" "slika %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "slika" - "Snimi fotografiju" "Nije moguće učitati sliku s kamere" "Dozvoli" "Da snimite fotografiju, dajte pristup Kameri" "Da podijelite sliku, dozvolite pristup Medijima" + "Uslikaj" + "Odaberi fotografiju" + "Pošalji poruku" + "Fotografija je poslana putem aplikacije Messages" + "Poruka je poslana putem aplikacije Messages" + "Slanje slike…" diff --git a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml index 4fa52ad63..6b77b1836 100644 --- a/java/com/android/dialer/callcomposer/res/values-ca/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ca/strings.xml @@ -25,9 +25,14 @@ "Comparteix i truca" "imatge del dia %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "imatge" - "Fes una foto" "No s\'ha pogut carregar la imatge de la càmera" "Permet" - "Per fer una foto, dóna accés a la càmera" - "Per compartir una imatge, dóna accés al contingut multimèdia" + "Per fer una foto, dona accés a la càmera" + "Per compartir una imatge, dona accés al contingut multimèdia" + "Fes una foto" + "Tria una foto" + "Envia un missatge" + "Foto enviada mitjançant Missatges" + "Missatge enviat mitjançant Missatges" + "S\'està enviant la imatge…" diff --git a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml index 93ae0c124..916953733 100644 --- a/java/com/android/dialer/callcomposer/res/values-cs/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-cs/strings.xml @@ -25,9 +25,14 @@ "Sdílet a zavolat" "obrázek %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "obrázek" - "Fotit" "Obrázek z fotoaparátu se nepodařilo načíst" "Povolit" "Chcete-li pořídit fotku, povolte přístup k fotoaparátu" "Pokud chcete sdílet fotku, povolte přístup k mediálním souborům" + "Vyfotit" + "Vybrat fotku" + "Poslat zprávu" + "Fotka poslaná v aplikaci Zprávy" + "Zpráva poslaná v aplikaci Zprávy" + "Odesílání obrázku…" diff --git a/java/com/android/dialer/callcomposer/res/values-da/strings.xml b/java/com/android/dialer/callcomposer/res/values-da/strings.xml index b1e3e6db9..f720d5973 100644 --- a/java/com/android/dialer/callcomposer/res/values-da/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-da/strings.xml @@ -25,9 +25,14 @@ "Del og ring" "billede %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "billede" - "Tag et billede" "Kamerabilledet kan ikke indlæses" "Tillad" "Du skal give adgang til kameraet for at tage et billede" "Du skal give adgang til medier for at dele et billede" + "Tag et billede" + "Vælg et billede" + "Send en sms" + "Fotoet blev sendt via Beskeder" + "Beskeden blev sendt via Beskeder" + "Billedet sendes…" diff --git a/java/com/android/dialer/callcomposer/res/values-de/strings.xml b/java/com/android/dialer/callcomposer/res/values-de/strings.xml index 9b9c13add..3f3767e6f 100644 --- a/java/com/android/dialer/callcomposer/res/values-de/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-de/strings.xml @@ -25,9 +25,14 @@ "Teilen und anrufen" "Bild: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "Bild" - "Foto aufnehmen" "Kamerabild konnte nicht geladen werden" "Zulassen" "Um ein Foto aufzunehmen, musst du den Zugriff auf die Kamera erlauben." "Um ein Bild zu teilen, musst du den Zugriff auf deine Medien erlauben." + "Bild aufnehmen" + "Foto auswählen" + "Nachricht senden" + "Foto über Messages gesendet" + "Nachricht über Messages gesendet." + "Bild wird gesendet…" diff --git a/java/com/android/dialer/callcomposer/res/values-el/strings.xml b/java/com/android/dialer/callcomposer/res/values-el/strings.xml index 45fce843f..9a8ed5d96 100644 --- a/java/com/android/dialer/callcomposer/res/values-el/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-el/strings.xml @@ -25,9 +25,14 @@ "Κοινοποίηση και κλήση" "εικόνα %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "εικόνα" - "Λήψη φωτογραφίας" "Δεν ήταν δυνατή η φόρτωση της εικόνας φωτογραφικής μηχανής" "Να επιτρέπεται" "Για να τραβήξετε μια φωτογραφία, παραχωρήστε πρόσβαση στην κάμερα" "Για να μοιραστείτε μια εικόνα, παραχωρήστε πρόσβαση στα πολυμέσα" + "Λήψη φωτογραφίας" + "Επιλογή φωτογραφίας" + "Αποστολή μηνύματος" + "Η φωτογραφία στάλθηκε μέσω του Messages" + "Το μήνυμα στάλθηκε μέσω του Messages" + "Αποστολή εικόνας…" diff --git a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml index c34cbbd1b..4e4edcfa9 100644 --- a/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-en-rAU/strings.xml @@ -25,9 +25,14 @@ "Share and call" "image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "image" - "Take a photo" "Couldn\'t load camera image" "Allow" "To take a photo, give access to Camera" "To share an image, give access to Media" + "Take a picture" + "Choose a photo" + "Sending a message" + "Photo sent via Messages" + "Message sent via Messages" + "Sending image…" diff --git a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml index c34cbbd1b..4e4edcfa9 100644 --- a/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-en-rGB/strings.xml @@ -25,9 +25,14 @@ "Share and call" "image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "image" - "Take a photo" "Couldn\'t load camera image" "Allow" "To take a photo, give access to Camera" "To share an image, give access to Media" + "Take a picture" + "Choose a photo" + "Sending a message" + "Photo sent via Messages" + "Message sent via Messages" + "Sending image…" diff --git a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml index c34cbbd1b..4e4edcfa9 100644 --- a/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-en-rIN/strings.xml @@ -25,9 +25,14 @@ "Share and call" "image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "image" - "Take a photo" "Couldn\'t load camera image" "Allow" "To take a photo, give access to Camera" "To share an image, give access to Media" + "Take a picture" + "Choose a photo" + "Sending a message" + "Photo sent via Messages" + "Message sent via Messages" + "Sending image…" diff --git a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml index 797d00124..f06f5f03e 100644 --- a/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-es-rUS/strings.xml @@ -25,9 +25,14 @@ "Compartir y llamar" "imagen del %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "imagen" - "Tomar una foto" "No se pudo cargar la imagen de la cámara" "Permitir" "Para tomar una foto, permite el acceso a la cámara" "Para compartir una imagen, permite el acceso al contenido multimedia" + "Tomar una foto" + "Elegir una foto" + "Enviar un mensaje" + "Foto enviada por Mensajes" + "Mensaje de texto enviado por Mensajes" + "Enviando imagen…" diff --git a/java/com/android/dialer/callcomposer/res/values-es/strings.xml b/java/com/android/dialer/callcomposer/res/values-es/strings.xml index 8a4e7d690..a8b919502 100644 --- a/java/com/android/dialer/callcomposer/res/values-es/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-es/strings.xml @@ -25,9 +25,14 @@ "Compartir y llamar" "imagen del %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "imagen" - "Hacer fotos" "No se ha podido cargar la imagen de la cámara" "Permitir" "Para hacer una foto, permite el acceso a la cámara" "Para compartir una imagen, permite el acceso al contenido multimedia" + "Hacer una foto" + "Elegir una foto" + "Enviar un mensaje" + "Foto enviada a través de Mensajes" + "Mensaje enviado a través de Mensajes" + "Enviando la imagen…" diff --git a/java/com/android/dialer/callcomposer/res/values-et/strings.xml b/java/com/android/dialer/callcomposer/res/values-et/strings.xml index 17b77a255..24548fb23 100644 --- a/java/com/android/dialer/callcomposer/res/values-et/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-et/strings.xml @@ -25,9 +25,14 @@ "Jaga ja helista" "pilt: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "pilt" - "Foto jäädvustamine" "Kaamera kujutist ei õnnestunud laadida" "Luba" "Foto jäädvustamiseks lubage juurdepääs kaamerale" "Pildi jagamiseks lubage juurdepääs meediale" + "Pildistamine" + "Foto valimine" + "Sõnumi saatmine" + "Foto saadeti rakenduse Messages kaudu" + "Sõnum saadeti rakenduse Messages kaudu" + "Kujutise saatmine …" diff --git a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml index be2aba7ca..012c62c31 100644 --- a/java/com/android/dialer/callcomposer/res/values-eu/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-eu/strings.xml @@ -25,9 +25,14 @@ "Partekatu eta deitu" "irudiaren data: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "irudia" - "Atera argazki bat" "Ezin izan da kargatu kamerako irudia" "Baimendu" "Argazkiak ateratzeko, eman kamera atzitzeko baimena" "Irudiak partekatzeko, eman multimedia-edukirako sarbidea" + "Atera argazki bat" + "Aukeratu argazki bat" + "Bidali mezu bat" + "Mezuak aplikazioaren bidez bidali da argazkia" + "Mezuak aplikazioaren bidez bidali da mezua" + "Irudia bidaltzen…" diff --git a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml index 9d588b232..eb97796cd 100644 --- a/java/com/android/dialer/callcomposer/res/values-fa/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fa/strings.xml @@ -25,9 +25,14 @@ "اشتراک‌گذاری و تماس" "تصویر %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "تصویر" - "عکس گرفتن" "تصویر دوربین بار نشد" "مجاز است" "برای عکس گرفتن، به دوربین اجازه دسترسی بدهید" "برای اشتراک‌گذاری تصویر، به رسانه اجازه دسترسی بدهید" + "عکس گرفتن" + "انتخاب عکس" + "ارسال پیام" + "عکس ارسال‌شده ازطریق «پیام‌ها»" + "پیام ارسال‌شده ازطریق «پیام‌ها»" + "درحال ارسال تصویر…" diff --git a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml index 98821bc6f..892bd969a 100644 --- a/java/com/android/dialer/callcomposer/res/values-fi/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fi/strings.xml @@ -25,9 +25,14 @@ "Jaa ja soita" "kuva (%1$tB %1$te %1$tY %1$tl %1$tM %1$tp)" "kuva" - "Ota kuva" "Kamerakuvan lataus epäonnistui." "Salli" "Jos haluat ottaa valokuvan, salli kameran käyttö." "Jos haluat jakaa kuvan, salli kuvien käyttö." + "Ota kuva" + "Valitse kuva" + "Lähetä viesti" + "Kuva lähetettiin Messages-sovelluksen kautta" + "Viesti lähetettiin Messages-sovelluksen kautta" + "Lähetetään kuvaa…" diff --git a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml index 29c001d6c..000d6eb7a 100644 --- a/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fr-rCA/strings.xml @@ -25,9 +25,14 @@ "Partager et appeler" "image : %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "image" - "Prendre une photo" "Impossible de charger l\'image de l\'appareil photo" "Autoriser" "Pour prendre une photo, autorisez l\'accès à l\'appareil photo" "Pour partager une image, autorisez l\'accès au contenu multimédia" + "Prendre une photo" + "Choisir une photo" + "Envoyer un message" + "Photo envoyée au moyen de l\'application Messages" + "Message envoyé au moyen de l\'application Messages" + "Envoi de l\'image en cours…" diff --git a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml index ab562898a..40b89a367 100644 --- a/java/com/android/dialer/callcomposer/res/values-fr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-fr/strings.xml @@ -25,9 +25,14 @@ "Partager et appeler" "image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "image" - "Prendre une photo" "Impossible de charger l\'image de la caméra" "Autoriser" "Pour prendre une photo, accordez l\'accès à l\'appareil photo." "Pour partager une image, accordez l\'accès aux fichiers multimédia." + "Prendre une photo" + "Choisir une photo" + "Envoyer un message" + "Photo envoyée via l\'application Messages" + "Message envoyé via l\'application Messages" + "Envoi de l\'image…" diff --git a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml index 5c867683f..55bf5aa3c 100644 --- a/java/com/android/dialer/callcomposer/res/values-gl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-gl/strings.xml @@ -25,9 +25,14 @@ "Compartir e chamar" "Imaxe do %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "Imaxe" - "Tirar unha foto" "Non se puido cargar a imaxe da cámara" "Permitir" "Para sacar unha foto, concede permiso de acceso á cámara" "Para compartir unha imaxe, concede permiso de acceso aos ficheiros multimedia" + "Tira unha foto" + "Escolle unha foto" + "Envía unha mensaxe" + "Foto enviada a través de Mensaxes" + "Mensaxe enviada a través de Mensaxes" + "Enviando imaxe…" diff --git a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml index c948d2ea5..13f4c843d 100644 --- a/java/com/android/dialer/callcomposer/res/values-gu/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-gu/strings.xml @@ -25,9 +25,14 @@ "શેર કરો અને કૉલ કરો" "છબી %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "છબી" - "એક ફોટો લો" "કૅમેરા છબી લોડ કરી શકાઈ નથી" "મંજૂરી આપો" "ફોટો લેવા માટે, કૅમેરાની ઍક્સેસ આપો" "છબી શેર કરવા, મીડિયાની ઍક્સેસ આપો" + "એક ચિત્ર લો" + "ફોટો પસંદ કરો" + "એક સંદેશ મોકલો" + "Messages મારફતે ફોટો મોકલ્યો" + "Messages મારફતે સંદેશ મોકલ્યો" + "છબી મોકલી રહ્યાં છીએ..." diff --git a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml index 6cfdb1664..5d39d0306 100644 --- a/java/com/android/dialer/callcomposer/res/values-hi/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-hi/strings.xml @@ -25,9 +25,14 @@ "साझा करें और कॉल करें" "चित्र %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "चित्र" - "कोई फ़ोटो लें" "कैमरे का चित्र लोड नहीं किया जा सका" "अनुमति दें" "फ़ोटो लेने के लिए, कैमरे की ऐक्सेस दें" "चित्र साझा करने के लिए, मीडिया की ऐक्सेस दें" + "चित्र लें" + "एक फ़ोटो चुनें" + "संदेश भेजें" + "संदेश ऐप्लिकेशन के ज़रिए फ़ोटो भेजा गया" + "संदेश ऐप्लिकेशन के ज़रिए संदेश भेजा गया" + "चित्र भेजा जा रहा है…" diff --git a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml index 613f1f473..551438845 100644 --- a/java/com/android/dialer/callcomposer/res/values-hr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-hr/strings.xml @@ -25,9 +25,14 @@ "Dijeli i pozovi" "slika %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "slika" - "Snimi fotografiju" "Slika se ne može učitati" "Omogući" "Da biste snimili fotografiju, dopustite pristup Fotoaparatu" "Za dijeljenje slike dopustite pristup Medijima" + "Snimi fotografiju" + "Odaberi fotografiju" + "Pošalji poruku" + "Fotografija poslana putem Poruka" + "Poruka poslana putem Poruka" + "Slanje slike..." diff --git a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml index 451fcb4eb..caf7577b1 100644 --- a/java/com/android/dialer/callcomposer/res/values-hu/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-hu/strings.xml @@ -25,9 +25,14 @@ "Megosztás és hívás" "kép: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "kép" - "Fotó készítése" "Nem lehetett betölteni a kamera képét" "Engedélyezés" "Fotó készítéséhez adjon hozzáférést a fényképezőgéphez" "Kép megosztásához adjon hozzáférést a médiafájlokhoz" + "Kép készítése" + "Fotó kiválasztása" + "Üzenet küldése" + "Fotó elküldve a Messages alkalmazásban" + "Üzenet elküldve a Messages alkalmazásban" + "Kép küldése…" diff --git a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml index 43793d6e2..ae7e6add3 100644 --- a/java/com/android/dialer/callcomposer/res/values-hy/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-hy/strings.xml @@ -25,9 +25,14 @@ "Կիսվել և զանգել" "պատկեր %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "պատկեր" - "Լուսանկարել" "Չհաջողվեց բեռնել տեսախցիկի պատկերը" "Թույլատրել" "Լուսանկարելու համար տրամադրեք Խցիկն օգտագործելու հնարավորություն" "Որևէ պատկերով կիսվելու համար տրամադրեք մեդիանյութերն օգտագործելու հնարավորություն" + "Լուսանկարել" + "Ընտրել լուսանկար" + "Ուղարկել հաղորդագրություն" + "Լուսանկարն ուղարկվել է Messages-ի միջոցով" + "Հաղորդագրությունն ուղարկվել է Messages-ի միջոցով" + "Պատկերի ուղարկում…" diff --git a/java/com/android/dialer/callcomposer/res/values-in/strings.xml b/java/com/android/dialer/callcomposer/res/values-in/strings.xml index 4f9081011..3d3cba70c 100644 --- a/java/com/android/dialer/callcomposer/res/values-in/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-in/strings.xml @@ -25,9 +25,14 @@ "Bagikan dan telepon" "gambar %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "gambar" - "Mengambil foto" "Tidak dapat memuat gambar kamera" "Izinkan" "Untuk mengambil foto, berikan akses ke Kamera" "Untuk membagikan gambar, berikan akses ke Media" + "Jepret" + "Pilih foto" + "Mengirim pesan" + "Foto dikirim lewat Message" + "Pesan dikirim lewat Message" + "Mengirim gambar…" diff --git a/java/com/android/dialer/callcomposer/res/values-is/strings.xml b/java/com/android/dialer/callcomposer/res/values-is/strings.xml index 5ca30503d..ae3e12364 100644 --- a/java/com/android/dialer/callcomposer/res/values-is/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-is/strings.xml @@ -25,9 +25,14 @@ "Deila og hringja" "mynd %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "mynd" - "Taka mynd" "Ekki var hægt að hlaða mynd frá myndavél" "Leyfa" "Til að taka mynd skaltu veita myndavélinni aðgang" "Til að deila mynd skaltu veita margmiðlunarefni aðgang" + "Taka mynd" + "Velja mynd" + "Senda skilaboð" + "Mynd send með Messages" + "Skilaboð send með Messages" + "Sendir mynd…" diff --git a/java/com/android/dialer/callcomposer/res/values-it/strings.xml b/java/com/android/dialer/callcomposer/res/values-it/strings.xml index 40c893f84..f06b0d85d 100644 --- a/java/com/android/dialer/callcomposer/res/values-it/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-it/strings.xml @@ -25,9 +25,14 @@ "Condividi e chiama" "immagine: %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "immagine" - "Scatta una foto" "Impossibile caricare l\'immagine della fotocamera" "Consenti" "Per poter scattare una foto devi concedere l\'accesso alla fotocamera" "Per condividere un\'immagine, devi concedere l\'accesso ai contenuti multimediali" + "Scatta una foto" + "Scegli una foto" + "Invia un messaggio" + "Foto inviata tramite Messaggi" + "Messaggio inviato tramite Messaggi" + "Invio dell\'immagine…" diff --git a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml index e1557dc04..8ed808b26 100644 --- a/java/com/android/dialer/callcomposer/res/values-iw/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-iw/strings.xml @@ -25,9 +25,14 @@ "שתף והתקשר" "תמונה %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "תמונה" - "צלם תמונה" "לא ניתן לטעון את התמונה מהמצלמה" "אפשר" "כדי שתוכל לצלם תמונות עליך להעניק לאפליקציה גישה למצלמה" "כדי שתוכל לשתף תמונות עליך להעניק לאפליקציה גישה למדיה" + "צילום תמונה" + "בחירת תמונה" + "שליחת הודעה" + "‏התמונה נשלחה דרך אפליקציית Messages" + "‏ההודעה נשלחה דרך אפליקציית Messages" + "התמונה נשלחת…" diff --git a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml index bc8161db6..61ad0ce82 100644 --- a/java/com/android/dialer/callcomposer/res/values-ja/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ja/strings.xml @@ -25,9 +25,14 @@ "共有して発信" "画像（%1$tB %1$te %1$tY %1$tl %1$tM %1$tp）" "画像" - "写真を撮る" "カメラ内の画像を読み込めませんでした" "許可" "写真を撮るには、まずカメラへのアクセスを許可してください" "画像を共有するには、まずメディアへのアクセスを許可してください" + "画像を撮影します" + "写真を選択します" + "メッセージを送信します" + "Android メッセージで写真が送信されました" + "Android メッセージでメッセージが送信されました" + "画像を送信しています…" diff --git a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml index 79f39ab81..4d65fa327 100644 --- a/java/com/android/dialer/callcomposer/res/values-ka/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ka/strings.xml @@ -25,9 +25,14 @@ "გაზიარება და დარეკვა" "სურათი, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "სურათი" - "ფოტოს გადაღება" "კამერის სურათი ვერ ჩაიტვირთა" "ნების დართვა" "ფოტოს გადასაღებად მიეცით კამერაზე წვდომა" "სურათის გასაზიარებლად მიეცით მედიაზე წვდომა" + "სურათის გადაღება" + "ფოტოს არჩევა" + "შეტყობინების გაგზავნა" + "ფოტო გაიგზავნა Messages აპიდან" + "შეტყობინება გაიგზავნა Messages აპიდან" + "მიმდინარეობს სურათის გაგზავნა…" diff --git a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml index ffe045f95..80f9caa5b 100644 --- a/java/com/android/dialer/callcomposer/res/values-kk/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-kk/strings.xml @@ -25,9 +25,14 @@ "Бөлісу және қоңырау шалу" "сурет, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "сурет" - "Суретке түсіру" "Камера суреті жүктелмеді" "Рұқсат беру" "Суретке түсіру үшін камераға кіруге рұқсат беріңіз" "Суретті жіберу үшін медиафайлға кіруге рұқсат беріңіз" + "Суретке түсіру" + "Суретті таңдау" + "Хабар жіберу" + "Сурет Messages арқылы жіберілді" + "Хабар Messages арқылы жіберілді" + "Сурет жіберілуде..." diff --git a/java/com/android/dialer/callcomposer/res/values-km/strings.xml b/java/com/android/dialer/callcomposer/res/values-km/strings.xml index 4444bceeb..b16534c47 100644 --- a/java/com/android/dialer/callcomposer/res/values-km/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-km/strings.xml @@ -25,9 +25,14 @@ "ចែករំលែក និង​ហៅ​ទូរសព្ទ" "រូបភាព %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "រូបភាព" - "ថតរូប" "មិន​អាច​ផ្ទុក​រូបភាព​​​ពី​កាមេរ៉ា​បាន​ទេ" "អនុញ្ញាត" "ដើម្បីថតរូប សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​កាមេរ៉ា" "ដើម្បីចែករំលែករូបភាព សូមអនុញ្ញាត​ឲ្យចូលប្រើប្រាស់​មេឌៀ" + "ថតរូប" + "ជ្រើសរើស​រូបថត" + "ផ្ញើសារ" + "រូបថត​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages" + "សារ​ដែល​បាន​ផ្ញើ​តាមរយៈ Messages" + "កំពុង​ផ្ញើ​រូបភាព..." diff --git a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml index f50bdcce4..59de5e7b6 100644 --- a/java/com/android/dialer/callcomposer/res/values-kn/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-kn/strings.xml @@ -25,9 +25,14 @@ "ಹಂಚಿಕೊಳ್ಳಿ ಮತ್ತು ಕರೆ ಮಾಡಿ" "ಚಿತ್ರ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "ಚಿತ್ರ" - "ಫೋಟೋ ತೆಗೆದುಕೊಳ್ಳಿ" "ಕ್ಯಾಮರಾ ಚಿತ್ರವನ್ನು ಲೋಡ್ ಮಾಡಲಾಗಲಿಲ್ಲ" "ಅನುಮತಿಸಿ" "ಫೋಟೋ ತೆಗೆಯಲು, ಕ್ಯಾಮರಾಗೆ ಪ್ರವೇಶ ನೀಡಿ" "ಚಿತ್ರವನ್ನು ಹಂಚಿಕೊಳ್ಳಲು, ಮಾಧ್ಯಮಕ್ಕೆ ಪ್ರವೇಶವನ್ನು ನೀಡಿ" + "ಚಿತ್ರ ತೆಗೆದುಕೊಳ್ಳಿ" + "ಒಂದು ಫೋಟೋ ಆಯ್ಕೆಮಾಡಿ" + "ಸಂದೇಶ ಕಳುಹಿಸಿ" + "ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಫೋಟೋ" + "ಸಂದೇಶಗಳ ಮೂಲಕ ಕಳುಹಿಸಲಾದ ಸಂದೇಶ" + "ಚಿತ್ರ ಕಳುಹಿಸಲಾಗುತ್ತಿದೆ…" diff --git a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml index d710afa3e..7df4a703a 100644 --- a/java/com/android/dialer/callcomposer/res/values-ko/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ko/strings.xml @@ -25,9 +25,14 @@ "공유 및 전화 걸기" "이미지 %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "이미지" - "사진 찍기" "카메라 이미지를 로드할 수 없습니다." "허용" "사진을 찍으려면 카메라에 액세스할 수 있도록 허용하세요." "이미지를 공유하려면 미디어에 액세스할 수 있도록 허용하세요." + "사진 촬영" + "사진 선택" + "메시지 보내기" + "메시지를 통해 전송된 사진" + "메시지를 통해 전송된 메시지" + "이미지 전송 중…" diff --git a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml index c7c053303..1a8a395a4 100644 --- a/java/com/android/dialer/callcomposer/res/values-ky/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ky/strings.xml @@ -25,9 +25,14 @@ "Бөлүшүү жана чалуу" "сүрөт, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "сүрөт" - "Сүрөткө тартуу" "Камерадан сүрөт жүктөлгөн жок" "Уруксат берүү" "Сүрөткө тартуу үчүн, колдонмого камераны пайдаланууга уруксат бериңиз" "Сүрөттү бөлүшүү үчүн мультимедиага кирүүгө уруксат бериңиз" + "Сүрөткө тартуу" + "Сүрөттү тандоо" + "Билдирүү жөнөтүү" + "Сүрөт Android жазышуулары колдонмосу аркылуу жөнөтүлдү" + "Билдирүү Android жазышуулары колдонмосу аркылуу жөнөтүлдү" + "Сүрөт жөнөтүлүүдө..." diff --git a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml index 9c4946000..42ae0f1cb 100644 --- a/java/com/android/dialer/callcomposer/res/values-lo/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-lo/strings.xml @@ -25,9 +25,14 @@ "ແບ່ງປັນ ແລະ ໂທ" "ຮູບ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "ຮູບ" - "ຖ່າຍຮູບ" "ບໍ່ສາມາດໂຫລດຮູບຈາກກ້ອງໄດ້" "ອະນຸຍາດ" "ເພື່ອຖ່າຍຮູບ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາກ້ອງຖ່າຍຮູບກ່ອນ" "ເພື່ອແບ່ງປັນຮູບພາບໃດໜຶ່ງ, ໃຫ້ອະນຸຍາດການເຂົ້າຫາມີເດຍກ່ອນ" + "ຖ່າຍຮູບ" + "ເລືອກຮູບພາບ..." + "ສົ່ງຂໍ້ຄວາມ" + "ສົ່ງຮູບຜ່ານ Messages ແລ້ວ" + "ສົ່ງຮູບຜ່ານ Messages ແລ້ວ" + "ກຳລັງສົ່ງຮູບພາບ..." diff --git a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml index 0b011f7d7..59112d3cf 100644 --- a/java/com/android/dialer/callcomposer/res/values-lt/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-lt/strings.xml @@ -25,9 +25,14 @@ "Bendrinti ir skambinti" "vaizdas (%1$tB %1$te %1$tY %1$tl %1$tM %1$tp)" "vaizdas" - "Fotografuoti" "Nepavyko įkelti fotoaparato vaizdo" "Leisti" "Kad galėtumėte fotografuoti, leiskite pasiekti fotoaparatą" "Kad galėtumėte bendrinti vaizdą, leiskite pasiekti mediją" + "Fotografuoti" + "Pasirinkti nuotrauką" + "Siųsti pranešimą" + "Nuotrauka išsiųsta naudojant „Messages“" + "Pranešimas išsiųstas naudojant „Messages“" + "Siunčiamas vaizdas..." diff --git a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml index 8593ca01d..8aa954096 100644 --- a/java/com/android/dialer/callcomposer/res/values-lv/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-lv/strings.xml @@ -25,9 +25,14 @@ "Kopīgot un zvanīt" "attēls, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "attēls" - "Uzņemt fotoattēlu" "Nevarēja ielādēt kameras attēlu." "Atļaut" "Lai uzņemtu fotoattēlu, piešķiriet piekļuvi kamerai." "Lai kopīgotu attēlu, piešķiriet piekļuvi multivides saturam." + "Uzņemt attēlu" + "Izvēlēties fotoattēlu" + "Sūtīt ziņojumu" + "Fotoattēls nosūtīts, izmantojot lietotni Ziņojumi" + "Ziņojums nosūtīts, izmantojot lietotni Ziņojumi" + "Tiek sūtīts attēls…" diff --git a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml index 40d7c622c..126b44c53 100644 --- a/java/com/android/dialer/callcomposer/res/values-mk/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-mk/strings.xml @@ -25,9 +25,14 @@ "Сподели и повикај" "слика од %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "слика" - "Фотографирајте" "Не можеше да се вчита слика од камерата" "Дозволете" "За да фотографирате, дозволете пристап до „Камера“" "За да споделите слика, дозволете пристап до Media" + "Фотографирајте" + "Изберете фотографија" + "Испратете порака" + "Фотографијата е испратена преку Messages" + "Пораката е испратена преку Messages" + "Се испраќа слика…" diff --git a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml index 0a0833d9d..67175cc1e 100644 --- a/java/com/android/dialer/callcomposer/res/values-ml/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ml/strings.xml @@ -25,9 +25,14 @@ "പങ്കിടുക, കോൾ ചെയ്യുക" "ചിത്രം %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "ചിത്രം" - "ഒരു ഫോട്ടോ എടുക്കുക" "ക്യാമറ ചിത്രം ലോഡുചെയ്യാനായില്ല" "അനുവദിക്കുക" "ഫോട്ടോ എടുക്കുന്നതിന്, ക്യാമറയ്ക്ക് ആക്സസ് നൽകുക" "ഫോട്ടോ പങ്കിടുന്നതിന്, മീഡിയയ്ക്ക് ആക്സസ് നൽകുക" + "ഒരു ചിത്രമെടുക്കുക" + "ഒരു ഫോട്ടോ തിരഞ്ഞെടുക്കുക" + "ഒരു സന്ദേശം അയയ്‌ക്കുക" + "മെസേജ് വഴി ഫോട്ടോ അയച്ചു" + "മെസേജ് വഴി സന്ദേശം അയച്ചു" + "ചിത്രം അയയ്‌ക്കുന്നു..." diff --git a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml index 54a292d9a..1de1f1152 100644 --- a/java/com/android/dialer/callcomposer/res/values-mn/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-mn/strings.xml @@ -25,9 +25,14 @@ "Хуваалцаад залгах" "зураг %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "зураг" - "Зураг авах" "Камерын дүрсийг ачаалж чадсангүй" "Зөвшөөрөх" "Зураг авахын тулд камерт хандах зөвшөөрөл олгох шаардлагатай" "Зураг хуваалцахын тулд медиад хандах зөвшөөрөл олгох шаардлагатай" + "Зураг авах" + "Зураг сонгоно уу" + "Зурвас илгээх" + "Зургийг Зурвасаар дамжуулан илгээсэн" + "Зурвасыг Зурвасаар дамжуулан илгээсэн" + "Зураг илгээж байна..." diff --git a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml index 7f8c5d7ef..40a794d52 100644 --- a/java/com/android/dialer/callcomposer/res/values-mr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-mr/strings.xml @@ -25,9 +25,14 @@ "सामायिक करा आणि कॉल करा" "प्रतिमा %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "प्रतिमा" - "एक फोटो घ्या" "कॅमेरा प्रतिमा लोड करणे शक्य झाले नाही" "अनुमती द्या" "एक फोटो घेण्यासाठी, कॅमेर्‍यामध्ये प्रवेश द्या" "एखादी प्रतिमा सामायिक करण्यासाठी मीडियामध्ये प्रवेश द्या" + "एक फोटो घ्या" + "फोटो निवडा" + "एक संदेश पाठवा" + "Messages द्वारे फोटो पाठविला" + "Messages द्वारे संदेश पाठविला" + "इमेज पाठवत आहे…" diff --git a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml index 0927cde9f..1f37e154a 100644 --- a/java/com/android/dialer/callcomposer/res/values-ms/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ms/strings.xml @@ -25,9 +25,14 @@ "Kongsi dan hubungi" "imej %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "imej" - "Ambil foto" "Tidak dapat memuatkan imej kamera" "Benarkan" "Untuk mengambil foto, berikan akses kepada Kamera" "Untuk berkongsi imej, berikan akses kepada Media" + "Ambil gambar" + "Pilih foto" + "Hantar mesej" + "Photo dihantar melalui Mesej" + "Mesej dihantar melalui Mesej" + "Menghantar imej…" diff --git a/java/com/android/dialer/callcomposer/res/values-my/strings.xml b/java/com/android/dialer/callcomposer/res/values-my/strings.xml index 6608e9a4f..5f8de84b8 100644 --- a/java/com/android/dialer/callcomposer/res/values-my/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-my/strings.xml @@ -25,9 +25,14 @@ "မျှဝေပြီး ခေါ်ဆိုရန်" "ပုံ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "ပုံ" - "ဓာတ်ပုံတစ်ပုံ ရိုက်ရန်" "ကင်မရာမှပုံကို မရယူနိုင်ပါ" "ခွင့်ပြုရန်" "ဓာတ်ပုံရိုက်ရန် ကင်မရာသို့ ဝင်သုံးခွင့်ပေးပါ" "ပုံမျှဝေရန် မီဒီယာသို့ ဝင်သုံးခွင့်ပေးပါ" + "ဓာတ်ပုံတစ်ပုံ ရိုက်ရန်" + "ဓာတ်ပုံတစ်ပုံ ရွေးရန်" + "မက်ဆေ့ဂျ်ပို့ရန်" + "မက်ဆေ့ဂျ်များမှတစ်ဆင့် ဓာတ်ပုံပို့ပြီးပါပြီ" + "မက်ဆေ့ဂျ်များမှတစ်ဆင့် မက်ဆေ့ဂျ်ပို့ပြီးပါပြီ" + "ပုံပို့နေသည်…" diff --git a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml index 693e7fd51..c9e1296e9 100644 --- a/java/com/android/dialer/callcomposer/res/values-nb/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-nb/strings.xml @@ -25,9 +25,14 @@ "Del og ring" "bilde %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "bilde" - "Ta et bilde" "Kunne ikke laste inn kamerabilde" "Tillat" "Gi tilgang til kameraet for å ta bilder" "Gi Media tilgang for å dele bilder" + "Ta et bilde" + "Velg et bilde" + "Send en melding" + "Bildet er sendt via Messages" + "Meldingen er sendt via Messages" + "Sender bildet …" diff --git a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml index 37dd68107..71d40a645 100644 --- a/java/com/android/dialer/callcomposer/res/values-ne/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ne/strings.xml @@ -25,9 +25,14 @@ "आदान-प्रदान र कल गर्नुहोस्" "छवि %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "छवि" - "एउटा तस्बिर खिच्नुहोस्" "क्यामेराको छवि लोड गर्न सकिएन" "अनुमति दिनुहोस्" "तस्बिर खिच्न, क्यामेरामाथि पहुँच दिनुहोस्" "छवि आदान-प्रदान गर्न, मिडियामाथि पहुँच दिनुहोस्" + "तस्बिर खिच्नुहोस्" + "तस्बिर छनौट गर्नुहोस्" + "सन्देश पठाउनुहोस्" + "Messages मार्फत पठाइएको तस्बिर" + "Messages मार्फत पठाइएको सन्देश" + "छवि पठाइँदै…" diff --git a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml index ebb00c470..59c09a39a 100644 --- a/java/com/android/dialer/callcomposer/res/values-nl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-nl/strings.xml @@ -25,9 +25,14 @@ "Delen en bellen" "afbeelding van %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "afbeelding" - "Een foto maken" "Kan camera-afbeelding niet laden" "Toestaan" "Verleen toegang tot Camera om een foto te maken" "Verleen toegang tot Media om een afbeelding te delen" + "Een foto nemen" + "Een foto kiezen" + "Een bericht verzenden" + "Foto verzonden via Berichten" + "Bericht verzonden via Berichten" + "Afbeelding verzenden…" diff --git a/java/com/android/dialer/callcomposer/res/values-no/strings.xml b/java/com/android/dialer/callcomposer/res/values-no/strings.xml index 693e7fd51..c9e1296e9 100644 --- a/java/com/android/dialer/callcomposer/res/values-no/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-no/strings.xml @@ -25,9 +25,14 @@ "Del og ring" "bilde %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "bilde" - "Ta et bilde" "Kunne ikke laste inn kamerabilde" "Tillat" "Gi tilgang til kameraet for å ta bilder" "Gi Media tilgang for å dele bilder" + "Ta et bilde" + "Velg et bilde" + "Send en melding" + "Bildet er sendt via Messages" + "Meldingen er sendt via Messages" + "Sender bildet …" diff --git a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml index bf6be36fe..0a51a63dc 100644 --- a/java/com/android/dialer/callcomposer/res/values-pa/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pa/strings.xml @@ -25,9 +25,14 @@ "ਸਾਂਝਾ ਕਰੋ ਅਤੇ ਕਾਲ ਕਰੋ" "ਚਿੱਤਰ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "ਚਿੱਤਰ" - "ਕੋਈ ਫ਼ੋਟੋ ਖਿੱਚੋ" "ਕੈਮਰਾ ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ" "ਇਜਾਜ਼ਤ ਦਿਓ" "ਫ਼ੋਟੋ ਖਿੱਚਣ ਲਈ, ਕੈਮਰੇ ਤੱਕ ਪਹੁੰਚ ਦਿਓ" "ਚਿੱਤਰ ਸਾਂਝਾ ਕਰਨ ਲਈ, ਮੀਡੀਆ ਤੱਕ ਪਹੁੰਚ ਦਿਓ" + "ਇੱਕ ਤਸਵੀਰ ਖਿੱਚੋ" + "ਇੱਕ ਫ਼ੋਟੋ ਚੁਣੋ" + "ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ" + "ਫ਼ੋਟੋ &quot;ਸੁਨੇਹੇ&quot; ਐਪ ਰਾਹੀਂ ਭੇਜੀ ਗਈ" + "ਸੁਨੇਹਾ &quot;ਸੁਨੇਹੇ&quot; ਐਪ ਰਾਹੀਂ ਭੇਜਿਆ ਗਿਆ" + "ਚਿੱਤਰ ਭੇਜਿਆ ਜਾ ਰਿਹਾ ਹੈ…" diff --git a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml index ba74628f0..130dd8c12 100644 --- a/java/com/android/dialer/callcomposer/res/values-pl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pl/strings.xml @@ -25,9 +25,14 @@ "Udostępnij i zadzwoń" "zdjęcie – %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "zdjęcie" - "Robienie zdjęć" "Nie udało się wczytać zdjęcia z aparatu" "Zezwól" "Aby zrobić zdjęcie, zezwól na dostęp do aparatu" "Aby udostępnić zdjęcie, zezwól na dostęp do multimediów" + "Zrób zdjęcie" + "Wybierz zdjęcie" + "Wyślij wiadomość" + "Zdjęcie zostało wysłane przez Wiadomości" + "Tekst został wysłany przez Wiadomości" + "Wysyłam obraz…" diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml index 9feee7d9d..a090d155d 100644 --- a/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pt-rBR/strings.xml @@ -25,9 +25,14 @@ "Compartilhar e ligar" "imagem de %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "imagem" - "Tirar uma foto" "Falha ao carregar a imagem da câmera" "Permitir" "Para tirar uma foto, permita o acesso à câmera" "Para compartilhar uma imagem, permita o acesso à mídia" + "Tirar uma foto" + "Escolher uma foto" + "Enviar uma mensagem" + "Foto enviada pelo Mensagens" + "Mensagem enviada pelo Mensagens" + "Enviando imagem..." diff --git a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml index 8b12d652f..34b3a96a1 100644 --- a/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pt-rPT/strings.xml @@ -25,9 +25,14 @@ "Partilhar e ligar" "imagem de %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "imagem" - "Tirar uma foto" "Não foi possível carregar a imagem da câmara" "Permitir" "Para tirar uma foto, conceda acesso à Câmara" "Para partilhar uma imagem, conceda acesso a Multimédia" + "Tirar uma foto" + "Selecionar foto" + "Enviar uma mensagem" + "Foto enviada através da aplicação Mensagens" + "Mensagem enviada através da aplicação Mensagens" + "A enviar imagem…" diff --git a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml index 9feee7d9d..a090d155d 100644 --- a/java/com/android/dialer/callcomposer/res/values-pt/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-pt/strings.xml @@ -25,9 +25,14 @@ "Compartilhar e ligar" "imagem de %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "imagem" - "Tirar uma foto" "Falha ao carregar a imagem da câmera" "Permitir" "Para tirar uma foto, permita o acesso à câmera" "Para compartilhar uma imagem, permita o acesso à mídia" + "Tirar uma foto" + "Escolher uma foto" + "Enviar uma mensagem" + "Foto enviada pelo Mensagens" + "Mensagem enviada pelo Mensagens" + "Enviando imagem..." diff --git a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml index 744ef80fb..29de0ed6a 100644 --- a/java/com/android/dialer/callcomposer/res/values-ro/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ro/strings.xml @@ -25,9 +25,14 @@ "Trimiteți și apelați" "imagine din %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "imagine" - "Fotografiați" "Nu s-a putut încărca imaginea de la camera foto" "Permiteți" "Pentru a fotografia, permiteți accesul la Camera foto" "Pentru a trimite o imagine, permiteți accesul la Conținutul media" + "Fotografiați" + "Alegeți o fotografie" + "Trimiteți un mesaj" + "Fotografie trimisă prin Messages" + "Mesaj trimis prin Messages" + "Se trimite imaginea…" diff --git a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml index 1abbc4996..ffdfb29a2 100644 --- a/java/com/android/dialer/callcomposer/res/values-ru/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ru/strings.xml @@ -25,9 +25,14 @@ "Поделиться и позвонить" "изображение, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "изображение" - "Перейти в режим фото" "Не удалось загрузить изображение с камеры" "Разрешить" "Чтобы сделать снимок, предоставьте доступ к камере" "Чтобы поделиться изображением, предоставьте доступ к мультимедиа" + "Сделать фото" + "Выбрать фото" + "Отправить сообщение" + "Фото отправлено через Android Сообщения" + "Сообщение отправлено через Android Сообщения" + "Отправка изображения…" diff --git a/java/com/android/dialer/callcomposer/res/values-si/strings.xml b/java/com/android/dialer/callcomposer/res/values-si/strings.xml index 48a447416..cdea197a6 100644 --- a/java/com/android/dialer/callcomposer/res/values-si/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-si/strings.xml @@ -25,9 +25,14 @@ "බෙදා ගෙන අමතන්න" "රූපය %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "රූපය" - "ඡායාරූපයක් ගන්න" "කැමරා රූපය පූරණය කළ නොහැකි විය" "ඉඩ දෙන්න" "ඡායාරූපයක් ගැනීමට, කැමරාවට ප්‍රවේශය දෙන්න" "රූපයක් බෙදා ගැනීමට, මාධ්‍යයට ප්‍රවේශය දෙන්න" + "පින්තුරයක් ගැනීම" + "ඡායාරූපයක් තේරීම" + "පණිවිඩයක් යැවීම" + "Messages හරහා ඡායාරූපය යවන ලදී" + "Messages හරහා පණිවිඩය යවන ලදී" + "රූපය යවමින්..." diff --git a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml index 2fb13c1af..e478e6391 100644 --- a/java/com/android/dialer/callcomposer/res/values-sk/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sk/strings.xml @@ -25,9 +25,14 @@ "Zdieľať a volať" "obrázok – %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "obrázok" - "Odfotiť" "Obrázok z fotoaparátu sa nepodarilo načítať" "Povoliť" "Ak chcete fotiť, povoľte prístup k fotoaparátu" "Ak chcete zdieľať obrázok, povoľte prístup k médiám" + "Odfotiť" + "Vybrať fotku" + "Odoslať správu" + "Fotka bola odoslaná prostredníctvom Správ" + "Správa bola odoslaná prostredníctvom Správ" + "Odosiela sa obrázok…" diff --git a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml index 34126ab36..85dd23d99 100644 --- a/java/com/android/dialer/callcomposer/res/values-sl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sl/strings.xml @@ -25,9 +25,14 @@ "Klic s skupno rabo" "slika %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "slika" - "Fotografiranje" "Slike fotoaparata ni bilo mogoče naložiti" "Dovoli" "Če želite posneti fotografijo, omogočite dostop do fotoaparata" "Če želite deliti sliko z drugimi, omogočite dostop do predstavnosti" + "Posnemi fotografijo" + "Izberi fotografijo" + "Pošlji sporočilo" + "Fotografija je bila poslana prek aplikacije Messages" + "Sporočilo je bila poslano prek aplikacije Messages" + "Pošiljanje slike …" diff --git a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml index 35dd197c9..aba7c8153 100644 --- a/java/com/android/dialer/callcomposer/res/values-sq/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sq/strings.xml @@ -25,9 +25,14 @@ "Ndaj dhe telefono" "imazh %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "imazh" - "Bëj një fotografi" "Imazhi i kamerës nuk mund të ngarkohej" "Lejo" "Për të shkrepur një fotografi, jep qasjen te Kamera" "Për të ndarë një imazh, jep qasjen te Media" + "Bëj një fotografi" + "Zgjidh një fotografi" + "Dërgo një mesazh" + "Fotografia u dërgua nëpërmjet \"Mesazheve\"" + "Mesazhi u dërgua nëpërmjet \"Mesazheve\"" + "Imazhi po dërgohet..." diff --git a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml index 4fa34ed40..ead04fce6 100644 --- a/java/com/android/dialer/callcomposer/res/values-sr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sr/strings.xml @@ -25,9 +25,14 @@ "Дели и позови" "слика, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "слика" - "Сликајте" "Учитавање слике са камере није успело" "Дозволи" "Одобрите приступ Камери да бисте снимили слику" "Одобрите приступ Медијима да бисте делили слику" + "Сликајте" + "Изаберите слику" + "Пошаљите поруку" + "Слика је послата преко Messages-а" + "Порука је послата преко Messages-а" + "Шаље се слика…" diff --git a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml index de33531db..0e37b296d 100644 --- a/java/com/android/dialer/callcomposer/res/values-sv/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sv/strings.xml @@ -25,9 +25,14 @@ "Dela och ring" "bild den %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "bild" - "Ta ett foto" "Det gick inte att läsa in kamerabild" "Tillåt" "Bevilja åtkomst till Kamera om du vill ta ett foto" "Bevilja åtkomst till Media om du vill dela en bild" + "Ta en bild" + "Välj ett foto" + "Skicka ett meddelande" + "Fotot har skickats via Messages" + "Meddelandet har skickats via Messages" + "Skickar bild …" diff --git a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml index e99fd06e4..03a7eaca5 100644 --- a/java/com/android/dialer/callcomposer/res/values-sw/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-sw/strings.xml @@ -25,9 +25,14 @@ "Shiriki na upige simu" "picha %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "picha" - "Piga picha" "Imeshindwa kupakia picha ya kamera" "Ruhusu" "Ruhusu programu ifikie Kamera ili uweze kupiga picha" - "Ruhusu programu ifikie Midia ili uweze kushiriki picha" + "Ruhusu programu ifikie hifadhi ili uweze kushiriki picha" + "Piga picha" + "Chagua picha" + "Tuma ujumbe" + "Picha imetumwa kupitia Programu ya Messages" + "Ujumbe umetumwa kupitia Programu ya Messages" + "Inatuma picha…" diff --git a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml index 407814889..e006ff9c1 100644 --- a/java/com/android/dialer/callcomposer/res/values-ta/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ta/strings.xml @@ -25,9 +25,14 @@ "பகிர்ந்து அழை" "படம், %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "படம்" - "படமெடுக்கும்" "கேமரா படத்தை ஏற்ற முடியவில்லை" "அனுமதி" "படமெடுக்க, கேமராவிற்கு அணுகல் வழங்கவும்" "படத்தைப் பகிர, மீடியாவிற்கு அணுகல் வழங்கவும்" + "படமெடுக்கவும்" + "புகைப்படத்தைத் தேர்வு செய்யும்" + "செய்தியை அனுப்பும்" + "மெசேஜஸ் மூலம் படம் அனுப்பப்பட்டது" + "மெசேஜஸ் மூலம் செய்தி அனுப்பப்பட்டது" + "படத்தை அனுப்புகிறது…" diff --git a/java/com/android/dialer/callcomposer/res/values-te/strings.xml b/java/com/android/dialer/callcomposer/res/values-te/strings.xml index 101429c16..b3f46663e 100644 --- a/java/com/android/dialer/callcomposer/res/values-te/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-te/strings.xml @@ -25,9 +25,14 @@ "భాగస్వా. చేసి, కాల్ చేయి" "చిత్రం %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "చిత్రం" - "ఫోటో తీస్తుంది" "కెమెరా చిత్రాన్ని లోడ్ చేయడం సాధ్యపడలేదు" "అనుమతించు" "ఫోటోను తీయడానికి, కెమెరాకు ప్రాప్యతను అందించండి" "చిత్రాన్ని భాగస్వామ్యం చేయడానికి, మీడియాకు ప్రాప్యతను అందించండి" + "చిత్రాన్ని తీస్తుంది" + "ఫోటోను ఎంచుకోండి" + "సందేశాన్ని పంపుతుంది" + "సందేశాల అనువర్తనం ద్వారా ఫోటోను పంపాము" + "సందేశాల అనువర్తనం ద్వారా సందేశాన్ని పంపాము" + "చిత్రాన్ని పంపుతోంది…" diff --git a/java/com/android/dialer/callcomposer/res/values-th/strings.xml b/java/com/android/dialer/callcomposer/res/values-th/strings.xml index a004d33f5..125a24b58 100644 --- a/java/com/android/dialer/callcomposer/res/values-th/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-th/strings.xml @@ -25,9 +25,14 @@ "แชร์และโทร" "รูปภาพเมื่อวันที่ %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "รูปภาพ" - "ถ่ายภาพ" "ไม่สามารถโหลดภาพจากกล้องได้" "อนุญาต" "หากต้องการถ่ายภาพ โปรดให้สิทธิ์การเข้าถึงกล้อง" "หากต้องการแชร์รูปภาพ โปรดให้สิทธิ์การเข้าถึงสื่อ" + "ถ่ายภาพ" + "เลือกรูปภาพ" + "ส่งข้อความ" + "ส่งรูปภาพผ่าน Messages แล้ว" + "ส่งข้อความผ่าน Messages แล้ว" + "กำลังส่งรูปภาพ..." diff --git a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml index e902a2fef..7e7dac607 100644 --- a/java/com/android/dialer/callcomposer/res/values-tl/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-tl/strings.xml @@ -25,9 +25,14 @@ "Ibahagi at tumawag" "larawan %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "larawan" - "Kumuha ng isang larawan" "Hindi mai-load ang larawan ng camera" "Payagan" "Upang kumuha ng larawan, magbigay ng access sa Camera" "Upang magbahagi ng imahe, magbigay ng access sa Media" + "Kumuha ng larawan" + "Pumili ng larawan" + "Magpadala ng mensahe" + "Larawang ipinadala sa pamamagitan ng Messages" + "Mensaheng ipinadala sa pamamagitan ng Messages" + "Ipinapadala ang larawan…" diff --git a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml index 0dfe8b213..99523d574 100644 --- a/java/com/android/dialer/callcomposer/res/values-tr/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-tr/strings.xml @@ -25,9 +25,14 @@ "Paylaş ve telefon et" "resim %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "resim" - "Fotoğraf çeker" "Kamera görüntüsü yüklenemedi" "İzin ver" "Fotoğraf çekmek için Kamera\'ya erişim izni verin" "Resim paylaşmak için Medya\'ya erişim izni verin" + "Resim çeker" + "Fotoğraf seçilmesini sağlar" + "Mesaj gönderir" + "Fotoğraf, Mesajlar uygulaması üzerinden gönderildi" + "Mesaj, Mesajlar uygulaması üzerinden gönderildi" + "Resim gönderiliyor…" diff --git a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml index 20898c315..fa57d3dea 100644 --- a/java/com/android/dialer/callcomposer/res/values-uk/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-uk/strings.xml @@ -25,9 +25,14 @@ "Надіслати й зателефонувати" "зображення %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "зображення" - "Зйомка фото" "Не вдалося завантажити зображення з камери" "Дозволити" "Щоб сфотографувати, надайте доступ до камери" "Щоб поділитися зображенням, надайте доступ до медіа-вмісту" + "Зробити знімок" + "Вибрати фотографію" + "Надіслати повідомлення" + "Фотографію надіслано через додаток Повідомлення" + "Текст надіслано через додаток Повідомлення" + "Надсилання зображення…" diff --git a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml index 92a2f8c0e..2677bd22b 100644 --- a/java/com/android/dialer/callcomposer/res/values-ur/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-ur/strings.xml @@ -25,9 +25,14 @@ "اشتراک کریں اور کال کریں" "تصویر %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "تصویر" - "ایک تصویر لیں" "کیمرے کی تصویر لوڈ نہیں ہو سکی" "اجازت دیں" "تصویر لینے کیلئے کیمرا کو رسائی دیں" "تصویر کا اشتراک کرنے کیلئے میڈیا تک رسائی دیں" + "تصویر لیں" + "ایک تصویر چنیں" + "پیغام بھیجیں" + "تصویر پیغامات کے ذریعے بھیجی گئی" + "پیغام پیغامات کے ذریعے بھیجا گیا" + "تصویر بھیجی جا رہی ہے…" diff --git a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml index 845016226..79152b544 100644 --- a/java/com/android/dialer/callcomposer/res/values-uz/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-uz/strings.xml @@ -25,9 +25,14 @@ "Ulashish va chaqirish" "tasvir, %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "tasvir" - "Surat rejimiga o‘tish" "Kamera orqali olingan suratni yuklab bo‘lmadi" "Ruxsat berish" "Suratga olish uchun kameraga kirshga ruxsat bering" "Rasmni baham ko‘rish uchun media fayllarga kirishga ruxsat bering" + "Rasmga olish" + "Rasm tanlash" + "Xabar yuborish" + "Rasm Android Xabarlar orqali yuborildi" + "Xabar Android Xabarlar orqali yuborildi" + "Tasvir yuborilmoqda…" diff --git a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml index 2d060bd01..f065f17d0 100644 --- a/java/com/android/dialer/callcomposer/res/values-vi/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-vi/strings.xml @@ -25,9 +25,14 @@ "Chia sẻ và gọi" "hình ảnh %1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "hình ảnh" - "Chụp ảnh" "Không thể tải hình ảnh trong máy ảnh" "Cho phép" "Để chụp ảnh, hãy cấp quyền truy cập vào Máy ảnh" "Để chia sẻ ảnh, hãy cấp quyền truy cập vào Phương tiện" + "Chụp ảnh" + "Chọn ảnh" + "Gửi tin nhắn" + "Đã gửi ảnh qua Messages" + "Đã gửi tin nhắn qua Messages" + "Đang gửi hình ảnh..." diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml index a6c2f9014..0bb323fe8 100644 --- a/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-zh-rCN/strings.xml @@ -25,9 +25,14 @@ "分享并拨打电话" "图片（%1$tB %1$te %1$tY %1$tl %1$tM %1$tp）" "图片" - "拍摄照片" "无法加载相机图片" "允许" "要拍摄照片，请授予相机使用权限" "要分享图片，请授予媒体访问权限" + "拍照" + "选择一张照片" + "发送信息" + "已通过“信息”应用发送照片" + "已通过“信息”应用发送短信" + "正在发送图片…" diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml index 8f66f4f18..5b70bbcbc 100644 --- a/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-zh-rHK/strings.xml @@ -25,9 +25,14 @@ "分享並通話" "圖片：%1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "圖片" - "拍照" "無法載入相機圖片" "允許" "如要拍照，請授予「相機」存取權" "如要分享圖片，請授予「媒體」存取權" + "拍照" + "選擇相片" + "傳送訊息" + "已透過「訊息」傳送相片" + "已透過「訊息」傳送訊息" + "正在傳送圖片…" diff --git a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml index a3af5af79..3f1eaf092 100644 --- a/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-zh-rTW/strings.xml @@ -25,9 +25,14 @@ "分享及撥號" "圖片：%1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "圖片" - "拍攝相片" "無法載入相機圖片" "允許" "如要拍照，請授予相機存取權" "如要分享圖片，請授予媒體存取權" + "拍攝相片" + "選擇相片" + "傳送訊息" + "透過訊息應用程式傳送的相片" + "透過訊息應用程式傳送的訊息" + "正在傳送圖片…" diff --git a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml index 2cce6883c..682febc57 100644 --- a/java/com/android/dialer/callcomposer/res/values-zu/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values-zu/strings.xml @@ -25,9 +25,14 @@ "Yabelana uphinde ushaye" "isithombe sangomhla ka-%1$tB %1$te %1$tY %1$tl %1$tM %1$tp" "isithombe" - "Thatha isithombe" "Ayikwazanga ukulayisha isithombe sekhamera" "Vumela" "Ukuze uthathe isithombe, nika ukufinyelela kukhamera" "Ukuze wabelane ngesithombe, nika ukufinyelela kumidiya" + "Thatha isithombe" + "Khetha isithombe" + "Thumela umlayezo" + "Isithombe sithunyelwe ngemilayezo" + "Umlayezo uthunyelwe ngemilayezo" + "Ithumela isithombe..." diff --git a/java/com/android/dialer/callcomposer/res/values/colors.xml b/java/com/android/dialer/callcomposer/res/values/colors.xml index 89e55b79a..8393c555f 100644 --- a/java/com/android/dialer/callcomposer/res/values/colors.xml +++ b/java/com/android/dialer/callcomposer/res/values/colors.xml @@ -20,5 +20,4 @@ #12000000 #00BC35 #607D8B - #ECEFF1 \ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/res/values/dimens.xml b/java/com/android/dialer/callcomposer/res/values/dimens.xml index d55540077..f4c2c3bef 100644 --- a/java/com/android/dialer/callcomposer/res/values/dimens.xml +++ b/java/com/android/dialer/callcomposer/res/values/dimens.xml @@ -15,15 +15,15 @@ ~ limitations under the License --> - 306dp + 292dp 2dp - 116dp - 58dp - 58dp - 18dp - 32sp + 112dp + 56dp + 56dp + 16dp + 28sp 16sp 2dp @@ -32,9 +32,7 @@ 48dp - 18dp 16sp - 8dp 4dp @@ -56,4 +54,6 @@ 8dp 16dp 48dp + + 108dp \ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/res/values/strings.xml b/java/com/android/dialer/callcomposer/res/values/strings.xml index cc7762b64..f01e90811 100644 --- a/java/com/android/dialer/callcomposer/res/values/strings.xml +++ b/java/com/android/dialer/callcomposer/res/values/strings.xml @@ -31,8 +31,6 @@ image %1$tB %1$te %1$tY %1$tl %1$tM %1$tp image - - Take a photo Couldn\'t load camera image @@ -41,4 +39,19 @@ To take a photo, give access to Camera To share an image, give access to Media + + Take a picture + + Choose a photo + + Send a message + + Photo sent via Messages + + Message sent via Messages + + Sending image\u2026 \ No newline at end of file diff --git a/java/com/android/dialer/callcomposer/res/values/styles.xml b/java/com/android/dialer/callcomposer/res/values/styles.xml index 29ac4ddaa..a03ee4894 100644 --- a/java/com/android/dialer/callcomposer/res/values/styles.xml +++ b/java/com/android/dialer/callcomposer/res/values/styles.xml @@ -15,7 +15,7 @@ ~ limitations under the License --> - diff --git a/java/com/android/dialer/callcomposer/util/BitmapResizer.java b/java/com/android/dialer/callcomposer/util/BitmapResizer.java index 658462def..84ada51d8 100644 --- a/java/com/android/dialer/callcomposer/util/BitmapResizer.java +++ b/java/com/android/dialer/callcomposer/util/BitmapResizer.java @@ -17,6 +17,7 @@ package com.android.dialer.callcomposer.util; import android.graphics.Bitmap; +import android.graphics.Matrix; import android.support.annotation.VisibleForTesting; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; @@ -28,40 +29,44 @@ public final class BitmapResizer { /** * Returns a bitmap that is a resized version of the parameter image. The image will only be * resized down and sized to be appropriate for an enriched call. + * + * @param image to be resized + * @param rotation degrees to rotate the image clockwise + * @return resized image */ - public static Bitmap resizeForEnrichedCalling(Bitmap image) { + public static Bitmap resizeForEnrichedCalling(Bitmap image, int rotation) { Assert.isWorkerThread(); int width = image.getWidth(); int height = image.getHeight(); + Matrix matrix = new Matrix(); + matrix.postRotate(rotation); + LogUtil.i( "BitmapResizer.resizeForEnrichedCalling", "starting height: %d, width: %d", height, width); if (width <= MAX_OUTPUT_RESOLUTION && height <= MAX_OUTPUT_RESOLUTION) { LogUtil.i("BitmapResizer.resizeForEnrichedCalling", "no resizing needed"); - return image; + return Bitmap.createBitmap(image, 0, 0, width, height, matrix, true); } + float ratio = 1; if (width > height) { // landscape - float ratio = width / (float) MAX_OUTPUT_RESOLUTION; - width = MAX_OUTPUT_RESOLUTION; - height = (int) (height / ratio); - } else if (height > width) { - // portrait - float ratio = height / (float) MAX_OUTPUT_RESOLUTION; - height = MAX_OUTPUT_RESOLUTION; - width = (int) (width / ratio); + ratio = MAX_OUTPUT_RESOLUTION / (float) width; } else { - // square - height = MAX_OUTPUT_RESOLUTION; - width = MAX_OUTPUT_RESOLUTION; + // portrait & square + ratio = MAX_OUTPUT_RESOLUTION / (float) height; } LogUtil.i( - "BitmapResizer.resizeForEnrichedCalling", "ending height: %d, width: %d", height, width); + "BitmapResizer.resizeForEnrichedCalling", + "ending height: %f, width: %f", + height * ratio, + width * ratio); - return Bitmap.createScaledBitmap(image, width, height, true); + matrix.postScale(ratio, ratio); + return Bitmap.createBitmap(image, 0, 0, width, height, matrix, true); } } -- cgit v1.2.3