diff options
167 files changed, 1642 insertions, 1046 deletions
diff --git a/api/current.txt b/api/current.txt index 528a202f6028..e9045c0f8e5c 100644 --- a/api/current.txt +++ b/api/current.txt @@ -115,12 +115,13 @@ package android { field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH"; field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO"; field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS"; + field public static final java.lang.String REQUEST_COMPANION_RUN_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND"; + field public static final java.lang.String REQUEST_COMPANION_USE_DATA_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND"; field public static final java.lang.String REQUEST_DELETE_PACKAGES = "android.permission.REQUEST_DELETE_PACKAGES"; field public static final java.lang.String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES"; field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES"; field public static final java.lang.String RESTRICTED_VR_ACCESS = "android.permission.RESTRICTED_VR_ACCESS"; - field public static final java.lang.String RUN_IN_BACKGROUND = "android.permission.RUN_IN_BACKGROUND"; field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE"; field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS"; field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM"; @@ -139,7 +140,6 @@ package android { field public static final java.lang.String TRANSMIT_IR = "android.permission.TRANSMIT_IR"; field public static final java.lang.String UNINSTALL_SHORTCUT = "com.android.launcher.permission.UNINSTALL_SHORTCUT"; field public static final java.lang.String UPDATE_DEVICE_STATS = "android.permission.UPDATE_DEVICE_STATS"; - field public static final java.lang.String USE_DATA_IN_BACKGROUND = "android.permission.USE_DATA_IN_BACKGROUND"; field public static final java.lang.String USE_FINGERPRINT = "android.permission.USE_FINGERPRINT"; field public static final java.lang.String USE_SIP = "android.permission.USE_SIP"; field public static final java.lang.String VIBRATE = "android.permission.VIBRATE"; @@ -312,6 +312,7 @@ package android { field public static final int autoUrlDetect = 16843404; // 0x101028c field public static final int autoVerify = 16844014; // 0x10104ee field public static final int autofillHints = 16844121; // 0x1010559 + field public static final int autofilledHighlight = 16844139; // 0x101056b field public static final int background = 16842964; // 0x10100d4 field public static final int backgroundDimAmount = 16842802; // 0x1010032 field public static final int backgroundDimEnabled = 16843295; // 0x101021f @@ -356,12 +357,12 @@ package android { field public static final int calendarTextColor = 16843931; // 0x101049b field public static final int calendarViewShown = 16843596; // 0x101034c field public static final int calendarViewStyle = 16843613; // 0x101035d - field public static final int canCaptureFingerprintGestures = 16844111; // 0x101054f field public static final int canControlMagnification = 16844039; // 0x1010507 field public static final int canPerformGestures = 16844045; // 0x101050d field public static final int canRecord = 16844060; // 0x101051c field public static final deprecated int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8 field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9 + field public static final int canRequestFingerprintGestures = 16844111; // 0x101054f field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7 field public static final int canRetrieveWindowContent = 16843653; // 0x1010385 field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230 @@ -1611,7 +1612,6 @@ package android { field public static final int alert_light_frame = 17301505; // 0x1080001 field public static final int arrow_down_float = 17301506; // 0x1080002 field public static final int arrow_up_float = 17301507; // 0x1080003 - field public static final int autofilled_highlight = 17301684; // 0x10800b4 field public static final int bottom_bar = 17301658; // 0x108009a field public static final int btn_default = 17301508; // 0x1080004 field public static final int btn_default_small = 17301509; // 0x1080005 @@ -2832,11 +2832,11 @@ package android.accessibilityservice { method public java.lang.String loadDescription(android.content.pm.PackageManager); method public java.lang.String loadSummary(android.content.pm.PackageManager); method public void writeToParcel(android.os.Parcel, int); - field public static final int CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES = 64; // 0x40 field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10 field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20 field public static final deprecated int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4 field public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 8; // 0x8 + field public static final int CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES = 64; // 0x40 field public static final int CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION = 2; // 0x2 field public static final int CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT = 1; // 0x1 field public static final android.os.Parcelable.Creator<android.accessibilityservice.AccessibilityServiceInfo> CREATOR; @@ -2848,13 +2848,13 @@ package android.accessibilityservice { field public static final int FEEDBACK_HAPTIC = 2; // 0x2 field public static final int FEEDBACK_SPOKEN = 1; // 0x1 field public static final int FEEDBACK_VISUAL = 8; // 0x8 - field public static final int FLAG_CAPTURE_FINGERPRINT_GESTURES = 512; // 0x200 field public static final int FLAG_ENABLE_ACCESSIBILITY_VOLUME = 128; // 0x80 field public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 2; // 0x2 field public static final int FLAG_REPORT_VIEW_IDS = 16; // 0x10 field public static final int FLAG_REQUEST_ACCESSIBILITY_BUTTON = 256; // 0x100 field public static final deprecated int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 8; // 0x8 field public static final int FLAG_REQUEST_FILTER_KEY_EVENTS = 32; // 0x20 + field public static final int FLAG_REQUEST_FINGERPRINT_GESTURES = 512; // 0x200 field public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 4; // 0x4 field public static final int FLAG_RETRIEVE_INTERACTIVE_WINDOWS = 64; // 0x40 field public int eventTypes; @@ -2876,7 +2876,6 @@ package android.accessibilityservice { public static abstract class FingerprintGestureController.FingerprintGestureCallback { ctor public FingerprintGestureController.FingerprintGestureCallback(); - method public deprecated void onGesture(int); method public void onGestureDetected(int); method public void onGestureDetectionAvailabilityChanged(boolean); } @@ -2896,14 +2895,12 @@ package android.accessibilityservice { public static class GestureDescription.StrokeDescription { ctor public GestureDescription.StrokeDescription(android.graphics.Path, long, long); - ctor public GestureDescription.StrokeDescription(android.graphics.Path, long, long, int, boolean); - method public int getContinuedStrokeId(); + ctor public GestureDescription.StrokeDescription(android.graphics.Path, long, long, boolean); + method public android.accessibilityservice.GestureDescription.StrokeDescription continueStroke(android.graphics.Path, long, long, boolean); method public long getDuration(); - method public int getId(); method public android.graphics.Path getPath(); method public long getStartTime(); - method public boolean isContinued(); - field public static final int INVALID_STROKE_ID = -1; // 0xffffffff + method public boolean willContinue(); } } @@ -6331,6 +6328,7 @@ package android.app.admin { method public int getPermissionGrantState(android.content.ComponentName, java.lang.String, java.lang.String); method public int getPermissionPolicy(android.content.ComponentName); method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName); + method public java.util.List<java.lang.String> getPermittedCrossProfileNotificationListeners(android.content.ComponentName); method public java.util.List<java.lang.String> getPermittedInputMethods(android.content.ComponentName); method public long getRequiredStrongAuthTimeout(android.content.ComponentName); method public boolean getScreenCaptureDisabled(android.content.ComponentName); @@ -6415,6 +6413,7 @@ package android.app.admin { method public boolean setPermissionGrantState(android.content.ComponentName, java.lang.String, java.lang.String, int); method public void setPermissionPolicy(android.content.ComponentName, int); method public boolean setPermittedAccessibilityServices(android.content.ComponentName, java.util.List<java.lang.String>); + method public boolean setPermittedCrossProfileNotificationListeners(android.content.ComponentName, java.util.List<java.lang.String>); method public boolean setPermittedInputMethods(android.content.ComponentName, java.util.List<java.lang.String>); method public void setProfileEnabled(android.content.ComponentName); method public void setProfileName(android.content.ComponentName, java.lang.String); @@ -6703,7 +6702,6 @@ package android.app.backup { public abstract class BackupAgent extends android.content.ContextWrapper { ctor public BackupAgent(); method public final void fullBackupFile(java.io.File, android.app.backup.FullBackupDataOutput); - method public long getBackupQuota(); method public abstract void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) throws java.io.IOException; method public void onCreate(); method public void onDestroy(); @@ -6738,6 +6736,7 @@ package android.app.backup { } public class BackupDataOutput { + method public long getQuota(); method public int writeEntityData(byte[], int) throws java.io.IOException; method public int writeEntityHeader(java.lang.String, int) throws java.io.IOException; } @@ -6766,6 +6765,7 @@ package android.app.backup { } public class FullBackupDataOutput { + method public long getQuota(); } public abstract class RestoreObserver { @@ -8025,7 +8025,7 @@ package android.bluetooth.le { method public void setAdvertisingData(android.bluetooth.le.AdvertiseData); method public void setAdvertisingParameters(android.bluetooth.le.AdvertisingSetParameters); method public void setPeriodicAdvertisingData(android.bluetooth.le.AdvertiseData); - method public void setPeriodicAdvertisingEnable(boolean); + method public void setPeriodicAdvertisingEnabled(boolean); method public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters); method public void setScanResponseData(android.bluetooth.le.AdvertiseData); } @@ -8286,7 +8286,7 @@ package android.companion { method public android.companion.BluetoothLeDeviceFilter build(); method public android.companion.BluetoothLeDeviceFilter.Builder setNamePattern(java.util.regex.Pattern); method public android.companion.BluetoothLeDeviceFilter.Builder setRawDataFilter(byte[], byte[]); - method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromBytes(java.lang.String, java.lang.String, int, int, boolean); + method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromBytes(java.lang.String, java.lang.String, int, int, java.nio.ByteOrder); method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromName(java.lang.String, java.lang.String, int, int); method public android.companion.BluetoothLeDeviceFilter.Builder setScanFilter(android.bluetooth.le.ScanFilter); } @@ -13286,7 +13286,7 @@ package android.graphics { method public void setFilterBitmap(boolean); method public void setFlags(int); method public void setFontFeatureSettings(java.lang.String); - method public boolean setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; + method public boolean setFontVariationSettings(java.lang.String); method public void setHinting(int); method public void setLetterSpacing(float); method public void setLinearText(boolean); @@ -13813,7 +13813,7 @@ package android.graphics { ctor public Typeface.Builder(android.content.res.AssetManager, java.lang.String); method public android.graphics.Typeface build(); method public android.graphics.Typeface.Builder setFallback(java.lang.String); - method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; + method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String); method public android.graphics.Typeface.Builder setFontVariationSettings(android.graphics.fonts.FontVariationAxis[]); method public android.graphics.Typeface.Builder setItalic(boolean); method public android.graphics.Typeface.Builder setTtcIndex(int); @@ -14397,17 +14397,13 @@ package android.graphics.drawable.shapes { package android.graphics.fonts { public final class FontVariationAxis { - ctor public FontVariationAxis(java.lang.String, float) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; - method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; + ctor public FontVariationAxis(java.lang.String, float); + method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String); method public float getStyleValue(); method public java.lang.String getTag(); method public static java.lang.String toFontVariationSettings(android.graphics.fonts.FontVariationAxis[]); } - public static class FontVariationAxis.InvalidFormatException extends java.lang.Exception { - ctor public FontVariationAxis.InvalidFormatException(java.lang.String); - } - } package android.graphics.pdf { @@ -47228,8 +47224,8 @@ package android.view.accessibility { field public static final java.lang.String ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN = "ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN"; field public static final java.lang.String ACTION_ARGUMENT_HTML_ELEMENT_STRING = "ACTION_ARGUMENT_HTML_ELEMENT_STRING"; field public static final java.lang.String ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT = "ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT"; - field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_X = "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_X"; - field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_Y = "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_Y"; + field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_X = "ACTION_ARGUMENT_MOVE_WINDOW_X"; + field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_Y = "ACTION_ARGUMENT_MOVE_WINDOW_Y"; field public static final java.lang.String ACTION_ARGUMENT_PROGRESS_VALUE = "android.view.accessibility.action.ARGUMENT_PROGRESS_VALUE"; field public static final java.lang.String ACTION_ARGUMENT_ROW_INT = "android.view.accessibility.action.ARGUMENT_ROW_INT"; field public static final java.lang.String ACTION_ARGUMENT_SELECTION_END_INT = "ACTION_ARGUMENT_SELECTION_END_INT"; @@ -47411,10 +47407,10 @@ package android.view.accessibility { method public android.view.accessibility.AccessibilityNodeInfo getRoot(); method public java.lang.CharSequence getTitle(); method public int getType(); - method public boolean inPictureInPicture(); method public boolean isAccessibilityFocused(); method public boolean isActive(); method public boolean isFocused(); + method public boolean isInPictureInPictureMode(); method public static android.view.accessibility.AccessibilityWindowInfo obtain(); method public static android.view.accessibility.AccessibilityWindowInfo obtain(android.view.accessibility.AccessibilityWindowInfo); method public void recycle(); @@ -51418,7 +51414,7 @@ package android.widget { method public void setExtractedText(android.view.inputmethod.ExtractedText); method public void setFilters(android.text.InputFilter[]); method public void setFontFeatureSettings(java.lang.String); - method public boolean setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; + method public boolean setFontVariationSettings(java.lang.String); method protected boolean setFrame(int, int, int, int); method public void setFreezesText(boolean); method public void setGravity(int); diff --git a/api/removed.txt b/api/removed.txt index 8c81ef42371e..779ff7cce923 100644 --- a/api/removed.txt +++ b/api/removed.txt @@ -452,6 +452,14 @@ package android.view { } +package android.view.accessibility { + + public final class AccessibilityWindowInfo implements android.os.Parcelable { + method public boolean inPictureInPicture(); + } + +} + package android.webkit { public class WebViewClient { diff --git a/api/system-current.txt b/api/system-current.txt index 474ee8086515..cf9228c7f709 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -211,6 +211,8 @@ package android { field public static final java.lang.String REGISTER_SIM_SUBSCRIPTION = "android.permission.REGISTER_SIM_SUBSCRIPTION"; field public static final java.lang.String REMOVE_DRM_CERTIFICATES = "android.permission.REMOVE_DRM_CERTIFICATES"; field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS"; + field public static final java.lang.String REQUEST_COMPANION_RUN_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND"; + field public static final java.lang.String REQUEST_COMPANION_USE_DATA_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND"; field public static final java.lang.String REQUEST_DELETE_PACKAGES = "android.permission.REQUEST_DELETE_PACKAGES"; field public static final java.lang.String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES"; @@ -218,7 +220,6 @@ package android { field public static final java.lang.String RESTRICTED_VR_ACCESS = "android.permission.RESTRICTED_VR_ACCESS"; field public static final java.lang.String RETRIEVE_WINDOW_CONTENT = "android.permission.RETRIEVE_WINDOW_CONTENT"; field public static final java.lang.String REVOKE_RUNTIME_PERMISSIONS = "android.permission.REVOKE_RUNTIME_PERMISSIONS"; - field public static final java.lang.String RUN_IN_BACKGROUND = "android.permission.RUN_IN_BACKGROUND"; field public static final java.lang.String SCORE_NETWORKS = "android.permission.SCORE_NETWORKS"; field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE"; field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS"; @@ -256,7 +257,6 @@ package android { field public static final java.lang.String UPDATE_DEVICE_STATS = "android.permission.UPDATE_DEVICE_STATS"; field public static final java.lang.String UPDATE_LOCK = "android.permission.UPDATE_LOCK"; field public static final java.lang.String USER_ACTIVITY = "android.permission.USER_ACTIVITY"; - field public static final java.lang.String USE_DATA_IN_BACKGROUND = "android.permission.USE_DATA_IN_BACKGROUND"; field public static final java.lang.String USE_FINGERPRINT = "android.permission.USE_FINGERPRINT"; field public static final java.lang.String USE_SIP = "android.permission.USE_SIP"; field public static final java.lang.String VIBRATE = "android.permission.VIBRATE"; @@ -432,6 +432,7 @@ package android { field public static final int autoUrlDetect = 16843404; // 0x101028c field public static final int autoVerify = 16844014; // 0x10104ee field public static final int autofillHints = 16844121; // 0x1010559 + field public static final int autofilledHighlight = 16844139; // 0x101056b field public static final int background = 16842964; // 0x10100d4 field public static final int backgroundDimAmount = 16842802; // 0x1010032 field public static final int backgroundDimEnabled = 16843295; // 0x101021f @@ -476,12 +477,12 @@ package android { field public static final int calendarTextColor = 16843931; // 0x101049b field public static final int calendarViewShown = 16843596; // 0x101034c field public static final int calendarViewStyle = 16843613; // 0x101035d - field public static final int canCaptureFingerprintGestures = 16844111; // 0x101054f field public static final int canControlMagnification = 16844039; // 0x1010507 field public static final int canPerformGestures = 16844045; // 0x101050d field public static final int canRecord = 16844060; // 0x101051c field public static final deprecated int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8 field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9 + field public static final int canRequestFingerprintGestures = 16844111; // 0x101054f field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7 field public static final int canRetrieveWindowContent = 16843653; // 0x1010385 field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230 @@ -1737,7 +1738,6 @@ package android { field public static final int alert_light_frame = 17301505; // 0x1080001 field public static final int arrow_down_float = 17301506; // 0x1080002 field public static final int arrow_up_float = 17301507; // 0x1080003 - field public static final int autofilled_highlight = 17301684; // 0x10800b4 field public static final int bottom_bar = 17301658; // 0x108009a field public static final int btn_default = 17301508; // 0x1080004 field public static final int btn_default_small = 17301509; // 0x1080005 @@ -2961,11 +2961,11 @@ package android.accessibilityservice { method public java.lang.String loadDescription(android.content.pm.PackageManager); method public java.lang.String loadSummary(android.content.pm.PackageManager); method public void writeToParcel(android.os.Parcel, int); - field public static final int CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES = 64; // 0x40 field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10 field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20 field public static final deprecated int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4 field public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 8; // 0x8 + field public static final int CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES = 64; // 0x40 field public static final int CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION = 2; // 0x2 field public static final int CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT = 1; // 0x1 field public static final android.os.Parcelable.Creator<android.accessibilityservice.AccessibilityServiceInfo> CREATOR; @@ -2977,13 +2977,13 @@ package android.accessibilityservice { field public static final int FEEDBACK_HAPTIC = 2; // 0x2 field public static final int FEEDBACK_SPOKEN = 1; // 0x1 field public static final int FEEDBACK_VISUAL = 8; // 0x8 - field public static final int FLAG_CAPTURE_FINGERPRINT_GESTURES = 512; // 0x200 field public static final int FLAG_ENABLE_ACCESSIBILITY_VOLUME = 128; // 0x80 field public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 2; // 0x2 field public static final int FLAG_REPORT_VIEW_IDS = 16; // 0x10 field public static final int FLAG_REQUEST_ACCESSIBILITY_BUTTON = 256; // 0x100 field public static final deprecated int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 8; // 0x8 field public static final int FLAG_REQUEST_FILTER_KEY_EVENTS = 32; // 0x20 + field public static final int FLAG_REQUEST_FINGERPRINT_GESTURES = 512; // 0x200 field public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 4; // 0x4 field public static final int FLAG_RETRIEVE_INTERACTIVE_WINDOWS = 64; // 0x40 field public int eventTypes; @@ -3005,7 +3005,6 @@ package android.accessibilityservice { public static abstract class FingerprintGestureController.FingerprintGestureCallback { ctor public FingerprintGestureController.FingerprintGestureCallback(); - method public deprecated void onGesture(int); method public void onGestureDetected(int); method public void onGestureDetectionAvailabilityChanged(boolean); } @@ -3025,14 +3024,12 @@ package android.accessibilityservice { public static class GestureDescription.StrokeDescription { ctor public GestureDescription.StrokeDescription(android.graphics.Path, long, long); - ctor public GestureDescription.StrokeDescription(android.graphics.Path, long, long, int, boolean); - method public int getContinuedStrokeId(); + ctor public GestureDescription.StrokeDescription(android.graphics.Path, long, long, boolean); + method public android.accessibilityservice.GestureDescription.StrokeDescription continueStroke(android.graphics.Path, long, long, boolean); method public long getDuration(); - method public int getId(); method public android.graphics.Path getPath(); method public long getStartTime(); - method public boolean isContinued(); - field public static final int INVALID_STROKE_ID = -1; // 0xffffffff + method public boolean willContinue(); } } @@ -6553,6 +6550,7 @@ package android.app.admin { method public int getPermissionPolicy(android.content.ComponentName); method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName); method public java.util.List<java.lang.String> getPermittedAccessibilityServices(int); + method public java.util.List<java.lang.String> getPermittedCrossProfileNotificationListeners(android.content.ComponentName); method public java.util.List<java.lang.String> getPermittedInputMethods(android.content.ComponentName); method public java.util.List<java.lang.String> getPermittedInputMethodsForCurrentUser(); method public android.content.ComponentName getProfileOwner() throws java.lang.IllegalArgumentException; @@ -6649,6 +6647,7 @@ package android.app.admin { method public boolean setPermissionGrantState(android.content.ComponentName, java.lang.String, java.lang.String, int); method public void setPermissionPolicy(android.content.ComponentName, int); method public boolean setPermittedAccessibilityServices(android.content.ComponentName, java.util.List<java.lang.String>); + method public boolean setPermittedCrossProfileNotificationListeners(android.content.ComponentName, java.util.List<java.lang.String>); method public boolean setPermittedInputMethods(android.content.ComponentName, java.util.List<java.lang.String>); method public void setProfileEnabled(android.content.ComponentName); method public void setProfileName(android.content.ComponentName, java.lang.String); @@ -6952,7 +6951,6 @@ package android.app.backup { public abstract class BackupAgent extends android.content.ContextWrapper { ctor public BackupAgent(); method public final void fullBackupFile(java.io.File, android.app.backup.FullBackupDataOutput); - method public long getBackupQuota(); method public abstract void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) throws java.io.IOException; method public void onCreate(); method public void onDestroy(); @@ -6989,6 +6987,8 @@ package android.app.backup { public class BackupDataOutput { ctor public BackupDataOutput(java.io.FileDescriptor); + ctor public BackupDataOutput(java.io.FileDescriptor, long); + method public long getQuota(); method public int writeEntityData(byte[], int) throws java.io.IOException; method public int writeEntityHeader(java.lang.String, int) throws java.io.IOException; } @@ -7165,6 +7165,7 @@ package android.app.backup { } public class FullBackupDataOutput { + method public long getQuota(); } public class RestoreDescription implements android.os.Parcelable { @@ -8503,7 +8504,7 @@ package android.bluetooth.le { method public void setAdvertisingData(android.bluetooth.le.AdvertiseData); method public void setAdvertisingParameters(android.bluetooth.le.AdvertisingSetParameters); method public void setPeriodicAdvertisingData(android.bluetooth.le.AdvertiseData); - method public void setPeriodicAdvertisingEnable(boolean); + method public void setPeriodicAdvertisingEnabled(boolean); method public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters); method public void setScanResponseData(android.bluetooth.le.AdvertiseData); } @@ -8786,7 +8787,7 @@ package android.companion { method public android.companion.BluetoothLeDeviceFilter build(); method public android.companion.BluetoothLeDeviceFilter.Builder setNamePattern(java.util.regex.Pattern); method public android.companion.BluetoothLeDeviceFilter.Builder setRawDataFilter(byte[], byte[]); - method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromBytes(java.lang.String, java.lang.String, int, int, boolean); + method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromBytes(java.lang.String, java.lang.String, int, int, java.nio.ByteOrder); method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromName(java.lang.String, java.lang.String, int, int); method public android.companion.BluetoothLeDeviceFilter.Builder setScanFilter(android.bluetooth.le.ScanFilter); } @@ -14065,7 +14066,7 @@ package android.graphics { method public void setFilterBitmap(boolean); method public void setFlags(int); method public void setFontFeatureSettings(java.lang.String); - method public boolean setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; + method public boolean setFontVariationSettings(java.lang.String); method public void setHinting(int); method public void setLetterSpacing(float); method public void setLinearText(boolean); @@ -14592,7 +14593,7 @@ package android.graphics { ctor public Typeface.Builder(android.content.res.AssetManager, java.lang.String); method public android.graphics.Typeface build(); method public android.graphics.Typeface.Builder setFallback(java.lang.String); - method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; + method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String); method public android.graphics.Typeface.Builder setFontVariationSettings(android.graphics.fonts.FontVariationAxis[]); method public android.graphics.Typeface.Builder setItalic(boolean); method public android.graphics.Typeface.Builder setTtcIndex(int); @@ -15176,17 +15177,13 @@ package android.graphics.drawable.shapes { package android.graphics.fonts { public final class FontVariationAxis { - ctor public FontVariationAxis(java.lang.String, float) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; - method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; + ctor public FontVariationAxis(java.lang.String, float); + method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String); method public float getStyleValue(); method public java.lang.String getTag(); method public static java.lang.String toFontVariationSettings(android.graphics.fonts.FontVariationAxis[]); } - public static class FontVariationAxis.InvalidFormatException extends java.lang.Exception { - ctor public FontVariationAxis.InvalidFormatException(java.lang.String); - } - } package android.graphics.pdf { @@ -50823,8 +50820,8 @@ package android.view.accessibility { field public static final java.lang.String ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN = "ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN"; field public static final java.lang.String ACTION_ARGUMENT_HTML_ELEMENT_STRING = "ACTION_ARGUMENT_HTML_ELEMENT_STRING"; field public static final java.lang.String ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT = "ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT"; - field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_X = "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_X"; - field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_Y = "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_Y"; + field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_X = "ACTION_ARGUMENT_MOVE_WINDOW_X"; + field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_Y = "ACTION_ARGUMENT_MOVE_WINDOW_Y"; field public static final java.lang.String ACTION_ARGUMENT_PROGRESS_VALUE = "android.view.accessibility.action.ARGUMENT_PROGRESS_VALUE"; field public static final java.lang.String ACTION_ARGUMENT_ROW_INT = "android.view.accessibility.action.ARGUMENT_ROW_INT"; field public static final java.lang.String ACTION_ARGUMENT_SELECTION_END_INT = "ACTION_ARGUMENT_SELECTION_END_INT"; @@ -51006,10 +51003,10 @@ package android.view.accessibility { method public android.view.accessibility.AccessibilityNodeInfo getRoot(); method public java.lang.CharSequence getTitle(); method public int getType(); - method public boolean inPictureInPicture(); method public boolean isAccessibilityFocused(); method public boolean isActive(); method public boolean isFocused(); + method public boolean isInPictureInPictureMode(); method public static android.view.accessibility.AccessibilityWindowInfo obtain(); method public static android.view.accessibility.AccessibilityWindowInfo obtain(android.view.accessibility.AccessibilityWindowInfo); method public void recycle(); @@ -55378,7 +55375,7 @@ package android.widget { method public void setExtractedText(android.view.inputmethod.ExtractedText); method public void setFilters(android.text.InputFilter[]); method public void setFontFeatureSettings(java.lang.String); - method public boolean setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; + method public boolean setFontVariationSettings(java.lang.String); method protected boolean setFrame(int, int, int, int); method public void setFreezesText(boolean); method public void setGravity(int); diff --git a/api/system-removed.txt b/api/system-removed.txt index 659236df31c6..fe512481b1ad 100644 --- a/api/system-removed.txt +++ b/api/system-removed.txt @@ -446,6 +446,14 @@ package android.view { } +package android.view.accessibility { + + public final class AccessibilityWindowInfo implements android.os.Parcelable { + method public boolean inPictureInPicture(); + } + +} + package android.webkit { public class WebViewClient { diff --git a/api/test-current.txt b/api/test-current.txt index 42b5e619093c..3b82fddc8691 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -115,12 +115,13 @@ package android { field public static final java.lang.String RECEIVE_WAP_PUSH = "android.permission.RECEIVE_WAP_PUSH"; field public static final java.lang.String RECORD_AUDIO = "android.permission.RECORD_AUDIO"; field public static final java.lang.String REORDER_TASKS = "android.permission.REORDER_TASKS"; + field public static final java.lang.String REQUEST_COMPANION_RUN_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND"; + field public static final java.lang.String REQUEST_COMPANION_USE_DATA_IN_BACKGROUND = "android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND"; field public static final java.lang.String REQUEST_DELETE_PACKAGES = "android.permission.REQUEST_DELETE_PACKAGES"; field public static final java.lang.String REQUEST_IGNORE_BATTERY_OPTIMIZATIONS = "android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"; field public static final java.lang.String REQUEST_INSTALL_PACKAGES = "android.permission.REQUEST_INSTALL_PACKAGES"; field public static final deprecated java.lang.String RESTART_PACKAGES = "android.permission.RESTART_PACKAGES"; field public static final java.lang.String RESTRICTED_VR_ACCESS = "android.permission.RESTRICTED_VR_ACCESS"; - field public static final java.lang.String RUN_IN_BACKGROUND = "android.permission.RUN_IN_BACKGROUND"; field public static final java.lang.String SEND_RESPOND_VIA_MESSAGE = "android.permission.SEND_RESPOND_VIA_MESSAGE"; field public static final java.lang.String SEND_SMS = "android.permission.SEND_SMS"; field public static final java.lang.String SET_ALARM = "com.android.alarm.permission.SET_ALARM"; @@ -139,7 +140,6 @@ package android { field public static final java.lang.String TRANSMIT_IR = "android.permission.TRANSMIT_IR"; field public static final java.lang.String UNINSTALL_SHORTCUT = "com.android.launcher.permission.UNINSTALL_SHORTCUT"; field public static final java.lang.String UPDATE_DEVICE_STATS = "android.permission.UPDATE_DEVICE_STATS"; - field public static final java.lang.String USE_DATA_IN_BACKGROUND = "android.permission.USE_DATA_IN_BACKGROUND"; field public static final java.lang.String USE_FINGERPRINT = "android.permission.USE_FINGERPRINT"; field public static final java.lang.String USE_SIP = "android.permission.USE_SIP"; field public static final java.lang.String VIBRATE = "android.permission.VIBRATE"; @@ -312,6 +312,7 @@ package android { field public static final int autoUrlDetect = 16843404; // 0x101028c field public static final int autoVerify = 16844014; // 0x10104ee field public static final int autofillHints = 16844121; // 0x1010559 + field public static final int autofilledHighlight = 16844139; // 0x101056b field public static final int background = 16842964; // 0x10100d4 field public static final int backgroundDimAmount = 16842802; // 0x1010032 field public static final int backgroundDimEnabled = 16843295; // 0x101021f @@ -356,12 +357,12 @@ package android { field public static final int calendarTextColor = 16843931; // 0x101049b field public static final int calendarViewShown = 16843596; // 0x101034c field public static final int calendarViewStyle = 16843613; // 0x101035d - field public static final int canCaptureFingerprintGestures = 16844111; // 0x101054f field public static final int canControlMagnification = 16844039; // 0x1010507 field public static final int canPerformGestures = 16844045; // 0x101050d field public static final int canRecord = 16844060; // 0x101051c field public static final deprecated int canRequestEnhancedWebAccessibility = 16843736; // 0x10103d8 field public static final int canRequestFilterKeyEvents = 16843737; // 0x10103d9 + field public static final int canRequestFingerprintGestures = 16844111; // 0x101054f field public static final int canRequestTouchExplorationMode = 16843735; // 0x10103d7 field public static final int canRetrieveWindowContent = 16843653; // 0x1010385 field public static final int candidatesTextStyleSpans = 16843312; // 0x1010230 @@ -1611,7 +1612,6 @@ package android { field public static final int alert_light_frame = 17301505; // 0x1080001 field public static final int arrow_down_float = 17301506; // 0x1080002 field public static final int arrow_up_float = 17301507; // 0x1080003 - field public static final int autofilled_highlight = 17301684; // 0x10800b4 field public static final int bottom_bar = 17301658; // 0x108009a field public static final int btn_default = 17301508; // 0x1080004 field public static final int btn_default_small = 17301509; // 0x1080005 @@ -2832,11 +2832,11 @@ package android.accessibilityservice { method public java.lang.String loadDescription(android.content.pm.PackageManager); method public java.lang.String loadSummary(android.content.pm.PackageManager); method public void writeToParcel(android.os.Parcel, int); - field public static final int CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES = 64; // 0x40 field public static final int CAPABILITY_CAN_CONTROL_MAGNIFICATION = 16; // 0x10 field public static final int CAPABILITY_CAN_PERFORM_GESTURES = 32; // 0x20 field public static final deprecated int CAPABILITY_CAN_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 4; // 0x4 field public static final int CAPABILITY_CAN_REQUEST_FILTER_KEY_EVENTS = 8; // 0x8 + field public static final int CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES = 64; // 0x40 field public static final int CAPABILITY_CAN_REQUEST_TOUCH_EXPLORATION = 2; // 0x2 field public static final int CAPABILITY_CAN_RETRIEVE_WINDOW_CONTENT = 1; // 0x1 field public static final android.os.Parcelable.Creator<android.accessibilityservice.AccessibilityServiceInfo> CREATOR; @@ -2848,13 +2848,13 @@ package android.accessibilityservice { field public static final int FEEDBACK_HAPTIC = 2; // 0x2 field public static final int FEEDBACK_SPOKEN = 1; // 0x1 field public static final int FEEDBACK_VISUAL = 8; // 0x8 - field public static final int FLAG_CAPTURE_FINGERPRINT_GESTURES = 512; // 0x200 field public static final int FLAG_ENABLE_ACCESSIBILITY_VOLUME = 128; // 0x80 field public static final int FLAG_INCLUDE_NOT_IMPORTANT_VIEWS = 2; // 0x2 field public static final int FLAG_REPORT_VIEW_IDS = 16; // 0x10 field public static final int FLAG_REQUEST_ACCESSIBILITY_BUTTON = 256; // 0x100 field public static final deprecated int FLAG_REQUEST_ENHANCED_WEB_ACCESSIBILITY = 8; // 0x8 field public static final int FLAG_REQUEST_FILTER_KEY_EVENTS = 32; // 0x20 + field public static final int FLAG_REQUEST_FINGERPRINT_GESTURES = 512; // 0x200 field public static final int FLAG_REQUEST_TOUCH_EXPLORATION_MODE = 4; // 0x4 field public static final int FLAG_RETRIEVE_INTERACTIVE_WINDOWS = 64; // 0x40 field public int eventTypes; @@ -2876,7 +2876,6 @@ package android.accessibilityservice { public static abstract class FingerprintGestureController.FingerprintGestureCallback { ctor public FingerprintGestureController.FingerprintGestureCallback(); - method public deprecated void onGesture(int); method public void onGestureDetected(int); method public void onGestureDetectionAvailabilityChanged(boolean); } @@ -2896,14 +2895,12 @@ package android.accessibilityservice { public static class GestureDescription.StrokeDescription { ctor public GestureDescription.StrokeDescription(android.graphics.Path, long, long); - ctor public GestureDescription.StrokeDescription(android.graphics.Path, long, long, int, boolean); - method public int getContinuedStrokeId(); + ctor public GestureDescription.StrokeDescription(android.graphics.Path, long, long, boolean); + method public android.accessibilityservice.GestureDescription.StrokeDescription continueStroke(android.graphics.Path, long, long, boolean); method public long getDuration(); - method public int getId(); method public android.graphics.Path getPath(); method public long getStartTime(); - method public boolean isContinued(); - field public static final int INVALID_STROKE_ID = -1; // 0xffffffff + method public boolean willContinue(); } } @@ -6356,6 +6353,7 @@ package android.app.admin { method public int getPermissionGrantState(android.content.ComponentName, java.lang.String, java.lang.String); method public int getPermissionPolicy(android.content.ComponentName); method public java.util.List<java.lang.String> getPermittedAccessibilityServices(android.content.ComponentName); + method public java.util.List<java.lang.String> getPermittedCrossProfileNotificationListeners(android.content.ComponentName); method public java.util.List<java.lang.String> getPermittedInputMethods(android.content.ComponentName); method public long getRequiredStrongAuthTimeout(android.content.ComponentName); method public boolean getScreenCaptureDisabled(android.content.ComponentName); @@ -6442,6 +6440,7 @@ package android.app.admin { method public boolean setPermissionGrantState(android.content.ComponentName, java.lang.String, java.lang.String, int); method public void setPermissionPolicy(android.content.ComponentName, int); method public boolean setPermittedAccessibilityServices(android.content.ComponentName, java.util.List<java.lang.String>); + method public boolean setPermittedCrossProfileNotificationListeners(android.content.ComponentName, java.util.List<java.lang.String>); method public boolean setPermittedInputMethods(android.content.ComponentName, java.util.List<java.lang.String>); method public void setProfileEnabled(android.content.ComponentName); method public void setProfileName(android.content.ComponentName, java.lang.String); @@ -6733,7 +6732,6 @@ package android.app.backup { public abstract class BackupAgent extends android.content.ContextWrapper { ctor public BackupAgent(); method public final void fullBackupFile(java.io.File, android.app.backup.FullBackupDataOutput); - method public long getBackupQuota(); method public abstract void onBackup(android.os.ParcelFileDescriptor, android.app.backup.BackupDataOutput, android.os.ParcelFileDescriptor) throws java.io.IOException; method public void onCreate(); method public void onDestroy(); @@ -6768,6 +6766,7 @@ package android.app.backup { } public class BackupDataOutput { + method public long getQuota(); method public int writeEntityData(byte[], int) throws java.io.IOException; method public int writeEntityHeader(java.lang.String, int) throws java.io.IOException; } @@ -6796,6 +6795,7 @@ package android.app.backup { } public class FullBackupDataOutput { + method public long getQuota(); } public abstract class RestoreObserver { @@ -8056,7 +8056,7 @@ package android.bluetooth.le { method public void setAdvertisingData(android.bluetooth.le.AdvertiseData); method public void setAdvertisingParameters(android.bluetooth.le.AdvertisingSetParameters); method public void setPeriodicAdvertisingData(android.bluetooth.le.AdvertiseData); - method public void setPeriodicAdvertisingEnable(boolean); + method public void setPeriodicAdvertisingEnabled(boolean); method public void setPeriodicAdvertisingParameters(android.bluetooth.le.PeriodicAdvertisingParameters); method public void setScanResponseData(android.bluetooth.le.AdvertiseData); } @@ -8317,7 +8317,7 @@ package android.companion { method public android.companion.BluetoothLeDeviceFilter build(); method public android.companion.BluetoothLeDeviceFilter.Builder setNamePattern(java.util.regex.Pattern); method public android.companion.BluetoothLeDeviceFilter.Builder setRawDataFilter(byte[], byte[]); - method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromBytes(java.lang.String, java.lang.String, int, int, boolean); + method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromBytes(java.lang.String, java.lang.String, int, int, java.nio.ByteOrder); method public android.companion.BluetoothLeDeviceFilter.Builder setRenameFromName(java.lang.String, java.lang.String, int, int); method public android.companion.BluetoothLeDeviceFilter.Builder setScanFilter(android.bluetooth.le.ScanFilter); } @@ -13328,7 +13328,7 @@ package android.graphics { method public void setFilterBitmap(boolean); method public void setFlags(int); method public void setFontFeatureSettings(java.lang.String); - method public boolean setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; + method public boolean setFontVariationSettings(java.lang.String); method public void setHinting(int); method public void setLetterSpacing(float); method public void setLinearText(boolean); @@ -13855,7 +13855,7 @@ package android.graphics { ctor public Typeface.Builder(android.content.res.AssetManager, java.lang.String); method public android.graphics.Typeface build(); method public android.graphics.Typeface.Builder setFallback(java.lang.String); - method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; + method public android.graphics.Typeface.Builder setFontVariationSettings(java.lang.String); method public android.graphics.Typeface.Builder setFontVariationSettings(android.graphics.fonts.FontVariationAxis[]); method public android.graphics.Typeface.Builder setItalic(boolean); method public android.graphics.Typeface.Builder setTtcIndex(int); @@ -14443,17 +14443,13 @@ package android.graphics.drawable.shapes { package android.graphics.fonts { public final class FontVariationAxis { - ctor public FontVariationAxis(java.lang.String, float) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; - method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; + ctor public FontVariationAxis(java.lang.String, float); + method public static android.graphics.fonts.FontVariationAxis[] fromFontVariationSettings(java.lang.String); method public float getStyleValue(); method public java.lang.String getTag(); method public static java.lang.String toFontVariationSettings(android.graphics.fonts.FontVariationAxis[]); } - public static class FontVariationAxis.InvalidFormatException extends java.lang.Exception { - ctor public FontVariationAxis.InvalidFormatException(java.lang.String); - } - } package android.graphics.pdf { @@ -47606,8 +47602,8 @@ package android.view.accessibility { field public static final java.lang.String ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN = "ACTION_ARGUMENT_EXTEND_SELECTION_BOOLEAN"; field public static final java.lang.String ACTION_ARGUMENT_HTML_ELEMENT_STRING = "ACTION_ARGUMENT_HTML_ELEMENT_STRING"; field public static final java.lang.String ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT = "ACTION_ARGUMENT_MOVEMENT_GRANULARITY_INT"; - field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_X = "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_X"; - field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_Y = "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_Y"; + field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_X = "ACTION_ARGUMENT_MOVE_WINDOW_X"; + field public static final java.lang.String ACTION_ARGUMENT_MOVE_WINDOW_Y = "ACTION_ARGUMENT_MOVE_WINDOW_Y"; field public static final java.lang.String ACTION_ARGUMENT_PROGRESS_VALUE = "android.view.accessibility.action.ARGUMENT_PROGRESS_VALUE"; field public static final java.lang.String ACTION_ARGUMENT_ROW_INT = "android.view.accessibility.action.ARGUMENT_ROW_INT"; field public static final java.lang.String ACTION_ARGUMENT_SELECTION_END_INT = "ACTION_ARGUMENT_SELECTION_END_INT"; @@ -47789,10 +47785,10 @@ package android.view.accessibility { method public android.view.accessibility.AccessibilityNodeInfo getRoot(); method public java.lang.CharSequence getTitle(); method public int getType(); - method public boolean inPictureInPicture(); method public boolean isAccessibilityFocused(); method public boolean isActive(); method public boolean isFocused(); + method public boolean isInPictureInPictureMode(); method public static android.view.accessibility.AccessibilityWindowInfo obtain(); method public static android.view.accessibility.AccessibilityWindowInfo obtain(android.view.accessibility.AccessibilityWindowInfo); method public void recycle(); @@ -51804,7 +51800,7 @@ package android.widget { method public void setExtractedText(android.view.inputmethod.ExtractedText); method public void setFilters(android.text.InputFilter[]); method public void setFontFeatureSettings(java.lang.String); - method public boolean setFontVariationSettings(java.lang.String) throws android.graphics.fonts.FontVariationAxis.InvalidFormatException; + method public boolean setFontVariationSettings(java.lang.String); method protected boolean setFrame(int, int, int, int); method public void setFreezesText(boolean); method public void setGravity(int); diff --git a/api/test-removed.txt b/api/test-removed.txt index 8c81ef42371e..779ff7cce923 100644 --- a/api/test-removed.txt +++ b/api/test-removed.txt @@ -452,6 +452,14 @@ package android.view { } +package android.view.accessibility { + + public final class AccessibilityWindowInfo implements android.os.Parcelable { + method public boolean inPictureInPicture(); + } + +} + package android.webkit { public class WebViewClient { diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index 64d7d4c1be97..af0a204fed13 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -619,20 +619,10 @@ public abstract class AccessibilityService extends Service { * @return The controller for fingerprint gestures, or {@code null} if gestures are unavailable. */ @RequiresPermission(android.Manifest.permission.USE_FINGERPRINT) - public final @Nullable FingerprintGestureController getFingerprintGestureController() { - if ((mFingerprintGestureController == null) - && getPackageManager().hasSystemFeature(FEATURE_FINGERPRINT)) { - FingerprintManager fingerprintManager = getSystemService(FingerprintManager.class); - if ((fingerprintManager != null) && fingerprintManager.isHardwareDetected()) { - AccessibilityServiceInfo info = getServiceInfo(); - int fingerprintCapabilityMask = - AccessibilityServiceInfo.CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES; - if ((info.getCapabilities() & fingerprintCapabilityMask) != 0) { - mFingerprintGestureController = new FingerprintGestureController( - AccessibilityInteractionClient.getInstance() - .getConnection(mConnectionId)); - } - } + public final @NonNull FingerprintGestureController getFingerprintGestureController() { + if (mFingerprintGestureController == null) { + mFingerprintGestureController = new FingerprintGestureController( + AccessibilityInteractionClient.getInstance().getConnection(mConnectionId)); } return mFingerprintGestureController; } diff --git a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java index 3cda489c5005..70a6ce615731 100644 --- a/core/java/android/accessibilityservice/AccessibilityServiceInfo.java +++ b/core/java/android/accessibilityservice/AccessibilityServiceInfo.java @@ -119,9 +119,9 @@ public class AccessibilityServiceInfo implements Parcelable { /** * Capability: This accessibility service can capture gestures from the fingerprint sensor - * @see android.R.styleable#AccessibilityService_canCaptureFingerprintGestures + * @see android.R.styleable#AccessibilityService_canRequestFingerprintGestures */ - public static final int CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES = 0x00000040; + public static final int CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES = 0x00000040; private static SparseArray<CapabilityInfo> sAvailableCapabilityInfos; @@ -301,7 +301,7 @@ public class AccessibilityServiceInfo implements Parcelable { * This flag requests that all fingerprint gestures be sent to the accessibility service. * It is handled in {@link FingerprintGestureController} */ - public static final int FLAG_CAPTURE_FINGERPRINT_GESTURES = 0x00000200; + public static final int FLAG_REQUEST_FINGERPRINT_GESTURES = 0x00000200; /** {@hide} */ public static final int FLAG_FORCE_DIRECT_BOOT_AWARE = 0x00010000; @@ -521,8 +521,8 @@ public class AccessibilityServiceInfo implements Parcelable { mCapabilities |= CAPABILITY_CAN_PERFORM_GESTURES; } if (asAttributes.getBoolean(com.android.internal.R.styleable - .AccessibilityService_canCaptureFingerprintGestures, false)) { - mCapabilities |= CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES; + .AccessibilityService_canRequestFingerprintGestures, false)) { + mCapabilities |= CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES; } TypedValue peekedValue = asAttributes.peekValue( com.android.internal.R.styleable.AccessibilityService_description); @@ -971,8 +971,8 @@ public class AccessibilityServiceInfo implements Parcelable { return "FLAG_ENABLE_ACCESSIBILITY_VOLUME"; case FLAG_REQUEST_ACCESSIBILITY_BUTTON: return "FLAG_REQUEST_ACCESSIBILITY_BUTTON"; - case FLAG_CAPTURE_FINGERPRINT_GESTURES: - return "FLAG_CAPTURE_FINGERPRINT_GESTURES"; + case FLAG_REQUEST_FINGERPRINT_GESTURES: + return "FLAG_REQUEST_FINGERPRINT_GESTURES"; default: return null; } @@ -1000,8 +1000,8 @@ public class AccessibilityServiceInfo implements Parcelable { return "CAPABILITY_CAN_CONTROL_MAGNIFICATION"; case CAPABILITY_CAN_PERFORM_GESTURES: return "CAPABILITY_CAN_PERFORM_GESTURES"; - case CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES: - return "CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES"; + case CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES: + return "CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES"; default: return "UNKNOWN"; } @@ -1064,8 +1064,8 @@ public class AccessibilityServiceInfo implements Parcelable { R.string.capability_title_canPerformGestures, R.string.capability_desc_canPerformGestures)); if ((context == null) || fingerprintAvailable(context)) { - sAvailableCapabilityInfos.put(CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES, - new CapabilityInfo(CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES, + sAvailableCapabilityInfos.put(CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES, + new CapabilityInfo(CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES, R.string.capability_title_canCaptureFingerprintGestures, R.string.capability_desc_canCaptureFingerprintGestures)); } diff --git a/core/java/android/accessibilityservice/FingerprintGestureController.java b/core/java/android/accessibilityservice/FingerprintGestureController.java index db00fffc3a28..9f04cea885af 100644 --- a/core/java/android/accessibilityservice/FingerprintGestureController.java +++ b/core/java/android/accessibilityservice/FingerprintGestureController.java @@ -181,11 +181,5 @@ public final class FingerprintGestureController { * {@link #FINGERPRINT_GESTURE_SWIPE_RIGHT}. */ public void onGestureDetected(int gesture) {} - - /** - * @deprecated Never called. Use onGestureDetected. - */ - @Deprecated - public void onGesture(int gesture) {} } } diff --git a/core/java/android/accessibilityservice/GestureDescription.java b/core/java/android/accessibilityservice/GestureDescription.java index c9da1526a4fa..92567d758856 100644 --- a/core/java/android/accessibilityservice/GestureDescription.java +++ b/core/java/android/accessibilityservice/GestureDescription.java @@ -24,6 +24,8 @@ import android.graphics.RectF; import android.os.Parcel; import android.os.Parcelable; +import com.android.internal.util.Preconditions; + import java.util.ArrayList; import java.util.List; @@ -130,7 +132,7 @@ public final class GestureDescription { touchPoints[numPointsFound].mIsStartOfPath = (strokeDescription.getContinuedStrokeId() < 0) && (time == strokeDescription.mStartTime); - touchPoints[numPointsFound].mIsEndOfPath = !strokeDescription.isContinued() + touchPoints[numPointsFound].mIsEndOfPath = !strokeDescription.willContinue() && (time == strokeDescription.mEndTime); strokeDescription.getPosForTime(time, mTempPos); touchPoints[numPointsFound].mX = Math.round(mTempPos[0]); @@ -197,7 +199,7 @@ public final class GestureDescription { * Immutable description of stroke that can be part of a gesture. */ public static class StrokeDescription { - public static final int INVALID_STROKE_ID = -1; + private static final int INVALID_STROKE_ID = -1; static int sIdCounter; @@ -210,7 +212,7 @@ public final class GestureDescription { float[] mTapLocation; int mId; boolean mContinued; - int mContinuedStrokeId; + int mContinuedStrokeId = INVALID_STROKE_ID; /** * @param path The path to follow. Must have exactly one contour. The bounds of the path @@ -219,12 +221,12 @@ public final class GestureDescription { * @param startTime The time, in milliseconds, from the time the gesture starts to the * time the stroke should start. Must not be negative. * @param duration The duration, in milliseconds, the stroke takes to traverse the path. - * Must not be negative. + * Must be positive. */ public StrokeDescription(@NonNull Path path, @IntRange(from = 0) long startTime, @IntRange(from = 0) long duration) { - this(path, startTime, duration, INVALID_STROKE_ID, false); + this(path, startTime, duration, false); } /** @@ -235,36 +237,23 @@ public final class GestureDescription { * time the stroke should start. Must not be negative. * @param duration The duration, in milliseconds, the stroke takes to traverse the path. * Must be positive. - * @param continuedStrokeId The ID of the stroke that this stroke continues, or - * {@link #INVALID_STROKE_ID} if it continues no stroke. The stroke it - * continues must have its isContinued flag set to {@code true} and must be in the - * gesture dispatched immediately before the one containing this stroke. - * @param isContinued {@code true} if this stroke will be continued by one in the + * @param willContinue {@code true} if this stroke will be continued by one in the * next gesture {@code false} otherwise. Continued strokes keep their pointers down when * the gesture completes. */ public StrokeDescription(@NonNull Path path, @IntRange(from = 0) long startTime, @IntRange(from = 0) long duration, - @IntRange(from = 0) int continuedStrokeId, - boolean isContinued) { - mContinued = isContinued; - mContinuedStrokeId = continuedStrokeId; - if (duration <= 0) { - throw new IllegalArgumentException("Duration must be positive"); - } - if (startTime < 0) { - throw new IllegalArgumentException("Start time must not be negative"); - } + boolean willContinue) { + mContinued = willContinue; + Preconditions.checkArgument(duration > 0, "Duration must be positive"); + Preconditions.checkArgument(startTime >= 0, "Start time must not be negative"); + Preconditions.checkArgument(!path.isEmpty(), "Path is empty"); RectF bounds = new RectF(); path.computeBounds(bounds, false /* unused */); - if ((bounds.bottom < 0) || (bounds.top < 0) || (bounds.right < 0) - || (bounds.left < 0)) { - throw new IllegalArgumentException("Path bounds must not be negative"); - } - if (path.isEmpty()) { - throw new IllegalArgumentException("Path is empty"); - } + Preconditions.checkArgument((bounds.bottom >= 0) && (bounds.top >= 0) + && (bounds.right >= 0) && (bounds.left >= 0), + "Path bounds must not be negative"); mPath = new Path(path); mPathMeasure = new PathMeasure(path, false); if (mPathMeasure.getLength() == 0) { @@ -321,17 +310,44 @@ public final class GestureDescription { * stroke in a future gesture. * * @return the ID of this stroke + * @hide */ public int getId() { return mId; } /** + * Create a new stroke that will continue this one. This is only possible if this stroke + * will continue. + * + * @param path The path for the stroke that continues this one. The starting point of + * this path must match the ending point of the stroke it continues. + * @param startTime The time, in milliseconds, from the time the gesture starts to the + * time this stroke should start. Must not be negative. This time is from + * the start of the new gesture, not the one being continued. + * @param duration The duration for the new stroke. Must not be negative. + * @param willContinue {@code true} if this stroke will be continued by one in the + * next gesture {@code false} otherwise. + * @return + */ + public StrokeDescription continueStroke(Path path, long startTime, long duration, + boolean willContinue) { + if (!mContinued) { + throw new IllegalStateException( + "Only strokes marked willContinue can be continued"); + } + StrokeDescription strokeDescription = + new StrokeDescription(path, startTime, duration, willContinue); + strokeDescription.mContinuedStrokeId = mId; + return strokeDescription; + } + + /** * Check if this stroke is marked to continue in the next gesture. * * @return {@code true} if the stroke is to be continued. */ - public boolean isContinued() { + public boolean willContinue() { return mContinued; } @@ -339,6 +355,7 @@ public final class GestureDescription { * Get the ID of the stroke that this one will continue. * * @return The ID of the stroke that this stroke continues, or 0 if no such stroke exists. + * @hide */ public int getContinuedStrokeId() { return mContinuedStrokeId; diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java index 7d81c4c029de..b7f1068faa3c 100644 --- a/core/java/android/app/AlertDialog.java +++ b/core/java/android/app/AlertDialog.java @@ -215,7 +215,8 @@ public class AlertDialog extends Dialog implements DialogInterface { return R.style.Theme_DeviceDefault_Dialog_Alert; } else if (themeResId == THEME_DEVICE_DEFAULT_LIGHT) { return R.style.Theme_DeviceDefault_Light_Dialog_Alert; - } else if (themeResId >= 0x01000000) { // start of real resource IDs. + } else if (Integer.compareUnsigned(themeResId, 0x01000000) >= 0) { + // start of real resource IDs. return themeResId; } else { final TypedValue outValue = new TypedValue(); diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index 8fcabce61825..9b1b6cdfc3ce 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -2756,8 +2756,8 @@ public class DevicePolicyManager { /** * Called by a profile or device owner to provision a token which can later be used to reset the - * device lockscreen password (if called by device owner), or work challenge (if called by - * profile owner), via {@link #resetPasswordWithToken}. + * device lockscreen password (if called by device owner), or managed profile challenge (if + * called by profile owner), via {@link #resetPasswordWithToken}. * <p> * If the user currently has a lockscreen password, the provisioned token will not be * immediately usable; it only becomes active after the user performs a confirm credential @@ -2835,8 +2835,8 @@ public class DevicePolicyManager { } /** - * Called by device or profile owner to force set a new device unlock password or a work profile - * challenge on current user. This takes effect immediately. + * Called by device or profile owner to force set a new device unlock password or a managed + * profile challenge on current user. This takes effect immediately. * <p> * Unlike {@link #resetPassword}, this API can change the password even before the user or * device is unlocked or decrypted. The supplied token must have been previously provisioned via @@ -5562,7 +5562,7 @@ public class DevicePolicyManager { * Calling with a null value for the list disables the restriction so that all services can be * used, calling with an empty list only allows the builtin system's services. * <p> - * System accesibility services are always available to the user the list can't modify this. + * System accessibility services are always available to the user the list can't modify this. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param packageNames List of accessibility service package names. @@ -5672,7 +5672,8 @@ public class DevicePolicyManager { * non-system input methods currently enabled that are not in the packageNames list. * @throws SecurityException if {@code admin} is not a device or profile owner. */ - public boolean setPermittedInputMethods(@NonNull ComponentName admin, List<String> packageNames) { + public boolean setPermittedInputMethods( + @NonNull ComponentName admin, List<String> packageNames) { throwIfParentInstance("setPermittedInputMethods"); if (mService != null) { try { @@ -5754,6 +5755,85 @@ public class DevicePolicyManager { } /** + * Called by a profile owner of a managed profile to set the packages that are allowed to use + * a {@link android.service.notification.NotificationListenerService} in the primary user to + * see notifications from the managed profile. By default all packages are permitted by this + * policy. When zero or more packages have been added, notification listeners installed on the + * primary user that are not in the list and are not part of the system won't receive events + * for managed profile notifications. + * <p> + * Calling with a {@code null} value for the list disables the restriction so that all + * notification listener services be used. Calling with an empty list disables all but the + * system's own notification listeners. System notification listener services are always + * available to the user. + * <p> + * If a device or profile owner want to stop notification listeners in their user from seeing + * that user's notifications they should prevent that service from running instead (e.g. via + * {@link #setApplicationHidden(ComponentName, String, boolean)}) + * + * @param admin Which {@link DeviceAdminReceiver} this request is associated with. + * @param packageList List of package names to whitelist + * @return true if setting the restriction succeeded. It will fail if called outside a managed + * profile + * @throws SecurityException if {@code admin} is not a profile owner. + * + * @see android.service.notification.NotificationListenerService + */ + public boolean setPermittedCrossProfileNotificationListeners( + @NonNull ComponentName admin, @Nullable List<String> packageList) { + throwIfParentInstance("setPermittedCrossProfileNotificationListeners"); + if (mService != null) { + try { + return mService.setPermittedCrossProfileNotificationListeners(admin, packageList); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + return false; + } + + /** + * Returns the list of packages installed on the primary user that allowed to use a + * {@link android.service.notification.NotificationListenerService} to receive + * notifications from this managed profile, as set by the profile owner. + * <p> + * An empty list means no notification listener services except system ones are allowed. + * A {@code null} return value indicates that all notification listeners are allowed. + */ + public @Nullable List<String> getPermittedCrossProfileNotificationListeners( + @NonNull ComponentName admin) { + throwIfParentInstance("getPermittedCrossProfileNotificationListeners"); + if (mService != null) { + try { + return mService.getPermittedCrossProfileNotificationListeners(admin); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + return null; + } + + /** + * Returns true if {@code NotificationListenerServices} from the given package are allowed to + * receive events for notifications from the given user id. Can only be called by the system uid + * + * @see #setPermittedCrossProfileNotificationListeners(ComponentName, List) + * + * @hide + */ + public boolean isNotificationListenerServicePermitted( + @NonNull String packageName, @UserIdInt int userId) { + if (mService != null) { + try { + return mService.isNotificationListenerServicePermitted(packageName, userId); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + return true; + } + + /** * Get the list of apps to keep around as APKs even if no user has currently installed it. This * function can be called by a device owner or by a delegate given the * {@link #DELEGATION_KEEP_UNINSTALLED_PACKAGES} scope via {@link #setDelegatedScopes}. diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 8ea911f4e9e4..e361d819ac2d 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -202,6 +202,10 @@ interface IDevicePolicyManager { List getPermittedInputMethodsForCurrentUser(); boolean isInputMethodPermittedByAdmin(in ComponentName admin, String packageName, int userId); + boolean setPermittedCrossProfileNotificationListeners(in ComponentName admin, in List<String> packageList); + List<String> getPermittedCrossProfileNotificationListeners(in ComponentName admin); + boolean isNotificationListenerServicePermitted(in String packageName, int userId); + Intent createAdminSupportIntent(in String restriction); boolean setApplicationHidden(in ComponentName admin, in String callerPackage, in String packageName, boolean hidden); boolean isApplicationHidden(in ComponentName admin, in String callerPackage, in String packageName); diff --git a/core/java/android/app/backup/BackupAgent.java b/core/java/android/app/backup/BackupAgent.java index 11636a5a7c0c..5f92af9fb8da 100644 --- a/core/java/android/app/backup/BackupAgent.java +++ b/core/java/android/app/backup/BackupAgent.java @@ -133,8 +133,6 @@ public abstract class BackupAgent extends ContextWrapper { Handler mHandler = null; - private long mBackupQuotaBytes = -1; - Handler getHandler() { if (mHandler == null) { mHandler = new Handler(Looper.getMainLooper()); @@ -186,21 +184,6 @@ public abstract class BackupAgent extends ContextWrapper { } /** - * Returns the quota in bytes for the currently requested backup operation. The value can - * vary for each operation depending on the type of backup being done. - * - * <p>Can be called only from {@link BackupAgent#onFullBackup(FullBackupDataOutput)} or - * {@link BackupAgent#onBackup(ParcelFileDescriptor, BackupDataOutput, ParcelFileDescriptor)}. - */ - public long getBackupQuota() { - if (mBackupQuotaBytes < 0) { - throw new IllegalStateException( - "Backup quota is available only during backup operations."); - } - return mBackupQuotaBytes; - } - - /** * The application is being asked to write any data changed since the last * time it performed a backup operation. The state data recorded during the * last backup pass is provided in the <code>oldState</code> file @@ -918,10 +901,8 @@ public abstract class BackupAgent extends ContextWrapper { // Ensure that we're running with the app's normal permission level long ident = Binder.clearCallingIdentity(); - mBackupQuotaBytes = quotaBytes; - if (DEBUG) Log.v(TAG, "doBackup() invoked"); - BackupDataOutput output = new BackupDataOutput(data.getFileDescriptor()); + BackupDataOutput output = new BackupDataOutput(data.getFileDescriptor(), quotaBytes); try { BackupAgent.this.onBackup(oldState, output, newState); @@ -937,9 +918,6 @@ public abstract class BackupAgent extends ContextWrapper { // guarantee themselves). waitForSharedPrefs(); - // Unset quota after onBackup is done. - mBackupQuotaBytes = -1; - Binder.restoreCallingIdentity(ident); try { callbackBinder.opComplete(token, 0); @@ -997,8 +975,6 @@ public abstract class BackupAgent extends ContextWrapper { // Ensure that we're running with the app's normal permission level long ident = Binder.clearCallingIdentity(); - mBackupQuotaBytes = quotaBytes; - if (DEBUG) Log.v(TAG, "doFullBackup() invoked"); // Ensure that any SharedPreferences writes have landed *before* @@ -1006,7 +982,7 @@ public abstract class BackupAgent extends ContextWrapper { waitForSharedPrefs(); try { - BackupAgent.this.onFullBackup(new FullBackupDataOutput(data)); + BackupAgent.this.onFullBackup(new FullBackupDataOutput(data, quotaBytes)); } catch (IOException ex) { Log.d(TAG, "onFullBackup (" + BackupAgent.this.getClass().getName() + ") threw", ex); throw new RuntimeException(ex); @@ -1017,9 +993,6 @@ public abstract class BackupAgent extends ContextWrapper { // ... and then again after, as in the doBackup() case waitForSharedPrefs(); - // Unset quota after onFullBackup is done. - mBackupQuotaBytes = -1; - // Send the EOD marker indicating that there is no more data // forthcoming from this agent. try { @@ -1046,9 +1019,7 @@ public abstract class BackupAgent extends ContextWrapper { public void doMeasureFullBackup(long quotaBytes, int token, IBackupManager callbackBinder) { // Ensure that we're running with the app's normal permission level final long ident = Binder.clearCallingIdentity(); - FullBackupDataOutput measureOutput = new FullBackupDataOutput(); - - mBackupQuotaBytes = quotaBytes; + FullBackupDataOutput measureOutput = new FullBackupDataOutput(quotaBytes); waitForSharedPrefs(); try { @@ -1060,8 +1031,6 @@ public abstract class BackupAgent extends ContextWrapper { Log.d(TAG, "onFullBackup[M] (" + BackupAgent.this.getClass().getName() + ") threw", ex); throw ex; } finally { - // Unset quota after onFullBackup is done. - mBackupQuotaBytes = -1; Binder.restoreCallingIdentity(ident); try { callbackBinder.opComplete(token, measureOutput.getSize()); diff --git a/core/java/android/app/backup/BackupDataOutput.java b/core/java/android/app/backup/BackupDataOutput.java index 1fe63e7ec30f..c7586a299dd8 100644 --- a/core/java/android/app/backup/BackupDataOutput.java +++ b/core/java/android/app/backup/BackupDataOutput.java @@ -62,12 +62,23 @@ import java.io.IOException; * @see BackupAgent */ public class BackupDataOutput { + final long mQuota; long mBackupWriter; - /** @hide */ + /** + * Construct a BackupDataOutput purely for data-stream manipulation. This instance will + * not report usable quota information. + * @hide */ @SystemApi public BackupDataOutput(FileDescriptor fd) { + this(fd, -1); + } + + /** @hide */ + @SystemApi + public BackupDataOutput(FileDescriptor fd, long quota) { if (fd == null) throw new NullPointerException(); + mQuota = quota; mBackupWriter = ctor(fd); if (mBackupWriter == 0) { throw new RuntimeException("Native initialization failed with fd=" + fd); @@ -75,6 +86,16 @@ public class BackupDataOutput { } /** + * Returns the quota in bytes for the application's current backup operation. The + * value can vary for each operation. + * + * @see FullBackupDataOutput#getQuota() + */ + public long getQuota() { + return mQuota; + } + + /** * Mark the beginning of one record in the backup data stream. This must be called before * {@link #writeEntityData}. * @param key A string key that uniquely identifies the data record within the application. diff --git a/core/java/android/app/backup/FullBackupDataOutput.java b/core/java/android/app/backup/FullBackupDataOutput.java index 94704b95da7b..5deedd035d0b 100644 --- a/core/java/android/app/backup/FullBackupDataOutput.java +++ b/core/java/android/app/backup/FullBackupDataOutput.java @@ -10,17 +10,35 @@ import android.os.ParcelFileDescriptor; public class FullBackupDataOutput { // Currently a name-scoping shim around BackupDataOutput private final BackupDataOutput mData; + private final long mQuota; private long mSize; + /** + * Returns the quota in bytes for the application's current backup operation. The + * value can vary for each operation. + * + * @see BackupDataOutput#getQuota() + */ + public long getQuota() { + return mQuota; + } + /** @hide - used only in measure operation */ - public FullBackupDataOutput() { + public FullBackupDataOutput(long quota) { mData = null; + mQuota = quota; mSize = 0; } /** @hide */ + public FullBackupDataOutput(ParcelFileDescriptor fd, long quota) { + mData = new BackupDataOutput(fd.getFileDescriptor(), quota); + mQuota = quota; + } + + /** @hide - used only internally to the backup manager service's stream construction */ public FullBackupDataOutput(ParcelFileDescriptor fd) { - mData = new BackupDataOutput(fd.getFileDescriptor()); + this(fd, -1); } /** @hide */ diff --git a/core/java/android/appwidget/AppWidgetProviderInfo.java b/core/java/android/appwidget/AppWidgetProviderInfo.java index 06fdb32fe495..52fa8a67532c 100644 --- a/core/java/android/appwidget/AppWidgetProviderInfo.java +++ b/core/java/android/appwidget/AppWidgetProviderInfo.java @@ -368,11 +368,11 @@ public class AppWidgetProviderInfo implements Parcelable { try { Resources resources = context.getPackageManager().getResourcesForApplication( providerInfo.applicationInfo); - if (resourceId > 0) { - if (density <= 0) { - density = context.getResources().getDisplayMetrics().densityDpi; + if (resourceId != 0) { + if (density < 0) { + density = 0; } - return resources.getDrawableForDensity(resourceId, density); + return resources.getDrawableForDensity(resourceId, density, null); } } catch (PackageManager.NameNotFoundException | Resources.NotFoundException e) { /* ignore */ diff --git a/core/java/android/bluetooth/le/AdvertisingSet.java b/core/java/android/bluetooth/le/AdvertisingSet.java index 3021be1f8c02..1bc211cb83a2 100644 --- a/core/java/android/bluetooth/le/AdvertisingSet.java +++ b/core/java/android/bluetooth/le/AdvertisingSet.java @@ -172,7 +172,7 @@ public final class AdvertisingSet { * * @param enable whether the periodic advertising should be enabled (true), or disabled (false). */ - public void setPeriodicAdvertisingEnable(boolean enable) { + public void setPeriodicAdvertisingEnabled(boolean enable) { try { gatt.setPeriodicAdvertisingEnable(this.advertiserId, enable); } catch (RemoteException e) { diff --git a/core/java/android/bluetooth/le/AdvertisingSetCallback.java b/core/java/android/bluetooth/le/AdvertisingSetCallback.java index 2c46e856db4a..c3c16a479e71 100644 --- a/core/java/android/bluetooth/le/AdvertisingSetCallback.java +++ b/core/java/android/bluetooth/le/AdvertisingSetCallback.java @@ -135,7 +135,7 @@ public abstract class AdvertisingSetCallback { int status) {} /** - * Callback triggered in response to {@link AdvertisingSet#setPeriodicAdvertisingEnable} + * Callback triggered in response to {@link AdvertisingSet#setPeriodicAdvertisingEnabled} * indicating result of the operation. * * @param advertisingSet The advertising set. diff --git a/core/java/android/bluetooth/le/AdvertisingSetParameters.java b/core/java/android/bluetooth/le/AdvertisingSetParameters.java index 31d8f482090d..71c4484a9474 100644 --- a/core/java/android/bluetooth/le/AdvertisingSetParameters.java +++ b/core/java/android/bluetooth/le/AdvertisingSetParameters.java @@ -242,7 +242,7 @@ public final class AdvertisingSetParameters implements Parcelable { * non-connectable. * Legacy advertisements can be both connectable and scannable. Non-legacy * advertisements can be only scannable or only connectable. - * @param connectable Controls whether the advertisment type will be + * @param connectable Controls whether the advertisement type will be * connectable (true) or non-connectable (false). */ public Builder setConnectable(boolean connectable) { @@ -254,7 +254,7 @@ public final class AdvertisingSetParameters implements Parcelable { * Set whether the advertisement type should be scannable. * Legacy advertisements can be both connectable and scannable. Non-legacy * advertisements can be only scannable or only connectable. - * @param scannable Controls whether the advertisment type will be + * @param scannable Controls whether the advertisement type will be * scannable (true) or non-scannable (false). */ public Builder setScannable(boolean scannable) { @@ -386,6 +386,7 @@ public final class AdvertisingSetParameters implements Parcelable { /** * Build the {@link AdvertisingSetParameters} object. + * @throws IllegalStateException if invalid combination of parameters is used. */ public AdvertisingSetParameters build() { if (isLegacy) { @@ -394,22 +395,22 @@ public final class AdvertisingSetParameters implements Parcelable { } if (connectable == true && scannable == false) { - throw new IllegalArgumentException( + throw new IllegalStateException( "Legacy advertisement can't be connectable and non-scannable"); } if (includeTxPower) { - throw new IllegalArgumentException( + throw new IllegalStateException( "Legacy advertising can't include TX power level in header"); } } else { if (connectable && scannable) { - throw new IllegalArgumentException( + throw new IllegalStateException( "Advertising can't be both connectable and scannable"); } if (isAnonymous && connectable) { - throw new IllegalArgumentException( + throw new IllegalStateException( "Advertising can't be both connectable and anonymous"); } } diff --git a/core/java/android/companion/BluetoothLeDeviceFilter.java b/core/java/android/companion/BluetoothLeDeviceFilter.java index 7a9ba1c3f402..7fb768c67386 100644 --- a/core/java/android/companion/BluetoothLeDeviceFilter.java +++ b/core/java/android/companion/BluetoothLeDeviceFilter.java @@ -38,6 +38,7 @@ import com.android.internal.util.BitUtils; import com.android.internal.util.ObjectUtils; import com.android.internal.util.Preconditions; +import java.nio.ByteOrder; import java.util.Arrays; import java.util.Objects; import java.util.regex.Pattern; @@ -61,15 +62,15 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { private final String mRenamePrefix; private final String mRenameSuffix; private final int mRenameBytesFrom; - private final int mRenameBytesTo; + private final int mRenameBytesLength; private final int mRenameNameFrom; - private final int mRenameNameTo; + private final int mRenameNameLength; private final boolean mRenameBytesReverseOrder; private BluetoothLeDeviceFilter(Pattern namePattern, ScanFilter scanFilter, byte[] rawDataFilter, byte[] rawDataFilterMask, String renamePrefix, - String renameSuffix, int renameBytesFrom, int renameBytesTo, - int renameNameFrom, int renameNameTo, boolean renameBytesReverseOrder) { + String renameSuffix, int renameBytesFrom, int renameBytesLength, + int renameNameFrom, int renameNameLength, boolean renameBytesReverseOrder) { mNamePattern = namePattern; mScanFilter = ObjectUtils.firstNotNull(scanFilter, ScanFilter.EMPTY); mRawDataFilter = rawDataFilter; @@ -77,9 +78,9 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { mRenamePrefix = renamePrefix; mRenameSuffix = renameSuffix; mRenameBytesFrom = renameBytesFrom; - mRenameBytesTo = renameBytesTo; + mRenameBytesLength = renameBytesLength; mRenameNameFrom = renameNameFrom; - mRenameNameTo = renameNameTo; + mRenameNameLength = renameNameLength; mRenameBytesReverseOrder = renameBytesReverseOrder; } @@ -125,8 +126,8 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { } /** @hide */ - public int getRenameBytesTo() { - return mRenameBytesTo; + public int getRenameBytesLength() { + return mRenameBytesLength; } /** @hide */ @@ -145,7 +146,7 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { if (mRenameBytesFrom >= 0) { final byte[] bytes = sr.getScanRecord().getBytes(); int startInclusive = mRenameBytesFrom; - int endInclusive = mRenameBytesTo - 1; + int endInclusive = mRenameBytesFrom + mRenameBytesLength -1; int initial = mRenameBytesReverseOrder ? endInclusive : startInclusive; int step = mRenameBytesReverseOrder ? -1 : 1; for (int i = initial; startInclusive <= i && i <= endInclusive; i += step) { @@ -154,7 +155,7 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { } else { sb.append( getDeviceDisplayNameInternal(sr.getDevice()) - .substring(mRenameNameFrom, mRenameNameTo)); + .substring(mRenameNameFrom, mRenameNameFrom + mRenameNameLength)); } return sb.append(TextUtils.emptyIfNull(mRenameSuffix)).toString(); } @@ -188,7 +189,9 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { if (o == null || getClass() != o.getClass()) return false; BluetoothLeDeviceFilter that = (BluetoothLeDeviceFilter) o; return mRenameBytesFrom == that.mRenameBytesFrom && - mRenameBytesTo == that.mRenameBytesTo && + mRenameBytesLength == that.mRenameBytesLength && + mRenameNameFrom == that.mRenameNameFrom && + mRenameNameLength == that.mRenameNameLength && mRenameBytesReverseOrder == that.mRenameBytesReverseOrder && Objects.equals(mNamePattern, that.mNamePattern) && Objects.equals(mScanFilter, that.mScanFilter) && @@ -201,8 +204,8 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { @Override public int hashCode() { return Objects.hash(mNamePattern, mScanFilter, mRawDataFilter, mRawDataFilterMask, - mRenamePrefix, mRenameSuffix, mRenameBytesFrom, mRenameBytesTo, - mRenameBytesReverseOrder); + mRenamePrefix, mRenameSuffix, mRenameBytesFrom, mRenameBytesLength, + mRenameNameFrom, mRenameNameLength, mRenameBytesReverseOrder); } @Override @@ -214,9 +217,9 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { dest.writeString(mRenamePrefix); dest.writeString(mRenameSuffix); dest.writeInt(mRenameBytesFrom); - dest.writeInt(mRenameBytesTo); + dest.writeInt(mRenameBytesLength); dest.writeInt(mRenameNameFrom); - dest.writeInt(mRenameNameTo); + dest.writeInt(mRenameNameLength); dest.writeBoolean(mRenameBytesReverseOrder); } @@ -235,9 +238,9 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { ", mRenamePrefix='" + mRenamePrefix + '\'' + ", mRenameSuffix='" + mRenameSuffix + '\'' + ", mRenameBytesFrom=" + mRenameBytesFrom + - ", mRenameBytesTo=" + mRenameBytesTo + + ", mRenameBytesLength=" + mRenameBytesLength + ", mRenameNameFrom=" + mRenameNameFrom + - ", mRenameNameTo=" + mRenameNameTo + + ", mRenameNameLength=" + mRenameNameLength + ", mRenameBytesReverseOrder=" + mRenameBytesReverseOrder + '}'; } @@ -264,7 +267,7 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { if (renamePrefix != null) { if (bytesFrom >= 0) { builder.setRenameFromBytes(renamePrefix, suffix, bytesFrom, bytesTo, - bytesReverseOrder); + bytesReverseOrder ? ByteOrder.LITTLE_ENDIAN : ByteOrder.BIG_ENDIAN); } else { builder.setRenameFromName(renamePrefix, suffix, nameFrom, nameTo); } @@ -293,9 +296,9 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { private String mRenamePrefix; private String mRenameSuffix; private int mRenameBytesFrom = -1; - private int mRenameBytesTo; + private int mRenameBytesLength; private int mRenameNameFrom = -1; - private int mRenameNameTo; + private int mRenameNameLength; private boolean mRenameBytesReverseOrder = false; /** @@ -355,19 +358,19 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { * @param prefix to be displayed before the byte data * @param suffix to be displayed after the byte data * @param bytesFrom the start byte index to be displayed (inclusive) - * @param bytesTo the end byte index to be displayed (exclusive) - * @param bytesReverseOrder if true, the byte order of the provided range will be flipped - * when displaying + * @param bytesLength the number of bytes to be displayed from the given index + * @param byteOrder whether the given range of bytes is big endian (will be displayed + * in same order) or little endian (will be flipped before displaying) * @return self for chaining */ @NonNull public Builder setRenameFromBytes(@NonNull String prefix, @NonNull String suffix, - int bytesFrom, int bytesTo, boolean bytesReverseOrder) { + int bytesFrom, int bytesLength, ByteOrder byteOrder) { checkRenameNotSet(); - checkRangeNotEmpty(bytesFrom, bytesTo); + checkRangeNotEmpty(bytesLength); mRenameBytesFrom = bytesFrom; - mRenameBytesTo = bytesTo; - mRenameBytesReverseOrder = bytesReverseOrder; + mRenameBytesLength = bytesLength; + mRenameBytesReverseOrder = byteOrder == ByteOrder.LITTLE_ENDIAN; return setRename(prefix, suffix); } @@ -383,16 +386,16 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { * @param prefix to be displayed before the byte data * @param suffix to be displayed after the byte data * @param nameFrom the start name character index to be displayed (inclusive) - * @param nameTo the end name character index to be displayed (exclusive) + * @param nameLength the number of characters to be displayed from the given index * @return self for chaining */ @NonNull public Builder setRenameFromName(@NonNull String prefix, @NonNull String suffix, - int nameFrom, int nameTo) { + int nameFrom, int nameLength) { checkRenameNotSet(); - checkRangeNotEmpty(nameFrom, nameTo); + checkRangeNotEmpty(nameLength); mRenameNameFrom = nameFrom; - mRenameNameTo = nameTo; + mRenameNameLength = nameLength; mRenameBytesReverseOrder = false; return setRename(prefix, suffix); } @@ -401,8 +404,8 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { checkState(mRenamePrefix == null, "Renaming rule can only be set once"); } - private void checkRangeNotEmpty(int bytesFrom, int bytesTo) { - checkArgument(bytesFrom < bytesTo, "Range must be non-empty"); + private void checkRangeNotEmpty(int length) { + checkArgument(length > 0, "Range must be non-empty"); } @NonNull @@ -423,8 +426,8 @@ public final class BluetoothLeDeviceFilter implements DeviceFilter<ScanResult> { return new BluetoothLeDeviceFilter(mNamePattern, mScanFilter, mRawDataFilter, mRawDataFilterMask, mRenamePrefix, mRenameSuffix, - mRenameBytesFrom, mRenameBytesTo, - mRenameNameFrom, mRenameNameTo, + mRenameBytesFrom, mRenameBytesLength, + mRenameNameFrom, mRenameNameLength, mRenameBytesReverseOrder); } } diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 28cfd331cd27..309827c3477a 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -36,7 +36,6 @@ import android.database.IContentObserver; import android.graphics.Point; import android.graphics.drawable.Drawable; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.os.CancellationSignal; import android.os.DeadObjectException; @@ -516,12 +515,7 @@ public abstract class ContentResolver { public ContentResolver(Context context) { mContext = context != null ? context : ActivityThread.currentApplication(); mPackageName = mContext.getOpPackageName(); - if (android.os.Process.myUid() == android.os.Process.PHONE_UID) { - // STOPSHIP: Telephony needs to fix b/35792675 - mTargetSdkVersion = Build.VERSION_CODES.N_MR1; - } else { - mTargetSdkVersion = mContext.getApplicationInfo().targetSdkVersion; - } + mTargetSdkVersion = mContext.getApplicationInfo().targetSdkVersion; } /** @hide */ diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java index 766eab9dac4d..fc26d0e792de 100644 --- a/core/java/android/content/pm/PackageParser.java +++ b/core/java/android/content/pm/PackageParser.java @@ -148,7 +148,7 @@ public class PackageParser { private static final String PROPERTY_CHILD_PACKAGES_ENABLED = "persist.sys.child_packages_enabled"; - private static final boolean MULTI_PACKAGE_APK_ENABLED = + private static final boolean MULTI_PACKAGE_APK_ENABLED = Build.IS_DEBUGGABLE && SystemProperties.getBoolean(PROPERTY_CHILD_PACKAGES_ENABLED, false); private static final int MAX_PACKAGES_PER_APK = 5; diff --git a/core/java/android/provider/FontsContract.java b/core/java/android/provider/FontsContract.java index 1013b0f0af23..f90911421e10 100644 --- a/core/java/android/provider/FontsContract.java +++ b/core/java/android/provider/FontsContract.java @@ -15,7 +15,6 @@ */ package android.provider; -import static android.graphics.fonts.FontVariationAxis.InvalidFormatException; import static java.lang.annotation.RetentionPolicy.SOURCE; import android.annotation.IntDef; @@ -601,7 +600,7 @@ public class FontsContract { FontInfo[] fonts = getFontFromProvider( context, request, providerInfo.authority, cancellationSignal); return new FontFamilyResult(FontFamilyResult.STATUS_OK, fonts); - } catch (InvalidFormatException e) { + } catch (IllegalArgumentException e) { return new FontFamilyResult(FontFamilyResult.STATUS_UNEXPECTED_DATA_PROVIDED, null); } } @@ -755,7 +754,7 @@ public class FontsContract { @VisibleForTesting public static @NonNull FontInfo[] getFontFromProvider( Context context, FontRequest request, String authority, - CancellationSignal cancellationSignal) throws InvalidFormatException { + CancellationSignal cancellationSignal) { ArrayList<FontInfo> result = new ArrayList<>(); final Uri uri = new Uri.Builder().scheme(ContentResolver.SCHEME_CONTENT) .authority(authority) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 89c0963320d3..95be39bdbd93 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -6622,6 +6622,13 @@ public final class Settings { public static final String PAYMENT_SERVICE_SEARCH_URI = "payment_service_search_uri"; /** + * This is the query URI for finding a auto fill service to install. + * + * @hide + */ + public static final String AUTOFILL_SERVICE_SEARCH_URI = "autofill_service_search_uri"; + + /** * If enabled, apps should try to skip any introductory hints on first launch. This might * apply to users that are already familiar with the environment or temporary users. * <p> @@ -7717,6 +7724,14 @@ public final class Settings { "location_background_throttle_interval_ms"; /** + * Most frequent location update interval in milliseconds that proximity alert is allowed + * to request. + * @hide + */ + public static final String LOCATION_BACKGROUND_THROTTLE_PROXIMITY_ALERT_INTERVAL_MS = + "location_background_throttle_proximity_alert_interval_ms"; + + /** * Packages that are whitelisted for background throttling (throttling will not be applied). * @hide */ diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index 4029a42554db..39f1170a474b 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -805,6 +805,14 @@ public class View implements Drawable.Callback, KeyEvent.Callback, public static final int LAST_APP_ACCESSIBILITY_ID = Integer.MAX_VALUE / 2; /** + * Attribute to find the autofilled highlight + * + * @see #getAutofilledDrawable() + */ + private static final int[] AUTOFILL_HIGHLIGHT_ATTR = + new int[]{android.R.attr.autofilledHighlight}; + + /** * Signals that compatibility booleans have been initialized according to * target SDK versions. */ @@ -7471,10 +7479,12 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * <p>See {@link #autofill(AutofillValue)} and * {@link #onProvideAutofillVirtualStructure(ViewStructure, int)} for more info. * <p>To indicate that a virtual view was autofilled - * <code>@android:drawable/autofilled_highlight</code> should be drawn over it until the data + * <code>?android:attr/autofilledHighlight</code> should be drawn over it until the data * changes. * * @param values map of values to be autofilled, keyed by virtual child id. + * + * @attr ref android.R.styleable#Theme_autofilledHighlight */ public void autofill(@NonNull @SuppressWarnings("unused") SparseArray<AutofillValue> values) { } @@ -20406,15 +20416,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * * @throws IllegalStateException if the drawable could not be found. */ - @NonNull private Drawable getAutofilledDrawable() { + @Nullable private Drawable getAutofilledDrawable() { // Lazily load the isAutofilled drawable. if (mAttachInfo.mAutofilledDrawable == null) { - mAttachInfo.mAutofilledDrawable = mContext.getDrawable(R.drawable.autofilled_highlight); - - if (mAttachInfo.mAutofilledDrawable == null) { - throw new IllegalStateException( - "Could not find android:drawable/autofilled_highlight"); - } + TypedArray a = mContext.getTheme().obtainStyledAttributes(AUTOFILL_HIGHLIGHT_ATTR); + int attributeResourceId = a.getResourceId(0, 0); + mAttachInfo.mAutofilledDrawable = mContext.getDrawable(attributeResourceId); + a.recycle(); } return mAttachInfo.mAutofilledDrawable; @@ -20429,8 +20437,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (isAutofilled()) { Drawable autofilledHighlight = getAutofilledDrawable(); - autofilledHighlight.setBounds(0, 0, getWidth(), getHeight()); - autofilledHighlight.draw(canvas); + if (autofilledHighlight != null) { + autofilledHighlight.setBounds(0, 0, getWidth(), getHeight()); + autofilledHighlight.draw(canvas); + } } } diff --git a/core/java/android/view/accessibility/AccessibilityNodeInfo.java b/core/java/android/view/accessibility/AccessibilityNodeInfo.java index 94a4547fca64..5148d92a8279 100644 --- a/core/java/android/view/accessibility/AccessibilityNodeInfo.java +++ b/core/java/android/view/accessibility/AccessibilityNodeInfo.java @@ -487,7 +487,7 @@ public class AccessibilityNodeInfo implements Parcelable { * @see AccessibilityAction#ACTION_MOVE_WINDOW */ public static final String ACTION_ARGUMENT_MOVE_WINDOW_X = - "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_X"; + "ACTION_ARGUMENT_MOVE_WINDOW_X"; /** * Argument for specifying the y coordinate to which to move a window. @@ -501,7 +501,7 @@ public class AccessibilityNodeInfo implements Parcelable { * @see AccessibilityAction#ACTION_MOVE_WINDOW */ public static final String ACTION_ARGUMENT_MOVE_WINDOW_Y = - "android.view.accessibility.action.ARGUMENT_MOVE_WINDOW_Y"; + "ACTION_ARGUMENT_MOVE_WINDOW_Y"; /** * Argument to pass the {@link AccessibilityClickableSpan}. diff --git a/core/java/android/view/accessibility/AccessibilityWindowInfo.java b/core/java/android/view/accessibility/AccessibilityWindowInfo.java index 2a7537b08921..f11767debbc9 100644 --- a/core/java/android/view/accessibility/AccessibilityWindowInfo.java +++ b/core/java/android/view/accessibility/AccessibilityWindowInfo.java @@ -231,8 +231,18 @@ public final class AccessibilityWindowInfo implements Parcelable { * Check if the window is in picture-in-picture mode. * * @return {@code true} if the window is in picture-in-picture mode, {@code false} otherwise. + * @removed */ public boolean inPictureInPicture() { + return isInPictureInPictureMode(); + } + + /** + * Check if the window is in picture-in-picture mode. + * + * @return {@code true} if the window is in picture-in-picture mode, {@code false} otherwise. + */ + public boolean isInPictureInPictureMode() { return mInPictureInPicture; } diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java index 492010c414fa..eee70e047dfd 100644 --- a/core/java/android/widget/TextView.java +++ b/core/java/android/widget/TextView.java @@ -56,7 +56,6 @@ import android.graphics.RectF; import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.graphics.fonts.FontVariationAxis; -import android.graphics.fonts.FontVariationAxis.InvalidFormatException; import android.icu.text.DecimalFormatSymbols; import android.os.AsyncTask; import android.os.Build.VERSION_CODES; @@ -3925,14 +3924,13 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener * TextView. This function also returns true for empty settings string. Otherwise * returns false. * - * @throws InvalidFormatException If given string is not a valid font variation settings - * format. + * @throws IllegalArgumentException If given string is not a valid font variation settings + * format. * * @see #getFontVariationSettings() * @see FontVariationAxis */ - public boolean setFontVariationSettings(@Nullable String fontVariationSettings) - throws InvalidFormatException { + public boolean setFontVariationSettings(@Nullable String fontVariationSettings) { final String existingSettings = mTextPaint.getFontVariationSettings(); if (fontVariationSettings == existingSettings || (fontVariationSettings != null diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 8bf96e368a98..5b4a454e3d97 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -1861,22 +1861,40 @@ android:description="@string/permdesc_systemAlertWindow" android:protectionLevel="signature|preinstalled|appop|pre23|development" /> - <!-- Allows an app to run in the background. - <p>Protection level: signature + <!-- @deprecated Use {@link android.Manifest.permission#REQUEST_COMPANION_RUN_IN_BACKGROUND} + @hide --> <permission android:name="android.permission.RUN_IN_BACKGROUND" android:label="@string/permlab_runInBackground" android:description="@string/permdesc_runInBackground" android:protectionLevel="signature" /> - <!-- Allows an app to use data in the background. - <p>Protection level: signature + <!-- @deprecated Use + {@link android.Manifest.permission#REQUEST_COMPANION_USE_DATA_IN_BACKGROUND} + @hide --> <permission android:name="android.permission.USE_DATA_IN_BACKGROUND" android:label="@string/permlab_useDataInBackground" android:description="@string/permdesc_useDataInBackground" android:protectionLevel="signature" /> + <!-- Allows a companion app to run in the background. + <p>Protection level: signature + --> + <permission android:name="android.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND" + android:label="@string/permlab_runInBackground" + android:description="@string/permdesc_runInBackground" + android:protectionLevel="signature" /> + + <!-- Allows a companion app to use data in the background. + <p>Protection level: signature + --> + <permission android:name="android.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND" + android:label="@string/permlab_useDataInBackground" + android:description="@string/permdesc_useDataInBackground" + android:protectionLevel="signature" /> + + <!-- ================================== --> <!-- Permissions affecting the system wallpaper --> <!-- ================================== --> diff --git a/core/res/res/layout/autofill_save.xml b/core/res/res/layout/autofill_save.xml index cbea275af034..60df492e451a 100644 --- a/core/res/res/layout/autofill_save.xml +++ b/core/res/res/layout/autofill_save.xml @@ -25,7 +25,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:layout_marginTop="32dp" - android:padding="16dp" + android:paddingTop="16dp" android:elevation="32dp" android:background="?android:attr/colorBackground" android:orientation="vertical"> @@ -33,43 +33,53 @@ <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> - <TextView - android:id="@+id/autofill_save_title" - android:layout_width="0dp" + <LinearLayout + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:text="@string/autofill_save_title" - android:textSize="16sp" - android:textColor="?android:attr/textColorPrimary" - android:layout_weight="1"> - </TextView> + android:orientation="horizontal"> + + <TextView + android:id="@+id/autofill_save_title" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="@string/autofill_save_title" + android:textSize="16sp" + android:textColor="?android:attr/textColorPrimary" + android:layout_weight="1"> + </TextView> + + <ImageView + android:id="@+id/autofill_save_close" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="16dp" + android:src="@android:drawable/ic_close" + android:alpha="0.54" + android:background="?android:attr/selectableItemBackgroundBorderless"> + </ImageView> + + </LinearLayout> - <ImageView - android:id="@+id/autofill_save_close" - android:layout_width="wrap_content" + <TextView + android:id="@+id/autofill_save_subtitle" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" - android:src="@android:drawable/ic_close" - android:alpha="0.54" - android:background="?android:attr/selectableItemBackgroundBorderless"> - </ImageView> + android:layout_marginTop="4dp" + android:visibility="gone"> + </TextView> </LinearLayout> - <TextView - android:id="@+id/autofill_save_subtitle" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="4dp" - android:visibility="gone"> - </TextView> - <com.android.internal.widget.ButtonBarLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="end" - android:layout_marginTop="16dp" + android:padding="16dp" + android:clipToPadding="false" android:layout_weight="1" android:orientation="horizontal"> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 3898cae0df07..c4215141448d 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -60,6 +60,9 @@ mode. --> <attr name="colorMultiSelectHighlight" format="color" /> + <!-- Drawable to be drawn over the view to mark it as autofilled--> + <attr name="autofilledHighlight" format="reference" /> + <!-- Default disabled alpha for widgets that set enabled/disabled alpha programmatically. --> <attr name="disabledAlpha" format="float" /> <!-- The alpha applied to the foreground color to create the primary text color. --> @@ -3448,8 +3451,8 @@ <flag name="flagEnableAccessibilityVolume" value="0x00000080" /> <!-- Has flag {@link android.accessibilityservice.AccessibilityServiceInfo#FLAG_REQUEST_ACCESSIBILITY_BUTTON}. --> <flag name="flagRequestAccessibilityButton" value="0x00000100" /> - <!-- Has flag {@link android.accessibilityservice.AccessibilityServiceInfo#FLAG_CAPTURE_FINGERPRINT_GESTURES}. --> - <flag name="flagCaptureFingerprintGestures" value="0x00000200" /> + <!-- Has flag {@link android.accessibilityservice.AccessibilityServiceInfo#FLAG_REQUEST_FINGERPRINT_GESTURES}. --> + <flag name="flagRequestFingerprintGestures" value="0x00000200" /> </attr> <!-- Component name of an activity that allows the user to modify the settings for this service. This setting cannot be changed at runtime. --> @@ -3489,10 +3492,10 @@ the fingerprint sensor. <p> Required to allow setting the {@link android.accessibilityservice - #AccessibilityServiceInfo#FLAG_CAN_CAPTURE_FINGERPRINT_GESTURES} flag. + #AccessibilityServiceInfo#FLAG_REQUEST_FINGERPRINT_GESTURES} flag to have any effect. </p> --> - <attr name="canCaptureFingerprintGestures" format="boolean" /> + <attr name="canRequestFingerprintGestures" format="boolean" /> <!-- Short description of the accessibility service purpose or behavior.--> <attr name="description" /> <!-- Brief summary of the accessibility service purpose or behavior. --> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 1fbcac247ac9..89ed9cb58943 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -2792,7 +2792,7 @@ <public name="colorMode" /> <public name="isolatedSplits" /> <public name="targetSandboxVersion" /> - <public name="canCaptureFingerprintGestures" /> + <public name="canRequestFingerprintGestures" /> <public name="alphabeticModifiers" /> <public name="numericModifiers" /> <public name="fontProviderAuthority" /> @@ -2822,6 +2822,7 @@ <!-- @hide @SystemApi --> <public name="requiredSystemPropertyValue" /> <public name="justificationMode" /> + <public name="autofilledHighlight" /> </public-group> <public-group type="style" first-id="0x010302e0"> @@ -2833,8 +2834,8 @@ <public name="autofill" /> </public-group> - <public-group type="drawable" first-id="0x010800b4"> - <public name="autofilled_highlight" /> + <public-group type="drawable" first-id="0x010800b5"> + <!-- 0x010800b4 was removed --> <public name="ic_picture_in_picture" /> </public-group> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 0ea9b3961979..1e529da7b14a 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -238,6 +238,7 @@ <java-symbol type="attr" name="windowFixedHeightMinor" /> <java-symbol type="attr" name="accessibilityFocusedDrawable"/> <java-symbol type="attr" name="isLightTheme"/> + <java-symbol type="attr" name="autofilledHighlight"/> <java-symbol type="bool" name="action_bar_embed_tabs" /> <java-symbol type="bool" name="action_bar_expanded_action_views_exclusive" /> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index a661b070872d..e8fbf348c371 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -435,6 +435,9 @@ please see themes_device_defaults.xml. <!-- Accessibility focused drawable --> <item name="accessibilityFocusedDrawable">@drawable/view_accessibility_focused</item> + <!-- Autofilled highlight drawable --> + <item name="autofilledHighlight">@drawable/autofilled_highlight</item> + <!-- Lighting and shadow properties --> <item name="lightY">@dimen/light_y</item> <item name="lightZ">@dimen/light_z</item> diff --git a/core/tests/coretests/src/android/provider/FontsContractTest.java b/core/tests/coretests/src/android/provider/FontsContractTest.java index 56bfbb0a646f..d42d79e8fd82 100644 --- a/core/tests/coretests/src/android/provider/FontsContractTest.java +++ b/core/tests/coretests/src/android/provider/FontsContractTest.java @@ -32,7 +32,6 @@ import android.content.pm.PackageManager; import android.content.pm.ProviderInfo; import android.content.pm.Signature; import android.database.MatrixCursor; -import android.graphics.fonts.FontVariationAxis.InvalidFormatException; import android.graphics.fonts.FontVariationAxis; import android.provider.FontsContract.FontInfo; import android.support.test.filters.SmallTest; @@ -73,7 +72,7 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> { mPackageManager = mock(PackageManager.class); } - public void testGetFontFromProvider_resultOK() throws InvalidFormatException { + public void testGetFontFromProvider_resultOK() { FontInfo[] fonts = FontsContract.getFontFromProvider( getMockContext(), request, TestFontsProvider.AUTHORITY, null); assertNotNull(fonts); @@ -90,8 +89,7 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> { assertEquals(RESULT_CODE_OK, font.getResultCode()); } - public void testGetFontFromProvider_providerDoesntReturnAllFields() - throws InvalidFormatException { + public void testGetFontFromProvider_providerDoesntReturnAllFields() { mProvider.setReturnAllFields(false); FontInfo[] fonts = FontsContract.getFontFromProvider( @@ -107,7 +105,7 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> { assertEquals(RESULT_CODE_OK, font.getResultCode()); } - public void testGetFontFromProvider_resultFontNotFound() throws InvalidFormatException { + public void testGetFontFromProvider_resultFontNotFound() { // Make the provider return unknown mProvider.setResultCode(RESULT_CODE_FONT_NOT_FOUND); FontInfo[] fonts = FontsContract.getFontFromProvider( @@ -120,7 +118,7 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> { assertEquals(RESULT_CODE_FONT_NOT_FOUND, font.getResultCode()); } - public void testGetFontFromProvider_resultFontUnavailable() throws InvalidFormatException { + public void testGetFontFromProvider_resultFontUnavailable() { // Make the provider return font unavailable mProvider.setResultCode(RESULT_CODE_FONT_UNAVAILABLE); FontInfo[] fonts = FontsContract.getFontFromProvider( @@ -140,7 +138,7 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> { assertEquals(RESULT_CODE_FONT_UNAVAILABLE, font.getResultCode()); } - public void testGetFontFromProvider_resultMalformedQuery() throws InvalidFormatException { + public void testGetFontFromProvider_resultMalformedQuery() { // Make the provider return font unavailable mProvider.setResultCode(RESULT_CODE_MALFORMED_QUERY); FontInfo[] fonts = FontsContract.getFontFromProvider( @@ -160,8 +158,7 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> { assertEquals(RESULT_CODE_MALFORMED_QUERY, font.getResultCode()); } - public void testGetFontFromProvider_resultFontNotFoundSecondRow() - throws InvalidFormatException { + public void testGetFontFromProvider_resultFontNotFoundSecondRow() { MatrixCursor cursor = new MatrixCursor(new String[] { FontsContract.Columns._ID, FontsContract.Columns.TTC_INDEX, FontsContract.Columns.VARIATION_SETTINGS, FontsContract.Columns.WEIGHT, FontsContract.Columns.ITALIC, @@ -193,7 +190,7 @@ public class FontsContractTest extends ProviderTestCase2<TestFontsProvider> { assertEquals(RESULT_CODE_FONT_NOT_FOUND, font.getResultCode()); } - public void testGetFontFromProvider_resultFontNotFoundOtherRow() throws InvalidFormatException { + public void testGetFontFromProvider_resultFontNotFoundOtherRow() { MatrixCursor cursor = new MatrixCursor(new String[] { FontsContract.Columns._ID, FontsContract.Columns.TTC_INDEX, FontsContract.Columns.VARIATION_SETTINGS, FontsContract.Columns.WEIGHT, FontsContract.Columns.ITALIC, diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java index ba24eec0fb04..99909acb9c0a 100644 --- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java +++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java @@ -37,7 +37,8 @@ import org.junit.runner.RunWith; /** Tests that ensure appropriate settings are backed up. */ @RunWith(AndroidJUnit4.class) -@Presubmit +// TODO(b/37684646): Can re-enable pre-submit once test is fixed. +//@Presubmit @SmallTest public class SettingsBackupTest { @@ -213,6 +214,7 @@ public class SettingsBackupTest { Settings.Global.LANG_ID_UPDATE_CONTENT_URL, Settings.Global.LANG_ID_UPDATE_METADATA_URL, Settings.Global.LOCATION_BACKGROUND_THROTTLE_INTERVAL_MS, + Settings.Global.LOCATION_BACKGROUND_THROTTLE_PROXIMITY_ALERT_INTERVAL_MS, Settings.Global.LOCATION_BACKGROUND_THROTTLE_PACKAGE_WHITELIST, Settings.Global.LOCATION_SETTINGS_LINK_TO_PERMISSIONS_ENABLED, Settings.Global.LOCK_SOUND, diff --git a/core/tests/coretests/src/android/text/VariationParserTest.java b/core/tests/coretests/src/android/text/VariationParserTest.java index bcc47e1fc201..b0f55d6da0e3 100644 --- a/core/tests/coretests/src/android/text/VariationParserTest.java +++ b/core/tests/coretests/src/android/text/VariationParserTest.java @@ -33,7 +33,7 @@ public class VariationParserTest extends TestCase { try { FontVariationAxis.fromFontVariationSettings("'wdth' " + invalidStyle); fail(); - } catch (FontVariationAxis.InvalidFormatException e) { + } catch (IllegalArgumentException e) { // pass } } @@ -41,14 +41,14 @@ public class VariationParserTest extends TestCase { try { FontVariationAxis.fromFontVariationSettings("'wght' 1, 'wdth' " + invalidStyle); fail(); - } catch (FontVariationAxis.InvalidFormatException e) { + } catch (IllegalArgumentException e) { // pass } } } @SmallTest - public void testOpenTypeTagValue() throws FontVariationAxis.InvalidFormatException { + public void testOpenTypeTagValue() { assertEquals(0x77647468, (new FontVariationAxis("wdth", 0).getOpenTypeTagValue())); assertEquals(0x41582020, (new FontVariationAxis("AX ", 0).getOpenTypeTagValue())); assertEquals(0x20202020, (new FontVariationAxis(" ", 0).getOpenTypeTagValue())); diff --git a/graphics/java/android/graphics/FontListParser.java b/graphics/java/android/graphics/FontListParser.java index 1a4f225c6267..7c07a302dfe9 100644 --- a/graphics/java/android/graphics/FontListParser.java +++ b/graphics/java/android/graphics/FontListParser.java @@ -134,12 +134,7 @@ public class FontListParser { String tagStr = parser.getAttributeValue(null, "tag"); String styleValueStr = parser.getAttributeValue(null, "stylevalue"); skip(parser); // axis tag is empty, ignore any contents and consume end tag - try { - return new FontVariationAxis(tagStr, Float.parseFloat(styleValueStr)); - } catch (FontVariationAxis.InvalidFormatException e) { - // Treat as system failure since system preinstalled font setting has invalid format. - throw new RuntimeException(e); - } + return new FontVariationAxis(tagStr, Float.parseFloat(styleValueStr)); } private static FontConfig.Alias readAlias(XmlPullParser parser) diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index 81bd6adbb9d5..e62df8ff4742 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -21,7 +21,6 @@ import android.annotation.NonNull; import android.annotation.Size; import android.graphics.FontListParser; import android.graphics.fonts.FontVariationAxis; -import android.graphics.fonts.FontVariationAxis.InvalidFormatException; import android.os.LocaleList; import android.text.FontConfig; import android.text.GraphicsOperations; @@ -1575,13 +1574,13 @@ public class Paint { * typeface. This function also returns true for empty settings string. Otherwise * returns false * - * @throws InvalidFormatException If given string is not a valid font variation settings format. + * @throws IllegalArgumentException If given string is not a valid font variation settings + * format * * @see #getFontVariationSettings() * @see FontVariationAxis */ - public boolean setFontVariationSettings(String fontVariationSettings) - throws InvalidFormatException { + public boolean setFontVariationSettings(String fontVariationSettings) { final String settings = TextUtils.nullIfEmpty(fontVariationSettings); if (settings == mFontVariationSettings || (settings != null && settings.equals(mFontVariationSettings))) { diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java index ba62a08b6fcd..ad6ea2bdb284 100644 --- a/graphics/java/android/graphics/Typeface.java +++ b/graphics/java/android/graphics/Typeface.java @@ -30,7 +30,6 @@ import android.annotation.Nullable; import android.content.res.AssetManager; import android.graphics.FontListParser; import android.graphics.fonts.FontVariationAxis; -import android.graphics.fonts.FontVariationAxis.InvalidFormatException; import android.net.Uri; import android.os.Bundle; import android.os.Handler; @@ -432,11 +431,10 @@ public class Typeface { * Sets a font variation settings. * * @param variationSettings See {@link android.widget.TextView#setFontVariationSettings}. - * @throws InvalidFormatException If given string is not a valid font variation settings - * format. + * @throws IllegalArgumentException If given string is not a valid font variation settings + * format. */ - public Builder setFontVariationSettings(@Nullable String variationSettings) - throws InvalidFormatException { + public Builder setFontVariationSettings(@Nullable String variationSettings) { if (mFonts != null) { throw new IllegalArgumentException( "Font variation settings can not be specified for FontResult source."); diff --git a/graphics/java/android/graphics/fonts/FontVariationAxis.java b/graphics/java/android/graphics/fonts/FontVariationAxis.java index fb2a3a873394..99564fab94cd 100644 --- a/graphics/java/android/graphics/fonts/FontVariationAxis.java +++ b/graphics/java/android/graphics/fonts/FontVariationAxis.java @@ -37,12 +37,11 @@ public final class FontVariationAxis { * The axis tag must contain four ASCII characters. Tag string that are longer or shorter than * four characters, or contains characters outside of U+0020..U+007E are invalid. * - * @throws {@link InvalidFormatException} If given tag string is invalid. + * @throws IllegalArgumentException If given tag string is invalid. */ - public FontVariationAxis(@NonNull String tagString, float styleValue) - throws InvalidFormatException { + public FontVariationAxis(@NonNull String tagString, float styleValue) { if (!isValidTag(tagString)) { - throw new InvalidFormatException("Invalid tag pattern: " + tagString); + throw new IllegalArgumentException("Illegal tag pattern: " + tagString); } mTag = makeTag(tagString); mTagString = tagString; @@ -113,15 +112,6 @@ public final class FontVariationAxis { } /** - * An exception indicates that the format of font variation settings is invalid. - */ - public static class InvalidFormatException extends Exception { - public InvalidFormatException(String message) { - super(message); - } - }; - - /** * Construct FontVariationAxis array from font variation settings. * * The settings string is constructed from multiple pairs of axis tag and style values. The axis @@ -138,10 +128,11 @@ public final class FontVariationAxis { * @param settings font variation settings. * @return FontVariationAxis[] the array of parsed font variation axis. {@code null} if settings * has no font variation settings. - * @throws InvalidFormatException If given string is not a valid font variation settings format. + * @throws IllegalArgumentException If given string is not a valid font variation settings + * format. */ - public static @Nullable FontVariationAxis[] fromFontVariationSettings(@Nullable String settings) - throws InvalidFormatException { + public static @Nullable FontVariationAxis[] fromFontVariationSettings( + @Nullable String settings) { if (settings == null || settings.isEmpty()) { return null; } @@ -153,7 +144,7 @@ public final class FontVariationAxis { continue; } if (!(c == '\'' || c == '"') || length < i + 6 || settings.charAt(i + 5) != c) { - throw new InvalidFormatException( + throw new IllegalArgumentException( "Tag should be wrapped with double or single quote: " + settings); } final String tagString = settings.substring(i + 1, i + 5); @@ -168,7 +159,8 @@ public final class FontVariationAxis { // Float.parseFloat ignores leading/trailing whitespaces. value = Float.parseFloat(settings.substring(i, endOfValueString)); } catch (NumberFormatException e) { - throw new InvalidFormatException("Failed to parse float string: " + e.getMessage()); + throw new IllegalArgumentException( + "Failed to parse float string: " + e.getMessage()); } axisList.add(new FontVariationAxis(tagString, value)); i = endOfValueString; diff --git a/location/java/android/location/GnssStatus.java b/location/java/android/location/GnssStatus.java index a44bc5b9db26..912551f5e4a9 100644 --- a/location/java/android/location/GnssStatus.java +++ b/location/java/android/location/GnssStatus.java @@ -55,9 +55,9 @@ public final class GnssStatus { public static final int GNSS_SV_FLAGS_HAS_CARRIER_FREQUENCY = (1 << 3); /** @hide */ - public static final int SVID_SHIFT_WIDTH = 7; + public static final int SVID_SHIFT_WIDTH = 8; /** @hide */ - public static final int CONSTELLATION_TYPE_SHIFT_WIDTH = 3; + public static final int CONSTELLATION_TYPE_SHIFT_WIDTH = 4; /** @hide */ public static final int CONSTELLATION_TYPE_MASK = 0xf; diff --git a/packages/SettingsLib/res/values-af/strings.xml b/packages/SettingsLib/res/values-af/strings.xml index f45c2c1b7df9..e89b21aed295 100644 --- a/packages/SettingsLib/res/values-af/strings.xml +++ b/packages/SettingsLib/res/values-af/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling van internetverbinding"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Boodskaptoegang"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-toegang"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Gebruik hoëgehalte-oudio: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Gebruik hoëgehalte-oudio"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Gekoppel aan media-oudio"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Gekoppel aan foonoudio"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Gekoppel aan lêeroordragbediener"</string> diff --git a/packages/SettingsLib/res/values-am/strings.xml b/packages/SettingsLib/res/values-am/strings.xml index c4e66aa1bad6..d8150d197125 100644 --- a/packages/SettingsLib/res/values-am/strings.xml +++ b/packages/SettingsLib/res/values-am/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"የበይነ መረብ ተያያዥ ማጋሪያ"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"የመልዕክት መዳረሻ"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"የሲም መዳረሻ"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"ከፍተኛ ጥራት ያለውን ኦዲዮ ተጠቀም፦ <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"ከፍተኛ ጥራት ያለውን ኦዲዮ ተጠቀም"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"ወደ ማህደረ መረጃ አውዲዮ ተያይዟል"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ወደ ስልክ አውዲዮ ተያይዟል"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ወደ ፋይል ዝውውር አገልጋይ ተያይዟል"</string> diff --git a/packages/SettingsLib/res/values-ar/strings.xml b/packages/SettingsLib/res/values-ar/strings.xml index 266b883b052d..034653ffb54a 100644 --- a/packages/SettingsLib/res/values-ar/strings.xml +++ b/packages/SettingsLib/res/values-ar/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"مشاركة اتصال الإنترنت"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"الدخول إلى الرسائل"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"الوصول إلى شريحة SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"استخدام صوت عالي الجودة: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"استخدام صوت عالي الجودة"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"متصل بالإعدادات الصوتية للوسائط"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"متصل بالإعدادات الصوتية للهاتف"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"متصل بخادم نقل الملف"</string> @@ -329,7 +327,7 @@ <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g> حتى يكتمل الشحن"</string> <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"غير معروف"</string> - <string name="battery_info_status_charging" msgid="1705179948350365604">"شحن"</string> + <string name="battery_info_status_charging" msgid="1705179948350365604">"جاري الشحن"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"جارٍ الشحن"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"لا يتم الشحن"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"لا يتم الشحن"</string> diff --git a/packages/SettingsLib/res/values-az/strings.xml b/packages/SettingsLib/res/values-az/strings.xml index 85e787582ef9..603f6918d89d 100644 --- a/packages/SettingsLib/res/values-az/strings.xml +++ b/packages/SettingsLib/res/values-az/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"internet bağlantı paylaşımı"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Mesaj Girişi"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM Girişi"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Yüksək keyfiyyətli audio istifadə edin: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Yüksək keyfiyyətli audio istifadə edin"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Media audioya birləşdirilib"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefon audiosuna qoşulu"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Fayl transfer serverinə qoşulu"</string> diff --git a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml index 802d852d1586..35473b3a4167 100644 --- a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml +++ b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deljenje internet veze"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Pristup porukama"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Pristup SIM kartici"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Koristi zvuk visokog kvaliteta: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Koristi zvuk visokog kvaliteta"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Povezano sa zvukom medija"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Povezano sa zvukom telefona"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Povezano sa serverom za prenos datoteka"</string> diff --git a/packages/SettingsLib/res/values-be/strings.xml b/packages/SettingsLib/res/values-be/strings.xml index 421f0b3490aa..61388c0e1ed0 100644 --- a/packages/SettingsLib/res/values-be/strings.xml +++ b/packages/SettingsLib/res/values-be/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Прадастаўленне доступу да Інтэрнэту"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Доступ да паведамленняў"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Доступ да SIM-карты"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Выбраць аўдыя высокай якасці: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Выбраць аўдыя высокай якасці"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Падключана да аўдыё медыа"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Падключана да аўдыё тэлефона"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Падключаны да серверу перадачы файлаў"</string> @@ -349,7 +347,7 @@ <string name="screen_zoom_summary_default" msgid="2247006805614056507">"Стандартны"</string> <string name="screen_zoom_summary_large" msgid="4835294730065424084">"Вялікі"</string> <string name="screen_zoom_summary_very_large" msgid="7108563375663670067">"Большы"</string> - <string name="screen_zoom_summary_extremely_large" msgid="7427320168263276227">"Найвялікшы"</string> + <string name="screen_zoom_summary_extremely_large" msgid="7427320168263276227">"Самы вялікі"</string> <string name="screen_zoom_summary_custom" msgid="5611979864124160447">"Карыстальніцкі (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string> <string name="help_feedback_label" msgid="6815040660801785649">"Даведка і водгукі"</string> <string name="content_description_menu_button" msgid="8182594799812351266">"Меню"</string> diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml index 1893393870af..aeea676ecedd 100644 --- a/packages/SettingsLib/res/values-bg/strings.xml +++ b/packages/SettingsLib/res/values-bg/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Споделяне на връзката с интернет"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Достъп до съобщенията"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Достъп до SIM картата"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Използване на висококачествен звук: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Използване на висококачествен звук"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Установена е връзка с медийно аудио"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Връзка със звука на телефона"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Установена е връзка със сървър за трансфер на файлове"</string> diff --git a/packages/SettingsLib/res/values-bn/strings.xml b/packages/SettingsLib/res/values-bn/strings.xml index b5fa68605011..21b4fbce0da2 100644 --- a/packages/SettingsLib/res/values-bn/strings.xml +++ b/packages/SettingsLib/res/values-bn/strings.xml @@ -26,7 +26,7 @@ <string name="wifi_disabled_generic" msgid="4259794910584943386">"অক্ষম হয়েছে"</string> <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"IP কনফিগারেশনের ব্যর্থতা"</string> <string name="wifi_disabled_by_recommendation_provider" msgid="5168315140978066096">"খারাপ নেটওয়ার্কের কারণে সংযুক্ত নয়"</string> - <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"WiFi সংযোগের ব্যর্থতা"</string> + <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"ওয়াই ফাই সংযোগের ব্যর্থতা"</string> <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"প্রমাণীকরণ সমস্যা"</string> <string name="wifi_not_in_range" msgid="1136191511238508967">"পরিসরের মধ্যে নয়"</string> <string name="wifi_no_internet_no_reconnect" msgid="5724903347310541706">"স্বয়ংক্রিয়ভাবে সংযোগ করবে না"</string> @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ইন্টারনেট সংযোগ শেয়ার করা হচ্ছে"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"বার্তা অ্যাক্সেস"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"সিম -এর অ্যাক্সেস"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"উচ্চ মানের অডিও ব্যবহার করুন: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"উচ্চ মানের অডিও ব্যবহার করুন"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"মিডিয়া অডিওতে সংযুক্ত রয়েছে"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ফোন অডিওতে সংযুক্ত"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ফাইল স্থানান্তর সার্ভারের সঙ্গে সংযুক্ত"</string> @@ -106,7 +104,7 @@ <string name="launch_defaults_none" msgid="4241129108140034876">"কোনো ডিফল্ট সেট করা নেই"</string> <string name="tts_settings" msgid="8186971894801348327">"পাঠ্য থেকে ভাষ্য আউটপুট সেটিংস"</string> <string name="tts_settings_title" msgid="1237820681016639683">"লেখিত-থেকে-ভাষ্য"</string> - <string name="tts_default_rate_title" msgid="6030550998379310088">"ভাষ্য হার"</string> + <string name="tts_default_rate_title" msgid="6030550998379310088">"কথা বলার হার"</string> <string name="tts_default_rate_summary" msgid="4061815292287182801">"যে গতিতে পাঠ্য উচ্চারিত হয়"</string> <string name="tts_default_pitch_title" msgid="6135942113172488671">"পিচ"</string> <string name="tts_default_pitch_summary" msgid="1944885882882650009">"সিন্থেসাইজ করা ভাষ্যের স্বরকে প্রভাবিত করে"</string> diff --git a/packages/SettingsLib/res/values-bs/strings.xml b/packages/SettingsLib/res/values-bs/strings.xml index 3515347cf116..886d6356db4a 100644 --- a/packages/SettingsLib/res/values-bs/strings.xml +++ b/packages/SettingsLib/res/values-bs/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Dijeljenje internet veze"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Pristup poruci"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Pristup SIM-u"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Koristi visokokvalitetan zvuk: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Koristi visokokvalitetan zvuk"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Povezano sa zvukom medija"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Povezano na zvuk telefona"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Povezan na server za prijenos podataka"</string> @@ -97,7 +95,7 @@ <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Prijenosna pristupna tačka"</string> <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Dijeljenje Bluetooth veze"</string> <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Dijeljenje veze"</string> - <string name="tether_settings_title_all" msgid="8356136101061143841">"Dijeljenje internetske veze i prijenosna pristupna tačka"</string> + <string name="tether_settings_title_all" msgid="8356136101061143841">"Povezivanje putem mobitela i prijenosna pristupna tačka"</string> <string name="managed_user_title" msgid="8109605045406748842">"Sve radne aplikacije"</string> <string name="user_guest" msgid="8475274842845401871">"Gost"</string> <string name="unknown" msgid="1592123443519355854">"Nepoznato"</string> @@ -129,7 +127,7 @@ <string name="tts_engine_settings_title" msgid="3499112142425680334">"Postavke za <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string> <string name="tts_engine_settings_button" msgid="1030512042040722285">"Pokreni postavke programa"</string> <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Željeni program"</string> - <string name="tts_general_section_title" msgid="4402572014604490502">"Opće"</string> + <string name="tts_general_section_title" msgid="4402572014604490502">"Opće postavke"</string> <string name="tts_reset_speech_pitch_title" msgid="5789394019544785915">"Postavite visinu glasa"</string> <string name="tts_reset_speech_pitch_summary" msgid="8700539616245004418">"Visinu glasa koji izgovara tekst postavite na podrazumjevanu."</string> <string-array name="tts_rate_entries"> @@ -318,7 +316,7 @@ <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Protanomalija (crveno-zeleno)"</string> <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Tritanomalija (plavo-žuta)"</string> <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Ispravka boje"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ova funkcija je eksperimentalna te može utjecati na performanse."</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Ova funkcija je eksperimentalna i može uticati na performanse."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Zamjenjuje <xliff:g id="TITLE">%1$s</xliff:g>"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"Preostalo je otprilike još <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"Do potpune napunjenosti preostalo je <xliff:g id="TIME">%1$s</xliff:g>"</string> @@ -348,8 +346,8 @@ <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Malo"</string> <string name="screen_zoom_summary_default" msgid="2247006805614056507">"Zadano"</string> <string name="screen_zoom_summary_large" msgid="4835294730065424084">"Veliko"</string> - <string name="screen_zoom_summary_very_large" msgid="7108563375663670067">"Veće"</string> - <string name="screen_zoom_summary_extremely_large" msgid="7427320168263276227">"Najveće"</string> + <string name="screen_zoom_summary_very_large" msgid="7108563375663670067">"Vrlo veliko"</string> + <string name="screen_zoom_summary_extremely_large" msgid="7427320168263276227">"Najveći"</string> <string name="screen_zoom_summary_custom" msgid="5611979864124160447">"Prilagodi (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string> <string name="help_feedback_label" msgid="6815040660801785649">"Pomoć i povratne informacije"</string> <string name="content_description_menu_button" msgid="8182594799812351266">"Meni"</string> diff --git a/packages/SettingsLib/res/values-ca/strings.xml b/packages/SettingsLib/res/values-ca/strings.xml index 6252dcbaf423..1c7ce0c58249 100644 --- a/packages/SettingsLib/res/values-ca/strings.xml +++ b/packages/SettingsLib/res/values-ca/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Connexió compartida a Internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accés al missatge"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Accés a la SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Utilitza àudio d\'alta qualitat: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Utilitza àudio d\'alta qualitat"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connectat a l\'àudio del mitjà"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connectat a àudio del telèfon"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connectat al servidor de transferència de fitxers"</string> @@ -349,7 +347,7 @@ <string name="screen_zoom_summary_default" msgid="2247006805614056507">"Predeterminat"</string> <string name="screen_zoom_summary_large" msgid="4835294730065424084">"Gran"</string> <string name="screen_zoom_summary_very_large" msgid="7108563375663670067">"Més gran"</string> - <string name="screen_zoom_summary_extremely_large" msgid="7427320168263276227">"Màxim"</string> + <string name="screen_zoom_summary_extremely_large" msgid="7427320168263276227">"Més grans possible"</string> <string name="screen_zoom_summary_custom" msgid="5611979864124160447">"Personalitzat (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string> <string name="help_feedback_label" msgid="6815040660801785649">"Ajuda i suggeriments"</string> <string name="content_description_menu_button" msgid="8182594799812351266">"Menú"</string> diff --git a/packages/SettingsLib/res/values-cs/strings.xml b/packages/SettingsLib/res/values-cs/strings.xml index 7d91dc126e04..673d51b7fb46 100644 --- a/packages/SettingsLib/res/values-cs/strings.xml +++ b/packages/SettingsLib/res/values-cs/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Sdílení internetového připojení"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Přístup ke zprávám"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Přístup k SIM kartě"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Použít vysokou kvalitu zvuku: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Použít vysokou kvalitu zvuku"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Připojeno ke zvukovému médiu"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Připojeno k náhlavní soupravě"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Připojeno k serveru pro přenos dat"</string> diff --git a/packages/SettingsLib/res/values-da/strings.xml b/packages/SettingsLib/res/values-da/strings.xml index 986bc3e6a772..0447c52fe554 100644 --- a/packages/SettingsLib/res/values-da/strings.xml +++ b/packages/SettingsLib/res/values-da/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling af internetforbindelse"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Adgang til meddelelse"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-adgang"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Brug lyd i høj kvalitet: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Brug lyd i høj kvalitet"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Forbundet til medielyd"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Forbundet til telefonlyd"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Forbundet til filoverførselsserver"</string> diff --git a/packages/SettingsLib/res/values-de/strings.xml b/packages/SettingsLib/res/values-de/strings.xml index d8993fc5baec..0a2cf3353a32 100644 --- a/packages/SettingsLib/res/values-de/strings.xml +++ b/packages/SettingsLib/res/values-de/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Freigabe der Internetverbindung"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Nachrichtenzugriff"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Zugriff auf SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Hohe Audioqualität verwenden: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Hohe Audioqualität verwenden"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Verbunden mit Audiosystem von Medien"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Verbunden mit Audiosystem des Telefons"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Mit Dateiübertragungsserver verbunden"</string> @@ -318,7 +316,7 @@ <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Protanomalie (Rot-Grün-Sehschwäche)"</string> <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Tritanomalie (Blau-Gelb-Sehschwäche)"</string> <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Farbkorrektur"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Hierbei handelt es sich um eine experimentelle Funktion. Dies kann sich auf die Leistung auswirken."</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Hierbei handelt es sich um eine experimentelle Funktion, die sich auf die Leistung auswirken kann."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Außer Kraft gesetzt von \"<xliff:g id="TITLE">%1$s</xliff:g>\""</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"Ca. <xliff:g id="TIME">%1$s</xliff:g> übrig"</string> <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> bis zur vollständigen Aufladung"</string> diff --git a/packages/SettingsLib/res/values-el/strings.xml b/packages/SettingsLib/res/values-el/strings.xml index 307ced637eb9..24d3bf4c2ca2 100644 --- a/packages/SettingsLib/res/values-el/strings.xml +++ b/packages/SettingsLib/res/values-el/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Κοινή χρήση σύνδεσης στο Διαδίκτυο"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Πρόσβαση στο μήνυμα"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Πρόσβαση SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Χρήση ήχου υψηλής ποιότητας: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Χρήση ήχου υψηλής ποιότητας"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Συνδέθηκε σε ήχο πολυμέσων"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Συνδεδεμένο στον ήχο τηλεφώνου"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Συνδεδεμένο σε διακομιστή μεταφοράς αρχείων"</string> @@ -105,7 +103,7 @@ <string name="launch_defaults_some" msgid="313159469856372621">"Έχουν οριστεί κάποιες προεπιλογές"</string> <string name="launch_defaults_none" msgid="4241129108140034876">"Δεν έχουν οριστεί προεπιλογές"</string> <string name="tts_settings" msgid="8186971894801348327">"Ρυθμίσεις μετατροπής κειμένου σε ομιλία"</string> - <string name="tts_settings_title" msgid="1237820681016639683">"Έξοδος μετατροπής κειμένου σε ομιλία"</string> + <string name="tts_settings_title" msgid="1237820681016639683">"Μετατρ. κειμ. σε ομιλία"</string> <string name="tts_default_rate_title" msgid="6030550998379310088">"Ταχύτητα λόγου"</string> <string name="tts_default_rate_summary" msgid="4061815292287182801">"Ταχύτητα με την οποία εκφωνείται το κείμενο"</string> <string name="tts_default_pitch_title" msgid="6135942113172488671">"Τόνος"</string> diff --git a/packages/SettingsLib/res/values-en-rAU/strings.xml b/packages/SettingsLib/res/values-en-rAU/strings.xml index a35da4de143e..6b9daf7b7085 100644 --- a/packages/SettingsLib/res/values-en-rAU/strings.xml +++ b/packages/SettingsLib/res/values-en-rAU/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet connection sharing"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Message Access"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM Access"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Use high-quality audio: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Use high-quality audio"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connected to media audio"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connected to phone audio"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connected to file-transfer server"</string> diff --git a/packages/SettingsLib/res/values-en-rGB/strings.xml b/packages/SettingsLib/res/values-en-rGB/strings.xml index a35da4de143e..6b9daf7b7085 100644 --- a/packages/SettingsLib/res/values-en-rGB/strings.xml +++ b/packages/SettingsLib/res/values-en-rGB/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet connection sharing"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Message Access"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM Access"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Use high-quality audio: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Use high-quality audio"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connected to media audio"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connected to phone audio"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connected to file-transfer server"</string> diff --git a/packages/SettingsLib/res/values-en-rIN/strings.xml b/packages/SettingsLib/res/values-en-rIN/strings.xml index a35da4de143e..6b9daf7b7085 100644 --- a/packages/SettingsLib/res/values-en-rIN/strings.xml +++ b/packages/SettingsLib/res/values-en-rIN/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet connection sharing"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Message Access"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM Access"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Use high-quality audio: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Use high-quality audio"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connected to media audio"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connected to phone audio"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connected to file-transfer server"</string> diff --git a/packages/SettingsLib/res/values-es-rUS/strings.xml b/packages/SettingsLib/res/values-es-rUS/strings.xml index fa092e2a5e73..1464d442533c 100644 --- a/packages/SettingsLib/res/values-es-rUS/strings.xml +++ b/packages/SettingsLib/res/values-es-rUS/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartir conexión a Internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acceso a mensajes"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acceso SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Usar audio de alta calidad: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Usar audio de alta calidad"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio multimedia"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del dispositivo"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado al servidor de transferencia de archivo"</string> diff --git a/packages/SettingsLib/res/values-es/arrays.xml b/packages/SettingsLib/res/values-es/arrays.xml index d527a8510375..53c547dacd85 100644 --- a/packages/SettingsLib/res/values-es/arrays.xml +++ b/packages/SettingsLib/res/values-es/arrays.xml @@ -137,7 +137,7 @@ <item msgid="364670732877872677">"Mejor esfuerzo (tasa de bits flexible)"</item> </string-array> <string-array name="select_logd_size_titles"> - <item msgid="8665206199209698501">"No"</item> + <item msgid="8665206199209698501">"Desactivado"</item> <item msgid="1593289376502312923">"64 K"</item> <item msgid="487545340236145324">"256 K"</item> <item msgid="2423528675294333831">"1 M"</item> @@ -145,13 +145,13 @@ <item msgid="2803199102589126938">"16 M"</item> </string-array> <string-array name="select_logd_size_lowram_titles"> - <item msgid="6089470720451068364">"No"</item> + <item msgid="6089470720451068364">"Desactivado"</item> <item msgid="4622460333038586791">"64 K"</item> <item msgid="2212125625169582330">"256 K"</item> <item msgid="1704946766699242653">"1 M"</item> </string-array> <string-array name="select_logd_size_summaries"> - <item msgid="6921048829791179331">"No"</item> + <item msgid="6921048829791179331">"Desactivado"</item> <item msgid="2969458029344750262">"64 K/búfer registro"</item> <item msgid="1342285115665698168">"256 K/búfer registro"</item> <item msgid="1314234299552254621">"1 M/búfer registro"</item> @@ -159,13 +159,13 @@ <item msgid="5431354956856655120">"16 M/búfer registro"</item> </string-array> <string-array name="select_logpersist_titles"> - <item msgid="1744840221860799971">"No"</item> + <item msgid="1744840221860799971">"Desactivado"</item> <item msgid="3054662377365844197">"Todo"</item> <item msgid="688870735111627832">"Todo menos señal móvil"</item> <item msgid="2850427388488887328">"solo kernel"</item> </string-array> <string-array name="select_logpersist_summaries"> - <item msgid="2216470072500521830">"No"</item> + <item msgid="2216470072500521830">"Desactivado"</item> <item msgid="172978079776521897">"Todos los búferes de registro"</item> <item msgid="3873873912383879240">"Todo excepto búferes de registro de señal móvil"</item> <item msgid="8489661142527693381">"solo búfer de registro del kernel"</item> @@ -218,17 +218,17 @@ <item msgid="1340692776955662664">"Pila de llamadas en glGetError"</item> </string-array> <string-array name="show_non_rect_clip_entries"> - <item msgid="993742912147090253">"No"</item> + <item msgid="993742912147090253">"Desactivado"</item> <item msgid="675719912558941285">"Dibujar región de recorte no rectangular en azul"</item> <item msgid="1064373276095698656">"Resaltar comandos de dibujo probados en verde"</item> </string-array> <string-array name="track_frame_time_entries"> - <item msgid="2193584639058893150">"No"</item> + <item msgid="2193584639058893150">"Desactivado"</item> <item msgid="2751513398307949636">"En pantalla como barras"</item> <item msgid="2355151170975410323">"En <xliff:g id="AS_TYPED_COMMAND">adb shell dumpsys gfxinfo</xliff:g>"</item> </string-array> <string-array name="debug_hw_overdraw_entries"> - <item msgid="8190572633763871652">"No"</item> + <item msgid="8190572633763871652">"Desactivado"</item> <item msgid="7688197031296835369">"Mostrar áreas sobredibujadas"</item> <item msgid="2290859360633824369">"Mostrar áreas para deuteranomalía"</item> </string-array> diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml index 8dc6301d698d..13dde32f6493 100644 --- a/packages/SettingsLib/res/values-es/strings.xml +++ b/packages/SettingsLib/res/values-es/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartir conexión a Internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acceso a mensajes"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acceso a tarjeta SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Usar audio de alta calidad: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Usar audio de alta calidad"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado al audio del medio"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado al audio del teléfono"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado con el servidor de transferencia de archivos"</string> @@ -299,8 +297,8 @@ <string name="inactive_apps_title" msgid="1317817863508274533">"Aplicaciones inactivas"</string> <string name="inactive_app_inactive_summary" msgid="5091363706699855725">"Inactiva. Toca para alternar."</string> <string name="inactive_app_active_summary" msgid="4174921824958516106">"Activa. Toca para alternar."</string> - <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string> - <string name="runningservices_settings_summary" msgid="854608995821032748">"Ver y controlar los servicios en ejecución"</string> + <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en uso"</string> + <string name="runningservices_settings_summary" msgid="854608995821032748">"Ver y controlar los servicios en uso"</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementación de WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Establecer implementación de WebView"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Esta opción ya no está disponible. Vuelve a intentarlo."</string> @@ -308,7 +306,7 @@ <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convertir…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Ya está cifrado"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Convirtiendo a un cifrado basado en archivos"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Convierte la partición de datos en un cifrado basado en archivos.\n Advertencia: Este proceso borrará todos los datos.\n Esta función es alpha y es posible que no funcione correctamente.\n Pulsa la opción Borrar y convertir… para continuar."</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Convierte la partición de datos en un cifrado basado en archivos.\n Advertencia: Este proceso borrará todos los datos.\n Esta función es alfa y es posible que no funcione correctamente.\n Pulsa la opción Borrar y convertir… para continuar."</string> <string name="button_convert_fbe" msgid="5152671181309826405">"Borrar y convertir…"</string> <string name="picture_color_mode" msgid="4560755008730283695">"Modo de color de imagen"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliza sRGB"</string> @@ -343,7 +341,7 @@ <item msgid="8934126114226089439">"50%"</item> <item msgid="1286113608943010849">"100%"</item> </string-array> - <string name="charge_length_format" msgid="8978516217024434156">"Hace <xliff:g id="ID_1">%1$s</xliff:g>"</string> + <string name="charge_length_format" msgid="8978516217024434156">"hace <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="remaining_length_format" msgid="7886337596669190587">"Tiempo restante: <xliff:g id="ID_1">%1$s</xliff:g>"</string> <string name="screen_zoom_summary_small" msgid="5867245310241621570">"Pequeño"</string> <string name="screen_zoom_summary_default" msgid="2247006805614056507">"Predeterminado"</string> diff --git a/packages/SettingsLib/res/values-et/arrays.xml b/packages/SettingsLib/res/values-et/arrays.xml index 904e28e8a67b..77668900b27e 100644 --- a/packages/SettingsLib/res/values-et/arrays.xml +++ b/packages/SettingsLib/res/values-et/arrays.xml @@ -51,7 +51,7 @@ <string-array name="hdcp_checking_titles"> <item msgid="441827799230089869">"Ära kunagi kontrolli"</item> <item msgid="6042769699089883931">"Kontrolli ainult DRM-sisu"</item> - <item msgid="9174900380056846820">"Pidev kontrollimine"</item> + <item msgid="9174900380056846820">"Kontrolli alati"</item> </string-array> <string-array name="hdcp_checking_summaries"> <item msgid="505558545611516707">"Ära kunagi kasuta HDCP-kontrollimist"</item> diff --git a/packages/SettingsLib/res/values-et/strings.xml b/packages/SettingsLib/res/values-et/strings.xml index a8ebbdafc92f..cc528622910a 100644 --- a/packages/SettingsLib/res/values-et/strings.xml +++ b/packages/SettingsLib/res/values-et/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneti-ühenduse jagamine"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Juurdepääs sõnumile"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-kaardi juurdepääs"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Kasuta kvaliteetset heli: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Kasuta kvaliteetset heli"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ühendatud meediumiheliga"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ühendatud telefoniheliga"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ühendatud failiedastuse serveriga"</string> diff --git a/packages/SettingsLib/res/values-eu/strings.xml b/packages/SettingsLib/res/values-eu/strings.xml index 1cf26e5a75a1..aa6b3c28bc4c 100644 --- a/packages/SettingsLib/res/values-eu/strings.xml +++ b/packages/SettingsLib/res/values-eu/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneteko konexioa partekatzea"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Mezuetarako sarbidea"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM txartelerako sarbidea"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Erabili kalitate handiko audioa: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Erabili kalitate handiko audioa"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Euskarriaren audiora konektatuta"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefonoaren audiora konektatuta"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Fitxategi-transferentziako zerbitzarira konektatuta"</string> diff --git a/packages/SettingsLib/res/values-fa/strings.xml b/packages/SettingsLib/res/values-fa/strings.xml index c456b1c0fe15..65fe22ca14af 100644 --- a/packages/SettingsLib/res/values-fa/strings.xml +++ b/packages/SettingsLib/res/values-fa/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"اشتراکگذاری اتصال اینترنت"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"دسترسی به پیام"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"دسترسی سیمکارت"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"استفاده از صوت با کیفیت بالا: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"استفاده از صوت با کیفیت بالا"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"به رسانه صوتی متصل شد"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"به تلفن صوتی متصل شد"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"به سرور انتقال فایل متصل شد"</string> diff --git a/packages/SettingsLib/res/values-fi/strings.xml b/packages/SettingsLib/res/values-fi/strings.xml index f3e2d6b1603f..d306e2300dbd 100644 --- a/packages/SettingsLib/res/values-fi/strings.xml +++ b/packages/SettingsLib/res/values-fi/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetyhteyden jakaminen"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"MAP"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-kortin käyttö"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Käytä korkealaatuista ääntä: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Käytä korkealaatuista ääntä"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Yhdistetty median ääneen"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Yhdistetty puhelimen ääneen"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Yhdistetty tiedostonsiirtopalvelimeen"</string> diff --git a/packages/SettingsLib/res/values-fr-rCA/strings.xml b/packages/SettingsLib/res/values-fr-rCA/strings.xml index 8c1df6bb8fdf..58914731dc1f 100644 --- a/packages/SettingsLib/res/values-fr-rCA/strings.xml +++ b/packages/SettingsLib/res/values-fr-rCA/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partage de connexion Internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accès aux messages"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Accès à la carte SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Utiliser l\'audio de haute qualité : <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Utiliser l\'audio de haute qualité"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connecté aux paramètres audio du média"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connecté à l\'audio du téléphone"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connexion au serveur de transfert de fichiers"</string> @@ -113,7 +111,7 @@ <string name="tts_default_lang_title" msgid="8018087612299820556">"Langue"</string> <string name="tts_lang_use_system" msgid="2679252467416513208">"Utiliser la langue du système"</string> <string name="tts_lang_not_selected" msgid="7395787019276734765">"Langue non sélectionnée"</string> - <string name="tts_default_lang_summary" msgid="5219362163902707785">"Définit la langue utilisée par la syntèse vocale"</string> + <string name="tts_default_lang_summary" msgid="5219362163902707785">"Définir la langue utilisée par la syntèse vocale"</string> <string name="tts_play_example_title" msgid="7094780383253097230">"Écouter un échantillon"</string> <string name="tts_play_example_summary" msgid="8029071615047894486">"Lire une courte démonstration de la synthèse vocale"</string> <string name="tts_install_data_title" msgid="4264378440508149986">"Installer les données vocales"</string> @@ -146,10 +144,10 @@ <string name="choose_profile" msgid="6921016979430278661">"Sélectionnez un profil"</string> <string name="category_personal" msgid="1299663247844969448">"Personnel"</string> <string name="category_work" msgid="8699184680584175622">"Travail"</string> - <string name="development_settings_title" msgid="215179176067683667">"Options pour les développeurs"</string> - <string name="development_settings_enable" msgid="542530994778109538">"Activer les options pour les développeurs"</string> + <string name="development_settings_title" msgid="215179176067683667">"Options pour les concepteurs"</string> + <string name="development_settings_enable" msgid="542530994778109538">"Activer les options pour les concepteurs"</string> <string name="development_settings_summary" msgid="1815795401632854041">"Définir les options pour le développement de l\'application"</string> - <string name="development_settings_not_available" msgid="4308569041701535607">"Les options proposées aux développeurs ne sont pas disponibles pour cet utilisateur."</string> + <string name="development_settings_not_available" msgid="4308569041701535607">"Les options proposées aux concepteurs ne sont pas disponibles pour cet utilisateur."</string> <string name="vpn_settings_not_available" msgid="956841430176985598">"Les paramètres de RPV ne sont pas disponibles pour cet utilisateur"</string> <string name="tethering_settings_not_available" msgid="6765770438438291012">"Les paramètres de partage de connexion ne sont pas disponibles pour cet utilisateur"</string> <string name="apn_settings_not_available" msgid="7873729032165324000">"Les paramètres de point d\'accès ne sont pas disponibles pour cet utilisateur"</string> @@ -218,7 +216,7 @@ <string name="enable_terminal_title" msgid="95572094356054120">"Terminal local"</string> <string name="enable_terminal_summary" msgid="67667852659359206">"Activer l\'application Terminal permettant l\'accès au shell local"</string> <string name="hdcp_checking_title" msgid="8605478913544273282">"Vérification HDCP"</string> - <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Config. vérification HDCP"</string> + <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Configurer vérification HDCP"</string> <string name="debug_debugging_category" msgid="6781250159513471316">"Débogage"</string> <string name="debug_app" msgid="8349591734751384446">"Sélectionner une application à déboguer"</string> <string name="debug_app_not_set" msgid="718752499586403499">"Aucune application à déboguer définie"</string> @@ -304,11 +302,11 @@ <string name="select_webview_provider_title" msgid="4628592979751918907">"Mise en œuvre WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Définir la mise en œuvre WebView"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Ce choix n\'est plus valide. Réessayez."</string> - <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convertir en chiffrement basé sur un fichier"</string> + <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convertir en chiffrement"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convertir..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Déjà chiffré par un fichier"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Conversion en chiffrement basé sur un fichier en cours"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Convertir la partition de données en chiffrement basé sur un fichier.\n Avertissement! Cette opération supprimera toutes vos données. \nCette fonctionnalité est en version alpha et peut ne pas fonctionner correctement. \nTouchez « Effacer et convertir » pour continuer."</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Convertir la partition de données en chiffrement basé sur un fichier.\nAvertissement! Cette opération supprimera toutes vos données.\nCette fonctionnalité est en version alpha et peut ne pas fonctionner correctement.\nTouchez « Effacer et convertir… » pour continuer."</string> <string name="button_convert_fbe" msgid="5152671181309826405">"Effacer et convertir..."</string> <string name="picture_color_mode" msgid="4560755008730283695">"Mode couleur des images"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"Utiliser sRGB"</string> diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml index 1c6e93bcf196..831515ad0250 100644 --- a/packages/SettingsLib/res/values-fr/strings.xml +++ b/packages/SettingsLib/res/values-fr/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partage de connexion Internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accès aux messages"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Accès à la carte SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Utiliser le codec audio haute qualité : <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Utiliser un codec audio haute qualité"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Connecté aux paramètres audio du média"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Connecté aux paramètres audio du téléphone"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Connexion au serveur de transfert de fichiers"</string> @@ -282,7 +280,7 @@ <string name="enable_freeform_support_summary" msgid="8247310463288834487">"Activer la compatibilité avec les fenêtres de forme libre expérimentales."</string> <string name="local_backup_password_title" msgid="3860471654439418822">"Mot de passe sauvegarde PC"</string> <string name="local_backup_password_summary_none" msgid="6951095485537767956">"Les sauvegardes complètes sur PC ne sont pas protégées actuellement."</string> - <string name="local_backup_password_summary_change" msgid="5376206246809190364">"Appuyez pour modifier ou supprimer le mot de passe utilisé pour les sauvegardes complètes sur PC."</string> + <string name="local_backup_password_summary_change" msgid="5376206246809190364">"Appuyez pour modifier ou supprimer le mot de passe de sauvegarde complète sur PC."</string> <string name="local_backup_password_toast_success" msgid="582016086228434290">"Le nouveau mot de passe de secours a bien été défini."</string> <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"Le nouveau mot de passe et sa confirmation ne correspondent pas."</string> <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Échec de la définition du mot de passe de secours."</string> diff --git a/packages/SettingsLib/res/values-gl/strings.xml b/packages/SettingsLib/res/values-gl/strings.xml index 8557fb5e5439..c433c0f5aaf9 100644 --- a/packages/SettingsLib/res/values-gl/strings.xml +++ b/packages/SettingsLib/res/values-gl/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Uso compartido da conexión a Internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acceso ás mensaxes"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acceso á SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Usar audio de alta calidade: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Usar audio de alta calidade"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado ao audio multimedia"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado ao audio do teléfono"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado ao servidor de transferencia de ficheiros"</string> diff --git a/packages/SettingsLib/res/values-gu/strings.xml b/packages/SettingsLib/res/values-gu/strings.xml index 6bde256ac7d5..df9eda94154c 100644 --- a/packages/SettingsLib/res/values-gu/strings.xml +++ b/packages/SettingsLib/res/values-gu/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ઇન્ટરનેટ કનેક્શન શેરિંગ"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"સંદેશ ઍક્સેસ"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM ઍક્સેસ"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"ઉચ્ચ ગુણવત્તાવાળા ઑડિયોનો ઉપયોગ કરો: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"ઉચ્ચ ગુણવત્તાવાળા ઑડિયોનો ઉપયોગ કરો"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"મીડિયા ઑડિઓ સાથે કનેક્ટ કર્યુ"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ફોન ઑડિઓ સાથે કનેક્ટ થયાં"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ફાઇલ સ્થાનાંતરણ સેવાથી કનેક્ટ થયાં"</string> diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml index 0341a4f0a1d0..c729027623ae 100644 --- a/packages/SettingsLib/res/values-hi/strings.xml +++ b/packages/SettingsLib/res/values-hi/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"इंटरनेट कनेक्शन साझाकरण"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"संदेश एक्सेस"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"सिम ऐक्सेस"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"अच्छी गुणवत्ता वाले ऑडियो का उपयोग करें: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"अच्छी गुणवत्ता वाले ऑडियो का उपयोग करें"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"मीडिया ऑडियो से कनेक्ट किया गया"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"फ़ोन ऑडियो से कनेक्ट किया गया"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"फ़ाइल स्थानांतरण सर्वर से कनेक्ट किया गया"</string> diff --git a/packages/SettingsLib/res/values-hr/strings.xml b/packages/SettingsLib/res/values-hr/strings.xml index f9108c17de6c..e94b6df09c50 100644 --- a/packages/SettingsLib/res/values-hr/strings.xml +++ b/packages/SettingsLib/res/values-hr/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Dijeljenje internetske veze"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Pristup porukama"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Pristup SIM-u"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Upotrebljavaj visokokvalitetan audio: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Upotrebljavaj visokokvalitetan audio"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Povezano s medijskim zvukom"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Povezano sa telefonskim zvukom"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Povezano s poslužiteljem za prijenos datoteka"</string> @@ -218,7 +216,7 @@ <string name="enable_terminal_title" msgid="95572094356054120">"Lokalni terminal"</string> <string name="enable_terminal_summary" msgid="67667852659359206">"Omogući aplikaciju terminala koja nudi pristup lokalnoj ovojnici"</string> <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP provjera"</string> - <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Postav. ponaš. HDCP prov."</string> + <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"Postavke HDCP provjere"</string> <string name="debug_debugging_category" msgid="6781250159513471316">"Otklanjanje pogrešaka"</string> <string name="debug_app" msgid="8349591734751384446">"Aplikacija za otklanjanje pogrešaka"</string> <string name="debug_app_not_set" msgid="718752499586403499">"Nema aplikacije za otklanjanje pogrešaka"</string> diff --git a/packages/SettingsLib/res/values-hu/strings.xml b/packages/SettingsLib/res/values-hu/strings.xml index fdd34ad18a04..d06417f38375 100644 --- a/packages/SettingsLib/res/values-hu/strings.xml +++ b/packages/SettingsLib/res/values-hu/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetkapcsolat megosztása"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Üzenet-hozzáférés"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-elérés"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Jó audiominőség használata: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Jó audiominőség használata"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Csatlakoztatva az eszköz hangjához"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Csatlakoztatva a telefon hangjához"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Csatlakozva a fájlküldő szerverhez"</string> diff --git a/packages/SettingsLib/res/values-hy/strings.xml b/packages/SettingsLib/res/values-hy/strings.xml index aeb7f46cf80f..0ec7637178df 100644 --- a/packages/SettingsLib/res/values-hy/strings.xml +++ b/packages/SettingsLib/res/values-hy/strings.xml @@ -42,7 +42,7 @@ <string name="bluetooth_connecting" msgid="8555009514614320497">"Միանում է..."</string> <string name="bluetooth_connected" msgid="6038755206916626419">"Միացված է"</string> <string name="bluetooth_pairing" msgid="1426882272690346242">"Զուգակցում..."</string> - <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Միացված (առանց հեռախոսի)"</string> + <string name="bluetooth_connected_no_headset" msgid="2866994875046035609">"Միացված է (առանց հեռախոսի)"</string> <string name="bluetooth_connected_no_a2dp" msgid="4576188601581440337">"Միացված է (առանց մեդիա)"</string> <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Միացված է (հաղորդագրությանը մուտք չկա)"</string> <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Միացված է (առանց հեռախոսի և մեդիայի)"</string> @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Ինտերնետ կապի տարածում"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Մուտք հաղորդագրություն"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM քարտի հասանելիություն"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Օգտագործել բարձրորակ ձայն՝ <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Օգտագործել բարձրորակ ձայն"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Միացված է մեդիա աուդիոյին"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Միացված է հեռախոսի ձայնային տվյալներին"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Միացված է ֆայլերի փոխանցման սերվերին"</string> @@ -104,21 +102,21 @@ <string name="running_process_item_user_label" msgid="3129887865552025943">"Օտատեր՝ <xliff:g id="USER_NAME">%1$s</xliff:g>"</string> <string name="launch_defaults_some" msgid="313159469856372621">"Որոշ կանխադրված կարգավորումներ կան"</string> <string name="launch_defaults_none" msgid="4241129108140034876">"Կանխադրված կարգավորումներ չկան"</string> - <string name="tts_settings" msgid="8186971894801348327">"Տեքստից-խոսք կարգավորումներ"</string> + <string name="tts_settings" msgid="8186971894801348327">"Տեքստի հնչեցման կարգավորումներ"</string> <string name="tts_settings_title" msgid="1237820681016639683">"Տեքստի հնչեցում"</string> - <string name="tts_default_rate_title" msgid="6030550998379310088">"Խոսքի գնահատական"</string> + <string name="tts_default_rate_title" msgid="6030550998379310088">"Խոսքի արագությունը"</string> <string name="tts_default_rate_summary" msgid="4061815292287182801">"Տեքստի արտասանման արագությունը"</string> - <string name="tts_default_pitch_title" msgid="6135942113172488671">"Բարձրություն"</string> + <string name="tts_default_pitch_title" msgid="6135942113172488671">"Ձայնի բարձրությունը"</string> <string name="tts_default_pitch_summary" msgid="1944885882882650009">"Ազդում է սինթեզած խոսքի ձայներանգի վրա"</string> <string name="tts_default_lang_title" msgid="8018087612299820556">"Լեզու"</string> <string name="tts_lang_use_system" msgid="2679252467416513208">"Օգտագործել համակարգի լեզուն"</string> <string name="tts_lang_not_selected" msgid="7395787019276734765">"Լեզուն ընտրված չէ"</string> - <string name="tts_default_lang_summary" msgid="5219362163902707785">"Կարգավորում է լեզվին բնորոշ ձայնը արտասանվող տեքստի համար"</string> + <string name="tts_default_lang_summary" msgid="5219362163902707785">"Ընտրում է լեզուն՝ տեքստն ընթերցելու համար"</string> <string name="tts_play_example_title" msgid="7094780383253097230">"Լսել օրինակը"</string> <string name="tts_play_example_summary" msgid="8029071615047894486">"Կարճ հնչեցնել խոսքի սինթեզը"</string> <string name="tts_install_data_title" msgid="4264378440508149986">"Տեղադրել ձայնային տվյալները"</string> <string name="tts_install_data_summary" msgid="5742135732511822589">"Տեղադրել անհրաժեշտ ձայնային տվյալները` խոսքը սինթեզելու համար"</string> - <string name="tts_engine_security_warning" msgid="8786238102020223650">"Այս խոսքային սինթեզի գործիքը կարող է հավաքագրել այն ամենը, ինչ արտասանված է, այդ թվում` անձնական տվյալներ, ինչպիսիք են գաղտնաբառն ու բանկային քարտի համարները: Սկզբնաբյուրը <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> շարժիչն է: Միացնե՞լ խոսքի սինթեզի շարժիչի օգտագործումը:"</string> + <string name="tts_engine_security_warning" msgid="8786238102020223650">"Այս խոսքային սինթեզի գործիքը կարող է հավաքել այն ամենը, ինչ արտասանված է, այդ թվում` անձնական տվյալներ, ինչպիսիք են գաղտնաբառն ու բանկային քարտի համարները: Սկզբնաբյուրը <xliff:g id="TTS_PLUGIN_ENGINE_NAME">%s</xliff:g> շարժիչն է: Միացնե՞լ խոսքի սինթեզի շարժիչի օգտագործումը:"</string> <string name="tts_engine_network_required" msgid="1190837151485314743">"Այս լեզուն պահանջում է աշխատող ցանցային կապ գրվածքից խոսք ելքի համար:"</string> <string name="tts_default_sample_string" msgid="4040835213373086322">"Սա խոսքային սինթեզի մի նմուշ է:"</string> <string name="tts_status_title" msgid="7268566550242584413">"Լռելյայն լեզվի կարգավիճակը"</string> diff --git a/packages/SettingsLib/res/values-in/strings.xml b/packages/SettingsLib/res/values-in/strings.xml index 4da60bedb48a..733e2cba154b 100644 --- a/packages/SettingsLib/res/values-in/strings.xml +++ b/packages/SettingsLib/res/values-in/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Berbagi sambungan internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Akses Pesan"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Akses SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Gunakan audio berkualitas tinggi: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Gunakan audio berkualitas tinggi"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Tersambung ke media audio"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Tersambung ke audio ponsel"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Sambungkan ke server transfer file"</string> diff --git a/packages/SettingsLib/res/values-is/strings.xml b/packages/SettingsLib/res/values-is/strings.xml index a433b8d89fc0..d4fde8a1796e 100644 --- a/packages/SettingsLib/res/values-is/strings.xml +++ b/packages/SettingsLib/res/values-is/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deiling nettengingar"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Skilaboðaaðgangur"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Aðgangur að SIM-korti"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Nota hágæðahljóð: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Nota hágæðahljóð"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Tengt við hljóðspilun efnis"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Tengt við hljóð símans"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Tengt við skráaflutningsþjón"</string> diff --git a/packages/SettingsLib/res/values-it/strings.xml b/packages/SettingsLib/res/values-it/strings.xml index eef124d26fc5..14b8e3789c39 100644 --- a/packages/SettingsLib/res/values-it/strings.xml +++ b/packages/SettingsLib/res/values-it/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Condivisione connessione Internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Accesso ai messaggi"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Accesso alla SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Utilizza audio di alta qualità: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Utilizza audio di alta qualità"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Collegato ad audio media"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Collegato ad audio telefono"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Collegato al server di trasferimento file"</string> diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml index 9b3686d1406c..213aaf365525 100644 --- a/packages/SettingsLib/res/values-iw/strings.xml +++ b/packages/SettingsLib/res/values-iw/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"שיתוף חיבור לאינטרנט"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"גישה להודעות"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"גישה ל-SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"השתמש באודיו באיכות גבוהה: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"השתמש באודיו באיכות גבוהה"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"מחובר לאודיו של מדיה"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"מחובר לאודיו של הטלפון"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"מחובר לשרת העברת קבצים"</string> @@ -81,7 +79,7 @@ <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"ביטול"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"לאחר החיבור, התאמה מספקת גישה לאנשי הקשר ולהיסטוריית השיחות שלך."</string> <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"לא ניתן לבצע התאמה עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> - <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"לא ניתן להתאים את <xliff:g id="DEVICE_NAME">%1$s</xliff:g> בשל קוד PIN או סיסמה שגויים."</string> + <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"לא ניתן להתאים את <xliff:g id="DEVICE_NAME">%1$s</xliff:g> בשל קוד גישה או סיסמה שגויים."</string> <string name="bluetooth_pairing_device_down_error_message" msgid="7870998403045801381">"לא ניתן לתקשר עם <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="bluetooth_pairing_rejected_error_message" msgid="1648157108520832454">"ההתאמה נדחתה על ידי <xliff:g id="DEVICE_NAME">%1$s</xliff:g>."</string> <string name="accessibility_wifi_off" msgid="1166761729660614716">"Wi-Fi כבוי."</string> @@ -274,7 +272,7 @@ <string name="app_process_limit_title" msgid="4280600650253107163">"מגבלה של תהליכים ברקע"</string> <string name="show_all_anrs" msgid="28462979638729082">"הצג את כל פריטי ה-ANR"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"הצג תיבת דו-שיח של \'אפליקציה לא מגיבה\' עבור אפליקציות שפועלות ברקע"</string> - <string name="force_allow_on_external" msgid="3215759785081916381">"אילוץ הרשאה של אפליקציות באחסון חיצוני"</string> + <string name="force_allow_on_external" msgid="3215759785081916381">"אילוץ הרשאת אפליקציות באחסון חיצוני"</string> <string name="force_allow_on_external_summary" msgid="3640752408258034689">"מאפשר כתיבה של כל אפליקציה באחסון חיצוני, ללא התחשבות בערכי המניפסט"</string> <string name="force_resizable_activities" msgid="8615764378147824985">"אלץ יכולת קביעת גודל של הפעילויות"</string> <string name="force_resizable_activities_summary" msgid="6667493494706124459">"אפשר יכולת קביעת גודל של כל הפעילויות לריבוי חלונות, ללא קשר לערך המניפסט."</string> diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml index 57f20bff180e..440b04d8d120 100644 --- a/packages/SettingsLib/res/values-ja/strings.xml +++ b/packages/SettingsLib/res/values-ja/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"インターネット接続の共有"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"メッセージへのアクセス"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIMアクセス"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"高品質音声を使用: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"高品質音声を使用"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"メディアの音声に接続"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"携帯電話の音声に接続"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ファイル転送サーバーに接続"</string> diff --git a/packages/SettingsLib/res/values-ka/strings.xml b/packages/SettingsLib/res/values-ka/strings.xml index bac03c76f949..088d2955474e 100644 --- a/packages/SettingsLib/res/values-ka/strings.xml +++ b/packages/SettingsLib/res/values-ka/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ინტერნეტ კავშირის გაზიარება"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"შეტყობინებებზე წვდომა"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM წვდომა"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"მაღალხარისხიანი აუდიოს გამოყენება: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"მაღალხარისხიანი აუდიოს გამოყენება"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"დაკავშირებულია აუდიო მულტიმედიურ სისტემასთან"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"დაკავშირებულია ტელეფონის აუდიო მოწყობილობასთან"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"დაკავშირებულია ფაილების გადაცემის სერვერთან"</string> diff --git a/packages/SettingsLib/res/values-kk/strings.xml b/packages/SettingsLib/res/values-kk/strings.xml index 7af05356f4b5..cc8b6624a90a 100644 --- a/packages/SettingsLib/res/values-kk/strings.xml +++ b/packages/SettingsLib/res/values-kk/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Интернет байланысын ортақ қолдану"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Хабарға кіру"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM картасына кіру"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Жоғары сапалы аудио дыбысын пайдалану: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Жоғары сапалы аудио дыбысын пайдалану"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Медиа аудиосына жалғанған"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Телефон аудиосына қосылған"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Файл жіберу серверіне жалғанған"</string> diff --git a/packages/SettingsLib/res/values-km/strings.xml b/packages/SettingsLib/res/values-km/strings.xml index a8d1aa0966db..d299ec6936e9 100644 --- a/packages/SettingsLib/res/values-km/strings.xml +++ b/packages/SettingsLib/res/values-km/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ចែករំលែកការតភ្ជាប់អ៊ីនធឺណិត"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"ចូលដំណើរការសារ"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"ការចូលដំណើរការស៊ីម"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"ប្រើសំឡេងគុណភាពខ្ពស់៖ <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"ប្រើសំឡេងគុណភាពខ្ពស់"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"បានភ្ជាប់ទៅអូឌីយ៉ូមេឌៀ"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"តភ្ជាប់ទៅអូឌីយ៉ូទូរស័ព្ទ"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"បានតភ្ជាប់ទៅម៉ាស៊ីនមេផ្ទេរឯកសារ"</string> @@ -146,7 +144,7 @@ <string name="choose_profile" msgid="6921016979430278661">"ជ្រើសរើសកម្រងព័ត៌មាន"</string> <string name="category_personal" msgid="1299663247844969448">"ផ្ទាល់ខ្លួន"</string> <string name="category_work" msgid="8699184680584175622">"កន្លែងធ្វើការ"</string> - <string name="development_settings_title" msgid="215179176067683667">"ជម្រើសអ្នកអភិវឌ្ឍ"</string> + <string name="development_settings_title" msgid="215179176067683667">"ជម្រើសអ្នកអភិវឌ្ឍន៍"</string> <string name="development_settings_enable" msgid="542530994778109538">"បើកដំណើរការជម្រើសអ្នកអភិវឌ្ឍន៍"</string> <string name="development_settings_summary" msgid="1815795401632854041">"កំណត់ជម្រើសសម្រាប់ការអភិវឌ្ឍកម្មវិធី"</string> <string name="development_settings_not_available" msgid="4308569041701535607">"ជម្រើសអ្នកអភិវឌ្ឍមិនអាចប្រើបានសម្រាប់អ្នកប្រើនេះ"</string> @@ -301,15 +299,15 @@ <string name="inactive_app_active_summary" msgid="4174921824958516106">"សកម្ម។ ប៉ះដើម្បីបិទ/បើក។"</string> <string name="runningservices_settings_title" msgid="8097287939865165213">"សេវាកម្មកំពុងដំណើរការ"</string> <string name="runningservices_settings_summary" msgid="854608995821032748">"មើល និងគ្រប់គ្រងសេវាកម្មកំពុងដំណើរការបច្ចុប្បន្ន"</string> - <string name="select_webview_provider_title" msgid="4628592979751918907">"ការប្រតិបត្តិ WebView"</string> + <string name="select_webview_provider_title" msgid="4628592979751918907">"ការអនុវត្ត WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"កំណត់ការប្រតិបត្តិ WebView"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"ជម្រើសនេះលែងមានសុពលភាពទៀតហើយ ព្យាយាមម្តងទៀត"</string> - <string name="convert_to_file_encryption" msgid="3060156730651061223">"បម្លែងទៅជាការអ៊ីនគ្រីបឯកសារ"</string> + <string name="convert_to_file_encryption" msgid="3060156730651061223">"បំប្លែងទៅជាការអ៊ិនគ្រីបឯកសារ"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"បម្លែង…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"បានអ៊ីនគ្រីបឯកសាររួចហើយ"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"កំពុងបម្លែងទៅការអ៊ីនគ្រីបដែលផ្អែកលើឯកសារ"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"បម្លែងការបែងចែកទិន្នន័យទៅជាការអ៊ីនគ្រីបដែលផ្អែកលើឯកសារ។\n !!ព្រមាន!! សកម្មភាពនេះនឹងលុបទិន្នន័យរបស់អ្នកទាំងអស់។\n លក្ខណៈពិសេសនេះជាការសាកល្បងដំបូង ហើយអាចនឹងដំណើរការមិនប្រក្រតី។\n សូមចុច \'សម្អាត និងបម្លែង...\' ដើម្បីបន្ត។"</string> - <string name="button_convert_fbe" msgid="5152671181309826405">"សម្អាត និងបម្លែង…"</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"បំប្លែងការបែងចែកទិន្នន័យទៅជាការអ៊ិនគ្រីបដែលផ្អែកលើឯកសារ។\n !!ព្រមាន!! សកម្មភាពនេះនឹងលុបទិន្នន័យរបស់អ្នកទាំងអស់។\n មុខងារនេះសំខាន់ណាស់ ហើយអាចនឹងដំណើរការមិនប្រក្រតី។\n សូមចុច \'សម្អាត និងបំប្លែង...\' ដើម្បីបន្ត។"</string> + <string name="button_convert_fbe" msgid="5152671181309826405">"សម្អាត និងបំប្លែង…"</string> <string name="picture_color_mode" msgid="4560755008730283695">"របៀបនៃពណ៌រូបភាព"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"ប្រើ sRGB"</string> <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"បានបិទ"</string> @@ -318,7 +316,7 @@ <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Protanomaly (ក្រហមពណ៌បៃតង)"</string> <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Tritanomaly (ពណ៌ខៀវ-លឿង)"</string> <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"ការកែពណ៌"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"លក្ខណៈនេះគឺជាការពិសោធន៍ ហើយអាចប៉ះពាល់ការអនុវត្ត។"</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"មុខងារនេះគឺជាការពិសោធន៍ ហើយអាចប៉ះពាល់ដំណើរការ។"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"បដិសេធដោយ <xliff:g id="TITLE">%1$s</xliff:g>"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"សល់ប្រហែល <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"សល់ <xliff:g id="TIME">%1$s</xliff:g> ទើបសាកថ្មពេញ"</string> diff --git a/packages/SettingsLib/res/values-kn/arrays.xml b/packages/SettingsLib/res/values-kn/arrays.xml index d275f371495d..810aefedb04d 100644 --- a/packages/SettingsLib/res/values-kn/arrays.xml +++ b/packages/SettingsLib/res/values-kn/arrays.xml @@ -50,8 +50,8 @@ </string-array> <string-array name="hdcp_checking_titles"> <item msgid="441827799230089869">"ಎಂದಿಗೂ ಪರಿಶೀಲಿಸದಿರು"</item> - <item msgid="6042769699089883931">"DRM ವಿಷಯಗಳಿಗಾಗಿ ಮಾತ್ರ ಪರಿಶೀಲಿಸಿ"</item> - <item msgid="9174900380056846820">"ಯಾವಾಗಲೂ ಪರಿಶೀಲಿಸಿ"</item> + <item msgid="6042769699089883931">"DRM ವಿಷಯಗಳನ್ನು ಮಾತ್ರ ಪರಿಶೀಲಿಸು"</item> + <item msgid="9174900380056846820">"ಯಾವಾಗಲೂ ಪರಿಶೀಲಿಸು"</item> </string-array> <string-array name="hdcp_checking_summaries"> <item msgid="505558545611516707">"HDCP ಪರಿಶೀಲನೆಯನ್ನು ಎಂದಿಗೂ ಬಳಸದಿರು"</item> diff --git a/packages/SettingsLib/res/values-kn/strings.xml b/packages/SettingsLib/res/values-kn/strings.xml index 1d5c871ad85e..0120658ab35f 100644 --- a/packages/SettingsLib/res/values-kn/strings.xml +++ b/packages/SettingsLib/res/values-kn/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ಇಂಟರ್ನೆಟ್ ಸಂಪರ್ಕ ಹಂಚಿಕೊಳ್ಳುವಿಕೆ"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"ಸಂದೇಶ ಪ್ರವೇಶಿಸುವಿಕೆ"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"ಸಿಮ್ ಪ್ರವೇಶ"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"ಉನ್ನತ ಗುಣಮಟ್ಟದ ಆಡಿಯೋ ಬಳಸಿ: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"ಉನ್ನತ ಗುಣಮಟ್ಟದ ಆಡಿಯೋ ಬಳಸಿ"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"ಮಾಧ್ಯಮ ಆಡಿಯೋಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ಫೋನ್ ಆಡಿಯೋಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ಫೈಲ್ ವರ್ಗಾವಣೆ ಸರ್ವರ್ಗೆ ಸಂಪರ್ಕಗೊಂಡಿದೆ"</string> @@ -106,7 +104,7 @@ <string name="launch_defaults_none" msgid="4241129108140034876">"ಡೀಫಾಲ್ಟ್ಗಳನ್ನು ಹೊಂದಿಸಲಾಗಿಲ್ಲ"</string> <string name="tts_settings" msgid="8186971894801348327">"ಪಠ್ಯದಿಂದ ಧ್ವನಿಗೆ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="tts_settings_title" msgid="1237820681016639683">"ಧ್ವನಿಗೆ-ಪಠ್ಯದ ಔಟ್ಪುಟ್"</string> - <string name="tts_default_rate_title" msgid="6030550998379310088">"ಧ್ವನಿಯ ದರ"</string> + <string name="tts_default_rate_title" msgid="6030550998379310088">"ಧ್ವನಿಯ ಪ್ರಮಾಣ"</string> <string name="tts_default_rate_summary" msgid="4061815292287182801">"ಪಠ್ಯವನ್ನು ಹೇಳಿದ ವೇಗ"</string> <string name="tts_default_pitch_title" msgid="6135942113172488671">"ಪಿಚ್"</string> <string name="tts_default_pitch_summary" msgid="1944885882882650009">"ಸಂಯೋಜಿತ ಧ್ವನಿಯ ಟೋನ್ ಮೇಲೆ ಪರಿಣಾಮ ಬೀರುತ್ತದೆ"</string> @@ -202,8 +200,8 @@ <string name="select_logpersist_dialog_title" msgid="4003400579973269060">"ಸಾಧನದಲ್ಲಿ ನಿರಂತರವಾಗಿ ಸಂಗ್ರಹಿಸಲು ಲಾಗ್ ಬಫರ್ಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string> <string name="select_usb_configuration_title" msgid="2649938511506971843">"USB ಕಾನ್ಫಿಗರೇಶನ್ ಆಯ್ಕೆಮಾಡಿ"</string> <string name="select_usb_configuration_dialog_title" msgid="6385564442851599963">"USB ಕಾನ್ಫಿಗರೇಶನ್ ಆಯ್ಕೆಮಾಡಿ"</string> - <string name="allow_mock_location" msgid="2787962564578664888">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string> - <string name="allow_mock_location_summary" msgid="317615105156345626">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸು"</string> + <string name="allow_mock_location" msgid="2787962564578664888">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸಿ"</string> + <string name="allow_mock_location_summary" msgid="317615105156345626">"ಅಣಕು ಸ್ಥಾನಗಳನ್ನು ಅನುಮತಿಸಿ"</string> <string name="debug_view_attributes" msgid="6485448367803310384">"ವೀಕ್ಷಣೆ ಆಟ್ರಿಬ್ಯೂಟ್ ಪರಿಶೀಲನೆ"</string> <string name="mobile_data_always_on_summary" msgid="8149773901431697910">"ವೈ-ಫೈ ಸಕ್ರಿಯವಾಗಿರುವಾಗಲೂ, ಯಾವಾಗಲೂ ಮೊಬೈಲ್ ಡೇಟಾ ಸಕ್ರಿಯವಾಗಿರಿಸಿ (ವೇಗವಾಗಿ ನೆಟ್ವರ್ಕ್ ಬದಲಾಯಿಸಲು)."</string> <string name="adb_warning_title" msgid="6234463310896563253">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯನ್ನು ಅನುಮತಿಸುವುದೇ?"</string> @@ -236,7 +234,7 @@ <string name="debug_monitoring_category" msgid="7640508148375798343">"ಪರಿವೀಕ್ಷಣೆ ಮಾಡುವಿಕೆ"</string> <string name="strict_mode" msgid="1938795874357830695">"ಸ್ಟ್ರಿಕ್ಟ್ ಮೋಡ್ ಸಕ್ರಿಯ"</string> <string name="strict_mode_summary" msgid="142834318897332338">"ಅಪ್ಲಿಕೇಶನ್ಗಳು ಮುಖ್ಯ ಥ್ರೆಡ್ನಲ್ಲಿ ದೀರ್ಘ ಕಾರ್ಯಾಚರಣೆ ನಿರ್ವಹಿಸಿದಾಗ ಪರದೆಯನ್ನು ಫ್ಲ್ಯಾಶ್ ಮಾಡು"</string> - <string name="pointer_location" msgid="6084434787496938001">"ಪಾಯಿಂಟರ್ ಸ್ಥಾನ"</string> + <string name="pointer_location" msgid="6084434787496938001">"ಪಾಯಿಂಟರ್ ಸ್ಥಳ"</string> <string name="pointer_location_summary" msgid="840819275172753713">"ಪ್ರಸ್ತುತ ಸ್ಪರ್ಶ ಡೇಟಾ ತೋರಿಸುವ ಪರದೆಯ ಓವರ್ಲೇ"</string> <string name="show_touches" msgid="2642976305235070316">"ಟ್ಯಾಪ್ಗಳನ್ನು ತೋರಿಸು"</string> <string name="show_touches_summary" msgid="6101183132903926324">"ಟ್ಯಾಪ್ಗಳಿಗೆ ದೃಶ್ಯ ಪ್ರತಿಕ್ರಿಯೆ ತೋರಿಸು"</string> @@ -301,15 +299,15 @@ <string name="inactive_app_active_summary" msgid="4174921824958516106">"ಸಕ್ರಿಯ. ಟಾಗಲ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string> <string name="runningservices_settings_title" msgid="8097287939865165213">"ರನ್ ಆಗುತ್ತಿರುವ ಸೇವೆಗಳು"</string> <string name="runningservices_settings_summary" msgid="854608995821032748">"ಈಗ ರನ್ ಆಗುತ್ತಿರುವ ಸೇವೆಗಳನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ನಿಯಂತ್ರಿಸಿ"</string> - <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView ಅನುಷ್ಠಾನಗೊಳಿಸುವಿಕೆ"</string> + <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView ಹೊಂದಿಸಿ"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"WebView ಅನುಷ್ಠಾನಗೊಳಿಸುವಿಕೆಯನ್ನು ಹೊಂದಿಸಿ"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"ಈ ಆಯ್ಕೆಯು ಇನ್ನು ಮುಂದೆ ಮಾನ್ಯವಾಗಿರುವುದಿಲ್ಲ. ಮತ್ತೊಮ್ಮೆ ಪ್ರಯತ್ನಿಸಿ."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"ಫೈಲ್ ಎನ್ಕ್ರಿಪ್ಶನ್ಗೆ ಪರಿವರ್ತಿಸು"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"ಪರಿವರ್ತಿಸು…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"ಫೈಲ್ ಈಗಾಗಲೇ ಎನ್ಕ್ರಿಪ್ಟ್ ಮಾಡಲಾಗಿದೆ"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"ಫೈಲ್ ಆಧಾರಿತ ಎನ್ಕ್ರಿಪ್ಶನ್ಗೆ ಪರಿವರ್ತಿಸಲಾಗುತ್ತಿದೆ"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"ಡೇಟಾ ವಿಭಜನೆಯನ್ನು ಫೈಲ್ ಆಧಾರಿತ ಎನ್ಕ್ರಿಪ್ಶನ್ ಆಗಿ ಪರಿವರ್ತಿಸಿ.\n !!ಎಚ್ಚರಿಕೆ!! ಇದು ನಿಮ್ಮ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸುತ್ತದೆ.\n ಈ ವೈಶಿಷ್ಟ್ಯವು ಆಲ್ಫಾ ಆಗಿರುತ್ತದೆ ಮತ್ತು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದೆ ಇರಬಹುದು.\n ಮುಂದುವರಿಸಲು \'ಅಳಿಸು ಮತ್ತು ಪರಿವರ್ತಿಸು…\' ಒತ್ತಿರಿ."</string> - <string name="button_convert_fbe" msgid="5152671181309826405">"ಅಳಿಸು ಮತ್ತು ಪರಿವರ್ತಿಸು…"</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"ಡೇಟಾ ವಿಭಜನೆಯನ್ನು ಫೈಲ್ ಆಧಾರಿತ ಎನ್ಕ್ರಿಪ್ಶನ್ ಆಗಿ ಪರಿವರ್ತಿಸಿ.\n !!ಎಚ್ಚರಿಕೆ!! ಇದು ನಿಮ್ಮ ಎಲ್ಲ ಡೇಟಾವನ್ನು ಅಳಿಸಿತ್ತದೆ.\n ಈ ವೈಶಿಷ್ಟ್ಯವು ಆಲ್ಫಾ ಆಗಿರುತ್ತದೆ ಮತ್ತು ಸರಿಯಾಗಿ ಕಾರ್ಯನಿರ್ವಹಿಸದೆ ಇರಬಹುದು.\n ಮುಂದುವರಿಸಲು \'ಅಳಿಸಿ ಮತ್ತು ಪರಿವರ್ತಿಸು…\' ಒತ್ತಿರಿ."</string> + <string name="button_convert_fbe" msgid="5152671181309826405">"ಅಳಿಸಿ ಮತ್ತು ಪರಿವರ್ತಿಸು…"</string> <string name="picture_color_mode" msgid="4560755008730283695">"ಚಿತ್ರ ಬಣ್ಣದ ಮೋಡ್"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"sRGB ಬಳಸಿ"</string> <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string> diff --git a/packages/SettingsLib/res/values-ko/strings.xml b/packages/SettingsLib/res/values-ko/strings.xml index 3458f9021b0c..c5f842ec78f0 100644 --- a/packages/SettingsLib/res/values-ko/strings.xml +++ b/packages/SettingsLib/res/values-ko/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"인터넷 연결 공유"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"메시지 액세스"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM 액세스"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"고품질 오디오 사용: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"고품질 오디오 사용"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"미디어 오디오에 연결됨"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"휴대전화 오디오에 연결됨"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"파일 전송 서버에 연결됨"</string> diff --git a/packages/SettingsLib/res/values-ky/strings.xml b/packages/SettingsLib/res/values-ky/strings.xml index 62636193ef02..410f80bd948e 100644 --- a/packages/SettingsLib/res/values-ky/strings.xml +++ b/packages/SettingsLib/res/values-ky/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Интернет байланышын бөлүшүү"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Билдирүү алмашуу"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM картаны пайдалануу мүмкүнчүлүгү"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Жогорку сапаттагы аудио кодекти колдонуу: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Жогорку сапаттагы аудио кодекти колдонуу"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Медиа аудиого туташты"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Телефон аудиосуна туташты"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Файл өткөрүү серверине туташты"</string> @@ -78,7 +76,7 @@ <string name="bluetooth_hid_profile_summary_use_for" msgid="232727040453645139">"Киргизүү үчүн колдонулсун"</string> <string name="bluetooth_pairing_accept" msgid="6163520056536604875">"Жупташтыруу"</string> <string name="bluetooth_pairing_accept_all_caps" msgid="6061699265220789149">"ЖУПТАШТЫРУУ"</string> - <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Баш тартуу"</string> + <string name="bluetooth_pairing_decline" msgid="4185420413578948140">"Жок"</string> <string name="bluetooth_pairing_will_share_phonebook" msgid="4982239145676394429">"Жупташканда байланыштарыңыз менен чалуу таржымалыңызды пайдалана аласыз."</string> <string name="bluetooth_pairing_error_message" msgid="3748157733635947087">"<xliff:g id="DEVICE_NAME">%1$s</xliff:g> менен жупташуу мүмкүн эмес."</string> <string name="bluetooth_pairing_pin_error_message" msgid="8337234855188925274">"PIN же код туура эмес болгондуктан <xliff:g id="DEVICE_NAME">%1$s</xliff:g> туташуу мүмкүн эмес."</string> @@ -93,9 +91,9 @@ <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string> <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Алынып салынган колдонмолор"</string> <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Өчүрүлгөн колдонмолор жана колдонуучулар"</string> - <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB жалгаштыруу"</string> + <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB модем"</string> <string name="tether_settings_title_wifi" msgid="3277144155960302049">"Ташыма кошулуу чекити"</string> - <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth жалгаштыруу"</string> + <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"Bluetooth модем"</string> <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"Жалгаштыруу"</string> <string name="tether_settings_title_all" msgid="8356136101061143841">"Жалгаштыруу жана ташыма чекит"</string> <string name="managed_user_title" msgid="8109605045406748842">"Жумуш профилинин колднмлр"</string> @@ -113,7 +111,7 @@ <string name="tts_default_lang_title" msgid="8018087612299820556">"Тил"</string> <string name="tts_lang_use_system" msgid="2679252467416513208">"Тутум тилин колдонуу"</string> <string name="tts_lang_not_selected" msgid="7395787019276734765">"Тил тандалган жок"</string> - <string name="tts_default_lang_summary" msgid="5219362163902707785">"Айтылган текст боюнча тилге тиешелүү үндү коёт"</string> + <string name="tts_default_lang_summary" msgid="5219362163902707785">"Текстти окуй турган тилди тандоо"</string> <string name="tts_play_example_title" msgid="7094780383253097230">"Үлгүнү угуу"</string> <string name="tts_play_example_summary" msgid="8029071615047894486">"Кепти синтездөөнүн кыскача көргөзмөсүн ойнотуу"</string> <string name="tts_install_data_title" msgid="4264378440508149986">"Үн дайындарын орнотуу"</string> @@ -174,7 +172,7 @@ <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi дайын-даректүү протоколун иштетүү"</string> <string name="wifi_aggressive_handover" msgid="5309131983693661320">"Wi‑Fi начар болсо, мобилдик Инт-ке өтсүн"</string> <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Wi-Fi Роуминг Скандоо мүмкүнчүлүгүнө ар дайым уруксат берилсин"</string> - <string name="mobile_data_always_on" msgid="8774857027458200434">"Мобилдик дайындар ар дайым иштетилсин"</string> + <string name="mobile_data_always_on" msgid="8774857027458200434">"Мобилдик Интернет иштей берсин"</string> <string name="bluetooth_disable_absolute_volume" msgid="2660673801947898809">"Үндүн абсолюттук деңгээли өчүрүлсүн"</string> <string name="bluetooth_enable_inband_ringing" msgid="3291686366721786740">"Канал аралык чалууну иштетүү"</string> <string name="bluetooth_select_avrcp_version_string" msgid="3750059931120293633">"Bluetooth AVRCP версиясы"</string> @@ -351,7 +349,7 @@ <string name="screen_zoom_summary_very_large" msgid="7108563375663670067">"Чоңураак"</string> <string name="screen_zoom_summary_extremely_large" msgid="7427320168263276227">"Эң чоң"</string> <string name="screen_zoom_summary_custom" msgid="5611979864124160447">"Ыңгайлаштырылган (<xliff:g id="DENSITYDPI">%d</xliff:g>)"</string> - <string name="help_feedback_label" msgid="6815040660801785649">"Жардам жана жооп пикир"</string> + <string name="help_feedback_label" msgid="6815040660801785649">"Жардам жана пикир билдирүү"</string> <string name="content_description_menu_button" msgid="8182594799812351266">"Меню"</string> <string name="time_zone_gmt" msgid="2587097992671450782">"GMT"</string> <string name="retail_demo_reset_message" msgid="118771671364131297">"Демо режиминде демейки жөндөөлөргө кайтаруу үчүн сырсөздү киргизиңиз"</string> diff --git a/packages/SettingsLib/res/values-lo/strings.xml b/packages/SettingsLib/res/values-lo/strings.xml index 254005302256..5abd2a6cadf7 100644 --- a/packages/SettingsLib/res/values-lo/strings.xml +++ b/packages/SettingsLib/res/values-lo/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ການແບ່ງປັນການເຊື່ອມຕໍ່ອິນເຕີເນັດ"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"ການເຂົ້າເຖິງຂໍ້ຄວາມ"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"ການເຂົ້າເຖິງ SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"ໃຊ້ສຽງຄຸນນະພາບສູງ: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"ໃຊ້ສຽງຄຸນນະພາບສູງ"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"ເຊື່ອມຕໍ່ກັບສື່ດ້ານສຽງແລ້ວ"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ເຊື່ອມຕໍ່ກັບສຽງໂທລະສັບແລ້ວ"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ເຊື່ອມຕໍ່ກັບເຊີບເວີໂອນຍ້າຍໄຟລ໌ແລ້ວ"</string> diff --git a/packages/SettingsLib/res/values-lt/strings.xml b/packages/SettingsLib/res/values-lt/strings.xml index bcc884a1064c..830abf018c70 100644 --- a/packages/SettingsLib/res/values-lt/strings.xml +++ b/packages/SettingsLib/res/values-lt/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneto ryšio bendrinimas"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Prieiga prie pranešimų"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM prieiga"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Naudoti aukštos kokybės garsą: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Naudoti aukštos kokybės garsą"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Prijungta prie medijos garso įrašo"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Prijungta prie telefono garso"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Prijungta prie failų perkėlimo serverio"</string> diff --git a/packages/SettingsLib/res/values-lv/strings.xml b/packages/SettingsLib/res/values-lv/strings.xml index 80bbee56c80a..57499545d4a5 100644 --- a/packages/SettingsLib/res/values-lv/strings.xml +++ b/packages/SettingsLib/res/values-lv/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Interneta savienojuma koplietošana"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Piekļuve ziņojumam"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Piekļuve SIM kartei"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Izmantot augstas kvalitātes audio: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Izmantot augstas kvalitātes audio"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Savienots ar multivides audio"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Savienots ar tālruņa audio"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Savienots ar failu pārsūtīšanas serveri"</string> diff --git a/packages/SettingsLib/res/values-mk/strings.xml b/packages/SettingsLib/res/values-mk/strings.xml index 17cff9a03f1a..f38ef5d5a30e 100644 --- a/packages/SettingsLib/res/values-mk/strings.xml +++ b/packages/SettingsLib/res/values-mk/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Споделување конекција на интернет"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Порака за пристап"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Пристап до СИМ"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Користи висококвалитетно аудио: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Користи висококвалитетно аудио"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Поврзан со аудио на медиуми"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Поврзан со аудио на телефон"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Поврзан со сервер за пренос на датотеки"</string> diff --git a/packages/SettingsLib/res/values-ml/strings.xml b/packages/SettingsLib/res/values-ml/strings.xml index 9de75e141596..71945055ded0 100644 --- a/packages/SettingsLib/res/values-ml/strings.xml +++ b/packages/SettingsLib/res/values-ml/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ഇന്റർനെറ്റ് കണക്ഷൻ പങ്കിടൽ"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"ആക്സസ്സ് നിയന്ത്രിക്കുക"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM ആക്സസ്"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"ഉയർന്ന നിലവാരമുള്ള ഓഡിയോ ഉപയോഗിക്കുക: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"ഉയർന്ന നിലവാരമുള്ള ഓഡിയോ ഉപയോഗിക്കുക"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"മീഡിയ ഓഡിയോയിലേക്ക് കണക്റ്റുചെയ്തു"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ഫോൺ ഓഡിയോയിൽ കണക്റ്റുചെയ്തു"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ഫയൽ കൈമാറ്റ സെർവറിലേക്ക് കണക്റ്റുചെയ്തു"</string> diff --git a/packages/SettingsLib/res/values-mn/strings.xml b/packages/SettingsLib/res/values-mn/strings.xml index 09ce7c013f40..c11fa9fadd46 100644 --- a/packages/SettingsLib/res/values-mn/strings.xml +++ b/packages/SettingsLib/res/values-mn/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Интернэт холболтыг хуваалцах"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Зурвас хандалт"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM Хандалт"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Өндөр чанарын аудио ашиглах: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Өндөр чанарын аудио ашиглах"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Медиа аудиод холбогдсон"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Утасны аудид холбогдсон"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Файл дамжуулах серверт холбогдсон"</string> diff --git a/packages/SettingsLib/res/values-mr/strings.xml b/packages/SettingsLib/res/values-mr/strings.xml index e020ca4841c0..a45648efb71f 100644 --- a/packages/SettingsLib/res/values-mr/strings.xml +++ b/packages/SettingsLib/res/values-mr/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"इंटरनेट कनेक्शन सामायिकरण"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"संदेशात प्रवेश"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"सिम प्रवेश"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"उच्च दर्जाचा ऑडिओ वापरा: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"उच्च दर्जाचा ऑडिओ वापरा"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"मीडिया ऑडिओवर कनेक्ट केले"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"फोन ऑडिओ वर कनेक्ट केले"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"फाईल स्थानांतर सर्व्हरवर कनेक्ट केले"</string> diff --git a/packages/SettingsLib/res/values-ms/strings.xml b/packages/SettingsLib/res/values-ms/strings.xml index 3f264c3fc32a..6ca514bb9833 100644 --- a/packages/SettingsLib/res/values-ms/strings.xml +++ b/packages/SettingsLib/res/values-ms/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Perkongsian sambungan Internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Akses Mesej"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Akses SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Gunakan audio berkualiti tinggi: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Gunakan audio berkualiti tinggi"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Disambungkan ke audio media"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Disambungkan ke audio telefon"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Bersambung ke pelayan pemindahan fail"</string> diff --git a/packages/SettingsLib/res/values-my/arrays.xml b/packages/SettingsLib/res/values-my/arrays.xml index 484c95a91eae..85d600210f72 100644 --- a/packages/SettingsLib/res/values-my/arrays.xml +++ b/packages/SettingsLib/res/values-my/arrays.xml @@ -50,7 +50,7 @@ </string-array> <string-array name="hdcp_checking_titles"> <item msgid="441827799230089869">"ဘယ်တော့မှ မစစ်ဆေးပါနှင့်"</item> - <item msgid="6042769699089883931">"DRMအကြောင်းအရာကိုသာ စစ်ဆေးမည်"</item> + <item msgid="6042769699089883931">"DRM အကြောင်းအရာကိုသာ စစ်ဆေးရန်"</item> <item msgid="9174900380056846820">"အမြဲစစ်ဆေးရန်"</item> </string-array> <string-array name="hdcp_checking_summaries"> diff --git a/packages/SettingsLib/res/values-my/strings.xml b/packages/SettingsLib/res/values-my/strings.xml index 6697eb1e013a..21bc2dc86993 100644 --- a/packages/SettingsLib/res/values-my/strings.xml +++ b/packages/SettingsLib/res/values-my/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"အင်တာနက်ဆက်သွယ်မှု မျှဝေခြင်း"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"သတင်းရယူမှု"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM အသုံးပြုခြင်း"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"အရည်အသွေးမြင့် အသံအမျိုးအစားကို သုံးရန်− <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"အရည်အသွေးမြင့် အသံအမျိုးအစားကိုသုံးရန်"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"မီဒီယာအသံအား ချိတ်ဆက်ရန်"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ဖုန်းအသံအား ချိတ်ဆက်ရန်"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ဖိုင်လွှဲပြောင်းမည့်ဆာဗာနှင့် ချိတ်ဆက်ထားပြီး"</string> @@ -169,7 +167,7 @@ <string name="mock_location_app" msgid="7966220972812881854">"တည်နေရာအတုပြု အက်ပ်ရွေးရန်"</string> <string name="mock_location_app_not_set" msgid="809543285495344223">"တည်နေရာအတုပြ အက်ပ်သတ်မှတ်ထားခြင်းမရှိပါ"</string> <string name="mock_location_app_set" msgid="8966420655295102685">"တည်နေရာအတုပြ အက်ပ်- <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="debug_networking_category" msgid="7044075693643009662">"ကွန်ရက်လုပ်ငန်း"</string> + <string name="debug_networking_category" msgid="7044075693643009662">"ချိတ်ဆက်ဆောင်ရွက်ခြင်း"</string> <string name="wifi_display_certification" msgid="8611569543791307533">"ကြိုးမဲ့ပြသမှု အသိအမှတ်ပြုလက်မှတ်"</string> <string name="wifi_verbose_logging" msgid="4203729756047242344">"Wi‑Fi Verbose မှတ်တမ်းတင်ခြင်းအား ဖွင့်မည်"</string> <string name="wifi_aggressive_handover" msgid="5309131983693661320">"Wi‑Fi မှ မိုဘိုင်းသို့ လွှဲပြောင်းရန်"</string> @@ -218,7 +216,7 @@ <string name="enable_terminal_title" msgid="95572094356054120">"လိုကယ်တာမီနယ်"</string> <string name="enable_terminal_summary" msgid="67667852659359206">"local shell အသုံးပြုခွင့်ကမ်းလှမ်းသော တာမင်နယ်အပလီကေးရှင်းဖွင့်ပါ"</string> <string name="hdcp_checking_title" msgid="8605478913544273282">"HDCP စစ်ဆေးမှု"</string> - <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCPစစ်ဆေးခြင်းလုပ်ဆောင်မှုကို သတ်မှတ်မည်"</string> + <string name="hdcp_checking_dialog_title" msgid="5141305530923283">"HDCP စစ်ဆေးပုံကို သတ်မှတ်မည်"</string> <string name="debug_debugging_category" msgid="6781250159513471316">"အမှားရှာဖွေဖယ်ရှားခြင်း"</string> <string name="debug_app" msgid="8349591734751384446">"အမှားရှာသည့်အပလီကေးရှင်းရွေးချယ်ရန်"</string> <string name="debug_app_not_set" msgid="718752499586403499">"အမှားရှာသည့်အပလီကေးရှင်းတခုမှ မသတ်မှတ်ထားပါ"</string> @@ -318,7 +316,7 @@ <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Protanomaly (အနီ-အစိမ်း)"</string> <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Tritanomaly (အပြာ-အဝါ)"</string> <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"အရောင်ပြင်ဆင်မှု"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ဒီအင်္ဂါရပ်မှာ စမ်းသပ်မှု ဖြစ်၍ လုပ်ကိုင်မှုကို အကျိုးသက်ရောက်နိုင်သည်။"</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"ဤဝန်ဆောင်မှုမှာ စမ်းသပ်အဆင့်သာဖြစ်၍ လုပ်ဆောင်မှုအားနည်းနိုင်သည်။"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"<xliff:g id="TITLE">%1$s</xliff:g> မှ ကျော်၍ လုပ်ထားသည်။"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"<xliff:g id="TIME">%1$s</xliff:g> ခန့်လိုပါသည်"</string> <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"အားပြည့်ရန် <xliff:g id="TIME">%1$s</xliff:g> လိုပါသည်"</string> diff --git a/packages/SettingsLib/res/values-nb/arrays.xml b/packages/SettingsLib/res/values-nb/arrays.xml index e0f7663f7bb2..287c38618802 100644 --- a/packages/SettingsLib/res/values-nb/arrays.xml +++ b/packages/SettingsLib/res/values-nb/arrays.xml @@ -49,9 +49,9 @@ <item msgid="1805837518286731242">"Unngår dårlig tilkobling midlertidig"</item> </string-array> <string-array name="hdcp_checking_titles"> - <item msgid="441827799230089869">"Aldri kontrollér"</item> + <item msgid="441827799230089869">"Kontrollér aldri"</item> <item msgid="6042769699089883931">"Kontrollér kun DRM-innhold"</item> - <item msgid="9174900380056846820">"Alltid kontrollér"</item> + <item msgid="9174900380056846820">"Kontrollér alltid"</item> </string-array> <string-array name="hdcp_checking_summaries"> <item msgid="505558545611516707">"Bruk aldri HDCP-kontroll"</item> diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml index 0be93b9c85e4..409ccab20ab0 100644 --- a/packages/SettingsLib/res/values-nb/strings.xml +++ b/packages/SettingsLib/res/values-nb/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Deling av Internett-tilkobling"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Meldingstilgang"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Tilgang til SIM-kortet"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Bruk lyd av høy kvalitet: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Bruk lyd av høy kvalitet"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Koblet til medielyd"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Koblet til telefonlyd"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Koblet til tjener for filoverføring"</string> @@ -308,7 +306,7 @@ <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertér …"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Allerede kryptert og lagret som fil"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Konvertér til filbasert kryptering"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Konvertér datapartisjonen til filbasert kryptering.\n !!Advarsel!! Dette sletter alle dataene dine.\n Dette er en alfafunksjon og kommer kanskje ikke til å fungere skikkelig.\n Trykk på «Slett og konvertér …» for å fortsette."</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Konvertér datapartisjonen til filbasert kryptering.\n !!Advarsel!! Dette gjør at alle dataene dine slettes.\n Dette er en alfafunksjon, som kanskje ikke fungerer som forventet.\n Trykk på «Slett og konvertér …» for å fortsette."</string> <string name="button_convert_fbe" msgid="5152671181309826405">"Slett og konvertér …"</string> <string name="picture_color_mode" msgid="4560755008730283695">"Fargemodus for bilder"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"Bruk sRGB"</string> @@ -318,7 +316,7 @@ <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"Protanomali (rød-grønn)"</string> <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"Tritanomali (blå-gul)"</string> <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"Fargekorrigering"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Denne funksjonen er eksperimentell og kan påvirke ytelsen."</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"Dette er en eksperimentell funksjon som kan gjøre at telefonen ikke fungerer optimalt."</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"Overstyres av <xliff:g id="TITLE">%1$s</xliff:g>"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"Omtrent <xliff:g id="TIME">%1$s</xliff:g> gjenstår"</string> <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g> til det er fulladet"</string> diff --git a/packages/SettingsLib/res/values-ne/strings.xml b/packages/SettingsLib/res/values-ne/strings.xml index 45c9d4e8cf6f..8738e042982c 100644 --- a/packages/SettingsLib/res/values-ne/strings.xml +++ b/packages/SettingsLib/res/values-ne/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"इन्टरनेट जडान साझेदारी गर्दै"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"सन्देश पहुँच"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM पहुँच"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"उच्च गुणस्तरको अडियो प्रयोग गर्नुहोस्: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"उच्च गुणस्तरको अडियो प्रयोग गर्नुहोस्"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"मिडिया अडियोसँग जडित"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"फोन अडियोमा जडान गरियो"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"फाइल ट्रान्सफर सर्भरमा जडान गरियो"</string> diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml index a9c522def106..30cd8db040ab 100644 --- a/packages/SettingsLib/res/values-nl/strings.xml +++ b/packages/SettingsLib/res/values-nl/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internetverbinding delen"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Toegang tot berichten"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Sim-toegang"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Audio van hoge kwaliteit gebruiken: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Audio van hoge kwaliteit gebruiken"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Verbonden met audio van medium"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Verbonden met audio van telefoon"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Verbonden met server voor bestandsoverdracht"</string> diff --git a/packages/SettingsLib/res/values-pa/strings.xml b/packages/SettingsLib/res/values-pa/strings.xml index a954105d11e1..ac7d7dedc901 100644 --- a/packages/SettingsLib/res/values-pa/strings.xml +++ b/packages/SettingsLib/res/values-pa/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ਇੰਟਰਨੈਟ ਕਨੈਕਸ਼ਨ ਸ਼ੇਅਰਿੰਗ"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"ਸੁਨੇਹਾ ਪਹੁੰਚ"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM ਪਹੁੰਚ"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"ਉੱਚ ਗੁਣਵੱਤਾ ਔਡੀਓ ਵਰਤੋ: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"ਉੱਚ ਗੁਣਵੱਤਾ ਔਡੀਓ ਵਰਤੋ"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"ਮੀਡੀਆ ਔਡੀਓ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ਫੋਨ ਔਡੀਓ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ਫਾਈਲ ਟ੍ਰਾਂਸਫਰ ਸਰਵਰ ਨਾਲ ਕਨੈਕਟ ਕੀਤਾ"</string> diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml index b5edff1c9873..762404227b2d 100644 --- a/packages/SettingsLib/res/values-pl/strings.xml +++ b/packages/SettingsLib/res/values-pl/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Udostępnianie połączenia internetowego"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Dostęp do wiadomości"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Dostęp do karty SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Korzystaj z dźwięku wysokiej jakości: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Korzystaj z dźwięku wysokiej jakości"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Połączono z funkcją audio multimediów"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Połączono z funkcją audio telefonu"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Połączono z serwerem transferu plików"</string> @@ -304,7 +302,7 @@ <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementacja WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Ustaw implementację WebView"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Ta opcja nie jest już obsługiwana. Spróbuj ponownie."</string> - <string name="convert_to_file_encryption" msgid="3060156730651061223">"Przekształć na szyfrowanie plików"</string> + <string name="convert_to_file_encryption" msgid="3060156730651061223">"Szyfrowanie plików"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Przekształć…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Pliki są już zaszyfrowane"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Przekształcanie na szyfrowanie plików"</string> diff --git a/packages/SettingsLib/res/values-pt-rBR/strings.xml b/packages/SettingsLib/res/values-pt-rBR/strings.xml index 1651384b2759..fead9f073bd4 100644 --- a/packages/SettingsLib/res/values-pt-rBR/strings.xml +++ b/packages/SettingsLib/res/values-pt-rBR/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartilhamento de conexão à Internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acesso a mensagens"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acesso SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Usar áudio de alta qualidade: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Usar áudio de alta qualidade"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado ao áudio da mídia"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado ao áudio do smartphone"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado ao servidor de transferência de arquivo"</string> diff --git a/packages/SettingsLib/res/values-pt-rPT/strings.xml b/packages/SettingsLib/res/values-pt-rPT/strings.xml index d69cc745f389..0059cdd721f0 100644 --- a/packages/SettingsLib/res/values-pt-rPT/strings.xml +++ b/packages/SettingsLib/res/values-pt-rPT/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Partilha da ligação à internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acesso a mensagens"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acesso ao SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Utilizar áudio de alta qualidade: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Utilizar áudio de alta qualidade"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ligado ao áudio de multimédia"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ligado ao áudio do telefone"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ligado ao servidor de transferência de ficheiros"</string> diff --git a/packages/SettingsLib/res/values-pt/strings.xml b/packages/SettingsLib/res/values-pt/strings.xml index 1651384b2759..fead9f073bd4 100644 --- a/packages/SettingsLib/res/values-pt/strings.xml +++ b/packages/SettingsLib/res/values-pt/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Compartilhamento de conexão à Internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acesso a mensagens"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acesso SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Usar áudio de alta qualidade: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Usar áudio de alta qualidade"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectado ao áudio da mídia"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectado ao áudio do smartphone"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectado ao servidor de transferência de arquivo"</string> diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml index d89858c606d6..9504a737eba9 100644 --- a/packages/SettingsLib/res/values-ro/strings.xml +++ b/packages/SettingsLib/res/values-ro/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Distribuirea conexiunii la internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Acces la mesaje"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Acces la SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Utilizați conținut audio de înaltă calitate: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Utilizați conținut audio de înaltă calitate"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Conectat la profilul pentru conținut media audio"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Conectat la componenta audio a telefonului"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Conectat la serverul de transfer de fișiere"</string> @@ -281,7 +279,7 @@ <string name="enable_freeform_support" msgid="1461893351278940416">"Activați ferestrele cu formă liberă"</string> <string name="enable_freeform_support_summary" msgid="8247310463288834487">"Activați compatibilitatea pentru ferestrele experimentale cu formă liberă."</string> <string name="local_backup_password_title" msgid="3860471654439418822">"Parolă copie rez. desktop"</string> - <string name="local_backup_password_summary_none" msgid="6951095485537767956">"În prezent, copiile de rezervă complete pe desktop nu sunt protejate"</string> + <string name="local_backup_password_summary_none" msgid="6951095485537767956">"În prezent, backupurile complete pe desktop nu sunt protejate"</string> <string name="local_backup_password_summary_change" msgid="5376206246809190364">"Atingeți ca să modificați sau să eliminați parola pentru backupurile complete pe desktop"</string> <string name="local_backup_password_toast_success" msgid="582016086228434290">"A fost setată o parolă de rezervă nouă"</string> <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"Parola nouă și confirmarea acesteia nu se potrivesc."</string> @@ -308,7 +306,7 @@ <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convertiți…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Criptarea bazată pe sistemul de fișiere este finalizată"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Se face conversia la criptarea bazată pe sistemul de fișiere"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Faceți conversia partiției de date la criptarea bazată pe sistemul de fișiere. \n !!Avertisment!! Astfel, toate datele dvs. vor fi șterse.\n Aceasta este o funcție în versiune alpha și este posibil să nu funcționeze corect.\n Apăsați pe „Ștergeți și convertiți…” pentru a continua."</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Faceți conversia partiției de date la criptarea bazată pe sistemul de fișiere. \n AVERTISMENT! Astfel, toate datele dvs. vor fi șterse.\n Aceasta este o funcție în versiune alpha și este posibil să nu funcționeze corect.\n Apăsați pe „Ștergeți și convertiți…” pentru a continua."</string> <string name="button_convert_fbe" msgid="5152671181309826405">"Ștergeți și convertiți…"</string> <string name="picture_color_mode" msgid="4560755008730283695">"Modul de culori pentru imagini"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"Folosiți sRGB"</string> diff --git a/packages/SettingsLib/res/values-ru/strings.xml b/packages/SettingsLib/res/values-ru/strings.xml index 451cb0b954c3..cc82236ea637 100644 --- a/packages/SettingsLib/res/values-ru/strings.xml +++ b/packages/SettingsLib/res/values-ru/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Профиль PAN"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Доступ к сообщениям"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Доступ к SIM-карте"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Использовать аудио высокого качества: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Использовать аудио высокого качества"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Подключено к мультимедийному аудиоустройству"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Подключено к аудиоустройству телефона"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Установлено подключение к серверу передачи файлов"</string> diff --git a/packages/SettingsLib/res/values-si/strings.xml b/packages/SettingsLib/res/values-si/strings.xml index 03165fe067bc..16233088b8fd 100644 --- a/packages/SettingsLib/res/values-si/strings.xml +++ b/packages/SettingsLib/res/values-si/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"අන්තර්ජාල සම්බන්ධතා බෙදාගැනීම"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"පණිවිඩ ප්රවේශය"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM ප්රවේශය"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"ඉහළ ගුණත්වයේ ශ්රව්ය භාවිත කරන්න: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"ඉහළ ගුණත්වයේ ශ්රව්ය භාවිත කරන්න"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"මාධ්ය ශ්රව්යට සම්බන්ධ විය"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"දුරකතනයේ ශ්රව්යට සම්බන්ධ විය"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ගොනු හුවමාරු සේවාදායකය සමග සම්බන්ධ විය"</string> diff --git a/packages/SettingsLib/res/values-sk/strings.xml b/packages/SettingsLib/res/values-sk/strings.xml index 8df768c8ad4e..a8f5566e3efc 100644 --- a/packages/SettingsLib/res/values-sk/strings.xml +++ b/packages/SettingsLib/res/values-sk/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Zdieľanie pripojenia na Internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Prístup ku správam"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Prístup k SIM karte"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Použiť zvuk s vysokou kvalitou: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Použiť zvuk s vysokou kvalitou"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Pripojené ku zvukovému médiu"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Pripojené ku zvuku telefónu"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Pripojené na server pre prenos údajov"</string> @@ -105,7 +103,7 @@ <string name="launch_defaults_some" msgid="313159469856372621">"Predvolená pre niektoré akcie"</string> <string name="launch_defaults_none" msgid="4241129108140034876">"Nie je predvolená pre žiadne akcie"</string> <string name="tts_settings" msgid="8186971894801348327">"Nastavenia prevodu textu na reč"</string> - <string name="tts_settings_title" msgid="1237820681016639683">"Výstup prevodu textu na reč"</string> + <string name="tts_settings_title" msgid="1237820681016639683">"Prevod textu na reč"</string> <string name="tts_default_rate_title" msgid="6030550998379310088">"Rýchlosť reči"</string> <string name="tts_default_rate_summary" msgid="4061815292287182801">"Rýchlosť hovoreného textu"</string> <string name="tts_default_pitch_title" msgid="6135942113172488671">"Výška"</string> @@ -169,7 +167,7 @@ <string name="mock_location_app" msgid="7966220972812881854">"Vybrať aplikáciu so simulovanou polohou"</string> <string name="mock_location_app_not_set" msgid="809543285495344223">"Nemáte žiadnu aplikáciu so simulovanou polohou"</string> <string name="mock_location_app_set" msgid="8966420655295102685">"Aplikácia so simulovanou polohou: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> - <string name="debug_networking_category" msgid="7044075693643009662">"Možnosti siete"</string> + <string name="debug_networking_category" msgid="7044075693643009662">"Siete"</string> <string name="wifi_display_certification" msgid="8611569543791307533">"Certifikácia bezdrôtového zobrazenia"</string> <string name="wifi_verbose_logging" msgid="4203729756047242344">"Podrobné denníky Wi-Fi"</string> <string name="wifi_aggressive_handover" msgid="5309131983693661320">"Agres. odovzdávať Wi-Fi na mobilnú sieť"</string> @@ -236,7 +234,7 @@ <string name="debug_monitoring_category" msgid="7640508148375798343">"Monitorovanie"</string> <string name="strict_mode" msgid="1938795874357830695">"Povoliť prísny režim"</string> <string name="strict_mode_summary" msgid="142834318897332338">"Blikať pri dlhých operáciách hlavného vlákna"</string> - <string name="pointer_location" msgid="6084434787496938001">"Umiestnenie ukazovateľa"</string> + <string name="pointer_location" msgid="6084434787496938001">"Umiestnenie kurzora"</string> <string name="pointer_location_summary" msgid="840819275172753713">"Zobraziť prekryvnú vrstvu s aktuálnymi údajmi o klepnutiach"</string> <string name="show_touches" msgid="2642976305235070316">"Zobrazovať klepnutia"</string> <string name="show_touches_summary" msgid="6101183132903926324">"Vizuálne znázorňovať klepnutia"</string> @@ -301,14 +299,14 @@ <string name="inactive_app_active_summary" msgid="4174921824958516106">"Aktívne. Prepnite klepnutím."</string> <string name="runningservices_settings_title" msgid="8097287939865165213">"Spustené služby"</string> <string name="runningservices_settings_summary" msgid="854608995821032748">"Zobrazenie a ovládanie aktuálne spustených služieb"</string> - <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementácia komponenta WebView"</string> - <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Nastavenie implementácie komponenta WebView"</string> + <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementácia WebView"</string> + <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Nastaviť implementáciu WebView"</string> <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Táto voľba už nie je platná. Skúste to znova."</string> - <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertovať na šifrovanie súborov"</string> + <string name="convert_to_file_encryption" msgid="3060156730651061223">"Prejsť na šifrovanie súborov"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertovať…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Súbory sú už šifrované"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Konvertovanie na šifrovanie založené na súboroch"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Chystáte sa konvertovať dátový oddiel na šifrovanie založené na súboroch.\n !!Upozornenie!! Týmto procesom vymažete všetky dáta.\n Táto funkcia je v alfa verzii a nemusí fungovať správne.\n Ak chcete pokračovať, stlačte tlačidlo „Vymazať a konvertovať…“."</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Chystáte sa previesť dátový oddiel na šifrovanie založené na súboroch.\nPozor!!! Všetky vaše dáta budú vymazané.\nTáto funkcia je v alfa verzii a nemusí fungovať správne.\nAk chcete pokračovať, stlačte tlačidlo Vymazať a konvertovať…"</string> <string name="button_convert_fbe" msgid="5152671181309826405">"Vymazať a konvertovať…"</string> <string name="picture_color_mode" msgid="4560755008730283695">"Farebný režim obrázka"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"Použije sa sRGB"</string> diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml index 740a92e3eae2..085621a0adab 100644 --- a/packages/SettingsLib/res/values-sl/strings.xml +++ b/packages/SettingsLib/res/values-sl/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Skupna raba internetne povezave"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Dostop do sporočil"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Dostop do kartice SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Uporabi zvok visoke kakovosti: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Uporabi zvok visoke kakovosti"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Povezan s profilom za predstavnostni zvok"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Povezava s profilom za zvok telefona vzpostavljena"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Povezava s strežnikom za prenos datotek je vzpostavljena"</string> diff --git a/packages/SettingsLib/res/values-sq/strings.xml b/packages/SettingsLib/res/values-sq/strings.xml index e11c418bd0e0..c9398a50a4fd 100644 --- a/packages/SettingsLib/res/values-sq/strings.xml +++ b/packages/SettingsLib/res/values-sq/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Ndarja e lidhjes së internetit"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Qasja në mesazhe"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Qasje në kartën SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Përdor audion me cilësi të lartë: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Përdor audion me cilësi të lartë"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"U lidh me audion e medias"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"U lidh me audion e telefonit"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"U lidh me serverin e transferimit të skedarëve"</string> diff --git a/packages/SettingsLib/res/values-sr/strings.xml b/packages/SettingsLib/res/values-sr/strings.xml index 0f02f16dff0e..9c08f97d96a9 100644 --- a/packages/SettingsLib/res/values-sr/strings.xml +++ b/packages/SettingsLib/res/values-sr/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Дељење интернет везе"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Приступ порукама"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Приступ SIM картици"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Користи звук високог квалитета: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Користи звук високог квалитета"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Повезано са звуком медија"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Повезано са звуком телефона"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Повезано са сервером за пренос датотека"</string> diff --git a/packages/SettingsLib/res/values-sv/strings.xml b/packages/SettingsLib/res/values-sv/strings.xml index 1058a756e907..cfae5aef3f1b 100644 --- a/packages/SettingsLib/res/values-sv/strings.xml +++ b/packages/SettingsLib/res/values-sv/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Delning av Internetanslutning"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Meddelandeåtkomst"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-åtkomst"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Använd högkvalitativt ljud: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Använd högkvalitativt ljud"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ansluten till medialjud"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ansluten till telefonens ljud"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ansluten till filöverföringsserver"</string> diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml index fa7d028766cb..8b24ef77620b 100644 --- a/packages/SettingsLib/res/values-sw/strings.xml +++ b/packages/SettingsLib/res/values-sw/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Kushiriki muunganisho wa tovuti"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Ufikiaji wa Ujumbe"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Ufikiaji wa SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Tumia sauti ya ubora wa juu: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Tumia sauti ya ubora wa juu"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Imeunganishwa kwenye sikika ya njia ya mawasiliano"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Imeunganishwa kwenye sauti ya simu"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Imeunganishwa kwenye seva ya kuhamisha faili"</string> @@ -106,7 +104,7 @@ <string name="launch_defaults_none" msgid="4241129108140034876">"Hakuna chaguo-misingi zilizowekwa"</string> <string name="tts_settings" msgid="8186971894801348327">"Mipangilio ya maandishi kwa hotuba"</string> <string name="tts_settings_title" msgid="1237820681016639683">"Kubadilisha maandishi hadi usemi"</string> - <string name="tts_default_rate_title" msgid="6030550998379310088">"Kiwango cha usemaji"</string> + <string name="tts_default_rate_title" msgid="6030550998379310088">"Kasi ya kutamka"</string> <string name="tts_default_rate_summary" msgid="4061815292287182801">"Kasi ya kutamkwa kwa maneno"</string> <string name="tts_default_pitch_title" msgid="6135942113172488671">"Giza"</string> <string name="tts_default_pitch_summary" msgid="1944885882882650009">"Huathiri sauti ya matamshi yaliyounganishwa"</string> @@ -308,7 +306,7 @@ <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Badilisha..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Tayari faili imesimbwa kwa njia fiche"</string> <string name="title_convert_fbe" msgid="1263622876196444453">"Inabadilisha kuwa usimbaji fiche unaotegemea faili"</string> - <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Badilisha sehemu za data kuwa usimbaji unaotegemea faili.\n!!Onyo!! Hatua hii itafuta data yako yote.\nKipengele hiki ni cha alpha, na huenda kisifanye kazi vizuri.\nBonyeza \'Futa na ubadilishe...\' ili uendelee."</string> + <string name="convert_to_fbe_warning" msgid="6139067817148865527">"Badilisha sehemu za data kuwa usimbaji unaotegemea faili.\n!!Onyo!! Hatua hii itafuta data yako yote.\nKipengele hiki ni cha alpha na huenda kisifanye kazi vizuri.\nBonyeza \'Futa na ubadilishe...\' ili uendelee."</string> <string name="button_convert_fbe" msgid="5152671181309826405">"Futa na uibadilishe..."</string> <string name="picture_color_mode" msgid="4560755008730283695">"Hali ya rangi ya picha"</string> <string name="picture_color_mode_desc" msgid="1141891467675548590">"Tumia sRGB"</string> diff --git a/packages/SettingsLib/res/values-ta/strings.xml b/packages/SettingsLib/res/values-ta/strings.xml index 1a8745f6f9b9..e09db515c041 100644 --- a/packages/SettingsLib/res/values-ta/strings.xml +++ b/packages/SettingsLib/res/values-ta/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"இணைய இணைப்பு பகிர்தல்"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"செய்திக்கான அணுகல்"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"சிம் அணுகல்"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"உயர்தர ஆடியோவைப் பயன்படுத்து: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"உயர்தர ஆடியோவைப் பயன்படுத்து"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"மீடியா ஆடியோவுடன் இணைக்கப்பட்டது"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"மொபைல் ஆடியோவுடன் இணைக்கப்பட்டது"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"கோப்பைப் பரிமாற்றும் சேவையகத்துடன் இணைக்கப்பட்டது"</string> diff --git a/packages/SettingsLib/res/values-te/strings.xml b/packages/SettingsLib/res/values-te/strings.xml index 9e97748aba8d..dabf7edadd13 100644 --- a/packages/SettingsLib/res/values-te/strings.xml +++ b/packages/SettingsLib/res/values-te/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"ఇంటర్నెట్ కనెక్షన్ భాగస్వామ్యం"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"సందేశ ప్రాప్యత"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM ప్రాప్యత"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"అధిక నాణ్యత ఆడియోను ఉపయోగించండి: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"అధిక నాణ్యత ఆడియోను ఉపయోగించండి"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"మీడియా ఆడియోకు కనెక్ట్ చేయబడింది"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"ఫోన్ ఆడియోకు కనెక్ట్ చేయబడింది"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"ఫైల్ బదిలీ సర్వర్కు కనెక్ట్ చేయబడింది"</string> diff --git a/packages/SettingsLib/res/values-th/strings.xml b/packages/SettingsLib/res/values-th/strings.xml index 91ebc5565ea9..9a265f5316bc 100644 --- a/packages/SettingsLib/res/values-th/strings.xml +++ b/packages/SettingsLib/res/values-th/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"การแชร์การเชื่อมต่ออินเทอร์เน็ต"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"การเข้าถึงข้อความ"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"การเข้าถึงซิม"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"ใช้เสียงคุณภาพสูง: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"ใช้เสียงคุณภาพสูง"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"เชื่อมต่อกับระบบเสียงของสื่อแล้ว"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"เชื่อมต่อกับระบบเสียงของโทรศัพท์แล้ว"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"เชื่อมต่อกับเซิร์ฟเวอร์สำหรับโอนไฟล์แล้ว"</string> diff --git a/packages/SettingsLib/res/values-tl/strings.xml b/packages/SettingsLib/res/values-tl/strings.xml index a73fb570cdcb..c46ac78da289 100644 --- a/packages/SettingsLib/res/values-tl/strings.xml +++ b/packages/SettingsLib/res/values-tl/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Pagbabahagi ng koneksyon sa internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Access sa Mensahe"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Access sa SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Gumamit ng mataas na kalidad na audio: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Gumamit ng mataas na kalidad na audio"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Konektado sa media audio"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Nakakonekta sa audio ng telepono"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Nakakonekta sa server sa paglilipat ng file"</string> diff --git a/packages/SettingsLib/res/values-tr/strings.xml b/packages/SettingsLib/res/values-tr/strings.xml index ae890e4f9e7f..696b20917c2d 100644 --- a/packages/SettingsLib/res/values-tr/strings.xml +++ b/packages/SettingsLib/res/values-tr/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"İnternet bağlantısı paylaşımı"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Mesaj Erişimi"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM Erişimi"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Yüksek kalite ses kullan: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Yüksek kalite ses kullan"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Medya sesine bağlanıldı"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefon sesine bağlandı"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Dosya aktarım sunucusuna bağlandı"</string> @@ -238,8 +236,8 @@ <string name="strict_mode_summary" msgid="142834318897332338">"Uyg. ana işlem parçasında uzun işlem yap. ekr. yakıp söndür"</string> <string name="pointer_location" msgid="6084434787496938001">"İşaretçi konumu"</string> <string name="pointer_location_summary" msgid="840819275172753713">"Mevcut dokunmatik verilerini gösteren yer paylaşımı"</string> - <string name="show_touches" msgid="2642976305235070316">"Hafifçe dokunmayı göster"</string> - <string name="show_touches_summary" msgid="6101183132903926324">"Hafifçe dokunmalarda görsel geri bildirim göster"</string> + <string name="show_touches" msgid="2642976305235070316">"Dokunmayı göster"</string> + <string name="show_touches_summary" msgid="6101183132903926324">"Dokunmalarda görsel geri bildirim göster"</string> <string name="show_screen_updates" msgid="5470814345876056420">"Yüzey güncellemelerini göster"</string> <string name="show_screen_updates_summary" msgid="2569622766672785529">"Güncelleme sırasında tüm pencere yüzeylerini çiz"</string> <string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU görünüm güncellemelerini göster"</string> @@ -282,7 +280,7 @@ <string name="enable_freeform_support_summary" msgid="8247310463288834487">"Deneysel serbest biçimli pencere desteğini etkinleştir."</string> <string name="local_backup_password_title" msgid="3860471654439418822">"Masaüstü yedekleme şifresi"</string> <string name="local_backup_password_summary_none" msgid="6951095485537767956">"Masaüstü tam yedeklemeleri şu an korunmuyor"</string> - <string name="local_backup_password_summary_change" msgid="5376206246809190364">"Masaüstü tam yedeklemelerinin şifresini değiştirmek veya kaldırmak için hafifçe dokunun"</string> + <string name="local_backup_password_summary_change" msgid="5376206246809190364">"Masaüstü tam yedeklemelerinin şifresini değiştirmek veya kaldırmak için dokunun"</string> <string name="local_backup_password_toast_success" msgid="582016086228434290">"Yeni yedekleme şifresi ayarlandı"</string> <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"Yeni şifre ve onayı eşleşmiyor."</string> <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Yedekleme şifresi ayarlanamadı"</string> @@ -297,8 +295,8 @@ <item msgid="5363960654009010371">"Dijital içerik için optimize edilmiş renkler"</item> </string-array> <string name="inactive_apps_title" msgid="1317817863508274533">"Devre dışı uygulamalar"</string> - <string name="inactive_app_inactive_summary" msgid="5091363706699855725">"Etkin değil. Geçiş yapmak için hafifçe dokunun."</string> - <string name="inactive_app_active_summary" msgid="4174921824958516106">"Etkin. Geçiş yapmak için hafifçe dokunun."</string> + <string name="inactive_app_inactive_summary" msgid="5091363706699855725">"Etkin değil. Geçiş yapmak için dokunun."</string> + <string name="inactive_app_active_summary" msgid="4174921824958516106">"Etkin. Geçiş yapmak için dokunun."</string> <string name="runningservices_settings_title" msgid="8097287939865165213">"Çalışan hizmetler"</string> <string name="runningservices_settings_summary" msgid="854608995821032748">"Şu anda çalışan hizmetleri görüntüle ve denetle"</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView kullanımı"</string> diff --git a/packages/SettingsLib/res/values-uk/strings.xml b/packages/SettingsLib/res/values-uk/strings.xml index 63faab2ae8c7..a217708c9da6 100644 --- a/packages/SettingsLib/res/values-uk/strings.xml +++ b/packages/SettingsLib/res/values-uk/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Надання доступу до Інтернету"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Доступ до повідомлень"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Доступ до SIM-карти"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Використовувати аудіо високої якості: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Використовувати аудіо високої якості"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Підключено до аудіоджерела"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Підключено до звуку телеф."</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Підключ. до сервера передачі файлів"</string> @@ -329,7 +327,7 @@ <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> до повного заряду"</string> <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"Невідомо"</string> - <string name="battery_info_status_charging" msgid="1705179948350365604">"Зарядж-ся"</string> + <string name="battery_info_status_charging" msgid="1705179948350365604">"Заряджається"</string> <string name="battery_info_status_charging_lower" msgid="8689770213898117994">"заряджається"</string> <string name="battery_info_status_discharging" msgid="310932812698268588">"Не заряджається"</string> <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не заряджається"</string> diff --git a/packages/SettingsLib/res/values-ur/strings.xml b/packages/SettingsLib/res/values-ur/strings.xml index 67c3c1333cfc..3fceb9868f0e 100644 --- a/packages/SettingsLib/res/values-ur/strings.xml +++ b/packages/SettingsLib/res/values-ur/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"انٹرنیٹ کنکشن کا اشتراک کرنا"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"پیغام تک رسائی"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM رسائی"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"اعلی معیار کی آڈیو استعمال کریں: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"اعلی معیار کی آڈیو استعمال کریں"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"میڈیا آڈیو سے مربوط"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"فون آڈیو سے مربوط"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"فائل منتقلی سرور سے مربوط ہو گیا ہے"</string> @@ -93,11 +91,11 @@ <string name="process_kernel_label" msgid="3916858646836739323">"Android OS"</string> <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"ہٹائی گئی ایپس"</string> <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"ہٹائی گئی ایپس اور صارفین"</string> - <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB مربوط کرنا"</string> + <string name="tether_settings_title_usb" msgid="6688416425801386511">"USB ٹیتھرنگ"</string> <string name="tether_settings_title_wifi" msgid="3277144155960302049">"پورٹیبل ہاٹ اسپاٹ"</string> - <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"بلوٹوتھ مربوط کرنا"</string> - <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"مربوط کرنا"</string> - <string name="tether_settings_title_all" msgid="8356136101061143841">"مربوط کرنا اور پورٹیبل ہاٹ اسپاٹ"</string> + <string name="tether_settings_title_bluetooth" msgid="355855408317564420">"بلوٹوتھ ٹیتھرنگ"</string> + <string name="tether_settings_title_usb_bluetooth" msgid="5355828977109785001">"ٹیتھرنگ"</string> + <string name="tether_settings_title_all" msgid="8356136101061143841">"ٹیتھرنگ و پورٹیبل ہاٹ اسپاٹ"</string> <string name="managed_user_title" msgid="8109605045406748842">"تمام کام کی ایپس"</string> <string name="user_guest" msgid="8475274842845401871">"مہمان"</string> <string name="unknown" msgid="1592123443519355854">"نامعلوم"</string> @@ -151,7 +149,7 @@ <string name="development_settings_summary" msgid="1815795401632854041">"ایپ ڈویلپمنٹ کیلئے اختیارات سیٹ کریں"</string> <string name="development_settings_not_available" msgid="4308569041701535607">"اس صارف کیلئے ڈیولپر کے اختیارات دستیاب نہیں ہیں"</string> <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN ترتیبات اس صارف کیلئے دستیاب نہیں ہیں"</string> - <string name="tethering_settings_not_available" msgid="6765770438438291012">"ربط کی ترتیبات اس صارف کیلئے دستیاب نہیں ہیں"</string> + <string name="tethering_settings_not_available" msgid="6765770438438291012">"ٹیتھرنگ ترتیبات اس صارف کیلئے دستیاب نہیں ہیں"</string> <string name="apn_settings_not_available" msgid="7873729032165324000">"رسائی کی جگہ کے نام کی ترتیبات اس صارف کیلئے دستیاب نہیں ہیں"</string> <string name="enable_adb" msgid="7982306934419797485">"USB ڈیبگ کرنا"</string> <string name="enable_adb_summary" msgid="4881186971746056635">"USB مربوط ہونے پر ڈيبگ کرنے کی وضع"</string> diff --git a/packages/SettingsLib/res/values-uz/strings.xml b/packages/SettingsLib/res/values-uz/strings.xml index 5d504ffe715d..4e92c4640811 100644 --- a/packages/SettingsLib/res/values-uz/strings.xml +++ b/packages/SettingsLib/res/values-uz/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Internet aloqasi ulashmasi"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Xabarga kirish"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM-kartaga kirish"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Yuqori sifatli audiodan foydalanish: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Yuqori sifatli audiodan foydalanish"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Audio qurilmasiga ulangan"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Telefon karnayiga ulanildi"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Fayl almashinish serveriga ulanildi"</string> diff --git a/packages/SettingsLib/res/values-vi/strings.xml b/packages/SettingsLib/res/values-vi/strings.xml index 482d7ca5126f..34dd8632d8b9 100644 --- a/packages/SettingsLib/res/values-vi/strings.xml +++ b/packages/SettingsLib/res/values-vi/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Chia sẻ kết nối internet"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Truy cập tin nhắn"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Quyền truy cập SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Sử dụng âm thanh chất lượng cao: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Sử dụng âm thanh chất lượng cao"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Đã kết nối với âm thanh phương tiện"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Đã kết nối với âm thanh điện thoại"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Đã kết nối với máy chủ chuyển tệp"</string> diff --git a/packages/SettingsLib/res/values-zh-rCN/strings.xml b/packages/SettingsLib/res/values-zh-rCN/strings.xml index 41c6210bd39d..43d75b3b24ad 100644 --- a/packages/SettingsLib/res/values-zh-rCN/strings.xml +++ b/packages/SettingsLib/res/values-zh-rCN/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"共享互联网连接"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"消息权限"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM 卡存取权限"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"使用高品质音频：<xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"使用高品质音频"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"已连接到媒体音频"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"已连接到手机音频"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已连接到文件传输服务器"</string> @@ -314,11 +312,11 @@ <string name="picture_color_mode_desc" msgid="1141891467675548590">"使用 sRGB"</string> <string name="daltonizer_mode_disabled" msgid="7482661936053801862">"已停用"</string> <string name="daltonizer_mode_monochromacy" msgid="8485709880666106721">"全色盲"</string> - <string name="daltonizer_mode_deuteranomaly" msgid="5475532989673586329">"绿色弱视（红绿色）"</string> + <string name="daltonizer_mode_deuteranomaly" msgid="5475532989673586329">"绿色弱视（红绿不分）"</string> <string name="daltonizer_mode_protanomaly" msgid="8424148009038666065">"红色弱视（红绿色）"</string> <string name="daltonizer_mode_tritanomaly" msgid="481725854987912389">"蓝色弱视（蓝黄色）"</string> <string name="accessibility_display_daltonizer_preference_title" msgid="5800761362678707872">"色彩校正"</string> - <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"此功能为实验性功能，可能会影响性能。"</string> + <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"这是实验性功能，性能可能不稳定。"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"已被“<xliff:g id="TITLE">%1$s</xliff:g>”覆盖"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"还剩大约 <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"还需 <xliff:g id="TIME">%1$s</xliff:g>充满电"</string> diff --git a/packages/SettingsLib/res/values-zh-rHK/strings.xml b/packages/SettingsLib/res/values-zh-rHK/strings.xml index ecf7fa882f11..484f1d38e054 100644 --- a/packages/SettingsLib/res/values-zh-rHK/strings.xml +++ b/packages/SettingsLib/res/values-zh-rHK/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"互聯網連線分享"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"訊息存取權"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM 卡存取"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"使用優質音訊編解碼器：<xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"使用優質音訊編解碼器"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"已連接媒體音頻裝置"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"已連接手機耳機"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已連線至檔案傳輸伺服器"</string> @@ -321,12 +319,12 @@ <string name="accessibility_display_daltonizer_preference_subtitle" msgid="3484969015295282911">"這是一項實驗性功能，可能會影響效能。"</string> <string name="daltonizer_type_overridden" msgid="3116947244410245916">"已由「<xliff:g id="TITLE">%1$s</xliff:g>」覆寫"</string> <string name="power_remaining_duration_only" msgid="845431008899029842">"剩餘約 <xliff:g id="TIME">%1$s</xliff:g>"</string> - <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g>後就能完全充電"</string> + <string name="power_remaining_charging_duration_only" msgid="1421102457410268886">"<xliff:g id="TIME">%1$s</xliff:g>後就能充滿電"</string> <string name="power_remaining_duration_only_short" msgid="5329694252258605547">"尚餘 <xliff:g id="TIME">%1$s</xliff:g>"</string> <string name="power_discharging_duration" msgid="2843747179907396142">"<xliff:g id="LEVEL">%1$s</xliff:g> - 剩餘約 <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_discharging_duration_short" msgid="4192244429001842403">"<xliff:g id="LEVEL">%1$s</xliff:g> - 尚餘 <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="power_charging" msgid="1779532561355864267">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="STATE">%2$s</xliff:g>"</string> - <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - 還需 <xliff:g id="TIME">%2$s</xliff:g>才能完全充電"</string> + <string name="power_charging_duration" msgid="4676999980973411875">"<xliff:g id="LEVEL">%1$s</xliff:g> - 還需 <xliff:g id="TIME">%2$s</xliff:g>才能充滿電"</string> <string name="power_charging_duration_short" msgid="1098603958472207920">"<xliff:g id="LEVEL">%1$s</xliff:g> - <xliff:g id="TIME">%2$s</xliff:g>"</string> <string name="battery_info_status_unknown" msgid="196130600938058547">"未知"</string> <string name="battery_info_status_charging" msgid="1705179948350365604">"充電中"</string> diff --git a/packages/SettingsLib/res/values-zh-rTW/strings.xml b/packages/SettingsLib/res/values-zh-rTW/strings.xml index 92b52315c692..050c5567287b 100644 --- a/packages/SettingsLib/res/values-zh-rTW/strings.xml +++ b/packages/SettingsLib/res/values-zh-rTW/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"網際網路連線分享"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"訊息存取權"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"SIM 卡存取權"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"使用高品質音訊：<xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"使用高品質音訊"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"連接至媒體音訊"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"連接至電話音訊"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"已連線到檔案傳輸伺服器"</string> diff --git a/packages/SettingsLib/res/values-zu/strings.xml b/packages/SettingsLib/res/values-zu/strings.xml index 415ddd934732..d2a5743a1919 100644 --- a/packages/SettingsLib/res/values-zu/strings.xml +++ b/packages/SettingsLib/res/values-zu/strings.xml @@ -56,10 +56,8 @@ <string name="bluetooth_profile_pan_nap" msgid="8429049285027482959">"Ukwabelana ngoxhumano lwe-Inthanethi"</string> <string name="bluetooth_profile_map" msgid="5465271250454324383">"Ukufinyelela umlayezo"</string> <string name="bluetooth_profile_sap" msgid="5764222021851283125">"Ukufinyelela kwe-SIM"</string> - <!-- no translation found for bluetooth_profile_a2dp_high_quality (2221025895896419505) --> - <skip /> - <!-- no translation found for bluetooth_profile_a2dp_high_quality_unknown_codec (5860996587596508755) --> - <skip /> + <string name="bluetooth_profile_a2dp_high_quality" msgid="2221025895896419505">"Sebenzisa umsindo wekhwalithi ephezulu: <xliff:g id="CODEC_NAME">%1$s</xliff:g>"</string> + <string name="bluetooth_profile_a2dp_high_quality_unknown_codec" msgid="5860996587596508755">"Sebenzisa umsindo wekhwalithi ephezulu"</string> <string name="bluetooth_a2dp_profile_summary_connected" msgid="963376081347721598">"Ixhume emsindweni wemidiya"</string> <string name="bluetooth_headset_profile_summary_connected" msgid="7661070206715520671">"Ixhunywe kumsindo wefoni"</string> <string name="bluetooth_opp_profile_summary_connected" msgid="2611913495968309066">"Ixhunywe kwiseva yokudlulisa ifayela"</string> diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java index 9e9bc9359cda..24d81870fc77 100644 --- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java +++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java @@ -336,8 +336,12 @@ public class AccessPoint implements Comparable<AccessPoint> { builder.append(',').append(securityToString(security, pskType)); } builder.append(",level=").append(getLevel()); - builder.append(",rankingScore=").append(mRankingScore); - builder.append(",badge=").append(mBadge); + if (mRankingScore != Integer.MIN_VALUE) { + builder.append(",rankingScore=").append(mRankingScore); + } + if (mBadge != NetworkBadging.BADGING_NONE) { + builder.append(",badge=").append(mBadge); + } builder.append(",metered=").append(isMetered()); return builder.append(')').toString(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java index 4d47e6b04aa9..540c39150188 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationData.java @@ -334,7 +334,7 @@ public class NotificationData { mEntries.put(entry.notification.getKey(), entry); } mGroupManager.onEntryAdded(entry); - filterAndSort(); + updateRankingAndSort(mRankingMap); } public Entry remove(String key, RankingMap ranking) { diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java index 08ac9a9de864..18c5756b3fb6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationDataTest.java @@ -24,16 +24,20 @@ import static org.mockito.Mockito.when; import android.Manifest; import android.app.Notification; +import android.app.NotificationChannel; import android.content.pm.IPackageManager; import android.content.pm.PackageManager; import android.os.Bundle; +import android.service.notification.NotificationListenerService; import android.service.notification.StatusBarNotification; import android.support.test.annotation.UiThreadTest; import android.support.test.filters.SmallTest; import android.support.test.runner.AndroidJUnit4; import com.android.systemui.SysuiTestCase; +import com.android.systemui.statusbar.phone.NotificationGroupManager; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -49,6 +53,8 @@ public class NotificationDataTest extends SysuiTestCase { mock(StatusBarNotification.class); private final IPackageManager mMockPackageManager = mock(IPackageManager.class); + private NotificationData mNotificationData; + private ExpandableNotificationRow mRow; @Before public void setUp() throws Exception { @@ -62,6 +68,12 @@ public class NotificationDataTest extends SysuiTestCase { eq(Manifest.permission.NOTIFICATION_DURING_SETUP), eq(UID_ALLOW_DURING_SETUP))) .thenReturn(PackageManager.PERMISSION_GRANTED); + + NotificationData.Environment mock = mock(NotificationData.Environment.class); + when(mock.getGroupManager()).thenReturn(new NotificationGroupManager()); + mNotificationData = new TestableNotificationData(mock); + mNotificationData.updateRanking(mock(NotificationListenerService.RankingMap.class)); + mRow = new NotificationTestHelper(getContext()).createRow(); } @Test @@ -99,6 +111,12 @@ public class NotificationDataTest extends SysuiTestCase { mMockStatusBarNotification)); } + @Test + public void testChannelSetWhenAdded() { + mNotificationData.add(mRow.getEntry()); + Assert.assertTrue(mRow.getEntry().channel != null); + } + private void initStatusBarNotification(boolean allowDuringSetup) { Bundle bundle = new Bundle(); bundle.putBoolean(Notification.EXTRA_ALLOW_DURING_SETUP, allowDuringSetup); @@ -107,4 +125,15 @@ public class NotificationDataTest extends SysuiTestCase { .build(); when(mMockStatusBarNotification.getNotification()).thenReturn(notification); } + + private class TestableNotificationData extends NotificationData { + public TestableNotificationData(Environment environment) { + super(environment); + } + + @Override + public NotificationChannel getChannel(String key) { + return new NotificationChannel(null, null, 0); + } + } } diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index b6dfdd178a1b..fa78f10f3e85 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -2808,7 +2808,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { mRetrieveInteractiveWindows = (info.flags & AccessibilityServiceInfo.FLAG_RETRIEVE_INTERACTIVE_WINDOWS) != 0; mCaptureFingerprintGestures = (info.flags - & AccessibilityServiceInfo.FLAG_CAPTURE_FINGERPRINT_GESTURES) != 0; + & AccessibilityServiceInfo.FLAG_REQUEST_FINGERPRINT_GESTURES) != 0; mRequestAccessibilityButton = (info.flags & AccessibilityServiceInfo.FLAG_REQUEST_ACCESSIBILITY_BUTTON) != 0; } @@ -4721,7 +4721,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { public boolean canCaptureFingerprintGestures(Service service) { return (service.mAccessibilityServiceInfo.getCapabilities() - & AccessibilityServiceInfo.CAPABILITY_CAN_CAPTURE_FINGERPRINT_GESTURES) != 0; + & AccessibilityServiceInfo.CAPABILITY_CAN_REQUEST_FINGERPRINT_GESTURES) != 0; } private int resolveProfileParentLocked(int userId) { diff --git a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java index 6b84c5fc9a49..2358ec55f686 100644 --- a/services/autofill/java/com/android/server/autofill/AutofillManagerService.java +++ b/services/autofill/java/com/android/server/autofill/AutofillManagerService.java @@ -26,6 +26,7 @@ import static com.android.server.autofill.Helper.bundleToString; import android.annotation.NonNull; import android.annotation.Nullable; import android.app.ActivityManager; +import android.app.ActivityThread; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.ContentResolver; @@ -125,7 +126,7 @@ public final class AutofillManagerService extends SystemService { public AutofillManagerService(Context context) { super(context); mContext = context; - mUi = new AutoFillUI(mContext); + mUi = new AutoFillUI(ActivityThread.currentActivityThread().getSystemUiContext()); final boolean debug = Build.IS_DEBUGGABLE; Slog.i(TAG, "Setting debug to " + debug); diff --git a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java index 63420fd27072..bcdb118eb76d 100644 --- a/services/autofill/java/com/android/server/autofill/ui/SaveUi.java +++ b/services/autofill/java/com/android/server/autofill/ui/SaveUi.java @@ -175,7 +175,7 @@ final class SaveUi { closeButton.setOnClickListener((v) -> mListener.onCancel( info.getNegativeActionListener())); - mDialog = new Dialog(context, R.style.Theme_Material_Panel); + mDialog = new Dialog(context, R.style.Theme_DeviceDefault_Light_Panel); mDialog.setContentView(view); final Window window = mDialog.getWindow(); diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index dc84c45800ab..6093241a6681 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -414,8 +414,9 @@ public class CompanionDeviceManagerService extends SystemService implements Bind Binder.withCleanCallingIdentity(() -> { try { - if (ArrayUtils.contains(packageInfo.requestedPermissions, - Manifest.permission.RUN_IN_BACKGROUND)) { + if (containsEither(packageInfo.requestedPermissions, + Manifest.permission.RUN_IN_BACKGROUND, + Manifest.permission.REQUEST_COMPANION_RUN_IN_BACKGROUND)) { mIdleController.addPowerSaveWhitelistApp(packageInfo.packageName); } else { mIdleController.removePowerSaveWhitelistApp(packageInfo.packageName); @@ -425,8 +426,9 @@ public class CompanionDeviceManagerService extends SystemService implements Bind } NetworkPolicyManager networkPolicyManager = NetworkPolicyManager.from(getContext()); - if (ArrayUtils.contains(packageInfo.requestedPermissions, - Manifest.permission.USE_DATA_IN_BACKGROUND)) { + if (containsEither(packageInfo.requestedPermissions, + Manifest.permission.USE_DATA_IN_BACKGROUND, + Manifest.permission.REQUEST_COMPANION_USE_DATA_IN_BACKGROUND)) { networkPolicyManager.addUidPolicy( packageInfo.applicationInfo.uid, NetworkPolicyManager.POLICY_ALLOW_METERED_BACKGROUND); @@ -438,6 +440,10 @@ public class CompanionDeviceManagerService extends SystemService implements Bind }); } + private static <T> boolean containsEither(T[] array, T a, T b) { + return ArrayUtils.contains(array, a) || ArrayUtils.contains(array, b); + } + @Nullable private PackageInfo getPackageInfo(String packageName, int userId) { return Binder.withCleanCallingIdentity(() -> { diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index c6e44e0d424c..d008c5e0ccb6 100644 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -1868,7 +1868,8 @@ public final class ActiveServices { final boolean newService = app.services.add(r); bumpServiceExecutingLocked(r, execInFg, "create"); mAm.updateLruProcessLocked(app, false, null); - updateServiceForegroundLocked(r.app, true); + updateServiceForegroundLocked(r.app, /* oomAdj= */ false); + mAm.updateOomAdjLocked(); boolean created = false; try { @@ -2150,7 +2151,10 @@ public final class ActiveServices { final ServiceMap smap = getServiceMapLocked(r.userId); ServiceRecord found = smap.mServicesByName.remove(r.name); - if (found != r) { + + // Note when this method is called by bringUpServiceLocked(), the service is not found + // in mServicesByName and found will be null. + if (found != null && found != r) { // This is not actually the service we think is running... this should not happen, // but if it does, fail hard. smap.mServicesByName.put(r.name, found); diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index dfeff522fb48..61d185f19e36 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -2977,8 +2977,8 @@ public class ActivityStackSupervisor extends ConfigurationContainer implements D // Calculate the default bounds (don't use existing stack bounds as we may have just created // the stack - final Rect destBounds = mWindowManager.getPictureInPictureBounds(DEFAULT_DISPLAY, - aspectRatio, false /* useExistingStackBounds */); + final Rect destBounds = stack.getPictureInPictureBounds(aspectRatio, + false /* useExistingStackBounds */); stack.animateResizePinnedStack(sourceHintBounds, destBounds, -1 /* animationDuration */, true /* schedulePipModeChangedOnAnimationEnd */); diff --git a/services/core/java/com/android/server/am/PinnedActivityStack.java b/services/core/java/com/android/server/am/PinnedActivityStack.java index a4932bbdd732..672f563d17ca 100644 --- a/services/core/java/com/android/server/am/PinnedActivityStack.java +++ b/services/core/java/com/android/server/am/PinnedActivityStack.java @@ -43,6 +43,11 @@ class PinnedActivityStack extends ActivityStack<PinnedStackWindowController> return new PinnedStackWindowController(mStackId, this, displayId, onTop, outBounds); } + Rect getPictureInPictureBounds(float aspectRatio, boolean useExistingStackBounds) { + return getWindowContainerController().getPictureInPictureBounds(aspectRatio, + useExistingStackBounds); + } + void animateResizePinnedStack(Rect sourceHintBounds, Rect toBounds, int animationDuration, boolean schedulePipModeChangedOnAnimationEnd) { getWindowContainerController().animateResizePinnedStack(toBounds, sourceHintBounds, diff --git a/services/core/java/com/android/server/connectivity/Tethering.java b/services/core/java/com/android/server/connectivity/Tethering.java index b42242eb4423..9c5930b71d87 100644 --- a/services/core/java/com/android/server/connectivity/Tethering.java +++ b/services/core/java/com/android/server/connectivity/Tethering.java @@ -398,15 +398,21 @@ public class Tethering extends BaseNetworkObserver implements IControlsTethering } private int setWifiTethering(final boolean enable) { - synchronized (mPublicSync) { - mWifiTetherRequested = enable; - final WifiManager wifiManager = getWifiManager(); - if ((enable && wifiManager.startSoftAp(null /* use existing wifi config */)) || - (!enable && wifiManager.stopSoftAp())) { - return ConnectivityManager.TETHER_ERROR_NO_ERROR; + int rval = ConnectivityManager.TETHER_ERROR_MASTER_ERROR; + final long ident = Binder.clearCallingIdentity(); + try { + synchronized (mPublicSync) { + mWifiTetherRequested = enable; + final WifiManager mgr = getWifiManager(); + if ((enable && mgr.startSoftAp(null /* use existing wifi config */)) || + (!enable && mgr.stopSoftAp())) { + rval = ConnectivityManager.TETHER_ERROR_NO_ERROR; + } } - return ConnectivityManager.TETHER_ERROR_MASTER_ERROR; + } finally { + Binder.restoreCallingIdentity(ident); } + return rval; } private void setBluetoothTethering(final boolean enable, final ResultReceiver receiver) { diff --git a/services/core/java/com/android/server/location/GeofenceManager.java b/services/core/java/com/android/server/location/GeofenceManager.java index e24bf7620fe3..2493dfb42a60 100644 --- a/services/core/java/com/android/server/location/GeofenceManager.java +++ b/services/core/java/com/android/server/location/GeofenceManager.java @@ -23,8 +23,10 @@ import java.util.List; import android.app.AppOpsManager; import android.app.PendingIntent; +import android.content.ContentResolver; import android.content.Context; import android.content.Intent; +import android.database.ContentObserver; import android.location.Geofence; import android.location.Location; import android.location.LocationListener; @@ -35,6 +37,8 @@ import android.os.Handler; import android.os.Message; import android.os.PowerManager; import android.os.SystemClock; +import android.os.UserHandle; +import android.provider.Settings; import android.util.Slog; import com.android.server.LocationManagerService; @@ -58,9 +62,9 @@ public class GeofenceManager implements LocationListener, PendingIntent.OnFinish private static final long MAX_AGE_NANOS = 5 * 60 * 1000000000L; // five minutes /** - * Most frequent update interval allowed. + * The default value of most frequent update interval allowed. */ - private static final long MIN_INTERVAL_MS = 1 * 60 * 1000; // one minute + private static final long DEFAULT_MIN_INTERVAL_MS = 30 * 60 * 1000; // 30 minutes /** * Least frequent update interval allowed. @@ -106,6 +110,12 @@ public class GeofenceManager implements LocationListener, PendingIntent.OnFinish */ private boolean mPendingUpdate; + /** + * The actual value of most frequent update interval allowed. + */ + private long mEffectiveMinIntervalMs; + private ContentResolver mResolver; + public GeofenceManager(Context context, LocationBlacklist blacklist) { mContext = context; mLocationManager = (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE); @@ -114,6 +124,28 @@ public class GeofenceManager implements LocationListener, PendingIntent.OnFinish mWakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG); mHandler = new GeofenceHandler(); mBlacklist = blacklist; + mResolver = mContext.getContentResolver(); + updateMinInterval(); + mResolver.registerContentObserver( + Settings.Global.getUriFor( + Settings.Global.LOCATION_BACKGROUND_THROTTLE_PROXIMITY_ALERT_INTERVAL_MS), + true, + new ContentObserver(mHandler) { + @Override + public void onChange(boolean selfChange) { + synchronized (mLock) { + updateMinInterval(); + } + } + }, UserHandle.USER_ALL); + } + + /** + * Updates the minimal location request frequency. + */ + private void updateMinInterval() { + mEffectiveMinIntervalMs = Settings.Global.getLong(mResolver, + Settings.Global.LOCATION_BACKGROUND_THROTTLE_INTERVAL_MS, DEFAULT_MIN_INTERVAL_MS); } public void addFence(LocationRequest request, Geofence geofence, PendingIntent intent, @@ -301,10 +333,10 @@ public class GeofenceManager implements LocationListener, PendingIntent.OnFinish // Compute a location update interval based on the distance to the nearest fence. long intervalMs; if (location != null && Double.compare(minFenceDistance, Double.MAX_VALUE) != 0) { - intervalMs = (long)Math.min(MAX_INTERVAL_MS, Math.max(MIN_INTERVAL_MS, + intervalMs = (long)Math.min(MAX_INTERVAL_MS, Math.max(mEffectiveMinIntervalMs, minFenceDistance * 1000 / MAX_SPEED_M_S)); } else { - intervalMs = MIN_INTERVAL_MS; + intervalMs = mEffectiveMinIntervalMs; } if (!mReceivingLocationUpdates || mLocationUpdateInterval != intervalMs) { mReceivingLocationUpdates = true; diff --git a/services/core/java/com/android/server/notification/ManagedServices.java b/services/core/java/com/android/server/notification/ManagedServices.java index 3cb2f35d1585..b8d633fc666f 100644 --- a/services/core/java/com/android/server/notification/ManagedServices.java +++ b/services/core/java/com/android/server/notification/ManagedServices.java @@ -19,10 +19,12 @@ package com.android.server.notification; import static android.content.Context.BIND_ALLOW_WHITELIST_MANAGEMENT; import static android.content.Context.BIND_AUTO_CREATE; import static android.content.Context.BIND_FOREGROUND_SERVICE; +import static android.content.Context.DEVICE_POLICY_SERVICE; import android.annotation.NonNull; import android.app.ActivityManager; import android.app.PendingIntent; +import android.app.admin.DevicePolicyManager; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.ContentResolver; @@ -39,6 +41,7 @@ import android.content.pm.ServiceInfo; import android.content.pm.UserInfo; import android.database.ContentObserver; import android.net.Uri; +import android.os.Binder; import android.os.Build; import android.os.Handler; import android.os.IBinder; @@ -895,7 +898,9 @@ abstract public class ManagedServices { if (this.userid == UserHandle.USER_ALL) return true; if (this.isSystem) return true; if (nid == UserHandle.USER_ALL || nid == this.userid) return true; - return supportsProfiles() && mUserProfiles.isCurrentProfile(nid); + return supportsProfiles() + && mUserProfiles.isCurrentProfile(nid) + && isPermittedForProfile(nid); } public boolean supportsProfiles() { @@ -906,7 +911,7 @@ abstract public class ManagedServices { public void binderDied() { if (DEBUG) Slog.d(TAG, "binderDied"); // Remove the service, but don't unbind from the service. The system will bring the - // service back up, and the onServiceConnected handler will readd the service with the + // service back up, and the onServiceConnected handler will read the service with the // new binding. If this isn't a bound service, and is just a registered // service, just removing it from the list is all we need to do anyway. removeServiceImpl(this.service, this.userid); @@ -918,6 +923,26 @@ abstract public class ManagedServices { if (this.connection == null) return false; return mEnabledServicesForCurrentProfiles.contains(this.component); } + + /** + * Returns true if this service is allowed to receive events for the given userId. A + * managed profile owner can disallow non-system services running outside of the profile + * from receiving events from the profile. + */ + public boolean isPermittedForProfile(int userId) { + if (!mUserProfiles.isManagedProfile(userId)) { + return true; + } + DevicePolicyManager dpm = + (DevicePolicyManager) mContext.getSystemService(DEVICE_POLICY_SERVICE); + final long identity = Binder.clearCallingIdentity(); + try { + return dpm.isNotificationListenerServicePermitted( + component.getPackageName(), userId); + } finally { + Binder.restoreCallingIdentity(identity); + } + } } /** convenience method for looking in mEnabledServicesForCurrentProfiles */ @@ -959,6 +984,13 @@ abstract public class ManagedServices { return mCurrentProfiles.get(userId) != null; } } + + public boolean isManagedProfile(int userId) { + synchronized (mCurrentProfiles) { + UserInfo user = mCurrentProfiles.get(userId); + return user != null && user.isManagedProfile(); + } + } } public static class Config { diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index b8ca2bb6d3c7..8b8420571db4 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -2849,6 +2849,7 @@ public class NotificationManagerService extends SystemService { new Notification.Builder(getContext(), channelId) .setSmallIcon(adjustedSbn.getNotification().getSmallIcon()) .setGroupSummary(true) + .setGroupAlertBehavior(Notification.GROUP_ALERT_CHILDREN) .setGroup(GroupHelper.AUTOGROUP_KEY) .setFlag(Notification.FLAG_AUTOGROUP_SUMMARY, true) .setFlag(Notification.FLAG_GROUP_SUMMARY, true) diff --git a/services/core/java/com/android/server/wm/PinnedStackWindowController.java b/services/core/java/com/android/server/wm/PinnedStackWindowController.java index 5b9c16ce60c9..b0b93aba818d 100644 --- a/services/core/java/com/android/server/wm/PinnedStackWindowController.java +++ b/services/core/java/com/android/server/wm/PinnedStackWindowController.java @@ -17,6 +17,8 @@ package com.android.server.wm; import static android.app.ActivityManager.StackId.FULLSCREEN_WORKSPACE_STACK_ID; +import static android.app.ActivityManager.StackId.PINNED_STACK_ID; + import static com.android.server.wm.BoundsAnimationController.NO_PIP_MODE_CHANGED_CALLBACKS; import static com.android.server.wm.BoundsAnimationController.SCHEDULE_PIP_MODE_CHANGED_ON_END; import static com.android.server.wm.BoundsAnimationController.SCHEDULE_PIP_MODE_CHANGED_ON_START; @@ -42,6 +44,42 @@ public class PinnedStackWindowController extends StackWindowController { } /** + * @param useExistingStackBounds Apply {@param aspectRatio} to the existing target stack bounds + * if possible + */ + public Rect getPictureInPictureBounds(float aspectRatio, boolean useExistingStackBounds) { + synchronized (mWindowMap) { + if (!mService.mSupportsPictureInPicture || mContainer == null) { + return null; + } + + final Rect stackBounds; + final DisplayContent displayContent = mContainer.getDisplayContent(); + if (displayContent == null) { + return null; + } + + final PinnedStackController pinnedStackController = + displayContent.getPinnedStackController(); + if (useExistingStackBounds) { + // If the stack exists, then use its final bounds to calculate the new aspect ratio + // bounds + stackBounds = new Rect(); + mContainer.getAnimationOrCurrentBounds(stackBounds); + } else { + // Otherwise, just calculate the aspect ratio bounds from the default bounds + stackBounds = pinnedStackController.getDefaultBounds(); + } + + if (pinnedStackController.isValidPictureInPictureAspectRatio(aspectRatio)) { + return pinnedStackController.transformBoundsToAspectRatio(stackBounds, aspectRatio); + } else { + return stackBounds; + } + } + } + + /** * Animates the pinned stack. */ public void animateResizePinnedStack(Rect toBounds, Rect sourceHintBounds, @@ -104,8 +142,7 @@ public class PinnedStackWindowController extends StackWindowController { return; } - final int displayId = mContainer.getDisplayContent().getDisplayId(); - final Rect toBounds = mService.getPictureInPictureBounds(displayId, aspectRatio, + final Rect toBounds = getPictureInPictureBounds(aspectRatio, true /* useExistingStackBounds */); final Rect targetBounds = new Rect(); mContainer.getAnimationOrCurrentBounds(targetBounds); diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 05ec479cea93..a7f6600b086c 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2761,44 +2761,6 @@ public class WindowManagerService extends IWindowManager.Stub mDockedStackCreateBounds = bounds; } - /** - * @param useExistingStackBounds Apply {@param aspectRatio} to the existing target stack bounds - * if possible - */ - public Rect getPictureInPictureBounds(int displayId, float aspectRatio, - boolean useExistingStackBounds) { - synchronized (mWindowMap) { - if (!mSupportsPictureInPicture) { - return null; - } - - final Rect stackBounds; - final DisplayContent displayContent = mRoot.getDisplayContent(displayId); - if (displayContent == null) { - return null; - } - - final PinnedStackController pinnedStackController = - displayContent.getPinnedStackController(); - final TaskStack stack = displayContent.getStackById(PINNED_STACK_ID); - if (stack != null && useExistingStackBounds) { - // If the stack exists, then use its final bounds to calculate the new aspect ratio - // bounds. - stackBounds = new Rect(); - stack.getAnimationOrCurrentBounds(stackBounds); - } else { - // Otherwise, just calculate the aspect ratio bounds from the default bounds - stackBounds = pinnedStackController.getDefaultBounds(); - } - - if (pinnedStackController.isValidPictureInPictureAspectRatio(aspectRatio)) { - return pinnedStackController.transformBoundsToAspectRatio(stackBounds, aspectRatio); - } else { - return stackBounds; - } - } - } - public boolean isValidPictureInPictureAspectRatio(int displayId, float aspectRatio) { final DisplayContent displayContent = mRoot.getDisplayContent(displayId); return displayContent.getPinnedStackController().isValidPictureInPictureAspectRatio( diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp index 74ecd11d13f4..edd7d537ad9d 100644 --- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp +++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp @@ -1277,8 +1277,8 @@ static void android_location_GnssLocationProvider_delete_aiding_data(JNIEnv* /* * constellation and svFlag fields. */ enum ShiftWidth: uint8_t { - SVID_SHIFT_WIDTH = 7, - CONSTELLATION_TYPE_SHIFT_WIDTH = 3 + SVID_SHIFT_WIDTH = 8, + CONSTELLATION_TYPE_SHIFT_WIDTH = 4 }; static jint android_location_GnssLocationProvider_read_sv_status(JNIEnv* env, jobject /* obj */, diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 6584672c0948..87fb8c8dd272 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -663,6 +663,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { private static final String TAG_GLOBAL_PROXY_SPEC = "global-proxy-spec"; private static final String TAG_SPECIFIES_GLOBAL_PROXY = "specifies-global-proxy"; private static final String TAG_PERMITTED_IMES = "permitted-imes"; + private static final String TAG_PERMITTED_NOTIFICATION_LISTENERS = + "permitted-notification-listeners"; private static final String TAG_MAX_FAILED_PASSWORD_WIPE = "max-failed-password-wipe"; private static final String TAG_MAX_TIME_TO_UNLOCK = "max-time-to-unlock"; private static final String TAG_STRONG_AUTH_UNLOCK_TIMEOUT = "strong-auth-unlock-timeout"; @@ -770,6 +772,11 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { // allowed. List<String> permittedInputMethods; + // The list of packages allowed to use a NotificationListenerService to receive events for + // notifications from this user. Null means that all packages are allowed. Empty list means + // that only packages from the system are allowed. + List<String> permittedNotificationListeners; + // List of package names to keep cached. List<String> keepUninstalledPackages; @@ -1016,6 +1023,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { writePackageListToXml(out, TAG_PERMITTED_ACCESSIBILITY_SERVICES, permittedAccessiblityServices); writePackageListToXml(out, TAG_PERMITTED_IMES, permittedInputMethods); + writePackageListToXml(out, TAG_PERMITTED_NOTIFICATION_LISTENERS, + permittedNotificationListeners); writePackageListToXml(out, TAG_KEEP_UNINSTALLED_PACKAGES, keepUninstalledPackages); if (hasUserRestrictions()) { UserRestrictionsUtils.writeRestrictions( @@ -1187,6 +1196,8 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { permittedAccessiblityServices = readPackageList(parser, tag); } else if (TAG_PERMITTED_IMES.equals(tag)) { permittedInputMethods = readPackageList(parser, tag); + } else if (TAG_PERMITTED_NOTIFICATION_LISTENERS.equals(tag)) { + permittedNotificationListeners = readPackageList(parser, tag); } else if (TAG_KEEP_UNINSTALLED_PACKAGES.equals(tag)) { keepUninstalledPackages = readPackageList(parser, tag); } else if (TAG_USER_RESTRICTIONS.equals(tag)) { @@ -1407,6 +1418,10 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { pw.print(prefix); pw.print("permittedInputMethods="); pw.println(permittedInputMethods); } + if (permittedNotificationListeners != null) { + pw.print(prefix); pw.print("permittedNotificationListeners="); + pw.println(permittedNotificationListeners); + } if (keepUninstalledPackages != null) { pw.print(prefix); pw.print("keepUninstalledPackages="); pw.println(keepUninstalledPackages); @@ -7807,14 +7822,14 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (admin.permittedAccessiblityServices == null) { return true; } - return checkPackagesInPermittedListOrSystem(Arrays.asList(packageName), + return checkPackagesInPermittedListOrSystem(Collections.singletonList(packageName), admin.permittedAccessiblityServices, userHandle); } } private boolean checkCallerIsCurrentUserOrProfile() { - int callingUserId = UserHandle.getCallingUserId(); - long token = mInjector.binderClearCallingIdentity(); + final int callingUserId = UserHandle.getCallingUserId(); + final long token = mInjector.binderClearCallingIdentity(); try { UserInfo currentUser; UserInfo callingUser = getUserInfo(callingUserId); @@ -7854,6 +7869,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { return false; } + final int callingUserId = mInjector.userHandleGetCallingUserId(); if (packageList != null) { // InputMethodManager fetches input methods for current user. // So this can only be set when calling user is the current user @@ -7868,7 +7884,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { enabledPackages.add(ime.getPackageName()); } if (!checkPackagesInPermittedListOrSystem(enabledPackages, packageList, - mInjector.binderGetCallingUserHandle().getIdentifier())) { + callingUserId)) { Slog.e(LOG_TAG, "Cannot set permitted input methods, " + "because it contains already enabled input method."); return false; @@ -7880,7 +7896,7 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { ActiveAdmin admin = getActiveAdminForCallerLocked(who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); admin.permittedInputMethods = packageList; - saveSettingsLocked(UserHandle.getCallingUserId()); + saveSettingsLocked(callingUserId); } return true; } @@ -7979,11 +7995,70 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { if (admin.permittedInputMethods == null) { return true; } - return checkPackagesInPermittedListOrSystem(Arrays.asList(packageName), + return checkPackagesInPermittedListOrSystem(Collections.singletonList(packageName), admin.permittedInputMethods, userHandle); } } + @Override + public boolean setPermittedCrossProfileNotificationListeners( + ComponentName who, List<String> packageList) { + if (!mHasFeature) { + return false; + } + Preconditions.checkNotNull(who, "ComponentName is null"); + + final int callingUserId = mInjector.userHandleGetCallingUserId(); + if (!isManagedProfile(callingUserId)) { + return false; + } + + synchronized (this) { + ActiveAdmin admin = getActiveAdminForCallerLocked( + who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); + admin.permittedNotificationListeners = packageList; + saveSettingsLocked(callingUserId); + } + return true; + } + + @Override + public List<String> getPermittedCrossProfileNotificationListeners(ComponentName who) { + if (!mHasFeature) { + return null; + } + Preconditions.checkNotNull(who, "ComponentName is null"); + + synchronized (this) { + ActiveAdmin admin = getActiveAdminForCallerLocked( + who, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); + return admin.permittedNotificationListeners; + } + } + + @Override + public boolean isNotificationListenerServicePermitted(String packageName, int userId) { + if (!mHasFeature) { + return true; + } + + Preconditions.checkStringNotEmpty(packageName, "packageName is null or empty"); + if (!isCallerWithSystemUid()) { + throw new SecurityException( + "Only the system can query if a notification listener service is permitted"); + } + synchronized (this) { + ActiveAdmin profileOwner = getProfileOwnerAdminLocked(userId); + if (profileOwner == null || profileOwner.permittedNotificationListeners == null) { + return true; + } + return checkPackagesInPermittedListOrSystem(Collections.singletonList(packageName), + profileOwner.permittedNotificationListeners, userId); + + } + } + + private void sendAdminEnabledBroadcastLocked(int userHandle) { DevicePolicyData policyData = getUserData(userHandle); if (policyData.mAdminBroadcastPending) { diff --git a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityGestureDetectorTest.java b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityGestureDetectorTest.java index d0c2b52f4a67..14abb8a1d7bf 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityGestureDetectorTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/AccessibilityGestureDetectorTest.java @@ -16,7 +16,6 @@ package com.android.server.accessibility; -import static junit.framework.TestCase.assertEquals; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; diff --git a/services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureControllerTest.java b/services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureControllerTest.java index f8dfee40698f..360ccbf874f0 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureControllerTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/FingerprintGestureControllerTest.java @@ -131,7 +131,8 @@ public class FingerprintGestureControllerTest { mFingerprintGestureController.registerFingerprintGestureCallback( mMockFingerprintGestureCallback, null); mFingerprintGestureController.onGesture(FINGERPRINT_GESTURE_SWIPE_DOWN); - verify(mMockFingerprintGestureCallback, times(1)).onGestureDetected(FINGERPRINT_GESTURE_SWIPE_DOWN); + verify(mMockFingerprintGestureCallback, times(1)) + .onGestureDetected(FINGERPRINT_GESTURE_SWIPE_DOWN); reset(mMockFingerprintGestureCallback); mFingerprintGestureController.unregisterFingerprintGestureCallback( @@ -150,9 +151,11 @@ public class FingerprintGestureControllerTest { mFingerprintGestureController.registerFingerprintGestureCallback( mMockFingerprintGestureCallback, messageCapturingHandler); mFingerprintGestureController.onGesture(FINGERPRINT_GESTURE_SWIPE_DOWN); - verify(mMockFingerprintGestureCallback, times(0)).onGestureDetected(FINGERPRINT_GESTURE_SWIPE_DOWN); + verify(mMockFingerprintGestureCallback, times(0)) + .onGestureDetected(FINGERPRINT_GESTURE_SWIPE_DOWN); messageCapturingHandler.sendLastMessage(); - verify(mMockFingerprintGestureCallback, times(1)).onGestureDetected(FINGERPRINT_GESTURE_SWIPE_DOWN); + verify(mMockFingerprintGestureCallback, times(1)) + .onGestureDetected(FINGERPRINT_GESTURE_SWIPE_DOWN); reset(mMockFingerprintGestureCallback); mFingerprintGestureController.unregisterFingerprintGestureCallback( diff --git a/services/tests/servicestests/src/com/android/server/accessibility/GestureDescriptionTest.java b/services/tests/servicestests/src/com/android/server/accessibility/GestureDescriptionTest.java index b876a5fde643..8d389a22d5e2 100644 --- a/services/tests/servicestests/src/com/android/server/accessibility/GestureDescriptionTest.java +++ b/services/tests/servicestests/src/com/android/server/accessibility/GestureDescriptionTest.java @@ -16,7 +16,6 @@ package com.android.server.accessibility; -import static android.accessibilityservice.GestureDescription.StrokeDescription.INVALID_STROKE_ID; import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.everyItem; import static org.hamcrest.MatcherAssert.assertThat; @@ -246,7 +245,7 @@ public class GestureDescriptionTest { swipePath.moveTo(10, 20); swipePath.lineTo(30, 40); StrokeDescription stroke1 = - new StrokeDescription(swipePath, 0, 100, 0, true); + new StrokeDescription(swipePath, 0, 100, true); GestureDescription gesture = new GestureDescription.Builder().addStroke(stroke1).build(); List<GestureStep> steps = MotionEventGenerator .getGestureStepsFromGestureDescription(gesture, 10); @@ -260,9 +259,8 @@ public class GestureDescriptionTest { swipePath.moveTo(10, 20); swipePath.lineTo(30, 40); StrokeDescription stroke1 = - new StrokeDescription(swipePath, 0, 100, INVALID_STROKE_ID, true); - StrokeDescription stroke2 = - new StrokeDescription(swipePath, 0, 100, stroke1.getId(), false); + new StrokeDescription(swipePath, 0, 100, true); + StrokeDescription stroke2 = stroke1.continueStroke(swipePath, 0, 100, false); GestureDescription gesture = new GestureDescription.Builder().addStroke(stroke2).build(); List<GestureStep> steps = MotionEventGenerator .getGestureStepsFromGestureDescription(gesture, 10); diff --git a/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java b/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java index 3fc2c1246c59..28051f9b2f8c 100644 --- a/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java +++ b/services/tests/servicestests/src/com/android/server/am/ActivityTestsBase.java @@ -230,9 +230,17 @@ public class ActivityTestsBase { if (mStack == null) { final RecentTasks recents = new RecentTasks(mService, mService.mStackSupervisor); - mStack = mStackId == ActivityManager.StackId.PINNED_STACK_ID - ? new PinnedActivityStack(this, recents, mOnTop) - : new TestActivityStack(this, recents, mOnTop); + if (mStackId == ActivityManager.StackId.PINNED_STACK_ID) { + mStack = new PinnedActivityStack(this, recents, mOnTop) { + @Override + Rect getPictureInPictureBounds(float aspectRatio, + boolean useExistingStackBounds) { + return new Rect(50, 50, 100, 100); + } + }; + } else { + mStack = new TestActivityStack(this, recents, mOnTop); + } } return mStack; diff --git a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java index 971cdf8cfb84..c2b0ea5430e6 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -1217,7 +1217,8 @@ public class DevicePolicyManagerTest extends DpmTestBase { } /** - * Setup a package in the package manager mock. Useful for faking installed applications. + * Setup a package in the package manager mock for {@link DpmMockContext#CALLER_USER_HANDLE}. + * Useful for faking installed applications. * * @param packageName the name of the package to be setup * @param appId the application ID to be given to the package @@ -1225,19 +1226,41 @@ public class DevicePolicyManagerTest extends DpmTestBase { */ private int setupPackageInPackageManager(final String packageName, final int appId) throws Exception { + return setupPackageInPackageManager( + packageName, DpmMockContext.CALLER_USER_HANDLE, appId, + ApplicationInfo.FLAG_HAS_CODE); + } + + /** + * Setup a package in the package manager mock. Useful for faking installed applications. + * + * @param packageName the name of the package to be setup + * @param userId the user id where the package will be "installed" + * @param appId the application ID to be given to the package + * @param flags flags to set in the ApplicationInfo for this package + * @return the UID of the package as known by the mock package manager + */ + private int setupPackageInPackageManager( + final String packageName, int userId, final int appId, int flags) + throws Exception { // Make the PackageManager return the package instead of throwing a NameNotFoundException final PackageInfo pi = new PackageInfo(); pi.applicationInfo = new ApplicationInfo(); - pi.applicationInfo.flags = ApplicationInfo.FLAG_HAS_CODE; + pi.applicationInfo.flags = flags; doReturn(pi).when(mContext.ipackageManager).getPackageInfo( eq(packageName), anyInt(), - eq(DpmMockContext.CALLER_USER_HANDLE)); + eq(userId)); + doReturn(pi.applicationInfo).when(mContext.ipackageManager).getApplicationInfo( + eq(packageName), + anyInt(), + eq(userId)); + // Setup application UID with the PackageManager - final int uid = UserHandle.getUid(DpmMockContext.CALLER_USER_HANDLE, appId); + final int uid = UserHandle.getUid(userId, appId); doReturn(uid).when(mContext.packageManager).getPackageUidAsUser( eq(packageName), - eq(DpmMockContext.CALLER_USER_HANDLE)); + eq(userId)); // Associate packageName to uid doReturn(packageName).when(mContext.ipackageManager).getNameForUid(eq(uid)); doReturn(new String[]{packageName}) @@ -3971,6 +3994,210 @@ public class DevicePolicyManagerTest extends DpmTestBase { assertFalse(dpm.isCurrentInputMethodSetByOwner()); } + public void testSetPermittedCrossProfileNotificationListeners_unavailableForDo() + throws Exception { + // Set up a device owner. + mContext.binder.callingUid = DpmMockContext.CALLER_SYSTEM_USER_UID; + setupDeviceOwner(); + assertSetPermittedCrossProfileNotificationListenersUnavailable(mContext.binder.callingUid); + } + + public void testSetPermittedCrossProfileNotificationListeners_unavailableForPoOnUser() + throws Exception { + // Set up a profile owner. + mContext.binder.callingUid = DpmMockContext.CALLER_UID; + setupProfileOwner(); + assertSetPermittedCrossProfileNotificationListenersUnavailable(mContext.binder.callingUid); + } + + private void assertSetPermittedCrossProfileNotificationListenersUnavailable( + int adminUid) throws Exception { + mContext.binder.callingUid = adminUid; + final int userId = UserHandle.getUserId(adminUid); + + final String packageName = "some.package"; + assertFalse(dpms.setPermittedCrossProfileNotificationListeners( + admin1, Collections.singletonList(packageName))); + assertNull(dpms.getPermittedCrossProfileNotificationListeners(admin1)); + + mContext.binder.callingUid = DpmMockContext.SYSTEM_UID; + assertTrue(dpms.isNotificationListenerServicePermitted(packageName, userId)); + + // Attempt to set to empty list (which means no listener is whitelisted) + mContext.binder.callingUid = adminUid; + assertFalse(dpms.setPermittedCrossProfileNotificationListeners( + admin1, Collections.<String>emptyList())); + assertNull(dpms.getPermittedCrossProfileNotificationListeners(admin1)); + + mContext.binder.callingUid = DpmMockContext.SYSTEM_UID; + assertTrue(dpms.isNotificationListenerServicePermitted(packageName, userId)); + } + + public void testIsNotificationListenerServicePermitted_onlySystemCanCall() throws Exception { + // Set up a managed profile + final int MANAGED_PROFILE_USER_ID = 15; + final int MANAGED_PROFILE_ADMIN_UID = UserHandle.getUid(MANAGED_PROFILE_USER_ID, 19436); + addManagedProfile(admin1, MANAGED_PROFILE_ADMIN_UID, admin1); + mContext.binder.callingUid = MANAGED_PROFILE_ADMIN_UID; + + final String permittedListener = "some.package"; + setupPackageInPackageManager( + permittedListener, + UserHandle.USER_SYSTEM, // We check the packageInfo from the primary user. + /*appId=*/ 12345, /*flags=*/ 0); + + assertTrue(dpms.setPermittedCrossProfileNotificationListeners( + admin1, Collections.singletonList(permittedListener))); + + try { + dpms.isNotificationListenerServicePermitted( + permittedListener, MANAGED_PROFILE_USER_ID); + fail("isNotificationListenerServicePermitted should throw if not called from System"); + } catch (SecurityException expected) { + } + + mContext.binder.callingUid = DpmMockContext.SYSTEM_UID; + assertTrue(dpms.isNotificationListenerServicePermitted( + permittedListener, MANAGED_PROFILE_USER_ID)); + } + + public void testSetPermittedCrossProfileNotificationListeners_managedProfile() + throws Exception { + // Set up a managed profile + final int MANAGED_PROFILE_USER_ID = 15; + final int MANAGED_PROFILE_ADMIN_UID = UserHandle.getUid(MANAGED_PROFILE_USER_ID, 19436); + addManagedProfile(admin1, MANAGED_PROFILE_ADMIN_UID, admin1); + mContext.binder.callingUid = MANAGED_PROFILE_ADMIN_UID; + + final String permittedListener = "permitted.package"; + int appId = 12345; + setupPackageInPackageManager( + permittedListener, + UserHandle.USER_SYSTEM, // We check the packageInfo from the primary user. + appId, /*flags=*/ 0); + + final String notPermittedListener = "not.permitted.package"; + setupPackageInPackageManager( + notPermittedListener, + UserHandle.USER_SYSTEM, // We check the packageInfo from the primary user. + ++appId, /*flags=*/ 0); + + final String systemListener = "system.package"; + setupPackageInPackageManager( + systemListener, + UserHandle.USER_SYSTEM, // We check the packageInfo from the primary user. + ++appId, ApplicationInfo.FLAG_SYSTEM); + + // By default all packages are allowed + assertNull(dpms.getPermittedCrossProfileNotificationListeners(admin1)); + + mContext.binder.callingUid = DpmMockContext.SYSTEM_UID; + assertTrue(dpms.isNotificationListenerServicePermitted( + permittedListener, MANAGED_PROFILE_USER_ID)); + assertTrue(dpms.isNotificationListenerServicePermitted( + notPermittedListener, MANAGED_PROFILE_USER_ID)); + assertTrue(dpms.isNotificationListenerServicePermitted( + systemListener, MANAGED_PROFILE_USER_ID)); + + // Setting only one package in the whitelist + mContext.binder.callingUid = MANAGED_PROFILE_ADMIN_UID; + assertTrue(dpms.setPermittedCrossProfileNotificationListeners( + admin1, Collections.singletonList(permittedListener))); + List<String> permittedListeners = + dpms.getPermittedCrossProfileNotificationListeners(admin1); + assertEquals(1, permittedListeners.size()); + assertEquals(permittedListener, permittedListeners.get(0)); + + mContext.binder.callingUid = DpmMockContext.SYSTEM_UID; + assertTrue(dpms.isNotificationListenerServicePermitted( + permittedListener, MANAGED_PROFILE_USER_ID)); + assertFalse(dpms.isNotificationListenerServicePermitted( + notPermittedListener, MANAGED_PROFILE_USER_ID)); + // System packages are always allowed (even if not in the whitelist) + assertTrue(dpms.isNotificationListenerServicePermitted( + systemListener, MANAGED_PROFILE_USER_ID)); + + // Setting an empty whitelist - only system listeners allowed + mContext.binder.callingUid = MANAGED_PROFILE_ADMIN_UID; + assertTrue(dpms.setPermittedCrossProfileNotificationListeners( + admin1, Collections.<String>emptyList())); + assertEquals(0, dpms.getPermittedCrossProfileNotificationListeners(admin1).size()); + + mContext.binder.callingUid = DpmMockContext.SYSTEM_UID; + assertFalse(dpms.isNotificationListenerServicePermitted( + permittedListener, MANAGED_PROFILE_USER_ID)); + assertFalse(dpms.isNotificationListenerServicePermitted( + notPermittedListener, MANAGED_PROFILE_USER_ID)); + // System packages are always allowed (even if not in the whitelist) + assertTrue(dpms.isNotificationListenerServicePermitted( + systemListener, MANAGED_PROFILE_USER_ID)); + + // Setting a null whitelist - all listeners allowed + mContext.binder.callingUid = MANAGED_PROFILE_ADMIN_UID; + assertTrue(dpms.setPermittedCrossProfileNotificationListeners(admin1, null)); + assertNull(dpms.getPermittedCrossProfileNotificationListeners(admin1)); + + mContext.binder.callingUid = DpmMockContext.SYSTEM_UID; + assertTrue(dpms.isNotificationListenerServicePermitted( + permittedListener, MANAGED_PROFILE_USER_ID)); + assertTrue(dpms.isNotificationListenerServicePermitted( + notPermittedListener, MANAGED_PROFILE_USER_ID)); + assertTrue(dpms.isNotificationListenerServicePermitted( + systemListener, MANAGED_PROFILE_USER_ID)); + } + + public void testSetPermittedCrossProfileNotificationListeners_doesNotAffectPrimaryProfile() + throws Exception { + // Set up a managed profile + final int MANAGED_PROFILE_USER_ID = 15; + final int MANAGED_PROFILE_ADMIN_UID = UserHandle.getUid(MANAGED_PROFILE_USER_ID, 19436); + addManagedProfile(admin1, MANAGED_PROFILE_ADMIN_UID, admin1); + mContext.binder.callingUid = MANAGED_PROFILE_ADMIN_UID; + + final String nonSystemPackage = "non.system.package"; + int appId = 12345; + setupPackageInPackageManager( + nonSystemPackage, + UserHandle.USER_SYSTEM, // We check the packageInfo from the primary user. + appId, /*flags=*/ 0); + + final String systemListener = "system.package"; + setupPackageInPackageManager( + systemListener, + UserHandle.USER_SYSTEM, // We check the packageInfo from the primary user. + ++appId, ApplicationInfo.FLAG_SYSTEM); + + // By default all packages are allowed (for all profiles) + assertNull(dpms.getPermittedCrossProfileNotificationListeners(admin1)); + + mContext.binder.callingUid = DpmMockContext.SYSTEM_UID; + assertTrue(dpms.isNotificationListenerServicePermitted( + nonSystemPackage, MANAGED_PROFILE_USER_ID)); + assertTrue(dpms.isNotificationListenerServicePermitted( + systemListener, MANAGED_PROFILE_USER_ID)); + assertTrue(dpms.isNotificationListenerServicePermitted( + nonSystemPackage, UserHandle.USER_SYSTEM)); + assertTrue(dpms.isNotificationListenerServicePermitted( + systemListener, UserHandle.USER_SYSTEM)); + + // Setting an empty whitelist - only system listeners allowed in managed profile, but + // all allowed in primary profile + mContext.binder.callingUid = MANAGED_PROFILE_ADMIN_UID; + assertTrue(dpms.setPermittedCrossProfileNotificationListeners( + admin1, Collections.<String>emptyList())); + assertEquals(0, dpms.getPermittedCrossProfileNotificationListeners(admin1).size()); + + mContext.binder.callingUid = DpmMockContext.SYSTEM_UID; + assertFalse(dpms.isNotificationListenerServicePermitted( + nonSystemPackage, MANAGED_PROFILE_USER_ID)); + assertTrue(dpms.isNotificationListenerServicePermitted( + systemListener, MANAGED_PROFILE_USER_ID)); + assertTrue(dpms.isNotificationListenerServicePermitted( + nonSystemPackage, UserHandle.USER_SYSTEM)); + assertTrue(dpms.isNotificationListenerServicePermitted( + systemListener, UserHandle.USER_SYSTEM)); + } + public void testGetOwnerInstalledCaCertsForDeviceOwner() throws Exception { mContext.packageName = mRealTestContext.getPackageName(); setDeviceOwner(); diff --git a/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterLoaderTest.java b/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterLoaderTest.java index 4121447c156f..8108909152bb 100644 --- a/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterLoaderTest.java +++ b/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterLoaderTest.java @@ -24,9 +24,7 @@ import static org.junit.Assert.fail; import android.app.ActivityManager.TaskSnapshot; import android.content.res.Configuration; -import android.graphics.Bitmap; import android.graphics.Rect; -import android.os.Debug; import android.os.SystemClock; import android.platform.test.annotations.Presubmit; import android.support.test.filters.MediumTest; @@ -55,13 +53,13 @@ public class TaskSnapshotPersisterLoaderTest extends TaskSnapshotPersisterTestBa @Test public void testPersistAndLoadSnapshot() { - mPersister.persistSnapshot(1 , sTestUserId, createSnapshot()); + mPersister.persistSnapshot(1 , mTestUserId, createSnapshot()); mPersister.waitForQueueEmpty(); final File[] files = new File[] { new File(sFilesDir.getPath() + "/snapshots/1.proto"), new File(sFilesDir.getPath() + "/snapshots/1.jpg"), new File(sFilesDir.getPath() + "/snapshots/1_reduced.jpg")}; assertTrueForFiles(files, File::exists, " must exist"); - final TaskSnapshot snapshot = mLoader.loadTask(1, sTestUserId, false /* reduced */); + final TaskSnapshot snapshot = mLoader.loadTask(1, mTestUserId, false /* reduced */); assertNotNull(snapshot); assertEquals(TEST_INSETS, snapshot.getContentInsets()); assertNotNull(snapshot.getSnapshot()); @@ -76,8 +74,8 @@ public class TaskSnapshotPersisterLoaderTest extends TaskSnapshotPersisterTestBa @Test public void testTaskRemovedFromRecents() { - mPersister.persistSnapshot(1, sTestUserId, createSnapshot()); - mPersister.onTaskRemovedFromRecents(1, sTestUserId); + mPersister.persistSnapshot(1, mTestUserId, createSnapshot()); + mPersister.onTaskRemovedFromRecents(1, mTestUserId); mPersister.waitForQueueEmpty(); assertFalse(new File(sFilesDir.getPath() + "/snapshots/1.proto").exists()); assertFalse(new File(sFilesDir.getPath() + "/snapshots/1.jpg").exists()); @@ -90,12 +88,12 @@ public class TaskSnapshotPersisterLoaderTest extends TaskSnapshotPersisterTestBa @Test public void testThrottling() { long ms = SystemClock.elapsedRealtime(); - mPersister.persistSnapshot(1, sTestUserId, createSnapshot()); - mPersister.persistSnapshot(2, sTestUserId, createSnapshot()); - mPersister.persistSnapshot(3, sTestUserId, createSnapshot()); - mPersister.persistSnapshot(4, sTestUserId, createSnapshot()); - mPersister.persistSnapshot(5, sTestUserId, createSnapshot()); - mPersister.persistSnapshot(6, sTestUserId, createSnapshot()); + mPersister.persistSnapshot(1, mTestUserId, createSnapshot()); + mPersister.persistSnapshot(2, mTestUserId, createSnapshot()); + mPersister.persistSnapshot(3, mTestUserId, createSnapshot()); + mPersister.persistSnapshot(4, mTestUserId, createSnapshot()); + mPersister.persistSnapshot(5, mTestUserId, createSnapshot()); + mPersister.persistSnapshot(6, mTestUserId, createSnapshot()); mPersister.waitForQueueEmpty(); assertTrue(SystemClock.elapsedRealtime() - ms > 500); } @@ -115,11 +113,11 @@ public class TaskSnapshotPersisterLoaderTest extends TaskSnapshotPersisterTestBa @Test public void testRemoveObsoleteFiles() { - mPersister.persistSnapshot(1, sTestUserId, createSnapshot()); - mPersister.persistSnapshot(2, sTestUserId, createSnapshot()); + mPersister.persistSnapshot(1, mTestUserId, createSnapshot()); + mPersister.persistSnapshot(2, mTestUserId, createSnapshot()); final ArraySet<Integer> taskIds = new ArraySet<>(); taskIds.add(1); - mPersister.removeObsoleteFiles(taskIds, new int[] { sTestUserId }); + mPersister.removeObsoleteFiles(taskIds, new int[] { mTestUserId }); mPersister.waitForQueueEmpty(); final File[] existsFiles = new File[] { new File(sFilesDir.getPath() + "/snapshots/1.proto"), @@ -135,11 +133,11 @@ public class TaskSnapshotPersisterLoaderTest extends TaskSnapshotPersisterTestBa @Test public void testRemoveObsoleteFiles_addedOneInTheMeantime() { - mPersister.persistSnapshot(1, sTestUserId, createSnapshot()); + mPersister.persistSnapshot(1, mTestUserId, createSnapshot()); final ArraySet<Integer> taskIds = new ArraySet<>(); taskIds.add(1); - mPersister.removeObsoleteFiles(taskIds, new int[] { sTestUserId }); - mPersister.persistSnapshot(2, sTestUserId, createSnapshot()); + mPersister.removeObsoleteFiles(taskIds, new int[] { mTestUserId }); + mPersister.persistSnapshot(2, mTestUserId, createSnapshot()); mPersister.waitForQueueEmpty(); final File[] existsFiles = new File[] { new File(sFilesDir.getPath() + "/snapshots/1.proto"), diff --git a/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java b/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java index 5e7389d24330..18d0c321d181 100644 --- a/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java +++ b/services/tests/servicestests/src/com/android/server/wm/TaskSnapshotPersisterTestBase.java @@ -21,7 +21,6 @@ import static android.graphics.GraphicBuffer.USAGE_HW_TEXTURE; import static android.graphics.GraphicBuffer.USAGE_SW_READ_RARELY; import android.app.ActivityManager.TaskSnapshot; -import android.content.pm.UserInfo; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.GraphicBuffer; @@ -31,8 +30,6 @@ import android.os.UserManager; import android.support.test.InstrumentationRegistry; import org.junit.After; -import org.junit.AfterClass; -import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -43,32 +40,24 @@ import java.io.File; */ class TaskSnapshotPersisterTestBase extends WindowTestsBase { - private static final String TEST_USER_NAME = "TaskSnapshotPersisterTest User"; private static final Rect TEST_INSETS = new Rect(10, 20, 30, 40); TaskSnapshotPersister mPersister; TaskSnapshotLoader mLoader; - static int sTestUserId; + int mTestUserId; static File sFilesDir; - private static UserManager sUserManager; @BeforeClass public static void setUpUser() { - sUserManager = UserManager.get(InstrumentationRegistry.getContext()); - sTestUserId = createUser(TEST_USER_NAME, 0); sFilesDir = InstrumentationRegistry.getContext().getFilesDir(); } - @AfterClass - public static void tearDownUser() { - removeUser(sTestUserId); - } - @Before public void setUp() throws Exception { super.setUp(); - mPersister = new TaskSnapshotPersister( - userId -> sFilesDir); + final UserManager um = UserManager.get(InstrumentationRegistry.getContext()); + mTestUserId = um.getUserHandle(); + mPersister = new TaskSnapshotPersister(userId -> sFilesDir); mLoader = new TaskSnapshotLoader(mPersister); mPersister.start(); } @@ -78,20 +67,6 @@ class TaskSnapshotPersisterTestBase extends WindowTestsBase { cleanDirectory(); } - private static int createUser(String name, int flags) { - UserInfo user = sUserManager.createUser(name, flags); - if (user == null) { - Assert.fail("Error while creating the test user: " + TEST_USER_NAME); - } - return user.id; - } - - private static void removeUser(int userId) { - if (!sUserManager.removeUser(userId)) { - Assert.fail("Error while removing the test user: " + TEST_USER_NAME); - } - } - private void cleanDirectory() { for (File file : new File(sFilesDir, "snapshots").listFiles()) { if (!file.isDirectory()) { @@ -101,7 +76,7 @@ class TaskSnapshotPersisterTestBase extends WindowTestsBase { } TaskSnapshot createSnapshot() { - GraphicBuffer buffer = GraphicBuffer.create(100, 100, PixelFormat.RGBA_8888, + final GraphicBuffer buffer = GraphicBuffer.create(100, 100, PixelFormat.RGBA_8888, USAGE_HW_TEXTURE | USAGE_SW_READ_RARELY | USAGE_SW_READ_RARELY); Canvas c = buffer.lockCanvas(); c.drawColor(Color.RED); diff --git a/tools/aapt2/Main.cpp b/tools/aapt2/Main.cpp index 1965ad941b2e..01930d0c424b 100644 --- a/tools/aapt2/Main.cpp +++ b/tools/aapt2/Main.cpp @@ -27,7 +27,7 @@ namespace aapt { static const char* sMajorVersion = "2"; // Update minor version whenever a feature or flag is added. -static const char* sMinorVersion = "13"; +static const char* sMinorVersion = "14"; int PrintVersion() { std::cerr << "Android Asset Packaging Tool (aapt) " << sMajorVersion << "." diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp index 93748d358d7a..8accfa84c0a6 100644 --- a/tools/aapt2/cmd/Link.cpp +++ b/tools/aapt2/cmd/Link.cpp @@ -191,6 +191,62 @@ class LinkContext : public IAaptContext { int min_sdk_version_ = 0; }; +// A custom delegate that generates compatible pre-O IDs for use with feature splits. +// Feature splits use package IDs > 7f, which in Java (since Java doesn't have unsigned ints) +// is interpreted as a negative number. Some verification was wrongly assuming negative values +// were invalid. +// +// This delegate will attempt to masquerade any '@id/' references with ID 0xPPTTEEEE, +// where PP > 7f, as 0x7fPPEEEE. Any potential overlapping is verified and an error occurs if such +// an overlap exists. +class FeatureSplitSymbolTableDelegate : public DefaultSymbolTableDelegate { + public: + FeatureSplitSymbolTableDelegate(IAaptContext* context) : context_(context) { + } + + virtual ~FeatureSplitSymbolTableDelegate() = default; + + virtual std::unique_ptr<SymbolTable::Symbol> FindByName( + const ResourceName& name, + const std::vector<std::unique_ptr<ISymbolSource>>& sources) override { + std::unique_ptr<SymbolTable::Symbol> symbol = + DefaultSymbolTableDelegate::FindByName(name, sources); + if (symbol == nullptr) { + return {}; + } + + // Check to see if this is an 'id' with the target package. + if (name.type == ResourceType::kId && symbol->id) { + ResourceId* id = &symbol->id.value(); + if (id->package_id() > kAppPackageId) { + // Rewrite the resource ID to be compatible pre-O. + ResourceId rewritten_id(kAppPackageId, id->package_id(), id->entry_id()); + + // Check that this doesn't overlap another resource. + if (DefaultSymbolTableDelegate::FindById(rewritten_id, sources) != nullptr) { + // The ID overlaps, so log a message (since this is a weird failure) and fail. + context_->GetDiagnostics()->Error(DiagMessage() << "Failed to rewrite " << name + << " for pre-O feature split support"); + return {}; + } + + if (context_->IsVerbose()) { + context_->GetDiagnostics()->Note(DiagMessage() << "rewriting " << name << " (" << *id + << ") -> (" << rewritten_id << ")"); + } + + *id = rewritten_id; + } + } + return symbol; + } + + private: + DISALLOW_COPY_AND_ASSIGN(FeatureSplitSymbolTableDelegate); + + IAaptContext* context_; +}; + static bool FlattenXml(xml::XmlResource* xml_res, const StringPiece& path, Maybe<size_t> max_sdk_level, bool keep_raw_values, IArchiveWriter* writer, IAaptContext* context) { @@ -1464,6 +1520,19 @@ class LinkCommand { context_->GetExternalSymbols()->PrependSource( util::make_unique<ResourceTableSymbolSource>(&final_table_)); + // Workaround for pre-O runtime that would treat negative resource IDs + // (any ID with a package ID > 7f) as invalid. Intercept any ID (PPTTEEEE) with PP > 0x7f + // and type == 'id', and return the ID 0x7fPPEEEE. IDs don't need to be real resources, they + // are just identifiers. + if (context_->GetMinSdkVersion() < SDK_O && context_->GetPackageType() == PackageType::kApp) { + if (context_->IsVerbose()) { + context_->GetDiagnostics()->Note(DiagMessage() + << "enabling pre-O feature split ID rewriting"); + } + context_->GetExternalSymbols()->SetDelegate( + util::make_unique<FeatureSplitSymbolTableDelegate>(context_)); + } + ReferenceLinker linker; if (!linker.Consume(context_, &final_table_)) { context_->GetDiagnostics()->Error(DiagMessage() << "failed linking references"); diff --git a/tools/aapt2/cmd/Optimize.cpp b/tools/aapt2/cmd/Optimize.cpp index 78ed49b64dd2..194c0c80c2b2 100644 --- a/tools/aapt2/cmd/Optimize.cpp +++ b/tools/aapt2/cmd/Optimize.cpp @@ -213,10 +213,10 @@ class OptimizeCommand { if (file_ref->file == nullptr) { ResourceNameRef name(pkg->name, type->type, entry->name); - context_->GetDiagnostics()->Error(DiagMessage(file_ref->GetSource()) + context_->GetDiagnostics()->Warn(DiagMessage(file_ref->GetSource()) << "file for resource " << name << " with config '" << config_value->config << "' not found"); - return false; + continue; } const StringPiece entry_name = entry->name; diff --git a/tools/aapt2/flatten/XmlFlattener.cpp b/tools/aapt2/flatten/XmlFlattener.cpp index 366c373223dc..e98d2d758df4 100644 --- a/tools/aapt2/flatten/XmlFlattener.cpp +++ b/tools/aapt2/flatten/XmlFlattener.cpp @@ -99,7 +99,11 @@ class XmlFlattenerVisitor : public xml::Visitor { flat_node->comment.index = util::HostToDevice32(-1); ResXMLTree_cdataExt* flat_text = writer.NextBlock<ResXMLTree_cdataExt>(); - AddString(node->text, kLowPriority, &flat_text->data); + + // Process plain strings to make sure they get properly escaped. + util::StringBuilder builder; + builder.Append(node->text); + AddString(builder.ToString(), kLowPriority, &flat_text->data); writer.Finish(); } @@ -184,17 +188,14 @@ class XmlFlattenerVisitor : public xml::Visitor { writer.Finish(); } - void WriteAttributes(xml::Element* node, ResXMLTree_attrExt* flat_elem, - ChunkWriter* writer) { + void WriteAttributes(xml::Element* node, ResXMLTree_attrExt* flat_elem, ChunkWriter* writer) { filtered_attrs_.clear(); filtered_attrs_.reserve(node->attributes.size()); // Filter the attributes. for (xml::Attribute& attr : node->attributes) { - if (options_.max_sdk_level && attr.compiled_attribute && - attr.compiled_attribute.value().id) { - size_t sdk_level = - FindAttributeSdkLevel(attr.compiled_attribute.value().id.value()); + if (options_.max_sdk_level && attr.compiled_attribute && attr.compiled_attribute.value().id) { + size_t sdk_level = FindAttributeSdkLevel(attr.compiled_attribute.value().id.value()); if (sdk_level > options_.max_sdk_level.value()) { continue; } @@ -211,8 +212,7 @@ class XmlFlattenerVisitor : public xml::Visitor { const ResourceId kIdAttr(0x010100d0); - std::sort(filtered_attrs_.begin(), filtered_attrs_.end(), - cmp_xml_attribute_by_id); + std::sort(filtered_attrs_.begin(), filtered_attrs_.end(), cmp_xml_attribute_by_id); flat_elem->attributeCount = util::HostToDevice16(filtered_attrs_.size()); @@ -234,18 +234,15 @@ class XmlFlattenerVisitor : public xml::Visitor { } attribute_index++; - // Add the namespaceUri to the list of StringRefs to encode. Use null if - // the namespace + // Add the namespaceUri to the list of StringRefs to encode. Use null if the namespace // is empty (doesn't exist). AddString(xml_attr->namespace_uri, kLowPriority, &flat_attr->ns, true /* treat_empty_string_as_null */); flat_attr->rawValue.index = util::HostToDevice32(-1); - if (!xml_attr->compiled_attribute || - !xml_attr->compiled_attribute.value().id) { - // The attribute has no associated ResourceID, so the string order - // doesn't matter. + if (!xml_attr->compiled_attribute || !xml_attr->compiled_attribute.value().id) { + // The attribute has no associated ResourceID, so the string order doesn't matter. AddString(xml_attr->name, kLowPriority, &flat_attr->name); } else { // Attribute names are stored without packages, but we use @@ -255,8 +252,7 @@ class XmlFlattenerVisitor : public xml::Visitor { // pools that we later combine. // // Lookup the StringPool for this package and make the reference there. - const xml::AaptAttribute& aapt_attr = - xml_attr->compiled_attribute.value(); + const xml::AaptAttribute& aapt_attr = xml_attr->compiled_attribute.value(); StringPool::Ref name_ref = package_pools[aapt_attr.id.value().package_id()].MakeRef( @@ -266,10 +262,18 @@ class XmlFlattenerVisitor : public xml::Visitor { AddString(name_ref, &flat_attr->name); } + // Process plain strings to make sure they get properly escaped. + StringPiece raw_value = xml_attr->value; + util::StringBuilder str_builder; + if (!options_.keep_raw_values) { + str_builder.Append(xml_attr->value); + raw_value = str_builder.ToString(); + } + if (options_.keep_raw_values || !xml_attr->compiled_value) { // Keep raw values if the value is not compiled or // if we're building a static library (need symbols). - AddString(xml_attr->value, kLowPriority, &flat_attr->rawValue); + AddString(raw_value, kLowPriority, &flat_attr->rawValue); } if (xml_attr->compiled_value) { @@ -277,12 +281,12 @@ class XmlFlattenerVisitor : public xml::Visitor { } else { // Flatten as a regular string type. flat_attr->typedValue.dataType = android::Res_value::TYPE_STRING; - AddString(xml_attr->value, kLowPriority, - (ResStringPool_ref*)&flat_attr->typedValue.data); + + AddString(str_builder.ToString(), kLowPriority, + (ResStringPool_ref*) &flat_attr->typedValue.data); } - flat_attr->typedValue.size = - util::HostToDevice16(sizeof(flat_attr->typedValue)); + flat_attr->typedValue.size = util::HostToDevice16(sizeof(flat_attr->typedValue)); flat_attr++; } } diff --git a/tools/aapt2/flatten/XmlFlattener_test.cpp b/tools/aapt2/flatten/XmlFlattener_test.cpp index f0613e74b5f8..cfa89bb4b09f 100644 --- a/tools/aapt2/flatten/XmlFlattener_test.cpp +++ b/tools/aapt2/flatten/XmlFlattener_test.cpp @@ -82,72 +82,71 @@ TEST_F(XmlFlattenerTest, FlattenXmlWithNoCompiledAttributes) { android::ResXMLTree tree; ASSERT_TRUE(Flatten(doc.get(), &tree)); - ASSERT_EQ(tree.next(), android::ResXMLTree::START_NAMESPACE); + ASSERT_EQ(android::ResXMLTree::START_NAMESPACE, tree.next()); size_t len; const char16_t* namespace_prefix = tree.getNamespacePrefix(&len); - EXPECT_EQ(StringPiece16(namespace_prefix, len), u"test"); + EXPECT_EQ(StringPiece16(u"test"), StringPiece16(namespace_prefix, len)); const char16_t* namespace_uri = tree.getNamespaceUri(&len); - ASSERT_EQ(StringPiece16(namespace_uri, len), u"http://com.test"); + ASSERT_EQ(StringPiece16(u"http://com.test"), StringPiece16(namespace_uri, len)); - ASSERT_EQ(tree.next(), android::ResXMLTree::START_TAG); + ASSERT_EQ(android::ResXMLTree::START_TAG, tree.next()); - ASSERT_EQ(tree.getElementNamespace(&len), nullptr); + ASSERT_EQ(nullptr, tree.getElementNamespace(&len)); const char16_t* tag_name = tree.getElementName(&len); - EXPECT_EQ(StringPiece16(tag_name, len), u"View"); + EXPECT_EQ(StringPiece16(u"View"), StringPiece16(tag_name, len)); ASSERT_EQ(1u, tree.getAttributeCount()); - ASSERT_EQ(tree.getAttributeNamespace(0, &len), nullptr); + ASSERT_EQ(nullptr, tree.getAttributeNamespace(0, &len)); const char16_t* attr_name = tree.getAttributeName(0, &len); - EXPECT_EQ(StringPiece16(attr_name, len), u"attr"); + EXPECT_EQ(StringPiece16(u"attr"), StringPiece16(attr_name, len)); - EXPECT_EQ(0, tree.indexOfAttribute(nullptr, 0, u"attr", - StringPiece16(u"attr").size())); + EXPECT_EQ(0, tree.indexOfAttribute(nullptr, 0, u"attr", StringPiece16(u"attr").size())); - ASSERT_EQ(tree.next(), android::ResXMLTree::START_TAG); + ASSERT_EQ(android::ResXMLTree::START_TAG, tree.next()); - ASSERT_EQ(tree.getElementNamespace(&len), nullptr); + ASSERT_EQ(nullptr, tree.getElementNamespace(&len)); tag_name = tree.getElementName(&len); - EXPECT_EQ(StringPiece16(tag_name, len), u"Layout"); + EXPECT_EQ(StringPiece16(u"Layout"), StringPiece16(tag_name, len)); ASSERT_EQ(1u, tree.getAttributeCount()); const char16_t* attr_namespace = tree.getAttributeNamespace(0, &len); - EXPECT_EQ(StringPiece16(attr_namespace, len), u"http://com.test"); + EXPECT_EQ(StringPiece16(u"http://com.test"), StringPiece16(attr_namespace, len)); attr_name = tree.getAttributeName(0, &len); - EXPECT_EQ(StringPiece16(attr_name, len), u"hello"); + EXPECT_EQ(StringPiece16(u"hello"), StringPiece16(attr_name, len)); - ASSERT_EQ(tree.next(), android::ResXMLTree::END_TAG); - ASSERT_EQ(tree.next(), android::ResXMLTree::START_TAG); + ASSERT_EQ(android::ResXMLTree::END_TAG, tree.next()); + ASSERT_EQ(android::ResXMLTree::START_TAG, tree.next()); - ASSERT_EQ(tree.getElementNamespace(&len), nullptr); + ASSERT_EQ(nullptr, tree.getElementNamespace(&len)); tag_name = tree.getElementName(&len); - EXPECT_EQ(StringPiece16(tag_name, len), u"Layout"); + EXPECT_EQ(StringPiece16(u"Layout"), StringPiece16(tag_name, len)); ASSERT_EQ(0u, tree.getAttributeCount()); - ASSERT_EQ(tree.next(), android::ResXMLTree::TEXT); + ASSERT_EQ(android::ResXMLTree::TEXT, tree.next()); const char16_t* text = tree.getText(&len); - EXPECT_EQ(StringPiece16(text, len), u"Some text\\"); + EXPECT_EQ(StringPiece16(u"Some text\\"), StringPiece16(text, len)); - ASSERT_EQ(tree.next(), android::ResXMLTree::END_TAG); - ASSERT_EQ(tree.getElementNamespace(&len), nullptr); + ASSERT_EQ(android::ResXMLTree::END_TAG, tree.next()); + ASSERT_EQ(nullptr, tree.getElementNamespace(&len)); tag_name = tree.getElementName(&len); - EXPECT_EQ(StringPiece16(tag_name, len), u"Layout"); + EXPECT_EQ(StringPiece16(u"Layout"), StringPiece16(tag_name, len)); - ASSERT_EQ(tree.next(), android::ResXMLTree::END_TAG); - ASSERT_EQ(tree.getElementNamespace(&len), nullptr); + ASSERT_EQ(android::ResXMLTree::END_TAG, tree.next()); + ASSERT_EQ(nullptr, tree.getElementNamespace(&len)); tag_name = tree.getElementName(&len); - EXPECT_EQ(StringPiece16(tag_name, len), u"View"); + EXPECT_EQ(StringPiece16(u"View"), StringPiece16(tag_name, len)); - ASSERT_EQ(tree.next(), android::ResXMLTree::END_NAMESPACE); + ASSERT_EQ(android::ResXMLTree::END_NAMESPACE, tree.next()); namespace_prefix = tree.getNamespacePrefix(&len); - EXPECT_EQ(StringPiece16(namespace_prefix, len), u"test"); + EXPECT_EQ(StringPiece16(u"test"), StringPiece16(namespace_prefix, len)); namespace_uri = tree.getNamespaceUri(&len); - ASSERT_EQ(StringPiece16(namespace_uri, len), u"http://com.test"); + ASSERT_EQ(StringPiece16(u"http://com.test"), StringPiece16(namespace_uri, len)); - ASSERT_EQ(tree.next(), android::ResXMLTree::END_DOCUMENT); + ASSERT_EQ(android::ResXMLTree::END_DOCUMENT, tree.next()); } TEST_F(XmlFlattenerTest, FlattenCompiledXmlAndStripSdk21) { @@ -300,4 +299,41 @@ TEST_F(XmlFlattenerTest, FlattenNonStandardPackageId) { EXPECT_EQ(ResourceId(0x80020000), tree.getAttributeData(idx)); } +TEST_F(XmlFlattenerTest, ProcessEscapedStrings) { + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom( + R"EOF(<element value="\?hello" pattern="\\d{5}">\\d{5}</element>)EOF"); + + android::ResXMLTree tree; + ASSERT_TRUE(Flatten(doc.get(), &tree)); + + while (tree.next() != android::ResXMLTree::START_TAG) { + ASSERT_NE(tree.getEventType(), android::ResXMLTree::BAD_DOCUMENT); + ASSERT_NE(tree.getEventType(), android::ResXMLTree::END_DOCUMENT); + } + + const StringPiece16 kValue = u"value"; + const StringPiece16 kPattern = u"pattern"; + + size_t len; + ssize_t idx; + const char16_t* str16; + + idx = tree.indexOfAttribute(nullptr, 0, kValue.data(), kValue.size()); + ASSERT_GE(idx, 0); + str16 = tree.getAttributeStringValue(idx, &len); + ASSERT_NE(nullptr, str16); + EXPECT_EQ(StringPiece16(u"?hello"), StringPiece16(str16, len)); + + idx = tree.indexOfAttribute(nullptr, 0, kPattern.data(), kPattern.size()); + ASSERT_GE(idx, 0); + str16 = tree.getAttributeStringValue(idx, &len); + ASSERT_NE(nullptr, str16); + EXPECT_EQ(StringPiece16(u"\\d{5}"), StringPiece16(str16, len)); + + ASSERT_EQ(android::ResXMLTree::TEXT, tree.next()); + str16 = tree.getText(&len); + ASSERT_NE(nullptr, str16); + EXPECT_EQ(StringPiece16(u"\\d{5}"), StringPiece16(str16, len)); +} + } // namespace aapt diff --git a/tools/aapt2/java/JavaClassGenerator.cpp b/tools/aapt2/java/JavaClassGenerator.cpp index a8226c0a9082..2a23aa9e5372 100644 --- a/tools/aapt2/java/JavaClassGenerator.cpp +++ b/tools/aapt2/java/JavaClassGenerator.cpp @@ -31,6 +31,7 @@ #include "Resource.h" #include "ResourceTable.h" #include "ResourceValues.h" +#include "SdkConstants.h" #include "ValueVisitor.h" #include "java/AnnotationProcessor.h" #include "java/ClassDefinition.h" @@ -430,9 +431,15 @@ void JavaClassGenerator::ProcessResource(const ResourceNameRef& name, const Reso const ResourceEntry& entry, ClassDefinition* out_class_def, MethodDefinition* out_rewrite_method, std::ostream* out_r_txt) { + ResourceId real_id = id; + if (context_->GetMinSdkVersion() < SDK_O && name.type == ResourceType::kId && + id.package_id() > kAppPackageId) { + real_id = ResourceId(kAppPackageId, id.package_id(), id.entry_id()); + } + const std::string field_name = TransformToFieldName(name.entry); std::unique_ptr<ResourceMember> resource_member = - util::make_unique<ResourceMember>(field_name, id); + util::make_unique<ResourceMember>(field_name, real_id); // Build the comments and annotations for this entry. AnnotationProcessor* processor = resource_member->GetCommentBuilder(); @@ -458,7 +465,7 @@ void JavaClassGenerator::ProcessResource(const ResourceNameRef& name, const Reso out_class_def->AddMember(std::move(resource_member)); if (out_r_txt != nullptr) { - *out_r_txt << "int " << name.type << " " << field_name << " " << id << "\n"; + *out_r_txt << "int " << name.type << " " << field_name << " " << real_id << "\n"; } if (out_rewrite_method != nullptr) { diff --git a/tools/aapt2/link/XmlReferenceLinker_test.cpp b/tools/aapt2/link/XmlReferenceLinker_test.cpp index cc59416cb2b9..66ecc15730ed 100644 --- a/tools/aapt2/link/XmlReferenceLinker_test.cpp +++ b/tools/aapt2/link/XmlReferenceLinker_test.cpp @@ -81,6 +81,7 @@ TEST_F(XmlReferenceLinkerTest, LinkBasicAttributes) { android:layout_width="match_parent" android:background="@color/green" android:text="hello" + android:attr="\?hello" nonAaptAttr="1" nonAaptAttrRef="@id/id" class="hello" />)EOF"); @@ -89,35 +90,40 @@ TEST_F(XmlReferenceLinkerTest, LinkBasicAttributes) { ASSERT_TRUE(linker.Consume(context_.get(), doc.get())); xml::Element* view_el = xml::FindRootElement(doc.get()); - ASSERT_NE(view_el, nullptr); + ASSERT_NE(nullptr, view_el); xml::Attribute* xml_attr = view_el->FindAttribute(xml::kSchemaAndroid, "layout_width"); - ASSERT_NE(xml_attr, nullptr); + ASSERT_NE(nullptr, xml_attr); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute.value().id); - EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), ResourceId(0x01010000)); - ASSERT_NE(xml_attr->compiled_value, nullptr); - ASSERT_NE(ValueCast<BinaryPrimitive>(xml_attr->compiled_value.get()), nullptr); + EXPECT_EQ(ResourceId(0x01010000), xml_attr->compiled_attribute.value().id.value()); + ASSERT_NE(nullptr, xml_attr->compiled_value); + ASSERT_NE(nullptr, ValueCast<BinaryPrimitive>(xml_attr->compiled_value.get())); xml_attr = view_el->FindAttribute(xml::kSchemaAndroid, "background"); - ASSERT_NE(xml_attr, nullptr); + ASSERT_NE(nullptr, xml_attr); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute.value().id); - EXPECT_EQ(xml_attr->compiled_attribute.value().id.value(), ResourceId(0x01010001)); - ASSERT_NE(xml_attr->compiled_value, nullptr); + EXPECT_EQ(ResourceId(0x01010001), xml_attr->compiled_attribute.value().id.value()); + ASSERT_NE(nullptr, xml_attr->compiled_value); Reference* ref = ValueCast<Reference>(xml_attr->compiled_value.get()); - ASSERT_NE(ref, nullptr); + ASSERT_NE(nullptr, ref); AAPT_ASSERT_TRUE(ref->name); - EXPECT_EQ(ref->name.value(), test::ParseNameOrDie("color/green")); // Make sure the name + EXPECT_EQ(test::ParseNameOrDie("color/green"), ref->name.value()); // Make sure the name // didn't change. AAPT_ASSERT_TRUE(ref->id); - EXPECT_EQ(ref->id.value(), ResourceId(0x7f020000)); + EXPECT_EQ(ResourceId(0x7f020000), ref->id.value()); xml_attr = view_el->FindAttribute(xml::kSchemaAndroid, "text"); - ASSERT_NE(xml_attr, nullptr); + ASSERT_NE(nullptr, xml_attr); AAPT_ASSERT_TRUE(xml_attr->compiled_attribute); ASSERT_FALSE(xml_attr->compiled_value); // Strings don't get compiled for memory sake. + xml_attr = view_el->FindAttribute(xml::kSchemaAndroid, "attr"); + ASSERT_NE(nullptr, xml_attr); + AAPT_ASSERT_TRUE(xml_attr->compiled_attribute); + ASSERT_FALSE(xml_attr->compiled_value); // Should be a plain string. + xml_attr = view_el->FindAttribute("", "nonAaptAttr"); ASSERT_NE(nullptr, xml_attr); AAPT_ASSERT_FALSE(xml_attr->compiled_attribute); @@ -131,9 +137,9 @@ TEST_F(XmlReferenceLinkerTest, LinkBasicAttributes) { ASSERT_NE(nullptr, ValueCast<Reference>(xml_attr->compiled_value.get())); xml_attr = view_el->FindAttribute("", "class"); - ASSERT_NE(xml_attr, nullptr); + ASSERT_NE(nullptr, xml_attr); AAPT_ASSERT_FALSE(xml_attr->compiled_attribute); - ASSERT_EQ(xml_attr->compiled_value, nullptr); + ASSERT_EQ(nullptr, xml_attr->compiled_value); } TEST_F(XmlReferenceLinkerTest, PrivateSymbolsAreNotLinked) { diff --git a/tools/aapt2/process/SymbolTable.cpp b/tools/aapt2/process/SymbolTable.cpp index bcafbcabee6c..1a648bf080b5 100644 --- a/tools/aapt2/process/SymbolTable.cpp +++ b/tools/aapt2/process/SymbolTable.cpp @@ -34,6 +34,21 @@ using android::StringPiece; namespace aapt { +SymbolTable::SymbolTable(NameMangler* mangler) + : mangler_(mangler), + delegate_(util::make_unique<DefaultSymbolTableDelegate>()), + cache_(200), + id_cache_(200) { +} + +void SymbolTable::SetDelegate(std::unique_ptr<ISymbolTableDelegate> delegate) { + CHECK(delegate != nullptr) << "can't set a nullptr delegate"; + delegate_ = std::move(delegate); + + // Clear the cache in case this delegate changes the order of lookup. + cache_.clear(); +} + void SymbolTable::AppendSource(std::unique_ptr<ISymbolSource> source) { sources_.push_back(std::move(source)); @@ -75,28 +90,27 @@ const SymbolTable::Symbol* SymbolTable::FindByName(const ResourceName& name) { mangled_name = &mangled_name_impl.value(); } - for (auto& symbolSource : sources_) { - std::unique_ptr<Symbol> symbol = symbolSource->FindByName(*mangled_name); - if (symbol) { - // Take ownership of the symbol into a shared_ptr. We do this because - // LruCache doesn't support unique_ptr. - std::shared_ptr<Symbol> shared_symbol(std::move(symbol)); + std::unique_ptr<Symbol> symbol = delegate_->FindByName(*mangled_name, sources_); + if (symbol == nullptr) { + return nullptr; + } - // Since we look in the cache with the unmangled, but package prefixed - // name, we must put the same name into the cache. - cache_.put(*name_with_package, shared_symbol); + // Take ownership of the symbol into a shared_ptr. We do this because + // LruCache doesn't support unique_ptr. + std::shared_ptr<Symbol> shared_symbol(std::move(symbol)); - if (shared_symbol->id) { - // The symbol has an ID, so we can also cache this! - id_cache_.put(shared_symbol->id.value(), shared_symbol); - } + // Since we look in the cache with the unmangled, but package prefixed + // name, we must put the same name into the cache. + cache_.put(*name_with_package, shared_symbol); - // Returns the raw pointer. Callers are not expected to hold on to this - // between calls to Find*. - return shared_symbol.get(); - } + if (shared_symbol->id) { + // The symbol has an ID, so we can also cache this! + id_cache_.put(shared_symbol->id.value(), shared_symbol); } - return nullptr; + + // Returns the raw pointer. Callers are not expected to hold on to this + // between calls to Find*. + return shared_symbol.get(); } const SymbolTable::Symbol* SymbolTable::FindById(const ResourceId& id) { @@ -105,20 +119,19 @@ const SymbolTable::Symbol* SymbolTable::FindById(const ResourceId& id) { } // We did not find it in the cache, so look through the sources. - for (auto& symbolSource : sources_) { - std::unique_ptr<Symbol> symbol = symbolSource->FindById(id); - if (symbol) { - // Take ownership of the symbol into a shared_ptr. We do this because LruCache - // doesn't support unique_ptr. - std::shared_ptr<Symbol> shared_symbol(std::move(symbol)); - id_cache_.put(id, shared_symbol); - - // Returns the raw pointer. Callers are not expected to hold on to this - // between calls to Find*. - return shared_symbol.get(); - } + std::unique_ptr<Symbol> symbol = delegate_->FindById(id, sources_); + if (symbol == nullptr) { + return nullptr; } - return nullptr; + + // Take ownership of the symbol into a shared_ptr. We do this because LruCache + // doesn't support unique_ptr. + std::shared_ptr<Symbol> shared_symbol(std::move(symbol)); + id_cache_.put(id, shared_symbol); + + // Returns the raw pointer. Callers are not expected to hold on to this + // between calls to Find*. + return shared_symbol.get(); } const SymbolTable::Symbol* SymbolTable::FindByReference(const Reference& ref) { @@ -140,6 +153,28 @@ const SymbolTable::Symbol* SymbolTable::FindByReference(const Reference& ref) { return symbol; } +std::unique_ptr<SymbolTable::Symbol> DefaultSymbolTableDelegate::FindByName( + const ResourceName& name, const std::vector<std::unique_ptr<ISymbolSource>>& sources) { + for (auto& source : sources) { + std::unique_ptr<SymbolTable::Symbol> symbol = source->FindByName(name); + if (symbol) { + return symbol; + } + } + return {}; +} + +std::unique_ptr<SymbolTable::Symbol> DefaultSymbolTableDelegate::FindById( + ResourceId id, const std::vector<std::unique_ptr<ISymbolSource>>& sources) { + for (auto& source : sources) { + std::unique_ptr<SymbolTable::Symbol> symbol = source->FindById(id); + if (symbol) { + return symbol; + } + } + return {}; +} + std::unique_ptr<SymbolTable::Symbol> ResourceTableSymbolSource::FindByName( const ResourceName& name) { Maybe<ResourceTable::SearchResult> result = table_->FindResource(name); diff --git a/tools/aapt2/process/SymbolTable.h b/tools/aapt2/process/SymbolTable.h index 298da4d42c77..bd252d245dc8 100644 --- a/tools/aapt2/process/SymbolTable.h +++ b/tools/aapt2/process/SymbolTable.h @@ -47,6 +47,7 @@ inline android::hash_t hash_type(const ResourceId& id) { } class ISymbolSource; +class ISymbolTableDelegate; class NameMangler; class SymbolTable { @@ -73,7 +74,11 @@ class SymbolTable { bool is_public = false; }; - SymbolTable(NameMangler* mangler) : mangler_(mangler), cache_(200), id_cache_(200) {} + SymbolTable(NameMangler* mangler); + + // Overrides the default ISymbolTableDelegate, which allows a custom defined strategy for + // looking up resources from a set of sources. + void SetDelegate(std::unique_ptr<ISymbolTableDelegate> delegate); // Appends a symbol source. The cache is not cleared since entries that // have already been found would take precedence due to ordering. @@ -99,6 +104,7 @@ class SymbolTable { private: NameMangler* mangler_; + std::unique_ptr<ISymbolTableDelegate> delegate_; std::vector<std::unique_ptr<ISymbolSource>> sources_; // We use shared_ptr because unique_ptr is not supported and @@ -109,11 +115,41 @@ class SymbolTable { DISALLOW_COPY_AND_ASSIGN(SymbolTable); }; -/** - * An interface that a symbol source implements in order to surface symbol - * information - * to the symbol table. - */ +// Allows the customization of the lookup strategy/order of a symbol from a set of +// symbol sources. +class ISymbolTableDelegate { + public: + ISymbolTableDelegate() = default; + virtual ~ISymbolTableDelegate() = default; + + // The name is already mangled and does not need further processing. + virtual std::unique_ptr<SymbolTable::Symbol> FindByName( + const ResourceName& name, const std::vector<std::unique_ptr<ISymbolSource>>& sources) = 0; + + virtual std::unique_ptr<SymbolTable::Symbol> FindById( + ResourceId id, const std::vector<std::unique_ptr<ISymbolSource>>& sources) = 0; + + private: + DISALLOW_COPY_AND_ASSIGN(ISymbolTableDelegate); +}; + +class DefaultSymbolTableDelegate : public ISymbolTableDelegate { + public: + DefaultSymbolTableDelegate() = default; + virtual ~DefaultSymbolTableDelegate() = default; + + virtual std::unique_ptr<SymbolTable::Symbol> FindByName( + const ResourceName& name, + const std::vector<std::unique_ptr<ISymbolSource>>& sources) override; + virtual std::unique_ptr<SymbolTable::Symbol> FindById( + ResourceId id, const std::vector<std::unique_ptr<ISymbolSource>>& sources) override; + + private: + DISALLOW_COPY_AND_ASSIGN(DefaultSymbolTableDelegate); +}; + +// An interface that a symbol source implements in order to surface symbol information +// to the symbol table. class ISymbolSource { public: virtual ~ISymbolSource() = default; @@ -122,9 +158,7 @@ class ISymbolSource { const ResourceName& name) = 0; virtual std::unique_ptr<SymbolTable::Symbol> FindById(ResourceId id) = 0; - /** - * Default implementation tries the name if it exists, else the ID. - */ + // Default implementation tries the name if it exists, else the ID. virtual std::unique_ptr<SymbolTable::Symbol> FindByReference( const Reference& ref) { if (ref.name) { @@ -136,11 +170,9 @@ class ISymbolSource { } }; -/** - * Exposes the resources in a ResourceTable as symbols for SymbolTable. - * Instances of this class must outlive the encompassed ResourceTable. - * Lookups by ID are ignored. - */ +// Exposes the resources in a ResourceTable as symbols for SymbolTable. +// Instances of this class must outlive the encompassed ResourceTable. +// Lookups by ID are ignored. class ResourceTableSymbolSource : public ISymbolSource { public: explicit ResourceTableSymbolSource(ResourceTable* table) : table_(table) {} diff --git a/tools/aapt2/readme.md b/tools/aapt2/readme.md index daf1ebc20461..0291720bb1ac 100644 --- a/tools/aapt2/readme.md +++ b/tools/aapt2/readme.md @@ -1,5 +1,19 @@ # Android Asset Packaging Tool 2.0 (AAPT2) release notes +## Version 2.14 +### `aapt2 link ...` +- If an app is building with a minSdkVersion < 26 and a --package-id XX where XX > 7F, aapt2 + will automatically convert any 'id' resource references from the resource ID 0xPPTTEEEE to + 0x7FPPEEEE. +- This is done to workaround a bug in previous versions of the platform that would validate + a resource ID by assuming it is larger than 0. In Java, a resource ID with package ID greater + than 0x7F is interpreted as a negative number, causing valid feature split IDs like 0x80010000 + to fail the check. +- '@id/foo' resources are just sentinel values and do not actually need to resolve to anything. + Rewriting these resource IDs to use the package ID 7F while maintaining their definitions under + the original package ID is safe. Collisions against the base APK are checked to ensure these + rewritten IDs to not overlap with the base. + ## Version 2.13 ### `aapt2 optimize ...` - aapt2 optimize can now split a binary APK with the same --split parameters as the link diff --git a/tools/aapt2/unflatten/BinaryResourceParser.cpp b/tools/aapt2/unflatten/BinaryResourceParser.cpp index 42786b5387cf..f3116701056b 100644 --- a/tools/aapt2/unflatten/BinaryResourceParser.cpp +++ b/tools/aapt2/unflatten/BinaryResourceParser.cpp @@ -439,11 +439,10 @@ std::unique_ptr<Item> BinaryResourceParser::ParseValue(const ResourceNameRef& na if (file_ref != nullptr) { file_ref->file = files_->FindFile(*file_ref->path); if (file_ref->file == nullptr) { - context_->GetDiagnostics()->Error(DiagMessage() << "resource " << name << " for config '" + context_->GetDiagnostics()->Warn(DiagMessage() << "resource " << name << " for config '" << config << "' is a file reference to '" << *file_ref->path << "' but no such path exists"); - return {}; } } } diff --git a/tools/aapt2/xml/XmlDom.cpp b/tools/aapt2/xml/XmlDom.cpp index 60551901fe8d..98f5f1d06df9 100644 --- a/tools/aapt2/xml/XmlDom.cpp +++ b/tools/aapt2/xml/XmlDom.cpp @@ -42,7 +42,6 @@ struct Stack { std::stack<xml::Node*> node_stack; std::string pending_comment; std::unique_ptr<xml::Text> last_text_node; - util::StringBuilder pending_text; }; /** @@ -66,14 +65,12 @@ static void SplitName(const char* name, std::string* out_ns, static void FinishPendingText(Stack* stack) { if (stack->last_text_node != nullptr) { - if (!stack->pending_text.IsEmpty()) { - stack->last_text_node->text = stack->pending_text.ToString(); - stack->pending_text = {}; + if (!stack->last_text_node->text.empty()) { stack->node_stack.top()->AppendChild(std::move(stack->last_text_node)); } else { // Drop an empty text node. - stack->last_text_node = nullptr; } + stack->last_text_node = nullptr; } } @@ -138,13 +135,11 @@ static void XMLCALL StartElementHandler(void* user_data, const char* name, while (*attrs) { Attribute attribute; SplitName(*attrs++, &attribute.namespace_uri, &attribute.name); - util::StringBuilder builder; - builder.Append(*attrs++); - attribute.value = builder.ToString(); + attribute.value = *attrs++; // Insert in sorted order. - auto iter = std::lower_bound(el->attributes.begin(), el->attributes.end(), - attribute, less_attribute); + auto iter = std::lower_bound(el->attributes.begin(), el->attributes.end(), attribute, + less_attribute); el->attributes.insert(iter, std::move(attribute)); } @@ -173,14 +168,14 @@ static void XMLCALL CharacterDataHandler(void* user_data, const char* s, int len // See if we can just append the text to a previous text node. if (stack->last_text_node != nullptr) { - stack->pending_text.Append(str); + stack->last_text_node->text.append(str.data(), str.size()); return; } stack->last_text_node = util::make_unique<Text>(); stack->last_text_node->line_number = XML_GetCurrentLineNumber(parser); stack->last_text_node->column_number = XML_GetCurrentColumnNumber(parser); - stack->pending_text.Append(str); + stack->last_text_node->text = str.to_string(); } static void XMLCALL CommentDataHandler(void* user_data, const char* comment) { diff --git a/tools/aapt2/xml/XmlDom_test.cpp b/tools/aapt2/xml/XmlDom_test.cpp index 0fc3cec66666..fb18ea316ca6 100644 --- a/tools/aapt2/xml/XmlDom_test.cpp +++ b/tools/aapt2/xml/XmlDom_test.cpp @@ -49,23 +49,26 @@ TEST(XmlDomTest, Inflate) { EXPECT_EQ(ns->namespace_prefix, "android"); } -TEST(XmlDomTest, HandleEscapes) { - std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom( - R"EOF(<shortcode pattern="\\d{5}">\\d{5}</shortcode>)EOF"); +// Escaping is handled after parsing of the values for resource-specific values. +TEST(XmlDomTest, ForwardEscapes) { + std::unique_ptr<xml::XmlResource> doc = test::BuildXmlDom(R"EOF( + <element value="\?hello" pattern="\\d{5}">\\d{5}</element>)EOF"); xml::Element* el = xml::FindRootElement(doc->root.get()); ASSERT_NE(nullptr, el); xml::Attribute* attr = el->FindAttribute({}, "pattern"); ASSERT_NE(nullptr, attr); + EXPECT_EQ("\\\\d{5}", attr->value); - EXPECT_EQ("\\d{5}", attr->value); + attr = el->FindAttribute({}, "value"); + ASSERT_NE(nullptr, attr); + EXPECT_EQ("\\?hello", attr->value); ASSERT_EQ(1u, el->children.size()); - xml::Text* text = xml::NodeCast<xml::Text>(el->children[0].get()); ASSERT_NE(nullptr, text); - EXPECT_EQ("\\d{5}", text->text); + EXPECT_EQ("\\\\d{5}", text->text); } } // namespace aapt |