diff options
188 files changed, 1925 insertions, 2240 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index 25c489736dfa..9f683e3891ab 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -5466,27 +5466,33 @@ public class Activity extends ContextThemeWrapper /** * Activities that want to remain visible behind a translucent activity above them must call - * this method anytime before a return from {@link #onPause()}. If this call is successful - * then the activity will remain visible when {@link #onPause()} is called, and can continue to - * play media in the background, but it must stop playing and release resources prior to or - * within the call to {@link #onVisibleBehindCanceled()}. If this call returns false, the - * activity will not be visible in the background, and must release any media resources - * immediately. + * this method anytime between the start of {@link #onResume()} and the return from + * {@link #onPause()}. If this call is successful then the activity will remain visible after + * {@link #onPause()} is called, and is allowed to continue playing media in the background. + * + * <p>The actions of this call are reset each time that this activity is brought to the + * front. That is, every time {@link #onResume()} is called the activity will be assumed + * to not have requested visible behind. Therefore, if you want this activity to continue to + * be visible in the background you must call this method again. * * <p>Only fullscreen opaque activities may make this call. I.e. this call is a nop * for dialog and translucent activities. * - * <p>False will be returned any time this method is call between the return of onPause and + * <p>Under all circumstances, the activity must stop playing and release resources prior to or + * within a call to {@link #onVisibleBehindCanceled()} or if this call returns false. + * + * <p>False will be returned any time this method is called between the return of onPause and * the next call to onResume. * * @param visible true to notify the system that the activity wishes to be visible behind other * translucent activities, false to indicate otherwise. Resources must be * released when passing false to this method. - * @return the resulting visibiity state. If true the activity may remain visible beyond - * {@link #onPause()}. If false then the activity may not count on being visible behind - * other translucent activities, and must stop any media playback and release resources. - * Returning false may occur in lieu of a call to onVisibleBehindCanceled() so the return - * value must be checked. + * @return the resulting visibiity state. If true the activity will remain visible beyond + * {@link #onPause()} if the next activity is translucent or not fullscreen. If false + * then the activity may not count on being visible behind other translucent activities, + * and must stop any media playback and release resources. + * Returning false may occur in lieu of a call to {@link #onVisibleBehindCanceled()} so + * the return value must be checked. * * @see #onVisibleBehindCanceled() * @see #onBackgroundVisibleBehindChanged(boolean) diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 1e0dc53e1286..5f95b0417d3e 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -20,6 +20,7 @@ import android.text.TextUtils; import android.util.Slog; import com.android.internal.telephony.TelephonyProperties; +import dalvik.system.VMRuntime; /** * Information about the current build, extracted from system properties. @@ -51,7 +52,7 @@ public class Build { * @deprecated Use {@link #SUPPORTED_ABIS} instead. */ @Deprecated - public static final String CPU_ABI = getString("ro.product.cpu.abi"); + public static final String CPU_ABI; /** * The name of the second instruction set (CPU type + ABI convention) of native code. @@ -59,7 +60,7 @@ public class Build { * @deprecated Use {@link #SUPPORTED_ABIS} instead. */ @Deprecated - public static final String CPU_ABI2 = getString("ro.product.cpu.abi2"); + public static final String CPU_ABI2; /** The manufacturer of the product/hardware. */ public static final String MANUFACTURER = getString("ro.product.manufacturer"); @@ -117,6 +118,27 @@ public class Build { getStringList("ro.product.cpu.abilist64", ","); + static { + /* + * Adjusts CPU_ABI and CPU_ABI2 depending on whether or not a given process is 64 bit. + * 32 bit processes will always see 32 bit ABIs in these fields for backward + * compatibility. + */ + final String[] abiList; + if (VMRuntime.getRuntime().is64Bit()) { + abiList = SUPPORTED_64_BIT_ABIS; + } else { + abiList = SUPPORTED_32_BIT_ABIS; + } + + CPU_ABI = abiList[0]; + if (abiList.length > 1) { + CPU_ABI2 = abiList[1]; + } else { + CPU_ABI2 = ""; + } + } + /** Various version strings. */ public static class VERSION { /** diff --git a/core/java/android/speech/RecognitionService.java b/core/java/android/speech/RecognitionService.java index 32b2d8f4baf3..45eb0bfec95c 100644 --- a/core/java/android/speech/RecognitionService.java +++ b/core/java/android/speech/RecognitionService.java @@ -91,9 +91,20 @@ public abstract class RecognitionService extends Service { } }; - private void dispatchStartListening(Intent intent, IRecognitionListener listener) { + private void dispatchStartListening(Intent intent, final IRecognitionListener listener) { if (mCurrentCallback == null) { if (DBG) Log.d(TAG, "created new mCurrentCallback, listener = " + listener.asBinder()); + try { + listener.asBinder().linkToDeath(new IBinder.DeathRecipient() { + @Override + public void binderDied() { + mHandler.sendMessage(mHandler.obtainMessage(MSG_CANCEL, listener)); + } + }, 0); + } catch (RemoteException re) { + Log.e(TAG, "dead listener on startListening"); + return; + } mCurrentCallback = new Callback(listener); RecognitionService.this.onStartListening(intent, mCurrentCallback); } else { diff --git a/core/java/android/speech/SpeechRecognizer.java b/core/java/android/speech/SpeechRecognizer.java index 91c37992eed6..88e2edeee552 100644 --- a/core/java/android/speech/SpeechRecognizer.java +++ b/core/java/android/speech/SpeechRecognizer.java @@ -396,6 +396,14 @@ public class SpeechRecognizer { * Destroys the {@code SpeechRecognizer} object. */ public void destroy() { + if (mService != null) { + try { + mService.cancel(mListener); + } catch (final RemoteException e) { + // Not important + } + } + if (mConnection != null) { mContext.unbindService(mConnection); } diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index a2a4540e4e07..afc804c68a94 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -256,9 +256,8 @@ public class SurfaceView extends View { updateWindow(false, false); } - /** @hide */ @Override - protected void onDetachedFromWindowInternal() { + protected void onDetachedFromWindow() { if (mGlobalListenersAdded) { ViewTreeObserver observer = getViewTreeObserver(); observer.removeOnScrollChangedListener(mScrollChangedListener); @@ -280,7 +279,7 @@ public class SurfaceView extends View { mSession = null; mLayout.token = null; - super.onDetachedFromWindowInternal(); + super.onDetachedFromWindow(); } @Override diff --git a/core/java/com/android/server/BootReceiver.java b/core/java/com/android/server/BootReceiver.java index 468d7f1f15a9..d39bf076bf5f 100644 --- a/core/java/com/android/server/BootReceiver.java +++ b/core/java/com/android/server/BootReceiver.java @@ -155,8 +155,10 @@ public class BootReceiver extends BroadcastReceiver { // Scan existing tombstones (in case any new ones appeared) File[] tombstoneFiles = TOMBSTONE_DIR.listFiles(); for (int i = 0; tombstoneFiles != null && i < tombstoneFiles.length; i++) { - addFileToDropBox(db, prefs, headers, tombstoneFiles[i].getPath(), - LOG_SIZE, "SYSTEM_TOMBSTONE"); + if (tombstoneFiles[i].isFile()) { + addFileToDropBox(db, prefs, headers, tombstoneFiles[i].getPath(), + LOG_SIZE, "SYSTEM_TOMBSTONE"); + } } // Start watching for new tombstone files; will record them as they occur. @@ -165,8 +167,10 @@ public class BootReceiver extends BroadcastReceiver { @Override public void onEvent(int event, String path) { try { - String filename = new File(TOMBSTONE_DIR, path).getPath(); - addFileToDropBox(db, prefs, headers, filename, LOG_SIZE, "SYSTEM_TOMBSTONE"); + File file = new File(TOMBSTONE_DIR, path); + if (file.isFile()) { + addFileToDropBox(db, prefs, headers, file.getPath(), LOG_SIZE, "SYSTEM_TOMBSTONE"); + } } catch (IOException e) { Slog.e(TAG, "Can't log tombstone", e); } diff --git a/core/jni/android_util_AssetManager.cpp b/core/jni/android_util_AssetManager.cpp index 8753660e835d..4859ee6fb796 100644 --- a/core/jni/android_util_AssetManager.cpp +++ b/core/jni/android_util_AssetManager.cpp @@ -1324,21 +1324,7 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla config.density = 0; // Skip through XML attributes until the end or the next possible match. - // We make two assumptions about the order of attributes: - // 1) Among attributes with the same package ID, the attributes are - // sorted by increasing resource ID. - // 2) Groups of attributes with the same package ID are in the same - // order. - // 3) The same sorting is applied to the input attributes as is - // to the attributes in the XML. - // - // ex: 02010000, 02010001, 010100f4, 010100f5 - // - // The total order of attributes (including package ID) can not be linear - // as shared libraries get assigned dynamic package IDs at runtime, which - // may break the sort order established at build time. - while (ix < NX && (Res_GETPACKAGE(curIdent) != Res_GETPACKAGE(curXmlAttr) || - curIdent > curXmlAttr)) { + while (ix < NX && curIdent > curXmlAttr) { ix++; curXmlAttr = xmlParser->getAttributeNameResID(ix); } @@ -1353,9 +1339,7 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla } // Skip through the style values until the end or the next possible match. - while (styleEnt < endStyleEnt && - (Res_GETPACKAGE(curIdent) != Res_GETPACKAGE(styleEnt->map.name.ident) || - curIdent > styleEnt->map.name.ident)) { + while (styleEnt < endStyleEnt && curIdent > styleEnt->map.name.ident) { styleEnt++; } // Retrieve the current style attribute if it matches, and step to next. @@ -1371,9 +1355,7 @@ static jboolean android_content_AssetManager_applyStyle(JNIEnv* env, jobject cla } // Skip through the default style values until the end or the next possible match. - while (defStyleEnt < endDefStyleEnt && - (Res_GETPACKAGE(curIdent) != Res_GETPACKAGE(defStyleEnt->map.name.ident) || - curIdent > defStyleEnt->map.name.ident)) { + while (defStyleEnt < endDefStyleEnt && curIdent > defStyleEnt->map.name.ident) { defStyleEnt++; } // Retrieve the current default style attribute if it matches, and step to next. @@ -1535,8 +1517,7 @@ static jboolean android_content_AssetManager_retrieveAttributes(JNIEnv* env, job config.density = 0; // Skip through XML attributes until the end or the next possible match. - while (ix < NX && (Res_GETPACKAGE(curIdent) != Res_GETPACKAGE(curXmlAttr) || - curIdent > curXmlAttr)) { + while (ix < NX && curIdent > curXmlAttr) { ix++; curXmlAttr = xmlParser->getAttributeNameResID(ix); } diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index b3af119764eb..82c29c4eb1d0 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksaksies"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Bergingspasie word min"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Sommige stelselfunksies werk moontlik nie"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> loop tans"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Raak vir meer inligting of om die program te stop."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 7e43c14a1edc..8beace8b31f0 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"የፅሁፍ እርምጃዎች"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"የማከማቻ ቦታ እያለቀ ነው"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"አንዳንድ የስርዓት ተግባራት ላይሰሩ ይችላሉ"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> እያሄደ ነው"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"ተጨማሪ መረጃ ለማግኘት ወይም መተግበሪያውን ለማቆም ይንኩ።"</string> <string name="ok" msgid="5970060430562524910">"እሺ"</string> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index d40e16edccb7..2ad8272c8002 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"إجراءات النص"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"مساحة التخزين منخفضة"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"قد لا تعمل بعض وظائف النظام"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> قيد التشغيل"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"المس للحصول على مزيد من المعلومات أو لإيقاف التطبيق."</string> <string name="ok" msgid="5970060430562524910">"موافق"</string> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 243871bfd6ff..2b04bac9ffc6 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Действия с текста"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Мястото в хранилището е на изчерпване"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Възможно е някои функции на системата да не работят"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> се изпълнява"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Докоснете за още информация или за да спрете приложението."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-bn-rBD/strings.xml b/core/res/res/values-bn-rBD/strings.xml index 9353b1b5bbc3..fd21badb5382 100644 --- a/core/res/res/values-bn-rBD/strings.xml +++ b/core/res/res/values-bn-rBD/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"পাঠ্য ক্রিয়াগুলি"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"সঞ্চয়স্থান পূর্ণ হতে চলেছে"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"কিছু কিছু সিস্টেম ক্রিয়াকলাপ কাজ নাও করতে পারে"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> চলছে"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"আরো তথ্যের জন্য বা অ্যাপ্লিকেশানটি বন্ধ করার জন্য স্পর্শ করুন৷"</string> <string name="ok" msgid="5970060430562524910">"ঠিক আছে"</string> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 0b4f015c3695..78ab687d6a4a 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Accions de text"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"S\'està acabant l\'espai d\'emmagatzematge"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"És possible que algunes funcions del sistema no funcionin"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> s\'està executant"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Toca per obtenir més informació o bé per aturar l\'aplicació."</string> <string name="ok" msgid="5970060430562524910">"D\'acord"</string> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index c1bdeff7b9b7..d09a86ea787f 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Operace s textem"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"V úložišti je málo místa"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Některé systémové funkce nemusí fungovat"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"Aplikace <xliff:g id="APP_NAME">%1$s</xliff:g> je spuštěna"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Klepnutím zobrazíte další informace nebo ukončíte aplikaci."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 5d4245e304e1..9b88e3880389 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksthandlinger"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Der er snart ikke mere lagerplads"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Nogle systemfunktioner virker måske ikke"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> kører"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Tryk for at få flere oplysninger eller for at stoppe appen."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 851216659976..e4a1c8ceabb0 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Textaktionen"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Der Speicherplatz wird knapp"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Einige Systemfunktionen funktionieren möglicherweise nicht."</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> wird ausgeführt"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Für weitere Informationen oder zum Anhalten der App tippen"</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index ba58d2f8cb75..ebf80f6706e5 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Ενέργειες κειμένου"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ο χώρος αποθήκευσης εξαντλείται"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Ορισμένες λειτουργίες συστήματος ενδέχεται να μην λειτουργούν"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"Η εφαρμογή <xliff:g id="APP_NAME">%1$s</xliff:g> εκτελείται"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Αγγίξτε για περισσότερες πληροφορίες ή για να διακόψετε την εκτέλεση της εφαρμογής."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index d1182ffe58ca..02406ab9a19c 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Text actions"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Storage space running out"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Some system functions may not work"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> is running"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Touch for more information or to stop the app."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index d1182ffe58ca..02406ab9a19c 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Text actions"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Storage space running out"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Some system functions may not work"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> is running"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Touch for more information or to stop the app."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index e658000656c2..d1f7cedb6180 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Acciones de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Queda poco espacio de almacenamiento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Es posible que algunas funciones del sistema no estén disponibles."</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> se está ejecutando"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Toca para obtener más información o para detener la aplicación."</string> <string name="ok" msgid="5970060430562524910">"Aceptar"</string> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index be039975608d..1db7fe3a6746 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Acciones de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Queda poco espacio"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Es posible que algunas funciones del sistema no funcionen."</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> se está ejecutando"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Toca para obtener más información o para detener la aplicación."</string> <string name="ok" msgid="5970060430562524910">"Aceptar"</string> diff --git a/core/res/res/values-et-rEE/strings.xml b/core/res/res/values-et-rEE/strings.xml index d8e67b5879f2..e1a5c3ee93cd 100644 --- a/core/res/res/values-et-rEE/strings.xml +++ b/core/res/res/values-et-rEE/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tekstitoimingud"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Talletusruum saab täis"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Mõned süsteemifunktsioonid ei pruugi töötada"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> töötab"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Puudutage lisateabe saamiseks või rakenduse peatamiseks."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-eu-rES/strings.xml b/core/res/res/values-eu-rES/strings.xml index 0d13354421c8..86835fab64b6 100644 --- a/core/res/res/values-eu-rES/strings.xml +++ b/core/res/res/values-eu-rES/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Testu-ekintzak"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Memoria betetzen ari da"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Sistemaren funtzio batzuek ez dute agian funtzionatuko"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> abian da"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Informazio gehiago lortzeko edo aplikazioa gelditzeko, ukitu."</string> <string name="ok" msgid="5970060430562524910">"Ados"</string> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index 80f06078c8af..79b481552d9b 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"عملکردهای متنی"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"فضای ذخیرهسازی رو به اتمام است"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"برخی از عملکردهای سیستم ممکن است کار نکنند"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> در حال اجرا است"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"برای کسب اطلاعات بیشتر یا توقف برنامه لمس کنید."</string> <string name="ok" msgid="5970060430562524910">"تأیید"</string> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index 3e904bdeb77f..5daaa36e65f7 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tekstitoiminnot"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Tallennustila loppumassa"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Kaikki järjestelmätoiminnot eivät välttämättä toimi"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> on käynnissä"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Hanki lisätietoja tai sulje sovellus koskettamalla."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Muokkaa sovelluksessa %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Jaa sovelluksessa"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Jaa sovelluksessa %1$s"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"Valitse aloitusruutusovellus"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Käytä aloitusruutuna: %1$s"</string> <string name="alwaysUse" msgid="4583018368000610438">"Käytä oletuksena tälle toiminnolle."</string> <string name="use_a_different_app" msgid="8134926230585710243">"Käytä toista sovellusta"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Poista oletusasetus kohdassa Järjestelmäasetukset > Sovellukset > Ladattu."</string> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index 8cc0fb43b708..616146d230f5 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Actions sur le texte"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Espace de stockage bientôt saturé"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Il est possible que certaines fonctionnalités du système ne soient pas opérationnelles."</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> en cours d\'exécution"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Appuyez ici pour en savoir plus ou arrêter l\'application."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index b017abe30bab..5ecdebca32a0 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Actions sur le texte"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Espace de stockage bientôt saturé"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Il est possible que certaines fonctionnalités du système ne soient pas opérationnelles."</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> en cours d\'exécution"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Appuyez ici pour en savoir plus ou arrêter l\'application."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-gl-rES/strings.xml b/core/res/res/values-gl-rES/strings.xml index d7107a1f73b1..70ec500a72a5 100644 --- a/core/res/res/values-gl-rES/strings.xml +++ b/core/res/res/values-gl-rES/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Accións de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Estase esgotando o espazo de almacenamento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"É posible que algunhas funcións do sistema non funcionen"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> estase executando"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Toca aquí para obter máis información ou para deter a aplicación."</string> <string name="ok" msgid="5970060430562524910">"Aceptar"</string> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index e9ac818c492e..b1fc64ee6d2f 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"लेख क्रियाएं"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"मेमोरी स्थान समाप्त हो रहा है"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"हो सकता है कुछ सिस्टम फ़ंक्शन कार्य न करें"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> चल रहा है"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"अधिक जानकारी के लिए या ऐप्स रोकने के लिए स्पर्श करें."</string> <string name="ok" msgid="5970060430562524910">"ठीक है"</string> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 173a26b08d49..f1e98370423f 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Radnje s tekstom"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ponestaje prostora za pohranu"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Neke sistemske funkcije možda neće raditi"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"Aplikacija <xliff:g id="APP_NAME">%1$s</xliff:g> pokrenuta je"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Dodirnite za više informacija ili da biste zaustavili aplikaciju."</string> <string name="ok" msgid="5970060430562524910">"U redu"</string> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index afcd7af26cc8..1d401fb4fbd9 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Műveletek szöveggel"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Kevés a szabad terület"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Előfordulhat, hogy néhány rendszerfunkció nem működik."</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"A(z) <xliff:g id="APP_NAME">%1$s</xliff:g> jelenleg fut"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"További információért, illetve az alkalmazás leállításához érintse meg."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-hy-rAM/strings.xml b/core/res/res/values-hy-rAM/strings.xml index 1c0bf8fd7acd..437a30f817e7 100644 --- a/core/res/res/values-hy-rAM/strings.xml +++ b/core/res/res/values-hy-rAM/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Տեքստի գործողությունները"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Պահոցային տարածքը սպառվում է"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Համակարգի որոշ գործառույթներ հնարավոր է չաշխատեն"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g>-ն աշխատեցվում է"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Հպեք` լրացուցիչ տեղեկությունները կամ ծրագիրը դադարեցնելու համար:"</string> <string name="ok" msgid="5970060430562524910">"Լավ"</string> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 1ad6571c6fb3..6ea295d3b8d8 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tindakan teks"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ruang penyimpanan hampir habis"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Beberapa fungsi sistem mungkin tidak dapat bekerja"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> sedang berjalan"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Sentuh untuk informasi selengkapnya atau hentikan aplikasi."</string> <string name="ok" msgid="5970060430562524910">"Oke"</string> diff --git a/core/res/res/values-is-rIS/strings.xml b/core/res/res/values-is-rIS/strings.xml index 9a939525e344..68bac0cafd17 100644 --- a/core/res/res/values-is-rIS/strings.xml +++ b/core/res/res/values-is-rIS/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Textaaðgerðir"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Geymslurýmið er senn á þrotum"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Sumir kerfiseiginleikar kunna að vera óvirkir"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> er opið"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Snertu til að fá frekari upplýsingar eða loka forritinu."</string> <string name="ok" msgid="5970060430562524910">"Í lagi"</string> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 9f376db775bf..234a78436e6d 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Azioni testo"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Spazio di archiviazione in esaurimento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Alcune funzioni di sistema potrebbero non funzionare"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> è in esecuzione"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Tocca per ulteriori informazioni o per interrompere l\'app."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 2e3845e7a0fb..4fa80aa1da6e 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"פעולות טקסט"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"שטח האחסון אוזל"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"ייתכן שפונקציות מערכת מסוימות לא יפעלו"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> פועל"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"גע לקבלת מידע נוסף או כדי לעצור את האפליקציה."</string> <string name="ok" msgid="5970060430562524910">"אישור"</string> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 328494f7fec2..c3c4f26b0fea 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"テキスト操作"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"空き容量わずか"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"一部のシステム機能が動作しない可能性があります"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g>を実行しています"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"タップすると詳細が表示されるか、アプリが停止します。"</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-ka-rGE/strings.xml b/core/res/res/values-ka-rGE/strings.xml index 440536166fde..a214d9a93632 100644 --- a/core/res/res/values-ka-rGE/strings.xml +++ b/core/res/res/values-ka-rGE/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"ქმედებები ტექსტზე"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"თავისუფალი ადგილი იწურება"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"სისტემის ზოგიერთმა ფუნქციამ შესაძლოა არ იმუშავოს"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> გაშვებულია"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"შეეხეთ მეტი ინფორმაციისათვის ან აპის შესაწყვეტად."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"რედაქტირება %1$s-ით"</string> <string name="whichSendApplication" msgid="6902512414057341668">"გაზიარება:"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s-თან გაზიარება"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"აირჩიეთ Home აპი"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s-ის გამოყენება ......Home-ად"</string> <string name="alwaysUse" msgid="4583018368000610438">"ამ ქმედებისთვის ნაგულისხმევად გამოყენება."</string> <string name="use_a_different_app" msgid="8134926230585710243">"სხვა აპის გამოყენება"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"ნაგულისხმევი პარამეტრების წაშლა სისტემის პარამეტრებში > აპებში > ჩამოტვირთულებში."</string> diff --git a/core/res/res/values-kk-rKZ/strings.xml b/core/res/res/values-kk-rKZ/strings.xml index 611447d0c10d..2eb56a7c8e4a 100644 --- a/core/res/res/values-kk-rKZ/strings.xml +++ b/core/res/res/values-kk-rKZ/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Мәтін әрекеттері"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Жадта орын азайып барады"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Жүйенің кейбір функциялары жұмыс істемеуі мүмкін"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> қосылған"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Басқа ақпаратты қарау үшін немесе қолданбаны тоқтату үшін түртіңіз."</string> <string name="ok" msgid="5970060430562524910">"Жарайды"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s көмегімен өңдеу"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Бөлісу"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s қолданбасымен бөлісу"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"«Негізгі» қолданбасын таңдау"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s «Негізгі» ретінде пайдалану"</string> <string name="alwaysUse" msgid="4583018368000610438">"Бұл әрекет үшін бастапқы параметрін қолданыңыз."</string> <string name="use_a_different_app" msgid="8134926230585710243">"Басқа қолданбаны пайдалану"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Әдепкі параметрден «Жүйелік параметрлер» > «Қолданбалар» > «Жүктелгендер» тармағында құсбелгіні алу."</string> diff --git a/core/res/res/values-km-rKH/strings.xml b/core/res/res/values-km-rKH/strings.xml index 38bb15731b39..8725ee3c5055 100644 --- a/core/res/res/values-km-rKH/strings.xml +++ b/core/res/res/values-km-rKH/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"សកម្មភាពអត្ថបទ"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"អស់ទំហំផ្ទុក"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"មុខងារប្រព័ន្ធមួយចំនួនអាចមិនដំណើរការ"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> កំពុងដំណើរការ"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"ប៉ះ ដើម្បីមើលព័ត៌មានបន្ថែម ឬបញ្ឈប់កម្មវិធី។"</string> <string name="ok" msgid="5970060430562524910">"យល់ព្រម"</string> diff --git a/core/res/res/values-kn-rIN/strings.xml b/core/res/res/values-kn-rIN/strings.xml index 0bb34773318f..bfabe661e035 100644 --- a/core/res/res/values-kn-rIN/strings.xml +++ b/core/res/res/values-kn-rIN/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"ಪಠ್ಯದ ಕ್ರಮಗಳು"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"ಸಂಗ್ರಹಣೆ ಸ್ಥಳವು ತುಂಬಿದೆ"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"ಕೆಲವು ಸಿಸ್ಟಂ ಕಾರ್ಯವಿಧಾನಗಳು ಕಾರ್ಯನಿರ್ವಹಿಸದೇ ಇರಬಹುದು"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> ಚಾಲನೆಯಲ್ಲಿದೆ"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"ಹೆಚ್ಚಿನ ಮಾಹಿತಿಗಾಗಿ ಅಥವಾ ಅಪ್ಲಿಕೇಶನ್ ನಿಲ್ಲಿಸಲು ಸ್ಪರ್ಶಿಸಿ."</string> <string name="ok" msgid="5970060430562524910">"ಸರಿ"</string> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 1fea411c4971..15461a35e21f 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"텍스트 작업"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"저장 공간이 부족함"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"일부 시스템 기능이 작동하지 않을 수 있습니다."</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g>이(가) 실행 중입니다."</string> <string name="app_running_notification_text" msgid="4653586947747330058">"자세한 정보를 보거나 앱을 중지하려면 터치하세요."</string> <string name="ok" msgid="5970060430562524910">"확인"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s(으)로 수정"</string> <string name="whichSendApplication" msgid="6902512414057341668">"공유 대상"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s와(과) 공유"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"홈 앱 선택"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s을(를) 홈 앱으로 사용"</string> <string name="alwaysUse" msgid="4583018368000610438">"이 작업에 대해 기본값으로 사용"</string> <string name="use_a_different_app" msgid="8134926230585710243">"다른 앱 사용"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"시스템 설정 > 앱 > 다운로드로 이동하여 기본 설정을 지웁니다."</string> diff --git a/core/res/res/values-ky-rKG/strings.xml b/core/res/res/values-ky-rKG/strings.xml index 24269697b1a4..700493aa3352 100644 --- a/core/res/res/values-ky-rKG/strings.xml +++ b/core/res/res/values-ky-rKG/strings.xml @@ -1528,6 +1528,8 @@ <skip /> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Сактагычта орун калбай баратат"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Системанын кээ бир функциялары иштебеши мүмкүн"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> иштөөдө"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Кенен маалыматтар же колдонмону токтотуш үчүн тийиңиз."</string> <!-- no translation found for ok (5970060430562524910) --> @@ -1554,10 +1556,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s менен түзөтүү"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Төмөнкү менен бөлүшүү"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s менен бөлүшүү"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"Башкы бет колдонмосун тандаңыз"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Башкы бет колдонмосу катары %1$s пайдалануу"</string> <!-- no translation found for alwaysUse (4583018368000610438) --> <skip /> <string name="use_a_different_app" msgid="8134926230585710243">"Башка колдонмону пайдалануу"</string> diff --git a/core/res/res/values-lo-rLA/strings.xml b/core/res/res/values-lo-rLA/strings.xml index c7c82db85af5..81a836f1761e 100644 --- a/core/res/res/values-lo-rLA/strings.xml +++ b/core/res/res/values-lo-rLA/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"ການເຮັດວຽກຂອງຂໍ້ຄວາມ"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"ພື້ນທີ່ຈັດເກັບຂໍ້ມູນກຳລັງຈະເຕັມ"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"ການເຮັດວຽກບາງຢ່າງຂອງລະບົບບາງອາດຈະໃຊ້ບໍ່ໄດ້"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> ກຳລັງເຮັດວຽກຢູ່"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"ແຕະເພື່ອເບິ່ງຂໍ້ມູນເພີ່ມເຕີມ ຫຼືເພື່ອຢຸດການເຮັດວຽກຂອງແອັບຯນີ້."</string> <string name="ok" msgid="5970060430562524910">"ຕົກລົງ"</string> @@ -1202,7 +1204,7 @@ <string name="whichSendApplication" msgid="6902512414057341668">"ແບ່ງປັນກັບ"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"ແບ່ງປັນກັບ %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"ເລືອກແອັບຯໂຮມ"</string> - <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"ໃຊ້ %1$s ເປັນໂຮມ"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"ໃຊ້ %1$s ເປັນໜ້າຫຼັກ"</string> <string name="alwaysUse" msgid="4583018368000610438">"ໃຊ້ໂດຍຄ່າເລີ່ມຕົນສຳລັບການເຮັດວຽກນີ້."</string> <string name="use_a_different_app" msgid="8134926230585710243">"ນຳໃຊ້ແອັບຯອື່ນ"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"ລຶບລ້າງຄ່າເລີ່ມຕົ້ນ ໃນ ການຕັ້ງຄ່າລະບົບ > ແອັບຯ > ດາວໂຫລດແລ້ວ."</string> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index c71a7d6384fa..da666efd870b 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksto veiksmai"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Mažėja laisvos saugyklos vietos"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Kai kurios sistemos funkcijos gali neveikti"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"„<xliff:g id="APP_NAME">%1$s</xliff:g>“ vykdoma"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Palieskite, jei norite gauti daugiau informacijos arba sustabdyti programą."</string> <string name="ok" msgid="5970060430562524910">"Gerai"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Redaguoti naudojant %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Bendrinti naudojant"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Bendrinti naudojant %1$s"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"Pasirinkti pagrindinę programą"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Naudoti „%1$s“ kaip pagrindinę programą"</string> <string name="alwaysUse" msgid="4583018368000610438">"Šiam veiksmui tai naudoti pagal numatytuosius nustatymus."</string> <string name="use_a_different_app" msgid="8134926230585710243">"Naudoti kitą programą"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Numatytuosius nustatymus išvalykite nuėję į „Sistemos nustatymai“ > „Programos“ > „Atsisiųsta“."</string> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index bb9a0c96151b..7bd7671a8662 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -760,13 +760,13 @@ <string name="policydesc_wipeData" product="default" msgid="5096895604574188391">"Dzēš tālruņa datus bez brīdinājuma, veicot rūpnīcas datu atiestatīšanu."</string> <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Iestatīt ierīces globālo starpniekserveri"</string> <string name="policydesc_setGlobalProxy" msgid="6387497466660154931">"Iestatiet izmantojamo ierīces globālo starpniekserveri, kad ir iespējota politika. Spēkā esošo globālo starpniekserveri iestata tikai pirmās ierīces administrators."</string> - <string name="policylab_expirePassword" msgid="885279151847254056">"Ekr. bloķ. paroles term. iest."</string> + <string name="policylab_expirePassword" msgid="885279151847254056">"Ekrāna bloķ., paroles termiņa iestat."</string> <string name="policydesc_expirePassword" msgid="1729725226314691591">"Kontrolē, cik bieži ir jāmaina ekrāna bloķēšanas parole."</string> <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Skatīt atmiņas šifrējumu"</string> <string name="policydesc_encryptedStorage" msgid="2637732115325316992">"Pieprasa, lai saglabātie lietotnes dati tiktu šifrēti."</string> <string name="policylab_disableCamera" msgid="6395301023152297826">"Atspējot kameras"</string> <string name="policydesc_disableCamera" msgid="2306349042834754597">"Neļauj izmantot nevienu ierīces kameru."</string> - <string name="policylab_disableKeyguardFeatures" msgid="266329104542638802">"Bloķēšanas f-jas atspējošana"</string> + <string name="policylab_disableKeyguardFeatures" msgid="266329104542638802">"Bloķēšanas funkcijas atspējošana"</string> <string name="policydesc_disableKeyguardFeatures" msgid="3467082272186534614">"Atspējot noteiktas funkcijas taustiņslēgā."</string> <string-array name="phoneTypes"> <item msgid="8901098336658710359">"Mājas"</item> @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksta darbības"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Paliek maz brīvas vietas"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Dažas sistēmas funkcijas var nedarboties."</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> darbojas"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Pieskarieties, lai iegūtu plašāku informāciju vai apturētu lietotnes darbību."</string> <string name="ok" msgid="5970060430562524910">"Labi"</string> diff --git a/core/res/res/values-mk-rMK/strings.xml b/core/res/res/values-mk-rMK/strings.xml index 380d9b6efb88..8f0e24cb208b 100644 --- a/core/res/res/values-mk-rMK/strings.xml +++ b/core/res/res/values-mk-rMK/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Дејства со текст"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Меморијата е речиси полна"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Некои системски функции може да не работат"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> работи"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Допри за повеќе информации или да се запре апликацијата"</string> <string name="ok" msgid="5970060430562524910">"Во ред"</string> diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml-rIN/strings.xml index b07805ef3897..a5b1e25ffe51 100644 --- a/core/res/res/values-ml-rIN/strings.xml +++ b/core/res/res/values-ml-rIN/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"ടെക്സ്റ്റ് പ്രവർത്തനങ്ങൾ"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"സംഭരണയിടം കഴിഞ്ഞു"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"ചില സിസ്റ്റം പ്രവർത്തനങ്ങൾ പ്രവർത്തിക്കണമെന്നില്ല."</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> പ്രവർത്തിക്കുന്നു"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"കൂടുതൽ വിവരങ്ങൾക്ക് സ്പർശിക്കുക അല്ലെങ്കിൽ അപ്ലിക്കേഷൻ നിർത്തുക."</string> <string name="ok" msgid="5970060430562524910">"ശരി"</string> diff --git a/core/res/res/values-mn-rMN/strings.xml b/core/res/res/values-mn-rMN/strings.xml index 76c9a108e850..58c2113aba9b 100644 --- a/core/res/res/values-mn-rMN/strings.xml +++ b/core/res/res/values-mn-rMN/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Текст үйлдэл"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Сангийн хэмжээ дутагдаж байна"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Зарим систем функц ажиллахгүй байна"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> ажиллаж байна"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Илүү мэдээлэл авах бол хүрэх эсвэл апп-г зогсооно уу ."</string> <string name="ok" msgid="5970060430562524910">"Тийм"</string> diff --git a/core/res/res/values-mr-rIN/strings.xml b/core/res/res/values-mr-rIN/strings.xml index 9e3c0cdd86e0..333111b90285 100644 --- a/core/res/res/values-mr-rIN/strings.xml +++ b/core/res/res/values-mr-rIN/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"मजकूर क्रिया"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"संचयन स्थान संपत आहे"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"काही सिस्टम कार्ये कार्य करू शकत नाहीत"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> चालत आहे"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"अधिक माहितीसाठी किंवा अॅप थांबविण्यासाठी स्पर्श करा."</string> <string name="ok" msgid="5970060430562524910">"ठीक"</string> diff --git a/core/res/res/values-ms-rMY/strings.xml b/core/res/res/values-ms-rMY/strings.xml index 911f881cdfd4..96785e9ef130 100644 --- a/core/res/res/values-ms-rMY/strings.xml +++ b/core/res/res/values-ms-rMY/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tindakan teks"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Ruang storan semakin berkurangan"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Beberapa fungsi sistem mungkin tidak berfungsi"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> sedang berjalan"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Sentuh untuk maklumat lanjut atau untuk menghentikan apl."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit dengan %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Kongsi dengan"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Kongsi dengan %1$s"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"Pilih apl Laman Utama"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Gunakan %1$s sebagai Laman Utama"</string> <string name="alwaysUse" msgid="4583018368000610438">"Gunakannya secara lalai untuk tindakan ini."</string> <string name="use_a_different_app" msgid="8134926230585710243">"Gunakan apl lain"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Padam bersih lalai dalam tetapan Sistem > Apl > Dimuat turun."</string> diff --git a/core/res/res/values-my-rMM/strings.xml b/core/res/res/values-my-rMM/strings.xml index c5fbeee85403..ba745efa97ab 100644 --- a/core/res/res/values-my-rMM/strings.xml +++ b/core/res/res/values-my-rMM/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"စာတို လုပ်ဆောင်ချက်"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"သိမ်းဆည်သော နေရာ နည်းနေပါသည်"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"တချို့ စနစ်လုပ်ငန်းများ အလုပ် မလုပ်ခြင်း ဖြစ်နိုင်ပါသည်"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> က အလုပ်လုပ်နေသည်။"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"အချက်အလက်များ ပိုသိရန် သို့မဟုတ် အပလီကေးရှင်းကို ရပ်ရန် တို့ထိလိုက်ပါ။"</string> <string name="ok" msgid="5970060430562524910">"ကောင်းပြီ"</string> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 0ae7ce8d2cf5..d0767a708297 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Teksthandlinger"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Lite ledig lagringsplass"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Enkelte systemfunksjoner fungerer muligens ikke slik de skal"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> kjører"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Trykk for mer informasjon, eller for å stoppe appen."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-ne-rNP/strings.xml b/core/res/res/values-ne-rNP/strings.xml index 6eb59a334a0a..78ae31d5a6d1 100644 --- a/core/res/res/values-ne-rNP/strings.xml +++ b/core/res/res/values-ne-rNP/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"पाठ कार्यहरू"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"भण्डारण ठाउँ सकिँदै छ"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"सायद केही प्रणाली कार्यक्रमहरूले काम गर्दैनन्"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> चलिरहेको छ"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"थप सूचनाको लागि छुनुहोस् वा अनुप्रयोग बन्द गर्नुहोस्।"</string> <string name="ok" msgid="5970060430562524910">"ठिक छ"</string> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 937943c1f9c1..14f3c15e04d0 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tekstacties"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Opslagruimte is bijna vol"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Bepaalde systeemfuncties werken mogelijk niet"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> wordt uitgevoerd"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Raak aan voor meer informatie of om de app te stoppen."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 27923924d722..1b26a3138c08 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Działania na tekście"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Kończy się miejsce"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Niektóre funkcje systemu mogą nie działać"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"Aplikacja <xliff:g id="APP_NAME">%1$s</xliff:g> jest uruchomiona"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Kliknij, aby uzyskać więcej informacji lub zatrzymać aplikację."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 52a5f46aced7..d3c86bda1d5f 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Acções de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Está quase sem espaço de armazenamento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Algumas funções do sistema poderão não funcionar"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> em execução"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Toque para obter mais informações ou para parar a aplicação."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index b9463d2feb41..8b2bd5a4065c 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Ações de texto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Pouco espaço de armazenamento"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Algumas funções do sistema podem não funcionar"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> está em execução"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Toque para mais informações ou para parar o app."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar com %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Compartilhar com"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Compartilhar com %1$s"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"Selecione um app de Página inicial"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Usar %1$s como Página inicial"</string> <string name="alwaysUse" msgid="4583018368000610438">"Usar como padrão para esta ação."</string> <string name="use_a_different_app" msgid="8134926230585710243">"Usar um app diferente"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Padrão claro em Configurações do sistema > Apps > Baixado."</string> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 329640e4cecd..ed234ebffdd3 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Acţiuni pentru text"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Spaţiul de stocare aproape ocupat"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Este posibil ca unele funcţii de sistem să nu funcţioneze"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> rulează acum"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Atingeți pentru mai multe informații sau pentru a opri aplicația."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editați cu %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Distribuiți cu"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Distribuiți cu %1$s"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"Selectați o aplicație de pe ecranul de pornire"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Utilizați %1$s ca Pagină de pornire"</string> <string name="alwaysUse" msgid="4583018368000610438">"Se utilizează în mod prestabilit pentru această acţiune."</string> <string name="use_a_different_app" msgid="8134926230585710243">"Utilizați altă aplicație"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Ștergeţi setările prestabilite din Setări de sistem > Aplicaţii > Descărcate."</string> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 2f0695e53f34..d44e3df46b6a 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Операции с текстом"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Недостаточно памяти"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Некоторые функции могут не работать"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"Приложение \"<xliff:g id="APP_NAME">%1$s</xliff:g>\" выполняется"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Нажмите, чтобы получить дополнительные данные или выключить приложение."</string> <string name="ok" msgid="5970060430562524910">"ОК"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Редактировать с помощью приложения \"%1$s\""</string> <string name="whichSendApplication" msgid="6902512414057341668">"Поделиться с помощью приложения:"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Предоставлять доступ с помощью приложения \"%1$s\""</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"Выберите главное приложение"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Назначьте приложение \"%1$s\" главным"</string> <string name="alwaysUse" msgid="4583018368000610438">"По умолчанию для этого действия"</string> <string name="use_a_different_app" msgid="8134926230585710243">"Другое приложение"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Удаляет настройки по умолчанию в меню \"Настройки > Приложения > Загруженные\"."</string> diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si-rLK/strings.xml index 2f5e3b344c7e..85eeea395061 100644 --- a/core/res/res/values-si-rLK/strings.xml +++ b/core/res/res/values-si-rLK/strings.xml @@ -1185,6 +1185,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"පෙළ ක්රියාවන්"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"ආචයනය ඉඩ ප්රමාණය අඩු වී ඇත"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"සමහර පද්ධති කාර්යයන් ක්රියා නොකරනු ඇත"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> ධාවනය වේ"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"වැඩිපුර තොරතුරු හෝ යෙදුම නැවතීම සඳහා ස්පර්ශ කරන්න."</string> <string name="ok" msgid="5970060430562524910">"හරි"</string> @@ -1203,10 +1205,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s සමඟ සංස්කරණය කරන්න"</string> <string name="whichSendApplication" msgid="6902512414057341668">"සමඟ බෙදාගන්න"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%s සමඟ බෙදාගන්න"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"මුල් පිටු යෙදුම තෝරන්න"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"මුල් පිටු යෙදුම ලෙස %1$s න් භාවිතා කරන්න"</string> <string name="alwaysUse" msgid="4583018368000610438">"මෙම ක්රියාව සඳහා සුපුරුද්දෙන් භාවිත කරන්න."</string> <string name="use_a_different_app" msgid="8134926230585710243">"වෙනත් යෙදුමක් භාවිතා කරන්න"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"පද්ධති සැකසීම් > යෙදුම් > බාගැනීම් තුළ ඇති සුපුරුද්ද හිස් කරන්න."</string> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 175089187678..dd72884f71de 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Operácie s textom"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Nedostatok ukladacieho priestoru"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Niektoré systémové funkcie nemusia fungovať"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"Aplikácia <xliff:g id="APP_NAME">%1$s</xliff:g> je spustená"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Dotykom si zobrazíte viac informácií alebo zastavíte aplikáciu."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Upraviť v aplikácii %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Zdieľať v aplikácii"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Zdieľať v aplikácii %1$s"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"Výber aplikácie na plochu"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Ako plochu používať aplikáciu %1$s"</string> <string name="alwaysUse" msgid="4583018368000610438">"Použiť ako predvolené nastavenie pre túto akciu."</string> <string name="use_a_different_app" msgid="8134926230585710243">"Použiť inú aplikáciu"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Vymazať predvolené nastavenia v sekcii Nastavenia systému > Aplikácie > Stiahnuté položky."</string> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index d471593e652e..7e73acb3e0ea 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Besedilna dejanja"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Prostor za shranjevanje bo pošel"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Nekatere sistemske funkcije morda ne delujejo"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> se izvaja"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Dotaknite se, če želite izvedeti več ali ustaviti aplikacijo."</string> <string name="ok" msgid="5970060430562524910">"V redu"</string> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 735656d0cbd9..0b1c387d4be4 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Радње у вези са текстом"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Простор за складиштење је на измаку"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Неке системске функције можда не функционишу"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"Апликација <xliff:g id="APP_NAME">%1$s</xliff:g> је покренута"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Додирните за више информација или заустављање апликације."</string> <string name="ok" msgid="5970060430562524910">"Потврди"</string> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index d3df5ee6a207..c32afdef8f3c 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Textåtgärder"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Lagringsutrymmet börjar ta slut"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Det kan hända att vissa systemfunktioner inte fungerar"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> körs"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Tryck om du vill veta mer eller stoppa appen."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index c6d36a7af277..48923c88b1f1 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Vitendo vya maandishi"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Nafasi ya kuhafadhi inakwisha"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Baadhi ya vipengee vya mfumo huenda visifanye kazi"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> inatumiwa"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Gusa ili upate maelezo zaidi au usitishe programu."</string> <string name="ok" msgid="5970060430562524910">"Sawa"</string> diff --git a/core/res/res/values-ta-rIN/strings.xml b/core/res/res/values-ta-rIN/strings.xml index eb4c74811c4e..a8345b9c80bb 100644 --- a/core/res/res/values-ta-rIN/strings.xml +++ b/core/res/res/values-ta-rIN/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"உரை நடவடிக்கைகள்"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"சேமிப்பிடம் குறைகிறது"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"சில அமைப்பு செயல்பாடுகள் வேலை செய்யாமல் போகலாம்"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> இயக்குகிறது"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"மேலும் தகவலுக்கு அல்லது பயன்பாட்டை நிறுத்துவதற்கு, தொடவும்."</string> <string name="ok" msgid="5970060430562524910">"சரி"</string> diff --git a/core/res/res/values-te-rIN/strings.xml b/core/res/res/values-te-rIN/strings.xml index d3df8f3530a9..005e338b24d3 100644 --- a/core/res/res/values-te-rIN/strings.xml +++ b/core/res/res/values-te-rIN/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"వచనానికి సంబంధించిన చర్యలు"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"నిల్వ ఖాళీ అయిపోతోంది"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"కొన్ని సిస్టమ్ కార్యాచరణలు పని చేయకపోవచ్చు"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> అమలులో ఉంది"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"మరింత సమాచారం కోసం లేదా అనువర్తనాన్ని ఆపివేయడం కోసం తాకండి."</string> <string name="ok" msgid="5970060430562524910">"సరే"</string> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 19853991fc2a..9cc130439066 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"การทำงานของข้อความ"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"พื้นที่จัดเก็บเหลือน้อย"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"บางฟังก์ชันระบบอาจไม่ทำงาน"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> กำลังทำงาน"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"แตะเพื่อดูข้อมูลเพิ่มเติมหรือเพื่อหยุดแอป"</string> <string name="ok" msgid="5970060430562524910">"ตกลง"</string> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index c9591d41768d..4776592cb873 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Pagkilos ng teksto"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Nauubusan na ang puwang ng storage"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Maaaring hindi gumana nang tama ang ilang paggana ng system"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"Tumatakbo ang <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Pindutin para sa higit pang impormasyon o upang ihinto ang app."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"I-edit gamit ang %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Ibahagi gamit ang"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Ibahagi gamit ang %1$s"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"Pumili ng app sa Home"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Gamitin ang %1$s bilang Home"</string> <string name="alwaysUse" msgid="4583018368000610438">"Gamitin bilang default para sa pagkilos na ito."</string> <string name="use_a_different_app" msgid="8134926230585710243">"Gumamit ng ibang app"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"I-clear ang default sa mga setting ng System > Apps > Na-download."</string> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index aa7df86bcc8d..9e08ea77b886 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Metin eylemleri"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Depolama alanı bitiyor"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Bazı sistem işlevleri çalışmayabilir"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> çalışıyor"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Daha fazla bilgi edinmek için veya uygulamayı durdurmak için dokunun."</string> <string name="ok" msgid="5970060430562524910">"Tamam"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ile düzenle"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Şununla paylaş:"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ile paylaş"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"Ana Ekran uygulaması seçin"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Ana Ekran olarak %1$s uygulamasını kullanın"</string> <string name="alwaysUse" msgid="4583018368000610438">"Varsayılan olarak bu işlem için kullan."</string> <string name="use_a_different_app" msgid="8134926230585710243">"Farklı bir uygulama kullan"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Sistem ayarları > Uygulamalar > İndirilen bölümünden varsayılanı temizleyin."</string> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index f5a28948b1f8..6c441145af05 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Дії з текстом"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Закінчується пам’ять"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Деякі системні функції можуть не працювати"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> працює"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Торкніться, щоб дізнатися більше або зупинити програму."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> diff --git a/core/res/res/values-ur-rPK/strings.xml b/core/res/res/values-ur-rPK/strings.xml index aa5a2dfcb885..7498934fa5c3 100644 --- a/core/res/res/values-ur-rPK/strings.xml +++ b/core/res/res/values-ur-rPK/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"متن کی کارروائیاں"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"اسٹوریج کی جگہ ختم ہو رہی ہے"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"ممکن ہے سسٹم کے کچھ فنکشنز کام نہ کریں"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> چل رہا ہے"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"مزید معلومات کیلئے یا ایپ کو روکنے کیلئے ٹچ کریں۔"</string> <string name="ok" msgid="5970060430562524910">"ٹھیک ہے"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s کے ساتھ ترمیم کریں"</string> <string name="whichSendApplication" msgid="6902512414057341668">"اس کے ساتھ اشتراک کریں"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s کے ساتھ اشتراک کریں"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"ایک Home ایپ منتخب کریں"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s کو Home کے بطور استعمال کریں"</string> <string name="alwaysUse" msgid="4583018368000610438">"اس کارروائی کیلئے بطور ڈیفالٹ استعمال کریں۔"</string> <string name="use_a_different_app" msgid="8134926230585710243">"ایک مختلف ایپ استعمال کریں"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"سسٹم ترتیبات > ایپس > ڈاؤن لوڈ کردہ میں ڈیفالٹ صاف کریں۔"</string> diff --git a/core/res/res/values-uz-rUZ/strings.xml b/core/res/res/values-uz-rUZ/strings.xml index 8b6c06275c87..01f7e1f9c54f 100644 --- a/core/res/res/values-uz-rUZ/strings.xml +++ b/core/res/res/values-uz-rUZ/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Matn yozish"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Xotirada bo‘sh joy tugamoqda"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Ba‘zi tizim funksiyalari ishlamasligi mumkin"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> ishlamoqda"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Ilova dasturni to‘xtatish yoki tafsilotlar uchun bosing."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"“%1$s” yordamida tahrirlash"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Ulashish…"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"“%1$s” orqali ulashish"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"Bosh ilovani tanlash"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s: Bosh ilova sifatida foydalanish"</string> <string name="alwaysUse" msgid="4583018368000610438">"Ushbu amaldan standart sifatida foydalanish"</string> <string name="use_a_different_app" msgid="8134926230585710243">"Boshqa ilovadan foydalanish"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Birlamchi sozlamalarni Tizim sozlamalari > Ilovalar > Yuklab olingan menyusidan tozalang."</string> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 6c2f1e31a4d2..0227e7f7072d 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Tác vụ văn bản"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Sắp hết dung lượng lưu trữ"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Một số chức năng hệ thống có thể không hoạt động"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> đang chạy"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Chạm để xem thêm thông tin hoặc dừng ứng dụng."</string> <string name="ok" msgid="5970060430562524910">"OK"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Chỉnh sửa bằng %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Chia sẻ với"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Chia sẻ với %1$s"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"Chọn ứng dụng Home"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Sử dụng %1$s làm Home"</string> <string name="alwaysUse" msgid="4583018368000610438">"Sử dụng theo mặc định đối với tác vụ này."</string> <string name="use_a_different_app" msgid="8134926230585710243">"Sử dụng một ứng dụng khác"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Xóa mặc định trong Cài đặt hệ thống > Ứng dụng > Đã tải xuống."</string> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 4f031292280e..d8aba3e8e8e5 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"文字操作"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"存储空间不足"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"某些系统功能可能无法正常使用"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"“<xliff:g id="APP_NAME">%1$s</xliff:g>”正在运行"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"触摸即可了解详情或停止应用。"</string> <string name="ok" msgid="5970060430562524910">"确定"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"使用%1$s编辑"</string> <string name="whichSendApplication" msgid="6902512414057341668">"分享方式"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"使用%1$s分享"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"选择主屏幕应用"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"将“%1$s”设为主屏幕应用"</string> <string name="alwaysUse" msgid="4583018368000610438">"设为默认选项。"</string> <string name="use_a_different_app" msgid="8134926230585710243">"使用其他应用"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"在“系统设置”>“应用”>“已下载”中清除默认设置。"</string> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index ab4bf67f8216..1a498b3b2748 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"文字操作"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"儲存空間即將用盡"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"部分系統功能可能無法運作"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」執行中"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"輕觸即可瞭解詳情或停止應用程式。"</string> <string name="ok" msgid="5970060430562524910">"確定"</string> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 08cbca92a8d9..39078b92f5bb 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"文字動作"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"儲存空間即將用盡"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"部分系統功能可能無法運作"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」目前正在執行"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"輕觸即可瞭解詳情或停止應用程式。"</string> <string name="ok" msgid="5970060430562524910">"確定"</string> @@ -1201,10 +1203,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"使用 %1$s 編輯"</string> <string name="whichSendApplication" msgid="6902512414057341668">"選擇分享工具"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"透過 %1$s 分享"</string> - <!-- no translation found for whichHomeApplication (4307587691506919691) --> - <skip /> - <!-- no translation found for whichHomeApplicationNamed (4493438593214760979) --> - <skip /> + <string name="whichHomeApplication" msgid="4307587691506919691">"選取主螢幕應用程式"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"使用「%1$s」做為主螢幕"</string> <string name="alwaysUse" msgid="4583018368000610438">"設為預設應用程式。"</string> <string name="use_a_different_app" msgid="8134926230585710243">"使用其他應用程式"</string> <string name="clearDefaultHintMsg" msgid="3252584689512077257">"前往 [系統設定] > [應用程式] > [下載] 清除預設值。"</string> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 59b760b64f34..15c4306764cd 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -1183,6 +1183,8 @@ <string name="editTextMenuTitle" msgid="4909135564941815494">"Izenzo zombhalo"</string> <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Isikhala sokulondoloza siyaphela"</string> <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Eminye imisebenzi yohlelo ingahle ingasebenzi"</string> + <!-- no translation found for low_internal_storage_view_text_no_boot (6935190099204693424) --> + <skip /> <string name="app_running_notification_title" msgid="8718335121060787914">"I-<xliff:g id="APP_NAME">%1$s</xliff:g> iyasebenza"</string> <string name="app_running_notification_text" msgid="4653586947747330058">"Thinta ukuthola ulwazi oluningi noma ukumisa uhlelo lokusebenza."</string> <string name="ok" msgid="5970060430562524910">"KULUNGILE"</string> diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml index 824ed9efb677..26d313371ae1 100644 --- a/core/res/res/values/dimens.xml +++ b/core/res/res/values/dimens.xml @@ -412,7 +412,7 @@ <dimen name="light_y">-200dp</dimen> <dimen name="light_z">800dp</dimen> <dimen name="light_radius">800dp</dimen> - <item type="dimen" format="float" name="ambient_shadow_alpha">0.047</item> - <item type="dimen" format="float" name="spot_shadow_alpha">0.098</item> + <item type="dimen" format="float" name="ambient_shadow_alpha">0.075</item> + <item type="dimen" format="float" name="spot_shadow_alpha">0.15</item> </resources> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index f2b7d7be5f6f..081f8ae23c8b 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1696,6 +1696,7 @@ <java-symbol type="string" name="launch_warning_replace" /> <java-symbol type="string" name="launch_warning_title" /> <java-symbol type="string" name="low_internal_storage_view_text" /> + <java-symbol type="string" name="low_internal_storage_view_text_no_boot" /> <java-symbol type="string" name="low_internal_storage_view_title" /> <java-symbol type="string" name="notification_listener_binding_label" /> <java-symbol type="string" name="condition_provider_service_binding_label" /> diff --git a/data/etc/platform.xml b/data/etc/platform.xml index 91f58969b16c..d3869b8abf77 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -113,6 +113,12 @@ <group gid="loop_radio" /> </permission> + <!-- Hotword training apps sometimes need a GID to talk with low-level + hardware; give them audio for now until full HAL support is added. --> + <permission name="android.permission.MANAGE_VOICE_KEYPHRASES"> + <group gid="audio" /> + </permission> + <!-- ================================================================== --> <!-- ================================================================== --> <!-- ================================================================== --> diff --git a/docs/html/google/gcm/ccs.jd b/docs/html/google/gcm/ccs.jd index 1c7c8021b766..2faf97f3829d 100644 --- a/docs/html/google/gcm/ccs.jd +++ b/docs/html/google/gcm/ccs.jd @@ -81,10 +81,14 @@ Java sample using the Smack library</a>.</p> <p>The CCS XMPP endpoint runs at {@code gcm.googleapis.com:5235}. When testing functionality (with non-production users), you should instead connect to -{@code gcm-staging.googleapis.com:5236} (note the different port). Testing on -staging (a smaller environment where the latest CCS builds run) is beneficial -both for isolating real users from test code, as well as for early detection of -unexpected behavior changes.</p> +{@code gcm-preprod.googleapis.com:5236} (note the different port). Regular +testing on preprod (a smaller environment where the latest CCS builds run) is +beneficial both for isolating real users from test code, as well as for early +detection of unexpected behavior changes. Note that a connection receives upstream +messages destined for its GCM sender ID, regardless of which environment (gcm or +gcm-preprod) it is connected to. Therefore, test code connecting to +{@code gcm-preprod.googleapis.com:5236} should use a different GCM sender ID to +avoid upstream messages from production traffic being sent over test connections.</p> <p>The connection has two important requirements:</p> diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 2bbdfc8c7489..9ed70ed0d722 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -246,11 +246,9 @@ This is the Android Software Development Kit License Agreement <p>The Android SDK provides you the API libraries and developer tools necessary to build, test, and debug apps for Android.</p> -<p>If you're a new Android developer, we recommend you download the ADT Bundle -to quickly start developing apps. It includes the essential -Android SDK components and a version of the Eclipse IDE with built-in -<b>ADT (Android Developer Tools)</b> to -streamline your Android app development.</p> +<p>Download the ADT Bundle to quickly start developing apps. It includes the essential Android +SDK components and a version of the Eclipse IDE with built-in <b>ADT (Android Developer Tools)</b> +to streamline your Android app development.</p> <!-- this appears when viewing the online docs --> diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp index 61a767cc0c4f..8cef13765cc2 100644 --- a/libs/androidfw/ResourceTypes.cpp +++ b/libs/androidfw/ResourceTypes.cpp @@ -1185,11 +1185,7 @@ uint32_t ResXMLParser::getAttributeNameResID(size_t idx) const { int32_t id = getAttributeNameID(idx); if (id >= 0 && (size_t)id < mTree.mNumResIds) { - uint32_t resId = dtohl(mTree.mResIds[id]); - if (mTree.mDynamicRefTable == NULL || - mTree.mDynamicRefTable->lookupResourceId(&resId) == NO_ERROR) { - return resId; - } + return dtohl(mTree.mResIds[id]); } return 0; } diff --git a/libs/hwui/ShadowTessellator.cpp b/libs/hwui/ShadowTessellator.cpp index 35cc7a4fd69d..c1ffa0ab4807 100644 --- a/libs/hwui/ShadowTessellator.cpp +++ b/libs/hwui/ShadowTessellator.cpp @@ -37,7 +37,7 @@ void ShadowTessellator::tessellateAmbientShadow(bool isCasterOpaque, // A bunch of parameters to tweak the shadow. // TODO: Allow some of these changable by debug settings or APIs. - float heightFactor = 1.0f / 86; + float heightFactor = 1.0f / 128; const float geomFactor = 64; Caches& caches = Caches::getInstance(); diff --git a/media/java/android/media/tv/TvContentRating.java b/media/java/android/media/tv/TvContentRating.java index b4ec2b37c6e9..c539290d0ab0 100644 --- a/media/java/android/media/tv/TvContentRating.java +++ b/media/java/android/media/tv/TvContentRating.java @@ -155,14 +155,6 @@ import java.util.Objects; * <th>Description</th> * </tr> * <tr> - * <td>AM_TV_RS</td> - * <td>Range specific TV content rating system strings for Armenia</td> - * </tr> - * <tr> - * <td>AM_TV_AS</td> - * <td>Age specific TV content rating system strings for Armenia</td> - * </tr> - * <tr> * <td>AR_TV</td> * <td>TV content rating system for Argentina</td> * </tr> @@ -171,182 +163,37 @@ import java.util.Objects; * <td>TV content rating system for Australia</td> * </tr> * <tr> - * <td>BG_TV</td> - * <td>TV content rating system for Bulgaria</td> - * </tr> - * <tr> * <td>BR_TV</td> * <td>TV content rating system for Brazil</td> * </tr> * <tr> - * <td>CA_TV_CA</td> - * <td>TV content rating system for Canada (Canadian)</td> - * </tr> - * <tr> - * <td>CA_TV_QC</td> - * <td>TV content rating system for Canada (Quebec)</td> - * </tr> - * <tr> - * <td>CH_TV</td> - * <td>TV content rating system for Switzerland</td> - * </tr> - * <tr> - * <td>CL_TV</td> - * <td>TV content rating system for Chile</td> - * </tr> - * <tr> - * <td>DE_TV</td> - * <td>TV content rating system for Germany</td> - * </tr> - * <tr> - * <td>DK_TV</td> - * <td>TV content rating system for Denmark</td> - * </tr> - * <tr> - * <td>ES_TV</td> - * <td>TV content rating system for Spain</td> - * </tr> - * <tr> - * <td>FI_TV</td> - * <td>TV content rating system for Finland</td> - * </tr> - * <tr> - * <td>FR_TV</td> - * <td>TV content rating system for France</td> - * </tr> - * <tr> - * <td>GR_TV</td> - * <td>TV content rating system for Greece</td> - * </tr> - * <tr> - * <td>HK_TV</td> - * <td>TV content rating system for Hong Kong</td> + * <td>DVB</td> + * <td>DVB content rating system</td> * </tr> * <tr> - * <td>HU_TV</td> - * <td>TV content rating system for Hungary</td> + * <td>ES_DVB</td> + * <td>DVB content rating system for Spain</td> * </tr> * <tr> - * <td>ID_TV</td> - * <td>TV content rating system for Indonesia</td> + * <td>FR_DVB</td> + * <td>DVB content rating system for France</td> * </tr> * <tr> - * <td>IE_TV</td> - * <td>TV content rating system for Ireland</td> - * </tr> - * <tr> - * <td>IL_TV</td> - * <td>TV content rating system for Israel</td> - * </tr> - * <tr> - * <td>IN_TV</td> - * <td>TV content rating system for India</td> - * </tr> - * <tr> - * <td>IS_TV</td> - * <td>TV content rating system for Iceland</td> - * </tr> - * <tr> - * <td>JP_TV</td> - * <td>TV content rating system for Japan</td> + * <td>ISDB</td> + * <td>ISDB content rating system</td> * </tr> * <tr> * <td>KR_TV</td> * <td>TV content rating system for South Korea</td> * </tr> * <tr> - * <td>MV_TV</td> - * <td>TV content rating system for Maldives</td> - * </tr> - * <tr> - * <td>MX_TV</td> - * <td>TV content rating system for Mexico</td> - * </tr> - * <tr> - * <td>MY_TV</td> - * <td>TV content rating system for Malaysia</td> - * </tr> - * <tr> - * <td>NL_TV</td> - * <td>TV content rating system for Netherlands</td> - * </tr> - * <tr> - * <td>NZ_FTV</td> - * <td>TV content rating system for free-to-air channels in New Zealand</td> - * </tr> - * <tr> - * <td>NZ_PTV</td> - * <td>TV content rating system for Pay TV channels in New Zealand</td> - * </tr> - * <tr> - * <td>PE_TV</td> - * <td>TV content rating system for some Peruvian channels in Peru</td> - * </tr> - * <tr> - * <td>PE_ATV</td> - * <td>TV content rating system for America Television in Peru that uses its own rating - * system</td> - * </tr> - * <tr> - * <td>PH_TV</td> - * <td>TV content rating system for Philippines</td> - * </tr> - * <tr> - * <td>PL_TV</td> - * <td>TV content rating system for Poland</td> - * </tr> - * <tr> - * <td>PT_TV</td> - * <td>TV content rating system for Portugal</td> - * </tr> - * <tr> - * <td>RO_TV</td> - * <td>TV content rating system for Romania</td> - * </tr> - * <tr> - * <td>RU_TV</td> - * <td>TV content rating system for Russia</td> - * </tr> - * <tr> - * <td>RS_TV</td> - * <td>TV content rating system for Serbia</td> - * </tr> - * <tr> * <td>SG_TV</td> * <td>TV content rating system for Singapore</td> * </tr> * <tr> - * <td>SI_TV</td> - * <td>TV content rating system for Slovenia</td> - * </tr> - * <tr> - * <td>TH_TV</td> - * <td>TV content rating system for Thailand</td> - * </tr> - * <tr> - * <td>TR_TV</td> - * <td>TV content rating system for Turkey</td> - * </tr> - * <tr> - * <td>TW_TV</td> - * <td>TV content rating system for Taiwan</td> - * </tr> - * <tr> - * <td>UA_TV</td> - * <td>TV content rating system for Ukraine</td> - * </tr> - * <tr> * <td>US_TV</td> * <td>TV content rating system for the United States</td> * </tr> - * <tr> - * <td>VE_TV</td> - * <td>TV content rating system for Venezuela</td> - * </tr> - * <tr> - * <td>ZA_TV</td> - * <td>TV content rating system for South Africa</td> - * </tr> * </table> * * <h4>System defined strings for ratings</h4> @@ -357,137 +204,61 @@ import java.util.Objects; * <th>Description</th> * </tr> * <tr> - * <td valign="top" rowspan="6">AM_TV_RS</td> - * <td>AM_TV_RS_Y</td> - * <td>Suitable for ages 2-11</td> - * </tr> - * <tr> - * <td>AM_TV_RS_Y7</td> - * <td>Suitable for ages 7-16</td> - * </tr> - * <tr> - * <td>AM_TV_RS_GA</td> - * <td>Suitable for general audiences</td> - * </tr> - * <tr> - * <td>AM_TV_RS_TW</td> - * <td>Suitable for teens ages 9 and up</td> - * </tr> - * <tr> - * <td>AM_TV_RS_T</td> - * <td>Suitable for teens ages 12 and up</td> - * </tr> - * <tr> - * <td>AM_TV_RS_A</td> - * <td>Suitable only for adults ages 18 and up</td> - * </tr> - * <tr> - * <td valign="top" rowspan="6">AM_TV_AS</td> - * <td>AM_TV_AS_EC</td> - * <td>Suitable for ages 2 and up</td> - * </tr> - * <tr> - * <td>AM_TV_AS_E</td> - * <td>Suitable for ages 5 and up</td> - * </tr> - * <tr> - * <td>AM_TV_AS_E9</td> - * <td>Suitable for ages 9 and up</td> - * </tr> - * <tr> - * <td>AM_TV_AS_T</td> - * <td>Suitable for ages 12 and up</td> - * </tr> - * <tr> - * <td>AM_TV_AS_M</td> - * <td>Suitable for ages 16 and up</td> - * </tr> - * <tr> - * <td>AM_TV_AS_AO</td> - * <td>Suitable for ages 17 and up</td> - * </tr> - * <tr> * <td valign="top" rowspan="4">AR_TV</td> - * <td>AR_TV_ALL</td> + * <td>AR_TV_ATP</td> * <td>Suitable for all audiences. Programs may contain mild violence, language and mature * situations</td> * </tr> * <tr> - * <td>AR_TV_13</td> + * <td>AR_TV_SAM_13</td> * <td>Suitable for ages 13 and up. Programs may contain mild to moderate language and mild * violence and sexual references</td> * </tr> * <tr> - * <td>AR_TV_16</td> + * <td>AR_TV_SAM_16</td> * <td>Suitable for ages 16 and up. Programs may contain more intensive violence and coarse * language, partial nudity and moderate sexual references</td> * </tr> * <tr> - * <td>AR_TV_18</td> + * <td>AR_TV_SAM_18</td> * <td>Suitable for mature audiences only. Programs contain strong violence, coarse language * and explicit sexual references</td> * </tr> * <tr> - * <td valign="top" rowspan="7">AU_TV</td> - * <td>AU_TV_CTC</td> - * <td>This has advertising approval, but is not yet classified</td> + * <td valign="top" rowspan="8">AU_TV</td> + * <td>AU_TV_P</td> + * <td>Recommended for younger children aged between 2 and 11 years</td> + * </tr> + * <tr> + * <td>AU_TV_C</td> + * <td>Recommended for older children aged between 5 and 14 years</td> * </tr> * <tr> * <td>AU_TV_G</td> - * <td>The content is very mild in impact, and suitable for everyone</td> + * <td>Recommended for all ages</td> * </tr> * <tr> * <td>AU_TV_PG</td> - * <td>The content is mild in impact, but it may contain content that children find - * confusing or upsetting and may require the guidance or parents and guardians</td> + * <td>Parental guidance is recommended for young viewers under 15</td> * </tr> * <tr> * <td>AU_TV_M</td> - * <td>The content is moderate in impact, and it is recommended for teenagers aged 15 years - * and over</td> - * </tr> - * <tr> - * <td>AU_TV_MA15</td> - * <td>The content is strong in impact, and it is legally restricted to persons 15 years and - * over</td> + * <td>Recommended for mature audiences aged 15 years and over</td> * </tr> * <tr> - * <td>AU_TV_R18</td> - * <td>The content is high in impact, and it is restricted to adults</td> + * <td>AU_TV_MA</td> + * <td>Not suitable for children and teens under 15, due to sexual descriptions, course + * language, adult themes or drug use</td> * </tr> * <tr> - * <td>AU_TV_X18</td> - * <td>The content is restricted to adults. This classification is a special and legally - * restricted category which contains only sexually explicit content</td> + * <td>AU_TV_AV</td> + * <td>Not suitable for children and teens under 15. This category is used specifically for + * violent programs</td> * </tr> * <tr> - * <td valign="top" rowspan="5">BG_TV</td> - * <td>BG_TV_A</td> - * <td>Recommended to children. When the film confirms the ideals of humanism or popularizes - * the national and world cultures or contributes to upbringing children</td> - * </tr> - * <tr> - * <td>BG_TV_B</td> - * <td>No restrictive recommendations from the Committee. When the film is in no way - * contrary to the universal rules of morality in this country, has no restrictive - * recommendations from the Committee and does not fall in rating A</td> - * </tr> - * <tr> - * <td>BG_TV_C</td> - * <td>No persons under the age of 12 are admitted unless accompanied by an adult. When the - * film contains certain erotic scenes or scenes with drinking, taking drugs or stimulants - * or a few scenes of violence</td> - * </tr> - * <tr> - * <td>BG_TV_D</td> - * <td>No persons under the age of 16 are admitted. When the film contains quite a number of - * erotic scenes or scenes with drinking, taking drugs or stimulants or a considerable - * number of scenes showing violence</td> - * </tr> - * <tr> - * <td>BG_TV_X</td> - * <td>No persons under the age of 18 are admitted. When the film is naturalistically erotic - * or shows violence in an ostentatious manner</td> + * <td>AU_TV_R</td> + * <td>Not for children under 18. Content may include graphic violence, sexual situations, + * coarse language and explicit drug use</td> * </tr> * <tr> * <td valign="top" rowspan="6">BR_TV</td> @@ -515,422 +286,272 @@ import java.util.Objects; * <td>Content suitable for viewers over the age of 18</td> * </tr> * <tr> - * <td valign="top" rowspan="7">CA_TV_CA</td> - * <td>CA_TV_CA_EXEMPT</td> - * <td>Exempt from ratings and won't display an on-screen rating</td> - * </tr> - * <tr> - * <td>CA_TV_CA_C</td> - * <td>Suitable for children ages 2-7. May contain mild violence</td> - * </tr> - * <tr> - * <td>CA_TV_CA_C8</td> - * <td>Suitable for children ages 8 and older. May contain mild violence, fantasy horror, - * and socially offensive language</td> - * </tr> - * <tr> - * <td>CA_TV_CA_G</td> - * <td>Suitable for the entire family and may contain mild violence, profanity, and censored - * language</td> - * </tr> - * <tr> - * <td>CA_TV_CA_PG</td> - * <td>May contain moderate violence, profanity, nudity, and sexual references</td> - * </tr> - * <tr> - * <td>CA_TV_CA_14</td> - * <td>Intended for viewers ages 14 and older. May contain strong violence and profanity, - * and depictions of sexual activity</td> - * </tr> - * <tr> - * <td>CA_TV_CA_18</td> - * <td>Intended for viewers ages 18 and older. May contain explicit violence and sexual - * activity</td> - * </tr> - * <tr> - * <td valign="top" rowspan="6">CA_TV_QC</td> - * <td>CA_TV_QC_E</td> - * <td>Exempt from ratings and won't display an on-screen rating</td> + * <td valign="top" rowspan="15">DVB</td> + * <td>DVB_4</td> + * <td>Recommended for ages 4 and over</td> * </tr> * <tr> - * <td>CA_TV_QC_G</td> - * <td>Appropriate for all ages and must contain little or no violence and little to no - * sexual content</td> + * <td>DVB_5</td> + * <td>Recommended for ages 5 and over</td> * </tr> * <tr> - * <td>CA_TV_QC_8</td> - * <td>Appropriate for children 8 and may contain with little violence, language, and little - * to no sexual situations</td> + * <td>DVB_6</td> + * <td>Recommended for ages 6 and over</td> * </tr> * <tr> - * <td>CA_TV_QC_13</td> - * <td>Suitable for children 13 and may contain with moderate violence, language, and some - * sexual situations</td> + * <td>DVB_7</td> + * <td>Recommended for ages 7 and over</td> * </tr> * <tr> - * <td>CA_TV_QC_16</td> - * <td>Recommended for children over the age of 16 and may contain with strong violence, - * strong language, and strong sexual content</td> + * <td>DVB_8</td> + * <td>Recommended for ages 8 and over</td> * </tr> * <tr> - * <td>CA_TV_QC_18</td> - * <td>Only to be viewed by adults and may contain extreme violence and graphic sexual - * content. It is mostly used for 18+ movies and pornography</td> + * <td>DVB_9</td> + * <td>Recommended for ages 9 and over</td> * </tr> * <tr> - * <td valign="top" rowspan="2">CH_TV</td> - * <td>CH_TV_ALL</td> - * <td>This program is suitable for all ages</td> + * <td>DVB_10</td> + * <td>Recommended for ages 10 and over</td> * </tr> * <tr> - * <td>CH_TV_RED</td> - * <td>This program contains scenes that may hurt sensitive people, therefore the red symbol - * will be displayed</td> + * <td>DVB_11</td> + * <td>Recommended for ages 11 and over</td> * </tr> * <tr> - * <td valign="top" rowspan="7">CL_TV</td> - * <td>CL_TV_I</td> - * <td>Programs suitable for all children</td> + * <td>DVB_12</td> + * <td>Recommended for ages 12 and over</td> * </tr> * <tr> - * <td>CL_TV_I7</td> - * <td>Programs recommended for children ages 7 or older</td> + * <td>DVB_13</td> + * <td>Recommended for ages 13 and over</td> * </tr> * <tr> - * <td>CL_TV_I10</td> - * <td>Programs recommended for children ages 10 or older</td> + * <td>DVB_14</td> + * <td>Recommended for ages 14 and over</td> * </tr> * <tr> - * <td>CL_TV_I12</td> - * <td>Programs recommended for children and teens ages 12 or older</td> + * <td>DVB_15</td> + * <td>Recommended for ages 15 and over</td> * </tr> * <tr> - * <td>CL_TV_F</td> - * <td>Programs suitable for a general audience, with content appropriate for all ages</td> + * <td>DVB_16</td> + * <td>Recommended for ages 16 and over</td> * </tr> * <tr> - * <td>CL_TV_R</td> - * <td>Programs may content not suitable for children not accompanied by an adult</td> + * <td>DVB_17</td> + * <td>Recommended for ages 17 and over</td> * </tr> * <tr> - * <td>CL_TV_A</td> - * <td>Programs suitable for adult audiences only (ages 18 or older), may contain coarse - * language, and sexual or explicit situations</td> + * <td>DVB_18</td> + * <td>Recommended for ages 18 and over</td> * </tr> * <tr> - * <td valign="top" rowspan="4">DE_TV</td> - * <td>DE_TV_ALL</td> - * <td>The program is suitable for all ages</td> - * </tr> - * <tr> - * <td>DE_TV_12</td> - * <td>The program is not suitable for viewers under the age of 12</td> - * </tr> - * <tr> - * <td>DE_TV_16</td> - * <td>The program is not suitable for viewers under the age of 16</td> - * </tr> - * <tr> - * <td>DE_TV_18</td> - * <td>The program is not suitable for viewers under the age of 18</td> - * </tr> - * <tr> - * <td valign="top" rowspan="4">DK_TV</td> - * <td>DK_TV_G</td> - * <td>programs suitable for all ages</td> - * </tr> - * <tr> - * <td>DK_TV_Y</td> - * <td>programs suitable children accompanied by an adult</td> - * </tr> - * <tr> - * <td>DK_TV_R</td> - * <td>programs containing material with more intensive content</td> - * </tr> - * <tr> - * <td>DK_TV_B</td> - * <td>programs containing explicit content and strictly for adults only</td> - * </tr> - * <tr> - * <td valign="top" rowspan="7">ES_TV</td> - * <td>ES_TV_TP</td> + * <td valign="top" rowspan="18">ES_DVB</td> + * <td>ES_DVB_ALL</td> * <td>Recommended for all ages</td> * </tr> * <tr> - * <td>ES_TV_I</td> - * <td>Specially recommended for preschoolers and kids</td> - * </tr> - * <tr> - * <td>ES_TV_7</td> - * <td>Recommended for people older than 7 years old</td> - * </tr> - * <tr> - * <td>ES_TV_7I</td> - * <td>Recommended for kids older than 7 years old</td> - * </tr> - * <tr> - * <td>ES_TV_12</td> - * <td>Recommended for people older than 12 years old</td> + * <td>ES_DVB_C</td> + * <td>Recommended for children</td> * </tr> * <tr> - * <td>ES_TV_16</td> - * <td>Recommended for people older than 16 years old</td> + * <td>ES_DVB_X</td> + * <td>Recommended for adults</td> * </tr> * <tr> - * <td>ES_TV_18</td> - * <td>Recommended for people older than 18 years old</td> + * <td>ES_DVB_4</td> + * <td>Recommended for ages 4 and over</td> * </tr> * <tr> - * <td valign="top" rowspan="5">FI_TV</td> - * <td>FI_TV_S</td> - * <td>Allowed at all times</td> + * <td>ES_DVB_5</td> + * <td>Recommended for ages 5 and over</td> * </tr> * <tr> - * <td>FI_TV_K7</td> - * <td>Not recommended for children under 7</td> + * <td>ES_DVB_6</td> + * <td>Recommended for ages 6 and over</td> * </tr> * <tr> - * <td>FI_TV_K12</td> - * <td>Not recommended for children under 12</td> + * <td>ES_DVB_7</td> + * <td>Recommended for ages 7 and over</td> * </tr> * <tr> - * <td>FI_TV_K16</td> - * <td>Not recommended for children under 16</td> + * <td>ES_DVB_8</td> + * <td>Recommended for ages 8 and over</td> * </tr> * <tr> - * <td>FI_TV_K18</td> - * <td>Not recommended for children under 18</td> + * <td>ES_DVB_9</td> + * <td>Recommended for ages 9 and over</td> * </tr> * <tr> - * <td valign="top" rowspan="5">FR_TV</td> - * <td>FR_TV_ALL</td> - * <td>Appropriate for all ages</td> + * <td>ES_DVB_10</td> + * <td>Recommended for ages 10 and over</td> * </tr> * <tr> - * <td>FR_TV_10</td> - * <td>Not recommended for children under 10</td> + * <td>ES_DVB_11</td> + * <td>Recommended for ages 11 and over</td> * </tr> * <tr> - * <td>FR_TV_12</td> - * <td>Not recommended for children under 12</td> + * <td>ES_DVB_12</td> + * <td>Recommended for ages 12 and over</td> * </tr> * <tr> - * <td>FR_TV_16</td> - * <td>Not recommended for children under 16</td> + * <td>ES_DVB_13</td> + * <td>Recommended for ages 13 and over</td> * </tr> * <tr> - * <td>FR_TV_18</td> - * <td>Not recommended for persons under 18</td> + * <td>ES_DVB_14</td> + * <td>Recommended for ages 14 and over</td> * </tr> * <tr> - * <td valign="top" rowspan="5">GR_TV</td> - * <td>GR_TV_ALL</td> - * <td>Suitable for all ages</td> + * <td>ES_DVB_15</td> + * <td>Recommended for ages 15 and over</td> * </tr> * <tr> - * <td>GR_TV_10</td> - * <td>Parental consent suggested</td> + * <td>ES_DVB_16</td> + * <td>Recommended for ages 16 and over</td> * </tr> * <tr> - * <td>GR_TV_12</td> - * <td>Required parental consent</td> + * <td>ES_DVB_17</td> + * <td>Recommended for ages 17 and over</td> * </tr> * <tr> - * <td>GR_TV_15</td> - * <td>Suitable for minors over the age of 15</td> + * <td>ES_DVB_18</td> + * <td>Recommended for ages 18 and over</td> * </tr> * <tr> - * <td>GR_TV_18</td> - * <td>Suitable only for adults profanity before midnight is punishable by fine, except when - * used in the context of the program</td> - * </tr> - * <tr> - * <td valign="top" rowspan="3">HK_TV</td> - * <td>HK_TV_G</td> - * <td>For general audiences</td> - * </tr> - * <tr> - * <td>HK_TV_PG</td> - * <td>Programs are unsuitable for children, parental guidance is recommended</td> - * </tr> - * <tr> - * <td>HK_TV_M</td> - * <td>Programs are recommended only for adult viewers above the age of 18</td> - * </tr> - * <tr> - * <td valign="top" rowspan="6">HU_TV</td> - * <td>HU_TV_U</td> - * <td>Programs can be viewed by any age</td> - * </tr> - * <tr> - * <td>HU_TV_CF</td> - * <td>Programs recommended for children. It is an optional rating, there is no obligation - * for broadcasters to indicate it</td> - * </tr> - * <tr> - * <td>HU_TV_6</td> - * <td>Programs not recommended for children below the age of 6, may not contain any - * violence or sexual content</td> - * </tr> - * <tr> - * <td>HU_TV_12</td> - * <td>Programs not recommended for children below the age of 12, may contain light sexual - * content or explicit language</td> - * </tr> - * <tr> - * <td>HU_TV_16</td> - * <td>Programs not recommended for teens and children below the age of 16, may contain more - * intensive violence and sexual content</td> - * </tr> - * <tr> - * <td>HU_TV_18</td> - * <td>The program is recommended only for adult viewers (for ages 18 and up), may contain - * explicit violence and explicit sexual content</td> - * </tr> - * <tr> - * <td valign="top" rowspan="8">ID_TV</td> - * <td>ID_TV_P</td> - * <td>Suitable for children from ages 2 through 11</td> + * <td valign="top" rowspan="16">FR_DVB</td> + * <td>FR_DVB_U</td> + * <td>Recommended for all ages</td> * </tr> * <tr> - * <td>ID_TV_A</td> - * <td>Suitable for teens and children from ages 7 through 16</td> + * <td>FR_DVB_4</td> + * <td>Recommended for ages 4 and over</td> * </tr> * <tr> - * <td>ID_TV_A_BO</td> - * <td>Suitable for children ages 5 through 10, with parental guidance or permission</td> + * <td>FR_DVB_5</td> + * <td>Recommended for ages 5 and over</td> * </tr> * <tr> - * <td>ID_TV_SU</td> - * <td>Suitable for general audiences</td> + * <td>FR_DVB_6</td> + * <td>Recommended for ages 6 and over</td> * </tr> * <tr> - * <td>ID_TV_BO</td> - * <td>Parental guidance suggested for ages 5 and under</td> + * <td>FR_DVB_7</td> + * <td>Recommended for ages 7 and over</td> * </tr> * <tr> - * <td>ID_TV_R</td> - * <td>Suitable for teens from ages 13 through 17</td> + * <td>FR_DVB_8</td> + * <td>Recommended for ages 8 and over</td> * </tr> * <tr> - * <td>ID_TV_R_BO</td> - * <td>Suitable for teens with parental guidance or permission</td> + * <td>FR_DVB_9</td> + * <td>Recommended for ages 9 and over</td> * </tr> * <tr> - * <td>ID_TV_D</td> - * <td>Suitable for viewers over 18 and older only</td> + * <td>FR_DVB_10</td> + * <td>Recommended for ages 10 and over</td> * </tr> * <tr> - * <td valign="top" rowspan="5">IE_TV</td> - * <td>IE_TV_GA</td> - * <td>Suitable for all ages</td> + * <td>FR_DVB_11</td> + * <td>Recommended for ages 11 and over</td> * </tr> * <tr> - * <td>IE_TV_CH</td> - * <td>Suitable for children ages 5 to 10, may contain comedic violence or action fantasy - * violence</td> + * <td>FR_DVB_12</td> + * <td>Recommended for ages 12 and over</td> * </tr> * <tr> - * <td>IE_TV_YA</td> - * <td>Suitable for adolescent audiences, may contain thematic elements that would appeal to - * teenagers</td> + * <td>FR_DVB_13</td> + * <td>Recommended for ages 13 and over</td> * </tr> * <tr> - * <td>IE_TV_PS</td> - * <td>Suitable for more mature viewers, more mature themes may be present</td> + * <td>FR_DVB_14</td> + * <td>Recommended for ages 14 and over</td> * </tr> * <tr> - * <td>IE_TV_MA</td> - * <td>Most restrictive classification, allowing for heavy subject matter and coarse - * language</td> + * <td>FR_DVB_15</td> + * <td>Recommended for ages 15 and over</td> * </tr> * <tr> - * <td valign="top" rowspan="5">IL_TV</td> - * <td>IL_TV_G</td> - * <td>General audience; anyone, regardless of age, can view the program, usually news and - * children's programming</td> + * <td>FR_DVB_16</td> + * <td>Recommended for ages 16 and over</td> * </tr> * <tr> - * <td>IL_TV_12</td> - * <td>Suitable for teens and children ages 12 and over, no child under 12 are permitted to - * view the program</td> + * <td>FR_DVB_17</td> + * <td>Recommended for ages 17 and over</td> * </tr> * <tr> - * <td>IL_TV_15</td> - * <td>Suitable for teens ages 15 and over, no child under 15 may view the programme</td> + * <td>FR_DVB_18</td> + * <td>Recommended for ages 18 and over</td> * </tr> * <tr> - * <td>IL_TV_18</td> - * <td>Suitable for adults only, no minors may view the programme</td> + * <td valign="top" rowspan="17">ISDB</td> + * <td>ISDB_4</td> + * <td>Recommended for ages 4 and over</td> * </tr> * <tr> - * <td>IL_TV_E</td> - * <td>Exempt from classification</td> + * <td>ISDB_5</td> + * <td>Recommended for ages 5 and over</td> * </tr> * <tr> - * <td valign="top" rowspan="4">IN_TV</td> - * <td>IN_TV_U</td> - * <td>Unrestricted public exhibition</td> + * <td>ISDB_6</td> + * <td>Recommended for ages 6 and over</td> * </tr> * <tr> - * <td>IN_TV_U_A</td> - * <td>Unrestricted public exhibition, but with a caution regarding parental guidance to - * those under 12 years of age</td> + * <td>ISDB_7</td> + * <td>Recommended for ages 7 and over</td> * </tr> * <tr> - * <td>IN_TV_A</td> - * <td>Public exhibition restricted to adults 18 years of age and older only</td> + * <td>ISDB_8</td> + * <td>Recommended for ages 8 and over</td> * </tr> * <tr> - * <td>IN_TV_S</td> - * <td>Public exhibition restricted to members of any profession or any class of persons - * </td> + * <td>ISDB_9</td> + * <td>Recommended for ages 9 and over</td> * </tr> * <tr> - * <td valign="top" rowspan="7">IS_TV</td> - * <td>IS_TV_L</td> - * <td>Programs suitable for all ages</td> + * <td>ISDB_10</td> + * <td>Recommended for ages 10 and over</td> * </tr> * <tr> - * <td>IS_TV_7</td> - * <td>Programs suitable for ages 7 and older</td> + * <td>ISDB_11</td> + * <td>Recommended for ages 11 and over</td> * </tr> * <tr> - * <td>IS_TV_10</td> - * <td>Programs suitable for ages 10 and older</td> + * <td>ISDB_12</td> + * <td>Recommended for ages 12 and over</td> * </tr> * <tr> - * <td>IS_TV_12</td> - * <td>Programs suitable for ages 12 and older</td> + * <td>ISDB_13</td> + * <td>Recommended for ages 13 and over</td> * </tr> * <tr> - * <td>IS_TV_14</td> - * <td>Programs suitable for ages 14 and older</td> + * <td>ISDB_14</td> + * <td>Recommended for ages 14 and over</td> * </tr> * <tr> - * <td>IS_TV_16</td> - * <td>Programs suitable for ages 16 and older</td> + * <td>ISDB_15</td> + * <td>Recommended for ages 15 and over</td> * </tr> * <tr> - * <td>IS_TV_18</td> - * <td>Programs suitable for ages 18 and older</td> + * <td>ISDB_16</td> + * <td>Recommended for ages 16 and over</td> * </tr> * <tr> - * <td valign="top" rowspan="4">JP_TV</td> - * <td>JP_TV_G</td> - * <td>General, suitable for all ages</td> + * <td>ISDB_17</td> + * <td>Recommended for ages 17 and over</td> * </tr> * <tr> - * <td>JP_TV_PG12</td> - * <td>Parental guidance requested for young people under 12 years</td> + * <td>ISDB_18</td> + * <td>Recommended for ages 18 and over</td> * </tr> * <tr> - * <td>JP_TV_R15</td> - * <td>For persons aged 15 and above only</td> + * <td>ISDB_19</td> + * <td>Recommended for ages 19 and over</td> * </tr> * <tr> - * <td>JP_TV_R18</td> - * <td>For persons aged 18 and above only</td> + * <td>ISDB_20</td> + * <td>Recommended for ages 20 and over</td> * </tr> * <tr> * <td valign="top" rowspan="5">KR_TV</td> @@ -957,314 +578,6 @@ import java.util.Objects; * <td>For adults only</td> * </tr> * <tr> - * <td valign="top" rowspan="9">MV_TV</td> - * <td>MV_TV_Y</td> - * <td>Young children</td> - * </tr> - * <tr> - * <td>MV_TV_G</td> - * <td>General viewing for all ages</td> - * </tr> - * <tr> - * <td>MV_TV_PG</td> - * <td>Parental guidance is required unaccompanied children</td> - * </tr> - * <tr> - * <td>MV_TV_PG_12</td> - * <td>Parental guidance is required for children under the age of 12</td> - * </tr> - * <tr> - * <td>MV_TV_12</td> - * <td>Teens and children aged 12 and older may watch, otherwise restricted</td> - * </tr> - * <tr> - * <td>MV_TV_15</td> - * <td>Restricted to viewers aged 15 and above</td> - * </tr> - * <tr> - * <td>MV_TV_18</td> - * <td>Restricted to viewers aged 18 and above</td> - * </tr> - * <tr> - * <td>MV_TV_21</td> - * <td>Restricted to viewers aged 21 and above</td> - * </tr> - * <tr> - * <td>MV_TV_X</td> - * <td>Most restrictive classification, only adults ages 25 and above may view</td> - * </tr> - * <tr> - * <td valign="top" rowspan="6">MX_TV</td> - * <td>MX_TV_A</td> - * <td>Appropriate for all ages, parental guidance is recommended for children under 7 years - * </td> - * </tr> - * <tr> - * <td>MX_TV_B</td> - * <td>Designed for ages 12 and older, may contain some sexual situations, mild violence, - * and mild language</td> - * </tr> - * <tr> - * <td>MX_TV_B_15</td> - * <td>Designed for ages 15 and up, slightly more intensive than the 'A' and 'B' ratings - * </td> - * </tr> - * <tr> - * <td>MX_TV_C</td> - * <td>Designed to be viewed by adults aged 18 or older only, generally more intensive - * content</td> - * </tr> - * <tr> - * <td>MX_TV_D</td> - * <td>Designed to be viewed only by mature adults (at least 21 years of age and over), - * contains extreme content matter</td> - * </tr> - * <tr> - * <td>MX_TV_RC</td> - * <td>Banned from public television in Mexico</td> - * </tr> - * <tr> - * <td valign="top" rowspan="3">MY_TV</td> - * <td>MY_TV_U</td> - * <td>General viewing for all ages, can be broadcast anytime</td> - * </tr> - * <tr> - * <td>MY_TV_P13</td> - * <td>For viewers ages 13 and above, children under 13 needs parental guidance, can be - * broadcast anytime, but some elements may only be broadcast at night</td> - * </tr> - * <tr> - * <td>MY_TV_18</td> - * <td>For viewers ages 18 and above only</td> - * </tr> - * <tr> - * <td valign="top" rowspan="5">NL_TV</td> - * <td>NL_TV_AL</td> - * <td>All Ages</td> - * </tr> - * <tr> - * <td>NL_TV_6</td> - * <td>Parental advisory for children under 6</td> - * </tr> - * <tr> - * <td>NL_TV_9</td> - * <td>Parental advisory for children under 9</td> - * </tr> - * <tr> - * <td>NL_TV_12</td> - * <td>Parental advisory for children under 12</td> - * </tr> - * <tr> - * <td>NL_TV_16</td> - * <td>Parental advisory for children under 16</td> - * </tr> - * <tr> - * <td valign="top" rowspan="3">NZ_FTV</td> - * <td>NZ_FTV_G</td> - * <td>These exclude material likely to harm children under 14 and can screen at any time. - * Programmes may not necessarily be designed for younger viewers, but must not contain - * material likely to cause them undue distress or discomfort</td> - * </tr> - * <tr> - * <td>NZ_FTV_PGR</td> - * <td>Programmes more suited to more mature viewers. These are not necessarily unsuitable - * for children, but viewer discretion is advised, and parents and guardians are encouraged - * to supervise younger viewers</td> - * </tr> - * <tr> - * <td>NZ_FTV_AO</td> - * <td>Contain material of an adult nature handled in such a way that it is unsuitable for - * children</td> - * </tr> - * <tr> - * <td valign="top" rowspan="5">NZ_PTV</td> - * <td>NZ_PTV_G</td> - * <td>suitable for general audiences</td> - * </tr> - * <tr> - * <td>NZ_PTV_PG</td> - * <td>Parental guidance recommended for under 10</td> - * </tr> - * <tr> - * <td>NZ_PTV_M</td> - * <td>Suitable for mature audiences 13 and up</td> - * </tr> - * <tr> - * <td>NZ_PTV_16</td> - * <td>Suitable for viewers 16 and up</td> - * </tr> - * <tr> - * <td>NZ_PTV_18</td> - * <td>Suitable for viewers 18 and up</td> - * </tr> - * <tr> - * <td valign="top" rowspan="3">PE_TV</td> - * <td>PE_TV_A</td> - * <td>Suitable for all audiences</td> - * </tr> - * <tr> - * <td>PE_TV_14</td> - * <td>Suitable for people aged 14 and above only</td> - * </tr> - * <tr> - * <td>PE_TV_18</td> - * <td>Suitable for people aged 18 and above only</td> - * </tr> - * <tr> - * <td valign="top" rowspan="4">PE_ATV</td> - * <td>PE_ATV_GP</td> - * <td>General audience</td> - * </tr> - * <tr> - * <td>PE_ATV_PG</td> - * <td>Parental guidance required for under 6</td> - * </tr> - * <tr> - * <td>PE_ATV_14</td> - * <td>Suitable for people aged 14 and above only</td> - * </tr> - * <tr> - * <td>PE_ATV_18</td> - * <td>Suitable for people aged 18 and above only</td> - * </tr> - * <tr> - * <td valign="top" rowspan="3">PH_TV</td> - * <td>PH_TV_G</td> - * <td>Suitable for all public viewers</td> - * </tr> - * <tr> - * <td>PH_TV_PG</td> - * <td>Programmes rated PG may contain scenes or other content that are unsuitable for - * children without the guidance of a parent</td> - * </tr> - * <tr> - * <td>PH_TV_SPG</td> - * <td>Contains mature themes or moderate to intense violence, which may be deemed unfit for - * children to watch without strict parental supervision</td> - * </tr> - * <tr> - * <td valign="top" rowspan="5">PL_TV</td> - * <td>PL_TV_G</td> - * <td>Positive or neutral view of the world, little to no violence, non-sexual love, and no - * sexual content</td> - * </tr> - * <tr> - * <td>PL_TV_7</td> - * <td>Age 7 and above. May additionally contain some mild language, bloodless violence, and - * a more negative view of the world</td> - * </tr> - * <tr> - * <td>PL_TV_12</td> - * <td>Age 12 and above. May contain some foul language, some violence, and some sexual - * content</td> - * </tr> - * <tr> - * <td>PL_TV_16</td> - * <td>Age 16 and above. Deviant social behaviour, world filled with violence and sexuality, - * simplified picture of adulthood, display of physical force, especially in controversial - * social context, immoral behaviour without ethic dilemma, putting the blame on the victim, - * excessive concentration on material possessions</td> - * </tr> - * <tr> - * <td>PL_TV_18</td> - * <td>Age 18 and above. One-sided display of the joys of adult life without showing - * responsibilities, social justification of violent behaviour, excessive vulgarity, use of - * racial slurs and social stereotypes, explicit sexual content, praise of aggression or - * vulgarity</td> - * </tr> - * <tr> - * <td valign="top" rowspan="4">PT_TV</td> - * <td>PT_TV_T</td> - * <td>Suitable for all</td> - * </tr> - * <tr> - * <td>PT_TV_10</td> - * <td>May not be suitable for children under 10, parental guidance advised</td> - * </tr> - * <tr> - * <td>PT_TV_12</td> - * <td>May not be suitable for children under 12, parental guidance advised</td> - * </tr> - * <tr> - * <td>PT_TV_16</td> - * <td>Not suitable for children under 16</td> - * </tr> - * <tr> - * <td valign="top" rowspan="6">RO_TV</td> - * <td>RO_TV_Y</td> - * <td>Young Ages</td> - * </tr> - * <tr> - * <td>RO_TV_G</td> - * <td>General Exhibition</td> - * </tr> - * <tr> - * <td>RO_TV_AP</td> - * <td>Parental guidance is recommended for children below the age of 12</td> - * </tr> - * <tr> - * <td>RO_TV_12</td> - * <td>Forbidden for children under 12 years of age</td> - * </tr> - * <tr> - * <td>RO_TV_15</td> - * <td>Forbidden for children under 15 years of age</td> - * </tr> - * <tr> - * <td>RO_TV_18</td> - * <td>Forbidden for children under 18 years of age</td> - * </tr> - * <tr> - * <td valign="top" rowspan="5">RU_TV</td> - * <td>RU_TV_0</td> - * <td>Can be watched by Any Age</td> - * </tr> - * <tr> - * <td>RU_TV_6</td> - * <td>Only kids the age of 6 or older can watch</td> - * </tr> - * <tr> - * <td>RU_TV_12</td> - * <td>Only kids the age of 12 or older can watch</td> - * </tr> - * <tr> - * <td>RU_TV_16</td> - * <td>Only teens the age of 16 or older can watch</td> - * </tr> - * <tr> - * <td>RU_TV_18</td> - * <td>Restricted to children ONLY people 18 or older</td> - * </tr> - * <tr> - * <td valign="top" rowspan="7">RS_TV</td> - * <td>RS_TV_G</td> - * <td>Program suitable for all ages</td> - * </tr> - * <tr> - * <td>RS_TV_12</td> - * <td>Program not suitable for children under the age of 12</td> - * </tr> - * <tr> - * <td>RS_TV_14</td> - * <td>Program not suitable for children/teens under the age of 14</td> - * </tr> - * <tr> - * <td>RS_TV_15</td> - * <td>Program not suitable for children/teens under the age of 15</td> - * </tr> - * <tr> - * <td>RS_TV_16</td> - * <td>Program not suitable for children/teens under the age of 16</td> - * </tr> - * <tr> - * <td>RS_TV_17</td> - * <td>Program not suitable for children/teens under the age of 17</td> - * </tr> - * <tr> - * <td>RS_TV_18</td> - * <td>Program not suitable for minors under the age of 18</td> - * </tr> - * <tr> * <td valign="top" rowspan="6">SG_TV</td> * <td>SG_TV_G</td> * <td>Suitable for all ages</td> @@ -1291,101 +604,6 @@ import java.util.Objects; * <td>Suitable for adults aged 21 and above</td> * </tr> * <tr> - * <td valign="top" rowspan="4">SI_TV</td> - * <td>SI_TV_VS</td> - * <td>Parental guidance suggested (for children under 6)</td> - * </tr> - * <tr> - * <td>SI_TV_12</td> - * <td>Content suitable for teens over 12 years</td> - * </tr> - * <tr> - * <td>SI_TV_15</td> - * <td>Content suitable for teens over 15 years</td> - * </tr> - * <tr> - * <td>SI_TV_AD</td> - * <td>Content exclusively for adults</td> - * </tr> - * <tr> - * <td valign="top" rowspan="6">TH_TV</td> - * <td>TH_TV_P</td> - * <td>Content suitable for primary school aged children</td> - * </tr> - * <tr> - * <td>TH_TV_C</td> - * <td>Content suitable for children between 6-12 years old</td> - * </tr> - * <tr> - * <td>TH_TV_G</td> - * <td>Content suitable for general audiences</td> - * </tr> - * <tr> - * <td>TH_TV_PG13</td> - * <td>Content suitable for people aged 13 and above, but can be watched by those who are - * under the recommended age if parental guidance is provided</td> - * </tr> - * <tr> - * <td>TH_TV_PG18</td> - * <td>Content suitable for people aged above 18 years old; those who are younger that 18 - * must be provided with parental guidance</td> - * </tr> - * <tr> - * <td>TH_TV_A</td> - * <td>Content unsuitable for children and youngsters</td> - * </tr> - * <tr> - * <td valign="top" rowspan="4">TR_TV</td> - * <td>TR_TV_G</td> - * <td>General audience. Suitable for all ages</td> - * </tr> - * <tr> - * <td>TR_TV_7</td> - * <td>Suitable for ages 7 and over</td> - * </tr> - * <tr> - * <td>TR_TV_13</td> - * <td>Suitable for ages 13 and over</td> - * </tr> - * <tr> - * <td>TR_TV_18</td> - * <td>Suitable for ages 13 and over</td> - * </tr> - * <tr> - * <td valign="top" rowspan="4">TW_TV</td> - * <td>TW_TV_G</td> - * <td>For all ages</td> - * </tr> - * <tr> - * <td>TW_TV_P</td> - * <td>Not suitable for children under 6 years old. People aged 6 but under 12 require - * guidance from accompanying adults to watch</td> - * </tr> - * <tr> - * <td>TW_TV_PG</td> - * <td>Not suitable for people under 12 years of age. Parental guidance is required for - * people aged 12 but under 18</td> - * </tr> - * <tr> - * <td>TW_TV_R</td> - * <td>For adults only and people under 18 years of age must not watch</td> - * </tr> - * <tr> - * <td valign="top" rowspan="3">UA_TV</td> - * <td>UA_TV_G</td> - * <td>This program does not have age restrictions</td> - * </tr> - * <tr> - * <td>UA_TV_Y</td> - * <td>Children must view this program with parents. In it program there are fragments, - * which unsuitable for children</td> - * </tr> - * <tr> - * <td>UA_TV_R</td> - * <td>This program is only for adult viewers. In it there are scenes with nudity, drug use, - * or violence</td> - * </tr> - * <tr> * <td valign="top" rowspan="6">US_TV</td> * <td>US_TV_Y</td> * <td>This program is designed to be appropriate for all children</td> @@ -1413,63 +631,6 @@ import java.util.Objects; * <td>This program is specifically designed to be viewed by adults and therefore may be * unsuitable for children under 17</td> * </tr> - * <tr> - * <td valign="top" rowspan="3">VE_TV</td> - * <td>VE_TV_TU</td> - * <td>For all ages</td> - * </tr> - * <tr> - * <td>VE_TV_SU</td> - * <td>Parental guidance for young viewers</td> - * </tr> - * <tr> - * <td>VE_TV_A</td> - * <td>Mature viewers</td> - * </tr> - * <tr> - * <td valign="top" rowspan="6">ZA_TV</td> - * <td>ZA_TV_F</td> - * <td>This is a program/film that does not contain any obscenity, and is suitable for - * family viewing. A logo must be displayed in the corner of the screen for 30 seconds after - * each commercial break</td> - * </tr> - * <tr> - * <td>ZA_TV_PG</td> - * <td>Children under 6 may watch this program/film, but must be accompanied by an adult. - * This program contains an adult related theme, which might include very mild language, - * violence and sexual innuendo. A logo must be displayed in the corner of the screen for - * one minute after each commercial break</td> - * </tr> - * <tr> - * <td>ZA_TV_13</td> - * <td>Children under 13 are prohibited from watching this program/film. This program - * contains mild language, violence and sexual innuendo. A logo must be displayed in the - * corner of the screen for two minutes after each commercial break</td> - * </tr> - * <tr> - * <td>ZA_TV_16</td> - * <td>Children under 16 are prohibited from watching this program/film. It contains - * moderate violence, language, and some sexual situations. In the case of television, this - * program may only be broadcast after 9pm-4:30am. A logo must be displayed in the corner of - * the screen for five minutes after each commercial break. A full-screen warning must be - * issued before the start of the program. If the program is longer than an hour, a warning - * must be displayed every half an hour</td> - * </tr> - * <tr> - * <td>ZA_TV_18</td> - * <td>Children under 18 are prohibited from watching this program/film. It contains extreme - * violence, language and/or graphic sexual content. In the case of television, this program - * may only be broadcast from 10pm-4:30am. A logo must be displayed in the corner of the - * screen for the duration of the program. A full-screen warning must be issued before the - * start of the program and after each commercial break</td> - * </tr> - * <tr> - * <td>ZA_TV_R18</td> - * <td>This is reserved for films of an extreme sexual nature (pornography). R18 films may - * only be distributed in the form of video and DVD in a controlled environment (e.g. Adult - * Shops). No public viewing of this film may take place. R18 films may not be broadcast on - * television and in cinemas</td> - * </tr> * </table> * * <h4>System defined strings for sub-ratings</h4> @@ -1480,101 +641,43 @@ import java.util.Objects; * <th>Description</th> * </tr> * <tr> - * <td valign="top" rowspan="6">NL_TV</td> - * <td>NL_TV_V</td> - * <td>Violence<br/>Applicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</td> - * </tr> - * <tr> - * <td>NL_TV_F</td> - * <td>Scary or Disturbing ContentViolence<br/>Applicable to NL_TV_AL, NL_TV_6, NL_TV_9, - * NL_TV_12, NL_TV_16</td> - * </tr> - * <tr> - * <td>NL_TV_S</td> - * <td>Sexual Content<br/>Applicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</td> - * </tr> - * <tr> - * <td>NL_TV_D</td> - * <td>Discrimination<br/>Applicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</td> - * </tr> - * <tr> - * <td>NL_TV_DA</td> - * <td>Drug and/or Alcohol abuse<br/>Applicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, - * NL_TV_16</td> - * </tr> - * <tr> - * <td>NL_TV_L</td> - * <td>Bad Language<br/>Applicable to NL_TV_AL, NL_TV_6, NL_TV_9, NL_TV_12, NL_TV_16</td> - * </tr> - * <tr> - * <td valign="top" rowspan="4">NZ_PTV</td> - * <td>NZ_PTV_C</td> - * <td>Content may offend<br/>Applicable to NZ_PTV_PG, NZ_PTV_M, NZ_PTV_16, NZ_PTV_18</td> - * </tr> - * <tr> - * <td>NZ_PTV_V</td> - * <td>Violence<br/>Applicable to NZ_PTV_PG, NZ_PTV_M, NZ_PTV_16, NZ_PTV_18</td> + * <td valign="top" rowspan="3">BR_TV</td> + * <td>BR_TV_D</td> + * <td>Drugs<br/>Applicable to BR_TV_L, BR_TV_10, BR_TV_12, BR_TV_14, BR_TV_16, and BR_TV_18 + * </td> * </tr> * <tr> - * <td>NZ_PTV_L</td> - * <td>Language<br/>Applicable to NZ_PTV_PG, NZ_PTV_M, NZ_PTV_16, NZ_PTV_18</td> + * <td>BR_TV_S</td> + * <td>Sex<br/>Applicable to BR_TV_L, BR_TV_10, BR_TV_12, BR_TV_14, BR_TV_16, and BR_TV_18 + * </td> * </tr> * <tr> - * <td>NZ_PTV_S</td> - * <td>Sexual content<br/>Applicable to NZ_PTV_PG, NZ_PTV_M, NZ_PTV_16, NZ_PTV_18</td> + * <td>BR_TV_V</td> + * <td>Violence<br/>Applicable to BR_TV_L, BR_TV_10, BR_TV_12, BR_TV_14, BR_TV_16, and + * BR_TV_18</td> * </tr> * <tr> * <td valign="top" rowspan="5">US_TV</td> * <td>US_TV_D</td> - * <td>Suggestive dialogue (Usually means talks about sex)<br/>Applicable to US_TV_PG, - * US_TV_14, US_TV</td> + * <td>Suggestive dialogue (Usually means talks about sex)<br/>Applicable to US_TV_PG, and + * US_TV_14</td> * </tr> * <tr> * <td>US_TV_L</td> - * <td>Coarse language<br/>Applicable to US_TV_PG, US_TV_14</td> + * <td>Coarse language<br/>Applicable to US_TV_PG, US_TV_14, and US_TV_MA</td> * </tr> * <tr> * <td>US_TV_S</td> - * <td>Sexual content<br/>Applicable to US_TV_PG, US_TV_14, US_TV_MA</td> + * <td>Sexual content<br/>Applicable to US_TV_PG, US_TV_14, and US_TV_MA</td> * </tr> * <tr> * <td>US_TV_V</td> - * <td>Violence<br/>Applicable to US_TV_PG, US_TV_14, US_TV_MA</td> + * <td>Violence<br/>Applicable to US_TV_PG, US_TV_14, and US_TV_MA</td> * </tr> * <tr> * <td>US_TV_FV</td> * <td>Fantasy violence (Children's programming only)<br/>Applicable to US_TV_Y7</td> * </tr> - * <tr> - * <td valign="top" rowspan="6">ZA_TV</td> - * <td>ZA_TV_D</td> - * <td>Drug<br/>Applicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18 - * </td> - * </tr> - * <tr> - * <td>ZA_TV_V</td> - * <td>Violence<br/>Applicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18 - * </td> - * </tr> - * <tr> - * <td>ZA_TV_N</td> - * <td>Nudity<br/>Applicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18 - * </td> - * </tr> - * <tr> - * <td>ZA_TV_P</td> - * <td>Prejudice<br/>Applicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, - * ZA_TV_R18</td> - * </tr> - * <tr> - * <td>ZA_TV_S</td> - * <td>Sex<br/>Applicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18</td> - * </tr> - * <tr> - * <td>ZA_TV_L</td> - * <td>Language<br/>Applicable to ZA_TV_F, ZA_TV_PG, ZA_TV_13, ZA_TV_16, ZA_TV_18, ZA_TV_R18 - * </td> - * </tr> * </table> */ public final class TvContentRating { diff --git a/opengl/java/android/opengl/GLSurfaceView.java b/opengl/java/android/opengl/GLSurfaceView.java index 1406f6ba4b83..3c76115cb537 100644 --- a/opengl/java/android/opengl/GLSurfaceView.java +++ b/opengl/java/android/opengl/GLSurfaceView.java @@ -595,9 +595,8 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback mDetached = false; } - /** @hide */ @Override - protected void onDetachedFromWindowInternal() { + protected void onDetachedFromWindow() { if (LOG_ATTACH_DETACH) { Log.d(TAG, "onDetachedFromWindow"); } @@ -605,7 +604,7 @@ public class GLSurfaceView extends SurfaceView implements SurfaceHolder.Callback mGLThread.requestExitAndWait(); } mDetached = true; - super.onDetachedFromWindowInternal(); + super.onDetachedFromWindow(); } // ---------------------------------------------------------------------- diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index fb0faacde542..bbc7ccd0e4b1 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nee dankie"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Stel op"</string> <string name="muted_by" msgid="6147073845094180001">"Gedemp deur <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index d81186eee6c1..52ea8f5f415e 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -70,7 +70,7 @@ <string name="screenshot_saving_title" msgid="8242282144535555697">"ቅጽበታዊ ገጽ እይታ በማስቀመጥ ላይ..."</string> <string name="screenshot_saving_text" msgid="2419718443411738818">"ቅጽበታዊ ገጽ እይታ እየተቀመጠ ነው::"</string> <string name="screenshot_saved_title" msgid="6461865960961414961">"ቅጽበታዊ ገጽ እይታ ተቀርጿል"</string> - <string name="screenshot_saved_text" msgid="1152839647677558815">"የአንተን ቅጽበታዊ ገጽ እይታ ለማየት ንካ"</string> + <string name="screenshot_saved_text" msgid="1152839647677558815">"የእርስዎን ቅጽበታዊ ገጽ እይታ ለማየት ይንኩ"</string> <string name="screenshot_failed_title" msgid="705781116746922771">"ቅጽበታዊ ገጽ እይታ መቅረጽ አልተቻለም::"</string> <string name="screenshot_failed_text" msgid="1260203058661337274">"በተገደበ የማከማቻ ቦታ ምክንያት ወይም በመተግበሪያው ወይም በድርጅትዎ ስለማይፈቀድ የማያ ገጽ ቅጽበታዊ እይታዎችን ማንሳት አይቻልም።"</string> <string name="usb_preference_title" msgid="6551050377388882787">"የUSB ፋይል ሰደዳ አማራጮች"</string> @@ -233,7 +233,7 @@ <string name="quick_settings_brightness_label" msgid="6968372297018755815">"ብሩህነት"</string> <string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"በራስ ሰር አሽከርክር"</string> <string name="quick_settings_rotation_locked_label" msgid="6359205706154282377">"አዙሪት ተቆልፏል"</string> - <string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"ምስል ገላጭ"</string> + <string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"በቁመት"</string> <string name="quick_settings_rotation_locked_landscape_label" msgid="8553157770061178719">"በወርድ"</string> <string name="quick_settings_ime_label" msgid="7073463064369468429">"የግቤት ስልት"</string> <string name="quick_settings_location_label" msgid="5011327048748762257">"አካባቢ"</string> @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"አይ፣ አመሰግናለሁ"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"አዋቅር"</string> <string name="muted_by" msgid="6147073845094180001">"ድምጽ በ<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ተዘግቷል"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>። <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index f3ca5c270e4e..ea5be809cfce 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"لا، شكرًا"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"إعداد"</string> <string name="muted_by" msgid="6147073845094180001">"تم كتم الصوت بواسطة <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index bbf7a15878b4..88b5f7e24370 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Няма нужда"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Настройване"</string> <string name="muted_by" msgid="6147073845094180001">"Заглушено от <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-bn-rBD/strings.xml b/packages/SystemUI/res/values-bn-rBD/strings.xml index ddc959d52e59..482ac9045d21 100644 --- a/packages/SystemUI/res/values-bn-rBD/strings.xml +++ b/packages/SystemUI/res/values-bn-rBD/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"না থাক"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"সেট আপ"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> দ্বারা নিঃশব্দ করা হয়েছে"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index a63cd710b351..99e7f19bdbaa 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configura"</string> <string name="muted_by" msgid="6147073845094180001">"Silenciat per <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index 7695154bfa0f..3e1a9ccfc153 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ne, děkuji"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Nastavit"</string> <string name="muted_by" msgid="6147073845094180001">"Ignorováno stranou <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index f066e697241e..53b6de474442 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nej tak"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Konfigurer"</string> <string name="muted_by" msgid="6147073845094180001">"Lyden blev afbrudt af <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index c5d7c0633f01..1e8e8b705fe4 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nein danke"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Einrichten"</string> <string name="muted_by" msgid="6147073845094180001">"Stummgeschaltet durch <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index a0eadb438da5..86dd4e7fe957 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Όχι"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Ρύθμιση"</string> <string name="muted_by" msgid="6147073845094180001">"Σίγαση από <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 2571adda533d..460d2ac0230b 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No, thanks"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Setup"</string> <string name="muted_by" msgid="6147073845094180001">"Muted by <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 2571adda533d..460d2ac0230b 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No, thanks"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Setup"</string> <string name="muted_by" msgid="6147073845094180001">"Muted by <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index f1ead9a2aa3c..a34096b9864f 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurar"</string> <string name="muted_by" msgid="6147073845094180001">"Silenciados por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index ac04ecc63811..f6fc4358f45e 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No, gracias"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurar"</string> <string name="muted_by" msgid="6147073845094180001">"Silenciado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et-rEE/strings.xml index 83775ad00fe1..80a75dd799f5 100644 --- a/packages/SystemUI/res/values-et-rEE/strings.xml +++ b/packages/SystemUI/res/values-et-rEE/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Tänan, ei"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Seadistus"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> vaigistas"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-eu-rES/strings.xml b/packages/SystemUI/res/values-eu-rES/strings.xml index 20b9e822d16d..ede31398bea0 100644 --- a/packages/SystemUI/res/values-eu-rES/strings.xml +++ b/packages/SystemUI/res/values-eu-rES/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ez, eskerrik asko"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Konfiguratu"</string> <string name="muted_by" msgid="6147073845094180001">"Audioa desaktibatu da (<xliff:g id="THIRD_PARTY">%1$s</xliff:g>)"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index ac475444259e..98ece3c76492 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"خیر، سپاسگزارم"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"راهاندازی"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> آن را بیصدا کرد"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index b5380ee3ff23..9fe1e4c218ba 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Non, merci"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurer"</string> <string name="muted_by" msgid="6147073845094180001">"Mis en sourdine par <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 365739588bc6..b697bbe153ed 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Non, merci"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurer"</string> <string name="muted_by" msgid="6147073845094180001">"Son coupé par : <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-gl-rES/strings.xml b/packages/SystemUI/res/values-gl-rES/strings.xml index ae4211e279ee..ce02ae9eb7de 100644 --- a/packages/SystemUI/res/values-gl-rES/strings.xml +++ b/packages/SystemUI/res/values-gl-rES/strings.xml @@ -253,7 +253,7 @@ <string name="quick_settings_wifi_no_network" msgid="2221993077220856376">"Non hai rede"</string> <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Wifi desactivada"</string> <string name="quick_settings_wifi_detail_empty_text" msgid="2831702993995222755">"Non hai redes gardadas dispoñibles"</string> - <string name="quick_settings_cast_title" msgid="1893629685050355115">"Pantalla de emisión"</string> + <string name="quick_settings_cast_title" msgid="1893629685050355115">"Enviar pantalla"</string> <string name="quick_settings_casting" msgid="6601710681033353316">"Emitindo"</string> <string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"Dispositivo sen nome"</string> <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"Listo para emitir"</string> @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Non grazas"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurar"</string> <string name="muted_by" msgid="6147073845094180001">"Silenciado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 6ca12b67247e..5cdae2a9fe59 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"नहीं धन्यवाद"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"सेट करें"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> द्वारा म्यूट किया गया"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index b7b097a462cf..c9633988d367 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ne, hvala"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Postavi"</string> <string name="muted_by" msgid="6147073845094180001">"Zvuk je isklj. treća strana <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 039df8c5a9ca..62724171ddd8 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nem, köszönöm"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Beállítás"</string> <string name="muted_by" msgid="6147073845094180001">"A(z) <xliff:g id="THIRD_PARTY">%1$s</xliff:g> elnémította"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 9a5521c175ff..d863d5e79b56 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Tidak"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Siapkan"</string> <string name="muted_by" msgid="6147073845094180001">"Dinonaktifkan oleh <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-is-rIS/strings.xml b/packages/SystemUI/res/values-is-rIS/strings.xml index 258435a628ff..e93a341f6d05 100644 --- a/packages/SystemUI/res/values-is-rIS/strings.xml +++ b/packages/SystemUI/res/values-is-rIS/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nei, takk"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Setja upp"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> tók hljóðið af"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index 0acb102bdad2..25193176de94 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No, grazie"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configura"</string> <string name="muted_by" msgid="6147073845094180001">"Audio disattivato da <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 4accd2200565..8c710e5d26dc 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"לא, תודה"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"הגדר"</string> <string name="muted_by" msgid="6147073845094180001">"הושתק על ידי <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 17c78662e98f..d3136685c3e2 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"キャンセル"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"設定"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>によりミュートになっています"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-kk-rKZ/strings.xml b/packages/SystemUI/res/values-kk-rKZ/strings.xml index 07c0e6be11ac..79baeb7a277a 100644 --- a/packages/SystemUI/res/values-kk-rKZ/strings.xml +++ b/packages/SystemUI/res/values-kk-rKZ/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Жоқ, рақмет"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Реттеу"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> үнін өшірген"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km-rKH/strings.xml index 461137b19297..31fb4637e310 100644 --- a/packages/SystemUI/res/values-km-rKH/strings.xml +++ b/packages/SystemUI/res/values-km-rKH/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"ទេ អរគុណ!"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"រៀបចំ"</string> <string name="muted_by" msgid="6147073845094180001">"បានបិទសំឡេងដោយ <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-kn-rIN/strings.xml b/packages/SystemUI/res/values-kn-rIN/strings.xml index 1ae6cb9e4bf3..c867aba0ee56 100644 --- a/packages/SystemUI/res/values-kn-rIN/strings.xml +++ b/packages/SystemUI/res/values-kn-rIN/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"ಬೇಡ ಧನ್ಯವಾದಗಳು"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"ಹೊಂದಿಸು"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ಅವರಿಂದ ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index cb928676ca90..8bb6b53a7578 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"사용 안함"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"설정"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>에서 알림음 음소거"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml index bea18fe19357..e729d953c9ed 100644 --- a/packages/SystemUI/res/values-ky-rKG/strings.xml +++ b/packages/SystemUI/res/values-ky-rKG/strings.xml @@ -382,6 +382,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Жок, рахмат"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Орнотуу"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> тарабынан үнсүздөлдү"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index fc0712773c3b..7439b9771e68 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ne, ačiū"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Nustatyti"</string> <string name="muted_by" msgid="6147073845094180001">"Nutildė <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index 2795e674b763..e1ee1826442d 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nē"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Iestatīt"</string> <string name="muted_by" msgid="6147073845094180001">"Skaņu izslēdza <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-mk-rMK/strings.xml b/packages/SystemUI/res/values-mk-rMK/strings.xml index 35c06cda9e68..cde9d24a4fb9 100644 --- a/packages/SystemUI/res/values-mk-rMK/strings.xml +++ b/packages/SystemUI/res/values-mk-rMK/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Не, фала"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Постави"</string> <string name="muted_by" msgid="6147073845094180001">"Звукот го исклучи <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-ml-rIN/strings.xml b/packages/SystemUI/res/values-ml-rIN/strings.xml index c74e071db224..a42bd5175a6e 100644 --- a/packages/SystemUI/res/values-ml-rIN/strings.xml +++ b/packages/SystemUI/res/values-ml-rIN/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"വേണ്ട, നന്ദി"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"സജ്ജീകരിക്കുക"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>, മ്യൂട്ടുചെയ്തു"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-mr-rIN/strings.xml b/packages/SystemUI/res/values-mr-rIN/strings.xml index e160d60d636c..f5e2115e6f6d 100644 --- a/packages/SystemUI/res/values-mr-rIN/strings.xml +++ b/packages/SystemUI/res/values-mr-rIN/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"नाही धन्यवाद"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"सेट अप"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> द्वारे नि:शब्द केले"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-my-rMM/strings.xml b/packages/SystemUI/res/values-my-rMM/strings.xml index b52345018175..47af85fe8897 100644 --- a/packages/SystemUI/res/values-my-rMM/strings.xml +++ b/packages/SystemUI/res/values-my-rMM/strings.xml @@ -354,6 +354,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"မလိုအပ်ပါ"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"သတ်မှတ်ရန်"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> အသံပိတ်သည်"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>။ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index a9d2bd633186..6a02ff0e0115 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nei takk"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Konfigurer"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> har kuttet lyden"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 2fa3b30db4cc..966f2f66fd5d 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nee, bedankt"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configureren"</string> <string name="muted_by" msgid="6147073845094180001">"Gedempt door <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 89143690b02b..fa15c8bb9b3c 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nie, dziękuję"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Skonfiguruj"</string> <string name="muted_by" msgid="6147073845094180001">"Ściszone przez: <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index d315ffac0d37..9202ef45d32d 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Não, obrigado"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Configurar"</string> <string name="muted_by" msgid="6147073845094180001">"Som desativado por <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index db7303284bec..6072ec0b531a 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Закрыть"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Настроить"</string> <string name="muted_by" msgid="6147073845094180001">"Звук отключен приложением \"<xliff:g id="THIRD_PARTY">%1$s</xliff:g>\""</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>."</string> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index 9fa532a762b9..3d3eefd831c8 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nie, vďaka"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Nastaviť"</string> <string name="muted_by" msgid="6147073845094180001">"Stlmené aplikáciou <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index 24e2a5a0e20c..5f6bd1cd2cc2 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ne, hvala"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Nastavitev"</string> <string name="muted_by" msgid="6147073845094180001">"Izklop zvoka: <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 151543437f96..5f297c36f69c 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Не, хвала"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Подеси"</string> <string name="muted_by" msgid="6147073845094180001">"Звук је искључио/ла <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 0bf864da2c1a..5f445bea9c9f 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Nej tack"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Konfig."</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> har stängt av ljudet"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index f43d30fe13aa..91dcaabe46c0 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -354,6 +354,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Hapana, asante"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Sanidi"</string> <string name="muted_by" msgid="6147073845094180001">"Sauti imezimwa na <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml index f19ee7f6fe7c..f769e63c646c 100644 --- a/packages/SystemUI/res/values-ta-rIN/strings.xml +++ b/packages/SystemUI/res/values-ta-rIN/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"வேண்டாம்"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"அமை"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ஒலியடக்கினார்"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-te-rIN/strings.xml b/packages/SystemUI/res/values-te-rIN/strings.xml index 418ff727c1db..e6d4fad4f9a1 100644 --- a/packages/SystemUI/res/values-te-rIN/strings.xml +++ b/packages/SystemUI/res/values-te-rIN/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"వద్దు, ధన్యవాదాలు"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"సెటప్ చేయి"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> ద్వారా మ్యూట్ చేయబడింది"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 04a9b0799569..8a805b519202 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"ไม่เป็นไร"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"ตั้งค่า"</string> <string name="muted_by" msgid="6147073845094180001">"ปิดเสียงโดย <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g> <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index 50f6558e5f73..4896786fe531 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Hindi"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"I-set up"</string> <string name="muted_by" msgid="6147073845094180001">"Na-mute ng <xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 917fe1fcf9d0..4da55641c380 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Hayır, teşekkürler"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Kur"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> tarafından kapatıldı"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index c1378aa830c9..8887c7ff0d5a 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ні, дякую"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Налаштув."</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> вимикає звук"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-ur-rPK/strings.xml b/packages/SystemUI/res/values-ur-rPK/strings.xml index bc78d49abadb..8972ce58ad65 100644 --- a/packages/SystemUI/res/values-ur-rPK/strings.xml +++ b/packages/SystemUI/res/values-ur-rPK/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"نہیں شکریہ"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"ترتیب دیں"</string> <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> کے ذریعے خاموش کردہ"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>۔ <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-uz-rUZ/strings.xml b/packages/SystemUI/res/values-uz-rUZ/strings.xml index 7edcc2a0b1d0..10781ea032a9 100644 --- a/packages/SystemUI/res/values-uz-rUZ/strings.xml +++ b/packages/SystemUI/res/values-uz-rUZ/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Yo‘q, kerak emas"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Sozlash"</string> <string name="muted_by" msgid="6147073845094180001">"“<xliff:g id="THIRD_PARTY">%1$s</xliff:g>” tomonidan ovozsiz qilingan"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index ae584fc8c216..a4dccbaa3c9f 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Ko, cảm ơn"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Thiết lập"</string> <string name="muted_by" msgid="6147073845094180001">"Do <xliff:g id="THIRD_PARTY">%1$s</xliff:g> tắt tiếng"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 6a8e3b67f500..6cc64f9fef7e 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"不用了"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"设置"</string> <string name="muted_by" msgid="6147073845094180001">"已被<xliff:g id="THIRD_PARTY">%1$s</xliff:g>设为静音"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>（<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>）"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 674473b2158e..e18d0a2651fc 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"不用了，謝謝"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"設定"</string> <string name="muted_by" msgid="6147073845094180001">"靜音設定者：<xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 5166adfed572..e890922a32cd 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -256,7 +256,7 @@ <string name="quick_settings_cast_title" msgid="1893629685050355115">"投放螢幕"</string> <string name="quick_settings_casting" msgid="6601710681033353316">"投放"</string> <string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"未命名的裝置"</string> - <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"投放準備完成"</string> + <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"可以開始投放了"</string> <string name="quick_settings_cast_detail_empty_text" msgid="311785821261640623">"沒有可用裝置"</string> <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"亮度"</string> <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"自動"</string> @@ -358,6 +358,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"不用了，謝謝"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"設定"</string> <string name="muted_by" msgid="6147073845094180001">"由 <xliff:g id="THIRD_PARTY">%1$s</xliff:g> 設為靜音"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>。<xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 89b263ba16ff..735bf9c73ebb 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -356,6 +356,5 @@ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Cha ngiyabonga"</string> <string name="hidden_notifications_setup" msgid="41079514801976810">"Lungisa"</string> <string name="muted_by" msgid="6147073845094180001">"Ithuliswe ngu-<xliff:g id="THIRD_PARTY">%1$s</xliff:g>"</string> - <!-- no translation found for zen_mode_and_condition (4462471036429759903) --> - <skip /> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> </resources> diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml index 08bda1fcde7f..cd82c45b8d30 100644 --- a/packages/SystemUI/res/values/config.xml +++ b/packages/SystemUI/res/values/config.xml @@ -161,12 +161,9 @@ duration of the transition in to recents from home. --> <integer name="recents_animate_task_enter_from_home_delay">150</integer> <!-- The min animation duration for animating the task in when transitioning from home. --> - <integer name="recents_animate_task_enter_from_home_duration">200</integer> - <!-- The total animation stagger delay when entering from home. --> - <integer name="recents_animate_task_enter_from_home_stagger_delay">110</integer> - <!-- The total animation duration added to the last card when entering from home. - This value is partialy also added to the previous tasks --> - <integer name="recents_animate_task_enter_from_home_stagger_duration">72</integer> + <integer name="recents_animate_task_enter_from_home_duration">250</integer> + <!-- The animation stagger to apply to each task animation when transitioning from home. --> + <integer name="recents_animate_task_enter_from_home_stagger_delay">12</integer> <!-- The short duration when animating in/out the lock to app button. --> <integer name="recents_animate_lock_to_app_button_short_duration">150</integer> <!-- The long duration when animating in/out the lock to app button. --> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 1a44c8c8d791..9ee18f3209fa 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -858,37 +858,37 @@ <!-- Monitoring dialog disconnect vpn button [CHAR LIMIT=30] --> <string name="disconnect_vpn">Disconnect VPN</string> - <!-- Monitoring dialog device owner body text [CHAR LIMIT=300] --> + <!-- Monitoring dialog device owner body text [CHAR LIMIT=400] --> <string name="monitoring_description_device_owned">This device is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\n\nYour administrator can monitor your device and network activity, including emails, apps and secure websites.\n\nFor more information, contact your administrator.</string> - <!-- Monitoring dialog non-legacy VPN text [CHAR LIMIT=300] --> + <!-- Monitoring dialog non-legacy VPN text [CHAR LIMIT=400] --> <string name="monitoring_description_vpn">You gave \"<xliff:g id="application">%1$s</xliff:g>\" permission to set up a VPN connection.\n\nThis app can monitor your device and network activity, including emails, apps and secure websites.</string> - <!-- Monitoring dialog legacy VPN text [CHAR LIMIT=300] --> + <!-- Monitoring dialog legacy VPN text [CHAR LIMIT=400] --> <string name="monitoring_description_legacy_vpn">You\'re connected to a VPN (\"<xliff:g id="application">%1$s</xliff:g>\").\n\nYour VPN service provider can monitor your device and network activity including emails, apps, and secure websites.</string> - <!-- Monitoring dialog non-legacy VPN with device owner text [CHAR LIMIT=300] --> + <!-- Monitoring dialog non-legacy VPN with device owner text [CHAR LIMIT=400] --> <string name="monitoring_description_vpn_device_owned">This device is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps, and secure websites. For more information, contact your administrator.\n\nAlso, you gave \"<xliff:g id="application">%2$s</xliff:g>\" permission to set up a VPN connection. This app can monitor network activity too.</string> - <!-- Monitoring dialog legacy VPN with device owner text [CHAR LIMIT=300] --> + <!-- Monitoring dialog legacy VPN with device owner text [CHAR LIMIT=400] --> <string name="monitoring_description_legacy_vpn_device_owned">This device is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps, and secure websites. For more information, contact your administrator.\n\nAlso, you\'re connected to a VPN (\"<xliff:g id="application">%2$s</xliff:g>\"). Your VPN service provider can monitor network activity too.</string> - <!-- Monitoring dialog profile owner body text [CHAR LIMIT=300] --> + <!-- Monitoring dialog profile owner body text [CHAR LIMIT=400] --> <string name="monitoring_description_profile_owned">This profile is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\n\nYour administrator can monitor your device and network activity, including emails, apps and secure websites.\n\nFor more information, contact your administrator.</string> - <!-- Monitoring dialog device and profile owner body text [CHAR LIMIT=300] --> + <!-- Monitoring dialog device and profile owner body text [CHAR LIMIT=400] --> <string name="monitoring_description_device_and_profile_owned">This device is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\nYour profile is managed by:\n<xliff:g id="organization">%2$s</xliff:g>\n\nYour administrator can monitor your device and network activity, including emails, apps and secure websites.\n\nFor more information, contact your administrator.</string> - <!-- Monitoring dialog non-legacy VPN with profile owner text [CHAR LIMIT=300] --> + <!-- Monitoring dialog non-legacy VPN with profile owner text [CHAR LIMIT=400] --> <string name="monitoring_description_vpn_profile_owned">This profile is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps, and secure websites. For more information, contact your administrator.\n\nAlso, you gave \"<xliff:g id="application">%2$s</xliff:g>\" permission to set up a VPN connection. This app can monitor network activity too.</string> - <!-- Monitoring dialog legacy VPN with profile owner text [CHAR LIMIT=300] --> + <!-- Monitoring dialog legacy VPN with profile owner text [CHAR LIMIT=400] --> <string name="monitoring_description_legacy_vpn_profile_owned">This profile is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps, and secure websites. For more information, contact your administrator.\n\nAlso, you\'re connected to a VPN (\"<xliff:g id="application">%2$s</xliff:g>\"). Your VPN service provider can monitor network activity too.</string> - <!-- Monitoring dialog non-legacy VPN with device and profile owner text [CHAR LIMIT=300] --> + <!-- Monitoring dialog non-legacy VPN with device and profile owner text [CHAR LIMIT=400] --> <string name="monitoring_description_vpn_device_and_profile_owned">This device is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\nYour profile is managed by:\n<xliff:g id="organization">%2$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps, and secure websites. For more information, contact your administrator.\n\nAlso, you gave \"<xliff:g id="application">%3$s</xliff:g>\" permission to set up a VPN connection. This app can monitor network activity too.</string> - <!-- Monitoring dialog legacy VPN with device and profile owner text [CHAR LIMIT=300] --> + <!-- Monitoring dialog legacy VPN with device and profile owner text [CHAR LIMIT=400] --> <string name="monitoring_description_legacy_vpn_device_and_profile_owned">This device is managed by:\n<xliff:g id="organization">%1$s</xliff:g>\nYour profile is managed by:\n<xliff:g id="organization">%2$s</xliff:g>\n\nYour administrator is capable of monitoring your network activity including emails, apps, and secure websites. For more information, contact your administrator.\n\nAlso, you\'re connected to a VPN (\"<xliff:g id="application">%3$s</xliff:g>\"). Your VPN service provider can monitor network activity too.</string> <!-- Indication on the keyguard that appears when the user disables trust agents until the next time they unlock manually. [CHAR LIMIT=NONE] --> diff --git a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java index 8416ad7ecfd5..1283dcd92827 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java +++ b/packages/SystemUI/src/com/android/systemui/recents/AlternateRecentsComponent.java @@ -189,7 +189,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta void showRelativeAffiliatedTask(boolean showNextTask) { RecentsTaskLoader loader = RecentsTaskLoader.getInstance(); TaskStack stack = loader.getTaskStack(mSystemServicesProxy, mContext.getResources(), - -1, -1, false, null, null); + -1, -1, false, true, null, null); // Return early if there are no tasks if (stack.getTaskCount() == 0) return; @@ -444,7 +444,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta // Get the stack of tasks that we are animating into RecentsTaskLoader loader = RecentsTaskLoader.getInstance(); TaskStack stack = loader.getTaskStack(mSystemServicesProxy, mContext.getResources(), - runningTaskId, -1, false, null, null); + runningTaskId, -1, false, isTopTaskHome, null, null); if (stack.getTaskCount() == 0) { return null; } @@ -485,7 +485,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta // which can differ depending on the number of items in the list. SystemServicesProxy ssp = mSystemServicesProxy; List<ActivityManager.RecentTaskInfo> recentTasks = - ssp.getRecentTasks(3, UserHandle.CURRENT.getIdentifier()); + ssp.getRecentTasks(3, UserHandle.CURRENT.getIdentifier(), isTopTaskHome); boolean useThumbnailTransition = !isTopTaskHome; boolean hasRecentTasks = !recentTasks.isEmpty(); diff --git a/packages/SystemUI/src/com/android/systemui/recents/Constants.java b/packages/SystemUI/src/com/android/systemui/recents/Constants.java index 103f96f58421..85cf07798f2b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/Constants.java +++ b/packages/SystemUI/src/com/android/systemui/recents/Constants.java @@ -37,6 +37,8 @@ public class Constants { public static final boolean EnableTaskBarTouchEvents = true; // Enables app-info pane on long-pressing the icon public static final boolean EnableDevAppInfoOnLongPress = true; + // Enables debug mode + public static final boolean EnableDebugMode = false; // Enables the search bar layout public static final boolean EnableSearchLayout = true; // Enables the thumbnail alpha on the front-most task diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index a49bbf964ad6..01ba5a28072d 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -182,14 +182,6 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView /** Updates the set of recent tasks */ void updateRecentsTasks(Intent launchIntent) { - // Load all the tasks - RecentsTaskLoader loader = RecentsTaskLoader.getInstance(); - SpaceNode root = loader.reload(this, Constants.Values.RecentsTaskLoader.PreloadFirstTasksCount); - ArrayList<TaskStack> stacks = root.getStacks(); - if (!stacks.isEmpty()) { - mRecentsView.setTaskStacks(root.getStacks()); - } - // Update the configuration based on the launch intent boolean fromSearchHome = launchIntent.getBooleanExtra( AlternateRecentsComponent.EXTRA_FROM_SEARCH_HOME, false); @@ -203,6 +195,16 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView AlternateRecentsComponent.EXTRA_FROM_TASK_ID, -1); mConfig.launchedWithAltTab = launchIntent.getBooleanExtra( AlternateRecentsComponent.EXTRA_TRIGGERED_FROM_ALT_TAB, false); + + // Load all the tasks + RecentsTaskLoader loader = RecentsTaskLoader.getInstance(); + SpaceNode root = loader.reload(this, + Constants.Values.RecentsTaskLoader.PreloadFirstTasksCount, + mConfig.launchedFromHome); + ArrayList<TaskStack> stacks = root.getStacks(); + if (!stacks.isEmpty()) { + mRecentsView.setTaskStacks(root.getStacks()); + } mConfig.launchedWithNoRecentTasks = !root.hasTasks(); // Create the home intent runnable diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java index 4696c82ecd8e..2aca576b805b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsConfiguration.java @@ -220,8 +220,6 @@ public class RecentsConfiguration { res.getInteger(R.integer.recents_animate_task_enter_from_home_duration); taskViewEnterFromHomeStaggerDelay = res.getInteger(R.integer.recents_animate_task_enter_from_home_stagger_delay); - taskViewEnterFromHomeStaggerDuration = - res.getInteger(R.integer.recents_animate_task_enter_from_home_stagger_duration); taskViewExitToHomeDuration = res.getInteger(R.integer.recents_animate_task_exit_to_home_duration); taskViewRemoveAnimDuration = diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/DebugTrigger.java b/packages/SystemUI/src/com/android/systemui/recents/misc/DebugTrigger.java index d0009850bcf0..fbf8a8669b70 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/misc/DebugTrigger.java +++ b/packages/SystemUI/src/com/android/systemui/recents/misc/DebugTrigger.java @@ -19,6 +19,7 @@ package com.android.systemui.recents.misc; import android.os.Handler; import android.os.SystemClock; import android.view.KeyEvent; +import com.android.systemui.recents.Constants; /** * A trigger for catching a debug chord. @@ -48,6 +49,8 @@ public class DebugTrigger { * then we just call the callback. */ public void onKeyEvent(int keyCode) { + if (!Constants.DebugFlags.App.EnableDebugMode) return; + if (mLastKeyCode == 0) { if (keyCode == KeyEvent.KEYCODE_VOLUME_UP) { mLastKeyCode = keyCode; diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java index 9554f01fc6fe..71a3ef186986 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java +++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java @@ -138,7 +138,8 @@ public class SystemServicesProxy { } /** Returns a list of the recents tasks */ - public List<ActivityManager.RecentTaskInfo> getRecentTasks(int numLatestTasks, int userId) { + public List<ActivityManager.RecentTaskInfo> getRecentTasks(int numLatestTasks, int userId, + boolean isTopTaskHome) { if (mAm == null) return null; // If we are mocking, then create some recent tasks @@ -195,10 +196,11 @@ public class SystemServicesProxy { // tasks // Check the first non-recents task, include this task even if it is marked as excluded - // from recents. In other words, only remove excluded tasks if it is not the first task + // from recents if we are currently in the app. In other words, only remove excluded + // tasks if it is not the first active task. boolean isExcluded = (t.baseIntent.getFlags() & Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) == Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; - if (isExcluded && !isFirstValidTask) { + if (isExcluded && (isTopTaskHome || !isFirstValidTask)) { iter.remove(); continue; } diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java index 9d4fe66e6127..d40e8474e573 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/RecentsTaskLoader.java @@ -322,11 +322,12 @@ public class RecentsTaskLoader { } /** Gets the list of recent tasks, ordered from back to front. */ - private static List<ActivityManager.RecentTaskInfo> getRecentTasks(SystemServicesProxy ssp) { + private static List<ActivityManager.RecentTaskInfo> getRecentTasks(SystemServicesProxy ssp, + boolean isTopTaskHome) { RecentsConfiguration config = RecentsConfiguration.getInstance(); List<ActivityManager.RecentTaskInfo> tasks = - ssp.getRecentTasks(config.maxNumTasksToLoad, - UserHandle.CURRENT.getIdentifier()); + ssp.getRecentTasks(config.maxNumTasksToLoad, UserHandle.CURRENT.getIdentifier(), + isTopTaskHome); Collections.reverse(tasks); return tasks; } @@ -408,11 +409,11 @@ public class RecentsTaskLoader { } /** Reload the set of recent tasks */ - public SpaceNode reload(Context context, int preloadCount) { + public SpaceNode reload(Context context, int preloadCount, boolean isTopTaskHome) { ArrayList<Task.TaskKey> taskKeys = new ArrayList<Task.TaskKey>(); ArrayList<Task> tasksToLoad = new ArrayList<Task>(); TaskStack stack = getTaskStack(mSystemServicesProxy, context.getResources(), - -1, preloadCount, true, taskKeys, tasksToLoad); + -1, preloadCount, true, isTopTaskHome, taskKeys, tasksToLoad); SpaceNode root = new SpaceNode(); root.setStack(stack); @@ -429,10 +430,10 @@ public class RecentsTaskLoader { /** Creates a lightweight stack of the current recent tasks, without thumbnails and icons. */ public TaskStack getTaskStack(SystemServicesProxy ssp, Resources res, int preloadTaskId, int preloadTaskCount, - boolean loadTaskThumbnails, List<Task.TaskKey> taskKeysOut, - List<Task> tasksToLoadOut) { + boolean loadTaskThumbnails, boolean isTopTaskHome, + List<Task.TaskKey> taskKeysOut, List<Task> tasksToLoadOut) { RecentsConfiguration config = RecentsConfiguration.getInstance(); - List<ActivityManager.RecentTaskInfo> tasks = getRecentTasks(ssp); + List<ActivityManager.RecentTaskInfo> tasks = getRecentTasks(ssp, isTopTaskHome); HashMap<Task.ComponentNameKey, ActivityInfoHandle> activityInfoCache = new HashMap<Task.ComponentNameKey, ActivityInfoHandle>(); ArrayList<Task> tasksToAdd = new ArrayList<Task>(); diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index e1e4068a18d7..40134da79af2 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -743,6 +743,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal for (int i = 0; i < childCount; i++) { TaskView t = (TaskView) getChildAt(i); if (t == tv) { + t.setClipViewInStack(false); t.startLaunchTaskAnimation(r, true, true, lockToTask); } else { boolean occludesLaunchTarget = launchTargetTask.group.isTaskAboveTask(t.getTask(), diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java index 17508045b818..26581762dbca 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java @@ -418,22 +418,21 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, } else if (mConfig.launchedFromHome) { // Animate the tasks up int frontIndex = (ctx.currentStackViewCount - ctx.currentStackViewIndex - 1); - float fraction = (float) frontIndex / (ctx.currentStackViewCount - 1); - fraction = (float) Math.pow(fraction, 0.85f); - int delay = (int) (mConfig.taskViewEnterFromHomeDelay + - fraction * mConfig.taskViewEnterFromHomeStaggerDelay); - long delayIncrease = (long) (fraction * mConfig.taskViewEnterFromHomeStaggerDuration); + int delay = mConfig.taskViewEnterFromHomeDelay + + frontIndex * mConfig.taskViewEnterFromHomeStaggerDelay; + + setScaleX(transform.scale); + setScaleY(transform.scale); if (!mConfig.fakeShadows) { animate().translationZ(transform.translationZ); } animate() - .scaleX(transform.scale) - .scaleY(transform.scale) .translationY(transform.translationY) .setStartDelay(delay) .setUpdateListener(ctx.updateListener) .setInterpolator(mConfig.quintOutInterpolator) - .setDuration(mConfig.taskViewEnterFromHomeDuration + delayIncrease) + .setDuration(mConfig.taskViewEnterFromHomeDuration + + frontIndex * mConfig.taskViewEnterFromHomeStaggerDelay) .withEndAction(new Runnable() { @Override public void run() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index 222740871bd2..d0f73b166fac 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -2135,6 +2135,10 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, return onKeyguard && (isMethodInsecure || mDozing || mScreenOnComingFromTouch); } + public boolean isDozing() { + return mDozing; + } + @Override // NotificationData.Environment public String getCurrentMediaNotificationKey() { return mMediaNotificationKey; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java index 242f1b729d64..f0c599d044e3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarWindowView.java @@ -23,6 +23,7 @@ import android.graphics.Paint; import android.graphics.PorterDuff; import android.graphics.PorterDuffXfermode; import android.graphics.Rect; +import android.media.session.MediaSessionLegacyHelper; import android.os.IBinder; import android.util.AttributeSet; import android.view.KeyEvent; @@ -133,11 +134,14 @@ public class StatusBarWindowView extends FrameLayout { if (!down) { return mService.onSpacePressed(); } + break; case KeyEvent.KEYCODE_VOLUME_DOWN: case KeyEvent.KEYCODE_VOLUME_UP: - if (down) { - mService.wakeUpIfDozing(event.getEventTime(), false); + if (mService.isDozing()) { + MediaSessionLegacyHelper.getHelper(mContext).sendVolumeKeyEvent(event, true); + return true; } + break; } if (mService.interceptMediaKey(event)) { return true; diff --git a/preloaded-classes b/preloaded-classes index b3fc51729295..649255fca81d 100644 --- a/preloaded-classes +++ b/preloaded-classes @@ -2,29 +2,183 @@ # Automatically generated by frameworks/base/tools/preload/WritePreloadedClassFile.java. # MIN_LOAD_TIME_MICROS=1250 # MIN_PROCESSES=10 +[B +[C +[D +[F +[I +[J +[Landroid.accounts.Account; +[Landroid.animation.Animator; +[Landroid.animation.Keyframe$FloatKeyframe; +[Landroid.animation.Keyframe$IntKeyframe; +[Landroid.animation.PropertyValuesHolder; +[Landroid.app.FragmentState; +[Landroid.app.LoaderManagerImpl; +[Landroid.content.ContentProviderResult; +[Landroid.content.ContentValues; +[Landroid.content.Intent; +[Landroid.content.pm.ActivityInfo; +[Landroid.content.pm.ConfigurationInfo; +[Landroid.content.pm.FeatureGroupInfo; +[Landroid.content.pm.FeatureInfo; +[Landroid.content.pm.InstrumentationInfo; +[Landroid.content.pm.PathPermission; +[Landroid.content.pm.PermissionInfo; +[Landroid.content.pm.ProviderInfo; +[Landroid.content.pm.ServiceInfo; +[Landroid.content.pm.Signature; +[Landroid.content.res.StringBlock; +[Landroid.content.res.XmlBlock; +[Landroid.database.sqlite.SQLiteConnection$Operation; +[Landroid.database.sqlite.SQLiteConnectionPool$AcquiredConnectionStatus; +[Landroid.graphics.Bitmap$CompressFormat; +[Landroid.graphics.Bitmap$Config; +[Landroid.graphics.Canvas$EdgeType; +[Landroid.graphics.FontFamily; +[Landroid.graphics.Interpolator$Result; +[Landroid.graphics.Matrix$ScaleToFit; +[Landroid.graphics.Paint$Align; +[Landroid.graphics.Paint$Cap; +[Landroid.graphics.Paint$Join; +[Landroid.graphics.Paint$Style; +[Landroid.graphics.Path$Direction; +[Landroid.graphics.Path$FillType; +[Landroid.graphics.PorterDuff$Mode; +[Landroid.graphics.Region$Op; +[Landroid.graphics.Shader$TileMode; +[Landroid.graphics.Typeface; +[Landroid.graphics.drawable.Drawable; +[Landroid.graphics.drawable.GradientDrawable$Orientation; +[Landroid.graphics.drawable.LayerDrawable$ChildDrawable; +[Landroid.graphics.drawable.Ripple; +[Landroid.hardware.soundtrigger.SoundTrigger$ConfidenceLevel; +[Landroid.hardware.soundtrigger.SoundTrigger$Keyphrase; +[Landroid.hardware.soundtrigger.SoundTrigger$KeyphraseRecognitionExtra; +[Landroid.media.AudioGain; +[Landroid.net.NetworkInfo$DetailedState; +[Landroid.net.NetworkInfo$State; +[Landroid.os.AsyncTask$Status; +[Landroid.os.MessageQueue$IdleHandler; +[Landroid.os.Parcel; +[Landroid.os.Parcelable; +[Landroid.os.PatternMatcher; +[Landroid.os.storage.StorageVolume; +[Landroid.system.StructPollfd; +[Landroid.text.DynamicLayout$ChangeWatcher; +[Landroid.text.InputFilter; +[Landroid.text.Layout$Alignment; +[Landroid.text.Layout$Directions; +[Landroid.text.MeasuredText; +[Landroid.text.SpanWatcher; +[Landroid.text.TextLine; +[Landroid.text.TextUtils$TruncateAt; +[Landroid.text.TextWatcher; +[Landroid.text.method.TextKeyListener$Capitalize; +[Landroid.text.method.TextKeyListener; +[Landroid.text.style.AlignmentSpan; +[Landroid.text.style.CharacterStyle; +[Landroid.text.style.LeadingMarginSpan; +[Landroid.text.style.LineBackgroundSpan; +[Landroid.text.style.LineHeightSpan; +[Landroid.text.style.MetricAffectingSpan; +[Landroid.text.style.ParagraphStyle; +[Landroid.text.style.ReplacementSpan; +[Landroid.text.style.SpellCheckSpan; +[Landroid.text.style.SuggestionSpan; +[Landroid.text.style.WrapTogetherSpan; +[Landroid.util.LongSparseArray; +[Landroid.util.PathParser$PathDataNode; +[Landroid.view.Choreographer$CallbackQueue; +[Landroid.view.View; +[Landroid.widget.Editor$TextDisplayList; +[Landroid.widget.Editor$TextViewPositionListener; +[Landroid.widget.ImageView$ScaleType; +[Landroid.widget.TextView$BufferType; +[Landroid.widget.TextView$ChangeWatcher; +[Lcom.android.dex.TableOfContents$Section; +[Lcom.android.internal.policy.impl.PhoneWindow$PanelFeatureState; +[Lcom.android.internal.telephony.PhoneConstants$State; +[Lcom.android.okhttp.Protocol; +[Lcom.android.okhttp.ResponseSource; +[Lcom.android.okhttp.internal.http.HttpURLConnectionImpl$Retry; +[Lcom.android.org.bouncycastle.asn1.ASN1ObjectIdentifier; +[Lcom.android.org.bouncycastle.asn1.x509.GeneralName; +[Lcom.android.org.conscrypt.OpenSSLX509CertPath$Encoding; +[Lcom.android.org.conscrypt.OpenSSLX509Certificate; +[Ljava.io.FileDescriptor; +[Ljava.lang.CharSequence; +[Ljava.lang.Class; +[Ljava.lang.Integer; +[Ljava.lang.Object; +[Ljava.lang.Runnable; +[Ljava.lang.String; +[Ljava.lang.Void; +[Ljava.math.BigDecimal; +[Ljava.math.BigInteger; +[Ljava.math.RoundingMode; +[Ljava.net.InetAddress; +[Ljava.net.Proxy$Type; +[Ljava.security.cert.X509Certificate; +[Ljava.text.Format$Field; +[Ljava.util.ArrayList; +[Ljava.util.Map$Entry; +[Ljava.util.TimerTask; +[Ljava.util.TreeMap$Relation; +[Ljava.util.concurrent.ConcurrentHashMap$Node; +[Ljava.util.concurrent.ConcurrentHashMap$Segment; +[Ljava.util.concurrent.TimeUnit; +[Ljava.util.logging.Handler; +[Ljavax.net.ssl.KeyManager; +[Ljavax.net.ssl.TrustManager; +[Llibcore.reflect.AnnotationMember$DefaultValues; +[Llibcore.reflect.AnnotationMember; +[Lorg.apache.harmony.security.asn1.ASN1Type; +[Lorg.apache.harmony.security.utils.ObjectIdentifier; +[Lorg.apache.http.Header; +[Lorg.apache.http.HeaderElement; +[Lorg.apache.http.NameValuePair; +[Lorg.apache.http.conn.routing.RouteInfo$LayerType; +[Lorg.apache.http.conn.routing.RouteInfo$TunnelType; +[Lorg.json.JSONStringer$Scope; +[Lorg.kxml2.io.KXmlParser$ValueContext; +[Z +[[B +[[I +[[Lcom.android.org.bouncycastle.asn1.ASN1ObjectIdentifier; +[[Ljava.lang.Object; +[[Ljava.lang.String; +[[Lorg.apache.harmony.security.utils.ObjectIdentifier; +[[[B android.R$styleable android.accounts.Account android.accounts.Account$1 android.accounts.AccountManager -android.accounts.AccountManager$12 -android.accounts.AccountManager$13 -android.accounts.AccountManager$6 +android.accounts.AccountManager$16 +android.accounts.AccountManager$8 android.accounts.AccountManager$AmsTask android.accounts.AccountManager$AmsTask$1 android.accounts.AccountManager$AmsTask$Response +android.accounts.AccountManagerCallback android.accounts.AccountManagerFuture +android.accounts.AccountsException +android.accounts.AuthenticatorException android.accounts.IAccountManager android.accounts.IAccountManager$Stub android.accounts.IAccountManager$Stub$Proxy android.accounts.IAccountManagerResponse android.accounts.IAccountManagerResponse$Stub android.accounts.OnAccountsUpdateListener +android.accounts.OperationCanceledException android.animation.Animator android.animation.Animator$AnimatorListener +android.animation.Animator$AnimatorPauseListener +android.animation.AnimatorInflater android.animation.AnimatorListenerAdapter android.animation.AnimatorSet android.animation.AnimatorSet$AnimatorSetListener android.animation.AnimatorSet$Builder +android.animation.AnimatorSet$Dependency android.animation.AnimatorSet$DependencyListener android.animation.AnimatorSet$Node android.animation.FloatEvaluator @@ -35,30 +189,40 @@ android.animation.Keyframe android.animation.Keyframe$FloatKeyframe android.animation.Keyframe$IntKeyframe android.animation.KeyframeSet +android.animation.Keyframes +android.animation.Keyframes$FloatKeyframes +android.animation.Keyframes$IntKeyframes +android.animation.LayoutTransition android.animation.LayoutTransition$TransitionListener android.animation.ObjectAnimator android.animation.PropertyValuesHolder android.animation.PropertyValuesHolder$FloatPropertyValuesHolder android.animation.PropertyValuesHolder$IntPropertyValuesHolder +android.animation.RectEvaluator +android.animation.StateListAnimator +android.animation.StateListAnimator$1 +android.animation.StateListAnimator$Tuple android.animation.TimeInterpolator android.animation.TypeEvaluator android.animation.ValueAnimator android.animation.ValueAnimator$AnimationHandler +android.animation.ValueAnimator$AnimatorUpdateListener android.app.ActionBar android.app.ActionBar$LayoutParams android.app.Activity android.app.Activity$1 android.app.ActivityManager -android.app.ActivityManager$MemoryInfo -android.app.ActivityManager$MemoryInfo$1 android.app.ActivityManager$RunningAppProcessInfo android.app.ActivityManager$RunningAppProcessInfo$1 +android.app.ActivityManager$TaskDescription +android.app.ActivityManager$TaskDescription$1 android.app.ActivityManagerNative android.app.ActivityManagerNative$1 android.app.ActivityManagerProxy android.app.ActivityThread android.app.ActivityThread$1 android.app.ActivityThread$2 +android.app.ActivityThread$3 android.app.ActivityThread$ActivityClientRecord android.app.ActivityThread$AppBindData android.app.ActivityThread$ApplicationThread @@ -66,7 +230,6 @@ android.app.ActivityThread$BindServiceData android.app.ActivityThread$ContextCleanupInfo android.app.ActivityThread$CreateServiceData android.app.ActivityThread$DropBoxReporter -android.app.ActivityThread$DumpComponentInfo android.app.ActivityThread$EventLoggingReporter android.app.ActivityThread$GcIdler android.app.ActivityThread$H @@ -79,9 +242,10 @@ android.app.ActivityThread$ReceiverData android.app.ActivityThread$ResultData android.app.ActivityThread$ServiceArgsData android.app.ActivityThread$StopInfo +android.app.ActivityTransitionState android.app.AlertDialog -android.app.AlertDialog$Builder android.app.AppGlobals +android.app.AppOpsManager android.app.Application android.app.Application$ActivityLifecycleCallbacks android.app.ApplicationErrorReport$CrashInfo @@ -91,6 +255,7 @@ android.app.ApplicationPackageManager$ResourceName android.app.ApplicationThreadNative android.app.BackStackRecord android.app.BackStackRecord$Op +android.app.BackStackRecord$TransitionState android.app.ContextImpl android.app.ContextImpl$1 android.app.ContextImpl$10 @@ -127,8 +292,30 @@ android.app.ContextImpl$38 android.app.ContextImpl$39 android.app.ContextImpl$4 android.app.ContextImpl$40 +android.app.ContextImpl$41 +android.app.ContextImpl$42 +android.app.ContextImpl$43 +android.app.ContextImpl$44 +android.app.ContextImpl$45 +android.app.ContextImpl$46 +android.app.ContextImpl$47 +android.app.ContextImpl$48 +android.app.ContextImpl$49 android.app.ContextImpl$5 +android.app.ContextImpl$50 +android.app.ContextImpl$51 +android.app.ContextImpl$52 +android.app.ContextImpl$53 +android.app.ContextImpl$54 +android.app.ContextImpl$55 +android.app.ContextImpl$56 +android.app.ContextImpl$57 +android.app.ContextImpl$58 +android.app.ContextImpl$59 android.app.ContextImpl$6 +android.app.ContextImpl$60 +android.app.ContextImpl$61 +android.app.ContextImpl$62 android.app.ContextImpl$7 android.app.ContextImpl$8 android.app.ContextImpl$9 @@ -138,16 +325,23 @@ android.app.ContextImpl$StaticServiceFetcher android.app.Dialog android.app.Dialog$1 android.app.Dialog$ListenersHandler +android.app.DialogFragment android.app.Fragment +android.app.Fragment$1 android.app.FragmentBreadCrumbs -android.app.FragmentBreadCrumbs$1 android.app.FragmentContainer android.app.FragmentManager android.app.FragmentManager$BackStackEntry -android.app.FragmentManager$OnBackStackChangedListener android.app.FragmentManagerImpl android.app.FragmentManagerImpl$1 +android.app.FragmentManagerState +android.app.FragmentManagerState$1 +android.app.FragmentState +android.app.FragmentState$1 android.app.FragmentTransaction +android.app.IActivityContainer +android.app.IActivityContainer$Stub +android.app.IActivityContainer$Stub$Proxy android.app.IActivityManager android.app.IActivityManager$ContentProviderHolder android.app.IActivityManager$ContentProviderHolder$1 @@ -160,13 +354,8 @@ android.app.IInstrumentationWatcher$Stub android.app.INotificationManager android.app.INotificationManager$Stub android.app.INotificationManager$Stub$Proxy -android.app.ISearchManager -android.app.ISearchManager$Stub -android.app.ISearchManager$Stub$Proxy android.app.IServiceConnection android.app.IServiceConnection$Stub -android.app.ITransientNotification -android.app.ITransientNotification$Stub android.app.IUiAutomationConnection android.app.IUiAutomationConnection$Stub android.app.Instrumentation @@ -174,8 +363,6 @@ android.app.IntentReceiverLeaked android.app.IntentService android.app.IntentService$ServiceHandler android.app.ListActivity -android.app.ListActivity$1 -android.app.ListActivity$2 android.app.LoadedApk android.app.LoadedApk$ReceiverDispatcher android.app.LoadedApk$ReceiverDispatcher$Args @@ -192,16 +379,22 @@ android.app.NativeActivity android.app.Notification android.app.Notification$1 android.app.Notification$Builder +android.app.Notification$BuilderRemoteViews android.app.NotificationManager android.app.OnActivityPausedListener android.app.PendingIntent android.app.PendingIntent$1 +android.app.PendingIntent$CanceledException +android.app.ProgressDialog android.app.QueuedWork android.app.ReceiverRestrictedContext +android.app.ResourcesManager android.app.ResultInfo android.app.ResultInfo$1 android.app.Service android.app.ServiceConnectionLeaked +android.app.SharedElementCallback +android.app.SharedElementCallback$1 android.app.SharedPreferencesImpl android.app.SharedPreferencesImpl$1 android.app.SharedPreferencesImpl$2 @@ -209,6 +402,9 @@ android.app.SharedPreferencesImpl$EditorImpl android.app.SharedPreferencesImpl$EditorImpl$1 android.app.SharedPreferencesImpl$EditorImpl$2 android.app.SharedPreferencesImpl$MemoryCommitResult +android.app.admin.DevicePolicyManager +android.app.admin.IDevicePolicyManager$Stub +android.app.admin.IDevicePolicyManager$Stub$Proxy android.app.backup.BackupDataInput android.app.backup.BackupDataInput$EntityHeader android.app.backup.BackupDataOutput @@ -216,12 +412,15 @@ android.app.backup.BackupHelperDispatcher android.app.backup.BackupHelperDispatcher$Header android.app.backup.FileBackupHelperBase android.app.backup.FullBackup +android.appwidget.AppWidgetHostView android.appwidget.AppWidgetManager android.appwidget.AppWidgetProvider +android.bluetooth.BluetoothDevice android.bluetooth.BluetoothUuid android.content.AbstractThreadedSyncAdapter android.content.AbstractThreadedSyncAdapter$ISyncAdapterImpl android.content.AbstractThreadedSyncAdapter$SyncThread +android.content.ActivityNotFoundException android.content.BroadcastReceiver android.content.BroadcastReceiver$PendingResult android.content.ComponentCallbacks @@ -232,8 +431,11 @@ android.content.ContentProvider android.content.ContentProvider$Transport android.content.ContentProviderClient android.content.ContentProviderNative +android.content.ContentProviderOperation +android.content.ContentProviderOperation$1 android.content.ContentProviderProxy android.content.ContentProviderResult +android.content.ContentProviderResult$1 android.content.ContentResolver android.content.ContentResolver$CursorWrapperInner android.content.ContentResolver$ParcelFileDescriptorInner @@ -264,11 +466,17 @@ android.content.Intent android.content.Intent$1 android.content.IntentFilter android.content.IntentFilter$1 +android.content.IntentFilter$MalformedMimeTypeException +android.content.IntentSender$SendIntentException +android.content.OperationApplicationException android.content.ServiceConnection android.content.SharedPreferences android.content.SharedPreferences$Editor android.content.SharedPreferences$OnSharedPreferenceChangeListener android.content.SyncContext +android.content.SyncRequest +android.content.SyncRequest$1 +android.content.SyncRequest$Builder android.content.SyncResult android.content.SyncResult$1 android.content.SyncStats @@ -281,6 +489,8 @@ android.content.pm.ApplicationInfo$1 android.content.pm.ComponentInfo android.content.pm.ConfigurationInfo android.content.pm.ConfigurationInfo$1 +android.content.pm.FeatureGroupInfo +android.content.pm.FeatureGroupInfo$1 android.content.pm.FeatureInfo android.content.pm.FeatureInfo$1 android.content.pm.IPackageManager @@ -293,6 +503,7 @@ android.content.pm.PackageInfo$1 android.content.pm.PackageItemInfo android.content.pm.PackageManager android.content.pm.PackageManager$NameNotFoundException +android.content.pm.PackageParser$PackageParserException android.content.pm.PathPermission android.content.pm.PathPermission$1 android.content.pm.PermissionInfo @@ -322,9 +533,10 @@ android.content.res.ObbInfo android.content.res.ObbInfo$1 android.content.res.ObbScanner android.content.res.Resources +android.content.res.Resources$NotFoundException android.content.res.Resources$Theme +android.content.res.ResourcesKey android.content.res.StringBlock -android.content.res.StringBlock$StyleIDs android.content.res.TypedArray android.content.res.XmlBlock android.content.res.XmlBlock$Parser @@ -361,6 +573,7 @@ android.database.IContentObserver$Stub android.database.IContentObserver$Stub$Proxy android.database.MatrixCursor android.database.Observable +android.database.SQLException android.database.sqlite.DatabaseObjectNotClosedException android.database.sqlite.SQLiteClosable android.database.sqlite.SQLiteConnection @@ -376,12 +589,13 @@ android.database.sqlite.SQLiteCursorDriver android.database.sqlite.SQLiteCustomFunction android.database.sqlite.SQLiteDatabase android.database.sqlite.SQLiteDatabase$1 -android.database.sqlite.SQLiteDatabase$2 android.database.sqlite.SQLiteDatabaseConfiguration +android.database.sqlite.SQLiteDatabaseCorruptException +android.database.sqlite.SQLiteDatabaseLockedException android.database.sqlite.SQLiteDebug -android.database.sqlite.SQLiteDebug$DbStats android.database.sqlite.SQLiteDebug$PagerStats android.database.sqlite.SQLiteDirectCursorDriver +android.database.sqlite.SQLiteException android.database.sqlite.SQLiteGlobal android.database.sqlite.SQLiteOpenHelper android.database.sqlite.SQLiteProgram @@ -400,13 +614,13 @@ android.ddm.DdmHandleProfiling android.ddm.DdmHandleThread android.ddm.DdmHandleViewDebug android.ddm.DdmRegister -android.drm.DrmManagerClient android.emoji.EmojiFactory android.graphics.AvoidXfermode android.graphics.Bitmap android.graphics.Bitmap$1 android.graphics.Bitmap$2 android.graphics.Bitmap$BitmapFinalizer +android.graphics.Bitmap$CompressFormat android.graphics.Bitmap$Config android.graphics.BitmapFactory android.graphics.BitmapFactory$Options @@ -417,6 +631,7 @@ android.graphics.Camera android.graphics.Canvas android.graphics.Canvas$CanvasFinalizer android.graphics.Canvas$EdgeType +android.graphics.CanvasProperty android.graphics.Color android.graphics.ColorFilter android.graphics.ColorMatrixColorFilter @@ -427,6 +642,12 @@ android.graphics.DashPathEffect android.graphics.DiscretePathEffect android.graphics.DrawFilter android.graphics.EmbossMaskFilter +android.graphics.FontFamily +android.graphics.FontListParser +android.graphics.FontListParser$Alias +android.graphics.FontListParser$Config +android.graphics.FontListParser$Family +android.graphics.FontListParser$Font android.graphics.Insets android.graphics.Interpolator android.graphics.Interpolator$Result @@ -439,6 +660,8 @@ android.graphics.Matrix$1 android.graphics.Matrix$ScaleToFit android.graphics.Movie android.graphics.NinePatch +android.graphics.NinePatch$InsetStruct +android.graphics.Outline android.graphics.Paint android.graphics.Paint$Align android.graphics.Paint$Cap @@ -485,12 +708,17 @@ android.graphics.Typeface android.graphics.Xfermode android.graphics.YuvImage android.graphics.drawable.Animatable +android.graphics.drawable.AnimatedStateListDrawable +android.graphics.drawable.AnimatedStateListDrawable$AnimatedStateListState +android.graphics.drawable.AnimatedStateListDrawable$AnimationDrawableTransition +android.graphics.drawable.AnimatedStateListDrawable$FrameInterpolator +android.graphics.drawable.AnimatedStateListDrawable$Transition +android.graphics.drawable.AnimatedVectorDrawable +android.graphics.drawable.AnimatedVectorDrawable$AnimatedVectorDrawableState android.graphics.drawable.AnimationDrawable android.graphics.drawable.AnimationDrawable$AnimationState android.graphics.drawable.BitmapDrawable android.graphics.drawable.BitmapDrawable$BitmapState -android.graphics.drawable.ClipDrawable -android.graphics.drawable.ClipDrawable$ClipState android.graphics.drawable.ColorDrawable android.graphics.drawable.ColorDrawable$ColorState android.graphics.drawable.Drawable @@ -498,15 +726,26 @@ android.graphics.drawable.Drawable$Callback android.graphics.drawable.Drawable$ConstantState android.graphics.drawable.DrawableContainer android.graphics.drawable.DrawableContainer$DrawableContainerState +android.graphics.drawable.DrawableContainer$DrawableContainerState$ConstantStateFuture android.graphics.drawable.GradientDrawable android.graphics.drawable.GradientDrawable$1 android.graphics.drawable.GradientDrawable$GradientState android.graphics.drawable.GradientDrawable$Orientation +android.graphics.drawable.InsetDrawable +android.graphics.drawable.InsetDrawable$InsetState android.graphics.drawable.LayerDrawable android.graphics.drawable.LayerDrawable$ChildDrawable android.graphics.drawable.LayerDrawable$LayerState android.graphics.drawable.NinePatchDrawable android.graphics.drawable.NinePatchDrawable$NinePatchState +android.graphics.drawable.Ripple +android.graphics.drawable.Ripple$1 +android.graphics.drawable.Ripple$LogInterpolator +android.graphics.drawable.RippleBackground +android.graphics.drawable.RippleBackground$1 +android.graphics.drawable.RippleBackground$2 +android.graphics.drawable.RippleDrawable +android.graphics.drawable.RippleDrawable$RippleState android.graphics.drawable.RotateDrawable android.graphics.drawable.RotateDrawable$RotateState android.graphics.drawable.ScaleDrawable @@ -517,21 +756,39 @@ android.graphics.drawable.StateListDrawable android.graphics.drawable.StateListDrawable$StateListState android.graphics.drawable.TransitionDrawable android.graphics.drawable.TransitionDrawable$TransitionState +android.graphics.drawable.VectorDrawable +android.graphics.drawable.VectorDrawable$VFullPath +android.graphics.drawable.VectorDrawable$VGroup +android.graphics.drawable.VectorDrawable$VPath +android.graphics.drawable.VectorDrawable$VPathRenderer +android.graphics.drawable.VectorDrawable$VectorDrawableState android.graphics.drawable.shapes.RectShape -android.graphics.drawable.shapes.RoundRectShape android.graphics.drawable.shapes.Shape +android.graphics.pdf.PdfDocument +android.graphics.pdf.PdfEditor +android.graphics.pdf.PdfRenderer android.hardware.Camera android.hardware.Camera$CameraInfo android.hardware.Camera$Face +android.hardware.Camera$Parameters +android.hardware.Camera$PreviewCallback android.hardware.Sensor -android.hardware.SensorEvent android.hardware.SensorEventListener android.hardware.SensorManager android.hardware.SerialPort android.hardware.SystemSensorManager android.hardware.SystemSensorManager$BaseEventQueue +android.hardware.camera2.CameraCharacteristics +android.hardware.camera2.CaptureRequest +android.hardware.camera2.CaptureResult +android.hardware.camera2.DngCreator +android.hardware.camera2.impl.CameraMetadataNative +android.hardware.camera2.legacy.LegacyCameraDevice +android.hardware.camera2.legacy.PerfMeasurement android.hardware.display.DisplayManager +android.hardware.display.DisplayManager$DisplayListener android.hardware.display.DisplayManagerGlobal +android.hardware.display.DisplayManagerGlobal$DisplayListenerDelegate android.hardware.display.DisplayManagerGlobal$DisplayManagerCallback android.hardware.display.IDisplayManager android.hardware.display.IDisplayManager$Stub @@ -543,30 +800,62 @@ android.hardware.input.IInputDevicesChangedListener$Stub android.hardware.input.IInputManager android.hardware.input.IInputManager$Stub android.hardware.input.IInputManager$Stub$Proxy +android.hardware.input.InputDeviceIdentifier +android.hardware.input.InputDeviceIdentifier$1 android.hardware.input.InputManager android.hardware.input.InputManager$InputDevicesChangedListener +android.hardware.location.ActivityRecognitionHardware +android.hardware.location.IActivityRecognitionHardware +android.hardware.location.IActivityRecognitionHardware$Stub +android.hardware.soundtrigger.SoundTrigger +android.hardware.soundtrigger.SoundTrigger$ConfidenceLevel +android.hardware.soundtrigger.SoundTrigger$ConfidenceLevel$1 +android.hardware.soundtrigger.SoundTrigger$Keyphrase +android.hardware.soundtrigger.SoundTrigger$Keyphrase$1 +android.hardware.soundtrigger.SoundTrigger$KeyphraseRecognitionEvent +android.hardware.soundtrigger.SoundTrigger$KeyphraseRecognitionEvent$1 +android.hardware.soundtrigger.SoundTrigger$KeyphraseRecognitionExtra +android.hardware.soundtrigger.SoundTrigger$KeyphraseRecognitionExtra$1 +android.hardware.soundtrigger.SoundTrigger$KeyphraseSoundModel +android.hardware.soundtrigger.SoundTrigger$KeyphraseSoundModel$1 +android.hardware.soundtrigger.SoundTrigger$ModuleProperties +android.hardware.soundtrigger.SoundTrigger$ModuleProperties$1 +android.hardware.soundtrigger.SoundTrigger$RecognitionConfig +android.hardware.soundtrigger.SoundTrigger$RecognitionConfig$1 +android.hardware.soundtrigger.SoundTrigger$RecognitionEvent +android.hardware.soundtrigger.SoundTrigger$RecognitionEvent$1 +android.hardware.soundtrigger.SoundTrigger$SoundModel +android.hardware.soundtrigger.SoundTrigger$SoundModelEvent +android.hardware.soundtrigger.SoundTrigger$SoundModelEvent$1 +android.hardware.soundtrigger.SoundTriggerModule android.hardware.usb.UsbDevice android.hardware.usb.UsbDeviceConnection android.hardware.usb.UsbRequest android.inputmethodservice.ExtractEditText -android.location.GpsSatellite -android.location.GpsStatus -android.location.GpsStatus$1 -android.location.ILocationManager -android.location.ILocationManager$Stub -android.location.ILocationManager$Stub$Proxy android.location.Location android.location.Location$1 -android.location.LocationManager -android.location.LocationRequest -android.location.LocationRequest$1 android.media.AmrInputStream +android.media.AudioAttributes +android.media.AudioAttributes$1 +android.media.AudioAttributes$Builder +android.media.AudioDevicePort +android.media.AudioDevicePortConfig android.media.AudioFormat +android.media.AudioGain +android.media.AudioGainConfig +android.media.AudioHandle android.media.AudioManager android.media.AudioManager$1 android.media.AudioManager$FocusEventHandlerDelegate android.media.AudioManager$FocusEventHandlerDelegate$1 android.media.AudioManager$OnAudioFocusChangeListener +android.media.AudioMixPort +android.media.AudioMixPortConfig +android.media.AudioPatch +android.media.AudioPort +android.media.AudioPortConfig +android.media.AudioPortEventHandler +android.media.AudioPortEventHandler$1 android.media.AudioRecord android.media.AudioSystem android.media.AudioTrack @@ -574,33 +863,43 @@ android.media.CamcorderProfile android.media.CameraProfile android.media.DecoderCapabilities android.media.EncoderCapabilities -android.media.ExifInterface android.media.IAudioFocusDispatcher android.media.IAudioFocusDispatcher$Stub android.media.IAudioService android.media.IAudioService$Stub android.media.IAudioService$Stub$Proxy +android.media.IMediaHTTPConnection +android.media.IMediaHTTPConnection$Stub +android.media.Image +android.media.ImageReader +android.media.ImageReader$SurfaceImage android.media.JetPlayer android.media.MediaCodec android.media.MediaCodecList android.media.MediaCrypto android.media.MediaDrm android.media.MediaExtractor +android.media.MediaFormat +android.media.MediaHTTPConnection +android.media.MediaMetadata android.media.MediaMetadataRetriever android.media.MediaMuxer android.media.MediaPlayer android.media.MediaPlayer$OnBufferingUpdateListener android.media.MediaPlayer$OnCompletionListener android.media.MediaPlayer$OnErrorListener -android.media.MediaPlayer$OnInfoListener android.media.MediaPlayer$OnPreparedListener android.media.MediaPlayer$OnSeekCompleteListener +android.media.MediaPlayer$OnVideoSizeChangedListener android.media.MediaRecorder android.media.MediaScanner android.media.RemoteDisplay android.media.ResampleInputStream -android.media.SoundPool +android.media.SoundPool$SoundPoolImpl +android.media.SubtitleController$Listener android.media.ToneGenerator +android.media.audiofx.AudioEffect +android.media.audiofx.LoudnessEnhancer android.mtp.MtpDatabase android.mtp.MtpDevice android.mtp.MtpDeviceInfo @@ -630,9 +929,12 @@ android.net.NetworkStats android.net.NetworkStats$1 android.net.NetworkUtils android.net.Proxy +android.net.ProxyInfo android.net.SSLCertificateSocketFactory android.net.SSLCertificateSocketFactory$1 android.net.SSLSessionCache +android.net.StaticIpConfiguration +android.net.StaticIpConfiguration$1 android.net.TrafficStats android.net.Uri android.net.Uri$1 @@ -651,35 +953,46 @@ android.net.WebAddress android.net.http.AndroidHttpClient android.net.http.AndroidHttpClient$1 android.net.http.AndroidHttpClient$2 -android.net.http.AndroidHttpClient$CurlLogger -android.net.http.CertificateChainValidator android.net.wifi.IWifiManager android.net.wifi.IWifiManager$Stub android.net.wifi.IWifiManager$Stub$Proxy +android.net.wifi.WifiInfo android.net.wifi.WifiManager -android.net.wifi.WifiManager$ServiceHandler +android.net.wifi.WifiManager$WifiLock android.nfc.IAppCallback android.nfc.IAppCallback$Stub android.nfc.INfcAdapter android.nfc.INfcAdapter$Stub android.nfc.INfcAdapter$Stub$Proxy +android.nfc.INfcCardEmulation +android.nfc.INfcCardEmulation$Stub +android.nfc.INfcCardEmulation$Stub$Proxy android.nfc.INfcTag android.nfc.INfcTag$Stub android.nfc.INfcTag$Stub$Proxy +android.nfc.NdefRecord android.nfc.NfcActivityManager android.nfc.NfcAdapter android.nfc.NfcAdapter$1 android.nfc.NfcEvent android.nfc.NfcManager android.opengl.EGL14 +android.opengl.EGLConfig +android.opengl.EGLContext +android.opengl.EGLDisplay +android.opengl.EGLExt +android.opengl.EGLObjectHandle +android.opengl.EGLSurface android.opengl.ETC1 android.opengl.GLES10 android.opengl.GLES10Ext android.opengl.GLES11 android.opengl.GLES11Ext android.opengl.GLES20 -android.opengl.GLUtils -android.opengl.ManagedEGLContext +android.opengl.GLES30 +android.opengl.GLES31 +android.opengl.GLES31Ext +android.opengl.GLSurfaceView android.opengl.Matrix android.opengl.Visibility android.os.AsyncTask$1 @@ -691,6 +1004,9 @@ android.os.AsyncTask$SerialExecutor android.os.AsyncTask$SerialExecutor$1 android.os.AsyncTask$Status android.os.AsyncTask$WorkerRunnable +android.os.BadParcelableException +android.os.BaseBundle +android.os.BatteryStats android.os.Binder android.os.BinderProxy android.os.Build @@ -699,6 +1015,9 @@ android.os.Bundle android.os.Bundle$1 android.os.CancellationSignal android.os.CancellationSignal$OnCancelListener +android.os.CancellationSignal$Transport +android.os.ConditionVariable +android.os.DeadObjectException android.os.Debug android.os.Debug$MemoryInfo android.os.Debug$MemoryInfo$1 @@ -718,11 +1037,15 @@ android.os.ICancellationSignal$Stub android.os.IInterface android.os.IMessenger android.os.IMessenger$Stub -android.os.IMessenger$Stub$Proxy +android.os.INetworkManagementService$Stub +android.os.INetworkManagementService$Stub$Proxy android.os.IPowerManager android.os.IPowerManager$Stub android.os.IPowerManager$Stub$Proxy android.os.IServiceManager +android.os.IUserManager +android.os.IUserManager$Stub +android.os.IUserManager$Stub$Proxy android.os.Looper android.os.MemoryFile android.os.Message @@ -760,6 +1083,7 @@ android.os.StrictMode$5 android.os.StrictMode$6 android.os.StrictMode$7 android.os.StrictMode$8 +android.os.StrictMode$9 android.os.StrictMode$AndroidBlockGuardPolicy android.os.StrictMode$AndroidBlockGuardPolicy$1 android.os.StrictMode$AndroidCloseGuardReporter @@ -782,48 +1106,80 @@ android.os.Trace$1 android.os.UEventObserver android.os.UserHandle android.os.UserHandle$1 +android.os.UserManager +android.os.ZygoteStartFailedEx android.os.storage.IMountService android.os.storage.IMountService$Stub android.os.storage.IMountService$Stub$Proxy -android.os.storage.StorageManager android.os.storage.StorageVolume android.os.storage.StorageVolume$1 -android.preference.CheckBoxPreference -android.preference.GenericInflater -android.preference.GenericInflater$Parent -android.preference.Preference -android.preference.Preference$OnPreferenceChangeInternalListener -android.preference.Preference$OnPreferenceChangeListener +android.preference.ListPreference android.preference.PreferenceActivity -android.preference.PreferenceActivity$1 -android.preference.PreferenceFragment android.preference.PreferenceFragment$OnPreferenceStartFragmentCallback android.preference.PreferenceFrameLayout android.preference.PreferenceGroup -android.preference.PreferenceGroupAdapter -android.preference.PreferenceGroupAdapter$1 -android.preference.PreferenceGroupAdapter$PreferenceLayout -android.preference.PreferenceInflater android.preference.PreferenceManager android.preference.PreferenceManager$OnPreferenceTreeClickListener android.preference.PreferenceScreen -android.preference.TwoStatePreference android.provider.BaseColumns +android.provider.CallLog$Calls android.provider.ContactsContract +android.provider.ContactsContract$CommonDataKinds$Phone +android.provider.ContactsContract$ContactCounts +android.provider.ContactsContract$ContactNameColumns +android.provider.ContactsContract$ContactOptionsColumns +android.provider.ContactsContract$ContactStatusColumns +android.provider.ContactsContract$ContactsColumns +android.provider.ContactsContract$Data +android.provider.ContactsContract$DataColumns +android.provider.ContactsContract$DataColumnsWithJoins +android.provider.ContactsContract$DataUsageStatColumns +android.provider.ContactsContract$PhoneLookup +android.provider.ContactsContract$RawContactsColumns +android.provider.ContactsContract$StatusColumns +android.provider.DocumentsProvider +android.provider.Downloads$Impl +android.provider.SearchIndexablesContract +android.provider.Settings android.provider.Settings$Global android.provider.Settings$NameValueCache android.provider.Settings$NameValueTable android.provider.Settings$Secure android.provider.Settings$SettingNotFoundException android.provider.Settings$System +android.provider.Telephony$Mms android.renderscript.RenderScript android.security.AndroidKeyPairGenerator android.security.AndroidKeyStore android.security.AndroidKeyStoreProvider +android.speech.tts.TextToSpeechService +android.speech.tts.TextToSpeechService$SpeechItemV1 +android.speech.tts.TextToSpeechService$SynthesisSpeechItemV1 +android.speech.tts.TextToSpeechService$SynthesisToFileOutputStreamSpeechItemV1 +android.speech.tts.TextToSpeechService$UtteranceSpeechItem +android.speech.tts.TtsEngines +android.system.GaiException +android.system.Os +android.system.OsConstants +android.system.StructAddrinfo +android.system.StructFlock +android.system.StructGroupReq +android.system.StructGroupSourceReq +android.system.StructLinger +android.system.StructPasswd +android.system.StructPollfd +android.system.StructStatVfs +android.system.StructTimeval +android.system.StructUcred +android.system.StructUtsname +android.telecom.InCallService +android.telephony.PhoneNumberUtils android.telephony.Rlog +android.telephony.SubscriptionManager android.telephony.TelephonyManager android.text.AndroidBidi android.text.AndroidCharacter +android.text.BidiFormatter$DirectionalityEstimator android.text.BoringLayout android.text.BoringLayout$Metrics android.text.DynamicLayout @@ -832,13 +1188,10 @@ android.text.Editable android.text.Editable$Factory android.text.GetChars android.text.GraphicsOperations -android.text.Html android.text.Html$HtmlParser -android.text.HtmlToSpannedConverter android.text.InputFilter android.text.InputType android.text.Layout -android.text.Layout$1 android.text.Layout$Alignment android.text.Layout$Directions android.text.Layout$Ellipsizer @@ -877,21 +1230,20 @@ android.text.TextUtils$EllipsizeCallback android.text.TextUtils$TruncateAt android.text.TextWatcher android.text.format.DateFormat -android.text.format.DateUtils android.text.format.Time +android.text.format.Time$TimeCalculator android.text.method.AllCapsTransformationMethod android.text.method.ArrowKeyMovementMethod android.text.method.BaseKeyListener android.text.method.BaseMovementMethod android.text.method.KeyListener -android.text.method.LinkMovementMethod android.text.method.MetaKeyKeyListener android.text.method.MovementMethod android.text.method.PasswordTransformationMethod +android.text.method.QwertyKeyListener android.text.method.ReplacementTransformationMethod android.text.method.ReplacementTransformationMethod$ReplacementCharSequence android.text.method.ReplacementTransformationMethod$SpannedReplacementCharSequence -android.text.method.ScrollingMovementMethod android.text.method.SingleLineTransformationMethod android.text.method.TextKeyListener android.text.method.TextKeyListener$Capitalize @@ -900,9 +1252,7 @@ android.text.method.TransformationMethod2 android.text.style.AlignmentSpan android.text.style.CharacterStyle android.text.style.ClickableSpan -android.text.style.DynamicDrawableSpan android.text.style.EasyEditSpan -android.text.style.ImageSpan android.text.style.LeadingMarginSpan android.text.style.LineBackgroundSpan android.text.style.LineHeightSpan @@ -913,35 +1263,64 @@ android.text.style.SpellCheckSpan android.text.style.StyleSpan android.text.style.SuggestionSpan android.text.style.URLSpan -android.text.style.UnderlineSpan android.text.style.UpdateAppearance android.text.style.UpdateLayout android.text.style.WrapTogetherSpan +android.transition.AutoTransition +android.transition.ChangeBounds +android.transition.ChangeBounds$1 +android.transition.ChangeClipBounds +android.transition.ChangeImageTransform +android.transition.ChangeImageTransform$1 +android.transition.ChangeImageTransform$2 +android.transition.ChangeTransform +android.transition.ChangeTransform$1 +android.transition.Fade +android.transition.PathMotion +android.transition.Transition +android.transition.Transition$1 +android.transition.TransitionInflater +android.transition.TransitionManager +android.transition.TransitionSet +android.transition.TransitionValuesMaps +android.transition.Visibility android.util.AndroidException android.util.AndroidRuntimeException +android.util.ArrayMap +android.util.ArrayMap$1 +android.util.ArraySet android.util.AttributeSet android.util.Base64 android.util.Base64$Coder android.util.Base64$Decoder android.util.Base64$Encoder +android.util.ContainerHelpers android.util.DisplayMetrics android.util.EventLog android.util.EventLog$Event android.util.FloatMath android.util.FloatProperty +android.util.IntProperty android.util.Log android.util.Log$1 android.util.Log$TerribleFailureHandler android.util.LongSparseArray +android.util.LongSparseLongArray android.util.LruCache +android.util.MapCollections +android.util.MapCollections$ArrayIterator +android.util.MapCollections$KeySet +android.util.MathUtils +android.util.MutableInt +android.util.MutableLong android.util.Pair +android.util.PathParser +android.util.PathParser$ExtractFloatResult +android.util.PathParser$PathDataNode android.util.Patterns android.util.Pools$Pool android.util.Pools$SimplePool android.util.Pools$SynchronizedPool -android.util.PrefixPrinter -android.util.PrintWriterPrinter -android.util.Printer android.util.Property android.util.Singleton android.util.Slog @@ -949,6 +1328,7 @@ android.util.SparseArray android.util.SparseBooleanArray android.util.SparseIntArray android.util.StateSet +android.util.SuperNotCalledException android.util.TypedValue android.util.Xml android.view.AbsSavedState @@ -964,20 +1344,19 @@ android.view.Choreographer$CallbackQueue android.view.Choreographer$CallbackRecord android.view.Choreographer$FrameDisplayEventReceiver android.view.Choreographer$FrameHandler -android.view.CollapsibleActionView android.view.ContextMenu android.view.ContextMenu$ContextMenuInfo android.view.ContextThemeWrapper android.view.Display +android.view.DisplayAdjustments android.view.DisplayEventReceiver android.view.DisplayInfo android.view.DisplayInfo$1 -android.view.DisplayList -android.view.DisplayList$DisplayListFinalizer android.view.FallbackEventHandler android.view.FocusFinder android.view.FocusFinder$1 android.view.FocusFinder$SequentialFocusComparator +android.view.FrameStats android.view.GLES20Canvas android.view.GLES20Canvas$CanvasFinalizer android.view.GLES20RecordingCanvas @@ -986,11 +1365,16 @@ android.view.GestureDetector$GestureHandler android.view.GestureDetector$OnDoubleTapListener android.view.GestureDetector$OnGestureListener android.view.GestureDetector$SimpleOnGestureListener +android.view.GraphicBuffer +android.view.GraphicBuffer$1 android.view.Gravity android.view.HardwareCanvas android.view.HardwareLayer android.view.HardwareRenderer android.view.HardwareRenderer$HardwareDrawCallbacks +android.view.IAssetAtlas +android.view.IAssetAtlas$Stub +android.view.IAssetAtlas$Stub$Proxy android.view.IRotationWatcher android.view.IRotationWatcher$Stub android.view.IWindow @@ -1001,6 +1385,9 @@ android.view.IWindowManager$Stub$Proxy android.view.IWindowSession android.view.IWindowSession$Stub android.view.IWindowSession$Stub$Proxy +android.view.IWindowSessionCallback +android.view.IWindowSessionCallback$Stub +android.view.InflateException android.view.InputChannel android.view.InputChannel$1 android.view.InputDevice @@ -1023,42 +1410,44 @@ android.view.KeyEvent$DispatcherState android.view.LayoutInflater android.view.LayoutInflater$Factory android.view.LayoutInflater$Factory2 +android.view.LayoutInflater$FactoryMerger android.view.LayoutInflater$Filter android.view.Menu android.view.MenuInflater android.view.MenuInflater$MenuState android.view.MenuItem -android.view.MenuItem$OnMenuItemClickListener +android.view.MenuItem$OnActionExpandListener android.view.MotionEvent android.view.MotionEvent$1 android.view.MotionEvent$PointerCoords android.view.MotionEvent$PointerProperties android.view.PointerIcon android.view.PointerIcon$1 +android.view.RenderNode +android.view.RenderNodeAnimator +android.view.RenderNodeAnimator$1 android.view.SubMenu android.view.Surface android.view.Surface$1 android.view.Surface$CompatibleCanvas +android.view.Surface$OutOfResourcesException android.view.SurfaceControl android.view.SurfaceControl$PhysicalDisplayInfo -android.view.SurfaceHolder android.view.SurfaceHolder$Callback android.view.SurfaceHolder$Callback2 android.view.SurfaceSession android.view.SurfaceView -android.view.SurfaceView$1 -android.view.SurfaceView$2 -android.view.SurfaceView$3 -android.view.SurfaceView$4 -android.view.SurfaceView$MyWindow android.view.TextureView +android.view.ThreadedRenderer +android.view.ThreadedRenderer$AtlasInitializer android.view.VelocityTracker android.view.VelocityTracker$Estimator android.view.View -android.view.View$1 android.view.View$10 android.view.View$11 android.view.View$12 +android.view.View$13 +android.view.View$14 android.view.View$3 android.view.View$4 android.view.View$5 @@ -1071,7 +1460,6 @@ android.view.View$AttachInfo android.view.View$AttachInfo$Callbacks android.view.View$BaseSavedState android.view.View$BaseSavedState$1 -android.view.View$CheckForLongPress android.view.View$CheckForTap android.view.View$ListenerInfo android.view.View$MeasureSpec @@ -1088,8 +1476,6 @@ android.view.View$ScrollabilityCache android.view.View$TransformationInfo android.view.View$UnsetPressedState android.view.ViewConfiguration -android.view.ViewDebug -android.view.ViewDebug$HierarchyHandler android.view.ViewGroup android.view.ViewGroup$3 android.view.ViewGroup$LayoutParams @@ -1097,13 +1483,21 @@ android.view.ViewGroup$MarginLayoutParams android.view.ViewGroup$OnHierarchyChangeListener android.view.ViewGroup$TouchTarget android.view.ViewManager +android.view.ViewOutlineProvider +android.view.ViewOutlineProvider$1 +android.view.ViewOutlineProvider$2 +android.view.ViewOutlineProvider$3 +android.view.ViewOverlay$OverlayViewGroup android.view.ViewParent android.view.ViewRootImpl -android.view.ViewRootImpl$3 +android.view.ViewRootImpl$1 +android.view.ViewRootImpl$4 android.view.ViewRootImpl$AccessibilityInteractionConnectionManager android.view.ViewRootImpl$AsyncInputStage +android.view.ViewRootImpl$ConsumeBatchedInputImmediatelyRunnable android.view.ViewRootImpl$ConsumeBatchedInputRunnable android.view.ViewRootImpl$EarlyPostImeInputStage +android.view.ViewRootImpl$HighContrastTextManager android.view.ViewRootImpl$ImeInputStage android.view.ViewRootImpl$InputStage android.view.ViewRootImpl$InvalidateOnAnimationRunnable @@ -1114,6 +1508,7 @@ android.view.ViewRootImpl$RunQueue android.view.ViewRootImpl$RunQueue$HandlerAction android.view.ViewRootImpl$SyntheticInputStage android.view.ViewRootImpl$SyntheticJoystickHandler +android.view.ViewRootImpl$SyntheticKeyboardHandler android.view.ViewRootImpl$SyntheticTouchNavigationHandler android.view.ViewRootImpl$SyntheticTouchNavigationHandler$1 android.view.ViewRootImpl$SyntheticTrackballHandler @@ -1129,25 +1524,29 @@ android.view.ViewTreeObserver android.view.ViewTreeObserver$CopyOnWriteArray android.view.ViewTreeObserver$CopyOnWriteArray$Access android.view.ViewTreeObserver$InternalInsetsInfo -android.view.ViewTreeObserver$OnGlobalFocusChangeListener android.view.ViewTreeObserver$OnGlobalLayoutListener android.view.ViewTreeObserver$OnPreDrawListener android.view.ViewTreeObserver$OnScrollChangedListener android.view.ViewTreeObserver$OnTouchModeChangeListener android.view.Window android.view.Window$Callback +android.view.Window$OnWindowDismissedCallback +android.view.WindowAnimationFrameStats +android.view.WindowContentFrameStats$1 +android.view.WindowInsets android.view.WindowLeaked android.view.WindowManager android.view.WindowManager$LayoutParams android.view.WindowManager$LayoutParams$1 android.view.WindowManagerGlobal android.view.WindowManagerGlobal$1 +android.view.WindowManagerGlobal$2 android.view.WindowManagerImpl android.view.accessibility.AccessibilityEvent -android.view.accessibility.AccessibilityEventSource android.view.accessibility.AccessibilityManager android.view.accessibility.AccessibilityManager$1 android.view.accessibility.AccessibilityManager$AccessibilityStateChangeListener +android.view.accessibility.AccessibilityManager$HighTextContrastChangeListener android.view.accessibility.AccessibilityManager$MyHandler android.view.accessibility.AccessibilityNodeInfo android.view.accessibility.AccessibilityNodeProvider @@ -1159,20 +1558,19 @@ android.view.accessibility.IAccessibilityManagerClient android.view.accessibility.IAccessibilityManagerClient$Stub android.view.animation.AccelerateDecelerateInterpolator android.view.animation.AccelerateInterpolator -android.view.animation.AlphaAnimation android.view.animation.Animation -android.view.animation.Animation$1 -android.view.animation.Animation$2 -android.view.animation.Animation$3 android.view.animation.Animation$AnimationListener -android.view.animation.AnimationSet android.view.animation.AnimationUtils android.view.animation.DecelerateInterpolator android.view.animation.Interpolator android.view.animation.LinearInterpolator +android.view.animation.PathInterpolator android.view.animation.Transformation android.view.inputmethod.BaseInputConnection android.view.inputmethod.ComposingText +android.view.inputmethod.CursorAnchorInfo +android.view.inputmethod.CursorAnchorInfo$1 +android.view.inputmethod.CursorAnchorInfo$Builder android.view.inputmethod.EditorInfo android.view.inputmethod.EditorInfo$1 android.view.inputmethod.ExtractedText @@ -1185,80 +1583,53 @@ android.view.inputmethod.InputMethodManager$FinishedInputEventCallback android.view.inputmethod.InputMethodManager$H android.view.inputmethod.InputMethodManager$ImeInputEventSender android.view.inputmethod.InputMethodManager$PendingEvent -android.view.textservice.SpellCheckerSubtype -android.view.textservice.SpellCheckerSubtype$1 -android.webkit.CookieManager -android.webkit.CookieSyncManager -android.webkit.GeolocationPermissions -android.webkit.JavascriptInterface -android.webkit.URLUtil -android.webkit.WebBackForwardList -android.webkit.WebHistoryItem -android.webkit.WebIconDatabase -android.webkit.WebSettings -android.webkit.WebSettings$LayoutAlgorithm -android.webkit.WebSettings$PluginState -android.webkit.WebSettings$RenderPriority -android.webkit.WebSettings$ZoomDensity -android.webkit.WebStorage -android.webkit.WebSyncManager -android.webkit.WebSyncManager$SyncHandler -android.webkit.WebView -android.webkit.WebView$PrivateAccess -android.webkit.WebViewClient -android.webkit.WebViewDatabase android.webkit.WebViewFactory -android.webkit.WebViewFactoryProvider -android.webkit.WebViewFactoryProvider$Statics -android.webkit.WebViewProvider -android.webkit.WebViewProvider$ScrollDelegate -android.webkit.WebViewProvider$ViewDelegate android.widget.AbsListView -android.widget.AbsListView$1 android.widget.AbsListView$AdapterDataSetObserver android.widget.AbsListView$CheckForTap android.widget.AbsListView$LayoutParams android.widget.AbsListView$OnScrollListener -android.widget.AbsListView$PerformClick android.widget.AbsListView$RecycleBin android.widget.AbsListView$SavedState android.widget.AbsListView$SavedState$1 -android.widget.AbsListView$SelectionBoundsAdjuster -android.widget.AbsListView$WindowRunnnable android.widget.AbsSeekBar android.widget.AbsSpinner -android.widget.AbsSpinner$RecycleBin android.widget.AbsoluteLayout +android.widget.ActionMenuPresenter +android.widget.ActionMenuPresenter$OverflowMenuButton +android.widget.ActionMenuPresenter$OverflowMenuButton$1 +android.widget.ActionMenuPresenter$PopupPresenterCallback +android.widget.ActionMenuView +android.widget.ActionMenuView$ActionMenuChildView +android.widget.ActionMenuView$OnMenuItemClickListener android.widget.Adapter android.widget.AdapterView android.widget.AdapterView$AdapterDataSetObserver android.widget.AdapterView$OnItemClickListener -android.widget.AdapterView$OnItemLongClickListener android.widget.AdapterView$OnItemSelectedListener -android.widget.AdapterView$SelectionNotifier -android.widget.AdapterViewAnimator android.widget.ArrayAdapter android.widget.AutoCompleteTextView -android.widget.AutoCompleteTextView$DropDownItemClickListener -android.widget.AutoCompleteTextView$MyWatcher -android.widget.AutoCompleteTextView$PassThroughClickListener android.widget.BaseAdapter android.widget.Button android.widget.CheckBox android.widget.Checkable +android.widget.CheckedTextView android.widget.CompoundButton android.widget.CompoundButton$OnCheckedChangeListener -android.widget.CursorAdapter -android.widget.CursorAdapter$ChangeObserver -android.widget.CursorAdapter$MyDataSetObserver -android.widget.CursorFilter$CursorFilterClient +android.widget.DatePicker android.widget.EdgeEffect android.widget.EditText android.widget.Editor -android.widget.Editor$Blink +android.widget.Editor$CursorAnchorInfoNotifier +android.widget.Editor$HandleView android.widget.Editor$InputContentType android.widget.Editor$InputMethodState -android.widget.ExpandableListView +android.widget.Editor$InsertionHandleView +android.widget.Editor$PositionListener +android.widget.Editor$SpanController +android.widget.Editor$TextDisplayList +android.widget.Editor$TextViewPositionListener +android.widget.FastScroller android.widget.Filter android.widget.Filter$FilterListener android.widget.Filterable @@ -1266,16 +1637,18 @@ android.widget.FrameLayout android.widget.FrameLayout$LayoutParams android.widget.GridLayout android.widget.GridView +android.widget.HeaderViewListAdapter +android.widget.HorizontalScrollView android.widget.ImageButton +android.widget.ImageSwitcher android.widget.ImageView android.widget.ImageView$ScaleType android.widget.LinearLayout android.widget.LinearLayout$LayoutParams android.widget.ListAdapter android.widget.ListPopupWindow -android.widget.ListPopupWindow$1 -android.widget.ListPopupWindow$2 android.widget.ListPopupWindow$DropDownListView +android.widget.ListPopupWindow$ForwardingListener android.widget.ListPopupWindow$ListSelectorHider android.widget.ListPopupWindow$PopupDataSetObserver android.widget.ListPopupWindow$PopupScrollListener @@ -1283,57 +1656,47 @@ android.widget.ListPopupWindow$PopupTouchInterceptor android.widget.ListPopupWindow$ResizePopupRunnable android.widget.ListView android.widget.ListView$ArrowScrollFocusResult +android.widget.MediaController +android.widget.MultiAutoCompleteTextView android.widget.OverScroller android.widget.OverScroller$SplineOverScroller android.widget.PopupWindow android.widget.PopupWindow$1 -android.widget.PopupWindow$OnDismissListener android.widget.PopupWindow$PopupViewContainer android.widget.ProgressBar android.widget.ProgressBar$SavedState android.widget.ProgressBar$SavedState$1 +android.widget.QuickContactBadge +android.widget.RatingBar android.widget.RelativeLayout android.widget.RelativeLayout$DependencyGraph android.widget.RelativeLayout$DependencyGraph$Node android.widget.RelativeLayout$LayoutParams android.widget.RemoteViews android.widget.RemoteViews$1 +android.widget.RemoteViews$3 android.widget.RemoteViews$Action +android.widget.RemoteViews$ActionException android.widget.RemoteViews$BitmapCache android.widget.RemoteViews$MemoryUsageCounter +android.widget.RemoteViews$MutablePair android.widget.RemoteViews$OnClickHandler android.widget.RemoteViews$ReflectionAction +android.widget.RemoteViews$SetDrawableParameters +android.widget.RemoteViews$TextViewSizeAction android.widget.RemoteViewsAdapter$RemoteAdapterConnectionCallback +android.widget.RtlSpacingHelper android.widget.ScrollBarDrawable android.widget.ScrollView android.widget.Scroller -android.widget.SearchView -android.widget.SearchView$1 -android.widget.SearchView$10 -android.widget.SearchView$11 -android.widget.SearchView$2 -android.widget.SearchView$3 -android.widget.SearchView$4 -android.widget.SearchView$5 -android.widget.SearchView$6 -android.widget.SearchView$7 -android.widget.SearchView$8 -android.widget.SearchView$9 -android.widget.SearchView$SearchAutoComplete -android.widget.Spinner -android.widget.Spinner$DropDownAdapter -android.widget.Spinner$DropdownPopup -android.widget.Spinner$DropdownPopup$1 -android.widget.Spinner$SpinnerPopup +android.widget.Scroller$ViscousFluidInterpolator +android.widget.SectionIndexer +android.widget.SeekBar +android.widget.SimpleCursorAdapter android.widget.SpinnerAdapter +android.widget.Switch android.widget.TableLayout -android.widget.TableLayout$LayoutParams -android.widget.TableLayout$PassThroughHierarchyChangeListener -android.widget.TableRow -android.widget.TableRow$ChildrenTracker -android.widget.TableRow$LayoutParams android.widget.TextView -android.widget.TextView$2 android.widget.TextView$4 android.widget.TextView$BufferType android.widget.TextView$ChangeWatcher @@ -1342,20 +1705,41 @@ android.widget.TextView$Drawables android.widget.TextView$OnEditorActionListener android.widget.TextView$SavedState android.widget.TextView$SavedState$1 -android.widget.Toast -android.widget.Toast$TN -android.widget.Toast$TN$1 -android.widget.Toast$TN$2 +android.widget.TimePicker +android.widget.ToggleButton +android.widget.Toolbar +android.widget.Toolbar$1 +android.widget.Toolbar$2 +android.widget.Toolbar$ExpandedActionViewMenuPresenter +android.widget.Toolbar$LayoutParams +android.widget.ViewAnimator +android.widget.ViewFlipper +android.widget.ViewSwitcher +android.widget.WrapperListAdapter +com.android.dex.Annotation +com.android.dex.DexFormat +com.android.dex.EncodedValue +com.android.dex.EncodedValueCodec +com.android.dex.EncodedValueReader +com.android.dex.Leb128 +com.android.dex.Mutf8 +com.android.dex.util.ByteArrayByteInput +com.android.i18n.phonenumbers.AsYouTypeFormatter com.android.i18n.phonenumbers.PhoneNumberMatcher com.android.i18n.phonenumbers.PhoneNumberUtil +com.android.i18n.phonenumbers.Phonemetadata$PhoneMetadata com.android.internal.R$styleable -com.android.internal.app.ActionBarImpl -com.android.internal.app.ActionBarImpl$1 -com.android.internal.app.ActionBarImpl$2 -com.android.internal.app.AlertController -com.android.internal.app.AlertController$1 -com.android.internal.app.AlertController$AlertParams -com.android.internal.app.AlertController$ButtonHandler +com.android.internal.app.IAppOpsService +com.android.internal.app.IAppOpsService$Stub +com.android.internal.app.IAppOpsService$Stub$Proxy +com.android.internal.app.IBatteryStats$Stub +com.android.internal.app.IVoiceInteractor +com.android.internal.app.IVoiceInteractor$Stub +com.android.internal.app.ResolverActivity$ResolveListAdapter +com.android.internal.app.WindowDecorActionBar +com.android.internal.app.WindowDecorActionBar$1 +com.android.internal.app.WindowDecorActionBar$2 +com.android.internal.app.WindowDecorActionBar$3 com.android.internal.appwidget.IAppWidgetService com.android.internal.appwidget.IAppWidgetService$Stub com.android.internal.appwidget.IAppWidgetService$Stub$Proxy @@ -1365,6 +1749,8 @@ com.android.internal.logging.AndroidHandler com.android.internal.logging.AndroidHandler$1 com.android.internal.net.NetworkStatsFactory com.android.internal.os.AndroidPrintStream +com.android.internal.os.BatteryStatsImpl +com.android.internal.os.BatteryStatsImpl$Uid com.android.internal.os.BinderInternal com.android.internal.os.BinderInternal$GcWatcher com.android.internal.os.IDropBoxManagerService @@ -1378,17 +1764,18 @@ com.android.internal.os.RuntimeInit$Arguments com.android.internal.os.RuntimeInit$UncaughtHandler com.android.internal.os.SamplingProfilerIntegration com.android.internal.os.SomeArgs +com.android.internal.os.Zygote com.android.internal.os.ZygoteConnection com.android.internal.os.ZygoteConnection$Arguments com.android.internal.os.ZygoteInit com.android.internal.os.ZygoteInit$MethodAndArgsCaller +com.android.internal.os.ZygoteSecurityException com.android.internal.policy.IPolicy com.android.internal.policy.PolicyManager com.android.internal.policy.impl.PhoneFallbackEventHandler com.android.internal.policy.impl.PhoneLayoutInflater com.android.internal.policy.impl.PhoneWindow com.android.internal.policy.impl.PhoneWindow$1 -com.android.internal.policy.impl.PhoneWindow$2 com.android.internal.policy.impl.PhoneWindow$ActionMenuPresenterCallback com.android.internal.policy.impl.PhoneWindow$DecorView com.android.internal.policy.impl.PhoneWindow$DialogMenuCallback @@ -1398,6 +1785,9 @@ com.android.internal.policy.impl.PhoneWindow$PanelFeatureState$SavedState$1 com.android.internal.policy.impl.PhoneWindow$RotationWatcher com.android.internal.policy.impl.PhoneWindow$RotationWatcher$1 com.android.internal.policy.impl.Policy +com.android.internal.telephony.ISub +com.android.internal.telephony.ISub$Stub +com.android.internal.telephony.ISub$Stub$Proxy com.android.internal.telephony.ITelephony com.android.internal.telephony.ITelephony$Stub com.android.internal.telephony.ITelephony$Stub$Proxy @@ -1405,17 +1795,16 @@ com.android.internal.telephony.ITelephonyRegistry com.android.internal.telephony.ITelephonyRegistry$Stub com.android.internal.telephony.ITelephonyRegistry$Stub$Proxy com.android.internal.telephony.PhoneConstants$State -com.android.internal.textservice.ITextServicesManager -com.android.internal.textservice.ITextServicesManager$Stub +com.android.internal.transition.ActionBarTransition com.android.internal.util.ArrayUtils -com.android.internal.util.AsyncChannel -com.android.internal.util.AsyncChannel$DeathMonitor +com.android.internal.util.FastPrintWriter +com.android.internal.util.FastPrintWriter$1 com.android.internal.util.FastXmlSerializer -com.android.internal.util.MemInfoReader +com.android.internal.util.GrowingArrayUtils com.android.internal.util.Preconditions +com.android.internal.util.VirtualRefBasePtr com.android.internal.util.XmlUtils com.android.internal.view.ActionBarPolicy -com.android.internal.view.BaseIWindow com.android.internal.view.IInputConnectionWrapper com.android.internal.view.IInputConnectionWrapper$MyHandler com.android.internal.view.IInputConnectionWrapper$SomeArgs @@ -1435,37 +1824,115 @@ com.android.internal.view.IInputMethodSession$Stub$Proxy com.android.internal.view.InputBindResult com.android.internal.view.InputBindResult$1 com.android.internal.view.RootViewSurfaceTaker +com.android.internal.view.animation.FallbackLUTInterpolator +com.android.internal.view.animation.HasNativeInterpolator +com.android.internal.view.animation.NativeInterpolatorFactory +com.android.internal.view.animation.NativeInterpolatorFactoryHelper com.android.internal.view.menu.ActionMenuItem -com.android.internal.view.menu.ActionMenuItemView com.android.internal.view.menu.BaseMenuPresenter -com.android.internal.view.menu.ListMenuItemView com.android.internal.view.menu.MenuBuilder com.android.internal.view.menu.MenuBuilder$Callback com.android.internal.view.menu.MenuBuilder$ItemInvoker com.android.internal.view.menu.MenuItemImpl -com.android.internal.view.menu.MenuPopupHelper -com.android.internal.view.menu.MenuPopupHelper$MenuAdapter com.android.internal.view.menu.MenuPresenter com.android.internal.view.menu.MenuPresenter$Callback com.android.internal.view.menu.MenuView -com.android.internal.view.menu.MenuView$ItemView -com.android.internal.view.menu.SubMenuBuilder com.android.internal.widget.AbsActionBarView com.android.internal.widget.AbsActionBarView$VisibilityAnimListener com.android.internal.widget.ActionBarContainer +com.android.internal.widget.ActionBarContainer$ActionBarBackgroundDrawable com.android.internal.widget.ActionBarContextView com.android.internal.widget.ActionBarOverlayLayout +com.android.internal.widget.ActionBarOverlayLayout$1 +com.android.internal.widget.ActionBarOverlayLayout$2 +com.android.internal.widget.ActionBarOverlayLayout$3 +com.android.internal.widget.ActionBarOverlayLayout$4 +com.android.internal.widget.ActionBarOverlayLayout$5 +com.android.internal.widget.ActionBarOverlayLayout$ActionBarVisibilityCallback com.android.internal.widget.ActionBarOverlayLayout$LayoutParams -com.android.internal.widget.ActionBarView -com.android.internal.widget.ActionBarView$1 -com.android.internal.widget.ActionBarView$2 -com.android.internal.widget.ActionBarView$3 -com.android.internal.widget.ActionBarView$ExpandedActionViewMenuPresenter -com.android.internal.widget.ActionBarView$HomeView -com.android.internal.widget.ActionBarView$SavedState -com.android.internal.widget.ActionBarView$SavedState$1 -com.android.internal.widget.DialogTitle +com.android.internal.widget.BackgroundFallback +com.android.internal.widget.DecorContentParent +com.android.internal.widget.DecorToolbar com.android.internal.widget.EditableInputConnection +com.android.internal.widget.LockPatternUtils +com.android.internal.widget.ScrollingTabContainerView +com.android.internal.widget.ScrollingTabContainerView$TabView +com.android.internal.widget.ToolbarWidgetWrapper +com.android.internal.widget.ToolbarWidgetWrapper$1 +com.android.okhttp.Address +com.android.okhttp.CacheControl +com.android.okhttp.ConfigAwareConnectionPool +com.android.okhttp.ConfigAwareConnectionPool$1 +com.android.okhttp.Connection +com.android.okhttp.ConnectionPool +com.android.okhttp.ConnectionPool$1 +com.android.okhttp.Dispatcher +com.android.okhttp.Handshake +com.android.okhttp.Headers +com.android.okhttp.Headers$Builder +com.android.okhttp.HostResolver +com.android.okhttp.HostResolver$1 +com.android.okhttp.HttpHandler +com.android.okhttp.HttpsHandler +com.android.okhttp.OkAuthenticator +com.android.okhttp.OkHttpClient +com.android.okhttp.OkResponseCache +com.android.okhttp.Protocol +com.android.okhttp.Request +com.android.okhttp.Request$Builder +com.android.okhttp.Request$ParsedHeaders +com.android.okhttp.Response +com.android.okhttp.Response$Body +com.android.okhttp.Response$Builder +com.android.okhttp.ResponseSource +com.android.okhttp.Route +com.android.okhttp.RouteDatabase +com.android.okhttp.TunnelRequest +com.android.okhttp.internal.Platform +com.android.okhttp.internal.Util +com.android.okhttp.internal.Util$1 +com.android.okhttp.internal.http.CacheStrategy +com.android.okhttp.internal.http.CacheStrategy$1 +com.android.okhttp.internal.http.CacheStrategy$Factory +com.android.okhttp.internal.http.DelegatingHttpsURLConnection +com.android.okhttp.internal.http.HttpAuthenticator +com.android.okhttp.internal.http.HttpAuthenticator$1 +com.android.okhttp.internal.http.HttpConnection +com.android.okhttp.internal.http.HttpConnection$AbstractSource +com.android.okhttp.internal.http.HttpConnection$ChunkedSource +com.android.okhttp.internal.http.HttpConnection$FixedLengthSource +com.android.okhttp.internal.http.HttpEngine +com.android.okhttp.internal.http.HttpMethod +com.android.okhttp.internal.http.HttpTransport +com.android.okhttp.internal.http.HttpURLConnectionImpl +com.android.okhttp.internal.http.HttpURLConnectionImpl$Retry +com.android.okhttp.internal.http.HttpsURLConnectionImpl +com.android.okhttp.internal.http.OkHeaders +com.android.okhttp.internal.http.OkHeaders$1 +com.android.okhttp.internal.http.RequestLine +com.android.okhttp.internal.http.RetryableSink +com.android.okhttp.internal.http.RouteSelector +com.android.okhttp.internal.http.StatusLine +com.android.okhttp.internal.http.Transport +com.android.okhttp.internal.tls.OkHostnameVerifier +com.android.okio.BufferedSink +com.android.okio.BufferedSource +com.android.okio.ByteString +com.android.okio.Deadline +com.android.okio.Deadline$1 +com.android.okio.OkBuffer +com.android.okio.Okio +com.android.okio.Okio$1 +com.android.okio.Okio$2 +com.android.okio.RealBufferedSink +com.android.okio.RealBufferedSink$1 +com.android.okio.RealBufferedSource +com.android.okio.RealBufferedSource$1 +com.android.okio.Segment +com.android.okio.SegmentPool +com.android.okio.Sink +com.android.okio.Source +com.android.okio.Util com.android.org.bouncycastle.asn1.ASN1Boolean com.android.org.bouncycastle.asn1.ASN1Choice com.android.org.bouncycastle.asn1.ASN1Encodable @@ -1496,8 +1963,8 @@ com.android.org.bouncycastle.asn1.DEROctetString com.android.org.bouncycastle.asn1.DERPrintableString com.android.org.bouncycastle.asn1.DERSequence com.android.org.bouncycastle.asn1.DERSet -com.android.org.bouncycastle.asn1.DERT61String com.android.org.bouncycastle.asn1.DERTaggedObject +com.android.org.bouncycastle.asn1.DERUTF8String com.android.org.bouncycastle.asn1.DERUniversalString com.android.org.bouncycastle.asn1.DLSequence com.android.org.bouncycastle.asn1.DLSet @@ -1516,12 +1983,12 @@ com.android.org.bouncycastle.asn1.x509.BasicConstraints com.android.org.bouncycastle.asn1.x509.Extension com.android.org.bouncycastle.asn1.x509.GeneralName com.android.org.bouncycastle.asn1.x509.GeneralNames +com.android.org.bouncycastle.asn1.x509.PolicyInformation com.android.org.bouncycastle.asn1.x509.SubjectPublicKeyInfo com.android.org.bouncycastle.asn1.x509.X509Extension com.android.org.bouncycastle.asn1.x509.X509Extensions com.android.org.bouncycastle.asn1.x509.X509Name com.android.org.bouncycastle.asn1.x509.X509ObjectIdentifiers -com.android.org.bouncycastle.asn1.x9.X962NamedCurves com.android.org.bouncycastle.asn1.x9.X9ObjectIdentifiers com.android.org.bouncycastle.crypto.Digest com.android.org.bouncycastle.crypto.ExtendedDigest @@ -1535,6 +2002,7 @@ com.android.org.bouncycastle.jcajce.provider.asymmetric.DSA$Mappings com.android.org.bouncycastle.jcajce.provider.asymmetric.EC$Mappings com.android.org.bouncycastle.jcajce.provider.asymmetric.RSA$Mappings com.android.org.bouncycastle.jcajce.provider.asymmetric.X509$Mappings +com.android.org.bouncycastle.jcajce.provider.asymmetric.dh.KeyFactorySpi com.android.org.bouncycastle.jcajce.provider.asymmetric.dsa.DSAUtil com.android.org.bouncycastle.jcajce.provider.asymmetric.dsa.KeyFactorySpi com.android.org.bouncycastle.jcajce.provider.asymmetric.ec.KeyFactorySpi @@ -1549,13 +2017,20 @@ com.android.org.bouncycastle.jcajce.provider.digest.MD5 com.android.org.bouncycastle.jcajce.provider.digest.MD5$Mappings com.android.org.bouncycastle.jcajce.provider.digest.SHA1 com.android.org.bouncycastle.jcajce.provider.digest.SHA1$Mappings +com.android.org.bouncycastle.jcajce.provider.digest.SHA224 +com.android.org.bouncycastle.jcajce.provider.digest.SHA224$Mappings com.android.org.bouncycastle.jcajce.provider.digest.SHA256 com.android.org.bouncycastle.jcajce.provider.digest.SHA256$Mappings com.android.org.bouncycastle.jcajce.provider.digest.SHA384 com.android.org.bouncycastle.jcajce.provider.digest.SHA384$Mappings com.android.org.bouncycastle.jcajce.provider.digest.SHA512 com.android.org.bouncycastle.jcajce.provider.digest.SHA512$Mappings +com.android.org.bouncycastle.jcajce.provider.keystore.BC$Mappings +com.android.org.bouncycastle.jcajce.provider.keystore.PKCS12$Mappings +com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi +com.android.org.bouncycastle.jcajce.provider.keystore.bc.BcKeyStoreSpi$Std com.android.org.bouncycastle.jcajce.provider.symmetric.AES +com.android.org.bouncycastle.jcajce.provider.symmetric.AES$ECB com.android.org.bouncycastle.jcajce.provider.symmetric.AES$Mappings com.android.org.bouncycastle.jcajce.provider.symmetric.ARC4 com.android.org.bouncycastle.jcajce.provider.symmetric.ARC4$Mappings @@ -1565,10 +2040,19 @@ com.android.org.bouncycastle.jcajce.provider.symmetric.DES com.android.org.bouncycastle.jcajce.provider.symmetric.DES$Mappings com.android.org.bouncycastle.jcajce.provider.symmetric.DESede com.android.org.bouncycastle.jcajce.provider.symmetric.DESede$Mappings +com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12 +com.android.org.bouncycastle.jcajce.provider.symmetric.PBEPKCS12$Mappings +com.android.org.bouncycastle.jcajce.provider.symmetric.RC2 +com.android.org.bouncycastle.jcajce.provider.symmetric.RC2$Mappings +com.android.org.bouncycastle.jcajce.provider.symmetric.SymmetricAlgorithmProvider +com.android.org.bouncycastle.jcajce.provider.symmetric.Twofish +com.android.org.bouncycastle.jcajce.provider.symmetric.Twofish$Mappings com.android.org.bouncycastle.jcajce.provider.util.AlgorithmProvider com.android.org.bouncycastle.jcajce.provider.util.AsymmetricAlgorithmProvider com.android.org.bouncycastle.jcajce.provider.util.AsymmetricKeyInfoConverter +com.android.org.bouncycastle.jce.exception.ExtException com.android.org.bouncycastle.jce.interfaces.BCKeyStore +com.android.org.bouncycastle.jce.provider.AnnotatedException com.android.org.bouncycastle.jce.provider.BouncyCastleProvider com.android.org.bouncycastle.jce.provider.BouncyCastleProvider$1 com.android.org.bouncycastle.jce.provider.BouncyCastleProviderConfiguration @@ -1577,6 +2061,7 @@ com.android.org.bouncycastle.jce.provider.CertPathValidatorUtilities com.android.org.bouncycastle.jce.provider.PKIXCRLUtil com.android.org.bouncycastle.jce.provider.PKIXCertPathValidatorSpi com.android.org.bouncycastle.jce.provider.PKIXNameConstraintValidator +com.android.org.bouncycastle.jce.provider.PKIXNameConstraintValidatorException com.android.org.bouncycastle.jce.provider.PKIXPolicyNode com.android.org.bouncycastle.jce.provider.RFC3280CertPathUtilities com.android.org.bouncycastle.util.Arrays @@ -1593,7 +2078,7 @@ com.android.org.conscrypt.CertPinManager com.android.org.conscrypt.ChainStrengthAnalyzer com.android.org.conscrypt.ClientSessionContext com.android.org.conscrypt.ClientSessionContext$HostAndPort -com.android.org.conscrypt.DefaultSSLContextImpl +com.android.org.conscrypt.CryptoUpcalls com.android.org.conscrypt.FileClientSessionCache com.android.org.conscrypt.FileClientSessionCache$Impl com.android.org.conscrypt.JSSEProvider @@ -1602,67 +2087,20 @@ com.android.org.conscrypt.KeyManagerImpl com.android.org.conscrypt.NativeCrypto com.android.org.conscrypt.NativeCrypto$SSLHandshakeCallbacks com.android.org.conscrypt.OpenSSLBIOInputStream -com.android.org.conscrypt.OpenSSLCipher -com.android.org.conscrypt.OpenSSLCipher$AES -com.android.org.conscrypt.OpenSSLCipher$AES$CBC -com.android.org.conscrypt.OpenSSLCipher$AES$CBC$NoPadding com.android.org.conscrypt.OpenSSLCipher$AES$CBC$PKCS5Padding -com.android.org.conscrypt.OpenSSLCipher$AES$CFB -com.android.org.conscrypt.OpenSSLCipher$AES$CTR -com.android.org.conscrypt.OpenSSLCipher$AES$ECB -com.android.org.conscrypt.OpenSSLCipher$AES$ECB$NoPadding -com.android.org.conscrypt.OpenSSLCipher$AES$ECB$PKCS5Padding -com.android.org.conscrypt.OpenSSLCipher$AES$OFB -com.android.org.conscrypt.OpenSSLCipher$ARC4 -com.android.org.conscrypt.OpenSSLCipher$DESEDE -com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC -com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC$NoPadding -com.android.org.conscrypt.OpenSSLCipher$DESEDE$CBC$PKCS5Padding -com.android.org.conscrypt.OpenSSLCipher$DESEDE$CFB -com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB -com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB$NoPadding -com.android.org.conscrypt.OpenSSLCipher$DESEDE$ECB$PKCS5Padding -com.android.org.conscrypt.OpenSSLCipher$DESEDE$OFB -com.android.org.conscrypt.OpenSSLCipherRSA -com.android.org.conscrypt.OpenSSLCipherRSA$PKCS1 -com.android.org.conscrypt.OpenSSLCipherRSA$Raw com.android.org.conscrypt.OpenSSLContextImpl -com.android.org.conscrypt.OpenSSLDSAKeyFactory -com.android.org.conscrypt.OpenSSLDSAKeyPairGenerator -com.android.org.conscrypt.OpenSSLECDHKeyAgreement -com.android.org.conscrypt.OpenSSLECKeyFactory -com.android.org.conscrypt.OpenSSLECKeyPairGenerator +com.android.org.conscrypt.OpenSSLDigestContext com.android.org.conscrypt.OpenSSLKey com.android.org.conscrypt.OpenSSLKeyHolder -com.android.org.conscrypt.OpenSSLMac -com.android.org.conscrypt.OpenSSLMac$HmacMD5 -com.android.org.conscrypt.OpenSSLMac$HmacSHA1 -com.android.org.conscrypt.OpenSSLMac$HmacSHA256 -com.android.org.conscrypt.OpenSSLMac$HmacSHA384 -com.android.org.conscrypt.OpenSSLMac$HmacSHA512 com.android.org.conscrypt.OpenSSLMessageDigestJDK com.android.org.conscrypt.OpenSSLMessageDigestJDK$MD5 com.android.org.conscrypt.OpenSSLMessageDigestJDK$SHA1 +com.android.org.conscrypt.OpenSSLMessageDigestJDK$SHA512 +com.android.org.conscrypt.OpenSSLNativeReference com.android.org.conscrypt.OpenSSLProvider -com.android.org.conscrypt.OpenSSLRSAKeyFactory -com.android.org.conscrypt.OpenSSLRSAKeyPairGenerator com.android.org.conscrypt.OpenSSLRSAPublicKey com.android.org.conscrypt.OpenSSLRandom com.android.org.conscrypt.OpenSSLSessionImpl -com.android.org.conscrypt.OpenSSLSignature -com.android.org.conscrypt.OpenSSLSignature$1 -com.android.org.conscrypt.OpenSSLSignature$EngineType -com.android.org.conscrypt.OpenSSLSignature$MD5RSA -com.android.org.conscrypt.OpenSSLSignature$SHA1DSA -com.android.org.conscrypt.OpenSSLSignature$SHA1ECDSA -com.android.org.conscrypt.OpenSSLSignature$SHA1RSA -com.android.org.conscrypt.OpenSSLSignature$SHA256ECDSA -com.android.org.conscrypt.OpenSSLSignature$SHA256RSA -com.android.org.conscrypt.OpenSSLSignature$SHA384ECDSA -com.android.org.conscrypt.OpenSSLSignature$SHA384RSA -com.android.org.conscrypt.OpenSSLSignature$SHA512ECDSA -com.android.org.conscrypt.OpenSSLSignature$SHA512RSA -com.android.org.conscrypt.OpenSSLSignatureRawRSA com.android.org.conscrypt.OpenSSLSocketFactoryImpl com.android.org.conscrypt.OpenSSLSocketImpl com.android.org.conscrypt.OpenSSLSocketImpl$SSLInputStream @@ -1675,9 +2113,16 @@ com.android.org.conscrypt.OpenSSLX509CertificateFactory com.android.org.conscrypt.OpenSSLX509CertificateFactory$1 com.android.org.conscrypt.OpenSSLX509CertificateFactory$2 com.android.org.conscrypt.OpenSSLX509CertificateFactory$Parser -com.android.org.conscrypt.ProtocolVersion +com.android.org.conscrypt.OpenSSLX509CertificateFactory$ParsingException +com.android.org.conscrypt.PinEntryException +com.android.org.conscrypt.PinListEntry +com.android.org.conscrypt.PinManagerException +com.android.org.conscrypt.Platform +com.android.org.conscrypt.Platform$OpenSSLMapper com.android.org.conscrypt.SSLClientSessionCache com.android.org.conscrypt.SSLParametersImpl +com.android.org.conscrypt.SSLParametersImpl$AliasChooser +com.android.org.conscrypt.SSLParametersImpl$PSKCallbacks com.android.org.conscrypt.ServerSessionContext com.android.org.conscrypt.TrustManagerFactoryImpl com.android.org.conscrypt.TrustManagerImpl @@ -1687,43 +2132,27 @@ com.android.org.conscrypt.TrustedCertificateKeyStoreSpi com.android.org.conscrypt.TrustedCertificateStore com.android.org.conscrypt.TrustedCertificateStore$1 com.android.org.conscrypt.TrustedCertificateStore$2 -com.android.org.conscrypt.TrustedCertificateStore$3 com.android.org.conscrypt.TrustedCertificateStore$CertSelector +com.android.org.conscrypt.util.Arrays com.android.server.NetworkManagementSocketTagger com.android.server.NetworkManagementSocketTagger$1 com.android.server.NetworkManagementSocketTagger$SocketTags -com.android.server.Watchdog com.google.android.collect.Lists com.google.android.collect.Maps -com.google.android.gles_jni.EGLConfigImpl -com.google.android.gles_jni.EGLContextImpl -com.google.android.gles_jni.EGLDisplayImpl com.google.android.gles_jni.EGLImpl -com.google.android.gles_jni.EGLSurfaceImpl com.google.android.gles_jni.GLImpl -dalvik.system.BaseDexClassLoader dalvik.system.BlockGuard dalvik.system.BlockGuard$1 dalvik.system.BlockGuard$2 dalvik.system.BlockGuard$BlockGuardPolicyException dalvik.system.BlockGuard$Policy -dalvik.system.CloseGuard -dalvik.system.CloseGuard$DefaultReporter -dalvik.system.CloseGuard$Reporter dalvik.system.DalvikLogHandler dalvik.system.DalvikLogging -dalvik.system.DexFile -dalvik.system.DexPathList -dalvik.system.DexPathList$Element -dalvik.system.NativeStart -dalvik.system.PathClassLoader dalvik.system.SocketTagger dalvik.system.SocketTagger$1 -dalvik.system.StaleDexCacheError dalvik.system.VMDebug dalvik.system.VMRuntime -dalvik.system.VMStack -dalvik.system.Zygote +dalvik.system.ZygoteHooks java.beans.PropertyChangeEvent java.beans.PropertyChangeSupport java.io.BufferedInputStream @@ -1731,100 +2160,68 @@ java.io.BufferedOutputStream java.io.BufferedReader java.io.BufferedWriter java.io.ByteArrayInputStream -java.io.ByteArrayOutputStream java.io.Closeable -java.io.Console -java.io.DataInput java.io.DataInputStream -java.io.DataOutput -java.io.DataOutputStream +java.io.EOFException java.io.Externalizable java.io.File java.io.FileDescriptor -java.io.FileFilter java.io.FileInputStream java.io.FileNotFoundException java.io.FileOutputStream java.io.FileReader java.io.FilterInputStream -java.io.FilterOutputStream -java.io.FilterReader -java.io.Flushable java.io.IOException java.io.InputStream java.io.InputStreamReader -java.io.ObjectInput +java.io.InterruptedIOException java.io.ObjectInputStream java.io.ObjectStreamClass -java.io.ObjectStreamConstants -java.io.ObjectStreamField java.io.OutputStream java.io.OutputStreamWriter -java.io.PrintStream java.io.PrintWriter java.io.PushbackInputStream -java.io.PushbackReader java.io.RandomAccessFile java.io.Reader java.io.Serializable java.io.StringReader java.io.StringWriter -java.io.Writer +java.io.UnsupportedEncodingException java.lang.AbstractMethodError -java.lang.AbstractStringBuilder -java.lang.Appendable -java.lang.ArithmeticException java.lang.ArrayIndexOutOfBoundsException -java.lang.ArrayStoreException -java.lang.AutoCloseable java.lang.Boolean -java.lang.BootClassLoader java.lang.Byte -java.lang.CaseMapper java.lang.CharSequence java.lang.Character -java.lang.Character$UnicodeBlock java.lang.Class java.lang.ClassCastException -java.lang.ClassCircularityError -java.lang.ClassFormatError java.lang.ClassLoader java.lang.ClassLoader$SystemClassLoader java.lang.ClassNotFoundException +java.lang.CloneNotSupportedException java.lang.Cloneable java.lang.Comparable java.lang.Daemons java.lang.Daemons$Daemon java.lang.Daemons$FinalizerDaemon java.lang.Daemons$FinalizerWatchdogDaemon +java.lang.Daemons$GCDaemon +java.lang.Daemons$HeapTrimmerDaemon java.lang.Daemons$ReferenceQueueDaemon java.lang.Double java.lang.Enum -java.lang.Enum$1 java.lang.Error java.lang.Exception -java.lang.ExceptionInInitializerError java.lang.Float -java.lang.IllegalAccessError java.lang.IllegalAccessException java.lang.IllegalArgumentException -java.lang.IllegalMonitorStateException java.lang.IllegalStateException -java.lang.IllegalThreadStateException -java.lang.IncompatibleClassChangeError -java.lang.IndexOutOfBoundsException -java.lang.InstantiationError java.lang.InstantiationException java.lang.Integer -java.lang.IntegralToString -java.lang.IntegralToString$1 -java.lang.InternalError java.lang.InterruptedException java.lang.Iterable -java.lang.LinkageError java.lang.Long java.lang.Math -java.lang.NegativeArraySizeException java.lang.NoClassDefFoundError java.lang.NoSuchFieldError java.lang.NoSuchFieldException @@ -1835,69 +2232,47 @@ java.lang.Number java.lang.NumberFormatException java.lang.Object java.lang.OutOfMemoryError -java.lang.Readable -java.lang.RealToString -java.lang.RealToString$1 java.lang.Runnable java.lang.Runtime java.lang.RuntimeException java.lang.RuntimePermission java.lang.SecurityException java.lang.Short -java.lang.StackOverflowError -java.lang.StackTraceElement java.lang.StrictMath java.lang.String -java.lang.String$CaseInsensitiveComparator -java.lang.StringBuffer java.lang.StringBuilder -java.lang.StringIndexOutOfBoundsException -java.lang.StringToReal java.lang.StringToReal$StringExponentPair java.lang.System +java.lang.System$PropertiesWithNonOverrideableDefaults java.lang.Thread -java.lang.Thread$State java.lang.Thread$UncaughtExceptionHandler -java.lang.ThreadGroup java.lang.ThreadLocal -java.lang.ThreadLocal$Values java.lang.Throwable -java.lang.TypeNotPresentException java.lang.UnsatisfiedLinkError java.lang.UnsupportedOperationException -java.lang.VMClassLoader -java.lang.VerifyError -java.lang.VirtualMachineError java.lang.Void java.lang.annotation.Annotation -java.lang.ref.FinalizerReference -java.lang.ref.FinalizerReference$Sentinel -java.lang.ref.Reference -java.lang.ref.ReferenceQueue +java.lang.annotation.Inherited java.lang.ref.SoftReference java.lang.ref.WeakReference -java.lang.reflect.AccessibleObject -java.lang.reflect.AnnotatedElement -java.lang.reflect.Array -java.lang.reflect.Constructor java.lang.reflect.Field -java.lang.reflect.Field$1 -java.lang.reflect.GenericDeclaration -java.lang.reflect.InvocationHandler -java.lang.reflect.Member +java.lang.reflect.GenericArrayType +java.lang.reflect.InvocationTargetException java.lang.reflect.Method -java.lang.reflect.Method$1 -java.lang.reflect.Modifier -java.lang.reflect.Proxy +java.lang.reflect.ParameterizedType java.lang.reflect.Type +java.lang.reflect.WildcardType java.math.BigDecimal java.math.BigInt java.math.BigInteger +java.math.Conversion +java.math.Multiplication java.math.NativeBN java.math.RoundingMode java.net.AddressCache java.net.AddressCache$AddressCacheEntry -java.net.CacheResponse +java.net.AddressCache$AddressCacheKey +java.net.ConnectException java.net.ContentHandler java.net.CookieHandler java.net.HttpURLConnection @@ -1907,9 +2282,8 @@ java.net.InetAddress java.net.InetSocketAddress java.net.InetUnixAddress java.net.JarURLConnection +java.net.MalformedURLException java.net.PlainSocketImpl -java.net.PlainSocketImpl$PlainSocketInputStream -java.net.PlainSocketImpl$PlainSocketOutputStream java.net.Proxy java.net.Proxy$Type java.net.ProxySelector @@ -1917,35 +2291,30 @@ java.net.ProxySelectorImpl java.net.ResponseCache java.net.Socket java.net.SocketAddress +java.net.SocketException java.net.SocketImpl java.net.SocketOptions -java.net.URI -java.net.URI$1 -java.net.URI$PartEncoder -java.net.URL +java.net.SocketTimeoutException +java.net.URISyntaxException java.net.URLConnection java.net.URLConnection$DefaultContentHandler java.net.URLEncoder java.net.URLEncoder$1 java.net.URLStreamHandler +java.net.URLStreamHandlerFactory java.net.UnknownHostException -java.nio.Buffer -java.nio.ByteArrayBuffer -java.nio.ByteBuffer java.nio.ByteOrder java.nio.CharArrayBuffer -java.nio.CharBuffer java.nio.CharSequenceAdapter -java.nio.DirectByteBuffer java.nio.FileChannelImpl java.nio.FileChannelImpl$1 -java.nio.MappedByteBuffer -java.nio.MemoryBlock -java.nio.MemoryBlock$NonMovableHeapBlock +java.nio.MemoryBlock$UnmanagedBlock java.nio.NIOAccess -java.nio.NioUtils +java.nio.channels.AsynchronousCloseException java.nio.channels.ByteChannel java.nio.channels.Channel +java.nio.channels.ClosedByInterruptException +java.nio.channels.ClosedChannelException java.nio.channels.FileChannel java.nio.channels.GatheringByteChannel java.nio.channels.InterruptibleChannel @@ -1956,27 +2325,29 @@ java.nio.channels.spi.AbstractInterruptibleChannel java.nio.channels.spi.AbstractInterruptibleChannel$1 java.nio.charset.Charset java.nio.charset.CharsetDecoder -java.nio.charset.CharsetDecoderICU java.nio.charset.CharsetEncoder java.nio.charset.CharsetEncoderICU java.nio.charset.CharsetICU -java.nio.charset.Charsets java.nio.charset.CoderResult -java.nio.charset.CodingErrorAction java.nio.charset.ModifiedUtf8 +java.nio.charset.StandardCharsets java.security.AccessController -java.security.BasicPermission -java.security.Guard +java.security.DigestException +java.security.GeneralSecurityException +java.security.InvalidAlgorithmParameterException +java.security.InvalidKeyException java.security.Key -java.security.KeyFactory +java.security.KeyException java.security.KeyFactorySpi -java.security.KeyPairGenerator +java.security.KeyManagementException java.security.KeyPairGeneratorSpi java.security.KeyStore +java.security.KeyStoreException java.security.KeyStoreSpi java.security.MessageDigest -java.security.MessageDigestSpi -java.security.Permission +java.security.MessageDigest$MessageDigestImpl +java.security.NoSuchAlgorithmException +java.security.NoSuchProviderException java.security.Principal java.security.PrivilegedAction java.security.Provider @@ -1986,18 +2357,27 @@ java.security.SecureRandom java.security.SecureRandomSpi java.security.Security java.security.Security$SecurityDoor -java.security.Signature -java.security.SignatureSpi +java.security.UnrecoverableEntryException +java.security.UnrecoverableKeyException +java.security.cert.CRLException java.security.cert.CertPath +java.security.cert.CertPathBuilderException java.security.cert.CertPathParameters java.security.cert.CertPathValidator +java.security.cert.CertPathValidatorException java.security.cert.CertPathValidatorResult java.security.cert.CertPathValidatorSpi java.security.cert.CertSelector +java.security.cert.CertStoreException +java.security.cert.CertStoreParameters java.security.cert.Certificate +java.security.cert.CertificateEncodingException +java.security.cert.CertificateException +java.security.cert.CertificateExpiredException java.security.cert.CertificateFactory java.security.cert.CertificateFactorySpi -java.security.cert.CertStoreParameters +java.security.cert.CertificateNotYetValidException +java.security.cert.CertificateParsingException java.security.cert.PKIXCertPathChecker java.security.cert.PKIXCertPathValidatorResult java.security.cert.PKIXParameters @@ -2011,15 +2391,10 @@ java.security.interfaces.DSAPublicKey java.security.interfaces.RSAKey java.security.interfaces.RSAPublicKey java.security.spec.AlgorithmParameterSpec -java.security.spec.EncodedKeySpec -java.security.spec.KeySpec -java.security.spec.RSAPublicKeySpec -java.security.spec.X509EncodedKeySpec -java.sql.Date +java.security.spec.InvalidKeySpecException java.text.AttributedCharacterIterator$Attribute java.text.Bidi java.text.Bidi$Run -java.text.Collator java.text.DateFormat java.text.DateFormat$Field java.text.DateFormatSymbols @@ -2030,87 +2405,49 @@ java.text.Format java.text.Format$Field java.text.NumberFormat java.text.NumberFormat$Field +java.text.ParseException java.text.ParsePosition -java.text.RuleBasedCollator java.text.SimpleDateFormat java.util.AbstractCollection -java.util.AbstractList -java.util.AbstractList$FullListIterator -java.util.AbstractList$SimpleListIterator -java.util.AbstractList$SubAbstractList -java.util.AbstractList$SubAbstractList$SubAbstractListIterator -java.util.AbstractList$SubAbstractListRandomAccess java.util.AbstractMap -java.util.AbstractQueue java.util.AbstractSequentialList java.util.AbstractSet java.util.ArrayDeque java.util.ArrayList -java.util.ArrayList$ArrayListIterator java.util.Arrays java.util.Arrays$ArrayList java.util.BitSet java.util.Calendar java.util.Collection java.util.Collections -java.util.Collections$1 -java.util.Collections$2 -java.util.Collections$EmptyList -java.util.Collections$EmptyMap -java.util.Collections$EmptySet -java.util.Collections$SingletonList -java.util.Collections$SynchronizedCollection -java.util.Collections$SynchronizedMap -java.util.Collections$SynchronizedSet -java.util.Collections$UnmodifiableCollection +java.util.Collections$SingletonSet$1 java.util.Collections$UnmodifiableCollection$1 -java.util.Collections$UnmodifiableList -java.util.Collections$UnmodifiableMap java.util.Collections$UnmodifiableMap$UnmodifiableEntrySet java.util.Collections$UnmodifiableMap$UnmodifiableEntrySet$1 java.util.Collections$UnmodifiableMap$UnmodifiableEntrySet$UnmodifiableMapEntry -java.util.Collections$UnmodifiableRandomAccessList -java.util.Collections$UnmodifiableSet java.util.ComparableTimSort java.util.Comparator java.util.Currency java.util.Date -java.util.Deque -java.util.Dictionary +java.util.DualPivotQuicksort java.util.EnumMap java.util.EnumSet -java.util.Enumeration java.util.EventObject java.util.Formattable -java.util.Formatter -java.util.Formatter$1 -java.util.Formatter$CachedDecimalFormat java.util.Formatter$FormatSpecifierParser java.util.Formatter$FormatToken java.util.GregorianCalendar java.util.HashMap -java.util.HashMap$EntryIterator -java.util.HashMap$EntrySet -java.util.HashMap$HashIterator -java.util.HashMap$HashMapEntry -java.util.HashMap$KeyIterator -java.util.HashMap$KeySet -java.util.HashMap$ValueIterator -java.util.HashMap$Values java.util.HashSet -java.util.Hashtable -java.util.Hashtable$EntryIterator -java.util.Hashtable$EntrySet java.util.Hashtable$HashIterator -java.util.Hashtable$HashtableEntry java.util.Hashtable$KeyEnumeration java.util.Hashtable$ValueIterator java.util.Hashtable$Values +java.util.IdentityHashMap java.util.Iterator java.util.LinkedHashMap java.util.LinkedHashMap$EntryIterator java.util.LinkedHashMap$KeyIterator -java.util.LinkedHashMap$LinkedEntry java.util.LinkedHashMap$LinkedHashIterator java.util.LinkedHashMap$ValueIterator java.util.LinkedHashSet @@ -2120,15 +2457,24 @@ java.util.LinkedList$LinkIterator java.util.List java.util.ListIterator java.util.Locale +java.util.Locale$Builder java.util.Map java.util.Map$Entry +java.util.MapEntry +java.util.MapEntry$Type java.util.MiniEnumSet +java.util.MiniEnumSet$MiniEnumSetIterator +java.util.MissingResourceException java.util.NavigableMap java.util.NavigableSet +java.util.NoSuchElementException +java.util.Objects +java.util.PriorityQueue java.util.Properties java.util.Queue java.util.Random java.util.RandomAccess +java.util.Scanner java.util.Set java.util.SimpleTimeZone java.util.SortedMap @@ -2171,10 +2517,19 @@ java.util.concurrent.BlockingQueue java.util.concurrent.Callable java.util.concurrent.CancellationException java.util.concurrent.ConcurrentHashMap +java.util.concurrent.ConcurrentHashMap$BaseIterator +java.util.concurrent.ConcurrentHashMap$CollectionView +java.util.concurrent.ConcurrentHashMap$CounterCell +java.util.concurrent.ConcurrentHashMap$ForwardingNode +java.util.concurrent.ConcurrentHashMap$KeyIterator +java.util.concurrent.ConcurrentHashMap$KeySetView +java.util.concurrent.ConcurrentHashMap$Node java.util.concurrent.ConcurrentHashMap$Segment +java.util.concurrent.ConcurrentHashMap$Traverser java.util.concurrent.ConcurrentLinkedQueue java.util.concurrent.ConcurrentLinkedQueue$Node java.util.concurrent.ConcurrentMap +java.util.concurrent.ConcurrentSkipListMap java.util.concurrent.CopyOnWriteArrayList java.util.concurrent.CopyOnWriteArrayList$CowIterator java.util.concurrent.CountDownLatch @@ -2190,10 +2545,19 @@ java.util.concurrent.Executors$RunnableAdapter java.util.concurrent.Future java.util.concurrent.FutureTask java.util.concurrent.FutureTask$WaitNode +java.util.concurrent.LinkedBlockingDeque java.util.concurrent.LinkedBlockingQueue java.util.concurrent.LinkedBlockingQueue$Node java.util.concurrent.RejectedExecutionHandler java.util.concurrent.RunnableFuture +java.util.concurrent.ScheduledExecutorService +java.util.concurrent.Semaphore +java.util.concurrent.Semaphore$NonfairSync +java.util.concurrent.Semaphore$Sync +java.util.concurrent.SynchronousQueue +java.util.concurrent.SynchronousQueue$TransferStack +java.util.concurrent.SynchronousQueue$TransferStack$SNode +java.util.concurrent.SynchronousQueue$Transferer java.util.concurrent.ThreadFactory java.util.concurrent.ThreadPoolExecutor java.util.concurrent.ThreadPoolExecutor$AbortPolicy @@ -2206,8 +2570,10 @@ java.util.concurrent.TimeUnit$4 java.util.concurrent.TimeUnit$5 java.util.concurrent.TimeUnit$6 java.util.concurrent.TimeUnit$7 +java.util.concurrent.TimeoutException java.util.concurrent.atomic.AtomicBoolean java.util.concurrent.atomic.AtomicInteger +java.util.concurrent.atomic.AtomicLong java.util.concurrent.atomic.AtomicReference java.util.concurrent.locks.AbstractOwnableSynchronizer java.util.concurrent.locks.AbstractQueuedSynchronizer @@ -2226,14 +2592,13 @@ java.util.concurrent.locks.ReentrantReadWriteLock$ReadLock java.util.concurrent.locks.ReentrantReadWriteLock$Sync java.util.concurrent.locks.ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter java.util.concurrent.locks.ReentrantReadWriteLock$WriteLock -java.util.jar.Attributes -java.util.jar.Attributes$Name java.util.jar.JarEntry java.util.jar.JarFile -java.util.jar.JarVerifier -java.util.jar.Manifest +java.util.jar.JarFile$JarFileEnumerator +java.util.jar.StrictJarFile java.util.logging.ConsoleHandler java.util.logging.ErrorManager +java.util.logging.Filter java.util.logging.Formatter java.util.logging.Handler java.util.logging.Level @@ -2244,54 +2609,42 @@ java.util.logging.Logger$1 java.util.logging.LoggingPermission java.util.logging.SimpleFormatter java.util.logging.StreamHandler -java.util.regex.MatchResult -java.util.regex.Matcher java.util.regex.Pattern java.util.regex.PatternSyntaxException -java.util.regex.Splitter -java.util.zip.Adler32 java.util.zip.CRC32 -java.util.zip.Checksum java.util.zip.Deflater java.util.zip.DeflaterOutputStream java.util.zip.GZIPInputStream java.util.zip.GZIPOutputStream java.util.zip.Inflater java.util.zip.InflaterInputStream -java.util.zip.ZipConstants -java.util.zip.ZipEntry -java.util.zip.ZipFile java.util.zip.ZipFile$1 java.util.zip.ZipFile$RAFStream -java.util.zip.ZipFile$ZipInflaterInputStream -javax.crypto.Cipher -javax.crypto.CipherSpi -javax.crypto.KeyAgreementSpi -javax.crypto.MacSpi -javax.crypto.SecretKey +javax.crypto.BadPaddingException +javax.crypto.IllegalBlockSizeException +javax.crypto.NoSuchPaddingException javax.crypto.spec.GCMParameterSpec -javax.crypto.spec.IvParameterSpec -javax.crypto.spec.SecretKeySpec javax.microedition.khronos.egl.EGL javax.microedition.khronos.egl.EGL10 -javax.microedition.khronos.egl.EGLConfig -javax.microedition.khronos.egl.EGLContext -javax.microedition.khronos.egl.EGLDisplay -javax.microedition.khronos.egl.EGLSurface javax.microedition.khronos.opengles.GL javax.microedition.khronos.opengles.GL10 javax.microedition.khronos.opengles.GL10Ext javax.microedition.khronos.opengles.GL11 javax.microedition.khronos.opengles.GL11Ext javax.microedition.khronos.opengles.GL11ExtensionPack +javax.net.DefaultSocketFactory javax.net.SocketFactory javax.net.ssl.DefaultHostnameVerifier +javax.net.ssl.DistinguishedNameParser javax.net.ssl.HostnameVerifier javax.net.ssl.HttpsURLConnection javax.net.ssl.KeyManager javax.net.ssl.KeyManagerFactory javax.net.ssl.KeyManagerFactorySpi javax.net.ssl.SSLContextSpi +javax.net.ssl.SSLException +javax.net.ssl.SSLPeerUnverifiedException +javax.net.ssl.SSLProtocolException javax.net.ssl.SSLSession javax.net.ssl.SSLSessionContext javax.net.ssl.SSLSocket @@ -2303,8 +2656,11 @@ javax.net.ssl.X509ExtendedKeyManager javax.net.ssl.X509KeyManager javax.net.ssl.X509TrustManager javax.security.auth.x500.X500Principal +javax.security.cert.CertificateException +javax.xml.parsers.ParserConfigurationException libcore.icu.AlphabeticIndex libcore.icu.AlphabeticIndex$ImmutableIndex +libcore.icu.DateIntervalFormat libcore.icu.ICU libcore.icu.LocaleData libcore.icu.NativeBreakIterator @@ -2315,86 +2671,56 @@ libcore.icu.NativeDecimalFormat$FieldPositionIterator libcore.icu.NativeIDN libcore.icu.NativeNormalizer libcore.icu.NativePluralRules -libcore.icu.RuleBasedCollatorICU libcore.icu.TimeZoneNames libcore.icu.Transliterator libcore.internal.StringPool libcore.io.AsynchronousCloseMonitor -libcore.io.BlockGuardOs libcore.io.BufferIterator libcore.io.DropBox libcore.io.DropBox$DefaultReporter libcore.io.DropBox$Reporter -libcore.io.ErrnoException libcore.io.EventLogger libcore.io.EventLogger$DefaultReporter libcore.io.EventLogger$Reporter -libcore.io.ForwardingOs -libcore.io.GaiException libcore.io.HeapBufferIterator libcore.io.IoBridge -libcore.io.IoUtils -libcore.io.Libcore -libcore.io.Memory +libcore.io.IoUtils$FileReader libcore.io.MemoryMappedFile libcore.io.NioBufferIterator -libcore.io.Os -libcore.io.OsConstants -libcore.io.Posix libcore.io.Streams -libcore.io.StructAddrinfo -libcore.io.StructFlock -libcore.io.StructGroupReq -libcore.io.StructLinger -libcore.io.StructPasswd -libcore.io.StructPollfd -libcore.io.StructStat -libcore.io.StructTimeval -libcore.io.StructUcred -libcore.io.StructUtsname libcore.math.MathUtils libcore.net.MimeUtils -libcore.net.UriCodec -libcore.net.http.HttpDate -libcore.net.http.HttpDate$1 +libcore.net.event.NetworkEventDispatcher +libcore.net.event.NetworkEventListener libcore.net.url.FileHandler libcore.net.url.FileURLConnection +libcore.net.url.FileURLConnection$1 libcore.net.url.JarHandler libcore.net.url.JarURLConnectionImpl libcore.net.url.JarURLConnectionImpl$JarURLConnectionInputStream libcore.net.url.UrlUtils -libcore.util.BasicLruCache -libcore.util.CollectionUtils -libcore.util.CollectionUtils$1 -libcore.util.CollectionUtils$1$1 -libcore.util.EmptyArray -libcore.util.MutableInt -libcore.util.MutableLong -libcore.util.Objects +libcore.reflect.AnnotationFactory +libcore.reflect.AnnotationMember +libcore.reflect.AnnotationMember$DefaultValues +libcore.reflect.ListOfVariables +libcore.reflect.ParameterizedTypeImpl libcore.util.ZoneInfo +libcore.util.ZoneInfo$CheckedArithmeticException +libcore.util.ZoneInfo$WallTime libcore.util.ZoneInfoDB +libcore.util.ZoneInfoDB$TzData +libcore.util.ZoneInfoDB$TzData$1 org.apache.commons.logging.Log org.apache.commons.logging.LogFactory org.apache.commons.logging.impl.Jdk14Logger org.apache.commons.logging.impl.WeakHashtable -org.apache.harmony.crypto.internal.NullCipherSpi org.apache.harmony.dalvik.NativeTestTarget -org.apache.harmony.dalvik.ddmc.Chunk -org.apache.harmony.dalvik.ddmc.ChunkHandler -org.apache.harmony.dalvik.ddmc.DdmServer +org.apache.harmony.dalvik.ddmc.DdmVmInternal org.apache.harmony.luni.internal.util.TimezoneGetter org.apache.harmony.security.asn1.ASN1Any -org.apache.harmony.security.asn1.ASN1BitString -org.apache.harmony.security.asn1.ASN1BitString$ASN1NamedBitList -org.apache.harmony.security.asn1.ASN1Boolean org.apache.harmony.security.asn1.ASN1Choice org.apache.harmony.security.asn1.ASN1Constants org.apache.harmony.security.asn1.ASN1Constructed -org.apache.harmony.security.asn1.ASN1Explicit -org.apache.harmony.security.asn1.ASN1GeneralizedTime -org.apache.harmony.security.asn1.ASN1Implicit -org.apache.harmony.security.asn1.ASN1Integer -org.apache.harmony.security.asn1.ASN1OctetString org.apache.harmony.security.asn1.ASN1Oid org.apache.harmony.security.asn1.ASN1Oid$1 org.apache.harmony.security.asn1.ASN1Primitive @@ -2410,24 +2736,22 @@ org.apache.harmony.security.asn1.ASN1StringType$5 org.apache.harmony.security.asn1.ASN1StringType$6 org.apache.harmony.security.asn1.ASN1StringType$7 org.apache.harmony.security.asn1.ASN1StringType$ASN1StringUTF8Type -org.apache.harmony.security.asn1.ASN1Time org.apache.harmony.security.asn1.ASN1Type org.apache.harmony.security.asn1.ASN1TypeCollection -org.apache.harmony.security.asn1.ASN1UTCTime org.apache.harmony.security.asn1.ASN1ValueCollection org.apache.harmony.security.asn1.BerInputStream org.apache.harmony.security.asn1.BerOutputStream -org.apache.harmony.security.asn1.BitString org.apache.harmony.security.asn1.DerInputStream org.apache.harmony.security.asn1.DerOutputStream -org.apache.harmony.security.asn1.ObjectIdentifier -org.apache.harmony.security.fortress.Engine org.apache.harmony.security.fortress.Engine$ServiceCacheEntry org.apache.harmony.security.fortress.Engine$SpiAndProvider org.apache.harmony.security.fortress.SecurityAccess org.apache.harmony.security.fortress.Services +org.apache.harmony.security.pkcs7.ContentInfo$1 +org.apache.harmony.security.pkcs7.SignedData org.apache.harmony.security.provider.crypto.CryptoProvider org.apache.harmony.security.utils.AlgNameMapper +org.apache.harmony.security.utils.AlgNameMapperSource org.apache.harmony.security.utils.ObjectIdentifier org.apache.harmony.security.x501.AttributeTypeAndValue org.apache.harmony.security.x501.AttributeTypeAndValue$1 @@ -2438,43 +2762,11 @@ org.apache.harmony.security.x501.DirectoryString org.apache.harmony.security.x501.DirectoryString$1 org.apache.harmony.security.x501.Name org.apache.harmony.security.x501.Name$1 -org.apache.harmony.security.x509.AlgorithmIdentifier -org.apache.harmony.security.x509.AlgorithmIdentifier$1 -org.apache.harmony.security.x509.BasicConstraints -org.apache.harmony.security.x509.BasicConstraints$1 -org.apache.harmony.security.x509.Certificate -org.apache.harmony.security.x509.Certificate$1 -org.apache.harmony.security.x509.EDIPartyName -org.apache.harmony.security.x509.EDIPartyName$1 -org.apache.harmony.security.x509.ExtendedKeyUsage -org.apache.harmony.security.x509.ExtendedKeyUsage$1 -org.apache.harmony.security.x509.Extension -org.apache.harmony.security.x509.Extension$1 -org.apache.harmony.security.x509.Extension$2 -org.apache.harmony.security.x509.ExtensionValue -org.apache.harmony.security.x509.Extensions -org.apache.harmony.security.x509.Extensions$1 -org.apache.harmony.security.x509.GeneralName -org.apache.harmony.security.x509.GeneralName$1 -org.apache.harmony.security.x509.GeneralName$2 -org.apache.harmony.security.x509.GeneralNames -org.apache.harmony.security.x509.GeneralNames$1 -org.apache.harmony.security.x509.KeyUsage -org.apache.harmony.security.x509.ORAddress -org.apache.harmony.security.x509.ORAddress$1 -org.apache.harmony.security.x509.ORAddress$2 -org.apache.harmony.security.x509.OtherName -org.apache.harmony.security.x509.OtherName$1 -org.apache.harmony.security.x509.SubjectPublicKeyInfo -org.apache.harmony.security.x509.SubjectPublicKeyInfo$1 org.apache.harmony.security.x509.TBSCertificate -org.apache.harmony.security.x509.TBSCertificate$1 -org.apache.harmony.security.x509.Time -org.apache.harmony.security.x509.Time$1 -org.apache.harmony.security.x509.Validity -org.apache.harmony.security.x509.Validity$1 org.apache.harmony.xml.ExpatAttributes org.apache.harmony.xml.ExpatParser +org.apache.harmony.xml.dom.DocumentImpl +org.apache.harmony.xml.dom.InnerNodeImpl org.apache.http.ConnectionReuseStrategy org.apache.http.FormattedHeader org.apache.http.Header @@ -2486,6 +2778,7 @@ org.apache.http.HttpConnection org.apache.http.HttpConnectionMetrics org.apache.http.HttpEntity org.apache.http.HttpEntityEnclosingRequest +org.apache.http.HttpException org.apache.http.HttpHost org.apache.http.HttpInetConnection org.apache.http.HttpMessage @@ -2496,6 +2789,8 @@ org.apache.http.HttpResponseFactory org.apache.http.HttpResponseInterceptor org.apache.http.HttpVersion org.apache.http.NameValuePair +org.apache.http.ParseException +org.apache.http.ProtocolException org.apache.http.ProtocolVersion org.apache.http.ReasonPhraseCatalog org.apache.http.RequestLine @@ -2503,6 +2798,7 @@ org.apache.http.StatusLine org.apache.http.auth.AuthSchemeFactory org.apache.http.auth.AuthSchemeRegistry org.apache.http.auth.AuthState +org.apache.http.auth.AuthenticationException org.apache.http.client.AuthenticationHandler org.apache.http.client.CookieStore org.apache.http.client.CredentialsProvider @@ -2529,6 +2825,7 @@ org.apache.http.conn.BasicManagedEntity org.apache.http.conn.ClientConnectionManager org.apache.http.conn.ClientConnectionOperator org.apache.http.conn.ClientConnectionRequest +org.apache.http.conn.ConnectTimeoutException org.apache.http.conn.ConnectionKeepAliveStrategy org.apache.http.conn.ConnectionReleaseTrigger org.apache.http.conn.EofSensorInputStream @@ -2562,13 +2859,9 @@ org.apache.http.conn.ssl.SSLSocketFactory org.apache.http.conn.ssl.StrictHostnameVerifier org.apache.http.conn.ssl.X509HostnameVerifier org.apache.http.conn.util.InetAddressUtils -org.apache.http.cookie.CookieAttributeHandler -org.apache.http.cookie.CookieIdentityComparator -org.apache.http.cookie.CookieOrigin -org.apache.http.cookie.CookiePathComparator -org.apache.http.cookie.CookieSpec org.apache.http.cookie.CookieSpecFactory org.apache.http.cookie.CookieSpecRegistry +org.apache.http.cookie.MalformedCookieException org.apache.http.entity.AbstractHttpEntity org.apache.http.entity.BasicHttpEntity org.apache.http.entity.ByteArrayEntity @@ -2576,7 +2869,9 @@ org.apache.http.entity.ContentLengthStrategy org.apache.http.entity.HttpEntityWrapper org.apache.http.impl.AbstractHttpClientConnection org.apache.http.impl.DefaultConnectionReuseStrategy +org.apache.http.impl.DefaultHttpClientConnection org.apache.http.impl.DefaultHttpResponseFactory +org.apache.http.impl.DefaultHttpServerConnection org.apache.http.impl.EnglishReasonPhraseCatalog org.apache.http.impl.HttpConnectionMetricsImpl org.apache.http.impl.SocketHttpClientConnection @@ -2584,7 +2879,6 @@ org.apache.http.impl.auth.BasicSchemeFactory org.apache.http.impl.auth.DigestSchemeFactory org.apache.http.impl.client.AbstractAuthenticationHandler org.apache.http.impl.client.AbstractHttpClient -org.apache.http.impl.client.BasicCookieStore org.apache.http.impl.client.BasicCredentialsProvider org.apache.http.impl.client.ClientParamsStack org.apache.http.impl.client.DefaultConnectionKeepAliveStrategy @@ -2598,6 +2892,7 @@ org.apache.http.impl.client.DefaultUserTokenHandler org.apache.http.impl.client.EntityEnclosingRequestWrapper org.apache.http.impl.client.RequestWrapper org.apache.http.impl.client.RoutedRequest +org.apache.http.impl.client.TunnelRefusedException org.apache.http.impl.conn.AbstractClientConnAdapter org.apache.http.impl.conn.AbstractPoolEntry org.apache.http.impl.conn.AbstractPooledConnAdapter @@ -2621,29 +2916,12 @@ org.apache.http.impl.conn.tsccm.RouteSpecificPool org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager$1 org.apache.http.impl.conn.tsccm.WaitingThreadAborter -org.apache.http.impl.cookie.AbstractCookieAttributeHandler -org.apache.http.impl.cookie.AbstractCookieSpec -org.apache.http.impl.cookie.BasicCommentHandler -org.apache.http.impl.cookie.BasicExpiresHandler -org.apache.http.impl.cookie.BasicMaxAgeHandler -org.apache.http.impl.cookie.BasicPathHandler -org.apache.http.impl.cookie.BasicSecureHandler -org.apache.http.impl.cookie.BestMatchSpec org.apache.http.impl.cookie.BestMatchSpecFactory org.apache.http.impl.cookie.BrowserCompatSpecFactory -org.apache.http.impl.cookie.CookieSpecBase +org.apache.http.impl.cookie.DateParseException org.apache.http.impl.cookie.NetscapeDraftSpecFactory -org.apache.http.impl.cookie.RFC2109DomainHandler -org.apache.http.impl.cookie.RFC2109Spec org.apache.http.impl.cookie.RFC2109SpecFactory -org.apache.http.impl.cookie.RFC2109VersionHandler -org.apache.http.impl.cookie.RFC2965CommentUrlAttributeHandler -org.apache.http.impl.cookie.RFC2965DiscardAttributeHandler -org.apache.http.impl.cookie.RFC2965DomainAttributeHandler -org.apache.http.impl.cookie.RFC2965PortAttributeHandler -org.apache.http.impl.cookie.RFC2965Spec org.apache.http.impl.cookie.RFC2965SpecFactory -org.apache.http.impl.cookie.RFC2965VersionAttributeHandler org.apache.http.impl.entity.EntityDeserializer org.apache.http.impl.entity.EntitySerializer org.apache.http.impl.entity.LaxContentLengthStrategy @@ -2705,20 +2983,11 @@ org.apache.http.protocol.RequestUserAgent org.apache.http.util.ByteArrayBuffer org.apache.http.util.CharArrayBuffer org.apache.http.util.LangUtils -org.ccil.cowan.tagsoup.AttributesImpl -org.ccil.cowan.tagsoup.AutoDetector -org.ccil.cowan.tagsoup.Element -org.ccil.cowan.tagsoup.ElementType -org.ccil.cowan.tagsoup.HTMLModels org.ccil.cowan.tagsoup.HTMLScanner -org.ccil.cowan.tagsoup.HTMLSchema org.ccil.cowan.tagsoup.Parser -org.ccil.cowan.tagsoup.Parser$1 -org.ccil.cowan.tagsoup.ScanHandler -org.ccil.cowan.tagsoup.Scanner -org.ccil.cowan.tagsoup.Schema org.json.JSON org.json.JSONArray +org.json.JSONException org.json.JSONObject org.json.JSONObject$1 org.json.JSONStringer @@ -2733,9 +3002,11 @@ org.xml.sax.EntityResolver org.xml.sax.ErrorHandler org.xml.sax.InputSource org.xml.sax.Locator +org.xml.sax.SAXException +org.xml.sax.SAXNotRecognizedException +org.xml.sax.SAXNotSupportedException org.xml.sax.XMLReader -org.xml.sax.ext.LexicalHandler org.xml.sax.helpers.DefaultHandler org.xmlpull.v1.XmlPullParser +org.xmlpull.v1.XmlPullParserException org.xmlpull.v1.XmlSerializer -sun.misc.Unsafe diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index cc1742210893..7d4156fe7fcd 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -2117,7 +2117,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { // performs the current profile parent resolution. final int resolvedUserId = mSecurityPolicy .resolveCallingUserIdEnforcingPermissionsLocked( - UserHandle.getCallingUserId()); + UserHandle.USER_CURRENT); if (resolvedUserId != mCurrentUserId) { return null; } @@ -2148,7 +2148,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { // performs the current profile parent resolution. final int resolvedUserId = mSecurityPolicy .resolveCallingUserIdEnforcingPermissionsLocked( - UserHandle.getCallingUserId()); + UserHandle.USER_CURRENT); if (resolvedUserId != mCurrentUserId) { return null; } @@ -2181,7 +2181,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { // performs the current profile parent resolution. final int resolvedUserId = mSecurityPolicy .resolveCallingUserIdEnforcingPermissionsLocked( - UserHandle.getCallingUserId()); + UserHandle.USER_CURRENT); if (resolvedUserId != mCurrentUserId) { return false; } @@ -2233,7 +2233,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { // performs the current profile parent resolution. final int resolvedUserId = mSecurityPolicy .resolveCallingUserIdEnforcingPermissionsLocked( - UserHandle.getCallingUserId()); + UserHandle.USER_CURRENT); if (resolvedUserId != mCurrentUserId) { return false; } @@ -2285,7 +2285,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { // performs the current profile parent resolution. final int resolvedUserId = mSecurityPolicy .resolveCallingUserIdEnforcingPermissionsLocked( - UserHandle.getCallingUserId()); + UserHandle.USER_CURRENT); if (resolvedUserId != mCurrentUserId) { return false; } @@ -2337,7 +2337,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { // performs the current profile parent resolution. final int resolvedUserId = mSecurityPolicy .resolveCallingUserIdEnforcingPermissionsLocked( - UserHandle.getCallingUserId()); + UserHandle.USER_CURRENT); if (resolvedUserId != mCurrentUserId) { return false; } @@ -2390,7 +2390,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { // performs the current profile parent resolution. final int resolvedUserId = mSecurityPolicy .resolveCallingUserIdEnforcingPermissionsLocked( - UserHandle.getCallingUserId()); + UserHandle.USER_CURRENT); if (resolvedUserId != mCurrentUserId) { return false; } @@ -2441,7 +2441,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { // performs the current profile parent resolution. final int resolvedUserId = mSecurityPolicy .resolveCallingUserIdEnforcingPermissionsLocked( - UserHandle.getCallingUserId()); + UserHandle.USER_CURRENT); if (resolvedUserId != mCurrentUserId) { return false; } @@ -2480,7 +2480,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { // performs the current profile parent resolution. final int resolvedUserId = mSecurityPolicy .resolveCallingUserIdEnforcingPermissionsLocked( - UserHandle.getCallingUserId()); + UserHandle.USER_CURRENT); if (resolvedUserId != mCurrentUserId) { return false; } @@ -2527,7 +2527,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { // performs the current profile parent resolution. final int resolvedUserId = mSecurityPolicy .resolveCallingUserIdEnforcingPermissionsLocked( - UserHandle.getCallingUserId()); + UserHandle.USER_CURRENT); if (resolvedUserId != mCurrentUserId) { return false; } @@ -3621,6 +3621,12 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { if (callingUserId == userId) { return resolveProfileParentLocked(userId); } + final int callingUserParentId = resolveProfileParentLocked(callingUserId); + if (callingUserParentId == mCurrentUserId && + (userId == UserHandle.USER_CURRENT + || userId == UserHandle.USER_CURRENT_OR_SELF)) { + return mCurrentUserId; + } if (!hasPermission(Manifest.permission.INTERACT_ACROSS_USERS) && !hasPermission(Manifest.permission.INTERACT_ACROSS_USERS_FULL)) { throw new SecurityException("Call from user " + callingUserId + " as user " diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 01e80b708c79..f430c568e7a3 100755 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -1468,6 +1468,7 @@ public final class ActiveServices { app.services.remove(r); r.app = null; scheduleServiceRestartLocked(r, false); + return; } } diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index c7eb54665c3b..d5b6813ba12c 100755 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -27,6 +27,7 @@ import static com.android.internal.util.XmlUtils.writeBooleanAttribute; import static com.android.internal.util.XmlUtils.writeIntAttribute; import static com.android.internal.util.XmlUtils.writeLongAttribute; import static com.android.server.Watchdog.NATIVE_STACKS_OF_INTEREST; +import static com.android.server.am.ActivityRecord.HOME_ACTIVITY_TYPE; import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT; import static org.xmlpull.v1.XmlPullParser.START_TAG; import static com.android.server.am.ActivityStackSupervisor.HOME_STACK_ID; @@ -1192,7 +1193,7 @@ public final class ActivityManagerService extends ActivityManagerNative static final int SYSTEM_USER_START_MSG = 42; static final int SYSTEM_USER_CURRENT_MSG = 43; static final int ENTER_ANIMATION_COMPLETE_MSG = 44; - static final int ENABLE_SCREEN_AFTER_BOOT_MSG = 45; + static final int FINISH_BOOTING_MSG = 45; static final int START_USER_SWITCH_MSG = 46; static final int SEND_LOCALE_TO_MOUNT_DAEMON_MSG = 47; @@ -1877,8 +1878,13 @@ public final class ActivityManagerService extends ActivityManagerNative } break; } - case ENABLE_SCREEN_AFTER_BOOT_MSG: { - enableScreenAfterBoot(); + case FINISH_BOOTING_MSG: { + if (msg.arg1 != 0) { + finishBooting(); + } + if (msg.arg2 != 0) { + enableScreenAfterBoot(); + } break; } case SEND_LOCALE_TO_MOUNT_DAEMON_MSG: { @@ -2025,7 +2031,7 @@ public final class ActivityManagerService extends ActivityManagerNative @Override public void onPackageModified(String packageName) { final int eventUserId = getChangingUserId(); - final PackageManager pm = mContext.getPackageManager(); + final IPackageManager pm = AppGlobals.getPackageManager(); final ArrayList<Pair<Intent, Integer>> recentTaskIntents = new ArrayList<Pair<Intent, Integer>>(); final HashSet<ComponentName> componentsKnownToExist = new HashSet<ComponentName>(); @@ -2050,13 +2056,15 @@ public final class ActivityManagerService extends ActivityManagerNative continue; } try { - ActivityInfo info = pm.getActivityInfo(cn, eventUserId); - if (info != null && info.isEnabled()) { + ActivityInfo info = pm.getActivityInfo(cn, 0, eventUserId); + if (info != null) { componentsKnownToExist.add(cn); } else { tasksToRemove.add(p.second); } - } catch (Exception e) {} + } catch (RemoteException e) { + Log.e(TAG, "Failed to query activity info for component: " + cn, e); + } } } // Prune all the tasks with removed components from the list of recent tasks @@ -6258,8 +6266,9 @@ public final class ActivityManagerService extends ActivityManagerNative Binder.restoreCallingIdentity(origId); } - void postEnableScreenAfterBootLocked() { - mHandler.sendEmptyMessage(ENABLE_SCREEN_AFTER_BOOT_MSG); + void postFinishBooting(boolean finishBooting, boolean enableScreen) { + mHandler.sendMessage(mHandler.obtainMessage(FINISH_BOOTING_MSG, + finishBooting? 1 : 0, enableScreen ? 1 : 0)); } void enableScreenAfterBoot() { @@ -6324,7 +6333,7 @@ public final class ActivityManagerService extends ActivityManagerNative startProcessLocked(procs.get(ip), "on-hold", null); } } - + if (mFactoryTest != FactoryTest.FACTORY_TEST_LOW_LEVEL) { // Start looking for apps that are abusing wake locks. Message nmsg = mHandler.obtainMessage(CHECK_EXCESSIVE_WAKE_LOCKS_MSG); @@ -6564,7 +6573,7 @@ public final class ActivityManagerService extends ActivityManagerNative throw new IllegalArgumentException("File descriptors passed in options"); } } - + synchronized(this) { int callingUid = Binder.getCallingUid(); int origUserId = userId; @@ -6594,7 +6603,7 @@ public final class ActivityManagerService extends ActivityManagerNative return getIntentSenderLocked(type, packageName, callingUid, userId, token, resultWho, requestCode, intents, resolvedTypes, flags, options); - + } catch (RemoteException e) { throw new SecurityException(e); } @@ -6852,7 +6861,7 @@ public final class ActivityManagerService extends ActivityManagerNative "setProcessForeground()"); synchronized(this) { boolean changed = false; - + synchronized (mPidsSelfLocked) { ProcessRecord pr = mPidsSelfLocked.get(pid); if (pr == null && isForeground) { @@ -6888,13 +6897,13 @@ public final class ActivityManagerService extends ActivityManagerNative } } } - + if (changed) { updateOomAdjLocked(); } } } - + // ========================================================= // PERMISSIONS // ========================================================= @@ -6956,7 +6965,7 @@ public final class ActivityManagerService extends ActivityManagerNative * permission is automatically denied. (Internally a null permission * string is used when calling {@link #checkComponentPermission} in cases * when only uid-based security is needed.) - * + * * This can be called with or without the global lock held. */ @Override @@ -7213,12 +7222,12 @@ public final class ActivityManagerService extends ActivityManagerNative if (DEBUG_URI_PERMISSION) Slog.v(TAG, "Checking grant " + targetPkg + " permission to " + grantUri); } - + final IPackageManager pm = AppGlobals.getPackageManager(); // If this is not a content: uri, we can't do anything with it. if (!ContentResolver.SCHEME_CONTENT.equals(grantUri.uri.getScheme())) { - if (DEBUG_URI_PERMISSION) Slog.v(TAG, + if (DEBUG_URI_PERMISSION) Slog.v(TAG, "Can't grant URI permission for non-content URI: " + grantUri); return -1; } @@ -7346,7 +7355,7 @@ public final class ActivityManagerService extends ActivityManagerNative // to the uri, and the target doesn't. Let's now give this to // the target. - if (DEBUG_URI_PERMISSION) Slog.v(TAG, + if (DEBUG_URI_PERMISSION) Slog.v(TAG, "Granting " + targetPkg + "/" + targetUid + " permission to " + grantUri); final String authority = grantUri.uri.getAuthority(); @@ -7548,7 +7557,7 @@ public final class ActivityManagerService extends ActivityManagerNative final ArrayMap<GrantUri, UriPermission> perms = mGrantedUriPermissions.get( perm.targetUid); if (perms != null) { - if (DEBUG_URI_PERMISSION) Slog.v(TAG, + if (DEBUG_URI_PERMISSION) Slog.v(TAG, "Removing " + perm.targetUid + " permission to " + perm.uri); perms.remove(perm.uri); @@ -8117,7 +8126,7 @@ public final class ActivityManagerService extends ActivityManagerNative outInfo.foregroundAppThreshold = mProcessList.getMemLevel( ProcessList.FOREGROUND_APP_ADJ); } - + // ========================================================= // TASK MANAGEMENT // ========================================================= @@ -8519,7 +8528,7 @@ public final class ActivityManagerService extends ActivityManagerNative } } } - + /** * TODO: Add mController hook */ @@ -8595,7 +8604,7 @@ public final class ActivityManagerService extends ActivityManagerNative /** * Moves an activity, and all of the other activities within the same task, to the bottom * of the history stack. The activity's order within the task is unchanged. - * + * * @param token A reference to the activity we wish to move * @param nonRoot If false then this only works if the activity is the root * of a task; if true it will work for any activity in a task. @@ -9016,7 +9025,7 @@ public final class ActivityManagerService extends ActivityManagerNative == PackageManager.PERMISSION_GRANTED) { return null; } - + PathPermission[] pps = cpi.pathPermissions; if (pps != null) { int i = pps.length; @@ -9600,7 +9609,7 @@ public final class ActivityManagerService extends ActivityManagerNative } } } - + public final void publishContentProviders(IApplicationThread caller, List<ContentProviderHolder> providers) { if (providers == null) { @@ -10078,7 +10087,7 @@ public final class ActivityManagerService extends ActivityManagerNative return timedout; } - + public final void activitySlept(IBinder token) { if (localLOGV) Slog.v(TAG, "Activity slept: token=" + token); @@ -10153,7 +10162,7 @@ public final class ActivityManagerService extends ActivityManagerNative throw new SecurityException("Requires permission " + android.Manifest.permission.STOP_APP_SWITCHES); } - + synchronized(this) { mAppSwitchesAllowedTime = SystemClock.uptimeMillis() + APP_SWITCH_DELAY_TIME; @@ -10163,14 +10172,14 @@ public final class ActivityManagerService extends ActivityManagerNative mHandler.sendMessageDelayed(msg, APP_SWITCH_DELAY_TIME); } } - + public void resumeAppSwitches() { if (checkCallingPermission(android.Manifest.permission.STOP_APP_SWITCHES) != PackageManager.PERMISSION_GRANTED) { throw new SecurityException("Requires permission " + android.Manifest.permission.STOP_APP_SWITCHES); } - + synchronized(this) { // Note that we don't execute any pending app switches... we will // let those wait until either the timeout, or the next start @@ -10178,7 +10187,7 @@ public final class ActivityManagerService extends ActivityManagerNative mAppSwitchesAllowedTime = 0; } } - + boolean checkAppSwitchAllowedLocked(int sourcePid, int sourceUid, int callingPid, int callingUid, String name) { if (mAppSwitchesAllowedTime < SystemClock.uptimeMillis()) { @@ -10206,7 +10215,7 @@ public final class ActivityManagerService extends ActivityManagerNative Slog.w(TAG, name + " request from " + sourceUid + " stopped"); return false; } - + public void setDebugApp(String packageName, boolean waitForDebugger, boolean persistent) { enforceCallingPermission(android.Manifest.permission.SET_DEBUG_APP, @@ -11180,7 +11189,7 @@ public final class ActivityManagerService extends ActivityManagerNative } } } - + synchronized(this) { if (procsToKill != null) { for (int i=procsToKill.size()-1; i>=0; i--) { @@ -11189,20 +11198,20 @@ public final class ActivityManagerService extends ActivityManagerNative removeProcessLocked(proc, true, false, "system update done"); } } - + // Now that we have cleaned up any update processes, we // are ready to start launching real processes and know that // we won't trample on them any more. mProcessesReady = true; } - + Slog.i(TAG, "System now ready"); EventLog.writeEvent(EventLogTags.BOOT_PROGRESS_AMS_READY, SystemClock.uptimeMillis()); synchronized(this) { // Make sure we have no pre-ready processes sitting around. - + if (mFactoryTest == FactoryTest.FACTORY_TEST_LOW_LEVEL) { ResolveInfo ri = mContext.getPackageManager() .resolveActivity(new Intent(Intent.ACTION_FACTORY_TEST), @@ -11275,6 +11284,7 @@ public final class ActivityManagerService extends ActivityManagerNative // Start up initial activity. mBooting = true; + startHomeActivityLocked(mCurrentUserId); try { if (AppGlobals.getPackageManager().hasSystemUidErrors()) { @@ -11336,12 +11346,12 @@ public final class ActivityManagerService extends ActivityManagerNative startAppProblemLocked(app); app.stopFreezingAllLocked(); } - + /** * Generate a process error record, suitable for attachment to a ProcessRecord. - * + * * @param app The ProcessRecord in which the error occurred. - * @param condition Crashing, Application Not Responding, etc. Values are defined in + * @param condition Crashing, Application Not Responding, etc. Values are defined in * ActivityManager.AppErrorStateInfo * @param activity The activity associated with the crash, if known. * @param shortMsg Short message describing the crash. @@ -11350,7 +11360,7 @@ public final class ActivityManagerService extends ActivityManagerNative * * @return Returns a fully-formed AppErrorStateInfo record. */ - private ActivityManager.ProcessErrorStateInfo generateProcessError(ProcessRecord app, + private ActivityManager.ProcessErrorStateInfo generateProcessError(ProcessRecord app, int condition, String activity, String shortMsg, String longMsg, String stackTrace) { ActivityManager.ProcessErrorStateInfo report = new ActivityManager.ProcessErrorStateInfo(); @@ -12107,14 +12117,14 @@ public final class ActivityManagerService extends ActivityManagerNative } else if (app.notResponding) { report = app.notRespondingReport; } - + if (report != null) { if (errList == null) { errList = new ArrayList<ActivityManager.ProcessErrorStateInfo>(1); } errList.add(report); } else { - Slog.w(TAG, "Missing app error report, app = " + app.processName + + Slog.w(TAG, "Missing app error report, app = " + app.processName + " crashing = " + app.crashing + " notResponding = " + app.notResponding); } @@ -12173,7 +12183,7 @@ public final class ActivityManagerService extends ActivityManagerNative } if ((app.thread != null) && (!app.crashing && !app.notResponding)) { // Generate process state info for running application - ActivityManager.RunningAppProcessInfo currApp = + ActivityManager.RunningAppProcessInfo currApp = new ActivityManager.RunningAppProcessInfo(app.processName, app.pid, app.getPackageList()); fillInProcMemInfo(app, currApp); @@ -12255,7 +12265,7 @@ public final class ActivityManagerService extends ActivityManagerNative boolean dumpAll = false; boolean dumpClient = false; String dumpPackage = null; - + int opti = 0; while (opti < args.length) { String opt = args[opti]; @@ -12508,7 +12518,7 @@ public final class ActivityManagerService extends ActivityManagerNative boolean printedAnything = false; - if (mRecentTasks.size() > 0) { + if (mRecentTasks != null && mRecentTasks.size() > 0) { boolean printedHeader = false; final int N = mRecentTasks.size(); @@ -12628,12 +12638,12 @@ public final class ActivityManagerService extends ActivityManagerNative } } } - + if (mForegroundProcesses.size() > 0) { synchronized (mPidsSelfLocked) { boolean printed = false; for (int i=0; i<mForegroundProcesses.size(); i++) { - ProcessRecord r = mPidsSelfLocked.get( + ProcessRecord r = mPidsSelfLocked.get( mForegroundProcesses.valueAt(i).pid); if (dumpPackage != null && (r == null || !r.pkgList.containsKey(dumpPackage))) { @@ -12651,7 +12661,7 @@ public final class ActivityManagerService extends ActivityManagerNative } } } - + if (mPersistentStartingProcesses.size() > 0) { if (needSep) pw.println(); needSep = true; @@ -12669,7 +12679,7 @@ public final class ActivityManagerService extends ActivityManagerNative dumpProcessList(pw, this, mRemovedProcesses, " ", "Removed Norm", "Removed PERS", dumpPackage); } - + if (mProcessesOnHold.size() > 0) { if (needSep) pw.println(); needSep = true; @@ -12680,7 +12690,7 @@ public final class ActivityManagerService extends ActivityManagerNative } needSep = dumpProcessesToGc(fd, pw, args, opti, needSep, dumpAll, dumpPackage); - + if (mProcessCrashTimes.getMap().size() > 0) { boolean printed = false; long now = SystemClock.uptimeMillis(); @@ -12907,10 +12917,12 @@ public final class ActivityManagerService extends ActivityManagerNative if (dumpAll) { pw.println(" Total persistent processes: " + numPers); pw.println(" mProcessesReady=" + mProcessesReady - + " mSystemReady=" + mSystemReady); - pw.println(" mBooting=" + mBooting + + " mSystemReady=" + mSystemReady + " mBooted=" + mBooted + " mFactoryTest=" + mFactoryTest); + pw.println(" mBooting=" + mBooting + + " mCallFinishBooting=" + mCallFinishBooting + + " mBootAnimationComplete=" + mBootAnimationComplete); pw.print(" mLastPowerCheckRealtime="); TimeUtils.formatDuration(mLastPowerCheckRealtime, pw); pw.println(""); @@ -13050,7 +13062,7 @@ public final class ActivityManagerService extends ActivityManagerNative ArrayList<String> strings; ArrayList<Integer> objects; boolean all; - + ItemMatcher() { all = true; } @@ -13135,7 +13147,7 @@ public final class ActivityManagerService extends ActivityManagerNative protected boolean dumpActivity(FileDescriptor fd, PrintWriter pw, String name, String[] args, int opti, boolean dumpAll) { ArrayList<ActivityRecord> activities; - + synchronized (this) { activities = mStackSupervisor.getDumpActivitiesLocked(name); } @@ -13258,7 +13270,7 @@ public final class ActivityManagerService extends ActivityManagerNative } needSep = true; - + if (!onlyHistory && mStickyBroadcasts != null && dumpPackage == null) { for (int user=0; user<mStickyBroadcasts.size(); user++) { if (needSep) { @@ -13293,7 +13305,7 @@ public final class ActivityManagerService extends ActivityManagerNative } } } - + if (!onlyHistory && dumpAll) { pw.println(); for (BroadcastQueue queue : mBroadcastQueues) { @@ -13305,7 +13317,7 @@ public final class ActivityManagerService extends ActivityManagerNative needSep = true; printedAnything = true; } - + if (!printedAnything) { pw.println(" (nothing)"); } @@ -13641,7 +13653,7 @@ public final class ActivityManagerService extends ActivityManagerNative long realtime = SystemClock.elapsedRealtime(); pw.println("Applications Graphics Acceleration Info:"); pw.println("Uptime: " + uptime + " Realtime: " + realtime); - + for (int i = procs.size() - 1 ; i >= 0 ; i--) { ProcessRecord r = procs.get(i); if (r.thread != null) { @@ -13835,7 +13847,7 @@ public final class ActivityManagerService extends ActivityManagerNative boolean oomOnly = false; boolean isCompact = false; boolean localOnly = false; - + int opti = 0; while (opti < args.length) { String opt = args[opti]; @@ -13869,7 +13881,7 @@ public final class ActivityManagerService extends ActivityManagerNative pw.println("Unknown argument: " + opt + "; use -h for help"); } } - + final boolean isCheckinRequest = scanArgs(args, "--checkin"); long uptime = SystemClock.uptimeMillis(); long realtime = SystemClock.elapsedRealtime(); @@ -14554,7 +14566,7 @@ public final class ActivityManagerService extends ActivityManagerNative } return restart; } - + // ========================================================= // SERVICES // ========================================================= @@ -14636,7 +14648,7 @@ public final class ActivityManagerService extends ActivityManagerNative return mServices.peekServiceLocked(service, resolvedType); } } - + @Override public boolean stopServiceToken(ComponentName className, IBinder token, int startId) { @@ -14858,11 +14870,11 @@ public final class ActivityManagerService extends ActivityManagerNative mServices.serviceDoneExecutingLocked((ServiceRecord)token, type, startId, res); } } - + // ========================================================= // BACKUP AND RESTORE // ========================================================= - + // Cause the target app to be launched if necessary and its backup agent // instantiated. The backup agent will invoke backupAgentCreated() on the // activity manager to announce its creation. @@ -14925,7 +14937,7 @@ public final class ActivityManagerService extends ActivityManagerNative // mBackupAppName describe the app, so that when it binds back to the AM we // know that it's scheduled for a backup-agent operation. } - + return true; } @@ -15228,7 +15240,7 @@ public final class ActivityManagerService extends ActivityManagerNative mReceiverResolver.removeFilter(rl.get(i)); } } - + private final void sendPackageBroadcastLocked(int cmd, String[] packages, int userId) { for (int i = mLruProcesses.size() - 1 ; i >= 0 ; i--) { ProcessRecord r = mLruProcesses.get(i); @@ -15634,10 +15646,10 @@ public final class ActivityManagerService extends ActivityManagerNative final boolean replacePending = (intent.getFlags()&Intent.FLAG_RECEIVER_REPLACE_PENDING) != 0; - + if (DEBUG_BROADCAST) Slog.v(TAG, "Enqueing broadcast: " + intent.getAction() + " replacePending=" + replacePending); - + int NR = registeredReceivers != null ? registeredReceivers.size() : 0; if (!ordered && NR > 0) { // If we are not serializing this broadcast, then send the @@ -15745,7 +15757,7 @@ public final class ActivityManagerService extends ActivityManagerNative int seq = r.intent.getIntExtra("seq", -1); Slog.i(TAG, "Enqueueing broadcast " + r.intent.getAction() + " seq=" + seq); } - boolean replaced = replacePending && queue.replaceOrderedBroadcastLocked(r); + boolean replaced = replacePending && queue.replaceOrderedBroadcastLocked(r); if (!replaced) { queue.enqueueOrderedBroadcastLocked(r); queue.scheduleBroadcastsLocked(); @@ -15911,7 +15923,7 @@ public final class ActivityManagerService extends ActivityManagerNative Binder.restoreCallingIdentity(origId); } } - + // ========================================================= // INSTRUMENTATION // ========================================================= @@ -15981,17 +15993,17 @@ public final class ActivityManagerService extends ActivityManagerNative return true; } - + /** - * Report errors that occur while attempting to start Instrumentation. Always writes the + * Report errors that occur while attempting to start Instrumentation. Always writes the * error to the logs, but if somebody is watching, send the report there too. This enables * the "am" command to report errors with more information. - * + * * @param watcher The IInstrumentationWatcher. Null if there isn't one. * @param cn The component name of the instrumentation. * @param report The error report. */ - private void reportStartInstrumentationFailure(IInstrumentationWatcher watcher, + private void reportStartInstrumentationFailure(IInstrumentationWatcher watcher, ComponentName cn, String report) { Slog.w(TAG, report); try { @@ -16061,7 +16073,7 @@ public final class ActivityManagerService extends ActivityManagerNative // ========================================================= // CONFIGURATION // ========================================================= - + public ConfigurationInfo getDeviceConfigurationInfo() { ConfigurationInfo config = new ConfigurationInfo(); synchronized (this) { @@ -16151,11 +16163,11 @@ public final class ActivityManagerService extends ActivityManagerNative if (DEBUG_SWITCH || DEBUG_CONFIGURATION) { Slog.i(TAG, "Updating configuration to: " + values); } - + EventLog.writeEvent(EventLogTags.CONFIGURATION_CHANGED, changes); if (values.locale != null && !initLocale) { - saveLocaleLocked(values.locale, + saveLocaleLocked(values.locale, !values.locale.equals(mConfiguration.locale), values.userSetLocale); } @@ -16171,7 +16183,7 @@ public final class ActivityManagerService extends ActivityManagerNative //mUsageStatsService.noteStartConfig(newConfig); final Configuration configCopy = new Configuration(mConfiguration); - + // TODO: If our config changes, should we auto dismiss any currently // showing dialogs? mShowDialogs = shouldShowDialogs(newConfig); @@ -16270,7 +16282,7 @@ public final class ActivityManagerService extends ActivityManagerNative if(isDiff) { SystemProperties.set("user.language", l.getLanguage()); SystemProperties.set("user.region", l.getCountry()); - } + } if(isPersist) { SystemProperties.set("persist.sys.language", l.getLanguage()); @@ -16958,7 +16970,7 @@ public final class ActivityManagerService extends ActivityManagerNative } app.curRawAdj = adj; - + //Slog.i(TAG, "OOM ADJ " + app + ": pid=" + app.pid + // " adj=" + adj + " curAdj=" + app.curAdj + " maxAdj=" + app.maxAdj); if (adj > app.maxAdj) { @@ -17041,7 +17053,7 @@ public final class ActivityManagerService extends ActivityManagerNative // whatever. } } - + /** * Returns true if things are idle enough to perform GCs. */ @@ -17055,7 +17067,7 @@ public final class ActivityManagerService extends ActivityManagerNative return !processingBroadcasts && (isSleeping() || mStackSupervisor.allResumedActivitiesIdle()); } - + /** * Perform GCs on all processes that are waiting for it, but only * if things are idle. @@ -17084,11 +17096,11 @@ public final class ActivityManagerService extends ActivityManagerNative } } } - + scheduleAppGcsLocked(); } } - + /** * If all looks good, perform GCs on all processes waiting for them. */ @@ -17106,12 +17118,12 @@ public final class ActivityManagerService extends ActivityManagerNative */ final void scheduleAppGcsLocked() { mHandler.removeMessages(GC_BACKGROUND_PROCESSES_MSG); - + if (mProcessesToGc.size() > 0) { // Schedule a GC for the time to the next process. ProcessRecord proc = mProcessesToGc.get(0); Message msg = mHandler.obtainMessage(GC_BACKGROUND_PROCESSES_MSG); - + long when = proc.lastRequestedGc + GC_MIN_INTERVAL; long now = SystemClock.uptimeMillis(); if (when < (now+GC_TIMEOUT)) { @@ -17120,7 +17132,7 @@ public final class ActivityManagerService extends ActivityManagerNative mHandler.sendMessageAtTime(msg, when); } } - + /** * Add a process to the array of processes waiting to be GCed. Keeps the * list in sorted order by the last GC time. The process can't already be @@ -17140,7 +17152,7 @@ public final class ActivityManagerService extends ActivityManagerNative mProcessesToGc.add(0, proc); } } - + /** * Set up to ask a process to GC itself. This will either do it * immediately, or put it on the list of processes to gc the next diff --git a/services/core/java/com/android/server/am/ActivityStack.java b/services/core/java/com/android/server/am/ActivityStack.java index 0646cce92c71..e1b827843d6d 100755 --- a/services/core/java/com/android/server/am/ActivityStack.java +++ b/services/core/java/com/android/server/am/ActivityStack.java @@ -1105,6 +1105,11 @@ final class ActivityStack { invalidateLastScreenshot(); } next.returningOptions = null; + + if (mActivityContainer.mActivityDisplay.mVisibleBehindActivity == next) { + // When resuming an activity, require it to call requestVisibleBehind() again. + mActivityContainer.mActivityDisplay.setVisibleBehindActivity(null); + } } private void setVisibile(ActivityRecord r, boolean visible) { @@ -1482,6 +1487,11 @@ final class ActivityStack { final boolean resumeTopActivityInnerLocked(ActivityRecord prev, Bundle options) { if (ActivityManagerService.DEBUG_LOCKSCREEN) mService.logLockScreen(""); + if (!mService.mBooting && !mService.mBooted) { + // Not ready yet! + return false; + } + ActivityRecord parent = mActivityContainer.mParentActivity; if ((parent != null && parent.state != ActivityState.RESUMED) || !mActivityContainer.isAttachedLocked()) { @@ -3291,6 +3301,11 @@ final class ActivityStack { if (hasVisibleBehindActivity() && !mHandler.hasMessages(RELEASE_BACKGROUND_RESOURCES_TIMEOUT_MSG)) { final ActivityRecord r = getVisibleBehindActivity(); + if (r == topRunningActivityLocked(null)) { + // Don't release the top activity if it has requested to run behind the next + // activity. + return; + } if (DEBUG_STATES) Slog.d(TAG, "releaseBackgroundResources activtyDisplay=" + mActivityContainer.mActivityDisplay + " visibleBehind=" + r + " app=" + r.app + " thread=" + r.app.thread); @@ -3606,6 +3621,10 @@ final class ActivityStack { final TaskRecord task = mResumedActivity != null ? mResumedActivity.task : null; if (task == tr && tr.isOverHomeStack() || numTasks <= 1 && isOnHomeDisplay()) { + if (!mService.mBooting && !mService.mBooted) { + // Not ready yet! + return false; + } final int taskToReturnTo = tr.getTaskToReturnTo(); tr.setTaskToReturnTo(APPLICATION_ACTIVITY_TYPE); return mStackSupervisor.resumeHomeStackTask(taskToReturnTo, null); diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index 83a8d45c5192..bbfb62abff05 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -421,6 +421,11 @@ public final class ActivityStackSupervisor implements DisplayListener { } boolean resumeHomeStackTask(int homeStackTaskType, ActivityRecord prev) { + if (!mService.mBooting && !mService.mBooted) { + // Not ready yet! + return false; + } + if (homeStackTaskType == RECENTS_ACTIVITY_TYPE) { mWindowManager.showRecentApps(); return false; @@ -2238,9 +2243,13 @@ public final class ActivityStackSupervisor implements DisplayListener { r.idle = true; //Slog.i(TAG, "IDLE: mBooted=" + mBooted + ", fromTimeout=" + fromTimeout); - if (!mService.mBooted && isFrontStack(r.task.stack)) { - mService.mBooted = true; - enableScreen = true; + if (isFrontStack(r.task.stack) || fromTimeout) { + booting = mService.mBooting; + mService.mBooting = false; + if (!mService.mBooted) { + mService.mBooted = true; + enableScreen = true; + } } } @@ -2268,9 +2277,6 @@ public final class ActivityStackSupervisor implements DisplayListener { mFinishingActivities.clear(); } - booting = mService.mBooting; - mService.mBooting = false; - if (mStartingUsers.size() > 0) { startingUsers = new ArrayList<UserStartedState>(mStartingUsers); mStartingUsers.clear(); @@ -2295,9 +2301,7 @@ public final class ActivityStackSupervisor implements DisplayListener { activityRemoved |= r.task.stack.destroyActivityLocked(r, true, "finish-idle"); } - if (booting) { - mService.finishBooting(); - } else { + if (!booting) { // Complete user switch if (startingUsers != null) { for (int i = 0; i < startingUsers.size(); i++) { @@ -2318,8 +2322,8 @@ public final class ActivityStackSupervisor implements DisplayListener { //dump(); //mWindowManager.dump(); - if (enableScreen) { - mService.postEnableScreenAfterBootLocked(); + if (booting || enableScreen) { + mService.postFinishBooting(booting, enableScreen); } if (activityRemoved) { @@ -2584,7 +2588,6 @@ public final class ActivityStackSupervisor implements DisplayListener { r.mLaunchTaskBehind); } } - resumeHomeStackTask(HOME_ACTIVITY_TYPE, null); } void moveTaskToStack(int taskId, int stackId, boolean toTop) { diff --git a/services/core/java/com/android/server/display/DisplayPowerController.java b/services/core/java/com/android/server/display/DisplayPowerController.java index e2a548ace4ac..e3a25c066d9f 100644 --- a/services/core/java/com/android/server/display/DisplayPowerController.java +++ b/services/core/java/com/android/server/display/DisplayPowerController.java @@ -227,6 +227,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call // turning off the screen. private boolean mPendingScreenOff; + // True if we have unfinished business and are holding a suspend blocker. + private boolean mUnfinishedBusiness; + // The elapsed real time when the screen on was blocked. private long mScreenOnBlockStartRealTime; @@ -633,22 +636,42 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call mAppliedLowPower = true; } - // Animate the screen brightness when the screen is on. - if (state != Display.STATE_OFF) { - animateScreenBrightness(brightness, slowChange - ? BRIGHTNESS_RAMP_RATE_SLOW : BRIGHTNESS_RAMP_RATE_FAST); - } - // Animate the screen state change unless already animating. animateScreenStateChange(state, performScreenOffTransition); - // Report whether the display is ready for use and all changes have been applied. - if (mustNotify - && mPendingScreenOnUnblocker == null + // Animate the screen brightness when the screen is on or dozing. + // Skip the animation when the screen is off or suspended. + final int actualState = mPowerState.getScreenState(); + if (actualState == Display.STATE_ON || actualState == Display.STATE_DOZE) { + animateScreenBrightness(brightness, + slowChange ? BRIGHTNESS_RAMP_RATE_SLOW : BRIGHTNESS_RAMP_RATE_FAST); + } else { + animateScreenBrightness(brightness, 0); + } + + // Determine whether the display is ready for use in the newly requested state. + // Note that we do not wait for the brightness ramp animation to complete before + // reporting the display is ready because we only need to ensure the screen is in the + // right power state even as it continues to converge on the desired brightness. + final boolean ready = mPendingScreenOnUnblocker == null && !mColorFadeOnAnimator.isStarted() && !mColorFadeOffAnimator.isStarted() - && !mScreenBrightnessRampAnimator.isAnimating() - && mPowerState.waitUntilClean(mCleanListener)) { + && mPowerState.waitUntilClean(mCleanListener); + final boolean finished = ready + && !mScreenBrightnessRampAnimator.isAnimating(); + + // Grab a wake lock if we have unfinished business. + if (!finished && !mUnfinishedBusiness) { + if (DEBUG) { + Slog.d(TAG, "Unfinished business..."); + } + mCallbacks.acquireSuspendBlocker(); + mUnfinishedBusiness = true; + } + + // Notify the power manager when ready. + if (ready && mustNotify) { + // Send state change. synchronized (mLock) { if (!mPendingRequestChangedLocked) { mDisplayReadyLocked = true; @@ -660,6 +683,15 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call } sendOnStateChangedWithWakelock(); } + + // Release the wake lock when we have no unfinished business. + if (finished && mUnfinishedBusiness) { + if (DEBUG) { + Slog.d(TAG, "Finished business..."); + } + mUnfinishedBusiness = false; + mCallbacks.releaseSuspendBlocker(); + } } @Override @@ -723,6 +755,9 @@ final class DisplayPowerController implements AutomaticBrightnessController.Call } private void animateScreenBrightness(int target, int rate) { + if (DEBUG) { + Slog.d(TAG, "Animating brightness: target=" + target +", rate=" + rate); + } if (mScreenBrightnessRampAnimator.animateTo(target, rate)) { try { mBatteryStats.noteScreenBrightness(target); diff --git a/services/core/java/com/android/server/display/DisplayPowerState.java b/services/core/java/com/android/server/display/DisplayPowerState.java index a7651e42107e..fc068afd59a1 100644 --- a/services/core/java/com/android/server/display/DisplayPowerState.java +++ b/services/core/java/com/android/server/display/DisplayPowerState.java @@ -80,6 +80,7 @@ final class DisplayPowerState { mBacklight = backlight; mColorFade = electronBeam; mPhotonicModulator = new PhotonicModulator(); + mPhotonicModulator.start(); // At boot time, we know that the screen is on and the electron beam // animation is not playing. We don't know the screen's brightness though, @@ -336,7 +337,7 @@ final class DisplayPowerState { /** * Updates the state of the screen and backlight asynchronously on a separate thread. */ - private final class PhotonicModulator { + private final class PhotonicModulator extends Thread { private static final int INITIAL_SCREEN_STATE = Display.STATE_OFF; // unknown, assume off private static final int INITIAL_BACKLIGHT = -1; // unknown @@ -361,7 +362,7 @@ final class DisplayPowerState { if (!mChangeInProgress) { mChangeInProgress = true; - AsyncTask.THREAD_POOL_EXECUTOR.execute(mTask); + mLock.notifyAll(); } } return !mChangeInProgress; @@ -369,75 +370,78 @@ final class DisplayPowerState { } public void dump(PrintWriter pw) { - pw.println(); - pw.println("Photonic Modulator State:"); - pw.println(" mPendingState=" + Display.stateToString(mPendingState)); - pw.println(" mPendingBacklight=" + mPendingBacklight); - pw.println(" mActualState=" + Display.stateToString(mActualState)); - pw.println(" mActualBacklight=" + mActualBacklight); - pw.println(" mChangeInProgress=" + mChangeInProgress); + synchronized (mLock) { + pw.println(); + pw.println("Photonic Modulator State:"); + pw.println(" mPendingState=" + Display.stateToString(mPendingState)); + pw.println(" mPendingBacklight=" + mPendingBacklight); + pw.println(" mActualState=" + Display.stateToString(mActualState)); + pw.println(" mActualBacklight=" + mActualBacklight); + pw.println(" mChangeInProgress=" + mChangeInProgress); + } } - private final Runnable mTask = new Runnable() { - @Override - public void run() { - // Apply pending changes until done. - for (;;) { - final int state; - final boolean stateChanged; - final int backlight; - final boolean backlightChanged; - synchronized (mLock) { - state = mPendingState; - stateChanged = (state != mActualState); - backlight = mPendingBacklight; - backlightChanged = (backlight != mActualBacklight); - if (!stateChanged && !backlightChanged) { - mChangeInProgress = false; - break; - } - mActualState = state; - mActualBacklight = backlight; - } - - if (DEBUG) { - Slog.d(TAG, "Updating screen state: state=" - + Display.stateToString(state) + ", backlight=" + backlight); - } - boolean suspending = Display.isSuspendedState(state); - if (stateChanged && !suspending) { - requestDisplayState(state); - } - if (backlightChanged) { - setBrightness(backlight); - } - if (stateChanged && suspending) { - requestDisplayState(state); + @Override + public void run() { + for (;;) { + // Get pending change. + final int state; + final boolean stateChanged; + final int backlight; + final boolean backlightChanged; + synchronized (mLock) { + state = mPendingState; + stateChanged = (state != mActualState); + backlight = mPendingBacklight; + backlightChanged = (backlight != mActualBacklight); + if (!stateChanged && !backlightChanged) { + // All changed applied, notify outer class and wait for more. + mChangeInProgress = false; + postScreenUpdateThreadSafe(); + try { + mLock.wait(); + } catch (InterruptedException ex) { } + continue; } + mActualState = state; + mActualBacklight = backlight; } - // Let the outer class know that all changes have been applied. - postScreenUpdateThreadSafe(); + // Apply pending change. + if (DEBUG) { + Slog.d(TAG, "Updating screen state: state=" + + Display.stateToString(state) + ", backlight=" + backlight); + } + boolean suspending = Display.isSuspendedState(state); + if (stateChanged && !suspending) { + requestDisplayState(state); + } + if (backlightChanged) { + setBrightness(backlight); + } + if (stateChanged && suspending) { + requestDisplayState(state); + } } + } - private void requestDisplayState(int state) { - Trace.traceBegin(Trace.TRACE_TAG_POWER, "requestDisplayState(" - + Display.stateToString(state) + ")"); - try { - mBlanker.requestDisplayState(state); - } finally { - Trace.traceEnd(Trace.TRACE_TAG_POWER); - } + private void requestDisplayState(int state) { + Trace.traceBegin(Trace.TRACE_TAG_POWER, "requestDisplayState(" + + Display.stateToString(state) + ")"); + try { + mBlanker.requestDisplayState(state); + } finally { + Trace.traceEnd(Trace.TRACE_TAG_POWER); } + } - private void setBrightness(int backlight) { - Trace.traceBegin(Trace.TRACE_TAG_POWER, "setBrightness(" + backlight + ")"); - try { - mBacklight.setBrightness(backlight); - } finally { - Trace.traceEnd(Trace.TRACE_TAG_POWER); - } + private void setBrightness(int backlight) { + Trace.traceBegin(Trace.TRACE_TAG_POWER, "setBrightness(" + backlight + ")"); + try { + mBacklight.setBrightness(backlight); + } finally { + Trace.traceEnd(Trace.TRACE_TAG_POWER); } - }; + } } } diff --git a/services/core/java/com/android/server/display/RampAnimator.java b/services/core/java/com/android/server/display/RampAnimator.java index ad1e85717ab1..d71269f9eaeb 100644 --- a/services/core/java/com/android/server/display/RampAnimator.java +++ b/services/core/java/com/android/server/display/RampAnimator.java @@ -50,20 +50,32 @@ final class RampAnimator<T> { /** * Starts animating towards the specified value. * - * If this is the first time the property is being set, the value jumps - * directly to the target. + * If this is the first time the property is being set or if the rate is 0, + * the value jumps directly to the target. * * @param target The target value. - * @param rate The convergence rate, in units per second. + * @param rate The convergence rate in units per second, or 0 to set the value immediately. * @return True if the target differs from the previous target. */ public boolean animateTo(int target, int rate) { // Immediately jump to the target the first time. - if (mFirstTime) { - mFirstTime = false; - mProperty.setValue(mObject, target); - mCurrentValue = target; - return true; + if (mFirstTime || rate <= 0) { + if (mFirstTime || target != mCurrentValue) { + mFirstTime = false; + mRate = 0; + mTargetValue = target; + mCurrentValue = target; + mProperty.setValue(mObject, target); + if (mAnimating) { + mAnimating = false; + cancelAnimationCallback(); + } + if (mListener != null) { + mListener.onAnimationEnd(); + } + return true; + } + return false; } // Adjust the rate based on the closest target. @@ -88,7 +100,7 @@ final class RampAnimator<T> { mAnimating = true; mAnimatedValue = mCurrentValue; mLastFrameTimeNanos = System.nanoTime(); - postCallback(); + postAnimationCallback(); } return changed; @@ -108,11 +120,15 @@ final class RampAnimator<T> { mListener = listener; } - private void postCallback() { - mChoreographer.postCallback(Choreographer.CALLBACK_ANIMATION, mCallback, null); + private void postAnimationCallback() { + mChoreographer.postCallback(Choreographer.CALLBACK_ANIMATION, mAnimationCallback, null); + } + + private void cancelAnimationCallback() { + mChoreographer.removeCallbacks(Choreographer.CALLBACK_ANIMATION, mAnimationCallback, null); } - private final Runnable mCallback = new Runnable() { + private final Runnable mAnimationCallback = new Runnable() { @Override // Choreographer callback public void run() { final long frameTimeNanos = mChoreographer.getFrameTimeNanos(); @@ -144,7 +160,7 @@ final class RampAnimator<T> { } if (mTargetValue != mCurrentValue) { - postCallback(); + postAnimationCallback(); } else { mAnimating = false; if (mListener != null) { diff --git a/services/core/java/com/android/server/notification/ZenModeHelper.java b/services/core/java/com/android/server/notification/ZenModeHelper.java index 557a44e0cb7b..e6007bf704f8 100644 --- a/services/core/java/com/android/server/notification/ZenModeHelper.java +++ b/services/core/java/com/android/server/notification/ZenModeHelper.java @@ -150,48 +150,50 @@ public class ZenModeHelper { } public boolean shouldIntercept(NotificationRecord record) { - if (mZenMode != Global.ZEN_MODE_OFF) { - if (isSystem(record)) { - return false; - } - if (isAlarm(record)) { - if (mZenMode == Global.ZEN_MODE_NO_INTERRUPTIONS) { - ZenLog.traceIntercepted(record, "alarm"); - return true; + if (isSystem(record)) { + return false; + } + switch (mZenMode) { + case Global.ZEN_MODE_NO_INTERRUPTIONS: + // #notevenalarms + ZenLog.traceIntercepted(record, "none"); + return true; + case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS: + if (isAlarm(record)) { + // Alarms are always priority + return false; } - return false; - } - // allow user-prioritized packages through in priority mode - if (mZenMode == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS) { + // allow user-prioritized packages through in priority mode if (record.getPackagePriority() == Notification.PRIORITY_MAX) { ZenLog.traceNotIntercepted(record, "priorityApp"); return false; } - } - if (isCall(record)) { - if (!mConfig.allowCalls) { - ZenLog.traceIntercepted(record, "!allowCalls"); - return true; + if (isCall(record)) { + if (!mConfig.allowCalls) { + ZenLog.traceIntercepted(record, "!allowCalls"); + return true; + } + return shouldInterceptAudience(record); } - return shouldInterceptAudience(record); - } - if (isMessage(record)) { - if (!mConfig.allowMessages) { - ZenLog.traceIntercepted(record, "!allowMessages"); - return true; + if (isMessage(record)) { + if (!mConfig.allowMessages) { + ZenLog.traceIntercepted(record, "!allowMessages"); + return true; + } + return shouldInterceptAudience(record); } - return shouldInterceptAudience(record); - } - if (isEvent(record)) { - if (!mConfig.allowEvents) { - ZenLog.traceIntercepted(record, "!allowEvents"); - return true; + if (isEvent(record)) { + if (!mConfig.allowEvents) { + ZenLog.traceIntercepted(record, "!allowEvents"); + return true; + } + return false; } - } - ZenLog.traceIntercepted(record, "!allowed"); - return true; + ZenLog.traceIntercepted(record, "!priority"); + return true; + default: + return false; } - return false; } private boolean shouldInterceptAudience(NotificationRecord record) { diff --git a/services/core/java/com/android/server/pm/LauncherAppsService.java b/services/core/java/com/android/server/pm/LauncherAppsService.java index dcc4f8d18c36..d787919b01ab 100644 --- a/services/core/java/com/android/server/pm/LauncherAppsService.java +++ b/services/core/java/com/android/server/pm/LauncherAppsService.java @@ -254,7 +254,7 @@ public class LauncherAppsService extends SystemService { try { IPackageManager pm = AppGlobals.getPackageManager(); ActivityInfo info = pm.getActivityInfo(component, 0, user.getIdentifier()); - return info != null && info.isEnabled(); + return info != null; } finally { Binder.restoreCallingIdentity(ident); } diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index 271843904191..851cf17787e9 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -4729,6 +4729,18 @@ public class PackageManagerService extends IPackageManager.Stub { return dexCodeInstructionSets.toArray(new String[dexCodeInstructionSets.size()]); } + /** + * Returns deduplicated list of supported instructions for dex code. + */ + public static String[] getAllDexCodeInstructionSets() { + String[] supportedInstructionSets = new String[Build.SUPPORTED_ABIS.length]; + for (int i = 0; i < supportedInstructionSets.length; i++) { + String abi = Build.SUPPORTED_ABIS[i]; + supportedInstructionSets[i] = VMRuntime.getInstructionSet(abi); + } + return getDexCodeInstructionSets(supportedInstructionSets); + } + @Override public void forceDexOpt(String packageName) { enforceSystemOrRoot("forceDexOpt"); diff --git a/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java b/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java index 468a34443bb6..111c09b1570c 100644 --- a/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java +++ b/services/core/java/com/android/server/storage/DeviceStorageMonitorService.java @@ -18,6 +18,7 @@ package com.android.server.storage; import com.android.server.EventLogTags; import com.android.server.SystemService; +import com.android.server.pm.PackageManagerService; import android.app.Notification; import android.app.NotificationManager; @@ -51,6 +52,8 @@ import java.io.File; import java.io.FileDescriptor; import java.io.PrintWriter; +import dalvik.system.VMRuntime; + /** * This class implements a service to monitor the amount of disk * storage space on the device. If the free storage on device is less @@ -89,6 +92,7 @@ public class DeviceStorageMonitorService extends SystemService { private long mLastReportedFreeMemTime; boolean mLowMemFlag=false; private boolean mMemFullFlag=false; + private final boolean mIsBootImageOnDisk; private final ContentResolver mResolver; private final long mTotalMemory; // on /data private final StatFs mDataFileStats; @@ -285,6 +289,10 @@ public class DeviceStorageMonitorService extends SystemService { mLowMemFlag = false; } } + if (!mLowMemFlag && !mIsBootImageOnDisk) { + Slog.i(TAG, "No boot image on disk due to lack of space. Sending notification"); + sendNotification(); + } if (mFreeMem < mMemFullThreshold) { if (!mMemFullFlag) { sendFullNotification(); @@ -314,6 +322,7 @@ public class DeviceStorageMonitorService extends SystemService { super(context); mLastReportedFreeMemTime = 0; mResolver = context.getContentResolver(); + mIsBootImageOnDisk = isBootImageOnDisk(); //create StatFs object mDataFileStats = new StatFs(DATA_PATH.getAbsolutePath()); mSystemFileStats = new StatFs(SYSTEM_PATH.getAbsolutePath()); @@ -331,6 +340,15 @@ public class DeviceStorageMonitorService extends SystemService { mStorageNotFullIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY_BEFORE_BOOT); } + private static boolean isBootImageOnDisk() { + for (String instructionSet : PackageManagerService.getAllDexCodeInstructionSets()) { + if (!VMRuntime.isBootClassPathOnDisk(instructionSet)) { + return false; + } + } + return true; + } + /** * Initializes the disk space threshold value and posts an empty message to * kickstart the process. @@ -364,7 +382,7 @@ public class DeviceStorageMonitorService extends SystemService { @Override public boolean isMemoryLow() { - return mLowMemFlag; + return mLowMemFlag || !mIsBootImageOnDisk; } @Override @@ -409,6 +427,7 @@ public class DeviceStorageMonitorService extends SystemService { pw.print(" mLowMemFlag="); pw.print(mLowMemFlag); pw.print(" mMemFullFlag="); pw.println(mMemFullFlag); + pw.print(" mIsBootImageOnDisk="); pw.print(mIsBootImageOnDisk); pw.print(" mClearSucceeded="); pw.print(mClearSucceeded); pw.print(" mClearingCache="); pw.println(mClearingCache); @@ -445,19 +464,25 @@ public class DeviceStorageMonitorService extends SystemService { Context.NOTIFICATION_SERVICE); CharSequence title = context.getText( com.android.internal.R.string.low_internal_storage_view_title); - CharSequence details = context.getText( - com.android.internal.R.string.low_internal_storage_view_text); + CharSequence details = context.getText(mIsBootImageOnDisk + ? com.android.internal.R.string.low_internal_storage_view_text + : com.android.internal.R.string.low_internal_storage_view_text_no_boot); PendingIntent intent = PendingIntent.getActivityAsUser(context, 0, lowMemIntent, 0, null, UserHandle.CURRENT); - Notification notification = new Notification(); - notification.icon = com.android.internal.R.drawable.stat_notify_disk_full; - notification.tickerText = title; + Notification notification = new Notification.Builder(context) + .setSmallIcon(com.android.internal.R.drawable.stat_notify_disk_full) + .setTicker(title) + .setColor(context.getResources().getColor( + com.android.internal.R.color.system_notification_accent_color)) + .setContentTitle(title) + .setContentText(details) + .setContentIntent(intent) + .setStyle(new Notification.BigTextStyle() + .bigText(details)) + .setVisibility(Notification.VISIBILITY_PUBLIC) + .setCategory(Notification.CATEGORY_SYSTEM) + .build(); notification.flags |= Notification.FLAG_NO_CLEAR; - notification.color = context.getResources().getColor( - com.android.internal.R.color.system_notification_accent_color); - notification.setLatestEventInfo(context, title, details, intent); - notification.visibility = Notification.VISIBILITY_PUBLIC; - notification.category = Notification.CATEGORY_SYSTEM; mNotificationMgr.notifyAsUser(null, LOW_MEMORY_NOTIFICATION_ID, notification, UserHandle.ALL); context.sendStickyBroadcastAsUser(mStorageLowIntent, UserHandle.ALL); diff --git a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java index 972c929edf65..cfa44363551e 100644 --- a/services/usage/java/com/android/server/usage/UsageStatsDatabase.java +++ b/services/usage/java/com/android/server/usage/UsageStatsDatabase.java @@ -382,6 +382,10 @@ class UsageStatsDatabase { File[] files = dir.listFiles(); if (files != null) { for (File f : files) { + String path = f.getPath(); + if (path.endsWith(".bak")) { + f = new File(path.substring(0, path.length() - 4)); + } long beginTime = Long.parseLong(f.getName()); if (beginTime < expiryTime) { new AtomicFile(f).delete(); diff --git a/telecomm/java/android/telecom/Conference.java b/telecomm/java/android/telecom/Conference.java index e47d9d160cb1..b7b98bf329f0 100644 --- a/telecomm/java/android/telecom/Conference.java +++ b/telecomm/java/android/telecom/Conference.java @@ -18,6 +18,7 @@ package android.telecom; import android.annotation.SystemApi; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; @@ -37,6 +38,8 @@ public abstract class Conference { public void onDisconnected(Conference conference, DisconnectCause disconnectCause) {} public void onConnectionAdded(Conference conference, Connection connection) {} public void onConnectionRemoved(Conference conference, Connection connection) {} + public void onConferenceableConnectionsChanged( + Conference conference, List<Connection> conferenceableConnections) {} public void onDestroyed(Conference conference) {} public void onCapabilitiesChanged(Conference conference, int capabilities) {} } @@ -45,6 +48,9 @@ public abstract class Conference { private final List<Connection> mChildConnections = new CopyOnWriteArrayList<>(); private final List<Connection> mUnmodifiableChildConnections = Collections.unmodifiableList(mChildConnections); + private final List<Connection> mConferenceableConnections = new ArrayList<>(); + private final List<Connection> mUnmodifiableConferenceableConnections = + Collections.unmodifiableList(mConferenceableConnections); private PhoneAccountHandle mPhoneAccount; private AudioState mAudioState; @@ -53,6 +59,15 @@ public abstract class Conference { private int mCapabilities; private String mDisconnectMessage; + private final Connection.Listener mConnectionDeathListener = new Connection.Listener() { + @Override + public void onDestroyed(Connection c) { + if (mConferenceableConnections.remove(c)) { + fireOnConferenceableConnectionsChanged(); + } + } + }; + /** * Constructs a new Conference with a mandatory {@link PhoneAccountHandle} * @@ -120,6 +135,13 @@ public abstract class Conference { public void onSeparate(Connection connection) {} /** + * Invoked when the specified {@link Connection} should merged with the conference call. + * + * @param connection The {@code Connection} to merge. + */ + public void onMerge(Connection connection) {} + + /** * Invoked when the conference should be put on hold. */ public void onHold() {} @@ -238,6 +260,37 @@ public abstract class Conference { } /** + * Sets the connections with which this connection can be conferenced. + * + * @param conferenceableConnections The set of connections this connection can conference with. + */ + public final void setConferenceableConnections(List<Connection> conferenceableConnections) { + clearConferenceableList(); + for (Connection c : conferenceableConnections) { + // If statement checks for duplicates in input. It makes it N^2 but we're dealing with a + // small amount of items here. + if (!mConferenceableConnections.contains(c)) { + c.addConnectionListener(mConnectionDeathListener); + mConferenceableConnections.add(c); + } + } + fireOnConferenceableConnectionsChanged(); + } + + private final void fireOnConferenceableConnectionsChanged() { + for (Listener l : mListeners) { + l.onConferenceableConnectionsChanged(this, getConferenceableConnections()); + } + } + + /** + * Returns the connections with which this connection can be conferenced. + */ + public final List<Connection> getConferenceableConnections() { + return mUnmodifiableConferenceableConnections; + } + + /** * Tears down the conference object and any of its current connections. */ public final void destroy() { @@ -313,4 +366,11 @@ public abstract class Conference { } } } + + private final void clearConferenceableList() { + for (Connection c : mConferenceableConnections) { + c.removeConnectionListener(mConnectionDeathListener); + } + mConferenceableConnections.clear(); + } } diff --git a/telecomm/java/android/telecom/Connection.java b/telecomm/java/android/telecom/Connection.java index 13acc598f1b9..b5f66926d8c0 100644 --- a/telecomm/java/android/telecom/Connection.java +++ b/telecomm/java/android/telecom/Connection.java @@ -870,7 +870,7 @@ public abstract class Connection { } /** - * Obtains the connections with which this connection can be conferenced. + * Returns the connections with which this connection can be conferenced. */ public final List<Connection> getConferenceableConnections() { return mUnmodifiableConferenceableConnections; @@ -1100,7 +1100,7 @@ public abstract class Connection { private final void fireOnConferenceableConnectionsChanged() { for (Listener l : mListeners) { - l.onConferenceableConnectionsChanged(this, mConferenceableConnections); + l.onConferenceableConnectionsChanged(this, getConferenceableConnections()); } } diff --git a/telecomm/java/android/telecom/ConnectionService.java b/telecomm/java/android/telecom/ConnectionService.java index ed9251b7afda..efd311e8ca3c 100644 --- a/telecomm/java/android/telecom/ConnectionService.java +++ b/telecomm/java/android/telecom/ConnectionService.java @@ -360,6 +360,14 @@ public abstract class ConnectionService extends Service { } @Override + public void onConferenceableConnectionsChanged( + Conference conference, List<Connection> conferenceableConnections) { + mAdapter.setConferenceableConnections( + mIdByConference.get(conference), + createConnectionIdList(conferenceableConnections)); + } + + @Override public void onDestroyed(Conference conference) { removeConference(conference); } @@ -638,19 +646,25 @@ public abstract class ConnectionService extends Service { private void conference(String callId1, String callId2) { Log.d(this, "conference %s, %s", callId1, callId2); - Connection connection1 = findConnectionForAction(callId1, "conference"); - if (connection1 == getNullConnection()) { - Log.w(this, "Connection1 missing in conference request %s.", callId1); - return; - } - Connection connection2 = findConnectionForAction(callId2, "conference"); if (connection2 == getNullConnection()) { Log.w(this, "Connection2 missing in conference request %s.", callId2); return; } - onConference(connection1, connection2); + Connection connection1 = findConnectionForAction(callId1, "conference"); + if (connection1 == getNullConnection()) { + Conference conference1 = findConferenceForAction(callId1, "addConnection"); + if (conference1 == getNullConference()) { + Log.w(this, + "Connection1 or Conference1 missing in conference request %s.", + callId1); + } else { + conference1.onMerge(connection2); + } + } else { + onConference(connection1, connection2); + } } private void splitFromConference(String callId) { diff --git a/telecomm/java/android/telecom/RemoteConference.java b/telecomm/java/android/telecom/RemoteConference.java index b18cb968f182..b548274de2fc 100644 --- a/telecomm/java/android/telecom/RemoteConference.java +++ b/telecomm/java/android/telecom/RemoteConference.java @@ -21,6 +21,7 @@ import com.android.internal.telecom.IConnectionService; import android.annotation.SystemApi; import android.os.RemoteException; +import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Set; @@ -40,6 +41,9 @@ public final class RemoteConference { public void onConnectionAdded(RemoteConference conference, RemoteConnection connection) {} public void onConnectionRemoved(RemoteConference conference, RemoteConnection connection) {} public void onCapabilitiesChanged(RemoteConference conference, int capabilities) {} + public void onConferenceableConnectionsChanged( + RemoteConference conference, + List<RemoteConnection> conferenceableConnections) {} public void onDestroyed(RemoteConference conference) {} } @@ -50,6 +54,9 @@ public final class RemoteConference { private final List<RemoteConnection> mChildConnections = new CopyOnWriteArrayList<>(); private final List<RemoteConnection> mUnmodifiableChildConnections = Collections.unmodifiableList(mChildConnections); + private final List<RemoteConnection> mConferenceableConnections = new ArrayList<>(); + private final List<RemoteConnection> mUnmodifiableConferenceableConnections = + Collections.unmodifiableList(mConferenceableConnections); private int mState = Connection.STATE_NEW; private DisconnectCause mDisconnectCause; @@ -127,6 +134,15 @@ public final class RemoteConference { } } + /** @hide */ + void setConferenceableConnections(List<RemoteConnection> conferenceableConnections) { + mConferenceableConnections.clear(); + mConferenceableConnections.addAll(conferenceableConnections); + for (Callback c : mCallbacks) { + c.onConferenceableConnectionsChanged(this, mUnmodifiableConferenceableConnections); + } + } + /** {@hide} */ void setDisconnected(DisconnectCause disconnectCause) { if (mState != Connection.STATE_DISCONNECTED) { @@ -219,6 +235,10 @@ public final class RemoteConference { } } + public List<RemoteConnection> getConferenceableConnections() { + return mUnmodifiableConferenceableConnections; + } + public final void registerCallback(Callback callback) { mCallbacks.add(callback); } diff --git a/telecomm/java/android/telecom/RemoteConnectionService.java b/telecomm/java/android/telecom/RemoteConnectionService.java index d959e50dda5f..328dc8691c53 100644 --- a/telecomm/java/android/telecom/RemoteConnectionService.java +++ b/telecomm/java/android/telecom/RemoteConnectionService.java @@ -278,8 +278,13 @@ final class RemoteConnectionService { } } - findConnectionForAction(callId, "setConferenceableConnections") - .setConferenceableConnections(conferenceable); + if (hasConnection(callId)) { + findConnectionForAction(callId, "setConferenceableConnections") + .setConferenceableConnections(conferenceable); + } else { + findConferenceForAction(callId, "setConferenceableConnections") + .setConferenceableConnections(conferenceable); + } } }; @@ -358,6 +363,10 @@ final class RemoteConnectionService { } } + private boolean hasConnection(String callId) { + return mConferenceById.containsKey(callId); + } + private RemoteConnection findConnectionForAction( String callId, String action) { if (mConnectionById.containsKey(callId)) { diff --git a/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java b/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java index 5794b2bc0c4b..dd823aeaff00 100644 --- a/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java +++ b/tests/Compatibility/src/com/android/compatibilitytest/AppCompatibility.java @@ -155,16 +155,12 @@ public class AppCompatibility extends InstrumentationTestCase { homeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); Intent intent; if (isleanback) { - Log.d(TAG, "Leanback and relax!"); + Log.d(TAG, "Leanback and relax! " + packageName); intent = mPackageManager.getLeanbackLaunchIntentForPackage(packageName); } else { intent = mPackageManager.getLaunchIntentForPackage(packageName); } - // Skip if the apk does not have a launch intent. - if (intent == null) { - Log.d(TAG, "Skipping " + packageName + "; missing launch intent"); - return null; - } + assertNotNull("Skipping " + packageName + "; missing launch intent", intent); String processName = getProcessName(packageName); diff --git a/tests/SharedLibrary/lib/res/layout/main.xml b/tests/SharedLibrary/lib/res/layout/main.xml deleted file mode 100644 index df0204d90d4c..000000000000 --- a/tests/SharedLibrary/lib/res/layout/main.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/sample_layout"/> - - <com.google.android.test.shared_library.AddressView xmlns:address="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:background="#03a9f4" - address:name="Librarian L" - address:streetNumber="21" - address:streetName="Android Lane" - address:city="AndroidVille" - address:state="OS" - address:zip="12345" - address:country="Mobile"/> - -</LinearLayout> diff --git a/tests/SharedLibrary/lib/res/values/strings.xml b/tests/SharedLibrary/lib/res/values/strings.xml index 9beccd961d79..6827f936ceea 100644 --- a/tests/SharedLibrary/lib/res/values/strings.xml +++ b/tests/SharedLibrary/lib/res/values/strings.xml @@ -28,5 +28,4 @@ </string-array> <string name="racoon">Racoon</string> - <string name="sample_layout">This is an example of a layout this library provides.</string> </resources> diff --git a/tests/SharedLibrary/lib/src/com/google/android/test/shared_library/ActivityMain.java b/tests/SharedLibrary/lib/src/com/google/android/test/shared_library/ActivityMain.java index 4b4893ce0427..895acedb1e7f 100644 --- a/tests/SharedLibrary/lib/src/com/google/android/test/shared_library/ActivityMain.java +++ b/tests/SharedLibrary/lib/src/com/google/android/test/shared_library/ActivityMain.java @@ -18,11 +18,15 @@ package com.google.android.test.shared_library; import android.app.Activity; import android.os.Bundle; +import android.widget.TextView; public class ActivityMain extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView(R.layout.main); + + TextView content = new TextView(this); + content.setText("Dummy main entry for this apk; not really needed..."); + setContentView(content); } } diff --git a/tools/aapt/CacheUpdater.h b/tools/aapt/CacheUpdater.h index 0e65589529e5..efb245361894 100644 --- a/tools/aapt/CacheUpdater.h +++ b/tools/aapt/CacheUpdater.h @@ -12,6 +12,9 @@ #include <sys/stat.h> #include <stdio.h> #include "Images.h" +#ifdef HAVE_MS_C_RUNTIME +#include <direct.h> +#endif using namespace android; diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp index 9c1867e14a8f..45dd23b911e3 100644 --- a/tools/aidl/aidl.cpp +++ b/tools/aidl/aidl.cpp @@ -16,6 +16,7 @@ #ifdef HAVE_MS_C_RUNTIME #include <io.h> +#include <direct.h> #include <sys/stat.h> #endif |