From 230c78cec5086e53e378bfc3a8e3bb6168dc0a1f Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Sat, 19 Aug 2017 15:31:46 -0700 Subject: [PATCH] DO NOT MERGE ANYWHERE Revert "Merge "Remove gender-specific pronouns from documentation" into oc-dev" Bug: 64864568 This reverts commit fd35d7c0a284e31231e2f424cade864be695965b, reversing changes made to 07a21754f45672b27e765d8c7677c9663c6dce91. --- core/java/android/app/ActivityManager.java | 12 ---- core/java/android/app/job/JobInfo.java | 4 +- .../hardware/camera2/CameraManager.java | 30 +++------- .../android/hardware/input/IInputManager.aidl | 5 -- .../android/hardware/input/InputManager.java | 56 ------------------- core/java/android/provider/Settings.java | 11 ---- core/java/android/view/InputDevice.java | 32 ----------- core/java/android/view/View.java | 4 +- .../internal/os/RoSystemProperties.java | 2 - .../android/internal/util/AsyncChannel.java | 19 +++---- core/res/AndroidManifest.xml | 7 --- core/res/res/values-ar/strings.xml | 18 +++--- core/res/res/values-b+sr+Latn/strings.xml | 2 +- core/res/res/values-bg/strings.xml | 2 +- core/res/res/values-ca/strings.xml | 24 ++++---- core/res/res/values-da/strings.xml | 8 +-- core/res/res/values-de/strings.xml | 18 +++--- core/res/res/values-el/strings.xml | 2 +- core/res/res/values-es-rUS/strings.xml | 2 +- core/res/res/values-es/strings.xml | 2 +- core/res/res/values-eu/strings.xml | 2 +- core/res/res/values-fr-rCA/strings.xml | 2 +- core/res/res/values-hu/strings.xml | 6 +- core/res/res/values-hy/strings.xml | 4 +- core/res/res/values-it/strings.xml | 2 +- core/res/res/values-mk/strings.xml | 2 +- core/res/res/values-ne/strings.xml | 6 +- core/res/res/values-nl/strings.xml | 2 +- core/res/res/values-pt/strings.xml | 4 +- core/res/res/values-ro/strings.xml | 2 +- core/res/res/values-ru/strings.xml | 4 +- core/res/res/values-sk/strings.xml | 2 +- core/res/res/values-sl/strings.xml | 2 +- core/res/res/values-sr/strings.xml | 2 +- core/res/res/values-sv/strings.xml | 2 +- core/res/res/values-th/strings.xml | 4 +- core/res/res/values-tr/strings.xml | 2 +- core/res/res/values-uk/strings.xml | 4 +- core/res/res/values-uz/strings.xml | 2 +- core/res/res/values-vi/strings.xml | 2 +- core/res/res/values-zh-rCN/strings.xml | 4 +- core/res/res/values-zh-rTW/strings.xml | 4 +- .../SettingsLib/res/values-ar/strings.xml | 2 +- .../res/values-b+sr+Latn/arrays.xml | 2 +- .../res/values-b+sr+Latn/strings.xml | 2 +- packages/SettingsLib/res/values-bs/arrays.xml | 2 +- .../SettingsLib/res/values-bs/strings.xml | 4 +- .../SettingsLib/res/values-ca/strings.xml | 4 +- packages/SettingsLib/res/values-da/arrays.xml | 6 +- .../SettingsLib/res/values-eu/strings.xml | 2 +- .../SettingsLib/res/values-fr/strings.xml | 2 +- packages/SettingsLib/res/values-in/arrays.xml | 2 +- .../SettingsLib/res/values-in/strings.xml | 2 +- .../SettingsLib/res/values-it/strings.xml | 2 +- packages/SettingsLib/res/values-iw/arrays.xml | 10 ++-- .../SettingsLib/res/values-ja/strings.xml | 2 +- .../SettingsLib/res/values-ko/strings.xml | 2 +- packages/SettingsLib/res/values-ky/arrays.xml | 4 +- packages/SettingsLib/res/values-mk/arrays.xml | 2 +- packages/SettingsLib/res/values-my/arrays.xml | 16 +++--- .../SettingsLib/res/values-pt/strings.xml | 2 +- .../SettingsLib/res/values-ru/strings.xml | 12 ++-- packages/SettingsLib/res/values-sr/arrays.xml | 2 +- .../SettingsLib/res/values-sr/strings.xml | 2 +- .../SettingsLib/res/values-th/strings.xml | 2 +- .../SettingsLib/res/values-tr/strings.xml | 12 ++-- packages/SettingsLib/res/values-uz/arrays.xml | 6 +- .../SettingsLib/res/values-zh-rCN/strings.xml | 12 ++-- .../SettingsLib/res/values-zh-rHK/strings.xml | 4 +- .../SettingsLib/res/values-zh-rTW/strings.xml | 2 +- .../res-keyguard/values-pt-rPT/strings.xml | 10 ++-- .../SystemUI/res/values-pt-rBR/strings.xml | 8 +-- .../SystemUI/res/values-pt-rPT/strings.xml | 12 ++-- .../SystemUI/res/values-pt-rPT/strings_tv.xml | 2 +- .../android/server/ConnectivityService.java | 42 ++------------ .../android/server/am/ActivityStarter.java | 21 +++---- .../server/dreams/DreamManagerService.java | 13 +---- .../server/input/InputManagerService.java | 29 ---------- .../server/wm/WallpaperController.java | 9 +-- ...droid_server_input_InputManagerService.cpp | 52 ----------------- 80 files changed, 184 insertions(+), 464 deletions(-) diff --git a/core/java/android/app/ActivityManager.java b/core/java/android/app/ActivityManager.java index 3dcffa801508c..aca2d91778351 100644 --- a/core/java/android/app/ActivityManager.java +++ b/core/java/android/app/ActivityManager.java @@ -1118,18 +1118,6 @@ public class ActivityManager { return RoSystemProperties.CONFIG_LOW_RAM; } - /** - * Returns true if this is a small battery device. Exactly whether a device is considered to be - * small battery is ultimately up to the device configuration, but currently it generally means - * something in the class of a device with 1000 mAh or less. This is mostly intended to be used - * to determine whether certain features should be altered to account for a drastically smaller - * battery. - * @hide - */ - public static boolean isSmallBatteryDevice() { - return RoSystemProperties.CONFIG_SMALL_BATTERY; - } - /** * Used by persistent processes to determine if they are running on a * higher-end device so should be okay using hardware drawing acceleration diff --git a/core/java/android/app/job/JobInfo.java b/core/java/android/app/job/JobInfo.java index b304d07db22c4..87e516cabba54 100644 --- a/core/java/android/app/job/JobInfo.java +++ b/core/java/android/app/job/JobInfo.java @@ -107,10 +107,10 @@ public class JobInfo implements Parcelable { public static final int BACKOFF_POLICY_EXPONENTIAL = 1; /* Minimum interval for a periodic job, in milliseconds. */ - private static final long MIN_PERIOD_MILLIS = 30 * 60 * 1000L; // HACK|STOPSHIP:ewol 30 minutes + private static final long MIN_PERIOD_MILLIS = 15 * 60 * 1000L; // 15 minutes /* Minimum flex for a periodic job, in milliseconds. */ - private static final long MIN_FLEX_MILLIS = 10 * 60 * 1000L; // HACK|STOPSHIP:ewol 10 minutes + private static final long MIN_FLEX_MILLIS = 5 * 60 * 1000L; // 5 minutes /** * Minimum backoff interval for a job, in milliseconds diff --git a/core/java/android/hardware/camera2/CameraManager.java b/core/java/android/hardware/camera2/CameraManager.java index 90bf896c2225b..1b150bfca63a3 100644 --- a/core/java/android/hardware/camera2/CameraManager.java +++ b/core/java/android/hardware/camera2/CameraManager.java @@ -16,29 +16,28 @@ package android.hardware.camera2; -import android.annotation.NonNull; -import android.annotation.Nullable; import android.annotation.RequiresPermission; import android.annotation.SystemService; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.content.Context; -import android.hardware.CameraInfo; -import android.hardware.CameraStatus; import android.hardware.ICameraService; import android.hardware.ICameraServiceListener; +import android.hardware.CameraInfo; +import android.hardware.CameraStatus; import android.hardware.camera2.impl.CameraMetadataNative; import android.hardware.camera2.legacy.CameraDeviceUserShim; import android.hardware.camera2.legacy.LegacyMetadataMapper; +import android.os.IBinder; import android.os.Binder; import android.os.DeadObjectException; import android.os.Handler; -import android.os.IBinder; import android.os.Looper; import android.os.RemoteException; import android.os.ServiceManager; import android.os.ServiceSpecificException; -import android.os.SystemProperties; -import android.util.ArrayMap; import android.util.Log; +import android.util.ArrayMap; import java.util.ArrayList; @@ -211,9 +210,7 @@ public final class CameraManager { public CameraCharacteristics getCameraCharacteristics(@NonNull String cameraId) throws CameraAccessException { CameraCharacteristics characteristics = null; - if (CameraManagerGlobal.sCameraServiceDisabled) { - throw new IllegalArgumentException("No cameras available on device"); - } + synchronized (mLock) { /* * Get the camera characteristics from the camera service directly if it supports it, @@ -465,9 +462,6 @@ public final class CameraManager { "Handler argument is null, but no looper exists in the calling thread"); } } - if (CameraManagerGlobal.sCameraServiceDisabled) { - throw new IllegalArgumentException("No cameras available on device"); - } openCameraDeviceUserAsync(cameraId, callback, handler, clientUid); } @@ -513,9 +507,6 @@ public final class CameraManager { */ public void setTorchMode(@NonNull String cameraId, boolean enabled) throws CameraAccessException { - if (CameraManagerGlobal.sCameraServiceDisabled) { - throw new IllegalArgumentException("No cameras available on device"); - } CameraManagerGlobal.get().setTorchMode(cameraId, enabled); } @@ -754,9 +745,6 @@ public final class CameraManager { private CameraManagerGlobal() { } - public static final boolean sCameraServiceDisabled = - SystemProperties.getBoolean("config.disable_cameraservice", false); - public static CameraManagerGlobal get() { return gCameraManager; } @@ -776,7 +764,7 @@ public final class CameraManager { public ICameraService getCameraService() { synchronized(mLock) { connectCameraServiceLocked(); - if (mCameraService == null && !sCameraServiceDisabled) { + if (mCameraService == null) { Log.e(TAG, "Camera service is unavailable"); } return mCameraService; @@ -791,7 +779,7 @@ public final class CameraManager { */ private void connectCameraServiceLocked() { // Only reconnect if necessary - if (mCameraService != null || sCameraServiceDisabled) return; + if (mCameraService != null) return; Log.i(TAG, "Connecting to camera service"); diff --git a/core/java/android/hardware/input/IInputManager.aidl b/core/java/android/hardware/input/IInputManager.aidl index 45863167fa1b1..bdb278bb8c344 100644 --- a/core/java/android/hardware/input/IInputManager.aidl +++ b/core/java/android/hardware/input/IInputManager.aidl @@ -34,11 +34,6 @@ interface IInputManager { InputDevice getInputDevice(int deviceId); int[] getInputDeviceIds(); - // Enable/disable input device. - boolean isInputDeviceEnabled(int deviceId); - void enableInputDevice(int deviceId); - void disableInputDevice(int deviceId); - // Reports whether the hardware supports the given keys; returns true if successful boolean hasKeys(int deviceId, int sourceMask, in int[] keyCodes, out boolean[] keyExists); diff --git a/core/java/android/hardware/input/InputManager.java b/core/java/android/hardware/input/InputManager.java index 01e7d06eb3344..5149e930d94ab 100644 --- a/core/java/android/hardware/input/InputManager.java +++ b/core/java/android/hardware/input/InputManager.java @@ -318,62 +318,6 @@ public final class InputManager { } } - /** - * Returns true if an input device is enabled. Should return true for most - * situations. Some system apps may disable an input device, for - * example to prevent unwanted touch events. - * - * @param id The input device Id. - * - * @hide - */ - public boolean isInputDeviceEnabled(int id) { - try { - return mIm.isInputDeviceEnabled(id); - } catch (RemoteException ex) { - Log.w(TAG, "Could not check enabled status of input device with id = " + id); - throw ex.rethrowFromSystemServer(); - } - } - - /** - * Enables an InputDevice. - *

