diff options
48 files changed, 226 insertions, 33 deletions
diff --git a/api/current.xml b/api/current.xml index 88d7b6a7631d..504dab410eee 100644 --- a/api/current.xml +++ b/api/current.xml @@ -39747,14 +39747,14 @@ type="int" transient="false" volatile="false" - value="10" + value="12" static="true" final="true" deprecated="not deprecated" visibility="public" > </field> -<field name="STATE_AUDIO_DISCONNECTED" +<field name="STATE_AUDIO_CONNECTING" type="int" transient="false" volatile="false" @@ -39765,6 +39765,17 @@ visibility="public" > </field> +<field name="STATE_AUDIO_DISCONNECTED" + type="int" + transient="false" + volatile="false" + value="10" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="VENDOR_SPECIFIC_HEADSET_EVENT_COMPANY_ID_CATEGORY" type="java.lang.String" transient="false" diff --git a/core/java/android/bluetooth/BluetoothHeadset.java b/core/java/android/bluetooth/BluetoothHeadset.java index f63a5c5c344b..d5b004201001 100644 --- a/core/java/android/bluetooth/BluetoothHeadset.java +++ b/core/java/android/bluetooth/BluetoothHeadset.java @@ -184,29 +184,29 @@ public final class BluetoothHeadset implements BluetoothProfile { "android.bluetooth.headset.intent.category.companyid"; /** - * Headset state when SCO audio is connected + * Headset state when SCO audio is not connected * This state can be one of * {@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} of * {@link #ACTION_AUDIO_STATE_CHANGED} intent. */ - public static final int STATE_AUDIO_CONNECTED = 10; + public static final int STATE_AUDIO_DISCONNECTED = 10; /** * Headset state when SCO audio is connecting * This state can be one of * {@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} of * {@link #ACTION_AUDIO_STATE_CHANGED} intent. - * @hide */ - public static final int STATE_AUDIO_CONNECTING = 12; + public static final int STATE_AUDIO_CONNECTING = 11; /** - * Headset state when SCO audio is not connected + * Headset state when SCO audio is connected * This state can be one of * {@link #EXTRA_STATE} or {@link #EXTRA_PREVIOUS_STATE} of * {@link #ACTION_AUDIO_STATE_CHANGED} intent. */ - public static final int STATE_AUDIO_DISCONNECTED = 11; + public static final int STATE_AUDIO_CONNECTED = 12; + private Context mContext; private ServiceListener mServiceListener; @@ -377,11 +377,15 @@ public final class BluetoothHeadset implements BluetoothProfile { * audio connection. * * <p> Users can listen to {@link #ACTION_AUDIO_STATE_CHANGED}. - * {@link #EXTRA_STATE} will be set to {@link #STATE_AUDIO_CONNECTED} - * when the audio connection is established, - * and to {@link #STATE_AUDIO_DISCONNECTED} in case of failure. + * If this function returns true, this intent will be broadcasted with + * {@link #EXTRA_STATE} set to {@link #STATE_AUDIO_CONNECTING}. * - * <p>Requires {@link android.Manifest.permission#BLUETOOTH} + * <p> {@link #EXTRA_STATE} will transition from + * {@link #STATE_AUDIO_CONNECTING} to {@link #STATE_AUDIO_CONNECTED} when + * audio connection is established and to {@link #STATE_AUDIO_DISCONNECTED} + * in case of failure to establish the audio connection. + * + * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission. * * @param device Bluetooth headset * @return false if there is no headset connected of if the diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 3838a02d1caa..acefe5db2153 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParserException; import android.R; import android.content.ClipData; +import android.content.ClipData.Item; import android.content.ClipboardManager; import android.content.Context; import android.content.pm.PackageManager; @@ -88,6 +89,7 @@ import android.util.Log; import android.util.TypedValue; import android.view.ActionMode; import android.view.ContextMenu; +import android.view.DragEvent; import android.view.Gravity; import android.view.HapticFeedbackConstants; import android.view.KeyEvent; @@ -6731,10 +6733,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener mMovement.onTakeFocus(this, (Spannable) mText, direction); } - if (mSelectAllOnFocus) { - Selection.setSelection((Spannable) mText, 0, mText.length()); - } - // The DecorView does not have focus when the 'Done' ExtractEditText button is // pressed. Since it is the ViewRoot's mView, it requests focus before // ExtractEditText clears focus, which gives focus to the ExtractEditText. @@ -6753,6 +6751,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener */ Selection.setSelection((Spannable) mText, selStart, selEnd); } + + if (mSelectAllOnFocus) { + Selection.setSelection((Spannable) mText, 0, mText.length()); + } + mTouchFocusSelected = true; } @@ -7029,12 +7032,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener || windowParams.type > WindowManager.LayoutParams.LAST_SUB_WINDOW; } - // TODO Add an extra android:cursorController flag to disable the controller? - if (windowSupportsHandles && mCursorVisible && mLayout != null) { + if (windowSupportsHandles && isTextEditable() && mCursorVisible && mLayout != null) { if (mInsertionPointCursorController == null) { mInsertionPointCursorController = new InsertionPointCursorController(); } } else { + hideInsertionPointCursorController(); mInsertionPointCursorController = null; } @@ -7044,7 +7047,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener } } else { // Stop selection mode if the controller becomes unavailable. - stopSelectionActionMode(); + if (mSelectionModifierCursorController != null) { + stopSelectionActionMode(); + } mSelectionModifierCursorController = null; } } @@ -7053,7 +7058,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * @return True iff this TextView contains a text that can be edited. */ private boolean isTextEditable() { - return mText instanceof Editable && onCheckIsTextEditor(); + return mText instanceof Editable && onCheckIsTextEditor() && isEnabled(); } /** @@ -7684,13 +7689,53 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return packRangeInLong(min, max); } + private DragThumbnailBuilder getTextThumbnailBuilder(CharSequence text) { + TextView thumbnail = (TextView) inflate(mContext, + com.android.internal.R.layout.text_drag_thumbnail, null); + + if (thumbnail == null) { + throw new IllegalArgumentException("Unable to inflate text drag thumbnail"); + } + + if (text.length() > DRAG_THUMBNAIL_MAX_TEXT_LENGTH) { + text = text.subSequence(0, DRAG_THUMBNAIL_MAX_TEXT_LENGTH); + } + thumbnail.setText(text); + thumbnail.setTextColor(getTextColors()); + + thumbnail.setTextAppearance(mContext, R.styleable.Theme_textAppearanceLarge); + thumbnail.setGravity(Gravity.CENTER); + + thumbnail.setLayoutParams(new LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT)); + + final int size = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED); + thumbnail.measure(size, size); + + thumbnail.layout(0, 0, thumbnail.getMeasuredWidth(), thumbnail.getMeasuredHeight()); + thumbnail.invalidate(); + return new DragThumbnailBuilder(thumbnail); + } + @Override public boolean performLongClick() { if (super.performLongClick()) { mEatTouchRelease = true; return true; } - + + if (mSelectionActionMode != null && touchPositionIsInSelection()) { + final int start = getSelectionStart(); + final int end = getSelectionEnd(); + CharSequence selectedText = mTransformed.subSequence(start, end); + ClipData data = ClipData.newPlainText(null, null, selectedText); + startDrag(data, getTextThumbnailBuilder(selectedText), false); + stopSelectionActionMode(); + performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); + mEatTouchRelease = true; + return true; + } + if (startSelectionActionMode()) { performHapticFeedback(HapticFeedbackConstants.LONG_PRESS); mEatTouchRelease = true; @@ -8728,6 +8773,46 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener return getOffsetForHorizontal(line, x); } + @Override + public boolean onDragEvent(DragEvent event) { + switch (event.getAction()) { + case DragEvent.ACTION_DRAG_STARTED: + return mInsertionPointCursorController != null; + + case DragEvent.ACTION_DRAG_ENTERED: + TextView.this.requestFocus(); + return true; + + case DragEvent.ACTION_DRAG_LOCATION: { + final int offset = getOffset((int)event.getX(), (int)event.getY()); + Selection.setSelection((Spannable)mText, offset); + return true; + } + + case DragEvent.ACTION_DROP: { + StringBuilder content = new StringBuilder(""); + ClipData clipData = event.getClipData(); + final int itemCount = clipData.getItemCount(); + for (int i=0; i < itemCount; i++) { + Item item = clipData.getItem(i); + content.append(item.coerceToText(TextView.this.mContext)); + } + final int offset = getOffset((int) event.getX(), (int) event.getY()); + long minMax = prepareSpacesAroundPaste(offset, offset, content); + int min = extractRangeStartFromLong(minMax); + int max = extractRangeEndFromLong(minMax); + Selection.setSelection((Spannable) mText, max); + ((Editable) mText).replace(min, max, content); + return true; + } + + case DragEvent.ACTION_DRAG_EXITED: + case DragEvent.ACTION_DRAG_ENDED: + default: + return true; + } + } + @ViewDebug.ExportedProperty(category = "text") private CharSequence mText; @@ -8822,4 +8907,5 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener private static final InputFilter[] NO_FILTERS = new InputFilter[0]; private InputFilter[] mFilters = NO_FILTERS; private static final Spanned EMPTY_SPANNED = new SpannedString(""); + private static int DRAG_THUMBNAIL_MAX_TEXT_LENGTH = 20; } diff --git a/core/res/res/layout/text_drag_thumbnail.xml b/core/res/res/layout/text_drag_thumbnail.xml new file mode 100644 index 000000000000..63d2c05b539e --- /dev/null +++ b/core/res/res/layout/text_drag_thumbnail.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* apps/common/assets/default/default/skins/StatusBar.xml +** +** Copyright 2010, 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. +*/ +--> +<TextView + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@android:style/TextAppearance.Large" + android:gravity="center" + /> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 7e892a404ab4..0aa424701415 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Umožňuje aplikaci zobrazit konfiguraci místního telefonu s rozhraním Bluetooth, vytvářet připojení ke spárovaným zařízením a přijímat tato připojení."</string> <string name="permlab_nfc" msgid="4423351274757876953">"ovládat technologii NFC"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Umožňuje aplikaci komunikovat se štítky, kartami a čtečkami s podporou technologie NFC."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"vypnutí zámku kláves"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Umožňuje aplikaci vypnout zámek kláves a související zabezpečení heslem. Příkladem oprávněného použití této funkce je vypnutí zámku klávesnice při příchozím hovoru a jeho opětovné zapnutí po skončení hovoru."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"čtení nastavení synchronizace"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Umožňuje aplikaci načíst nastavení synchronizace, např. zda má být povolena synchronizace kontaktů."</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 0dbf3b77898a..e0be775dc6a3 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Tillader, at et program viser konfigurationen af den lokale Bluetooth-telefon samt opretter og accepterer forbindelse med parrede enheder."</string> <string name="permlab_nfc" msgid="4423351274757876953">"kontrollere Near Field Communication"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Tillader, at et program kommunikerer med tags, kort og læsere i Near Field Communication (NFC)."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"deaktiver tastaturlås"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Tillader, at et program deaktiverer tastaturlåsen og al associeret adgangskodesikkerhed. Et legitimt eksempel på dette er, at telefonen deaktiverer tastaturlåsen, når der modtages et indgående telefonopkald, og genaktiverer tastaturlåsen, når opkaldet er afsluttet."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"læs indstillinger for synkronisering"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Tillader, at et program læser synkroniseringsindstillingerne, f.eks. om kontakter skal synkroniseres."</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 0db7b0a60ff4..1566b1be0b8b 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Ermöglicht einer Anwendung, die Konfiguration des lokalen Bluetooth-Telefons einzusehen und Verbindungen mit Partnergeräten herzustellen und zu akzeptieren."</string> <string name="permlab_nfc" msgid="4423351274757876953">"Nahfeldkommunikation steuern"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Ermöglicht einer Anwendung die Kommunikation mit Tags für die Nahfeldkommunikation, Karten und Readern."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"Tastensperre deaktivieren"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Ermöglicht einer Anwendung, die Tastensperre sowie den damit verbundenen Passwortschutz zu deaktivieren. So wird die Tastensperre vom Telefon deaktiviert, wenn ein Anruf eingeht, und nach Beendigung des Anrufs wieder aktiviert."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"Synchronisierungseinstellungen lesen"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Ermöglicht einer Anwendung, die Synchronisierungseinstellungen zu lesen, etwa ob die Synchronisierung für Kontakte aktiviert ist oder nicht."</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index dc3d74797b49..bd86221a2190 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Επιτρέπει σε μια εφαρμογή να προβάλει τη διαμόρφωση του τοπικού τηλεφώνου Bluetooth και επίσης να πραγματοποιεί και να αποδέχεται συνδέσεις με συζευγμένες συσκευές."</string> <string name="permlab_nfc" msgid="4423351274757876953">"έλεγχος Επικοινωνίας κοντινού πεδίου (Near Field Communication)"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Επιτρέπει σε μια εφαρμογή την επικοινωνία με ετικέτες, τις κάρτες και τους αναγνώστες της Επικοινωνίας κοντινού πεδίου (NFC)."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"απενεργοποίηση κλειδώματος πληκτρολογίου"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Επιτρέπει σε μια εφαρμογή την απενεργοποίηση του κλειδώματος πληκτρολογίου και άλλης σχετικής ασφάλειας με κωδικό πρόσβασης. Για παράδειγμα, η απενεργοποίηση του κλειδώματος πληκτρολογίου όταν λαμβάνεται εισερχόμενη τηλεφωνική κλήση και η επανενεργοποίηση του κλειδώματος πληκτρολογίου όταν η κλήση τερματιστεί."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"ανάγνωση ρυθμίσεων συγχρονισμού"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Επιτρέπει σε μια εφαρμογή την ανάγνωση των ρυθμίσεων συγχρονισμού, όπως π.χ. εάν ο συγχρονισμός είναι ενεργοποιημένος για τις Επαφές."</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index b518c465e001..e303707c2321 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -439,6 +439,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Admite una aplicación que ve la configuración del teléfono Bluetooth local, y realiza y acepta conexiones con dispositivos vinculados."</string> <string name="permlab_nfc" msgid="4423351274757876953">"controlar la Transmisión de datos en proximidad"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Permite que una aplicación se comunique con etiquetas, tarjetas y lectores de Transmisión de datos en proximidad (NFC)."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"desactivar el bloqueo"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Admite una aplicación que desactiva el bloqueo y cualquier seguridad con contraseña relacionada. Un ejemplo legítimo de esto es el bloqueo desactivado por el teléfono cuando recibe una llamada telefónica entrante, y luego la reactivación del bloqueo cuando finaliza la llamada."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"leer la configuración de sincronización"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Admite una aplicación que lee la configuración de sincronización, como si está activada la sincronización para los Contactos."</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 75e5dc1517a3..452eefd10678 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Permite que una aplicación vea la configuración del teléfono Bluetooth local, y cree y acepte conexiones con los dispositivos sincronizados."</string> <string name="permlab_nfc" msgid="4423351274757876953">"controlar Comunicación de campo cercano (NFC)"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Permite que la aplicación se comunique con lectores, tarjetas y etiquetas de Comunicación de campo cercano (NFC)."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"inhabilitar bloqueo del teclado"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Permite que una aplicación inhabilite el bloqueo del teclado y cualquier protección con contraseña asociada. Un ejemplo legítimo de este permiso es la inhabilitación por parte del teléfono del bloqueo del teclado cuando recibe una llamada telefónica entrante y su posterior habilitación cuando finaliza la llamada."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"leer la configuración de sincronización"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Permite que una aplicación lea la configuración de sincronización como, por ejemplo, si la sincronización está habilitada para el menú \"Contactos\"."</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 0a944b990c76..a80235095aa7 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Permet à une application d\'obtenir la configuration du téléphone Bluetooth local et de créer et accepter des connexions à des appareils associés."</string> <string name="permlab_nfc" msgid="4423351274757876953">"contrôler la communication en champ proche"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Autorise une application à communiquer avec des tags, cartes et lecteurs prenant en charge la communication en champ proche (NFC)."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"Désactivation du verrouillage des touches"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Permet à une application de désactiver le verrouillage des touches et toute sécurité par mot de passe. Exemple : Votre téléphone désactive le verrouillage du clavier lorsque vous recevez un appel, puis le réactive lorsque vous raccrochez."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"Lecture des paramètres de synchronisation"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Permet à une application de lire les paramètres de synchronisation (par ex. savoir si la synchronisation est activée pour les Contacts)."</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index ba71e532816b..6e5987efef1d 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Consente a un\'applicazione di visualizzare la configurazione del telefono Bluetooth locale e di stabilire e accettare connessioni con dispositivi associati."</string> <string name="permlab_nfc" msgid="4423351274757876953">"controllo Near Field Communication"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Consente a un\'applicazione di comunicare con tag, schede e lettori NFC (Near Field Communication)."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"disattivazione blocco tastiera"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Consente la disattivazione da parte di un\'applicazione del blocco tastiera e di eventuali protezioni tramite password associate. Un valido esempio è la disattivazione da parte del telefono del blocco tastiera quando riceve una telefonata in entrata, e la successiva riattivazione del blocco al termine della chiamata."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"lettura impostazioni di sincronizz."</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Consente a un\'applicazione di leggere le impostazioni di sincronizzazione, come l\'attivazione o meno della sincronizzazione per Contatti."</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 748f8a7f90e6..12cb2909291b 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"このBluetooth端末の設定表示、および別の端末をペアとして設定し接続を承認することをアプリケーションに許可します。"</string> <string name="permlab_nfc" msgid="4423351274757876953">"NFCの管理"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"NFCタグ、カード、リーダーとの通信をアプリケーションに許可します。"</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"キーロックを無効にする"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"キーロックや関連するパスワードセキュリティを無効にすることをアプリケーションに許可します。正当な利用の例では、かかってきた電話を受信する際にキーロックを無効にし、通話の終了時にキーロックを有効にし直します。"</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"同期設定の読み取り"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"連絡先の同期の有効/無効など、同期設定の読み取りをアプリケーションに許可します。"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 5951045f2549..36e5134dc5aa 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"애플리케이션이 로컬 Bluetooth 전화의 구성을 보고 페어링된 장치에 연결하며 연결을 수락할 수 있도록 합니다."</string> <string name="permlab_nfc" msgid="4423351274757876953">"NFC(Near Field Communication) 제어"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"애플리케이션에서 NFC(Near Field Communication) 태그, 카드 및 리더와 통신할 수 있습니다."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"키 잠금 사용 중지"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"애플리케이션이 키 잠금 및 관련 비밀번호 보안을 사용 중지할 수 있도록 합니다. 예를 들어, 휴대전화가 수신전화를 받을 때 키 잠금을 사용 중지했다가 통화가 끝나면 키 잠금을 다시 사용할 수 있습니다."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"동기화 설정 읽기"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"애플리케이션이 주소록에 동기화를 사용할지 여부와 같은 동기화 설정을 읽을 수 있도록 합니다."</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index d97e8034b7a4..e43aabd9a755 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Lar applikasjonen se konfigurasjonen til den lokale Bluetooth-telefonen, og å opprette og godta tilkoblinger med parede enheter."</string> <string name="permlab_nfc" msgid="4423351274757876953">"kontroller overføring av data med NFC-teknologi"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Tillater programmet å kommunisere data via koder, kort og lesere for NFC-teknologi."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"slå av tastaturlås"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Lar applikasjonen slå av tastaturlåsen og enhver tilknyttet passordsikkerhet. Et legitimt eksempel på dette er at telefonen slår av tastaturlåsen når den mottar et innkommende anrop, og så slår den på igjen når samtalen er over."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"lese synkroniseringsinnstillinger"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Lar applikasjonen lese synkroniseringsinnstillingene, som for eksempel om kontakter blir synkronisert."</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 483b23664d1d..d66b6943aec0 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Hiermee kan een toepassing de configuratie van een lokale Bluetooth-telefoon bekijken en verbindingen met gekoppelde apparaten maken en accepteren."</string> <string name="permlab_nfc" msgid="4423351274757876953">"Near Field Communication regelen"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Hiermee kan een toepassing communiceren met NFC-tags (Near Field Communication), kaarten en lezers."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"toetsvergrendeling uitschakelen"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Hiermee kan een toepassing de toetsvergrendeling en bijbehorende wachtwoordbeveiliging uitschakelen. Een voorbeeld: de telefoon schakelt de toetsvergrendeling uit als er een oproep binnenkomt en schakelt de toetsvergrendeling weer in als de oproep is beëindigd."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"synchronisatie-instellingen lezen"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Hiermee kan een toepassing de synchronisatie-instellingen lezen, bijvoorbeeld of de synchronisatie van contacten is ingeschakeld."</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index d2f345e0a990..66a716055709 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Pozwala aplikacji na wyświetlanie konfiguracji lokalnego telefonu Bluetooth oraz na tworzenie i akceptowanie połączeń ze sparowanymi urządzeniami."</string> <string name="permlab_nfc" msgid="4423351274757876953">"kontrolowanie łączności Near Field Communication"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Zezwala aplikacji na komunikowanie się z użyciem tagów, kart i czytników Near Field Communication (NFC)."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"wyłączanie blokady klawiatury"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Pozwala aplikacji na wyłączenie blokady klawiatury i wszystkich związanych z tym haseł zabezpieczających. Typowym przykładem takiego działania jest wyłączanie blokady klawiatury, gdy pojawia się połączenie przychodzące, a następnie ponowne jej włączanie po zakończeniu połączenia."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"czytanie ustawień synchronizowania"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Pozwala aplikacji na czytanie ustawień synchronizacji, takich jak informacje, czy synchronizacja kontaktów jest włączona."</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 325291152e1d..990d630e7724 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Permite a uma aplicação ver a configuração do telefone Bluetooth local, bem como efectuar e aceitar ligações com dispositivos emparelhados."</string> <string name="permlab_nfc" msgid="4423351274757876953">"controlo Near Field Communication"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Permite que uma aplicação comunique com etiquetas, cartões e leitores Near Field Communication (NFC)."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"desactivar bloqueio de teclas"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Permite a uma aplicação desactivar o bloqueio de teclas e qualquer segurança por palavra-passe associada. Um exemplo legítimo é a desactivação do bloqueio de teclas pelo telefone ao receber uma chamada, reactivando, em seguida, o bloqueio de teclas ao terminar a chamada."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"ler definições de sincronização"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Permite a uma aplicação ler as definições de sincronização como, por exemplo, se a sincronização está activada para Contactos."</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 28d7bf698ae2..ce106db7ac9f 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Permite que um aplicativo veja a configuração do telefone Bluetooth local e que possa fazer e aceitar conexões com dispositivos pareados."</string> <string name="permlab_nfc" msgid="4423351274757876953">"controlar a comunicação a curta distância"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Permite que um aplicativo se comunique com tags, cartões e leitores de comunicação a curta distância (NFC)."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"desativar o bloqueio de teclas"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Permite que um aplicativo desative o bloqueio de teclas e qualquer segurança por senha associada. Um exemplo legítimo disso é a desativação do bloqueio de teclas pelo telefone ao receber uma chamada e a reativação do bloqueio quando a chamada é finalizada."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"ler as configurações de sincronização"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Permite que um aplicativo leia as configurações de sincronização, como se a sincronização está ativada para Contatos."</string> diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml index 3feba6a011f0..bbd61bda2127 100644 --- a/core/res/res/values-rm/strings.xml +++ b/core/res/res/values-rm/strings.xml @@ -444,6 +444,7 @@ <skip /> <!-- no translation found for permdesc_nfc (9171401851954407226) --> <skip /> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"deactivar la bloccaziun da la tastatura"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Permetta ad ina applicaziun da deactivar la bloccaziun da la tastatura e la protecziun cun il pled-clav associada. In exempel dad ina utilisaziun legitima: La bloccaziun da la tastatura vegn deactivada sche Vus retschavais in clom ed ella vegn reactivada sche Vus finis il telefon."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"leger ils parameters da sincronisaziun"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Permetta ad ina applicaziun da leger ils parameters da sincronisaziun (per exempel per savair sche la sincronisaziun da contacts è activà u betg)."</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 38ae2aa88f4f..4babb3bdbce5 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Позволяет приложению просматривать конфигурацию локального телефона Bluetooth, создавать подключения с сопряженными устройствами."</string> <string name="permlab_nfc" msgid="4423351274757876953">"управлять радиосвязью ближнего действия"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Позволяет приложению обмениваться данными с метками, картами и считывателями через радиосвязь ближнего действия (NFC)."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"отключать блокировку клавиатуры"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Позволяет приложению отключить блокировку клавиатуры и другие функции защиты паролем. Примером допустимого использования этой функции является отключение блокировки клавиатуры при получении входящего вызова и включение блокировки после завершения разговора."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"считывать настройки синхронизации"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Позволяет приложению считывать настройки синхронизации, такие как включение синхронизации Контактов."</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index dd05ecbf3fc0..102a08d16709 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Tillåter att ett program ser den lokala Bluetooth-telefonens konfiguration, och skapar och accepterar anslutningar med parkopplade enheter."</string> <string name="permlab_nfc" msgid="4423351274757876953">"kontrollera närfältskommunikationen"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Tillåter att en app kommunicerar med taggar, kort och läsare för närfältskommunikation (NFC)."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"inaktivera tangentlås"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Tillåter att ett program inaktiverar tangentlåset och tillhörande lösenordsskydd. Ett exempel på detta är att telefonen inaktiverar tangentlåset vid inkommande samtal och sedan aktiverar det igen när samtalet är avslutat."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"läsa synkroniseringsinställningar"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Tillåter att ett program läser synkroniseringsinställningarna, till exempel om synkronisering har aktiverats för kontakter."</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 1545d7aa35d1..a6bfbf630a8a 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"Uygulamaların yerel Bluetooth telefonunun yapılandırmasını görüntülemesine ve eşleşilmiş cihazlar ile bağlantı kurup kabul etmesine izin verir."</string> <string name="permlab_nfc" msgid="4423351274757876953">"Yakın Alan İletişimini denetle"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"Bir uyg\'nın Yakın Alan İletişimi etiketleri, kartları ve okuyclr ile iletşm kurmasına izin verir."</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"tuş kilidini devre dışı bırak"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"Uygulamaların tuş kilidini ve ilgili şifreli güvenlik önlemini devre dışı bırakmasına izin verir. Bunun geçerli bir örneği gelen bir çağrı alındığında tuş kilidinin devre dışı bırakılması, sonra çağrı bittiğinde kilidin yeniden devreye sokulmasıdır."</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"senk. ayarlarını oku"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"Uygulamanın, senkronizasyon işlevinin Kişiler için devrede olup olmadığı gibi senkronizasyon ayarlarını okumasına izin verir."</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 76690dd0cfa6..4fd516108064 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"允许应用程序查看本地蓝牙手机的配置，以及建立或接受与配对设备的连接。"</string> <string name="permlab_nfc" msgid="4423351274757876953">"控制近距离通信"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"允许应用程序与近距离通信 (NFC) 标签、卡和读卡器进行通信。"</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"停用键锁"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"允许应用程序停用键锁和任何关联的密码安全设置。例如，在手机上接听电话时停用键锁，在通话结束后重新启用键锁。"</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"读取同步设置"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"允许应用程序读取同步设置，例如是否为“联系人”启用同步。"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 5fb09980d66f..6d5c4d4a9ad8 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -440,6 +440,7 @@ <string name="permdesc_bluetooth" product="default" msgid="762515380679392945">"允許應用程式檢視本機藍牙電話設定，並與其他配對裝置連線。"</string> <string name="permlab_nfc" msgid="4423351274757876953">"控制近距離無線通訊"</string> <string name="permdesc_nfc" msgid="9171401851954407226">"允許應用程式使用近距離無線通訊 (NFC) 標記、卡片及讀取程式進行通訊。"</string> + <string name="permlab_disableKeyguard" msgid="4977406164311535092">"停用按鍵鎖定"</string> <string name="permdesc_disableKeyguard" msgid="3189763479326302017">"允許應用程式停用按鍵鎖定以及其他相關的密碼安全性。例如：收到來電時解除按鍵鎖定，通話結束後重新啟動按鍵鎖定。"</string> <string name="permlab_readSyncSettings" msgid="6201810008230503052">"讀取同步處理設定"</string> <string name="permdesc_readSyncSettings" msgid="5315925706353341823">"允許應用程式讀取同步處理設定，例如：是否同步處理 [聯絡人]。"</string> diff --git a/docs/html/sdk/adding-components.jd b/docs/html/sdk/adding-components.jd index 05be0d6f8bd4..1f9cb31af13c 100644 --- a/docs/html/sdk/adding-components.jd +++ b/docs/html/sdk/adding-components.jd @@ -150,14 +150,19 @@ the "Downloadable SDK Components" section at left.</p> <p>For example, there may be a dependency between the ADT Plugin for Eclipse and the SDK Tools component. When you install the SDK Tools -component, you would then need to upgrade to the required version of ADT (if you -are developing in Eclipse). In this case, you would find dependencies listed in -"Revisions" section of the <a href="{@docRoot}sdk/eclipse-adt.html#notes">ADT -Plugin Notes</a> and <a href="{@docRoot}sdk/tools-notes.html#notes">SDK Tools -Notes</a> documents. </p> - -<p>Additionally, the development tools will notify you with debug warnings -if there is dependency that you need to address. </p> +component, you should also upgrade to the required version of ADT (if you +are developing in Eclipse). In this case, the major version number for your ADT plugin should +always match the revision number of your SDK Tools (for example, ADT 8.x requires SDK Tools r8). +</p> + +<p>Also make sure that, each time you install a new version of the Android platform, you have +the latest version of the SDK Platform-tools component. The SDK Platform-tools contain +tools that are backward compatible with all versions of the Android platform and are +often updated to support new features in the latest version of the Android platform.</p> + +<p>The development tools will notify you with debug warnings if there is dependency that you need to +address. The SDK and AVD Manager also enforces dependencies by requiring that you download any +components that are needed by those you have selected.</p> <h2 id="AddingSites">Adding New Sites</h2> diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java index 23bbb87058eb..64ffa4ea8b9f 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/functional/MediaPlayerApiTest.java @@ -344,10 +344,8 @@ public class MediaPlayerApiTest extends ActivityInstrumentationTestCase<MediaFra @LargeTest public void testWAVSeekToEnd() throws Exception { - if (isWMVEnable) { - boolean isEnd = CodecTest.seekToEnd(MediaNames.WAV); - assertTrue("WAV seekToEnd", isEnd); - } + boolean isEnd = CodecTest.seekToEnd(MediaNames.WAV); + assertTrue("WAV seekToEnd", isEnd); } @MediumTest diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index fee726394226..828fae8fb885 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Nejnovější"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index b6ca93b2350c..74def1cef607 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Seneste"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index d3fb06ec7411..e033982b7f42 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Zuletzt verwendet"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index f50395b15300..ddcfc2cea05f 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Πρόσφατα"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index a6ce25a4ad9c..aff9f4cad43b 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Reciente"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index fc75775c0fd0..0b6af34d2635 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Reciente"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 22b8d5e7fe05..0e2a765952c0 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Récentes"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 8af1d9a9317c..c45bb4c8af03 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Recenti"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 807ecd603d2e..f6a8e5fc119d 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"新着"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 0c138217db96..1189194ac500 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"최근 사용한 앱"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index 380e75148c1d..b5f467623430 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Nylig"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 7159b065605f..ec8fcfb3ce96 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Recent"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 3b03b524123f..7034a6dcf1bf 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Najnowsze"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index f59ce9bc1d0b..80028a23cd33 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Recente"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 950f19623e6f..006379c77b63 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Recente"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-rm/strings.xml b/packages/SystemUI/res/values-rm/strings.xml index 8a8d8ae81d9d..646d7f5c21d9 100644 --- a/packages/SystemUI/res/values-rm/strings.xml +++ b/packages/SystemUI/res/values-rm/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Utilisà sco ultim"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index bb8b3755e9e0..d598ff3c69e3 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Недавние"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 1bcd55fec5e4..6ecdfa8412c5 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"Senaste"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 96b88de25a2e..059a4f1832e6 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"En Son Görevler"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 0dcb31c1a9d4..9c1f71fe0058 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"近期任务"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 16c3427858ea..11051be639d4 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -40,6 +40,8 @@ <string name="recent_tasks_title" msgid="3691764623638127888">"最新的"</string> <!-- no translation found for recent_tasks_empty (1905484479067697884) --> <skip /> + <!-- no translation found for recent_tasks_app_label (3796483981246752469) --> + <skip /> <!-- no translation found for toast_rotation_free (2700542202836832631) --> <skip /> <!-- no translation found for toast_rotation_locked (7484691306949652450) --> |