diff options
62 files changed, 214 insertions, 51 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 539b84ebf549..0d8a7cdace04 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -132,6 +132,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/accessibilityservice/IAccessibilityServiceClientCallback.java) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/accessibilityservice/IAccessibilityServiceClientCallback.P) $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates/src/core/java/android/accessibilityservice/IAccessibilityServiceClient.P) +$(call add-clean-step, rm -f $(PRODUCT_OUT)/system/media/video/Disco*) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index cdc51d1bb40d..51fd3460d0a2 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -3926,10 +3926,9 @@ public final class ViewRootImpl implements ViewParent, } public void dumpGfxInfo(int[] info) { + info[0] = info[1] = 0; if (mView != null) { getGfxInfo(mView, info); - } else { - info[0] = info[1] = 0; } } diff --git a/core/java/android/view/WindowManagerImpl.java b/core/java/android/view/WindowManagerImpl.java index 5d33cecd7078..dd6b5371d479 100644 --- a/core/java/android/view/WindowManagerImpl.java +++ b/core/java/android/view/WindowManagerImpl.java @@ -530,13 +530,16 @@ public class WindowManagerImpl implements WindowManager { for (int i = 0; i < count; i++) { ViewRootImpl root = mRoots[i]; + String name = getWindowName(root); + pw.printf("\n\t%s", name); + HardwareRenderer renderer = root.getView().mAttachInfo.mHardwareRenderer; if (renderer != null) { renderer.dumpGfxInfo(pw); } } - pw.println("\nView hierarchy:"); + pw.println("\nView hierarchy:\n"); int viewsCount = 0; int displayListsSize = 0; @@ -546,15 +549,14 @@ public class WindowManagerImpl implements WindowManager { ViewRootImpl root = mRoots[i]; root.dumpGfxInfo(info); - String name = root.getClass().getName() + '@' + - Integer.toHexString(hashCode()); - pw.printf(" %s: %d views, %.2f kB (display lists)", + String name = getWindowName(root); + pw.printf(" %s\n %d views, %.2f kB of display lists", name, info[0], info[1] / 1024.0f); HardwareRenderer renderer = root.getView().mAttachInfo.mHardwareRenderer; if (renderer != null) { pw.printf(", %d frames rendered", renderer.getFrameCount()); } - pw.printf("\n"); + pw.printf("\n\n"); viewsCount += info[0]; displayListsSize += info[1]; @@ -570,6 +572,11 @@ public class WindowManagerImpl implements WindowManager { } } + private static String getWindowName(ViewRootImpl root) { + return root.mWindowAttributes.getTitle() + "/" + + root.getClass().getName() + '@' + Integer.toHexString(root.hashCode()); + } + public void setStoppedState(IBinder token, boolean stopped) { synchronized (this) { if (mViews == null) diff --git a/core/java/android/webkit/AccessibilityInjector.java b/core/java/android/webkit/AccessibilityInjector.java index 64fb8c0270cc..7dfb5bb102e2 100644 --- a/core/java/android/webkit/AccessibilityInjector.java +++ b/core/java/android/webkit/AccessibilityInjector.java @@ -43,11 +43,6 @@ import java.util.concurrent.atomic.AtomicInteger; * APIs. */ class AccessibilityInjector { - // Default result returned from AndroidVox. Using true here means if the - // script fails, an accessibility service will always think that traversal - // has succeeded. - private static final String DEFAULT_ANDROIDVOX_RESULT = "true"; - // The WebViewClassic this injector is responsible for managing. private final WebViewClassic mWebViewClassic; @@ -509,9 +504,7 @@ class AccessibilityInjector { final String jsonString = mAccessibilityJSONObject.toString(); final String jsCode = String.format(ACCESSIBILITY_ANDROIDVOX_TEMPLATE, jsonString); - final String result = mCallback.performAction(mWebView, jsCode, DEFAULT_ANDROIDVOX_RESULT); - - return ("true".equalsIgnoreCase(result)); + return mCallback.performAction(mWebView, jsCode); } /** @@ -522,13 +515,13 @@ class AccessibilityInjector { "javascript:(function() { %s.onResult(%d, %s); })();"; // Time in milliseconds to wait for a result before failing. - private static final long RESULT_TIMEOUT = 200; + private static final long RESULT_TIMEOUT = 5000; private final AtomicInteger mResultIdCounter = new AtomicInteger(); private final Object mResultLock = new Object(); private final String mInterfaceName; - private String mResult = null; + private boolean mResult = false; private long mResultId = -1; private CallbackHandler(String interfaceName) { @@ -540,29 +533,27 @@ class AccessibilityInjector { * * @param webView The WebView to perform the action on. * @param code JavaScript code that evaluates to a result. - * @param defaultResult The result to return if the action times out. * @return The result of the action, or false if it timed out. */ - private String performAction(WebView webView, String code, String defaultResult) { + private boolean performAction(WebView webView, String code) { final int resultId = mResultIdCounter.getAndIncrement(); final String url = String.format( JAVASCRIPT_ACTION_TEMPLATE, mInterfaceName, resultId, code); webView.loadUrl(url); - return getResultAndClear(resultId, defaultResult); + return getResultAndClear(resultId); } /** * Gets the result of a request to perform an accessibility action. * * @param resultId The result id to match the result with the request. - * @param defaultResult The default result to return on timeout. * @return The result of the request. */ - private String getResultAndClear(int resultId, String defaultResult) { + private boolean getResultAndClear(int resultId) { synchronized (mResultLock) { final boolean success = waitForResultTimedLocked(resultId); - final String result = success ? mResult : defaultResult; + final boolean result = success ? mResult : false; clearResultLocked(); return result; } @@ -573,7 +564,7 @@ class AccessibilityInjector { */ private void clearResultLocked() { mResultId = -1; - mResult = null; + mResult = false; } /** @@ -624,7 +615,7 @@ class AccessibilityInjector { synchronized (mResultLock) { if (resultId > mResultId) { - mResult = result; + mResult = Boolean.parseBoolean(result); mResultId = resultId; } mResultLock.notifyAll(); diff --git a/core/java/android/webkit/WebSettingsClassic.java b/core/java/android/webkit/WebSettingsClassic.java index 354bb5a254b6..1288613a3918 100644 --- a/core/java/android/webkit/WebSettingsClassic.java +++ b/core/java/android/webkit/WebSettingsClassic.java @@ -22,7 +22,8 @@ import android.content.pm.PackageManager; import android.os.Build; import android.os.Handler; import android.os.Message; -import android.util.DisplayMetrics; +import android.provider.Settings; +import android.provider.Settings.SettingNotFoundException; import android.util.EventLog; import java.util.Locale; @@ -122,6 +123,7 @@ public class WebSettingsClassic extends WebSettings { private boolean mLoadWithOverviewMode = false; private boolean mEnableSmoothTransition = false; private boolean mForceUserScalable = false; + private boolean mPasswordEchoEnabled = true; // AutoFill Profile data public static class AutoFillProfile { @@ -295,6 +297,13 @@ public class WebSettingsClassic extends WebSettings { mAllowUniversalAccessFromFileURLs = true; mAllowFileAccessFromFileURLs = true; } + try { + mPasswordEchoEnabled = + Settings.System.getInt(context.getContentResolver(), + Settings.System.TEXT_SHOW_PASSWORD) != 0; + } catch (SettingNotFoundException e) { + mPasswordEchoEnabled = true; + } } private static final String ACCEPT_LANG_FOR_US_LOCALE = "en-US"; diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index aaa67783d7f3..a19bc2b1c6d8 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dokluidsprekers"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-klank"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Stelsel"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 510222d33d0a..d2cb8bc77c9d 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"የትከል ድምፅ ማጉያዎች"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI ድምጽ"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"ስርዓት"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index 1e8b30984cd7..aea32a8e29ee 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"مكبرات صوت للإرساء"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"صوت HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"النظام"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml index 23631a8ce989..bfe0e27f275e 100644 --- a/core/res/res/values-be/strings.xml +++ b/core/res/res/values-be/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Дынамікі станцыi"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-аўдыёвыхад"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Сістэма"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 32911f981c69..a972258b2264 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Докинг станц.: Високогов."</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI аудио"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Система"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index bc8a9c140935..8f8fb1d6f8b6 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -361,15 +361,15 @@ <string name="permlab_writeProfile" msgid="907793628777397643">"modificació targeta contacte"</string> <string name="permdesc_writeProfile" product="default" msgid="5552084294598465899">"Permet que l\'aplicació pugui canviar o afegir informació del perfil personal emmagatzemada al dispositiu, com ara el teu nom i la teva informació de contacte. Això significa que l\'aplicació et pot identificar i enviar la informació del teu perfil a altres persones."</string> <string name="permlab_readSocialStream" product="default" msgid="1268920956152419170">"llegeix el teu tauler d\'activitat social"</string> - <string name="permdesc_readSocialStream" product="default" msgid="4255706027172050872">"Permet que l\'aplicació accedeixi i sincronitzi actualitzacions socials teves i dels teus amics. Vés amb compte en compartir informació: això permet que l\'aplicació llegeix comunicacions entre tu i els teus amics a les xarxes socials, independentment de la confidencialitat. Nota: És possible que aquest permís no s\'apliqui a totes les xarxes socials."</string> + <string name="permdesc_readSocialStream" product="default" msgid="4255706027172050872">"Permet que l\'aplicació accedeixi i sincronitzi actualitzacions socials teves i dels teus amics. Vés amb compte en compartir informació: això permet que l\'aplicació llegeixi comunicacions entre tu i els teus amics a les xarxes socials, independentment de la confidencialitat. Nota: És possible que aquest permís no s\'apliqui a totes les xarxes socials."</string> <string name="permlab_writeSocialStream" product="default" msgid="3504179222493235645">"escriu al tauler d\'activitat social"</string> <string name="permdesc_writeSocialStream" product="default" msgid="3086557552204114849">"Permet que l\'aplicació mostri actualitzacions socials dels teus amics. Vés amb compte en compartir informació: això permet que l\'aplicació produeixi missatges que pot semblar que provinguin d\'un amic. Nota: És possible que aquest permís no s\'apliqui a totes les xarxes socials."</string> <string name="permlab_readCalendar" msgid="5972727560257612398">"llegeix els esdeveniments del calendari més informació confidencial"</string> <string name="permdesc_readCalendar" product="tablet" msgid="4216462049057658723">"Permet que l\'aplicació llegeixi tots els esdeveniments del calendari emmagatzemats a la tauleta, inclosos els dels amics o dels companys de feina. Aquesta acció pot permetre que l\'aplicació comparteixi o desi les dades del teu calendari, sense tenir en compte la confidencialitat."</string> <string name="permdesc_readCalendar" product="default" msgid="7434548682470851583">"Permet que l\'aplicació llegeixi tots els esdeveniments del calendari emmagatzemats al telèfon, inclosos els dels amics o dels companys de feina. Aquesta acció pot permetre que l\'aplicació comparteixi o desi les dades del teu calendari, sense tenir en compte la confidencialitat."</string> <string name="permlab_writeCalendar" msgid="8438874755193825647">"afegeix o modifica els esdeveniments del calendari i envia correus electrònics als clients sense el coneixement dels propietaris"</string> - <string name="permdesc_writeCalendar" product="tablet" msgid="6679035520113668528">"Permet que l\'aplicació afegeixi, elimini o canviï esdeveniments que pots modificar a la tauleta, inclosos d\'amics o de companys de feina. Aquesta acció pot permetre que l\'aplicació enviï missatges que sembli que provinguin dels propietaris del calendari o que modifiqui esdeveniments sense el coneixement dels propietaris."</string> - <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"Permet que l\'aplicació afegeixi, elimini o canviï esdeveniments que pots modificar al telèfon, inclosos d\'amics o de companys de feina. Aquesta acció pot permetre que l\'aplicació enviï missatges que sembli que provinguin dels propietaris del calendari o que modifiqui esdeveniments sense el coneixement dels propietaris."</string> + <string name="permdesc_writeCalendar" product="tablet" msgid="6679035520113668528">"Permet que l\'aplicació afegeixi, elimini o canviï esdeveniments que pots modificar a la tauleta, inclosos els d\'amics o de companys de feina. Aquesta acció pot permetre que l\'aplicació enviï missatges que sembli que provinguin dels propietaris del calendari o que modifiqui esdeveniments sense el coneixement dels propietaris."</string> + <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"Permet que l\'aplicació afegeixi, elimini o canviï esdeveniments que pots modificar al telèfon, inclosos els d\'amics o de companys de feina. Aquesta acció pot permetre que l\'aplicació enviï missatges que sembli que provinguin dels propietaris del calendari o que modifiqui esdeveniments sense el coneixement dels propietaris."</string> <string name="permlab_accessMockLocation" msgid="8688334974036823330">"crear orígens d\'ubicacions fictícies per fer proves"</string> <string name="permdesc_accessMockLocation" msgid="5808711039482051824">"Crea fonts d\'ubicació fictícies per provar o per instal·lar un proveïdor d\'ubicació nou. Aquesta acció permet que l\'aplicació substitueixi la ubicació o l\'estat que retornen altres fonts d\'ubicació, com ara el GPS o altres proveïdors d\'ubicació."</string> <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"accedir a ordres del proveïdor d\'ubicació addicionals"</string> @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Altaveus del connector"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Àudio HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index bb87fa6d783e..35f04805cce9 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Reproduktory doku"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Zvuk HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Systém"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index dc040e28483e..6bc5f9ff1fcc 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dockstationens højttalere"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-lyd"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 1556180178cb..2bd623bfee14 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dock-Lautsprecher"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-Audio"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 1d4f378a4157..9f50ca33d7fe 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Ηχεία βάσης σύνδεσης"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Ήχος HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Σύστημα"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 553928b97d4b..1386ad52c71f 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dock speakers"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI audio"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 8e1582abcbdb..c58b08e7fb65 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Altavoces del conector"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index b6cb694490f4..127abb53ab52 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Altavoces del conector"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml index 6ab1665a1c6c..6266353fa285 100644 --- a/core/res/res/values-et/strings.xml +++ b/core/res/res/values-et/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Doki kõlarid"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI heli"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Süsteem"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index a22dd19aec44..fcfbc0f996f6 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"بلندگوهای جایگاه اتصال"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"صدای HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"سیستم"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index c0fe3d525759..5888acf6474b 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -934,10 +934,8 @@ <string name="deleteText" msgid="7070985395199629156">"poista"</string> <string name="inputMethod" msgid="1653630062304567879">"Syöttötapa"</string> <string name="editTextMenuTitle" msgid="4909135564941815494">"Tekstitoiminnot"</string> - <!-- no translation found for low_internal_storage_view_title (5576272496365684834) --> - <skip /> - <!-- no translation found for low_internal_storage_view_text (6640505817617414371) --> - <skip /> + <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> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Peruuta"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1290,4 +1288,5 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Telineen kaiuttimet"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-ääni"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Järjestelmä"</string> + <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Valmis"</string> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index f8bc9aaf68e1..99c7627c6bb3 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Haut-parleurs de la station d\'accueil"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Système"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 0551773f880d..dbb387894986 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"डॉक स्पीकर"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI ऑडियो"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"सिस्टम"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index fddc2955ee61..dbe54ea6cb67 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Zvučnici postolja"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI audio"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sustav"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index bdec648cca0b..79e31194b32c 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dokkolóegység hangszórója"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI audió"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Rendszer"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index 5b5280f5c2fa..28cc0999254d 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Pengeras suara dok"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistem"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 54b8b39b9172..bf7a168cc0d1 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -934,10 +934,8 @@ <string name="deleteText" msgid="7070985395199629156">"elimina"</string> <string name="inputMethod" msgid="1653630062304567879">"Metodo inserimento"</string> <string name="editTextMenuTitle" msgid="4909135564941815494">"Azioni testo"</string> - <!-- no translation found for low_internal_storage_view_title (5576272496365684834) --> - <skip /> - <!-- no translation found for low_internal_storage_view_text (6640505817617414371) --> - <skip /> + <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> <string name="ok" msgid="5970060430562524910">"OK"</string> <string name="cancel" msgid="6442560571259935130">"Annulla"</string> <string name="yes" msgid="5362982303337969312">"OK"</string> @@ -1290,4 +1288,5 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Altoparlanti dock"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> + <string name="media_route_chooser_grouping_done" msgid="7966438307723317169">"Fine"</string> </resources> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 83ad2c257f75..880cc9d877b5 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"רמקולים של מעגן"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"אודיו HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"מערכת"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 68166c3305b1..eb3d96fcbaf1 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"ホルダーのスピーカー"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMIオーディオ"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"システム"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index db5625192587..d345c913dadd 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"도크 스피커"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI 오디오"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"시스템"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 90f8c401085f..319aca79155a 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Doko garsiakalbiai"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI garsas"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index 54bd95759d7e..88396575fb0f 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Doka skaļruņi"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI audio"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistēma"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml index 1f8a2ac55ec9..41f8521725d9 100644 --- a/core/res/res/values-ms/strings.xml +++ b/core/res/res/values-ms/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Pembesar suara dok"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Audio HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistem"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 6da4257fd672..24d849741600 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dokkhøyttalere"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-lyd"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index e94a5fba3973..fb5e365683cc 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dockluidsprekers"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-audio"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Systeem"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 8c6066916f13..8bd9b919ed16 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Głośniki stacji dokującej"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Dźwięk przez HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 8c86fc672892..1e2687d6b7d0 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Altif. estação ancoragem"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Áudio HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 525719f34d2b..75840ccbe01b 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Alto-falantes do dock"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Áudio HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistema"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-rm/strings.xml b/core/res/res/values-rm/strings.xml index ad15a00d11db..d5a42502e756 100644 --- a/core/res/res/values-rm/strings.xml +++ b/core/res/res/values-rm/strings.xml @@ -2024,4 +2024,6 @@ <skip /> <!-- no translation found for default_audio_route_category_name (3722811174003886946) --> <skip /> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 4e90357e5c7d..ef732f8552d2 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Difuz. dispozit. andocare"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Ieşire audio HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistem"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index e4b2962c9986..8c280ccae15f 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Динамики док-станции"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-аудио"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Система"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 49c50bc7f3d6..0ddf9ef88b56 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Reproduktory doku"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Zvuk HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Systém"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 11a0f34ff6e4..102e6f2fbb33 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Zvočniki stojala"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Zvok HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistem"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 08bbd349046f..7dd17fcc0a87 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Звучници базне станице"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI аудио"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Систем"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index fa4297c71e4e..c673628384ed 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dockningsstationens högtalare"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI-ljud"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index ac53b00c82a3..ef9d19d5e0ec 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Vipasa sauti vya gati"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Sauti ya HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Mfumo"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 9b19913238b9..c4b31d5de836 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"ลำโพงแท่นชาร์จ"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"เสียง HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"ระบบ"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index ae51a449965a..4ea1dbc2bc57 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Mga speaker ng dock"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI audio"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index 26b5108abc08..182e2cdc12d6 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Yuva hoparlörleri"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI ses"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Sistem"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 164766c17166..d86141593d3e 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Динаміки док-станції"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Аудіовихід HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Система"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 271e952e02e7..e80ac6ab132a 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Loa đế"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Âm thanh HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Hệ thống"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 82c5bf11ace3..6b1bfa6697c1 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"基座扬声器"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI 音频"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"系统"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index a79cead488e6..9decfa96ba0e 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"座架喇叭"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"HDMI 音訊"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"系統"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 812fc7c1e9be..48a7a8ab5170 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -1290,4 +1290,6 @@ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Izipika ze-Dock"</string> <string name="default_audio_route_name_hdmi" msgid="7986404173839007682">"Umsindo we-HDMI"</string> <string name="default_audio_route_category_name" msgid="3722811174003886946">"Isistimu"</string> + <!-- no translation found for media_route_chooser_grouping_done (7966438307723317169) --> + <skip /> </resources> diff --git a/data/videos/VideoPackage1.mk b/data/videos/VideoPackage1.mk index 407a76ee38f2..00896570d13e 100644 --- a/data/videos/VideoPackage1.mk +++ b/data/videos/VideoPackage1.mk @@ -23,6 +23,4 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \ $(LOCAL_PATH)/AndroidInSpace.480p.lq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.mp4 \ $(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \ - $(LOCAL_PATH)/Sunset.480p.lq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 \ - $(LOCAL_PATH)/Disco.240p.mp4:$(TARGET_PATH)/Disco.240p.mp4 \ - $(LOCAL_PATH)/Disco.480p.lq.mp4:$(TARGET_PATH)/Disco.480p.mp4 + $(LOCAL_PATH)/Sunset.480p.lq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 diff --git a/data/videos/VideoPackage2.mk b/data/videos/VideoPackage2.mk index c256a2de7abb..b53fd9f7c597 100644 --- a/data/videos/VideoPackage2.mk +++ b/data/videos/VideoPackage2.mk @@ -23,6 +23,4 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/AndroidInSpace.240p.mp4:$(TARGET_PATH)/AndroidInSpace.240p.mp4 \ $(LOCAL_PATH)/AndroidInSpace.480p.mq.mp4:$(TARGET_PATH)/AndroidInSpace.480p.mp4 \ $(LOCAL_PATH)/Sunset.240p.mp4:$(TARGET_PATH)/Sunset.240p.mp4 \ - $(LOCAL_PATH)/Sunset.480p.mq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 \ - $(LOCAL_PATH)/Disco.240p.mp4:$(TARGET_PATH)/Disco.240p.mp4 \ - $(LOCAL_PATH)/Disco.480p.mq.mp4:$(TARGET_PATH)/Disco.480p.mp4 + $(LOCAL_PATH)/Sunset.480p.mq.mp4:$(TARGET_PATH)/Sunset.480p.mp4 diff --git a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java index bec9aa200a9f..0bdf84a05692 100644 --- a/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java @@ -790,7 +790,7 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener if (DEBUG) Log.v(TAG, "Starting activity " + intent); context.startActivity(intent, opts.toBundle()); } - if (!usingDrawingCache) { + if (usingDrawingCache) { holder.thumbnailViewImage.setDrawingCacheEnabled(false); } } 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 baf86f397646..9c99653c240f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -820,6 +820,23 @@ public class PhoneStatusBar extends BaseStatusBar { R.integer.config_show_search_delay); } + // Q: What kinds of notifications should show during setup? + // A: Almost none! Only things coming from the system (package is "android") that also + // have special "kind" tags marking them as relevant for setup (see below). + private boolean showNotificationEvenIfUnprovisioned(StatusBarNotification sbn) { + if ("android".equals(sbn.pkg)) { + if (sbn.notification.kind != null) { + for (String aKind : sbn.notification.kind) { + // IME switcher, created by InputMethodManagerService + if ("android.system.imeswitcher".equals(aKind)) return true; + // OTA availability & errors, created by SystemUpdateService + if ("android.system.update".equals(aKind)) return true; + } + } + } + return false; + } + private void loadNotificationShade() { if (mPile == null) return; @@ -831,7 +848,7 @@ public class PhoneStatusBar extends BaseStatusBar { // If the device hasn't been through Setup, we only show system notifications for (int i=0; i<N; i++) { Entry ent = mNotificationData.get(N-i-1); - if (provisioned || "android".equals(ent.notification.pkg)) { + if (provisioned || showNotificationEvenIfUnprovisioned(ent.notification)) { toShow.add(ent.row); } } @@ -886,7 +903,7 @@ public class PhoneStatusBar extends BaseStatusBar { for (int i=0; i<N; i++) { Entry ent = mNotificationData.get(N-i-1); if ((provisioned && ent.notification.score >= HIDE_ICONS_BELOW_SCORE) - || "android".equals(ent.notification.pkg)) { + || showNotificationEvenIfUnprovisioned(ent.notification)) { toShow.add(ent.icon); } } @@ -1376,12 +1393,59 @@ public class PhoneStatusBar extends BaseStatusBar { if (!mTracking) return; mTracking = false; - mPile.setLayerType(View.LAYER_TYPE_NONE, null); + setPileLayers(View.LAYER_TYPE_NONE); mVelocityTracker.recycle(); mVelocityTracker = null; mCloseView.setPressed(false); } + /** + * Enables or disables layers on the children of the notifications pile. + * + * When layers are enabled, this method attempts to enable layers for the minimal + * number of children. Only children visible when the notification area is fully + * expanded will receive a layer. The technique used in this method might cause + * more children than necessary to get a layer (at most one extra child with the + * current UI.) + * + * @param layerType {@link View#LAYER_TYPE_NONE} or {@link View#LAYER_TYPE_HARDWARE} + */ + private void setPileLayers(int layerType) { + final int count = mPile.getChildCount(); + + switch (layerType) { + case View.LAYER_TYPE_NONE: + for (int i = 0; i < count; i++) { + mPile.getChildAt(i).setLayerType(layerType, null); + } + break; + case View.LAYER_TYPE_HARDWARE: + final int[] location = new int[2]; + mNotificationPanel.getLocationInWindow(location); + + final int left = location[0]; + final int top = location[1]; + final int right = left + mNotificationPanel.getWidth(); + final int bottom = top + getExpandedViewMaxHeight(); + + final Rect childBounds = new Rect(); + + for (int i = 0; i < count; i++) { + final View view = mPile.getChildAt(i); + view.getLocationInWindow(location); + + childBounds.set(location[0], location[1], + location[0] + view.getWidth(), location[1] + view.getHeight()); + + if (childBounds.intersects(left, top, right, bottom)) { + view.setLayerType(layerType, null); + } + } + + break; + } + } + void incrementAnim(long frameTimeNanos) { final long deltaNanos = Math.max(frameTimeNanos - mAnimLastTimeNanos, 0); final float t = deltaNanos * 0.000000001f; // ns -> s @@ -1421,7 +1485,7 @@ public class PhoneStatusBar extends BaseStatusBar { mCloseView.setPressed(true); mTracking = true; - mPile.setLayerType(View.LAYER_TYPE_HARDWARE, null); + setPileLayers(View.LAYER_TYPE_HARDWARE); mVelocityTracker = VelocityTracker.obtain(); if (opening) { makeExpandedVisible(true); diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index a5190f14f7e1..0911f1f2562e 100755 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -2968,7 +2968,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { } public boolean allowAppAnimationsLw() { - if (mKeyguard != null && mKeyguard.isVisibleLw()) { + if (mKeyguard != null && mKeyguard.isVisibleLw() && !mKeyguard.isAnimatingLw()) { // If keyguard is currently visible, no reason to animate // behind it. return false; diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java index 48219a4a992a..2d41f4399523 100644 --- a/services/java/com/android/server/InputMethodManagerService.java +++ b/services/java/com/android/server/InputMethodManagerService.java @@ -586,6 +586,10 @@ public class InputMethodManagerService extends IInputMethodManager.Stub mImeSwitcherNotification.defaults = 0; // please be quiet mImeSwitcherNotification.sound = null; mImeSwitcherNotification.vibrate = null; + + // Tag this notification specially so SystemUI knows it's important + mImeSwitcherNotification.kind = new String[] { "android.system.imeswitcher" }; + Intent intent = new Intent(Settings.ACTION_SHOW_INPUT_METHOD_PICKER); mImeSwitchPendingIntent = PendingIntent.getBroadcast(mContext, 0, intent, 0); diff --git a/services/java/com/android/server/wm/WindowAnimator.java b/services/java/com/android/server/wm/WindowAnimator.java index 267bf828d326..758b6e743197 100644 --- a/services/java/com/android/server/wm/WindowAnimator.java +++ b/services/java/com/android/server/wm/WindowAnimator.java @@ -279,7 +279,7 @@ public class WindowAnimator { } mService.mFocusMayChange = true; } - if (win.isReadyForDisplay()) { + if (win.isReadyForDisplay() && !winAnimator.isAnimating()) { mForceHiding = true; } if (WindowManagerService.DEBUG_VISIBILITY) Slog.v(TAG, diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java index 6d5ae71427bd..5d9dce77f8cb 100755 --- a/services/java/com/android/server/wm/WindowManagerService.java +++ b/services/java/com/android/server/wm/WindowManagerService.java @@ -3237,7 +3237,7 @@ public class WindowManagerService extends IWindowManager.Stub if (delayed) { a = new AlphaAnimation(1, 0); a.setStartOffset(0); - a.setDuration(delayDuration - 50); + a.setDuration(delayDuration - 120); a.setBackgroundColor(0xFF000000); } else { a = createExitAnimationLocked(transit, duration); |