- * Requires {@link android.Manifest.permissions.DISABLE_INPUT_DEVICE}. - *

- * - * @param id The input device Id. - * - * @hide - */ - public void enableInputDevice(int id) { - try { - mIm.enableInputDevice(id); - } catch (RemoteException ex) { - Log.w(TAG, "Could not enable input device with id = " + id); - throw ex.rethrowFromSystemServer(); - } - } - - /** - * Disables an InputDevice. - *

- * Requires {@link android.Manifest.permissions.DISABLE_INPUT_DEVICE}. - *

- * - * @param id The input device Id. - * - * @hide - */ - public void disableInputDevice(int id) { - try { - mIm.disableInputDevice(id); - } catch (RemoteException ex) { - Log.w(TAG, "Could not disable input device with id = " + id); - throw ex.rethrowFromSystemServer(); - } - } - /** * Registers an input device listener to receive notifications about when * input devices are added, removed or changed. diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 5fa13443f7ec6..b7514fd6df2c5 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -7876,17 +7876,6 @@ public final class Settings { */ public static final String NETWORK_SCORER_APP = "network_scorer_app"; - /** - * Configures the duration of the the ConnectivityService net transition wakelock. - * - * A setting of > 0 enacts this override duration in favor of the default or - * any other configured wakelock duration. - * A setting of == 0 effectively disables the net transition wakelock. - * @hide - */ - public static final String NET_TRANSITION_WAKELOCK_OVERRIDE_MS = - "net_transition_wakelock_override_ms"; - /** * If the NITZ_UPDATE_DIFF time is exceeded then an automatic adjustment * to SystemClock will be allowed even if NITZ_UPDATE_SPACING has not been diff --git a/core/java/android/view/InputDevice.java b/core/java/android/view/InputDevice.java index f6fee2dfa7376..ea2434e9e39db 100644 --- a/core/java/android/view/InputDevice.java +++ b/core/java/android/view/InputDevice.java @@ -16,8 +16,6 @@ package android.view; -import android.annotation.RequiresPermission; -import android.annotation.TestApi; import android.content.Context; import android.hardware.input.InputDeviceIdentifier; import android.hardware.input.InputManager; @@ -769,36 +767,6 @@ public final class InputDevice implements Parcelable { } } - /** - * Returns true if input device is enabled. - * @return Whether the input device is enabled. - * - * @hide - */ - public boolean isEnabled() { - return InputManager.getInstance().isInputDeviceEnabled(mId); - } - - /** - * Enables the input device. - * - * @hide - */ - @RequiresPermission(android.Manifest.permission.DISABLE_INPUT_DEVICE) - public void enable() { - InputManager.getInstance().enableInputDevice(mId); - } - - /** - * Disables the input device. - * - * @hide - */ - @RequiresPermission(android.Manifest.permission.DISABLE_INPUT_DEVICE) - public void disable() { - InputManager.getInstance().disableInputDevice(mId); - } - /** * Reports whether the device has a built-in microphone. * @return Whether the device has a built-in microphone. diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 7eebbbdf9e079..25c02d17f046c 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -25697,10 +25697,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * version supported by the application. For example, the method * {@link View#onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo)} is not available * in API version 4 when the accessibility APIs were first introduced. If a - * developer would like their application to run on API version 4 devices (assuming + * developer would like his application to run on API version 4 devices (assuming * all other APIs used by the application are version 4 or lower) and take advantage * of this method, instead of overriding the method which would break the application's - * backwards compatibility, they can override the corresponding method in this + * backwards compatibility, he can override the corresponding method in this * delegate and register the delegate in the target View if the API version of * the system is high enough, i.e. the API version is the same as or higher than the API * version that introduced diff --git a/core/java/com/android/internal/os/RoSystemProperties.java b/core/java/com/android/internal/os/RoSystemProperties.java index 89a4e17aa9767..1d26df0de12cb 100644 --- a/core/java/com/android/internal/os/RoSystemProperties.java +++ b/core/java/com/android/internal/os/RoSystemProperties.java @@ -33,8 +33,6 @@ public class RoSystemProperties { // ------ ro.config.* -------- // public static final boolean CONFIG_LOW_RAM = SystemProperties.getBoolean("ro.config.low_ram", false); - public static final boolean CONFIG_SMALL_BATTERY = - SystemProperties.getBoolean("ro.config.small_battery", false); // ------ ro.fw.* ------------ // public static final boolean FW_SYSTEM_USER_SPLIT = diff --git a/core/java/com/android/internal/util/AsyncChannel.java b/core/java/com/android/internal/util/AsyncChannel.java index 6fbfff8f381dd..d8be9fdc33bda 100644 --- a/core/java/com/android/internal/util/AsyncChannel.java +++ b/core/java/com/android/internal/util/AsyncChannel.java @@ -768,10 +768,9 @@ public class AsyncChannel { /** Handle of the reply message */ @Override public void handleMessage(Message msg) { - Message msgCopy = Message.obtain(); - msgCopy.copyFrom(msg); + mResultMsg = Message.obtain(); + mResultMsg.copyFrom(msg); synchronized(mLockObject) { - mResultMsg = msgCopy; mLockObject.notify(); } } @@ -813,26 +812,22 @@ public class AsyncChannel { */ private static Message sendMessageSynchronously(Messenger dstMessenger, Message msg) { SyncMessenger sm = SyncMessenger.obtain(); - Message resultMsg = null; try { if (dstMessenger != null && msg != null) { msg.replyTo = sm.mMessenger; synchronized (sm.mHandler.mLockObject) { - if (sm.mHandler.mResultMsg != null) { - Slog.wtf(TAG, "mResultMsg should be null here"); - sm.mHandler.mResultMsg = null; - } dstMessenger.send(msg); sm.mHandler.mLockObject.wait(); - resultMsg = sm.mHandler.mResultMsg; - sm.mHandler.mResultMsg = null; } + } else { + sm.mHandler.mResultMsg = null; } } catch (InterruptedException e) { - Slog.e(TAG, "error in sendMessageSynchronously", e); + sm.mHandler.mResultMsg = null; } catch (RemoteException e) { - Slog.e(TAG, "error in sendMessageSynchronously", e); + sm.mHandler.mResultMsg = null; } + Message resultMsg = sm.mHandler.mResultMsg; sm.recycle(); return resultMsg; } diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 790f887bd4a85..794d4f8b78b93 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -2734,13 +2734,6 @@ - - - "999+" "المحتويات مخفية" "تم إخفاء المحتويات بواسطة السياسة" - "لوحة المفاتيح الظاهرية" + "لوحة المفاتيح الافتراضية" "لوحة المفاتيح الفعلية" "الأمان" "وضع السيارة" @@ -270,7 +270,7 @@ "حالة الشبكة" "تنبيهات الشبكة" "الشبكة متوفرة" - "حالة الشبكة الظاهرية الخاصة" + "حالة الشبكة الافتراضية الخاصة" "إدارة الجهاز" "التنبيهات" "عرض توضيحي لبائع التجزئة" @@ -1208,7 +1208,7 @@ "Wi-Fi" "بلوتوث" "إيثرنت" - "‏شبكة ظاهرية خاصة (VPN)" + "‏شبكة افتراضية خاصة (VPN)" "نوع شبكة غير معروف" "‏تعذر الاتصال بـ Wi-Fi" @@ -1284,7 +1284,7 @@ "رفض" "تغيير لوحة المفاتيح" "استمرار عرضها على الشاشة أثناء نشاط لوحة المفاتيح الفعلية" - "إظهار لوحة المفاتيح الظاهرية" + "إظهار لوحة المفاتيح الافتراضية" "تهيئة لوحة المفاتيح الفعلية" "انقر لاختيار لغة وتنسيق" " أ ب ت ث ج ح خ د ذ ر ز س ش ص ض ط ظ ع غ ف ق ك ل م ن ه و ي" @@ -1372,14 +1372,14 @@ "مستمع واقع افتراضي" "موفر الحالة" "خدمة ترتيب أهمية الإشعارات" - "‏تم تنشيط الشبكة الظاهرية الخاصة (VPN)" + "‏تم تنشيط الشبكة الافتراضية الخاصة (VPN)" "‏تم تنشيط VPN بواسطة %s" "انقر لإدارة الشبكة." "تم الاتصال بـ %s. انقر لإدارة الشبكة." - "‏جارٍ الاتصال بشبكة ظاهرية خاصة (VPN) دائمة التشغيل..." - "‏تم الاتصال بشبكة ظاهرية خاصة (VPN) دائمة التشغيل" - "‏تم فصل الشبكة الظاهرية الخاصة (VPN) دائمة التشغيل" - "‏خطأ بشبكة ظاهرية خاصة (VPN) دائمة التشغيل" + "‏جارٍ الاتصال بشبكة افتراضية خاصة (VPN) دائمة التشغيل..." + "‏تم الاتصال بشبكة افتراضية خاصة (VPN) دائمة التشغيل" + "‏تم فصل الشبكة الافتراضية الخاصة (VPN) دائمة التشغيل" + "‏خطأ بشبكة افتراضية خاصة (VPN) دائمة التشغيل" "انقر للإعداد." "اختيار ملف" "لم يتم اختيار أي ملف" diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index 2ec4a382fcd32..940ab9c7ed37e 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -1207,7 +1207,7 @@ "USB za MIDI" "Povezano sa USB dodatkom" "Dodirnite za još opcija." - "Otklanjanje grešaka sa USB-a je uspostavljeno" + "Otklanjanje grešaka sa USB-a je omogućeno" "Dodirnite da biste onemogućili otklanjanje grešaka sa USB-a." "Izaberite da biste onemogućili otklanjanja grešaka sa USB-a." "Izveštaj o grešci se generiše…" diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index f46b8d488edd8..12527a8b59f58 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -280,7 +280,7 @@ "има достъп до календара ви" "SMS" "да изпраща и преглежда SMS съобщения" - "Съхранение" + "Хранилище" "да има достъп до снимките, мултимедията и файловете на устройството ви" "Микрофон" "записва звук" diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index 236c185577a0b..617cf30ff814d 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -93,9 +93,9 @@ "No es poden fer trucades d\'emergència" "Sense servei de veu" "Sense servei de veu/emergència" - "La xarxa de telefonia mòbil de la teva ubicació temporalment no ofereix aquest servei" + "La xarxa mòbil de la teva ubicació temporalment no ofereix aquest servei" "No es pot accedir a la xarxa" - "Per millorar la recepció, prova de canviar-ne el tipus a Sistema > Xarxa i Internet > Xarxes de telefonia mòbil > Tipus de xarxa preferit." + "Per millorar la recepció, prova de canviar-ne el tipus a Sistema > Xarxa i Internet > Xarxes mòbils > Tipus de xarxa preferit." "Alertes" "Desviació de trucades" "Mode de devolució de trucada d\'emergència" @@ -471,7 +471,7 @@ "controlar Comunicació de camp proper (NFC)" "Permet que l\'aplicació es comuniqui amb les etiquetes, les targetes i els lectors de Comunicació de camp proper (NFC)." "desactivació del bloqueig de pantalla" - "Permet que l\'aplicació desactivi el bloqueig del teclat i qualsevol element de seguretat de contrasenyes associat. Per exemple, el telèfon desactiva el bloqueig del teclat en rebre una trucada telefònica entrant i, a continuació, reactiva el bloqueig del teclat quan finalitza la trucada." + "Permet que l\'aplicació desactivi el bloqueig del teclat i qualsevol element de seguretat de contrasenyes associat. Per exemple, el telèfon desactiva el bloqueig del teclat en rebre una trucada entrant i, a continuació, reactiva el bloqueig del teclat quan finalitza la trucada." "Gestionar el maquinari d\'empremtes digitals" "Permet que l\'aplicació invoqui mètodes per afegir i suprimir plantilles d\'empremtes digitals que es puguin fer servir." "Utilitzar el maquinari d\'empremtes digitals" @@ -788,13 +788,13 @@ "Ha finalitzat la reorganització del widget." "S\'ha suprimit el widget de %1$s." "Desplega l\'àrea de desbloqueig." - "Desbloqueig lliscant el dit" + "Desbloqueig lliscant" "Desbloqueig mitjançant patró" "Desbloqueig facial" "Desbloqueig mitjançant PIN" "Desbloqueig mitjançant contrasenya" "Àrea de patró" - "Àrea per lliscar el dit" + "Àrea per lliscar" "?123" "ABC" "ALT" @@ -1075,7 +1075,7 @@ "%1$s ha superat el límit de memòria" "S\'ha recopilat un procés \"heap dump\"; toca per compartir-lo" "Vols compartir el \"heap dump\"?" - "El procés %1$s ha superat el límit de %2$s de memòria del procés. Hi ha un procés \"heap dump\" disponible perquè el comparteixis amb el desenvolupador. Vés amb compte: aquest \"heap dump\" pot contenir les dades personals a les quals l\'aplicació tingui accés." + "El procés %1$s ha superat el límit de %2$s de memòria del procés. Hi ha un procés \"heap dump\" disponible perquè el comparteixis amb el desenvolupador. Ves amb compte: aquest \"heap dump\" pot contenir les dades personals a les quals l\'aplicació tingui accés." "Tria una acció per al text" "Volum del timbre" "Volum de multimèdia" @@ -1159,10 +1159,10 @@ "Permet sempre" "No permetis mai" "Extracció de la targeta SIM" - "La xarxa de telefonia mòbil no estarà disponible fins que no reiniciïs amb una targeta SIM vàlida inserida." + "La xarxa mòbil no estarà disponible fins que no reiniciïs amb una targeta SIM vàlida inserida." "Fet" "Addició de la targeta SIM" - "Reinicia el dispositiu per accedir a la xarxa de telefonia mòbil." + "Reinicia el dispositiu per accedir a la xarxa mòbil." "Reinicia" "Perquè la nova SIM funcioni, has d\'instal·lar i obrir una aplicació del teu operador de telefonia mòbil." "BAIXA L\'APLICACIÓ" @@ -1257,7 +1257,7 @@ "Permet que una aplicació demani permís per ignorar les optimitzacions de bateria per a l\'aplicació." "Piqueu dos cops per controlar el zoom" "No s\'ha pogut afegir el widget." - "Vés" + "Ves" "Cerca" "Envia" "Següent" @@ -1615,9 +1615,9 @@ "No es pot deixar de fixar aquesta aplicació" "Pantalla fixada" "Fixació de la pantalla anul·lada" - "Sol·licita el codi PIN per anul·lar" - "Sol·licita el patró de desbloqueig per anul·lar" - "Demana la contrasenya per anul·lar" + "Sol·licita el codi PIN per deixar de fixar" + "Sol·licita el patró de desbloqueig per deixar de fixar" + "Demana la contrasenya per deixar de fixar" "Instal·lat per l\'administrador" "Actualitzat per l\'administrador" "Suprimit per l\'administrador" diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 325177126f044..8139176a7732c 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -1288,10 +1288,10 @@ "VPN aktiveres af %s" "Tryk for at administrere netværket." "Forbundet til %s. Tryk for at administrere netværket." - "Opretter forbindelse til altid aktiveret VPN…" - "Altid aktiveret VPN er forbundet" - "Forbindelsen til altid aktiveret VPN er afbrudt" - "Fejl i altid aktiveret VPN" + "Opretter forbindelse til konstant VPN…" + "Konstant VPN er forbundet" + "Forbindelsen til konstant VPN er afbrudt" + "Fejl i konstant VPN" "Tryk for at konfigurere" "Vælg fil" "Ingen fil er valgt" diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 778163c411e27..13833471668d8 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -447,9 +447,9 @@ "Tethering-Konnektivität ändern" "Ermöglicht der App, den Status der Tethering-Konnektivität zu ändern" "WLAN-Verbindungen abrufen" - "Ermöglicht der App, Informationen zu WLANs abzurufen, etwa ob ein WLAN aktiviert ist, und den Namen verbundener WLAN-Geräte." + "Ermöglicht der App, Informationen zu WLAN-Netzwerken abzurufen, etwa ob ein WLAN aktiviert ist, und den Namen verbundener WLAN-Geräte." "WLAN-Verbindungen herstellen und trennen" - "Ermöglicht der App, eine Verbindung zu WLAN-Zugangspunkten herzustellen und solche zu trennen und Änderungen an der Gerätekonfiguration für WLAN-Netzwerke vorzunehmen." + "Ermöglicht der App, eine Verbindung zu WLAN-Zugangspunkten herzustellen und solche zu trennen und Änderungen an der Gerätekonfiguration für WLANs vorzunehmen." "WLAN-Multicast-Empfang zulassen" "Ermöglicht der App, Pakete zu empfangen, die mithilfe von Multicast-Adressen an sämtliche Geräte in einem WLAN versendet wurden, nicht nur an dein Tablet. Dies nicht mehr Leistung in Anspruch als der Nicht-Multicast-Modus." "Ermöglicht der App, Pakete zu empfangen, die mithilfe von Multicast-Adressen an sämtliche Geräte in einem WLAN gesendet wurden, nicht nur an deinen Fernseher. Dies nimmt mehr Leistung in Anspruch als der Nicht-Multicast-Modus." @@ -1099,14 +1099,14 @@ "Benachrichtigungstöne" "Unbekannt" - WLAN-Netzwerke verfügbar - WLAN-Netzwerk verfügbar + WLANe verfügbar + WLAN verfügbar - Verfügbare WLAN-Netzwerke öffnen - Verfügbares WLAN-Netzwerk öffnen + Verfügbare WLANe öffnen + Verfügbares WLAN öffnen - "In WLAN-Netzwerk anmelden" + "In WLAN anmelden" "Im Netzwerk anmelden" @@ -1126,7 +1126,7 @@ "Es konnte keine WLAN-Verbindung hergestellt werden." " hat eine schlechte Internetverbindung." "Verbindung zulassen?" - "Die App \"%1$s\" möchte eine Verbindung zum WLAN-Netzwerk %2$s herstellen." + "Die App \"%1$s\" möchte eine Verbindung zum WLAN %2$s herstellen." "Eine App" "Wi-Fi Direct" "Wi-Fi Direct-Betrieb starten. Hierdurch wird der WLAN-Client-/-Hotspot-Betrieb deaktiviert." @@ -1186,7 +1186,7 @@ "Mit USB-Zubehör verbunden" "Für weitere Optionen tippen." "USB-Debugging aktiviert" - "Zum Deaktivieren von USB-Debugging tippen." + "Zum Deaktivieren von USB-Debugging tippen" "USB-Debugging deaktivieren: auswählen" "Fehlerbericht wird abgerufen…" "Fehlerbericht teilen?" diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 26f3f1d5a4aae..2b12bc31463a0 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -1367,7 +1367,7 @@ "Περισσότερες επιλογές" "%1$s, %2$s" "%1$s, %2$s, %3$s" - "Εσωτερικός κοινόχρηστος αποθηκευτικός χώρος" + "Εσωτ. κοινόχρ. αποθ. χώρος" "Κάρτα SD" "Κάρτα SD %s" "Μονάδα USB" diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 956b06d79db2a..938b00db9a8ab 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -1178,7 +1178,7 @@ "No se requieren permisos" "esto puede costarte dinero" "Aceptar" - "Este dispositivo se está cargando mediante USB" + "Cargando este dispositivo por USB" "El dispositivo conectado se está cargando mediante USB" "USB para transferir archivos" "USB para transferir fotos" diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 062f9386d39fe..81b186184b2d5 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -1186,7 +1186,7 @@ "Conectado a un accesorio USB" "Toca para ver más opciones." "Depuración USB habilitada" - "Toca para inhabilitar la depuración USB." + "Toca para inhabilitar la depuración USB" "Seleccionar para inhabilitar la depuración USB" "Creando informe de errores…" "¿Compartir informe de errores?" diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml index d308c70eb0fbd..a0f53589af026 100644 --- a/core/res/res/values-eu/strings.xml +++ b/core/res/res/values-eu/strings.xml @@ -1138,7 +1138,7 @@ "Gonbidapena bidali da" "Konektatzeko gonbidapena" "Igorlea:" - "Nori:" + "Hartzailea:" "Idatzi beharrezko PINa:" "PINa:" "Tableta Wi-Fi saretik deskonektatuko da %1$s gailura konektatuta dagoen bitartean" diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index b9b202fed1dac..8e6914087684d 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -1185,7 +1185,7 @@ "USB pour MIDI" "Connecté à un accessoire USB" "Touchez pour afficher plus d\'options." - "Débogage USB connecté" + "Débogage USB activé" "Touchez pour désactiver le débogage USB." "Sélectionnez cette option pour désactiver le débogage USB." "Création d\'un rapport de bogue en cours..." diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index b999489ccc52b..69ec07bc16c3e 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -90,7 +90,7 @@ "A szolgáltatás nincs biztosítva." "Nem tudja módosítani a hívó fél azonosítója beállítást." "Adatszolgáltatás letiltva" - "Nincs vészhívás" + "Nincs segélyhívás" "Hangszolgáltatás letiltva" "Hang- és segélyszolgáltatás letiltva" "Az Ön tartózkodási helyén ideiglenesen nem áll rendelkezésre a mobilhálózaton" @@ -223,7 +223,7 @@ "Telefonbeállítások" "Képernyő lezárása" "Kikapcsolás" - "Vészhívás" + "Segélyhívás" "Programhiba bejelentése" "Hibajelentés készítése" "Ezzel információt fog gyűjteni az eszköz jelenlegi állapotáról, amelyet a rendszer e-mailben fog elküldeni. Kérjük, legyen türelemmel, amíg a hibajelentés elkészül, és küldhető állapotba kerül." @@ -714,7 +714,7 @@ "A feloldáshoz vagy segélyhívás kezdeményezéséhez nyomja meg a Menü gombot." "A feloldáshoz nyomja meg a Menü gombot." "Rajzolja le a mintát a feloldáshoz" - "Vészhívás" + "Segélyhívás" "Hívás folytatása" "Helyes!" "Próbálja újra" diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml index 6cd7ba0b35016..ab0b6daa647d0 100644 --- a/core/res/res/values-hy/strings.xml +++ b/core/res/res/values-hy/strings.xml @@ -398,7 +398,7 @@ "Այս հավելվածը կարող է ստանալ ձեր տեղադրության տվյալները ցանցային տարբեր աղբյուրներից, օրինակ՝ բջջային աշտարակներից և Wi-Fi ցանցերից: Այս տեղորոշման ծառայությունները պետք է միացված և հասանելի լինեն ձեր հեռախոսում, որպեսզի հավելվածը կարողանա օգտագործել դրանք:" "փոխել ձեր աուդիո կարգավորումները" "Թույլ է տալիս հավելվածին փոփոխել ձայնանյութի գլոբալ կարգավորումները, ինչպես օրինակ` ձայնը և թե որ խոսափողն է օգտագործված արտածման համար:" - "ձայնագրել ձայնանյութ" + "ձայնագրել աուդիո ֆայլ" "Այս հավելվածը ցանկացած պահի կարող է ձայնագրել խոսափողի օգնությամբ:" "ուղարկել հրամաններ SIM քարտին" "Թույլ է տալիս հավելվածին հրամաններ ուղարկել SIM-ին: Սա շատ վտանգավոր է:" @@ -1418,7 +1418,7 @@ "Համակցված բարձրախոսներ" "HDMI" "Համակարգ" - "Bluetooth-ի ձայնանյութ" + "Bluetooth-ի աուդիո ֆայլ" "Անլար էկրան" "Հեռարձակում" "Միանալ սարքին" diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 05c9d548a3228..67b17103b027a 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -1367,7 +1367,7 @@ "Altre opzioni" "%1$s, %2$s" "%1$s, %2$s, %3$s" - "Archivio condiviso interno" + "Memoria condivisa interna" "Scheda SD" "Scheda SD %s" "Unità USB" diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml index 474cdc00abd63..688e639e0edc7 100644 --- a/core/res/res/values-mk/strings.xml +++ b/core/res/res/values-mk/strings.xml @@ -1041,7 +1041,7 @@ "%1$s не реагира" "Процесот %1$s не реагира" "Во ред" - "Извештај" + "Пријави" "Почекај" "Страницата не реагира.\n\nДали сакате да ја затворите?" "Пренасочена апликација" diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml index b371a8b7bb55f..ffd2e82c2ffb8 100644 --- a/core/res/res/values-ne/strings.xml +++ b/core/res/res/values-ne/strings.xml @@ -361,9 +361,9 @@ "अनुप्रयोगलाई अनुमति दिन्छ प्रणालीले बुटिङ सकेपछि आफै सुरूवात हुन। यसले TV सुरू गर्न लामो समय लिन सक्छ र अनुप्रयोगहरूलाई अनुमति दिन सक्छ सँधै सञ्चालन भई समग्र रूपमा ट्याब्लेटलाई ढिलो गराएर।" "अनुप्रयोगलाई प्रणाली बुट गरी सकेपछि जति सक्दो चाँडो आफैंमा सुरु गर्न अनुमति दिन्छ। यसले फोन सुरु गर्नमा ढिला गर्न सक्दछ र अनप्रयोगलाई समग्रमा फोन सधैँ चालु गरेर ढिला बनाउँदछ।" "स्टिकि प्रसारण पठाउनुहोस्" - "औपचारिक प्रसारणलाई पठाउनको लागि एउटा अनुप्रयोगलाई अनुमति दिन्छ, जुन प्रसारण समाप्त भएपछि बाँकी रहन्छ। अत्याधिक प्रयोगले धेरै मेमोरी प्रयोग गरेको कारणले ट्याब्लेटलाई ढिलो र अस्थिर बनाउन सक्छ।" + "औपचारिक प्रसारणलाई पठाउनको लागि एउटा अनुप्रयोगलाई अनुमति दिन्छ, जुन प्रसारण समाप्त भएपछि बाँकी रहन्छ। अत्यधिक प्रयोगले धेरै मेमोरी प्रयोग गरेको कारणले ट्याब्लेटलाई ढिलो र अस्थिर बनाउन सक्छ।" "अनुप्रयोगलाई टाँसिने प्रसारणहरू पठाउन अनुमति दिन्छ, जुन प्रसारण पछि पनि रहन्छ। अत्यन्य धेरै मेमोरी प्रयोग गर्ने बनाएर अत्यधिक प्रयोगले TV लाई ढिलो वा अस्थिर बनाउन सक्छ ।" - "औपचारिक प्रसारणलाई पठाउनको लागि एक अनुप्रयोगलाई अनुमति दिन्छ, जुन प्रसारण समाप्त भएपछि बाँकी रहन्छ। अत्याधिक प्रयोगले धेरै मेमोरी प्रयोग गरेको कारणले फोनलाई ढिलो र अस्थिर बनाउन सक्छ।" + "औपचारिक प्रसारणलाई पठाउनको लागि एक अनुप्रयोगलाई अनुमति दिन्छ, जुन प्रसारण समाप्त भएपछि बाँकी रहन्छ। अत्यधिक प्रयोगले धेरै मेमोरी प्रयोग गरेको कारणले फोनलाई ढिलो र अस्थिर बनाउन सक्छ।" "तपाईँका सम्पर्कहरू पढ्नुहोस्" "अनुप्रयोगलाई निर्दिष्ट व्यक्तिगतसँग अन्य तरिकाहरूबाट कल गर्नु भएका, इमेल गर्नु भएका वा अन्तर्क्रिया गर्नुभएका आवृतिसहितको तपाईंको ट्याब्लेटमा भण्डारण गरिएका सम्पर्कहरूको डेटा पढ्न अनुमति दिन्छ। यो अनुमतिले तपाईंको सम्पर्क डेटा बचत गर्न अनुमति दिन्छ, र खराब अनुप्रयोगहरूले तपाईंको जानकारी बिना सम्पर्क डेटा साझेदारी गर्न सक्दछन्।" "अनुप्रयोगलाई अनुमति दिन्छ तपाईँको TV मा भण्डारण गरिएका तपाईँका सम्पर्कका डेटा, तपाईँको कल, इमेलको बारम्बारता, वा अन्य तरीकाले खास व्यक्तिहरूसँग गरिएको सञ्चार लगायत, पढ्न।यस अनुमतिले अनुप्रयोगलाई अनुमति दिन्छ तपाईँको सम्पर्क डेटा सुरक्षित गर्न र दुस्प्रभावी अनुप्रयोगहरूले तपाईँको ज्ञान बिना सम्पर्क डेटा साझेदारी गर्न सक्छन्।" @@ -720,7 +720,7 @@ "फेरि प्रयास गर्नुहोस्" "फेरि प्रयास गर्नुहोस्" "सबै सुविधाहरू र डेटाका लागि अनलक गर्नुहोस्" - "अत्याधिक मोहडा खोल्ने प्रयासहरू बढी भए।" + "अत्यधिक मोहडा खोल्ने प्रयासहरू बढी भए।" "SIM कार्ड छैन" "ट्याब्लेटमा SIM कार्ड छैन।" "TV मा कुनै SIM कार्ड छैन।" diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index 8d75a539a92d4..eb71a8c496b47 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -1155,7 +1155,7 @@ "Verzenden" "Annuleren" "Mijn keuze onthouden" - "U kunt dit later wijzigen in \'Instellingen\' > \'Apps\'" + "U kunt dit later wijzigen in Instellingen > Apps" "Altijd toestaan" "Nooit toestaan" "Simkaart verwijderd" diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 5fd500a12ab3a..18d84558dbdd6 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -1186,7 +1186,7 @@ "Conectado a um acessório USB" "Toque para ver mais opções." "Depuração USB conectada" - "Toque para desativar a depuração do USB." + "Toque para desativar a depuração USB." "Selecione para desativar a depuração USB." "Gerando relatório do bug..." "Compartilhar relatório do bug?" @@ -1621,7 +1621,7 @@ "Instalado pelo seu administrador" "Atualizado pelo seu administrador" "Excluído pelo seu administrador" - "A economia de bateria reduz o desempenho e os limites de vibração do dispositivo, os serviços de localização e a maioria dos dados em segundo plano para aumentar a duração da bateria. E-mails, mensagens e outros aplicativos que dependem de sincronização não serão atualizados, a não ser que você os abra.\n\nA economia de bateria é desligada automaticamente quando o dispositivo está sendo carregado." + "A economia de bateria reduz o desempenho do dispositivo e limita a vibração, os serviços de localização e a maioria dos dados em segundo plano para aumentar a duração da bateria. E-mails, mensagens e outros apps que dependem de sincronização não serão atualizados, a não ser que você os abra.\n\nA economia de bateria é desligada automaticamente quando o dispositivo está sendo carregado." "Para ajudar a reduzir o uso de dados, a Economia de dados impede que alguns apps enviem ou recebam dados em segundo plano. Um app que você esteja usando no momento pode acessar dados, mas com menos frequência. Isso pode significar que as imagens não serão exibidas até que você toque nelas." "Ativar Economia de dados?" "Ativar" diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index 4f1fe6d7c094a..b6d042fe148b7 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -285,7 +285,7 @@ "trimită și să vadă mesajele SMS" "Stocare" "acceseze fotografiile, conținutul media și fișierele de pe dispozitiv" - "Microfonul" + "Microfon" "înregistreze sunet" "Camera foto" "fotografieze și să înregistreze videoclipuri" diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 38573c153ae63..f174f341c6aa3 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -210,7 +210,7 @@ "Подготовка обновлений…" "Обработка обновлений…" "Перезагрузка…" - "Сброс к заводским настройкам" + "Сбросить к заводским настройкам" "Перезагрузка…" "Выключение..." "Планшетный ПК будет отключен." @@ -1231,7 +1231,7 @@ "Нажмите, чтобы показать дополнительные параметры." "Отладка по USB разрешена" "Нажмите, чтобы отключить отладку по USB." - "Нажмите, чтобы отключить отладку USB." + "Нажмите, чтобы отключить отладку по USB." "Подготовка отчета об ошибке" "Разрешить доступ к информации об ошибке?" "Отправка отчета об ошибке" diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 01ea63e74c640..9f41fa660240f 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -1231,7 +1231,7 @@ "Klepnutím zobrazíte ďalšie možnosti." "Ladenie cez USB pripojené" "Klepnutím zakážete ladenie cez USB." - "Výberom zakážete ladenie USB." + "Vyberte, ak chcete zakázať ladenie cez USB." "Preberá sa hlásenie chyby…" "Chcete zdieľať hlásenie chyby?" "Zdieľa sa hlásenie chyby…" diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index 5f458e44a2c01..ffe54ab5dd9ef 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -286,7 +286,7 @@ "dostop do koledarja" "SMS" "pošiljanje in ogled sporočil SMS" - "Prostor za shranjevanje" + "Shramba" "dostop do fotografij, predstavnosti in datotek v napravi" "Mikrofon" "snemanje zvoka" diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index 95c8155ac9122..045bbf8a4f172 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -1207,7 +1207,7 @@ "USB за MIDI" "Повезано са USB додатком" "Додирните за још опција." - "Отклањање грешака са USB-а је успостављено" + "Отклањање грешака са USB-а је омогућено" "Додирните да бисте онемогућили отклањање грешака са USB-а." "Изаберите да бисте онемогућили отклањања грешака са USB-а." "Извештај о грешци се генерише…" diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 91fffb8664f5e..172e23eb9040a 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -1187,7 +1187,7 @@ "Tryck för fler alternativ." "USB-felsökning ansluten" "Tryck om du vill inaktivera USB-felsökning." - "Välj att inaktivera USB-felsökning." + "Välj för att inaktivera USB-felsökning." "Felrapporten överförs …" "Vill du dela felrapporten?" "Felrapporten delas …" diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 727ac1ab01ec1..a14e19af52a6f 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -1110,7 +1110,7 @@ "ลงชื่อเข้าใช้เครือข่าย" - "Wi-Fi ไม่สามารถเข้าถึงอินเทอร์เน็ต" + "Wi-Fi เชื่อมต่ออินเทอร์เน็ตไม่ได้" "แตะเพื่อดูตัวเลือก" "เปลี่ยนเป็น %1$s" "อุปกรณ์จะใช้ %1$s เมื่อ %2$s ไม่สามารถเข้าถึงอินเทอร์เน็ต อาจมีค่าบริการ" @@ -1185,7 +1185,7 @@ "USB สำหรับ MIDI" "เชื่อมต่อกับอุปกรณ์เสริม USB แล้ว" "แตะเพื่อดูตัวเลือกเพิ่มเติม" - "เชื่อมต่อการแก้ไขข้อบกพร่อง USB แล้ว" + "เชื่อมต่อการแก้ไขข้อบกพร่องผ่าน USB แล้ว" "แตะเพื่อปิดใช้การแก้ไขข้อบกพร่องของ USB" "เลือกเพื่อปิดใช้งานการแก้ไขข้อบกพร่อง USB" "กำลังสร้างรายงานข้อบกพร่อง…" diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index d8826e75f8f77..0e62552ff0c9e 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -1187,7 +1187,7 @@ "Diğer seçenekler için dokunun." "USB hata ayıklaması bağlandı" "USB hata ayıklama özelliğini devre dışı bırakmak için dokunun." - "USB hata ayıklamasını devre dışı bırakmak için tıklayın." + "USB hata ayıklamasını devre dışı bırakmak için seçin." "Hata raporu alınıyor…" "Hata raporu paylaşılsın mı?" "Hata raporu paylaşılıyor..." diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index 9f8a3742e074c..92f48e2cf8eea 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -1064,7 +1064,7 @@ "Очистити налаштування за умовчанням у меню Налаштування системи > Програми > Завантажені." "Виберіть дію" "Вибрати програму для пристрою USB" - "Жодна програма не може виконати цю дію." + "Жодний додаток не може виконати цю дію." "%1$s: збій у роботі" "%1$s: збій у роботі" "Додаток %1$s періодично перестає працювати" @@ -1231,7 +1231,7 @@ "Торкніться, щоб переглянути більше опцій." "Налагодження USB завершено" "Торкніться, щоб вимкнути налагодження USB." - "Вибер., щоб вимкн. налагодж. USB." + "Виберіть, щоб вимкнути налагодження за USB" "Створюється повідомлення про помилку…" "Надіслати звіт про помилку?" "Надсилається звіт про помилку…" diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml index cc9ca045a8aac..5f50513c5845e 100644 --- a/core/res/res/values-uz/strings.xml +++ b/core/res/res/values-uz/strings.xml @@ -1438,7 +1438,7 @@ "%1$s: %2$dx%3$d, %4$d dpi" ", xavfsiz" "Grafik kalit esimdan chiqdi" - "Grafik kalit noto‘g‘ri" + "Grafik kalit xato" "Parol noto‘g‘ri" "PIN-kod noto‘g‘ri" "%1$d soniyadan so‘ng qayta urinib ko‘ring." diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index 76d7602396be5..53e3ad4f8795c 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -1185,7 +1185,7 @@ "USB cho MIDI" "Đã kết nối với phụ kiện USB" "Nhấn để biết thêm tùy chọn." - "Gỡ lỗi USB đã được kết nối" + "Đã kết nối gỡ lỗi USB" "Nhấn để vô hiệu hóa gỡ lỗi USB." "Chọn để vô hiệu hóa gỡ lỗi USB." "Đang thu thập báo cáo lỗi…" diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 68899e396b427..c4444a1b67592 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -1185,9 +1185,9 @@ "正在通过 USB 连接到 MIDI 接口" "已连接到USB配件" "点按即可查看更多选项。" - "已连接到USB调试" + "已连接到 USB 调试" "点按即可停用 USB 调试功能。" - "选择停用USB调试。" + "选择即可停用 USB 调试功能。" "正在生成错误报告…" "要分享错误报告吗？" "正在分享错误报告…" diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index a4660ae53c1a8..265aaa412b967 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -1186,8 +1186,8 @@ "已連接 USB 配件" "輕觸即可查看更多選項。" "已連接 USB 偵錯工具" - "輕觸即可停用 USB 偵錯。" - "選取以停用 USB 偵錯。" + "輕觸即可停用 USB 偵錯功能。" + "選取這個選項以停用 USB 偵錯功能。" "正在接收錯誤報告…" "要分享錯誤報告嗎？" "正在分享錯誤報告…" diff --git a/packages/SettingsLib/res/values-ar/strings.xml b/packages/SettingsLib/res/values-ar/strings.xml index 526a8d0d04c55..9b8128cbd3f59 100644 --- a/packages/SettingsLib/res/values-ar/strings.xml +++ b/packages/SettingsLib/res/values-ar/strings.xml @@ -101,7 +101,7 @@ "غير معروف" "المستخدم: %1$s" "تم تعيين بعض الإعدادات الافتراضية" - "لم يتم تعيين إعدادات افتراضية" + "لم يتم تعيين إعدادات تلقائية" "إعدادات تحويل النص إلى كلام" "إخراج تحويل النص إلى كلام" "معدل سرعة الكلام" diff --git a/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml b/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml index 1eeed3c696321..0bfda36a37d62 100644 --- a/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml +++ b/packages/SettingsLib/res/values-b+sr+Latn/arrays.xml @@ -198,7 +198,7 @@ "Razmera animacije 10x" - "Nijedno" + "Ništa" "480 piksela" "480 piksela (bezbedno)" "720 piksela" diff --git a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml index 69ee82eaa2a43..b04089aa2479f 100644 --- a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml +++ b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml @@ -340,7 +340,7 @@ "Onemogućeno" "Dozvoljeno" "Nije dozvoljeno" - "Instalirajte nepozn. apl." + "Instaliranje nepoznatih aplikacija" "Početna za Podešavanja" "0%" diff --git a/packages/SettingsLib/res/values-bs/arrays.xml b/packages/SettingsLib/res/values-bs/arrays.xml index e0b3e3612d83b..2bfb4a5749703 100644 --- a/packages/SettingsLib/res/values-bs/arrays.xml +++ b/packages/SettingsLib/res/values-bs/arrays.xml @@ -245,7 +245,7 @@ "Najviše 4 procesa" - "Puni se" + "Punjenje" "MTP (protokol za prijenos sadržaja medija)" "PTP (protokol za prijenos slika)" "RNDIS (USB Ethernet)" diff --git a/packages/SettingsLib/res/values-bs/strings.xml b/packages/SettingsLib/res/values-bs/strings.xml index 037417a231fab..eef724e09df83 100644 --- a/packages/SettingsLib/res/values-bs/strings.xml +++ b/packages/SettingsLib/res/values-bs/strings.xml @@ -193,11 +193,11 @@ "Kada je omogućeno, Wi-Fi veza će u slučaju slabog signala agresivnije predavati vezu za prijenos podataka na mobilnu vezu" "Dozvoli/Zabrani Wi-Fi lutajuće skeniranje na osnovu količine podatkovnog prometa prisutnog na sučelju" "Veličine bafera za zapisnik" - "Izaberite veličine za Logger prema međumemoriji evidencije" + "Odaberite veličine za Logger prema međumemoriji evidencije" "Želite li izbrisati trajnu pohranu zapisivača?" "Kada više ne pratimo trajnog zapisivača, trebamo u potpunosti izbrisati podatke zapisivača na vašem uređaju." "Trajno pohranjuj podatke zapisivača na uređaju" - "Izaberite međuspremnike zapisnika za trajno pohranjivanje na uređaju" + "Odaberite međuspremnike zapisnika za trajno pohranjivanje na uređaju" "Odaberite USB konfiguraciju" "Odaberite konfiguraciju USB-a" "Dozvoli lažne lokacije" diff --git a/packages/SettingsLib/res/values-ca/strings.xml b/packages/SettingsLib/res/values-ca/strings.xml index 48bf180cb0cad..f34e7b4f906e1 100644 --- a/packages/SettingsLib/res/values-ca/strings.xml +++ b/packages/SettingsLib/res/values-ca/strings.xml @@ -273,7 +273,7 @@ "Tots els errors sense resposta" "Informa que una aplicació en segon pla no respon" "Mostra avisos del canal de notificacions" - "Mostra un avís a la pantalla quan una app publica una notificació sense canal vàlid" + "Mostra un avís a la pantalla quan una aplicació publica una notificació sense un canal vàlid" "Força permís d\'aplicacions a l\'emmagatzem. extern" "Permet que qualsevol aplicació es pugui escriure en un dispositiu d’emmagatzematge extern, independentment dels valors definits" "Força l\'ajust de la mida de les activitats" @@ -364,6 +364,6 @@ "Mètodes d\'introducció actius" "Utilitza els idiomes del sistema" "No s\'ha pogut obrir la configuració de: %1$s" - "Pot ser que aquest mètode d\'entrada pugui recopilar tot el que escriviu, incloses dades personals, com ara contrasenyes i números de targetes de crèdit. Ve de l\'aplicació %1$s. Voleu utilitzar aquest mètode d\'entrada?" + "Pot ser que aquest mètode d\'introducció pugui recopilar tot el que escriviu, incloses dades personals, com ara contrasenyes i números de targetes de crèdit. Ve de l\'aplicació %1$s. Voleu utilitzar aquest mètode d\'introducció?" "Nota: després de reiniciar, l\'aplicació no s\'iniciarà fins que no desbloquegis el telèfon" diff --git a/packages/SettingsLib/res/values-da/arrays.xml b/packages/SettingsLib/res/values-da/arrays.xml index 0647b4f5bc045..6c322ed741bbc 100644 --- a/packages/SettingsLib/res/values-da/arrays.xml +++ b/packages/SettingsLib/res/values-da/arrays.xml @@ -49,9 +49,9 @@ "Undgår midlertidigt dårlig forbindelse" - "Kontrollér aldrig" - "Kontrollér kun for DRM-indhold" - "Kontrollér altid" + "Tjek aldrig" + "Tjek kun for DRM-indhold" + "Tjek altid" "Brug aldrig HDCP-kontrol" diff --git a/packages/SettingsLib/res/values-eu/strings.xml b/packages/SettingsLib/res/values-eu/strings.xml index 33b9bdcfe816d..92d5ae54485c9 100644 --- a/packages/SettingsLib/res/values-eu/strings.xml +++ b/packages/SettingsLib/res/values-eu/strings.xml @@ -272,7 +272,7 @@ "Atzeko planoko prozesuen muga" "Erakutsi ANR guztiak" "\"Erantzunik ez\" mezua atz. planoko aplikazioetarako" - "Erakutsi jakinarazpenen kanaleko abisuak" + "Erakutsi jakinarazpenen kanalen abisuak" "Bistaratu abisuak aplikazioek baliozko kanalik gabeko jakinarazpenak argitaratzean" "Behartu aplikazioak onartzea kanpoko biltegian" "Aplikazioek kanpoko memorian idatz dezakete, manifestuaren balioak kontuan izan gabe" diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml index 166403b6d350f..96a73ff944131 100644 --- a/packages/SettingsLib/res/values-fr/strings.xml +++ b/packages/SettingsLib/res/values-fr/strings.xml @@ -340,7 +340,7 @@ "Désactivée" "Autorisé" "Non autorisé" - "Installation d\'applications inconnues" + "Installation d\'applis inconnues" "Paramètres" "0 %" diff --git a/packages/SettingsLib/res/values-in/arrays.xml b/packages/SettingsLib/res/values-in/arrays.xml index 0b19a7b6b3827..7f02a6a29fa17 100644 --- a/packages/SettingsLib/res/values-in/arrays.xml +++ b/packages/SettingsLib/res/values-in/arrays.xml @@ -45,7 +45,7 @@ "Diputus dari %1$s…" "Sambungan terputus" "Gagal" - "Dicekal" + "Diblokir" "Menghindari sambungan buruk untuk sementara" diff --git a/packages/SettingsLib/res/values-in/strings.xml b/packages/SettingsLib/res/values-in/strings.xml index 4e2ffdee502cb..28e98261a188e 100644 --- a/packages/SettingsLib/res/values-in/strings.xml +++ b/packages/SettingsLib/res/values-in/strings.xml @@ -340,7 +340,7 @@ "Dinonaktifkan" "Diizinkan" "Tidak diizinkan" - "Instal aplikasi yang tidak dikenal" + "Menginstal aplikasi yang tidak dikenal" "Layar Utama Setelan" "0%" diff --git a/packages/SettingsLib/res/values-it/strings.xml b/packages/SettingsLib/res/values-it/strings.xml index c8aa2005b9bd6..dee6b4292470f 100644 --- a/packages/SettingsLib/res/values-it/strings.xml +++ b/packages/SettingsLib/res/values-it/strings.xml @@ -101,7 +101,7 @@ "Sconosciuta" "Utente: %1$s" "Alcune opzioni predefinite impostate" - "Nessuna app predefinita impostata" + "Nessuna impostazione predefinita" "Impostazioni di sintesi vocale" "Output sintesi vocale" "Velocità voce" diff --git a/packages/SettingsLib/res/values-iw/arrays.xml b/packages/SettingsLib/res/values-iw/arrays.xml index 239e8cbf600e0..917f7108b8512 100644 --- a/packages/SettingsLib/res/values-iw/arrays.xml +++ b/packages/SettingsLib/res/values-iw/arrays.xml @@ -152,11 +152,11 @@ "כבוי" - "‏64K לכל מאגר יומן" - "‏256K לכל מאגר יומן" - "‏1M לכל מאגר יומן" - "‏4M לכל מאגר יומן" - "‏16M לכל מאגר יומן" + "‏64K לכל מאגר של יומן רישום" + "‏256K לכל מאגר של יומן רישום" + "‏1M לכל מאגר של יומן רישום" + "‏4M לכל מאגר של יומן רישום" + "‏16M לכל מאגר של יומן רישום" "כבוי" diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml index 32f3e52d8383d..eb4cc10e36bb6 100644 --- a/packages/SettingsLib/res/values-ja/strings.xml +++ b/packages/SettingsLib/res/values-ja/strings.xml @@ -101,7 +101,7 @@ "不明" "ユーザー: %1$s" "一部デフォルトを設定" - "既定の設定なし" + "デフォルトの設定なし" "テキスト読み上げの設定" "テキスト読み上げの出力" "音声の速度" diff --git a/packages/SettingsLib/res/values-ko/strings.xml b/packages/SettingsLib/res/values-ko/strings.xml index 1b7557494b2e7..0f4224a67680d 100644 --- a/packages/SettingsLib/res/values-ko/strings.xml +++ b/packages/SettingsLib/res/values-ko/strings.xml @@ -77,7 +77,7 @@ "페어링" "페어링" "취소" - "페어링하면 연결 시 주소록 및 통화 기록에 액세스할 수 있습니다." + "페어링하면 연결 시 연락처 및 통화 기록에 액세스할 수 있습니다." "%1$s와(과) 페어링하지 못했습니다." "PIN 또는 패스키가 잘못되어 %1$s와(과) 페어링하지 못했습니다." "%1$s와(과) 통신할 수 없습니다." diff --git a/packages/SettingsLib/res/values-ky/arrays.xml b/packages/SettingsLib/res/values-ky/arrays.xml index 1d7a9a4284e50..9c8e28a1e42d7 100644 --- a/packages/SettingsLib/res/values-ky/arrays.xml +++ b/packages/SettingsLib/res/values-ky/arrays.xml @@ -50,8 +50,8 @@ "Эч качан текшерилбесин" - "DRM мазмунун гана текшерүү" - "Ар дайым текшерүү" + "DRM мазмуну гана текшерилсин" + "Ар дайым текшерилсин" "Эч качан HDCP текшерүү колдонулбасын" diff --git a/packages/SettingsLib/res/values-mk/arrays.xml b/packages/SettingsLib/res/values-mk/arrays.xml index 16ba33608b691..2da43f0925b83 100644 --- a/packages/SettingsLib/res/values-mk/arrays.xml +++ b/packages/SettingsLib/res/values-mk/arrays.xml @@ -248,7 +248,7 @@ "Се полни" "МТП (Протокол за трансфер на медиуми)" "ПТП (Протокол за трансфер на слика)" - "РНДИС (УСБ за етернет)" + "РНДИС (USB за етернет)" "Аудиоизвор" "МИДИ" diff --git a/packages/SettingsLib/res/values-my/arrays.xml b/packages/SettingsLib/res/values-my/arrays.xml index 85d600210f72d..97a9c53a70ff9 100644 --- a/packages/SettingsLib/res/values-my/arrays.xml +++ b/packages/SettingsLib/res/values-my/arrays.xml @@ -137,7 +137,7 @@ "အကောင်းဆုံးကြိုးပမ်းမှု (ပေးပို့နှုန်း အလိုက်)" - "ပိတ်ပါ" + "ပိတ်ရန်" "64K" "256K" "1M" @@ -145,13 +145,13 @@ "16M" - "ပိတ်ပါ" + "ပိတ်ရန်" "64K" "256K" "1M" - "ပိတ်ပါ" + "ပိတ်ရန်" "မှတ်တမ်းယာယီကြားခံနယ်တစ်ခုလျှင် 64K" "မှတ်တမ်းယာယီကြားခံနယ်တစ်ခုလျှင် 256K" "မှတ်တမ်းယာယီကြားခံနယ်တစ်ခုလျှင် 1M" @@ -159,13 +159,13 @@ "မှတ်တမ်းယာယီကြားခံနယ်တစ်ခုလျှင် 16M" - "ပိတ်ပါ" + "ပိတ်ရန်" "အားလုံး" "ရေဒီယိုမှလွဲ၍ အားလုံး" "ကာနယ်သာ" - "ပိတ်ပါ" + "ပိတ်ရန်" "မှတ်တမ်းသိမ်းဆည်းရန် လျာထားချက်များ အားလုံး" "ရေဒီယို မှတ်တမ်းသိမ်းဆည်းရန်လျာထားချက်မှလွဲ၍ အားလုံး" "ကာနယ်မှတ်တမ်းသိမ်းဆည်းရန် လျာထားချက်သာ" @@ -218,17 +218,17 @@ "glGetError အမှားတက်လျှင်ခေါ်သောလုပ်ငန်းစဉ်" - "ပိတ်" + "ပိတ်ရန်" "စတုဂံမဟုတ်သော ဖောက်ရန်အပိုင်းကို အပြာရောင်ဖြင့်ဆွဲပါ" "စမ်းသပ်ထားသော ပုံဆွဲရန်ညွှန်ကြားချက်များကို အစိမ်းရောင်ဖြင့် အသားပေး ဖော်ပြပါ" - "ပိတ်" + "ပိတ်ရန်" "ဖန်သားပြင်ပေါ်မှာ မျဉ်းတန်းကဲ့သို့" "adb shell dumpsys gfxinfo ဖြင့်" - "ပိတ်" + "ပိတ်ရန်" "ရှိရင်းစွဲထက်ပိုသော ဧရိယာများကိုပြရန်" "အရောင်ရောနှောသောဧရိယာများပြရန်" diff --git a/packages/SettingsLib/res/values-pt/strings.xml b/packages/SettingsLib/res/values-pt/strings.xml index 98ef4cb512b67..e0683a8fc3140 100644 --- a/packages/SettingsLib/res/values-pt/strings.xml +++ b/packages/SettingsLib/res/values-pt/strings.xml @@ -81,7 +81,7 @@ "Não foi possível parear com %1$s." "Não foi possível parear com %1$s por causa de um PIN ou senha incorretos." "Não é possível se comunicar com %1$s." - "Emparelhamento rejeitado por %1$s." + "Pareamento rejeitado por %1$s." "Wi-Fi desligado." "Wi-Fi desconectado" "Uma barra de Wi-Fi." diff --git a/packages/SettingsLib/res/values-ru/strings.xml b/packages/SettingsLib/res/values-ru/strings.xml index a4006f9dfc4e4..90d9c338371df 100644 --- a/packages/SettingsLib/res/values-ru/strings.xml +++ b/packages/SettingsLib/res/values-ru/strings.xml @@ -50,7 +50,7 @@ "Профиль HSP/HFP" "Профиль OPP" "Профиль HID" - "Интернет-доступ" + "Доступ к Интернету" "Обмен контактами" "Использовать для обмена контактами" "Профиль PAN" @@ -74,12 +74,12 @@ "Использовать для аудиоустройства телефона" "Используется для передачи файлов" "Использовать для ввода" - "Подключить" - "ПОДКЛЮЧИТЬ" + "Добавить" + "ДОБАВИТЬ" "Отмена" "Сопряжение обеспечивает доступ к вашим контактам и журналу звонков при подключении." - "Не удалось подключиться к устройству \"%1$s\"." - "Не удалось подключиться к устройству \"%1$s\", так как введен неверный PIN-код или пароль." + "Не удалось установить сопряжение с устройством \"%1$s\"." + "Не удалось установить сопряжение с устройством \"%1$s\", так как введен неверный PIN-код или пароль." "Не удается установить соединение с устройством \"%1$s\"." "%1$s не разрешает сопряжение." "Wi-Fi выключен" @@ -204,7 +204,7 @@ "Разрешить использование фиктивных местоположений" "Включить проверку атрибутов" "Не отключать передачу данных по мобильной сети даже при активном Wi-Fi-подключении (для быстрого переключения между сетями)." - "Разрешить отладку USB?" + "Разрешить отладку по USB?" "Отладка по USB – это режим, который позволяет использовать ваше устройство как внешний накопитель: перемещать файлы (с компьютера и на компьютер), напрямую устанавливать приложения, а также просматривать системные журналы." "Запретить доступ к USB-отладке для всех компьютеров, которым он был разрешен?" "Изменение настроек" diff --git a/packages/SettingsLib/res/values-sr/arrays.xml b/packages/SettingsLib/res/values-sr/arrays.xml index f57989b6d1b54..ef1c9de94847a 100644 --- a/packages/SettingsLib/res/values-sr/arrays.xml +++ b/packages/SettingsLib/res/values-sr/arrays.xml @@ -198,7 +198,7 @@ "Размера анимације 10x" - "Ниједно" + "Ништа" "480 пиксела" "480 пиксела (безбедно)" "720 пиксела" diff --git a/packages/SettingsLib/res/values-sr/strings.xml b/packages/SettingsLib/res/values-sr/strings.xml index d87840bed31dc..e7dfc4c019380 100644 --- a/packages/SettingsLib/res/values-sr/strings.xml +++ b/packages/SettingsLib/res/values-sr/strings.xml @@ -340,7 +340,7 @@ "Онемогућено" "Дозвољено" "Није дозвољено" - "Инсталирајте непозн. апл." + "Инсталирање непознатих апликација" "Почетна за Подешавања" "0%" diff --git a/packages/SettingsLib/res/values-th/strings.xml b/packages/SettingsLib/res/values-th/strings.xml index f9cf10e6d066f..d31ca04ff9667 100644 --- a/packages/SettingsLib/res/values-th/strings.xml +++ b/packages/SettingsLib/res/values-th/strings.xml @@ -46,7 +46,7 @@ "เชื่อมต่อแล้ว (ยกเว้นเสียงสื่อ)" "เชื่อมต่อแล้ว (ไม่มีการเข้าถึงข้อความ)" "เชื่อมต่อ (ยกเว้นเสียงโทรศัพท์หรือสื่อ)" - "เสียงสื่อ" + "เสียงของสื่อ" "เสียงโทรศัพท์" "การถ่ายโอนไฟล์" "อุปกรณ์อินพุต" diff --git a/packages/SettingsLib/res/values-tr/strings.xml b/packages/SettingsLib/res/values-tr/strings.xml index 6a925626c552c..53163572ab37b 100644 --- a/packages/SettingsLib/res/values-tr/strings.xml +++ b/packages/SettingsLib/res/values-tr/strings.xml @@ -41,7 +41,7 @@ "Bağlantı kesiliyor…" "Bağlanıyor…" "Bağlandı" - "Eşleştiriliyor…" + "Eşleniyor…" "Bağlandı (telefon yok)" "Bağlandı (medya yok)" "Bağlı (mesaj erişimi yok)" @@ -74,14 +74,14 @@ "Telefon sesi için kullan" "Dosya aktarımı için kullan" "Giriş için kullan" - "Eşleştir" - "EŞLEŞTİR" + "Eşle" + "EŞLE" "İptal" "Eşleme işlemi, bağlantı kurulduğunda kişilerinize ve çağrı geçmişine erişim izni verir." - "%1$s ile eşleştirilemedi." - "PIN veya parola yanlış olduğundan %1$s ile eşleştirilemedi" + "%1$s ile eşlenemedi." + "PIN veya parola yanlış olduğundan %1$s ile eşlenemedi" "%1$s ile iletişim kurulamıyor." - "Eşleştirme %1$s tarafından reddedildi." + "Eşleme %1$s tarafından reddedildi." "Kablosuz kapalı." "Kablosuz bağlantı kesildi." "Kablosuz sinyal gücü tek çubuk." diff --git a/packages/SettingsLib/res/values-uz/arrays.xml b/packages/SettingsLib/res/values-uz/arrays.xml index 76be77188c7a6..1d4e1e9869546 100644 --- a/packages/SettingsLib/res/values-uz/arrays.xml +++ b/packages/SettingsLib/res/values-uz/arrays.xml @@ -22,7 +22,7 @@ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - "Tekshirib chiqilmoqda…" + "Qidiruv…" "Ulanmoqda…" "Tasdiqdan o‘tilmoqda…" "IP manzil o‘zlashtirilmoqda…" @@ -36,7 +36,7 @@ - "Tekshirilmoqda…" + "Qidiruv…" "%1$s tarmog‘iga ulanilmoqda…" "%1$s bilan aloqa o‘rnatilyapti…" "%1$s IP manzil beryapti…" @@ -223,7 +223,7 @@ "Chizmaning sinov buyruqlarini yashil bilan" - "O‘chirib qo‘yish" + "Faolsizlantirish" "Ekranda bo‘laklar tarzida" "“adb shell dumpsys gfxinfo” buyrug‘ida" diff --git a/packages/SettingsLib/res/values-zh-rCN/strings.xml b/packages/SettingsLib/res/values-zh-rCN/strings.xml index 3bbacd807c931..10a077b270f5d 100644 --- a/packages/SettingsLib/res/values-zh-rCN/strings.xml +++ b/packages/SettingsLib/res/values-zh-rCN/strings.xml @@ -101,7 +101,7 @@ "未知" "用户：%1$s" "已设置部分默认选项" - "未设置任何默认选项" + "没有默认操作" "文字转语音设置" "文字转语音 (TTS) 输出" "语速" @@ -151,9 +151,9 @@ "此用户无权修改VPN设置" "此用户无权修改网络共享设置" "此用户无权修改接入点名称设置" - "USB调试" + "USB 调试" "连接USB后启用调试模式" - "撤消USB调试授权" + "撤消 USB 调试授权" "错误报告快捷方式" "在电源菜单中显示用于提交错误报告的按钮" "不锁定屏幕" @@ -204,9 +204,9 @@ "允许模拟位置" "启用视图属性检查功能" "始终开启移动数据网络，即使 WLAN 网络已开启（便于快速切换网络）。" - "是否允许USB调试？" + "是否允许 USB 调试？" "USB 调试仅用于开发目的。该功能可用于在您的计算机和设备之间复制数据、在您的设备上安装应用（事先不发通知）以及读取日志数据。" - "是否针对您之前授权的所有计算机撤消USB调试的访问权限？" + "是否针对您之前授权的所有计算机撤消 USB 调试的访问权限？" "允许开发设置？" "这些设置仅适用于开发工作。一旦启用，会导致您的设备以及设备上的应用崩溃或出现异常。" "通过USB验证应用" @@ -223,7 +223,7 @@ "调试应用：%1$s" "选择应用" "无" - "等待调试器" + "等待调试程序" "调试应用会在执行前等待附加调试器" "电话监控器" "电话监控器会在检测到电话/调制解调器功能存在问题时收集相关日志，并向用户发出通知，提醒用户提交错误报告" diff --git a/packages/SettingsLib/res/values-zh-rHK/strings.xml b/packages/SettingsLib/res/values-zh-rHK/strings.xml index fe4fb3c4e34ca..accfb3f18f19d 100644 --- a/packages/SettingsLib/res/values-zh-rHK/strings.xml +++ b/packages/SettingsLib/res/values-zh-rHK/strings.xml @@ -51,8 +51,8 @@ "檔案傳輸" "輸入裝置" "互聯網連線" - "聯絡人共用" - "用於聯絡人共用" + "共用聯絡人" + "用於共用聯絡人" "互聯網連線分享" "訊息存取權" "SIM 卡存取" diff --git a/packages/SettingsLib/res/values-zh-rTW/strings.xml b/packages/SettingsLib/res/values-zh-rTW/strings.xml index 33b973d72a383..9a0b1bf6433cd 100644 --- a/packages/SettingsLib/res/values-zh-rTW/strings.xml +++ b/packages/SettingsLib/res/values-zh-rTW/strings.xml @@ -79,7 +79,7 @@ "取消" "配對完成後，所配對的裝置即可在連線後存取你的聯絡人和通話紀錄。" "無法與 %1$s 配對。" - "無法與 %1$s 配對，因為 PIN 或密碼金鑰不正確。" + "無法與 %1$s 配對，因為 PIN 碼或密碼金鑰不正確。" "無法與 %1$s 通訊。" "「%1$s」拒絕配對要求。" "已關閉 Wi-Fi。" diff --git a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml index 871d2cf9c6629..7e208c2174011 100644 --- a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml @@ -91,12 +91,12 @@ "Desenhou a sequência de desbloqueio incorretamente %1$d vezes. Após mais %2$d tentativas sem êxito, ser-lhe-á pedido para desbloquear o telemóvel através de uma conta de email.\n\n Tente novamente dentro de %3$d segundos." "Código PIN do cartão SIM incorreto. Tem de contactar o seu operador para desbloquear o dispositivo." - Código PIN do cartão SIM incorreto. Tem mais %d tentativa antes de precisar de contactar o seu operador para desbloquear o dispositivo. + Incorrect SIM PIN code, you have %d remaining attempts. Código PIN do cartão SIM incorreto. Tem mais %d tentativas. "Cartão SIM inutilizável. Contacte o seu operador." - Código PUK do cartão SIM incorreto. Tem mais %d tentativa antes de o cartão SIM ficar permanentemente inutilizável. + Incorrect SIM PUK code, you have %d remaining attempts before SIM becomes permanently unusable. Código PUK do cartão SIM incorreto. Tem mais %d tentativas antes de o cartão SIM ficar permanentemente inutilizável. "Falha ao introduzir o PIN do cartão SIM!" @@ -117,15 +117,15 @@ "Dispositivo bloqueado pelo administrador" "O dispositivo foi bloqueado manualmente" - O dispositivo não é desbloqueado há %d hora. Confirme o padrão. + Device hasn\'t been unlocked for %d hours. Confirm pattern. O dispositivo não é desbloqueado há %d horas. Confirme o padrão. - O dispositivo não é desbloqueado há %d hora. Confirme o PIN. + Device hasn\'t been unlocked for %d hours. Confirm PIN. O dispositivo não é desbloqueado há %d horas. Confirme o PIN. - O dispositivo não é desbloqueado há %d hora. Confirme a palavra-passe. + Device hasn\'t been unlocked for %d hours. Confirm password. O dispositivo não é desbloqueado há %d horas. Confirme a palavra-passe. "Não reconhecido" diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index a8bdd9191760e..7cd023cd39d79 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -214,10 +214,10 @@ "Bluetooth conectado." "O Bluetooth foi desativado." "O Bluetooth foi ativado." - "Relatório de localização desativado." - "Relatório de localização ativado." - "O Relatório de localização foi desativado." - "O Relatório de localização foi ativado." + "Relatório de Localização desativado." + "Relatório de Localização ativado." + "O Relatório de Localização foi desativado." + "O Relatório de Localização foi ativado." "Alarme definido para %s." "Fechar painel." "Mais tempo." diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 65b130b3c62f6..fe0859ef4b9ce 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -26,7 +26,7 @@ "Os ecrãs recentes aparecem aqui" "Ignorar aplicações recentes" - 1 ecrã na Vista geral + %d screens in Overview %d ecrãs na Vista geral "Sem notificações" @@ -252,7 +252,7 @@ "Limpar todas as notificações." "+ %s" - Mais %s notificação no grupo. + %s more notifications inside. Mais %s notificações no grupo. "Definições de notificação" @@ -552,12 +552,12 @@ "%d categorias de notificação" "Esta aplicação não tem categorias de notificação" - 1 de %d categoria de notificação desta aplicação + 1 out of %d notification categories from this app 1 de %d categorias de notificação desta aplicação "%1$s, %2$s" - %1$s, %2$s e mais %3$d + %1$s, %2$s, and %3$d others %1$s, %2$s e mais %3$d "Controlos de notificações da aplicação %1$s abertos" @@ -718,8 +718,8 @@ "Minimizar" "Fechar" "Arrastar para baixo para ignorar" - "Menu de ecrã no ecrã" - "A aplicação %s está no modo de ecrã no ecrã" + "Menu de imagem na imagem" + "A aplicação %s está no modo de imagem na imagem" "Se não pretende que a aplicação %s utilize esta funcionalidade, toque para abrir as definições e desative-a." "Reproduzir" "Colocar em pausa" diff --git a/packages/SystemUI/res/values-pt-rPT/strings_tv.xml b/packages/SystemUI/res/values-pt-rPT/strings_tv.xml index ee90009d3dc29..a621877ef317d 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings_tv.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings_tv.xml @@ -19,7 +19,7 @@ - "Ecrã no ecrã" + "Imagem na imagem" "(Sem título do programa)" "Fechar PIP" "Ecrã inteiro" diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 3791c8d3abfbc..4b12bc48b49e7 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -39,7 +39,9 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; +import android.content.pm.PackageManager; import android.content.res.Configuration; +import android.content.res.Resources; import android.database.ContentObserver; import android.net.ConnectivityManager; import android.net.ConnectivityManager.PacketKeepalive; @@ -98,6 +100,7 @@ import android.text.TextUtils; import android.util.LocalLog; import android.util.LocalLog.ReadOnlyLocalLog; import android.util.Log; +import android.util.Pair; import android.util.Slog; import android.util.SparseArray; import android.util.SparseBooleanArray; @@ -119,6 +122,7 @@ import com.android.internal.util.IndentingPrintWriter; import com.android.internal.util.MessageUtils; import com.android.internal.util.WakeupMessage; import com.android.internal.util.XmlUtils; +import com.android.server.LocalServices; import com.android.server.am.BatteryStatsService; import com.android.server.connectivity.DataConnectionStats; import com.android.server.connectivity.KeepaliveTracker; @@ -380,11 +384,6 @@ public class ConnectivityService extends IConnectivityManager.Stub */ private static final int EVENT_REGISTER_NETWORK_LISTENER_WITH_INTENT = 31; - /** - * - */ - private static final int EVENT_CONFIGURE_NET_TRANSITION_WAKELOCK_OVERRIDE = 32; - /** Handler thread used for both of the handlers below. */ @VisibleForTesting protected final HandlerThread mHandlerThread; @@ -879,23 +878,6 @@ public class ConnectivityService extends IConnectivityManager.Stub } } - private void updateNetTransitionWakelockOverride() { - int override = Settings.Global.getInt( - mContext.getContentResolver(), - Settings.Global.NET_TRANSITION_WAKELOCK_OVERRIDE_MS, - -1); - if (override >= 0) { - mNetTransitionWakeLockTimeout = override; - if (DBG) log("mNetTransitionWakeLockTimeout overridden to " + - mNetTransitionWakeLockTimeout + " ms"); - } else { - mNetTransitionWakeLockTimeout = mContext.getResources().getInteger( - com.android.internal.R.integer.config_networkTransitionTimeout); - if (DBG) log("mNetTransitionWakeLockTimeout configured to " + - mNetTransitionWakeLockTimeout + " ms"); - } - } - private void registerSettingsCallbacks() { // Watch for global HTTP proxy changes. mSettingsObserver.observe( @@ -906,11 +888,6 @@ public class ConnectivityService extends IConnectivityManager.Stub mSettingsObserver.observe( Settings.Global.getUriFor(Settings.Global.MOBILE_DATA_ALWAYS_ON), EVENT_CONFIGURE_MOBILE_DATA_ALWAYS_ON); - - // Watch for changes to the override of the net transition wakelock duration. - mSettingsObserver.observe( - Settings.Global.getUriFor(Settings.Global.NET_TRANSITION_WAKELOCK_OVERRIDE_MS), - EVENT_CONFIGURE_NET_TRANSITION_WAKELOCK_OVERRIDE); } private synchronized int nextNetworkRequestId() { @@ -1661,9 +1638,6 @@ public class ConnectivityService extends IConnectivityManager.Stub // Configure whether mobile data is always on. mHandler.sendMessage(mHandler.obtainMessage(EVENT_CONFIGURE_MOBILE_DATA_ALWAYS_ON)); - mHandler.sendMessage( - mHandler.obtainMessage(EVENT_CONFIGURE_NET_TRANSITION_WAKELOCK_OVERRIDE)); - mHandler.sendMessage(mHandler.obtainMessage(EVENT_SYSTEM_READY)); mPermissionMonitor.startMonitoring(); @@ -2877,10 +2851,6 @@ public class ConnectivityService extends IConnectivityManager.Stub handleMobileDataAlwaysOn(); break; } - case EVENT_CONFIGURE_NET_TRANSITION_WAKELOCK_OVERRIDE: { - updateNetTransitionWakelockOverride(); - break; - } // Sent by KeepaliveTracker to process an app request on the state machine thread. case NetworkAgent.CMD_START_PACKET_KEEPALIVE: { mKeepaliveTracker.handleStartKeepalive(msg); @@ -3053,10 +3023,6 @@ public class ConnectivityService extends IConnectivityManager.Stub // becomes CONNECTED, whichever happens first. The timer is started by the // first caller and not restarted by subsequent callers. private void requestNetworkTransitionWakelock(String forWhom) { - if (mNetTransitionWakeLockTimeout <= 0) { - return; - } - int serialNum = 0; synchronized (this) { if (mNetTransitionWakeLock.isHeld()) return; diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index c21ccd885e979..a31c33e4ab91f 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1093,9 +1093,6 @@ class ActivityStarter { top.getTask().setIntent(mStartActivity); } ActivityStack.logStartActivity(AM_NEW_INTENT, mStartActivity, top.getTask()); - if (shouldActivityBeBroughtToFront(reusedActivity)) { - mStartActivity.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT); - } top.deliverNewIntentLocked(mCallingUid, mStartActivity.intent, mStartActivity.launchedFromPackage); } @@ -1567,16 +1564,6 @@ class ActivityStarter { return DEFAULT_DISPLAY; } - private boolean shouldActivityBeBroughtToFront(ActivityRecord intentActivity) { - final ActivityStack focusStack = mSupervisor.getFocusedStack(); - ActivityRecord curTop = (focusStack == null) - ? null : focusStack.topRunningNonDelayedActivityLocked(mNotTop); - final TaskRecord topTask = curTop != null ? curTop.getTask() : null; - return topTask != null - && (topTask != intentActivity.getTask() || topTask != focusStack.topTask()) - && !mAvoidMoveToFront; - } - /** * Figure out which task and activity to bring to front when we have found an existing matching * activity record in history. May also clear the task if needed. @@ -1591,8 +1578,14 @@ class ActivityStarter { // the same behavior as if a new instance was being started, which means not bringing it // to the front if the caller is not itself in the front. final ActivityStack focusStack = mSupervisor.getFocusedStack(); + ActivityRecord curTop = (focusStack == null) + ? null : focusStack.topRunningNonDelayedActivityLocked(mNotTop); - if (shouldActivityBeBroughtToFront(intentActivity)) { + final TaskRecord topTask = curTop != null ? curTop.getTask() : null; + if (topTask != null + && (topTask != intentActivity.getTask() || topTask != focusStack.topTask()) + && !mAvoidMoveToFront) { + mStartActivity.intent.addFlags(Intent.FLAG_ACTIVITY_BROUGHT_TO_FRONT); if (mSourceRecord == null || (mSourceStack.topActivity() != null && mSourceStack.topActivity().getTask() == mSourceRecord.getTask())) { // We really do want to push this one into the user's face, right now. diff --git a/services/core/java/com/android/server/dreams/DreamManagerService.java b/services/core/java/com/android/server/dreams/DreamManagerService.java index 77587f9cec6a7..dbccc0765b739 100644 --- a/services/core/java/com/android/server/dreams/DreamManagerService.java +++ b/services/core/java/com/android/server/dreams/DreamManagerService.java @@ -86,7 +86,6 @@ public final class DreamManagerService extends SystemService { private boolean mCurrentDreamCanDoze; private boolean mCurrentDreamIsDozing; private boolean mCurrentDreamIsWaking; - private Runnable mStopDreamRunnable; private int mCurrentDreamDozeScreenState = Display.STATE_UNKNOWN; private int mCurrentDreamDozeScreenBrightness = PowerManager.BRIGHTNESS_DEFAULT; @@ -355,12 +354,6 @@ public final class DreamManagerService extends SystemService { && mCurrentDreamCanDoze == canDoze && mCurrentDreamUserId == userId) { Slog.i(TAG, "Already in target dream."); - // If dream is waking, cancel the wake. - mCurrentDreamIsWaking = false; - if (mStopDreamRunnable != null) { - mHandler.removeCallbacks(mStopDreamRunnable); - mStopDreamRunnable = null; - } return; } @@ -393,15 +386,13 @@ public final class DreamManagerService extends SystemService { mCurrentDreamIsWaking = true; } - mStopDreamRunnable = new Runnable() { + mHandler.post(new Runnable() { @Override public void run() { Slog.i(TAG, "Performing gentle wake from dream."); mController.stopDream(immediate); - mStopDreamRunnable = null; } - }; - mHandler.post(mStopDreamRunnable); + }); } } diff --git a/services/core/java/com/android/server/input/InputManagerService.java b/services/core/java/com/android/server/input/InputManagerService.java index 717efbf714db2..907b5c1c43304 100644 --- a/services/core/java/com/android/server/input/InputManagerService.java +++ b/services/core/java/com/android/server/input/InputManagerService.java @@ -232,9 +232,6 @@ public class InputManagerService extends IInputManager.Stub private static native void nativeReloadDeviceAliases(long ptr); private static native String nativeDump(long ptr); private static native void nativeMonitor(long ptr); - private static native boolean nativeIsInputDeviceEnabled(long ptr, int deviceId); - private static native void nativeEnableInputDevice(long ptr, int deviceId); - private static native void nativeDisableInputDevice(long ptr, int deviceId); private static native void nativeSetPointerIconType(long ptr, int iconId); private static native void nativeReloadPointerIcons(long ptr); private static native void nativeSetCustomPointerIcon(long ptr, PointerIcon icon); @@ -653,32 +650,6 @@ public class InputManagerService extends IInputManager.Stub return null; } - // Binder call - @Override - public boolean isInputDeviceEnabled(int deviceId) { - return nativeIsInputDeviceEnabled(mPtr, deviceId); - } - - // Binder call - @Override - public void enableInputDevice(int deviceId) { - if (!checkCallingPermission(android.Manifest.permission.DISABLE_INPUT_DEVICE, - "enableInputDevice()")) { - throw new SecurityException("Requires DISABLE_INPUT_DEVICE permission"); - } - nativeEnableInputDevice(mPtr, deviceId); - } - - // Binder call - @Override - public void disableInputDevice(int deviceId) { - if (!checkCallingPermission(android.Manifest.permission.DISABLE_INPUT_DEVICE, - "disableInputDevice()")) { - throw new SecurityException("Requires DISABLE_INPUT_DEVICE permission"); - } - nativeDisableInputDevice(mPtr, deviceId); - } - /** * Gets the ids of all input devices in the system. * @return The input device ids. diff --git a/services/core/java/com/android/server/wm/WallpaperController.java b/services/core/java/com/android/server/wm/WallpaperController.java index 45a6a536d2e86..7213c9518d163 100644 --- a/services/core/java/com/android/server/wm/WallpaperController.java +++ b/services/core/java/com/android/server/wm/WallpaperController.java @@ -358,14 +358,7 @@ class WallpaperController { Bundle sendWindowWallpaperCommand( WindowState window, String action, int x, int y, int z, Bundle extras, boolean sync) { - - // HACK(ewol): Custom whitelist for Wear Home app, to allow it to update the wallpaper - // regardless of what window is targeted. - // http://b/32172459 - final boolean hackWearWhitelisted = (window != null) && (window.mAttrs != null) - && "com.google.android.wearable.app".equals(window.mAttrs.packageName); - - if (hackWearWhitelisted || window == mWallpaperTarget || window == mPrevWallpaperTarget) { + if (window == mWallpaperTarget || window == mPrevWallpaperTarget) { boolean doWait = sync; for (int curTokenNdx = mWallpaperTokens.size() - 1; curTokenNdx >= 0; curTokenNdx--) { final WallpaperWindowToken token = mWallpaperTokens.get(curTokenNdx); diff --git a/services/core/jni/com_android_server_input_InputManagerService.cpp b/services/core/jni/com_android_server_input_InputManagerService.cpp index ac02bec99c6a1..6f24e7e6197ff 100644 --- a/services/core/jni/com_android_server_input_InputManagerService.cpp +++ b/services/core/jni/com_android_server_input_InputManagerService.cpp @@ -36,7 +36,6 @@ #include #include #include -#include #include #include @@ -204,7 +203,6 @@ public: void setInputDispatchMode(bool enabled, bool frozen); void setSystemUiVisibility(int32_t visibility); void setPointerSpeed(int32_t speed); - void setInputDeviceEnabled(uint32_t deviceId, bool enabled); void setShowTouches(bool enabled); void setInteractive(bool interactive); void reloadCalibration(); @@ -290,9 +288,6 @@ private: // Pointer controller singleton, created and destroyed as needed. wp pointerController; - - // Input devices to be disabled - SortedVector disabledInputDevices; } mLocked; std::atomic mInteractive; @@ -517,8 +512,6 @@ void NativeInputManager::getReaderConfiguration(InputReaderConfiguration* outCon outConfig->setPhysicalDisplayViewport(ViewportType::VIEWPORT_EXTERNAL, mLocked.externalViewport); outConfig->setVirtualDisplayViewports(mLocked.virtualViewports); - - outConfig->disabledDevices = mLocked.disabledInputDevices; } // release lock } @@ -808,24 +801,6 @@ void NativeInputManager::setPointerSpeed(int32_t speed) { InputReaderConfiguration::CHANGE_POINTER_SPEED); } -void NativeInputManager::setInputDeviceEnabled(uint32_t deviceId, bool enabled) { - { // acquire lock - AutoMutex _l(mLock); - - ssize_t index = mLocked.disabledInputDevices.indexOf(deviceId); - bool currentlyEnabled = index < 0; - if (!enabled && currentlyEnabled) { - mLocked.disabledInputDevices.add(deviceId); - } - if (enabled && !currentlyEnabled) { - mLocked.disabledInputDevices.remove(deviceId); - } - } // release lock - - mInputManager->getReader()->requestRefreshConfiguration( - InputReaderConfiguration::CHANGE_ENABLED_STATE); -} - void NativeInputManager::setShowTouches(bool enabled) { { // acquire lock AutoMutex _l(mLock); @@ -1554,27 +1529,6 @@ static void nativeMonitor(JNIEnv* /* env */, jclass /* clazz */, jlong ptr) { im->getInputManager()->getDispatcher()->monitor(); } -static jboolean nativeIsInputDeviceEnabled(JNIEnv* env /* env */, - jclass /* clazz */, jlong ptr, jint deviceId) { - NativeInputManager* im = reinterpret_cast(ptr); - - return im->getInputManager()->getReader()->isInputDeviceEnabled(deviceId); -} - -static void nativeEnableInputDevice(JNIEnv* /* env */, - jclass /* clazz */, jlong ptr, jint deviceId) { - NativeInputManager* im = reinterpret_cast(ptr); - - im->setInputDeviceEnabled(deviceId, true); -} - -static void nativeDisableInputDevice(JNIEnv* /* env */, - jclass /* clazz */, jlong ptr, jint deviceId) { - NativeInputManager* im = reinterpret_cast(ptr); - - im->setInputDeviceEnabled(deviceId, false); -} - static void nativeSetPointerIconType(JNIEnv* /* env */, jclass /* clazz */, jlong ptr, jint iconId) { NativeInputManager* im = reinterpret_cast(ptr); im->setPointerIconType(iconId); @@ -1667,12 +1621,6 @@ static const JNINativeMethod gInputManagerMethods[] = { (void*) nativeDump }, { "nativeMonitor", "(J)V", (void*) nativeMonitor }, - { "nativeIsInputDeviceEnabled", "(JI)Z", - (void*) nativeIsInputDeviceEnabled }, - { "nativeEnableInputDevice", "(JI)V", - (void*) nativeEnableInputDevice }, - { "nativeDisableInputDevice", "(JI)V", - (void*) nativeDisableInputDevice }, { "nativeSetPointerIconType", "(JI)V", (void*) nativeSetPointerIconType }, { "nativeReloadPointerIcons", "(J)V",