diff options
963 files changed, 18399 insertions, 5756 deletions
diff --git a/Android.mk b/Android.mk index cf6d946f7406..59b2a46b76af 100644 --- a/Android.mk +++ b/Android.mk @@ -422,6 +422,12 @@ LOCAL_SRC_FILES += \ telephony/java/com/android/ims/internal/IImsUtListener.aidl \ telephony/java/com/android/ims/internal/IImsVideoCallCallback.aidl \ telephony/java/com/android/ims/internal/IImsVideoCallProvider.aidl \ + telephony/java/com/android/ims/internal/uce/uceservice/IUceService.aidl \ + telephony/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl \ + telephony/java/com/android/ims/internal/uce/options/IOptionsService.aidl \ + telephony/java/com/android/ims/internal/uce/options/IOptionsListener.aidl \ + telephony/java/com/android/ims/internal/uce/presence/IPresenceService.aidl \ + telephony/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl \ telephony/java/com/android/ims/ImsConfigListener.aidl \ telephony/java/com/android/internal/telephony/ICarrierConfigLoader.aidl \ telephony/java/com/android/internal/telephony/IMms.aidl \ @@ -1037,7 +1043,7 @@ LOCAL_DROIDDOC_OPTIONS:=\ -hdf android.whichdoc offline \ -referenceonly -LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk-refonly +LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk include $(BUILD_DROIDDOC) diff --git a/api/current.txt b/api/current.txt index a5d8a930e40f..cb5d4b3eafba 100644 --- a/api/current.txt +++ b/api/current.txt @@ -5723,6 +5723,7 @@ package android.app { method public android.graphics.drawable.Drawable getFastDrawable(); method public static android.app.WallpaperManager getInstance(android.content.Context); method public android.os.ParcelFileDescriptor getWallpaperFile(int); + method public int getWallpaperId(int); method public android.app.WallpaperInfo getWallpaperInfo(); method public boolean hasResourceWallpaper(int); method public boolean isWallpaperSettingAllowed(); @@ -5913,7 +5914,7 @@ package android.app.admin { method public boolean setAlwaysOnVpnPackage(android.content.ComponentName, java.lang.String); method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean); method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle); - method public void setApplicationRestrictionsManagingPackage(android.content.ComponentName, java.lang.String); + method public void setApplicationRestrictionsManagingPackage(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException; method public void setAutoTimeRequired(android.content.ComponentName, boolean); method public void setBluetoothContactSharingDisabled(android.content.ComponentName, boolean); method public void setCameraDisabled(android.content.ComponentName, boolean); @@ -7101,9 +7102,10 @@ package android.bluetooth { method public void onServicesDiscovered(android.bluetooth.BluetoothGatt, int); } - public class BluetoothGattCharacteristic { + public class BluetoothGattCharacteristic implements android.os.Parcelable { ctor public BluetoothGattCharacteristic(java.util.UUID, int, int); method public boolean addDescriptor(android.bluetooth.BluetoothGattDescriptor); + method public int describeContents(); method public android.bluetooth.BluetoothGattDescriptor getDescriptor(java.util.UUID); method public java.util.List<android.bluetooth.BluetoothGattDescriptor> getDescriptors(); method public java.lang.Float getFloatValue(int, int); @@ -7121,6 +7123,8 @@ package android.bluetooth { method public boolean setValue(int, int, int, int); method public boolean setValue(java.lang.String); method public void setWriteType(int); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattCharacteristic> CREATOR; field public static final int FORMAT_FLOAT = 52; // 0x34 field public static final int FORMAT_SFLOAT = 50; // 0x32 field public static final int FORMAT_SINT16 = 34; // 0x22 @@ -7151,13 +7155,16 @@ package android.bluetooth { field protected java.util.List<android.bluetooth.BluetoothGattDescriptor> mDescriptors; } - public class BluetoothGattDescriptor { + public class BluetoothGattDescriptor implements android.os.Parcelable { ctor public BluetoothGattDescriptor(java.util.UUID, int); + method public int describeContents(); method public android.bluetooth.BluetoothGattCharacteristic getCharacteristic(); method public int getPermissions(); method public java.util.UUID getUuid(); method public byte[] getValue(); method public boolean setValue(byte[]); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattDescriptor> CREATOR; field public static final byte[] DISABLE_NOTIFICATION_VALUE; field public static final byte[] ENABLE_INDICATION_VALUE; field public static final byte[] ENABLE_NOTIFICATION_VALUE; @@ -7200,16 +7207,19 @@ package android.bluetooth { method public void onServiceAdded(int, android.bluetooth.BluetoothGattService); } - public class BluetoothGattService { + public class BluetoothGattService implements android.os.Parcelable { ctor public BluetoothGattService(java.util.UUID, int); method public boolean addCharacteristic(android.bluetooth.BluetoothGattCharacteristic); method public boolean addService(android.bluetooth.BluetoothGattService); + method public int describeContents(); method public android.bluetooth.BluetoothGattCharacteristic getCharacteristic(java.util.UUID); method public java.util.List<android.bluetooth.BluetoothGattCharacteristic> getCharacteristics(); method public java.util.List<android.bluetooth.BluetoothGattService> getIncludedServices(); method public int getInstanceId(); method public int getType(); method public java.util.UUID getUuid(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattService> CREATOR; field public static final int SERVICE_TYPE_PRIMARY = 0; // 0x0 field public static final int SERVICE_TYPE_SECONDARY = 1; // 0x1 field protected java.util.List<android.bluetooth.BluetoothGattCharacteristic> mCharacteristics; @@ -10101,27 +10111,22 @@ package android.content.res { method public final long skip(long) throws java.io.IOException; } - public class ColorStateList extends android.content.res.ComplexColor implements android.os.Parcelable { + public class ColorStateList implements android.os.Parcelable { ctor public ColorStateList(int[][], int[]); method public static deprecated android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public static android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public int describeContents(); + method public int getChangingConfigurations(); method public int getColorForState(int[], int); method public int getDefaultColor(); method public boolean isOpaque(); + method public boolean isStateful(); method public static android.content.res.ColorStateList valueOf(int); method public android.content.res.ColorStateList withAlpha(int); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.content.res.ColorStateList> CREATOR; } - public abstract class ComplexColor { - ctor public ComplexColor(); - method public int getChangingConfigurations(); - method public abstract int getDefaultColor(); - method public boolean isStateful(); - } - public final class Configuration implements java.lang.Comparable android.os.Parcelable { ctor public Configuration(); ctor public Configuration(android.content.res.Configuration); @@ -10225,11 +10230,6 @@ package android.content.res { field public int uiMode; } - public class GradientColor extends android.content.res.ComplexColor { - method public static android.content.res.GradientColor createFromXml(android.content.res.Resources, android.content.res.XmlResourceParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; - method public int getDefaultColor(); - } - public class ObbInfo implements android.os.Parcelable { method public int describeContents(); method public void writeToParcel(android.os.Parcel, int); @@ -10289,7 +10289,6 @@ package android.content.res { method public void getValue(java.lang.String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException; method public void getValueForDensity(int, int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException; method public android.content.res.XmlResourceParser getXml(int) throws android.content.res.Resources.NotFoundException; - method public android.content.res.ComplexColor loadComplexColor(android.util.TypedValue, int, android.content.res.Resources.Theme); method public final android.content.res.Resources.Theme newTheme(); method public android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]); method public android.content.res.TypedArray obtainTypedArray(int) throws android.content.res.Resources.NotFoundException; @@ -10325,7 +10324,6 @@ package android.content.res { method public int getChangingConfigurations(); method public int getColor(int, int); method public android.content.res.ColorStateList getColorStateList(int); - method public android.content.res.ComplexColor getComplexColor(int); method public float getDimension(int, float); method public int getDimensionPixelOffset(int, int); method public int getDimensionPixelSize(int, int); @@ -17762,9 +17760,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet addAll(java.lang.Iterable<?>); method public android.icu.text.UnicodeSet addAll(T...); method public T addAllTo(T); - method public java.lang.String[] addAllTo(java.lang.String[]); - method public static U addAllTo(java.lang.Iterable<T>, U); - method public static T[] addAllTo(java.lang.Iterable<T>, T[]); method public void addMatchSetTo(android.icu.text.UnicodeSet); method public android.icu.text.UnicodeSet applyIntPropertyValue(int, int); method public final android.icu.text.UnicodeSet applyPattern(java.lang.String); @@ -17778,10 +17773,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet cloneAsThawed(); method public android.icu.text.UnicodeSet closeOver(int); method public android.icu.text.UnicodeSet compact(); - method public static int compare(java.lang.CharSequence, int); - method public static int compare(int, java.lang.CharSequence); - method public static int compare(java.lang.Iterable<T>, java.lang.Iterable<T>); - method public static int compare(java.util.Collection<T>, java.util.Collection<T>, android.icu.text.UnicodeSet.ComparisonStyle); method public int compareTo(android.icu.text.UnicodeSet); method public int compareTo(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet.ComparisonStyle); method public int compareTo(java.lang.Iterable<java.lang.String>); @@ -17824,7 +17815,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet removeAll(android.icu.text.UnicodeSet); method public android.icu.text.UnicodeSet removeAll(java.lang.Iterable<T>); method public final android.icu.text.UnicodeSet removeAllStrings(); - method public static boolean resemblesPattern(java.lang.String, int); method public android.icu.text.UnicodeSet retain(int, int); method public final android.icu.text.UnicodeSet retain(int); method public final android.icu.text.UnicodeSet retain(java.lang.CharSequence); @@ -17839,7 +17829,6 @@ package android.icu.text { method public int spanBack(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition); method public int spanBack(java.lang.CharSequence, int, android.icu.text.UnicodeSet.SpanCondition); method public java.util.Collection<java.lang.String> strings(); - method public static java.lang.String[] toArray(android.icu.text.UnicodeSet); method public java.lang.String toPattern(boolean); field public static final int ADD_CASE_MAPPINGS = 4; // 0x4 field public static final android.icu.text.UnicodeSet ALL_CODE_POINTS; @@ -17958,11 +17947,8 @@ package android.icu.util { ctor protected CECalendar(int, int, int); ctor protected CECalendar(java.util.Date); ctor protected CECalendar(int, int, int, int, int, int); - method public static int ceToJD(long, int, int, int); - method protected abstract int getJDEpochOffset(); method protected int handleComputeMonthStart(int, int, boolean); method protected int handleGetLimit(int, int); - method public static void jdToCE(int, int, int[]); } public abstract class Calendar implements java.lang.Cloneable java.lang.Comparable java.io.Serializable { @@ -18190,7 +18176,6 @@ package android.icu.util { ctor public CopticCalendar(int, int, int); ctor public CopticCalendar(java.util.Date); ctor public CopticCalendar(int, int, int, int, int, int); - method protected deprecated int getJDEpochOffset(); method protected deprecated int handleGetExtendedYear(); field public static final int AMSHIR = 5; // 0x5 field public static final int BABA = 1; // 0x1 @@ -18361,11 +18346,11 @@ package android.icu.util { ctor public IslamicCalendar(java.util.Date); ctor public IslamicCalendar(int, int, int); ctor public IslamicCalendar(int, int, int, int, int, int); + method public android.icu.util.IslamicCalendar.CalculationType getCalculationType(); method protected int handleComputeMonthStart(int, int, boolean); method protected int handleGetExtendedYear(); method protected int handleGetLimit(int, int); - method public boolean isCivil(); - method public void setCivil(boolean); + method public void setCalculationType(android.icu.util.IslamicCalendar.CalculationType); field public static final int DHU_AL_HIJJAH = 11; // 0xb field public static final int DHU_AL_QIDAH = 10; // 0xa field public static final int JUMADA_1 = 4; // 0x4 @@ -18803,7 +18788,6 @@ package android.icu.util { method public int getMicro(); method public int getMilli(); method public int getMinor(); - method public static void main(java.lang.String[]); field public static final android.icu.util.VersionInfo ICU_VERSION; field public static final android.icu.util.VersionInfo UCOL_BUILDER_VERSION; field public static final android.icu.util.VersionInfo UCOL_RUNTIME_VERSION; @@ -19273,9 +19257,6 @@ package android.location { field public static final int STATE_UNKNOWN = 0; // 0x0 } - public static abstract class GnssMeasurement.MultipathIndicator implements java.lang.annotation.Annotation { - } - public final class GnssMeasurementsEvent implements android.os.Parcelable { ctor public GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]); method public int describeContents(); @@ -19294,9 +19275,6 @@ package android.location { method public void onStatusChanged(int); } - public static abstract class GnssMeasurementsEvent.GnssMeasurementsStatus implements java.lang.annotation.Annotation { - } - public final class GnssNavigationMessage implements android.os.Parcelable { method public int describeContents(); method public byte[] getData(); @@ -19322,9 +19300,6 @@ package android.location { field public static final int TYPE_UNKNOWN = 0; // 0x0 } - public static abstract class GnssNavigationMessage.GnssNavigationMessageType implements java.lang.annotation.Annotation { - } - public final class GnssNavigationMessageEvent implements android.os.Parcelable { ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage); method public int describeContents(); @@ -19342,9 +19317,6 @@ package android.location { method public void onStatusChanged(int); } - public static abstract class GnssNavigationMessageEvent.GnssNavigationMessageStatus implements java.lang.annotation.Annotation { - } - public abstract interface GnssNmeaListener { method public abstract void onNmeaReceived(long, java.lang.String); } @@ -19368,9 +19340,6 @@ package android.location { field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0 } - public static abstract class GnssStatus.ConstellationType implements java.lang.annotation.Annotation { - } - public abstract class GnssStatusCallback { ctor public GnssStatusCallback(); method public void onFirstFix(int); @@ -28759,14 +28728,16 @@ package android.os { public class HardwarePropertiesManager { method public android.os.CpuUsageInfo[] getCpuUsages(); - method public float[] getDeviceTemperatures(int); + method public float[] getDeviceTemperatures(int, int); method public float[] getFanSpeeds(); field public static final int DEVICE_TEMPERATURE_BATTERY = 2; // 0x2 field public static final int DEVICE_TEMPERATURE_CPU = 0; // 0x0 field public static final int DEVICE_TEMPERATURE_GPU = 1; // 0x1 - } - - public static abstract class HardwarePropertiesManager.DeviceTemperatureType implements java.lang.annotation.Annotation { + field public static final int DEVICE_TEMPERATURE_SKIN = 3; // 0x3 + field public static final int TEMPERATURE_CURRENT = 0; // 0x0 + field public static final int TEMPERATURE_SHUTDOWN = 2; // 0x2 + field public static final int TEMPERATURE_THROTTLING = 1; // 0x1 + field public static final float UNDEFINED_TEMPERATURE = -3.4028235E38f; } public abstract interface IBinder { @@ -32379,13 +32350,13 @@ package android.provider { field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS"; field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS"; field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS"; + field public static final java.lang.String ACTION_HARD_KEYBOARD_SETTINGS = "android.settings.HARD_KEYBOARD_SETTINGS"; field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS"; field public static final java.lang.String ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS = "android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS"; field public static final java.lang.String ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS = "android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS"; field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS"; field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS"; field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS"; - field public static final java.lang.String ACTION_KEYBOARD_LAYOUT_SETTINGS = "android.settings.KEYBOARD_LAYOUT_SETTINGS"; field public static final java.lang.String ACTION_LOCALE_SETTINGS = "android.settings.LOCALE_SETTINGS"; field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS"; @@ -35037,6 +35008,7 @@ package android.service.vr { ctor public VrListenerService(); method public static final boolean isVrModePackageEnabled(android.content.Context, android.content.ComponentName); method public android.os.IBinder onBind(android.content.Intent); + method public void onCurrentVrActivityChanged(android.content.ComponentName); field public static final java.lang.String SERVICE_INTERFACE = "android.service.vr.VrListenerService"; } @@ -36731,11 +36703,10 @@ package android.telephony { method public void notifyConfigChanged(int); method public deprecated void notifyConfigChangedForSubId(int); field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED"; - field public static final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls"; - field public static final java.lang.String BOOL_ALLOW_VIDEO_PAUSE = "bool_allow_video_pause"; field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool"; field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool"; field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool"; + field public static final java.lang.String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool"; field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool"; field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool"; field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool"; @@ -39778,8 +39749,10 @@ package android.text.util { method public static final boolean addLinks(android.widget.TextView, int); method public static final void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String); method public static final void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); + method public static final void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String, java.lang.String[], android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String); method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); + method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, java.lang.String[], android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); field public static final int ALL = 15; // 0xf field public static final int EMAIL_ADDRESSES = 2; // 0x2 field public static final int MAP_ADDRESSES = 8; // 0x8 diff --git a/api/system-current.txt b/api/system-current.txt index 97b7710edec8..a59a704eacf7 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -5857,6 +5857,7 @@ package android.app { method public android.graphics.drawable.Drawable getFastDrawable(); method public static android.app.WallpaperManager getInstance(android.content.Context); method public android.os.ParcelFileDescriptor getWallpaperFile(int); + method public int getWallpaperId(int); method public android.app.WallpaperInfo getWallpaperInfo(); method public boolean hasResourceWallpaper(int); method public boolean isWallpaperSettingAllowed(); @@ -6061,7 +6062,7 @@ package android.app.admin { method public boolean setAlwaysOnVpnPackage(android.content.ComponentName, java.lang.String); method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean); method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle); - method public void setApplicationRestrictionsManagingPackage(android.content.ComponentName, java.lang.String); + method public void setApplicationRestrictionsManagingPackage(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException; method public void setAutoTimeRequired(android.content.ComponentName, boolean); method public void setBluetoothContactSharingDisabled(android.content.ComponentName, boolean); method public void setCameraDisabled(android.content.ComponentName, boolean); @@ -7376,9 +7377,10 @@ package android.bluetooth { method public void onServicesDiscovered(android.bluetooth.BluetoothGatt, int); } - public class BluetoothGattCharacteristic { + public class BluetoothGattCharacteristic implements android.os.Parcelable { ctor public BluetoothGattCharacteristic(java.util.UUID, int, int); method public boolean addDescriptor(android.bluetooth.BluetoothGattDescriptor); + method public int describeContents(); method public android.bluetooth.BluetoothGattDescriptor getDescriptor(java.util.UUID); method public java.util.List<android.bluetooth.BluetoothGattDescriptor> getDescriptors(); method public java.lang.Float getFloatValue(int, int); @@ -7396,6 +7398,8 @@ package android.bluetooth { method public boolean setValue(int, int, int, int); method public boolean setValue(java.lang.String); method public void setWriteType(int); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattCharacteristic> CREATOR; field public static final int FORMAT_FLOAT = 52; // 0x34 field public static final int FORMAT_SFLOAT = 50; // 0x32 field public static final int FORMAT_SINT16 = 34; // 0x22 @@ -7426,13 +7430,16 @@ package android.bluetooth { field protected java.util.List<android.bluetooth.BluetoothGattDescriptor> mDescriptors; } - public class BluetoothGattDescriptor { + public class BluetoothGattDescriptor implements android.os.Parcelable { ctor public BluetoothGattDescriptor(java.util.UUID, int); + method public int describeContents(); method public android.bluetooth.BluetoothGattCharacteristic getCharacteristic(); method public int getPermissions(); method public java.util.UUID getUuid(); method public byte[] getValue(); method public boolean setValue(byte[]); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattDescriptor> CREATOR; field public static final byte[] DISABLE_NOTIFICATION_VALUE; field public static final byte[] ENABLE_INDICATION_VALUE; field public static final byte[] ENABLE_NOTIFICATION_VALUE; @@ -7475,16 +7482,19 @@ package android.bluetooth { method public void onServiceAdded(int, android.bluetooth.BluetoothGattService); } - public class BluetoothGattService { + public class BluetoothGattService implements android.os.Parcelable { ctor public BluetoothGattService(java.util.UUID, int); method public boolean addCharacteristic(android.bluetooth.BluetoothGattCharacteristic); method public boolean addService(android.bluetooth.BluetoothGattService); + method public int describeContents(); method public android.bluetooth.BluetoothGattCharacteristic getCharacteristic(java.util.UUID); method public java.util.List<android.bluetooth.BluetoothGattCharacteristic> getCharacteristics(); method public java.util.List<android.bluetooth.BluetoothGattService> getIncludedServices(); method public int getInstanceId(); method public int getType(); method public java.util.UUID getUuid(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattService> CREATOR; field public static final int SERVICE_TYPE_PRIMARY = 0; // 0x0 field public static final int SERVICE_TYPE_SECONDARY = 1; // 0x1 field protected java.util.List<android.bluetooth.BluetoothGattCharacteristic> mCharacteristics; @@ -10499,27 +10509,22 @@ package android.content.res { method public final long skip(long) throws java.io.IOException; } - public class ColorStateList extends android.content.res.ComplexColor implements android.os.Parcelable { + public class ColorStateList implements android.os.Parcelable { ctor public ColorStateList(int[][], int[]); method public static deprecated android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public static android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public int describeContents(); + method public int getChangingConfigurations(); method public int getColorForState(int[], int); method public int getDefaultColor(); method public boolean isOpaque(); + method public boolean isStateful(); method public static android.content.res.ColorStateList valueOf(int); method public android.content.res.ColorStateList withAlpha(int); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.content.res.ColorStateList> CREATOR; } - public abstract class ComplexColor { - ctor public ComplexColor(); - method public int getChangingConfigurations(); - method public abstract int getDefaultColor(); - method public boolean isStateful(); - } - public final class Configuration implements java.lang.Comparable android.os.Parcelable { ctor public Configuration(); ctor public Configuration(android.content.res.Configuration); @@ -10623,11 +10628,6 @@ package android.content.res { field public int uiMode; } - public class GradientColor extends android.content.res.ComplexColor { - method public static android.content.res.GradientColor createFromXml(android.content.res.Resources, android.content.res.XmlResourceParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; - method public int getDefaultColor(); - } - public class ObbInfo implements android.os.Parcelable { method public int describeContents(); method public void writeToParcel(android.os.Parcel, int); @@ -10687,7 +10687,6 @@ package android.content.res { method public void getValue(java.lang.String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException; method public void getValueForDensity(int, int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException; method public android.content.res.XmlResourceParser getXml(int) throws android.content.res.Resources.NotFoundException; - method public android.content.res.ComplexColor loadComplexColor(android.util.TypedValue, int, android.content.res.Resources.Theme); method public final android.content.res.Resources.Theme newTheme(); method public android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]); method public android.content.res.TypedArray obtainTypedArray(int) throws android.content.res.Resources.NotFoundException; @@ -10723,7 +10722,6 @@ package android.content.res { method public int getChangingConfigurations(); method public int getColor(int, int); method public android.content.res.ColorStateList getColorStateList(int); - method public android.content.res.ComplexColor getComplexColor(int); method public float getDimension(int, float); method public int getDimensionPixelOffset(int, int); method public int getDimensionPixelSize(int, int); @@ -15279,19 +15277,19 @@ package android.hardware.location { method public android.hardware.location.ContextHubInfo getContextHubInfo(int); method public android.hardware.location.NanoAppInstanceInfo getNanoAppInstanceInfo(int); method public int loadNanoApp(int, android.hardware.location.NanoApp); - method public int registerContextHubCallback(android.hardware.location.ContextHubManager.ContextHubCallback); - method public int registerContextHubCallback(android.hardware.location.ContextHubManager.ContextHubCallback, android.os.Handler); + method public int registerCallback(android.hardware.location.ContextHubManager.Callback); + method public int registerCallback(android.hardware.location.ContextHubManager.Callback, android.os.Handler); method public int sendMessage(int, int, android.hardware.location.ContextHubMessage); method public int unloadNanoApp(int); - method public int unregisterContextHubCallback(android.hardware.location.ContextHubManager.ContextHubCallback); + method public int unregisterCallback(android.hardware.location.ContextHubManager.Callback); field public static final int ANY_HUB = -1; // 0xffffffff field public static final int MSG_DATA_SEND = 3; // 0x3 field public static final int MSG_LOAD_NANO_APP = 1; // 0x1 field public static final int MSG_UNLOAD_NANO_APP = 2; // 0x2 } - public static abstract class ContextHubManager.ContextHubCallback { - ctor protected ContextHubManager.ContextHubCallback(); + public static abstract class ContextHubManager.Callback { + ctor protected ContextHubManager.Callback(); method public abstract void onMessageReceipt(int, int, android.hardware.location.ContextHubMessage); } @@ -18934,9 +18932,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet addAll(java.lang.Iterable<?>); method public android.icu.text.UnicodeSet addAll(T...); method public T addAllTo(T); - method public java.lang.String[] addAllTo(java.lang.String[]); - method public static U addAllTo(java.lang.Iterable<T>, U); - method public static T[] addAllTo(java.lang.Iterable<T>, T[]); method public void addMatchSetTo(android.icu.text.UnicodeSet); method public android.icu.text.UnicodeSet applyIntPropertyValue(int, int); method public final android.icu.text.UnicodeSet applyPattern(java.lang.String); @@ -18950,10 +18945,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet cloneAsThawed(); method public android.icu.text.UnicodeSet closeOver(int); method public android.icu.text.UnicodeSet compact(); - method public static int compare(java.lang.CharSequence, int); - method public static int compare(int, java.lang.CharSequence); - method public static int compare(java.lang.Iterable<T>, java.lang.Iterable<T>); - method public static int compare(java.util.Collection<T>, java.util.Collection<T>, android.icu.text.UnicodeSet.ComparisonStyle); method public int compareTo(android.icu.text.UnicodeSet); method public int compareTo(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet.ComparisonStyle); method public int compareTo(java.lang.Iterable<java.lang.String>); @@ -18996,7 +18987,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet removeAll(android.icu.text.UnicodeSet); method public android.icu.text.UnicodeSet removeAll(java.lang.Iterable<T>); method public final android.icu.text.UnicodeSet removeAllStrings(); - method public static boolean resemblesPattern(java.lang.String, int); method public android.icu.text.UnicodeSet retain(int, int); method public final android.icu.text.UnicodeSet retain(int); method public final android.icu.text.UnicodeSet retain(java.lang.CharSequence); @@ -19011,7 +19001,6 @@ package android.icu.text { method public int spanBack(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition); method public int spanBack(java.lang.CharSequence, int, android.icu.text.UnicodeSet.SpanCondition); method public java.util.Collection<java.lang.String> strings(); - method public static java.lang.String[] toArray(android.icu.text.UnicodeSet); method public java.lang.String toPattern(boolean); field public static final int ADD_CASE_MAPPINGS = 4; // 0x4 field public static final android.icu.text.UnicodeSet ALL_CODE_POINTS; @@ -19130,11 +19119,8 @@ package android.icu.util { ctor protected CECalendar(int, int, int); ctor protected CECalendar(java.util.Date); ctor protected CECalendar(int, int, int, int, int, int); - method public static int ceToJD(long, int, int, int); - method protected abstract int getJDEpochOffset(); method protected int handleComputeMonthStart(int, int, boolean); method protected int handleGetLimit(int, int); - method public static void jdToCE(int, int, int[]); } public abstract class Calendar implements java.lang.Cloneable java.lang.Comparable java.io.Serializable { @@ -19362,7 +19348,6 @@ package android.icu.util { ctor public CopticCalendar(int, int, int); ctor public CopticCalendar(java.util.Date); ctor public CopticCalendar(int, int, int, int, int, int); - method protected deprecated int getJDEpochOffset(); method protected deprecated int handleGetExtendedYear(); field public static final int AMSHIR = 5; // 0x5 field public static final int BABA = 1; // 0x1 @@ -19533,11 +19518,11 @@ package android.icu.util { ctor public IslamicCalendar(java.util.Date); ctor public IslamicCalendar(int, int, int); ctor public IslamicCalendar(int, int, int, int, int, int); + method public android.icu.util.IslamicCalendar.CalculationType getCalculationType(); method protected int handleComputeMonthStart(int, int, boolean); method protected int handleGetExtendedYear(); method protected int handleGetLimit(int, int); - method public boolean isCivil(); - method public void setCivil(boolean); + method public void setCalculationType(android.icu.util.IslamicCalendar.CalculationType); field public static final int DHU_AL_HIJJAH = 11; // 0xb field public static final int DHU_AL_QIDAH = 10; // 0xa field public static final int JUMADA_1 = 4; // 0x4 @@ -19975,7 +19960,6 @@ package android.icu.util { method public int getMicro(); method public int getMilli(); method public int getMinor(); - method public static void main(java.lang.String[]); field public static final android.icu.util.VersionInfo ICU_VERSION; field public static final android.icu.util.VersionInfo UCOL_BUILDER_VERSION; field public static final android.icu.util.VersionInfo UCOL_RUNTIME_VERSION; @@ -20445,9 +20429,6 @@ package android.location { field public static final int STATE_UNKNOWN = 0; // 0x0 } - public static abstract class GnssMeasurement.MultipathIndicator implements java.lang.annotation.Annotation { - } - public final class GnssMeasurementsEvent implements android.os.Parcelable { ctor public GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]); method public int describeContents(); @@ -20466,9 +20447,6 @@ package android.location { method public void onStatusChanged(int); } - public static abstract class GnssMeasurementsEvent.GnssMeasurementsStatus implements java.lang.annotation.Annotation { - } - public final class GnssNavigationMessage implements android.os.Parcelable { method public int describeContents(); method public byte[] getData(); @@ -20494,9 +20472,6 @@ package android.location { field public static final int TYPE_UNKNOWN = 0; // 0x0 } - public static abstract class GnssNavigationMessage.GnssNavigationMessageType implements java.lang.annotation.Annotation { - } - public final class GnssNavigationMessageEvent implements android.os.Parcelable { ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage); method public int describeContents(); @@ -20514,9 +20489,6 @@ package android.location { method public void onStatusChanged(int); } - public static abstract class GnssNavigationMessageEvent.GnssNavigationMessageStatus implements java.lang.annotation.Annotation { - } - public abstract interface GnssNmeaListener { method public abstract void onNmeaReceived(long, java.lang.String); } @@ -20540,9 +20512,6 @@ package android.location { field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0 } - public static abstract class GnssStatus.ConstellationType implements java.lang.annotation.Annotation { - } - public abstract class GnssStatusCallback { ctor public GnssStatusCallback(); method public void onFirstFix(int); @@ -31002,14 +30971,16 @@ package android.os { public class HardwarePropertiesManager { method public android.os.CpuUsageInfo[] getCpuUsages(); - method public float[] getDeviceTemperatures(int); + method public float[] getDeviceTemperatures(int, int); method public float[] getFanSpeeds(); field public static final int DEVICE_TEMPERATURE_BATTERY = 2; // 0x2 field public static final int DEVICE_TEMPERATURE_CPU = 0; // 0x0 field public static final int DEVICE_TEMPERATURE_GPU = 1; // 0x1 - } - - public static abstract class HardwarePropertiesManager.DeviceTemperatureType implements java.lang.annotation.Annotation { + field public static final int DEVICE_TEMPERATURE_SKIN = 3; // 0x3 + field public static final int TEMPERATURE_CURRENT = 0; // 0x0 + field public static final int TEMPERATURE_SHUTDOWN = 2; // 0x2 + field public static final int TEMPERATURE_THROTTLING = 1; // 0x1 + field public static final float UNDEFINED_TEMPERATURE = -3.4028235E38f; } public abstract interface IBinder { @@ -31673,6 +31644,7 @@ package android.os { method public android.os.Bundle getUserRestrictions(android.os.UserHandle); method public boolean hasUserRestriction(java.lang.String); method public boolean isManagedProfile(); + method public boolean isManagedProfile(int); method public boolean isQuietModeEnabled(android.os.UserHandle); method public boolean isSystemUser(); method public boolean isUserAGoat(); @@ -34825,13 +34797,13 @@ package android.provider { field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS"; field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS"; field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS"; + field public static final java.lang.String ACTION_HARD_KEYBOARD_SETTINGS = "android.settings.HARD_KEYBOARD_SETTINGS"; field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS"; field public static final java.lang.String ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS = "android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS"; field public static final java.lang.String ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS = "android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS"; field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS"; field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS"; field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS"; - field public static final java.lang.String ACTION_KEYBOARD_LAYOUT_SETTINGS = "android.settings.KEYBOARD_LAYOUT_SETTINGS"; field public static final java.lang.String ACTION_LOCALE_SETTINGS = "android.settings.LOCALE_SETTINGS"; field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS"; @@ -37580,6 +37552,7 @@ package android.service.vr { ctor public VrListenerService(); method public static final boolean isVrModePackageEnabled(android.content.Context, android.content.ComponentName); method public android.os.IBinder onBind(android.content.Intent); + method public void onCurrentVrActivityChanged(android.content.ComponentName); field public static final java.lang.String SERVICE_INTERFACE = "android.service.vr.VrListenerService"; } @@ -39392,11 +39365,10 @@ package android.telephony { method public deprecated void notifyConfigChangedForSubId(int); method public void updateConfigForPhoneId(int, java.lang.String); field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED"; - field public static final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls"; - field public static final java.lang.String BOOL_ALLOW_VIDEO_PAUSE = "bool_allow_video_pause"; field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool"; field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool"; field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool"; + field public static final java.lang.String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool"; field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool"; field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool"; field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool"; @@ -42503,8 +42475,10 @@ package android.text.util { method public static final boolean addLinks(android.widget.TextView, int); method public static final void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String); method public static final void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); + method public static final void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String, java.lang.String[], android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String); method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); + method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, java.lang.String[], android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); field public static final int ALL = 15; // 0xf field public static final int EMAIL_ADDRESSES = 2; // 0x2 field public static final int MAP_ADDRESSES = 8; // 0x8 diff --git a/api/test-current.txt b/api/test-current.txt index fa2669c26435..87e6e532be6b 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -5727,6 +5727,7 @@ package android.app { method public android.graphics.drawable.Drawable getFastDrawable(); method public static android.app.WallpaperManager getInstance(android.content.Context); method public android.os.ParcelFileDescriptor getWallpaperFile(int); + method public int getWallpaperId(int); method public android.app.WallpaperInfo getWallpaperInfo(); method public boolean hasResourceWallpaper(int); method public boolean isWallpaperSettingAllowed(); @@ -5917,7 +5918,7 @@ package android.app.admin { method public boolean setAlwaysOnVpnPackage(android.content.ComponentName, java.lang.String); method public boolean setApplicationHidden(android.content.ComponentName, java.lang.String, boolean); method public void setApplicationRestrictions(android.content.ComponentName, java.lang.String, android.os.Bundle); - method public void setApplicationRestrictionsManagingPackage(android.content.ComponentName, java.lang.String); + method public void setApplicationRestrictionsManagingPackage(android.content.ComponentName, java.lang.String) throws android.content.pm.PackageManager.NameNotFoundException; method public void setAutoTimeRequired(android.content.ComponentName, boolean); method public void setBluetoothContactSharingDisabled(android.content.ComponentName, boolean); method public void setCameraDisabled(android.content.ComponentName, boolean); @@ -7105,9 +7106,10 @@ package android.bluetooth { method public void onServicesDiscovered(android.bluetooth.BluetoothGatt, int); } - public class BluetoothGattCharacteristic { + public class BluetoothGattCharacteristic implements android.os.Parcelable { ctor public BluetoothGattCharacteristic(java.util.UUID, int, int); method public boolean addDescriptor(android.bluetooth.BluetoothGattDescriptor); + method public int describeContents(); method public android.bluetooth.BluetoothGattDescriptor getDescriptor(java.util.UUID); method public java.util.List<android.bluetooth.BluetoothGattDescriptor> getDescriptors(); method public java.lang.Float getFloatValue(int, int); @@ -7125,6 +7127,8 @@ package android.bluetooth { method public boolean setValue(int, int, int, int); method public boolean setValue(java.lang.String); method public void setWriteType(int); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattCharacteristic> CREATOR; field public static final int FORMAT_FLOAT = 52; // 0x34 field public static final int FORMAT_SFLOAT = 50; // 0x32 field public static final int FORMAT_SINT16 = 34; // 0x22 @@ -7155,13 +7159,16 @@ package android.bluetooth { field protected java.util.List<android.bluetooth.BluetoothGattDescriptor> mDescriptors; } - public class BluetoothGattDescriptor { + public class BluetoothGattDescriptor implements android.os.Parcelable { ctor public BluetoothGattDescriptor(java.util.UUID, int); + method public int describeContents(); method public android.bluetooth.BluetoothGattCharacteristic getCharacteristic(); method public int getPermissions(); method public java.util.UUID getUuid(); method public byte[] getValue(); method public boolean setValue(byte[]); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattDescriptor> CREATOR; field public static final byte[] DISABLE_NOTIFICATION_VALUE; field public static final byte[] ENABLE_INDICATION_VALUE; field public static final byte[] ENABLE_NOTIFICATION_VALUE; @@ -7204,16 +7211,19 @@ package android.bluetooth { method public void onServiceAdded(int, android.bluetooth.BluetoothGattService); } - public class BluetoothGattService { + public class BluetoothGattService implements android.os.Parcelable { ctor public BluetoothGattService(java.util.UUID, int); method public boolean addCharacteristic(android.bluetooth.BluetoothGattCharacteristic); method public boolean addService(android.bluetooth.BluetoothGattService); + method public int describeContents(); method public android.bluetooth.BluetoothGattCharacteristic getCharacteristic(java.util.UUID); method public java.util.List<android.bluetooth.BluetoothGattCharacteristic> getCharacteristics(); method public java.util.List<android.bluetooth.BluetoothGattService> getIncludedServices(); method public int getInstanceId(); method public int getType(); method public java.util.UUID getUuid(); + method public void writeToParcel(android.os.Parcel, int); + field public static final android.os.Parcelable.Creator<android.bluetooth.BluetoothGattService> CREATOR; field public static final int SERVICE_TYPE_PRIMARY = 0; // 0x0 field public static final int SERVICE_TYPE_SECONDARY = 1; // 0x1 field protected java.util.List<android.bluetooth.BluetoothGattCharacteristic> mCharacteristics; @@ -10111,27 +10121,22 @@ package android.content.res { method public final long skip(long) throws java.io.IOException; } - public class ColorStateList extends android.content.res.ComplexColor implements android.os.Parcelable { + public class ColorStateList implements android.os.Parcelable { ctor public ColorStateList(int[][], int[]); method public static deprecated android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public static android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; method public int describeContents(); + method public int getChangingConfigurations(); method public int getColorForState(int[], int); method public int getDefaultColor(); method public boolean isOpaque(); + method public boolean isStateful(); method public static android.content.res.ColorStateList valueOf(int); method public android.content.res.ColorStateList withAlpha(int); method public void writeToParcel(android.os.Parcel, int); field public static final android.os.Parcelable.Creator<android.content.res.ColorStateList> CREATOR; } - public abstract class ComplexColor { - ctor public ComplexColor(); - method public int getChangingConfigurations(); - method public abstract int getDefaultColor(); - method public boolean isStateful(); - } - public final class Configuration implements java.lang.Comparable android.os.Parcelable { ctor public Configuration(); ctor public Configuration(android.content.res.Configuration); @@ -10235,11 +10240,6 @@ package android.content.res { field public int uiMode; } - public class GradientColor extends android.content.res.ComplexColor { - method public static android.content.res.GradientColor createFromXml(android.content.res.Resources, android.content.res.XmlResourceParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException; - method public int getDefaultColor(); - } - public class ObbInfo implements android.os.Parcelable { method public int describeContents(); method public void writeToParcel(android.os.Parcel, int); @@ -10299,7 +10299,6 @@ package android.content.res { method public void getValue(java.lang.String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException; method public void getValueForDensity(int, int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException; method public android.content.res.XmlResourceParser getXml(int) throws android.content.res.Resources.NotFoundException; - method public android.content.res.ComplexColor loadComplexColor(android.util.TypedValue, int, android.content.res.Resources.Theme); method public final android.content.res.Resources.Theme newTheme(); method public android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]); method public android.content.res.TypedArray obtainTypedArray(int) throws android.content.res.Resources.NotFoundException; @@ -10335,7 +10334,6 @@ package android.content.res { method public int getChangingConfigurations(); method public int getColor(int, int); method public android.content.res.ColorStateList getColorStateList(int); - method public android.content.res.ComplexColor getComplexColor(int); method public float getDimension(int, float); method public int getDimensionPixelOffset(int, int); method public int getDimensionPixelSize(int, int); @@ -17772,9 +17770,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet addAll(java.lang.Iterable<?>); method public android.icu.text.UnicodeSet addAll(T...); method public T addAllTo(T); - method public java.lang.String[] addAllTo(java.lang.String[]); - method public static U addAllTo(java.lang.Iterable<T>, U); - method public static T[] addAllTo(java.lang.Iterable<T>, T[]); method public void addMatchSetTo(android.icu.text.UnicodeSet); method public android.icu.text.UnicodeSet applyIntPropertyValue(int, int); method public final android.icu.text.UnicodeSet applyPattern(java.lang.String); @@ -17788,10 +17783,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet cloneAsThawed(); method public android.icu.text.UnicodeSet closeOver(int); method public android.icu.text.UnicodeSet compact(); - method public static int compare(java.lang.CharSequence, int); - method public static int compare(int, java.lang.CharSequence); - method public static int compare(java.lang.Iterable<T>, java.lang.Iterable<T>); - method public static int compare(java.util.Collection<T>, java.util.Collection<T>, android.icu.text.UnicodeSet.ComparisonStyle); method public int compareTo(android.icu.text.UnicodeSet); method public int compareTo(android.icu.text.UnicodeSet, android.icu.text.UnicodeSet.ComparisonStyle); method public int compareTo(java.lang.Iterable<java.lang.String>); @@ -17834,7 +17825,6 @@ package android.icu.text { method public android.icu.text.UnicodeSet removeAll(android.icu.text.UnicodeSet); method public android.icu.text.UnicodeSet removeAll(java.lang.Iterable<T>); method public final android.icu.text.UnicodeSet removeAllStrings(); - method public static boolean resemblesPattern(java.lang.String, int); method public android.icu.text.UnicodeSet retain(int, int); method public final android.icu.text.UnicodeSet retain(int); method public final android.icu.text.UnicodeSet retain(java.lang.CharSequence); @@ -17849,7 +17839,6 @@ package android.icu.text { method public int spanBack(java.lang.CharSequence, android.icu.text.UnicodeSet.SpanCondition); method public int spanBack(java.lang.CharSequence, int, android.icu.text.UnicodeSet.SpanCondition); method public java.util.Collection<java.lang.String> strings(); - method public static java.lang.String[] toArray(android.icu.text.UnicodeSet); method public java.lang.String toPattern(boolean); field public static final int ADD_CASE_MAPPINGS = 4; // 0x4 field public static final android.icu.text.UnicodeSet ALL_CODE_POINTS; @@ -17968,11 +17957,8 @@ package android.icu.util { ctor protected CECalendar(int, int, int); ctor protected CECalendar(java.util.Date); ctor protected CECalendar(int, int, int, int, int, int); - method public static int ceToJD(long, int, int, int); - method protected abstract int getJDEpochOffset(); method protected int handleComputeMonthStart(int, int, boolean); method protected int handleGetLimit(int, int); - method public static void jdToCE(int, int, int[]); } public abstract class Calendar implements java.lang.Cloneable java.lang.Comparable java.io.Serializable { @@ -18200,7 +18186,6 @@ package android.icu.util { ctor public CopticCalendar(int, int, int); ctor public CopticCalendar(java.util.Date); ctor public CopticCalendar(int, int, int, int, int, int); - method protected deprecated int getJDEpochOffset(); method protected deprecated int handleGetExtendedYear(); field public static final int AMSHIR = 5; // 0x5 field public static final int BABA = 1; // 0x1 @@ -18371,11 +18356,11 @@ package android.icu.util { ctor public IslamicCalendar(java.util.Date); ctor public IslamicCalendar(int, int, int); ctor public IslamicCalendar(int, int, int, int, int, int); + method public android.icu.util.IslamicCalendar.CalculationType getCalculationType(); method protected int handleComputeMonthStart(int, int, boolean); method protected int handleGetExtendedYear(); method protected int handleGetLimit(int, int); - method public boolean isCivil(); - method public void setCivil(boolean); + method public void setCalculationType(android.icu.util.IslamicCalendar.CalculationType); field public static final int DHU_AL_HIJJAH = 11; // 0xb field public static final int DHU_AL_QIDAH = 10; // 0xa field public static final int JUMADA_1 = 4; // 0x4 @@ -18813,7 +18798,6 @@ package android.icu.util { method public int getMicro(); method public int getMilli(); method public int getMinor(); - method public static void main(java.lang.String[]); field public static final android.icu.util.VersionInfo ICU_VERSION; field public static final android.icu.util.VersionInfo UCOL_BUILDER_VERSION; field public static final android.icu.util.VersionInfo UCOL_RUNTIME_VERSION; @@ -19328,9 +19312,6 @@ package android.location { field public static final int STATE_UNKNOWN = 0; // 0x0 } - public static abstract class GnssMeasurement.MultipathIndicator implements java.lang.annotation.Annotation { - } - public final class GnssMeasurementsEvent implements android.os.Parcelable { ctor public GnssMeasurementsEvent(android.location.GnssClock, android.location.GnssMeasurement[]); method public int describeContents(); @@ -19349,9 +19330,6 @@ package android.location { method public void onStatusChanged(int); } - public static abstract class GnssMeasurementsEvent.GnssMeasurementsStatus implements java.lang.annotation.Annotation { - } - public final class GnssNavigationMessage implements android.os.Parcelable { ctor public GnssNavigationMessage(); method public int describeContents(); @@ -19386,9 +19364,6 @@ package android.location { field public static final int TYPE_UNKNOWN = 0; // 0x0 } - public static abstract class GnssNavigationMessage.GnssNavigationMessageType implements java.lang.annotation.Annotation { - } - public final class GnssNavigationMessageEvent implements android.os.Parcelable { ctor public GnssNavigationMessageEvent(android.location.GnssNavigationMessage); method public int describeContents(); @@ -19406,9 +19381,6 @@ package android.location { method public void onStatusChanged(int); } - public static abstract class GnssNavigationMessageEvent.GnssNavigationMessageStatus implements java.lang.annotation.Annotation { - } - public abstract interface GnssNmeaListener { method public abstract void onNmeaReceived(long, java.lang.String); } @@ -19432,9 +19404,6 @@ package android.location { field public static final int CONSTELLATION_UNKNOWN = 0; // 0x0 } - public static abstract class GnssStatus.ConstellationType implements java.lang.annotation.Annotation { - } - public abstract class GnssStatusCallback { ctor public GnssStatusCallback(); method public void onFirstFix(int); @@ -28824,14 +28793,16 @@ package android.os { public class HardwarePropertiesManager { method public android.os.CpuUsageInfo[] getCpuUsages(); - method public float[] getDeviceTemperatures(int); + method public float[] getDeviceTemperatures(int, int); method public float[] getFanSpeeds(); field public static final int DEVICE_TEMPERATURE_BATTERY = 2; // 0x2 field public static final int DEVICE_TEMPERATURE_CPU = 0; // 0x0 field public static final int DEVICE_TEMPERATURE_GPU = 1; // 0x1 - } - - public static abstract class HardwarePropertiesManager.DeviceTemperatureType implements java.lang.annotation.Annotation { + field public static final int DEVICE_TEMPERATURE_SKIN = 3; // 0x3 + field public static final int TEMPERATURE_CURRENT = 0; // 0x0 + field public static final int TEMPERATURE_SHUTDOWN = 2; // 0x2 + field public static final int TEMPERATURE_THROTTLING = 1; // 0x1 + field public static final float UNDEFINED_TEMPERATURE = -3.4028235E38f; } public abstract interface IBinder { @@ -32448,13 +32419,13 @@ package android.provider { field public static final java.lang.String ACTION_DEVICE_INFO_SETTINGS = "android.settings.DEVICE_INFO_SETTINGS"; field public static final java.lang.String ACTION_DISPLAY_SETTINGS = "android.settings.DISPLAY_SETTINGS"; field public static final java.lang.String ACTION_DREAM_SETTINGS = "android.settings.DREAM_SETTINGS"; + field public static final java.lang.String ACTION_HARD_KEYBOARD_SETTINGS = "android.settings.HARD_KEYBOARD_SETTINGS"; field public static final java.lang.String ACTION_HOME_SETTINGS = "android.settings.HOME_SETTINGS"; field public static final java.lang.String ACTION_IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS = "android.settings.IGNORE_BACKGROUND_DATA_RESTRICTIONS_SETTINGS"; field public static final java.lang.String ACTION_IGNORE_BATTERY_OPTIMIZATION_SETTINGS = "android.settings.IGNORE_BATTERY_OPTIMIZATION_SETTINGS"; field public static final java.lang.String ACTION_INPUT_METHOD_SETTINGS = "android.settings.INPUT_METHOD_SETTINGS"; field public static final java.lang.String ACTION_INPUT_METHOD_SUBTYPE_SETTINGS = "android.settings.INPUT_METHOD_SUBTYPE_SETTINGS"; field public static final java.lang.String ACTION_INTERNAL_STORAGE_SETTINGS = "android.settings.INTERNAL_STORAGE_SETTINGS"; - field public static final java.lang.String ACTION_KEYBOARD_LAYOUT_SETTINGS = "android.settings.KEYBOARD_LAYOUT_SETTINGS"; field public static final java.lang.String ACTION_LOCALE_SETTINGS = "android.settings.LOCALE_SETTINGS"; field public static final java.lang.String ACTION_LOCATION_SOURCE_SETTINGS = "android.settings.LOCATION_SOURCE_SETTINGS"; field public static final java.lang.String ACTION_MANAGE_ALL_APPLICATIONS_SETTINGS = "android.settings.MANAGE_ALL_APPLICATIONS_SETTINGS"; @@ -35108,6 +35079,7 @@ package android.service.vr { ctor public VrListenerService(); method public static final boolean isVrModePackageEnabled(android.content.Context, android.content.ComponentName); method public android.os.IBinder onBind(android.content.Intent); + method public void onCurrentVrActivityChanged(android.content.ComponentName); field public static final java.lang.String SERVICE_INTERFACE = "android.service.vr.VrListenerService"; } @@ -36802,11 +36774,10 @@ package android.telephony { method public void notifyConfigChanged(int); method public deprecated void notifyConfigChangedForSubId(int); field public static final java.lang.String ACTION_CARRIER_CONFIG_CHANGED = "android.telephony.action.CARRIER_CONFIG_CHANGED"; - field public static final java.lang.String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = "bool_allow_emergency_video_calls"; - field public static final java.lang.String BOOL_ALLOW_VIDEO_PAUSE = "bool_allow_video_pause"; field public static final java.lang.String KEY_ADDITIONAL_CALL_SETTING_BOOL = "additional_call_setting_bool"; field public static final java.lang.String KEY_ALLOW_ADDING_APNS_BOOL = "allow_adding_apns_bool"; field public static final java.lang.String KEY_ALLOW_EMERGENCY_NUMBERS_IN_CALL_LOG_BOOL = "allow_emergency_numbers_in_call_log_bool"; + field public static final java.lang.String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = "allow_emergency_video_calls_bool"; field public static final java.lang.String KEY_ALLOW_LOCAL_DTMF_TONES_BOOL = "allow_local_dtmf_tones_bool"; field public static final java.lang.String KEY_ALLOW_NON_EMERGENCY_CALLS_IN_ECM_BOOL = "allow_non_emergency_calls_in_ecm_bool"; field public static final java.lang.String KEY_ALWAYS_SHOW_EMERGENCY_ALERT_ONOFF_BOOL = "always_show_emergency_alert_onoff_bool"; @@ -39851,8 +39822,10 @@ package android.text.util { method public static final boolean addLinks(android.widget.TextView, int); method public static final void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String); method public static final void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); + method public static final void addLinks(android.widget.TextView, java.util.regex.Pattern, java.lang.String, java.lang.String[], android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String); method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); + method public static final boolean addLinks(android.text.Spannable, java.util.regex.Pattern, java.lang.String, java.lang.String[], android.text.util.Linkify.MatchFilter, android.text.util.Linkify.TransformFilter); field public static final int ALL = 15; // 0xf field public static final int EMAIL_ADDRESSES = 2; // 0x2 field public static final int MAP_ADDRESSES = 8; // 0x8 diff --git a/cmds/am/src/com/android/commands/am/Am.java b/cmds/am/src/com/android/commands/am/Am.java index e6c576825e67..86734b1c222c 100644 --- a/cmds/am/src/com/android/commands/am/Am.java +++ b/cmds/am/src/com/android/commands/am/Am.java @@ -1814,7 +1814,7 @@ public class Am extends BaseCommand { private void resizeStackUnchecked(int stackId, Rect bounds, int delayMs, boolean animate) { try { - mAm.resizeStack(stackId, bounds, false, false, animate); + mAm.resizeStack(stackId, bounds, false, false, animate, -1); Thread.sleep(delayMs); } catch (RemoteException e) { showError("Error: resizing stack " + e); diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java index ddc5b0c7eb08..bf823f8d960f 100644 --- a/core/java/android/accessibilityservice/AccessibilityService.java +++ b/core/java/android/accessibilityservice/AccessibilityService.java @@ -406,7 +406,9 @@ public abstract class AccessibilityService extends Service { /** * Callback for {@link android.view.accessibility.AccessibilityEvent}s. * - * @param event An event. + * @param event The new event. This event is owned by the caller and cannot be used after + * this method returns. Services wishing to use the event after this method returns should + * make a copy. */ public abstract void onAccessibilityEvent(AccessibilityEvent event); @@ -493,7 +495,9 @@ public abstract class AccessibilityService extends Service { * functionality. * <p> * - * @param event The event to be processed. + * @param event The event to be processed. This event is owned by the caller and cannot be used + * after this method returns. Services wishing to use the event after this method returns should + * make a copy. * @return If true then the event will be consumed and not delivered to * applications, otherwise it will be delivered as usual. */ diff --git a/core/java/android/animation/Animator.java b/core/java/android/animation/Animator.java index 8e31d323009f..c51725a2caac 100644 --- a/core/java/android/animation/Animator.java +++ b/core/java/android/animation/Animator.java @@ -16,6 +16,7 @@ package android.animation; +import android.annotation.Nullable; import android.content.pm.ActivityInfo.Config; import android.content.res.ConstantState; @@ -436,10 +437,14 @@ public abstract class Animator implements Cloneable { * operate on target objects (for example, {@link ValueAnimator}, but this method * is on the superclass for the convenience of dealing generically with those subclasses * that do handle targets. + * <p> + * <strong>Note:</strong> The target is stored as a weak reference internally to avoid leaking + * resources by having animators directly reference old targets. Therefore, you should + * ensure that animator targets always have a hard reference elsewhere. * * @param target The object being animated */ - public void setTarget(Object target) { + public void setTarget(@Nullable Object target) { } // Hide reverse() and canReverse() for now since reverse() only work for simple diff --git a/core/java/android/animation/ObjectAnimator.java b/core/java/android/animation/ObjectAnimator.java index 0b751b27afc9..542ecf41756e 100644 --- a/core/java/android/animation/ObjectAnimator.java +++ b/core/java/android/animation/ObjectAnimator.java @@ -373,6 +373,7 @@ public final class ObjectAnimator extends ValueAnimator { * @param values A set of values that the animation will animate between over time. * @return An ObjectAnimator object that is set up to animate between the given values. */ + @SafeVarargs public static <T> ObjectAnimator ofMultiInt(Object target, String propertyName, TypeConverter<T, int[]> converter, TypeEvaluator<T> evaluator, T... values) { PropertyValuesHolder pvh = PropertyValuesHolder.ofMultiInt(propertyName, converter, @@ -569,6 +570,7 @@ public final class ObjectAnimator extends ValueAnimator { * @param values A set of values that the animation will animate between over time. * @return An ObjectAnimator object that is set up to animate between the given values. */ + @SafeVarargs public static <T> ObjectAnimator ofMultiFloat(Object target, String propertyName, TypeConverter<T, float[]> converter, TypeEvaluator<T> evaluator, T... values) { PropertyValuesHolder pvh = PropertyValuesHolder.ofMultiFloat(propertyName, converter, @@ -642,6 +644,7 @@ public final class ObjectAnimator extends ValueAnimator { * @return An ObjectAnimator object that is set up to animate between the given values. */ @NonNull + @SafeVarargs public static <T, V> ObjectAnimator ofObject(T target, Property<T, V> property, TypeEvaluator<V> evaluator, V... values) { ObjectAnimator anim = new ObjectAnimator(target, property); @@ -670,6 +673,7 @@ public final class ObjectAnimator extends ValueAnimator { * @return An ObjectAnimator object that is set up to animate between the given values. */ @NonNull + @SafeVarargs public static <T, V, P> ObjectAnimator ofObject(T target, Property<T, P> property, TypeConverter<V, P> converter, TypeEvaluator<V> evaluator, V... values) { PropertyValuesHolder pvh = PropertyValuesHolder.ofObject(property, converter, evaluator, @@ -894,12 +898,6 @@ public final class ObjectAnimator extends ValueAnimator { return mTarget == null ? null : mTarget.get(); } - /** - * Sets the target object whose property will be animated by this animation. If the - * animator has been started, it will be canceled. - * - * @param target The object being animated - */ @Override public void setTarget(@Nullable Object target) { final Object oldTarget = getTarget(); diff --git a/core/java/android/animation/PropertyValuesHolder.java b/core/java/android/animation/PropertyValuesHolder.java index 6ba5b968dfe7..ffea6f5e0003 100644 --- a/core/java/android/animation/PropertyValuesHolder.java +++ b/core/java/android/animation/PropertyValuesHolder.java @@ -236,6 +236,7 @@ public class PropertyValuesHolder implements Cloneable { * @see ObjectAnimator#ofMultiInt(Object, String, TypeConverter, TypeEvaluator, Object[]) * @see ObjectAnimator#ofPropertyValuesHolder(Object, PropertyValuesHolder...) */ + @SafeVarargs public static <V> PropertyValuesHolder ofMultiInt(String propertyName, TypeConverter<V, int[]> converter, TypeEvaluator<V> evaluator, V... values) { return new MultiIntValuesHolder(propertyName, converter, evaluator, values); @@ -353,6 +354,7 @@ public class PropertyValuesHolder implements Cloneable { * @return PropertyValuesHolder The constructed PropertyValuesHolder object. * @see ObjectAnimator#ofMultiFloat(Object, String, TypeConverter, TypeEvaluator, Object[]) */ + @SafeVarargs public static <V> PropertyValuesHolder ofMultiFloat(String propertyName, TypeConverter<V, float[]> converter, TypeEvaluator<V> evaluator, V... values) { return new MultiFloatValuesHolder(propertyName, converter, evaluator, values); @@ -438,6 +440,7 @@ public class PropertyValuesHolder implements Cloneable { * @param values The values that the property will animate between. * @return PropertyValuesHolder The constructed PropertyValuesHolder object. */ + @SafeVarargs public static <V> PropertyValuesHolder ofObject(Property property, TypeEvaluator<V> evaluator, V... values) { PropertyValuesHolder pvh = new PropertyValuesHolder(property); @@ -465,6 +468,7 @@ public class PropertyValuesHolder implements Cloneable { * @see #setConverter(TypeConverter) * @see TypeConverter */ + @SafeVarargs public static <T, V> PropertyValuesHolder ofObject(Property<?, V> property, TypeConverter<T, V> converter, TypeEvaluator<T> evaluator, T... values) { PropertyValuesHolder pvh = new PropertyValuesHolder(property); diff --git a/core/java/android/app/ActivityManagerNative.java b/core/java/android/app/ActivityManagerNative.java index 811a05bac077..f5d7e7e068cf 100644 --- a/core/java/android/app/ActivityManagerNative.java +++ b/core/java/android/app/ActivityManagerNative.java @@ -16,6 +16,7 @@ package android.app; +import android.annotation.UserIdInt; import android.app.ActivityManager.StackInfo; import android.app.assist.AssistContent; import android.app.assist.AssistStructure; @@ -819,7 +820,9 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM final boolean allowResizeInDockedMode = data.readInt() == 1; final boolean preserveWindows = data.readInt() == 1; final boolean animate = data.readInt() == 1; - resizeStack(stackId, r, allowResizeInDockedMode, preserveWindows, animate); + final int animationDuration = data.readInt(); + resizeStack(stackId, + r, allowResizeInDockedMode, preserveWindows, animate, animationDuration); reply.writeNoException(); return true; } @@ -2942,6 +2945,13 @@ public abstract class ActivityManagerNative extends Binder implements IActivityM reply.writeNoException(); return true; } + case NOTIFY_LOCKED_PROFILE: { + data.enforceInterface(IActivityManager.descriptor); + final int userId = data.readInt(); + notifyLockedProfile(userId); + reply.writeNoException(); + return true; + } } return super.onTransact(code, data, reply, flags); @@ -3881,7 +3891,8 @@ class ActivityManagerProxy implements IActivityManager } @Override public void resizeStack(int stackId, Rect r, boolean allowResizeInDockedMode, - boolean preserveWindows, boolean animate) throws RemoteException { + boolean preserveWindows, boolean animate, int animationDuration) + throws RemoteException { Parcel data = Parcel.obtain(); Parcel reply = Parcel.obtain(); data.writeInterfaceToken(IActivityManager.descriptor); @@ -3895,6 +3906,7 @@ class ActivityManagerProxy implements IActivityManager data.writeInt(allowResizeInDockedMode ? 1 : 0); data.writeInt(preserveWindows ? 1 : 0); data.writeInt(animate ? 1 : 0); + data.writeInt(animationDuration); mRemote.transact(RESIZE_STACK_TRANSACTION, data, reply, 0); reply.readException(); data.recycle(); @@ -6894,5 +6906,17 @@ class ActivityManagerProxy implements IActivityManager reply.recycle(); } + public void notifyLockedProfile(@UserIdInt int userId) throws RemoteException + { + Parcel data = Parcel.obtain(); + Parcel reply = Parcel.obtain(); + data.writeInterfaceToken(IActivityManager.descriptor); + data.writeInt(userId); + mRemote.transact(NOTIFY_LOCKED_PROFILE, data, reply, 0); + reply.readException(); + data.recycle(); + reply.recycle(); + } + private IBinder mRemote; } diff --git a/core/java/android/app/ActivityOptions.java b/core/java/android/app/ActivityOptions.java index a6e7d67f1dd3..167e6cbeb84f 100644 --- a/core/java/android/app/ActivityOptions.java +++ b/core/java/android/app/ActivityOptions.java @@ -621,6 +621,7 @@ public class ActivityOptions { * @see android.transition.Transition#setEpicenterCallback( * android.transition.Transition.EpicenterCallback) */ + @SafeVarargs public static ActivityOptions makeSceneTransitionAnimation(Activity activity, Pair<View, String>... sharedElements) { ActivityOptions opts = new ActivityOptions(); diff --git a/core/java/android/app/AlarmManager.java b/core/java/android/app/AlarmManager.java index b08142add4d8..cb2130c4528e 100644 --- a/core/java/android/app/AlarmManager.java +++ b/core/java/android/app/AlarmManager.java @@ -559,9 +559,10 @@ public class AlarmManager { * the given time. * @hide */ - public void setIdleUntil(int type, long triggerAtMillis, PendingIntent operation) { - setImpl(type, triggerAtMillis, WINDOW_EXACT, 0, FLAG_IDLE_UNTIL, operation, - null, null, null, null, null); + public void setIdleUntil(int type, long triggerAtMillis, String tag, OnAlarmListener listener, + Handler targetHandler) { + setImpl(type, triggerAtMillis, WINDOW_EXACT, 0, FLAG_IDLE_UNTIL, null, + listener, tag, targetHandler, null, null); } /** diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java index 5ef03d1cac6f..5b7dae67392c 100644 --- a/core/java/android/app/ApplicationPackageManager.java +++ b/core/java/android/app/ApplicationPackageManager.java @@ -1147,8 +1147,7 @@ public class ApplicationPackageManager extends PackageManager { } private Drawable getManagedProfileIconForDensity(UserHandle user, int drawableId, int density) { - UserInfo userInfo = getUserInfo(user.getIdentifier()); - if (userInfo != null && userInfo.isManagedProfile()) { + if (isManagedProfile(user.getIdentifier())) { return getDrawableForDensity(drawableId, density); } return null; @@ -1156,8 +1155,7 @@ public class ApplicationPackageManager extends PackageManager { @Override public CharSequence getUserBadgedLabel(CharSequence label, UserHandle user) { - UserInfo userInfo = getUserInfo(user.getIdentifier()); - if (userInfo != null && userInfo.isManagedProfile()) { + if (isManagedProfile(user.getIdentifier())) { return Resources.getSystem().getString( com.android.internal.R.string.managed_profile_label_badge, label); } @@ -2259,17 +2257,16 @@ public class ApplicationPackageManager extends PackageManager { return drawable; } - private int getBadgeResIdForUser(int userHandle) { + private int getBadgeResIdForUser(int userId) { // Return the framework-provided badge. - UserInfo userInfo = getUserInfo(userHandle); - if (userInfo != null && userInfo.isManagedProfile()) { + if (isManagedProfile(userId)) { return com.android.internal.R.drawable.ic_corp_icon_badge; } return 0; } - private UserInfo getUserInfo(int userHandle) { - return getUserManager().getUserInfo(userHandle); + private boolean isManagedProfile(int userId) { + return getUserManager().isManagedProfile(userId); } /** {@hide} */ diff --git a/core/java/android/app/DownloadManager.java b/core/java/android/app/DownloadManager.java index ed4bb28427ae..536c4a865fce 100644 --- a/core/java/android/app/DownloadManager.java +++ b/core/java/android/app/DownloadManager.java @@ -1319,7 +1319,7 @@ public class DownloadManager { return getLocalUri(); case COLUMN_LOCAL_FILENAME: if (!mAccessFilename) { - throw new IllegalArgumentException( + throw new SecurityException( "COLUMN_LOCAL_FILENAME is deprecated;" + " use ContentResolver.openFileDescriptor() instead"); } diff --git a/core/java/android/app/IActivityManager.java b/core/java/android/app/IActivityManager.java index 8e87e2661361..639c207ec6d9 100644 --- a/core/java/android/app/IActivityManager.java +++ b/core/java/android/app/IActivityManager.java @@ -16,6 +16,7 @@ package android.app; +import android.annotation.UserIdInt; import android.app.ActivityManager.RunningServiceInfo; import android.app.ActivityManager.RunningTaskInfo; import android.app.ActivityManager.StackInfo; @@ -147,8 +148,23 @@ public interface IActivityManager extends IInterface { public boolean moveTaskToDockedStack(int taskId, int createMode, boolean toTop, boolean animate, Rect initialBounds) throws RemoteException; public boolean moveTopActivityToPinnedStack(int stackId, Rect bounds) throws RemoteException; + + /** + * Resizes the input stack id to the given bounds. + * + * @param stackId Id of the stack to resize. + * @param bounds Bounds to resize the stack to or {@code null} for fullscreen. + * @param allowResizeInDockedMode True if the resize should be allowed when the docked stack is + * active. + * @param preserveWindows True if the windows of activities contained in the stack should be + * preserved. + * @param animate True if the stack resize should be animated. + * @param animationDuration The duration of the resize animation in milliseconds or -1 if the + * default animation duration should be used. + * @throws RemoteException + */ public void resizeStack(int stackId, Rect bounds, boolean allowResizeInDockedMode, - boolean preserveWindows, boolean animate) throws RemoteException; + boolean preserveWindows, boolean animate, int animationDuration) throws RemoteException; /** * Moves all tasks from the docked stack in the fullscreen stack and puts the top task of the @@ -628,6 +644,8 @@ public interface IActivityManager extends IInterface { public void removeStack(int stackId) throws RemoteException; + public void notifyLockedProfile(@UserIdInt int userId) throws RemoteException; + /* * Private non-Binder interfaces */ @@ -1010,4 +1028,5 @@ public interface IActivityManager extends IInterface { int RESIZE_PINNED_STACK_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 370; int IS_VR_PACKAGE_ENABLED_TRANSACTION = IBinder.FIRST_CALL_TRANSACTION + 371; int SWAP_DOCKED_AND_FULLSCREEN_STACK = IBinder.FIRST_CALL_TRANSACTION + 372; + int NOTIFY_LOCKED_PROFILE = IBinder.FIRST_CALL_TRANSACTION + 373; } diff --git a/core/java/android/app/IWallpaperManager.aidl b/core/java/android/app/IWallpaperManager.aidl index 1143c6aec7a6..2fc6533f2cd0 100644 --- a/core/java/android/app/IWallpaperManager.aidl +++ b/core/java/android/app/IWallpaperManager.aidl @@ -62,6 +62,11 @@ interface IWallpaperManager { out Bundle outParams, int userId); /** + * Retrieve the given user's current wallpaper ID of the given kind. + */ + int getWallpaperIdForUser(int which, int userId); + + /** * If the current system wallpaper is a live wallpaper component, return the * information about that wallpaper. Otherwise, if it is a static image, * simply return null. diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index e9d0846fe71c..cb1bee5c0376 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -957,7 +957,7 @@ public class Notification implements Parcelable if (in.readInt() == 1) { actionIntent = PendingIntent.CREATOR.createFromParcel(in); } - mExtras = in.readBundle(); + mExtras = Bundle.setDefusable(in.readBundle(), true); mRemoteInputs = in.createTypedArray(RemoteInput.CREATOR); } @@ -1487,7 +1487,7 @@ public class Notification implements Parcelable mSortKey = parcel.readString(); - extras = parcel.readBundle(); // may be null + extras = Bundle.setDefusable(parcel.readBundle(), true); // may be null actions = parcel.createTypedArray(Action.CREATOR); // may be null diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java index 9d7f7246a25d..2987fbc4f33d 100644 --- a/core/java/android/app/SystemServiceRegistry.java +++ b/core/java/android/app/SystemServiceRegistry.java @@ -69,6 +69,7 @@ import android.media.soundtrigger.SoundTriggerManager; import android.media.tv.ITvInputManager; import android.media.tv.TvInputManager; import android.net.ConnectivityManager; +import android.net.ConnectivityThread; import android.net.EthernetManager; import android.net.IConnectivityManager; import android.net.IEthernetManager; @@ -500,7 +501,8 @@ final class SystemServiceRegistry { public WifiManager createService(ContextImpl ctx) { IBinder b = ServiceManager.getService(Context.WIFI_SERVICE); IWifiManager service = IWifiManager.Stub.asInterface(b); - return new WifiManager(ctx.getOuterContext(), service); + return new WifiManager(ctx.getOuterContext(), service, + ConnectivityThread.getInstanceLooper()); }}); registerService(Context.WIFI_P2P_SERVICE, WifiP2pManager.class, diff --git a/core/java/android/app/WallpaperManager.java b/core/java/android/app/WallpaperManager.java index 52e52728c25a..b52af2762fed 100644 --- a/core/java/android/app/WallpaperManager.java +++ b/core/java/android/app/WallpaperManager.java @@ -726,6 +726,38 @@ public class WallpaperManager { } /** + * Get the ID of the current wallpaper of the given kind. If there is no + * such wallpaper configured, returns a negative number. + * + * @param which The wallpaper whose ID is to be returned. Must be a single + * defined kind of wallpaper, either {@link #FLAG_SET_SYSTEM} or + * {@link #FLAG_SET_LOCK}. + * @return The positive numeric ID of the current wallpaper of the given kind, + * or a negative value if no such wallpaper is configured. + */ + public int getWallpaperId(int which) { + return getWallpaperIdForUser(which, mContext.getUserId()); + } + + /** + * Get the ID of the given user's current wallpaper of the given kind. If there + * is no such wallpaper configured, returns a negative number. + * @hide + */ + public int getWallpaperIdForUser(int which, int userId) { + try { + if (sGlobals.mService == null) { + Log.w(TAG, "WallpaperService not running"); + return -1; + } else { + return sGlobals.mService.getWallpaperIdForUser(which, userId); + } + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * Gets an Intent that will launch an activity that crops the given * image and sets the device's wallpaper. If there is a default HOME activity * that supports cropping wallpapers, it will be preferred as the default. diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index b7d9b80e9a53..e7427bfabe01 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -31,6 +31,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ParceledListSlice; import android.content.pm.UserInfo; import android.graphics.Bitmap; @@ -144,19 +145,23 @@ public class DevicePolicyManager { * {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME} instead, although specifying only * {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME} is still supported. * - * <p> The intent may also contain the following extras: + * <p>The intent may also contain the following extras: * <ul> - * <li> {@link #EXTRA_PROVISIONING_LOGO_URI}, optional </li> - * <li> {@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional </li> + * <li>{@link #EXTRA_PROVISIONING_ACCOUNT_TO_MIGRATE}, optional </li> + * <li>{@link #EXTRA_PROVISIONING_SKIP_ENCRYPTION}, optional, supported from + * {@link android.os.Build.VERSION_CODES#N}</li> + * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_LOGO_URI}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li> * </ul> * - * <p> When managed provisioning has completed, broadcasts are sent to the application specified + * <p>When managed provisioning has completed, broadcasts are sent to the application specified * in the provisioning intent. The * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} broadcast is sent in the * managed profile and the {@link #ACTION_MANAGED_PROFILE_PROVISIONED} broadcast is sent in * the primary profile. * - * <p> If provisioning fails, the managedProfile is removed so the device returns to its + * <p>If provisioning fails, the managedProfile is removed so the device returns to its * previous state. * * <p>If launched with {@link android.app.Activity#startActivityForResult(Intent, int)} a @@ -170,7 +175,6 @@ public class DevicePolicyManager { = "android.app.action.PROVISION_MANAGED_PROFILE"; /** - * @hide * Activity action: Starts the provisioning flow which sets up a managed user. * * <p>This intent will typically be sent by a mobile device management application (MDM). @@ -179,16 +183,24 @@ public class DevicePolicyManager { * been completed. Use {@link #isProvisioningAllowed(String)} to check if provisioning is * allowed. * - * <p>This intent should contain the extra - * {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME}. + * <p>The intent contains the following extras: + * <ul> + * <li>{@link #EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME}</li> + * <li>{@link #EXTRA_PROVISIONING_SKIP_ENCRYPTION}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_LOGO_URI}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li> + * </ul> * - * <p> If provisioning fails, the device returns to its previous state. + * <p>If provisioning fails, the device returns to its previous state. * * <p>If launched with {@link android.app.Activity#startActivityForResult(Intent, int)} a * result code of {@link android.app.Activity#RESULT_OK} implies that the synchronous part of * the provisioning flow was successful, although this doesn't guarantee the full flow will * succeed. Conversely a result code of {@link android.app.Activity#RESULT_CANCELED} implies * that the user backed-out of provisioning, or some precondition for provisioning wasn't met. + * + * @hide */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_PROVISION_MANAGED_USER @@ -219,11 +231,11 @@ public class DevicePolicyManager { * <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li> * </ul> * - * <p> When device owner provisioning has completed, an intent of the type + * <p>When device owner provisioning has completed, an intent of the type * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} is broadcast to the * device owner. * - * <p> If provisioning fails, the device is factory reset. + * <p>If provisioning fails, the device is factory reset. * * <p>A result code of {@link android.app.Activity#RESULT_OK} implies that the synchronous part * of the provisioning flow was successful, although this doesn't guarantee the full flow will @@ -287,14 +299,14 @@ public class DevicePolicyManager { * The primary benefit is that multiple non-system users are supported when provisioning using * this form of device management. * - * <p> During device owner provisioning a device admin app is set as the owner of the device. + * <p>During device owner provisioning a device admin app is set as the owner of the device. * A device owner has full control over the device. The device owner can not be modified by the * user. * - * <p> A typical use case would be a device that is owned by a company, but used by either an + * <p>A typical use case would be a device that is owned by a company, but used by either an * employee or client. * - * <p> An intent with this action can be sent only on an unprovisioned device. + * <p>An intent with this action can be sent only on an unprovisioned device. * It is possible to check if provisioning is allowed or not by querying the method * {@link #isProvisioningAllowed(String)}. * @@ -304,13 +316,15 @@ public class DevicePolicyManager { * <li>{@link #EXTRA_PROVISIONING_SKIP_ENCRYPTION}, optional</li> * <li>{@link #EXTRA_PROVISIONING_LEAVE_ALL_SYSTEM_APPS_ENABLED}, optional</li> * <li>{@link #EXTRA_PROVISIONING_ADMIN_EXTRAS_BUNDLE}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_LOGO_URI}, optional</li> + * <li>{@link #EXTRA_PROVISIONING_MAIN_COLOR}, optional</li> * </ul> * - * <p> When device owner provisioning has completed, an intent of the type + * <p>When device owner provisioning has completed, an intent of the type * {@link DeviceAdminReceiver#ACTION_PROFILE_PROVISIONING_COMPLETE} is broadcast to the * device owner. * - * <p> If provisioning fails, the device is factory reset. + * <p>If provisioning fails, the device is factory reset. * * <p>A result code of {@link android.app.Activity#RESULT_OK} implies that the synchronous part * of the provisioning flow was successful, although this doesn't guarantee the full flow will @@ -438,7 +452,7 @@ public class DevicePolicyManager { * * <p> When this extra is set, the application must have exactly one device admin receiver. * This receiver will be set as the profile or device owner and active admin. - + * * @see DeviceAdminReceiver * @deprecated Use {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_COMPONENT_NAME}. This extra is still * supported, but only if there is only one device admin receiver in the package that requires @@ -460,7 +474,7 @@ public class DevicePolicyManager { * <p>This component is set as device owner and active admin when device owner provisioning is * started by an intent with action {@link #ACTION_PROVISION_MANAGED_DEVICE} or by an NFC * message containing an NFC record with MIME type - * {@link #MIME_TYPE_PROVISIONING_NFC}. For the NFC record, the component name should be + * {@link #MIME_TYPE_PROVISIONING_NFC}. For the NFC record, the component name must be * flattened to a string, via {@link ComponentName#flattenToShortString()}. * * @see DeviceAdminReceiver @@ -663,8 +677,8 @@ public class DevicePolicyManager { * the file at download location specified in * {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_DOWNLOAD_LOCATION}. * - * <p>Either this extra or {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM} should be - * present. The provided checksum should match the checksum of the file at the download + * <p>Either this extra or {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_SIGNATURE_CHECKSUM} must be + * present. The provided checksum must match the checksum of the file at the download * location. If the checksum doesn't match an error will be shown to the user and the user will * be asked to factory reset the device. * @@ -688,8 +702,8 @@ public class DevicePolicyManager { * {@link android.content.pm.PackageManager#getPackageArchiveInfo} with flag * {@link android.content.pm.PackageManager#GET_SIGNATURES}. * - * <p>Either this extra or {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM} should be - * present. The provided checksum should match the checksum of any signature of the file at + * <p>Either this extra or {@link #EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_CHECKSUM} must be + * present. The provided checksum must match the checksum of any signature of the file at * the download location. If the checksum does not match an error will be shown to the user and * the user will be asked to factory reset the device. * @@ -714,11 +728,14 @@ public class DevicePolicyManager { = "android.app.action.MANAGED_PROFILE_PROVISIONED"; /** - * A boolean extra indicating whether device encryption can be skipped as part of Device Owner - * provisioning. + * A boolean extra indicating whether device encryption can be skipped as part of device owner + * or managed profile provisioning. * * <p>Use in an NFC record with {@link #MIME_TYPE_PROVISIONING_NFC} or an intent with action * {@link #ACTION_PROVISION_MANAGED_DEVICE} that starts device owner provisioning. + * + * <p>From {@link android.os.Build.VERSION_CODES#N} onwards, this is also supported for an + * intent with action {@link #ACTION_PROVISION_MANAGED_PROFILE}. */ public static final String EXTRA_PROVISIONING_SKIP_ENCRYPTION = "android.app.extra.PROVISIONING_SKIP_ENCRYPTION"; @@ -761,7 +778,7 @@ public class DevicePolicyManager { "android.app.extra.PROVISIONING_SKIP_USER_SETUP"; /** - * This MIME type is used for starting the Device Owner provisioning. + * This MIME type is used for starting the device owner provisioning. * * <p>During device owner provisioning a device admin app is set as the owner of the device. * A device owner has full control over the device. The device owner can not be modified by the @@ -771,7 +788,7 @@ public class DevicePolicyManager { * <p> A typical use case would be a device that is owned by a company, but used by either an * employee or client. * - * <p> The NFC message should be send to an unprovisioned device. + * <p> The NFC message must be sent to an unprovisioned device. * * <p>The NFC record must contain a serialized {@link java.util.Properties} object which * contains the following properties: @@ -3980,18 +3997,21 @@ public class DevicePolicyManager { * {@code null} value or uninstalling the managing package. * <p> * The supplied application restriction managing package must be installed when calling this - * API, otherwise an {@link IllegalArgumentException} will be thrown. + * API, otherwise an {@link NameNotFoundException} will be thrown. * * @param admin Which {@link DeviceAdminReceiver} this request is associated with. * @param packageName The package name which will be given access to application restrictions * APIs. If {@code null} is given the current package will be cleared. * @throws SecurityException if {@code admin} is not a device or profile owner. + * @throws NameNotFoundException if {@code packageName} is not found */ public void setApplicationRestrictionsManagingPackage(@NonNull ComponentName admin, - @Nullable String packageName) { + @Nullable String packageName) throws NameNotFoundException { if (mService != null) { try { - mService.setApplicationRestrictionsManagingPackage(admin, packageName); + if (!mService.setApplicationRestrictionsManagingPackage(admin, packageName)) { + throw new NameNotFoundException(packageName); + } } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -5810,14 +5830,6 @@ public class DevicePolicyManager { } /** - * Temporary // STOPSHIP TODO(mkarpinski): remove those once change to TestDPC is pushed - * @hide - */ - public void setDeviceLoggingEnabled(@NonNull ComponentName admin, boolean enabled) { - setSecurityLoggingEnabled(admin, enabled); - } - - /** * Return whether security logging is enabled or not by the device owner. * * <p>Can only be called by the device owner, otherwise a {@link SecurityException} will be @@ -5836,14 +5848,6 @@ public class DevicePolicyManager { } /** - * Temporary // STOPSHIP TODO(mkarpinski): remove those once change to TestDPC is pushed - * @hide - */ - public boolean getDeviceLoggingEnabled(@NonNull ComponentName admin) { - return isSecurityLoggingEnabled(admin); - } - - /** * Called by device owner to retrieve all new security logging entries since the last call to * this API after device boots. * @@ -5873,14 +5877,6 @@ public class DevicePolicyManager { } /** - * Temporary // STOPSHIP TODO(mkarpinski): remove those once change to TestDPC is pushed - * @hide - */ - public List<SecurityEvent> retrieveDeviceLogs(@NonNull ComponentName admin) { - return retrieveSecurityLogs(admin); - } - - /** * Called by the system to obtain a {@link DevicePolicyManager} whose calls act on the parent * profile. * @@ -5921,14 +5917,6 @@ public class DevicePolicyManager { } /** - * Temporary // STOPSHIP TODO(mkarpinski): remove those once change to TestDPC is pushed - * @hide - */ - public List<SecurityEvent> retrievePreviousDeviceLogs(@NonNull ComponentName admin) { - return retrievePreRebootSecurityLogs(admin); - } - - /** * Called by a profile owner of a managed profile to set the color used for customization. This * color is used as background color of the confirm credentials screen for that user. The * default color is {@link android.graphics.Color#GRAY}. diff --git a/core/java/android/app/admin/IDevicePolicyManager.aidl b/core/java/android/app/admin/IDevicePolicyManager.aidl index 3ba5bd839d2d..aed220dd5705 100644 --- a/core/java/android/app/admin/IDevicePolicyManager.aidl +++ b/core/java/android/app/admin/IDevicePolicyManager.aidl @@ -161,7 +161,7 @@ interface IDevicePolicyManager { void setApplicationRestrictions(in ComponentName who, in String packageName, in Bundle settings); Bundle getApplicationRestrictions(in ComponentName who, in String packageName); - void setApplicationRestrictionsManagingPackage(in ComponentName admin, in String packageName); + boolean setApplicationRestrictionsManagingPackage(in ComponentName admin, in String packageName); String getApplicationRestrictionsManagingPackage(in ComponentName admin); boolean isCallerApplicationRestrictionsManagingPackage(); diff --git a/core/java/android/bluetooth/BluetoothGatt.java b/core/java/android/bluetooth/BluetoothGatt.java index ea2dca08fd47..68442ea40701 100644 --- a/core/java/android/bluetooth/BluetoothGatt.java +++ b/core/java/android/bluetooth/BluetoothGatt.java @@ -197,109 +197,43 @@ public final class BluetoothGatt implements BluetoothProfile { } /** - * A new GATT service has been discovered. - * The service is added to the internal list and the search - * continues. - * @hide - */ - public void onGetService(String address, int srvcType, - int srvcInstId, ParcelUuid srvcUuid) { - if (VDBG) Log.d(TAG, "onGetService() - Device=" + address + " UUID=" + srvcUuid); - if (!address.equals(mDevice.getAddress())) { - return; - } - mServices.add(new BluetoothGattService(mDevice, srvcUuid.getUuid(), - srvcInstId, srvcType)); - } - - /** - * An included service has been found durig GATT discovery. - * The included service is added to the respective parent. - * @hide - */ - public void onGetIncludedService(String address, int srvcType, - int srvcInstId, ParcelUuid srvcUuid, - int inclSrvcType, int inclSrvcInstId, - ParcelUuid inclSrvcUuid) { - if (VDBG) Log.d(TAG, "onGetIncludedService() - Device=" + address - + " UUID=" + srvcUuid + " Included=" + inclSrvcUuid); - - if (!address.equals(mDevice.getAddress())) { - return; - } - BluetoothGattService service = getService(mDevice, - srvcUuid.getUuid(), srvcInstId, srvcType); - BluetoothGattService includedService = getService(mDevice, - inclSrvcUuid.getUuid(), inclSrvcInstId, inclSrvcType); - - if (service != null && includedService != null) { - service.addIncludedService(includedService); - } - } - - /** - * A new GATT characteristic has been discovered. - * Add the new characteristic to the relevant service and continue - * the remote device inspection. - * @hide - */ - public void onGetCharacteristic(String address, int srvcType, - int srvcInstId, ParcelUuid srvcUuid, - int charInstId, ParcelUuid charUuid, - int charProps) { - if (VDBG) Log.d(TAG, "onGetCharacteristic() - Device=" + address + " UUID=" + - charUuid); - - if (!address.equals(mDevice.getAddress())) { - return; - } - BluetoothGattService service = getService(mDevice, srvcUuid.getUuid(), - srvcInstId, srvcType); - if (service != null) { - service.addCharacteristic(new BluetoothGattCharacteristic( - service, charUuid.getUuid(), charInstId, charProps, 0)); - } - } - - /** - * A new GATT descriptor has been discovered. - * Finally, add the descriptor to the related characteristic. - * This should conclude the remote device update. - * @hide - */ - public void onGetDescriptor(String address, int srvcType, - int srvcInstId, ParcelUuid srvcUuid, - int charInstId, ParcelUuid charUuid, - int descrInstId, ParcelUuid descUuid) { - if (VDBG) Log.d(TAG, "onGetDescriptor() - Device=" + address + " UUID=" + descUuid); - - if (!address.equals(mDevice.getAddress())) { - return; - } - BluetoothGattService service = getService(mDevice, srvcUuid.getUuid(), - srvcInstId, srvcType); - if (service == null) return; - - BluetoothGattCharacteristic characteristic = service.getCharacteristic( - charUuid.getUuid(), charInstId); - if (characteristic == null) return; - - characteristic.addDescriptor(new BluetoothGattDescriptor( - characteristic, descUuid.getUuid(), descrInstId, 0)); - } - - /** * Remote search has been completed. * The internal object structure should now reflect the state * of the remote device database. Let the application know that * we are done at this point. * @hide */ - public void onSearchComplete(String address, int status) { + public void onSearchComplete(String address, List<BluetoothGattService> services, + int status) { if (DBG) Log.d(TAG, "onSearchComplete() = Device=" + address + " Status=" + status); if (!address.equals(mDevice.getAddress())) { return; } + + for (BluetoothGattService s : services) { + //services we receive don't have device set properly. + s.setDevice(mDevice); + } + + mServices.addAll(services); + + // Fix references to included services, as they doesn't point to right objects. + for (BluetoothGattService fixedService : mServices) { + ArrayList<BluetoothGattService> includedServices = + new ArrayList(fixedService.getIncludedServices()); + fixedService.getIncludedServices().clear(); + + for(BluetoothGattService brokenRef : includedServices) { + BluetoothGattService includedService = getService(mDevice, + brokenRef.getUuid(), brokenRef.getInstanceId(), brokenRef.getType()); + if (includedService != null) { + fixedService.addIncludedService(includedService); + } else { + Log.e(TAG, "Broken GATT database: can't find included service."); + } + } + } + try { mCallback.onServicesDiscovered(BluetoothGatt.this, status); } catch (Exception ex) { @@ -312,11 +246,12 @@ public final class BluetoothGatt implements BluetoothProfile { * Updates the internal value. * @hide */ - public void onCharacteristicRead(String address, int status, int srvcType, - int srvcInstId, ParcelUuid srvcUuid, - int charInstId, ParcelUuid charUuid, byte[] value) { + public void onCharacteristicRead(String address, int status, int handle, byte[] value) { if (VDBG) Log.d(TAG, "onCharacteristicRead() - Device=" + address - + " UUID=" + charUuid + " Status=" + status); + + " handle=" + handle + " Status=" + status); + + Log.w(TAG, "onCharacteristicRead() - Device=" + address + + " handle=" + handle + " Status=" + status); if (!address.equals(mDevice.getAddress())) { return; @@ -331,9 +266,7 @@ public final class BluetoothGatt implements BluetoothProfile { && mAuthRetry == false) { try { mAuthRetry = true; - mService.readCharacteristic(mClientIf, address, - srvcType, srvcInstId, srvcUuid, - charInstId, charUuid, AUTHENTICATION_MITM); + mService.readCharacteristic(mClientIf, address, handle, AUTHENTICATION_MITM); return; } catch (RemoteException e) { Log.e(TAG,"",e); @@ -342,13 +275,11 @@ public final class BluetoothGatt implements BluetoothProfile { mAuthRetry = false; - BluetoothGattService service = getService(mDevice, srvcUuid.getUuid(), - srvcInstId, srvcType); - if (service == null) return; - - BluetoothGattCharacteristic characteristic = service.getCharacteristic( - charUuid.getUuid(), charInstId); - if (characteristic == null) return; + BluetoothGattCharacteristic characteristic = getCharacteristicById(mDevice, handle); + if (characteristic == null) { + Log.w(TAG, "onCharacteristicRead() failed to find characteristic!"); + return; + } if (status == 0) characteristic.setValue(value); @@ -364,11 +295,9 @@ public final class BluetoothGatt implements BluetoothProfile { * Let the app know how we did... * @hide */ - public void onCharacteristicWrite(String address, int status, int srvcType, - int srvcInstId, ParcelUuid srvcUuid, - int charInstId, ParcelUuid charUuid) { + public void onCharacteristicWrite(String address, int status, int handle) { if (VDBG) Log.d(TAG, "onCharacteristicWrite() - Device=" + address - + " UUID=" + charUuid + " Status=" + status); + + " handle=" + handle + " Status=" + status); if (!address.equals(mDevice.getAddress())) { return; @@ -378,12 +307,7 @@ public final class BluetoothGatt implements BluetoothProfile { mDeviceBusy = false; } - BluetoothGattService service = getService(mDevice, srvcUuid.getUuid(), - srvcInstId, srvcType); - if (service == null) return; - - BluetoothGattCharacteristic characteristic = service.getCharacteristic( - charUuid.getUuid(), charInstId); + BluetoothGattCharacteristic characteristic = getCharacteristicById(mDevice, handle); if (characteristic == null) return; if ((status == GATT_INSUFFICIENT_AUTHENTICATION @@ -391,8 +315,7 @@ public final class BluetoothGatt implements BluetoothProfile { && mAuthRetry == false) { try { mAuthRetry = true; - mService.writeCharacteristic(mClientIf, address, - srvcType, srvcInstId, srvcUuid, charInstId, charUuid, + mService.writeCharacteristic(mClientIf, address, handle, characteristic.getWriteType(), AUTHENTICATION_MITM, characteristic.getValue()); return; @@ -415,21 +338,14 @@ public final class BluetoothGatt implements BluetoothProfile { * Updates the internal value. * @hide */ - public void onNotify(String address, int srvcType, - int srvcInstId, ParcelUuid srvcUuid, - int charInstId, ParcelUuid charUuid, - byte[] value) { - if (VDBG) Log.d(TAG, "onNotify() - Device=" + address + " UUID=" + charUuid); + public void onNotify(String address, int handle, byte[] value) { + if (VDBG) Log.d(TAG, "onNotify() - Device=" + address + " handle=" + handle); if (!address.equals(mDevice.getAddress())) { return; } - BluetoothGattService service = getService(mDevice, srvcUuid.getUuid(), - srvcInstId, srvcType); - if (service == null) return; - BluetoothGattCharacteristic characteristic = service.getCharacteristic( - charUuid.getUuid(), charInstId); + BluetoothGattCharacteristic characteristic = getCharacteristicById(mDevice, handle); if (characteristic == null) return; characteristic.setValue(value); @@ -445,12 +361,8 @@ public final class BluetoothGatt implements BluetoothProfile { * Descriptor has been read. * @hide */ - public void onDescriptorRead(String address, int status, int srvcType, - int srvcInstId, ParcelUuid srvcUuid, - int charInstId, ParcelUuid charUuid, - int descrInstId, ParcelUuid descrUuid, - byte[] value) { - if (VDBG) Log.d(TAG, "onDescriptorRead() - Device=" + address + " UUID=" + charUuid); + public void onDescriptorRead(String address, int status, int handle, byte[] value) { + if (VDBG) Log.d(TAG, "onDescriptorRead() - Device=" + address + " handle=" + handle); if (!address.equals(mDevice.getAddress())) { return; @@ -460,16 +372,7 @@ public final class BluetoothGatt implements BluetoothProfile { mDeviceBusy = false; } - BluetoothGattService service = getService(mDevice, srvcUuid.getUuid(), - srvcInstId, srvcType); - if (service == null) return; - - BluetoothGattCharacteristic characteristic = service.getCharacteristic( - charUuid.getUuid(), charInstId); - if (characteristic == null) return; - - BluetoothGattDescriptor descriptor = characteristic.getDescriptor( - descrUuid.getUuid(), descrInstId); + BluetoothGattDescriptor descriptor = getDescriptorById(mDevice, handle); if (descriptor == null) return; if (status == 0) descriptor.setValue(value); @@ -479,9 +382,7 @@ public final class BluetoothGatt implements BluetoothProfile { && mAuthRetry == false) { try { mAuthRetry = true; - mService.readDescriptor(mClientIf, address, - srvcType, srvcInstId, srvcUuid, charInstId, charUuid, - descrInstId, descrUuid, AUTHENTICATION_MITM); + mService.readDescriptor(mClientIf, address, handle, AUTHENTICATION_MITM); return; } catch (RemoteException e) { Log.e(TAG,"",e); @@ -501,11 +402,8 @@ public final class BluetoothGatt implements BluetoothProfile { * Descriptor write operation complete. * @hide */ - public void onDescriptorWrite(String address, int status, int srvcType, - int srvcInstId, ParcelUuid srvcUuid, - int charInstId, ParcelUuid charUuid, - int descrInstId, ParcelUuid descrUuid) { - if (VDBG) Log.d(TAG, "onDescriptorWrite() - Device=" + address + " UUID=" + charUuid); + public void onDescriptorWrite(String address, int status, int handle) { + if (VDBG) Log.d(TAG, "onDescriptorWrite() - Device=" + address + " handle=" + handle); if (!address.equals(mDevice.getAddress())) { return; @@ -515,16 +413,7 @@ public final class BluetoothGatt implements BluetoothProfile { mDeviceBusy = false; } - BluetoothGattService service = getService(mDevice, srvcUuid.getUuid(), - srvcInstId, srvcType); - if (service == null) return; - - BluetoothGattCharacteristic characteristic = service.getCharacteristic( - charUuid.getUuid(), charInstId); - if (characteristic == null) return; - - BluetoothGattDescriptor descriptor = characteristic.getDescriptor( - descrUuid.getUuid(), descrInstId); + BluetoothGattDescriptor descriptor = getDescriptorById(mDevice, handle); if (descriptor == null) return; if ((status == GATT_INSUFFICIENT_AUTHENTICATION @@ -532,9 +421,8 @@ public final class BluetoothGatt implements BluetoothProfile { && mAuthRetry == false) { try { mAuthRetry = true; - mService.writeDescriptor(mClientIf, address, - srvcType, srvcInstId, srvcUuid, charInstId, charUuid, - descrInstId, descrUuid, characteristic.getWriteType(), + mService.writeDescriptor(mClientIf, address, handle, + descriptor.getCharacteristic().getWriteType(), AUTHENTICATION_MITM, descriptor.getValue()); return; } catch (RemoteException e) { @@ -651,6 +539,37 @@ public final class BluetoothGatt implements BluetoothProfile { /** + * Returns a characteristic with id equal to instanceId. + * @hide + */ + /*package*/ BluetoothGattCharacteristic getCharacteristicById(BluetoothDevice device, int instanceId) { + for(BluetoothGattService svc : mServices) { + for(BluetoothGattCharacteristic charac : svc.getCharacteristics()) { + Log.w(TAG, "getCharacteristicById() comparing " + charac.getInstanceId() + " and " + instanceId); + if (charac.getInstanceId() == instanceId) + return charac; + } + } + return null; + } + + /** + * Returns a descriptor with id equal to instanceId. + * @hide + */ + /*package*/ BluetoothGattDescriptor getDescriptorById(BluetoothDevice device, int instanceId) { + for(BluetoothGattService svc : mServices) { + for(BluetoothGattCharacteristic charac : svc.getCharacteristics()) { + for(BluetoothGattDescriptor desc : charac.getDescriptors()) { + if (desc.getInstanceId() == instanceId) + return desc; + } + } + } + return null; + } + + /** * Register an application callback to start using GATT. * * <p>This is an asynchronous call. The callback {@link BluetoothGattCallback#onAppRegistered} @@ -898,9 +817,7 @@ public final class BluetoothGatt implements BluetoothProfile { try { mService.readCharacteristic(mClientIf, device.getAddress(), - service.getType(), service.getInstanceId(), - new ParcelUuid(service.getUuid()), characteristic.getInstanceId(), - new ParcelUuid(characteristic.getUuid()), AUTHENTICATION_NONE); + characteristic.getInstanceId(), AUTHENTICATION_NONE); } catch (RemoteException e) { Log.e(TAG,"",e); mDeviceBusy = false; @@ -943,11 +860,8 @@ public final class BluetoothGatt implements BluetoothProfile { try { mService.writeCharacteristic(mClientIf, device.getAddress(), - service.getType(), service.getInstanceId(), - new ParcelUuid(service.getUuid()), characteristic.getInstanceId(), - new ParcelUuid(characteristic.getUuid()), - characteristic.getWriteType(), AUTHENTICATION_NONE, - characteristic.getValue()); + characteristic.getInstanceId(), characteristic.getWriteType(), + AUTHENTICATION_NONE, characteristic.getValue()); } catch (RemoteException e) { Log.e(TAG,"",e); mDeviceBusy = false; @@ -988,11 +902,8 @@ public final class BluetoothGatt implements BluetoothProfile { } try { - mService.readDescriptor(mClientIf, device.getAddress(), service.getType(), - service.getInstanceId(), new ParcelUuid(service.getUuid()), - characteristic.getInstanceId(), new ParcelUuid(characteristic.getUuid()), - descriptor.getInstanceId(), new ParcelUuid(descriptor.getUuid()), - AUTHENTICATION_NONE); + mService.readDescriptor(mClientIf, device.getAddress(), + descriptor.getInstanceId(), AUTHENTICATION_NONE); } catch (RemoteException e) { Log.e(TAG,"",e); mDeviceBusy = false; @@ -1032,12 +943,8 @@ public final class BluetoothGatt implements BluetoothProfile { } try { - mService.writeDescriptor(mClientIf, device.getAddress(), service.getType(), - service.getInstanceId(), new ParcelUuid(service.getUuid()), - characteristic.getInstanceId(), new ParcelUuid(characteristic.getUuid()), - descriptor.getInstanceId(), new ParcelUuid(descriptor.getUuid()), - characteristic.getWriteType(), AUTHENTICATION_NONE, - descriptor.getValue()); + mService.writeDescriptor(mClientIf, device.getAddress(), descriptor.getInstanceId(), + characteristic.getWriteType(), AUTHENTICATION_NONE, descriptor.getValue()); } catch (RemoteException e) { Log.e(TAG,"",e); mDeviceBusy = false; @@ -1168,10 +1075,7 @@ public final class BluetoothGatt implements BluetoothProfile { try { mService.registerForNotification(mClientIf, device.getAddress(), - service.getType(), service.getInstanceId(), - new ParcelUuid(service.getUuid()), characteristic.getInstanceId(), - new ParcelUuid(characteristic.getUuid()), - enable); + characteristic.getInstanceId(), enable); } catch (RemoteException e) { Log.e(TAG,"",e); return false; diff --git a/core/java/android/bluetooth/BluetoothGattCallbackWrapper.java b/core/java/android/bluetooth/BluetoothGattCallbackWrapper.java index 01778b3dc40e..17e533a5b32f 100644 --- a/core/java/android/bluetooth/BluetoothGattCallbackWrapper.java +++ b/core/java/android/bluetooth/BluetoothGattCallbackWrapper.java @@ -18,6 +18,7 @@ package android.bluetooth; import android.bluetooth.le.AdvertiseSettings; import android.bluetooth.le.ScanResult; +import android.bluetooth.BluetoothGattService; import android.os.ParcelUuid; import android.os.RemoteException; @@ -48,41 +49,17 @@ public class BluetoothGattCallbackWrapper extends IBluetoothGattCallback.Stub { } @Override - public void onGetService(String address, int srvcType, int srvcInstId, ParcelUuid srvcUuid) - throws RemoteException { - } - - @Override - public void onGetIncludedService(String address, int srvcType, int srvcInstId, - ParcelUuid srvcUuid, int inclSrvcType, int inclSrvcInstId, ParcelUuid inclSrvcUuid) - throws RemoteException { - } - - @Override - public void onGetCharacteristic(String address, int srvcType, int srvcInstId, - ParcelUuid srvcUuid, int charInstId, ParcelUuid charUuid, int charProps) - throws RemoteException { - } - - @Override - public void onGetDescriptor(String address, int srvcType, int srvcInstId, ParcelUuid srvcUuid, - int charInstId, ParcelUuid charUuid, int descrInstId, ParcelUuid descrUuid) - throws RemoteException { - } - - @Override - public void onSearchComplete(String address, int status) throws RemoteException { + public void onSearchComplete(String address, List<BluetoothGattService> services, + int status) throws RemoteException { } @Override - public void onCharacteristicRead(String address, int status, int srvcType, int srvcInstId, - ParcelUuid srvcUuid, int charInstId, ParcelUuid charUuid, byte[] value) + public void onCharacteristicRead(String address, int status, int handle, byte[] value) throws RemoteException { } @Override - public void onCharacteristicWrite(String address, int status, int srvcType, int srvcInstId, - ParcelUuid srvcUuid, int charInstId, ParcelUuid charUuid) throws RemoteException { + public void onCharacteristicWrite(String address, int status, int handle) throws RemoteException { } @Override @@ -90,20 +67,15 @@ public class BluetoothGattCallbackWrapper extends IBluetoothGattCallback.Stub { } @Override - public void onDescriptorRead(String address, int status, int srvcType, int srvcInstId, - ParcelUuid srvcUuid, int charInstId, ParcelUuid charUuid, int descrInstId, - ParcelUuid descrUuid, byte[] value) throws RemoteException { + public void onDescriptorRead(String address, int status, int handle, byte[] value) throws RemoteException { } @Override - public void onDescriptorWrite(String address, int status, int srvcType, int srvcInstId, - ParcelUuid srvcUuid, int charInstId, ParcelUuid charUuid, int descrInstId, - ParcelUuid descrUuid) throws RemoteException { + public void onDescriptorWrite(String address, int status, int handle) throws RemoteException { } @Override - public void onNotify(String address, int srvcType, int srvcInstId, ParcelUuid srvcUuid, - int charInstId, ParcelUuid charUuid, byte[] value) throws RemoteException { + public void onNotify(String address, int handle, byte[] value) throws RemoteException { } @Override diff --git a/core/java/android/bluetooth/BluetoothGattCharacteristic.aidl b/core/java/android/bluetooth/BluetoothGattCharacteristic.aidl new file mode 100644 index 000000000000..bbb8623e2178 --- /dev/null +++ b/core/java/android/bluetooth/BluetoothGattCharacteristic.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.bluetooth; + +parcelable BluetoothGattCharacteristic; diff --git a/core/java/android/bluetooth/BluetoothGattCharacteristic.java b/core/java/android/bluetooth/BluetoothGattCharacteristic.java index 7cdcc2c9b9ff..7d698b3ef5a6 100644 --- a/core/java/android/bluetooth/BluetoothGattCharacteristic.java +++ b/core/java/android/bluetooth/BluetoothGattCharacteristic.java @@ -15,6 +15,9 @@ */ package android.bluetooth; +import android.os.Parcel; +import android.os.Parcelable; +import android.os.ParcelUuid; import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -26,7 +29,7 @@ import java.util.UUID; * {@link BluetoothGattService}. The characteristic contains a value as well as * additional information and optional GATT descriptors, {@link BluetoothGattDescriptor}. */ -public class BluetoothGattCharacteristic { +public class BluetoothGattCharacteristic implements Parcelable { /** * Characteristic proprty: Characteristic is broadcastable. @@ -242,6 +245,15 @@ public class BluetoothGattCharacteristic { initCharacteristic(service, uuid, instanceId, properties, permissions); } + /** + * Create a new BluetoothGattCharacteristic + * @hide + */ + public BluetoothGattCharacteristic(UUID uuid, int instanceId, + int properties, int permissions) { + initCharacteristic(null, uuid, instanceId, properties, permissions); + } + private void initCharacteristic(BluetoothGattService service, UUID uuid, int instanceId, int properties, int permissions) { @@ -261,6 +273,50 @@ public class BluetoothGattCharacteristic { } /** + * @hide + */ + public int describeContents() { + return 0; + } + + public void writeToParcel(Parcel out, int flags) { + out.writeParcelable(new ParcelUuid(mUuid), 0); + out.writeInt(mInstance); + out.writeInt(mProperties); + out.writeInt(mPermissions); + out.writeTypedList(mDescriptors); + } + + public static final Parcelable.Creator<BluetoothGattCharacteristic> CREATOR + = new Parcelable.Creator<BluetoothGattCharacteristic>() { + public BluetoothGattCharacteristic createFromParcel(Parcel in) { + return new BluetoothGattCharacteristic(in); + } + + public BluetoothGattCharacteristic[] newArray(int size) { + return new BluetoothGattCharacteristic[size]; + } + }; + + private BluetoothGattCharacteristic(Parcel in) { + mUuid = ((ParcelUuid)in.readParcelable(null)).getUuid(); + mInstance = in.readInt(); + mProperties = in.readInt(); + mPermissions = in.readInt(); + + mDescriptors = new ArrayList<BluetoothGattDescriptor>(); + + ArrayList<BluetoothGattDescriptor> descs = + in.createTypedArrayList(BluetoothGattDescriptor.CREATOR); + if (descs != null) { + for (BluetoothGattDescriptor desc: descs) { + desc.setCharacteristic(this); + mDescriptors.add(desc); + } + } + } + + /** * Returns the deisred key size. * @hide */ diff --git a/core/java/android/bluetooth/BluetoothGattDescriptor.aidl b/core/java/android/bluetooth/BluetoothGattDescriptor.aidl new file mode 100644 index 000000000000..439327331671 --- /dev/null +++ b/core/java/android/bluetooth/BluetoothGattDescriptor.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.bluetooth; + +parcelable BluetoothGattDescriptor; diff --git a/core/java/android/bluetooth/BluetoothGattDescriptor.java b/core/java/android/bluetooth/BluetoothGattDescriptor.java index 5f525dc609a0..28317c49604f 100644 --- a/core/java/android/bluetooth/BluetoothGattDescriptor.java +++ b/core/java/android/bluetooth/BluetoothGattDescriptor.java @@ -16,6 +16,9 @@ package android.bluetooth; +import android.os.Parcel; +import android.os.Parcelable; +import android.os.ParcelUuid; import java.util.UUID; /** @@ -25,7 +28,7 @@ import java.util.UUID; * characteristic, {@link BluetoothGattCharacteristic}. They can be used to describe * the characteristic's features or to control certain behaviours of the characteristic. */ -public class BluetoothGattDescriptor { +public class BluetoothGattDescriptor implements Parcelable { /** * Value used to enable notification for a client configuration descriptor @@ -138,6 +141,13 @@ public class BluetoothGattDescriptor { initDescriptor(characteristic, uuid, instance, permissions); } + /** + * @hide + */ + public BluetoothGattDescriptor(UUID uuid, int instance, int permissions) { + initDescriptor(null, uuid, instance, permissions); + } + private void initDescriptor(BluetoothGattCharacteristic characteristic, UUID uuid, int instance, int permissions) { mCharacteristic = characteristic; @@ -147,6 +157,36 @@ public class BluetoothGattDescriptor { } /** + * @hide + */ + public int describeContents() { + return 0; + } + + public void writeToParcel(Parcel out, int flags) { + out.writeParcelable(new ParcelUuid(mUuid), 0); + out.writeInt(mInstance); + out.writeInt(mPermissions); + } + + public static final Parcelable.Creator<BluetoothGattDescriptor> CREATOR + = new Parcelable.Creator<BluetoothGattDescriptor>() { + public BluetoothGattDescriptor createFromParcel(Parcel in) { + return new BluetoothGattDescriptor(in); + } + + public BluetoothGattDescriptor[] newArray(int size) { + return new BluetoothGattDescriptor[size]; + } + }; + + private BluetoothGattDescriptor(Parcel in) { + mUuid = ((ParcelUuid)in.readParcelable(null)).getUuid(); + mInstance = in.readInt(); + mPermissions = in.readInt(); + } + + /** * Returns the characteristic this descriptor belongs to. * @return The characteristic. */ diff --git a/core/java/android/bluetooth/BluetoothGattIncludedService.aidl b/core/java/android/bluetooth/BluetoothGattIncludedService.aidl new file mode 100644 index 000000000000..1ef427edc3a0 --- /dev/null +++ b/core/java/android/bluetooth/BluetoothGattIncludedService.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.bluetooth; + +parcelable BluetoothGattIncludedService; diff --git a/core/java/android/bluetooth/BluetoothGattIncludedService.java b/core/java/android/bluetooth/BluetoothGattIncludedService.java new file mode 100644 index 000000000000..155dc571d230 --- /dev/null +++ b/core/java/android/bluetooth/BluetoothGattIncludedService.java @@ -0,0 +1,110 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package android.bluetooth; + +import android.os.Parcel; +import android.os.Parcelable; +import android.os.ParcelUuid; +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; + +/** + * Represents a Bluetooth GATT Included Service + * @hide + */ +public class BluetoothGattIncludedService implements Parcelable { + + /** + * The UUID of this service. + */ + protected UUID mUuid; + + /** + * Instance ID for this service. + */ + protected int mInstanceId; + + /** + * Service type (Primary/Secondary). + */ + protected int mServiceType; + + /** + * Create a new BluetoothGattIncludedService + */ + public BluetoothGattIncludedService(UUID uuid, int instanceId, int serviceType) { + mUuid = uuid; + mInstanceId = instanceId; + mServiceType = serviceType; + } + + public int describeContents() { + return 0; + } + + public void writeToParcel(Parcel out, int flags) { + out.writeParcelable(new ParcelUuid(mUuid), 0); + out.writeInt(mInstanceId); + out.writeInt(mServiceType); + } + + public static final Parcelable.Creator<BluetoothGattIncludedService> CREATOR + = new Parcelable.Creator<BluetoothGattIncludedService>() { + public BluetoothGattIncludedService createFromParcel(Parcel in) { + return new BluetoothGattIncludedService(in); + } + + public BluetoothGattIncludedService[] newArray(int size) { + return new BluetoothGattIncludedService[size]; + } + }; + + private BluetoothGattIncludedService(Parcel in) { + mUuid = ((ParcelUuid)in.readParcelable(null)).getUuid(); + mInstanceId = in.readInt(); + mServiceType = in.readInt(); + } + + /** + * Returns the UUID of this service + * + * @return UUID of this service + */ + public UUID getUuid() { + return mUuid; + } + + /** + * Returns the instance ID for this service + * + * <p>If a remote device offers multiple services with the same UUID + * (ex. multiple battery services for different batteries), the instance + * ID is used to distuinguish services. + * + * @return Instance ID of this service + */ + public int getInstanceId() { + return mInstanceId; + } + + /** + * Get the type of this service (primary/secondary) + */ + public int getType() { + return mServiceType; + } +} diff --git a/core/java/android/bluetooth/BluetoothGattService.aidl b/core/java/android/bluetooth/BluetoothGattService.aidl new file mode 100644 index 000000000000..84314d2072df --- /dev/null +++ b/core/java/android/bluetooth/BluetoothGattService.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.bluetooth; + +parcelable BluetoothGattService; diff --git a/core/java/android/bluetooth/BluetoothGattService.java b/core/java/android/bluetooth/BluetoothGattService.java index 52bc0f796cb5..a4e1dc01d002 100644 --- a/core/java/android/bluetooth/BluetoothGattService.java +++ b/core/java/android/bluetooth/BluetoothGattService.java @@ -15,6 +15,9 @@ */ package android.bluetooth; +import android.os.Parcel; +import android.os.Parcelable; +import android.os.ParcelUuid; import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -25,7 +28,7 @@ import java.util.UUID; * <p> Gatt Service contains a collection of {@link BluetoothGattCharacteristic}, * as well as referenced services. */ -public class BluetoothGattService { +public class BluetoothGattService implements Parcelable { /** * Primary service @@ -117,6 +120,81 @@ public class BluetoothGattService { } /** + * Create a new BluetoothGattService + * @hide + */ + public BluetoothGattService(UUID uuid, int instanceId, int serviceType) { + mDevice = null; + mUuid = uuid; + mInstanceId = instanceId; + mServiceType = serviceType; + mCharacteristics = new ArrayList<BluetoothGattCharacteristic>(); + mIncludedServices = new ArrayList<BluetoothGattService>(); + } + + /** + * @hide + */ + public int describeContents() { + return 0; + } + + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeParcelable(new ParcelUuid(mUuid), 0); + out.writeInt(mInstanceId); + out.writeInt(mServiceType); + out.writeTypedList(mCharacteristics); + + ArrayList<BluetoothGattIncludedService> includedServices = + new ArrayList<BluetoothGattIncludedService>(mIncludedServices.size()); + for(BluetoothGattService s : mIncludedServices) { + includedServices.add(new BluetoothGattIncludedService(s.getUuid(), + s.getInstanceId(), s.getType())); + } + out.writeTypedList(includedServices); + } + + public static final Parcelable.Creator<BluetoothGattService> CREATOR + = new Parcelable.Creator<BluetoothGattService>() { + public BluetoothGattService createFromParcel(Parcel in) { + return new BluetoothGattService(in); + } + + public BluetoothGattService[] newArray(int size) { + return new BluetoothGattService[size]; + } + }; + + private BluetoothGattService(Parcel in) { + mUuid = ((ParcelUuid)in.readParcelable(null)).getUuid(); + mInstanceId = in.readInt(); + mServiceType = in.readInt(); + + mCharacteristics = new ArrayList<BluetoothGattCharacteristic>(); + + ArrayList<BluetoothGattCharacteristic> chrcs = + in.createTypedArrayList(BluetoothGattCharacteristic.CREATOR); + if (chrcs != null) { + for (BluetoothGattCharacteristic chrc : chrcs) { + chrc.setService(this); + mCharacteristics.add(chrc); + } + } + + mIncludedServices = new ArrayList<BluetoothGattService>(); + + ArrayList<BluetoothGattIncludedService> inclSvcs = + in.createTypedArrayList(BluetoothGattIncludedService.CREATOR); + if (chrcs != null) { + for (BluetoothGattIncludedService isvc : inclSvcs) { + mIncludedServices.add(new BluetoothGattService(null, isvc.getUuid(), + isvc.getInstanceId(), isvc.getType())); + } + } + } + + /** * Returns the device associated with this service. * @hide */ @@ -125,6 +203,14 @@ public class BluetoothGattService { } /** + * Returns the device associated with this service. + * @hide + */ + /*package*/ void setDevice(BluetoothDevice device) { + this.mDevice = device; + } + + /** * Add an included service to this service. * <p>Requires {@link android.Manifest.permission#BLUETOOTH} permission. * @@ -192,7 +278,7 @@ public class BluetoothGattService { * Add an included service to the internal map. * @hide */ - /*package*/ void addIncludedService(BluetoothGattService includedService) { + public void addIncludedService(BluetoothGattService includedService) { mIncludedServices.add(includedService); } diff --git a/core/java/android/bluetooth/IBluetoothGatt.aidl b/core/java/android/bluetooth/IBluetoothGatt.aidl index 6b5f77faacd3..adb07df29770 100644 --- a/core/java/android/bluetooth/IBluetoothGatt.aidl +++ b/core/java/android/bluetooth/IBluetoothGatt.aidl @@ -51,28 +51,13 @@ interface IBluetoothGatt { void clientDisconnect(in int clientIf, in String address); void refreshDevice(in int clientIf, in String address); void discoverServices(in int clientIf, in String address); - void readCharacteristic(in int clientIf, in String address, in int srvcType, - in int srvcInstanceId, in ParcelUuid srvcId, - in int charInstanceId, in ParcelUuid charId, - in int authReq); - void writeCharacteristic(in int clientIf, in String address, in int srvcType, - in int srvcInstanceId, in ParcelUuid srvcId, - in int charInstanceId, in ParcelUuid charId, + void readCharacteristic(in int clientIf, in String address, in int handle, in int authReq); + void writeCharacteristic(in int clientIf, in String address, in int handle, in int writeType, in int authReq, in byte[] value); - void readDescriptor(in int clientIf, in String address, in int srvcType, - in int srvcInstanceId, in ParcelUuid srvcId, - in int charInstanceId, in ParcelUuid charId, - in int descrInstanceId, in ParcelUuid descrUuid, - in int authReq); - void writeDescriptor(in int clientIf, in String address, in int srvcType, - in int srvcInstanceId, in ParcelUuid srvcId, - in int charInstanceId, in ParcelUuid charId, - in int descrInstanceId, in ParcelUuid descrId, + void readDescriptor(in int clientIf, in String address, in int handle, in int authReq); + void writeDescriptor(in int clientIf, in String address, in int handle, in int writeType, in int authReq, in byte[] value); - void registerForNotification(in int clientIf, in String address, in int srvcType, - in int srvcInstanceId, in ParcelUuid srvcId, - in int charInstanceId, in ParcelUuid charId, - in boolean enable); + void registerForNotification(in int clientIf, in String address, in int handle, in boolean enable); void beginReliableWrite(in int clientIf, in String address); void endReliableWrite(in int clientIf, in String address, in boolean execute); void readRemoteRssi(in int clientIf, in String address); diff --git a/core/java/android/bluetooth/IBluetoothGattCallback.aidl b/core/java/android/bluetooth/IBluetoothGattCallback.aidl index cbba9f021423..7163c370694c 100644 --- a/core/java/android/bluetooth/IBluetoothGattCallback.aidl +++ b/core/java/android/bluetooth/IBluetoothGattCallback.aidl @@ -16,6 +16,7 @@ package android.bluetooth; import android.os.ParcelUuid; +import android.bluetooth.BluetoothGattService; import android.bluetooth.le.AdvertiseSettings; import android.bluetooth.le.ScanResult; @@ -29,41 +30,13 @@ oneway interface IBluetoothGattCallback { in boolean connected, in String address); void onScanResult(in ScanResult scanResult); void onBatchScanResults(in List<ScanResult> batchResults); - void onGetService(in String address, in int srvcType, in int srvcInstId, - in ParcelUuid srvcUuid); - void onGetIncludedService(in String address, in int srvcType, in int srvcInstId, - in ParcelUuid srvcUuid, in int inclSrvcType, - in int inclSrvcInstId, in ParcelUuid inclSrvcUuid); - void onGetCharacteristic(in String address, in int srvcType, - in int srvcInstId, in ParcelUuid srvcUuid, - in int charInstId, in ParcelUuid charUuid, - in int charProps); - void onGetDescriptor(in String address, in int srvcType, - in int srvcInstId, in ParcelUuid srvcUuid, - in int charInstId, in ParcelUuid charUuid, - in int descrInstId, in ParcelUuid descrUuid); - void onSearchComplete(in String address, in int status); - void onCharacteristicRead(in String address, in int status, in int srvcType, - in int srvcInstId, in ParcelUuid srvcUuid, - in int charInstId, in ParcelUuid charUuid, - in byte[] value); - void onCharacteristicWrite(in String address, in int status, in int srvcType, - in int srvcInstId, in ParcelUuid srvcUuid, - in int charInstId, in ParcelUuid charUuid); + void onSearchComplete(in String address, in List<BluetoothGattService> services, in int status); + void onCharacteristicRead(in String address, in int status, in int handle, in byte[] value); + void onCharacteristicWrite(in String address, in int status, in int handle); void onExecuteWrite(in String address, in int status); - void onDescriptorRead(in String address, in int status, in int srvcType, - in int srvcInstId, in ParcelUuid srvcUuid, - in int charInstId, in ParcelUuid charUuid, - in int descrInstId, in ParcelUuid descrUuid, - in byte[] value); - void onDescriptorWrite(in String address, in int status, in int srvcType, - in int srvcInstId, in ParcelUuid srvcUuid, - in int charInstId, in ParcelUuid charUuid, - in int descrInstId, in ParcelUuid descrUuid); - void onNotify(in String address, in int srvcType, - in int srvcInstId, in ParcelUuid srvcUuid, - in int charInstId, in ParcelUuid charUuid, - in byte[] value); + void onDescriptorRead(in String address, in int status, in int handle, in byte[] value); + void onDescriptorWrite(in String address, in int status, in int handle); + void onNotify(in String address, in int handle, in byte[] value); void onReadRemoteRssi(in String address, in int rssi, in int status); void onMultiAdvertiseCallback(in int status, boolean isStart, in AdvertiseSettings advertiseSettings); diff --git a/core/java/android/bluetooth/IBluetoothManagerCallback.aidl b/core/java/android/bluetooth/IBluetoothManagerCallback.aidl index 1385dafca2fb..8104d2199482 100644 --- a/core/java/android/bluetooth/IBluetoothManagerCallback.aidl +++ b/core/java/android/bluetooth/IBluetoothManagerCallback.aidl @@ -23,7 +23,7 @@ import android.bluetooth.IBluetooth; * * {@hide} */ -interface IBluetoothManagerCallback { +oneway interface IBluetoothManagerCallback { void onBluetoothServiceUp(in IBluetooth bluetoothService); void onBluetoothServiceDown(); void onBrEdrDown(); diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java index 1c3f45cdbde8..bc2d788bf4c8 100644 --- a/core/java/android/content/ContentProvider.java +++ b/core/java/android/content/ContentProvider.java @@ -394,6 +394,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { @Override public Bundle call( String callingPkg, String method, @Nullable String arg, @Nullable Bundle extras) { + Bundle.setDefusable(extras, true); final String original = setCallingPackage(callingPkg); try { return ContentProvider.this.call(method, arg, extras); @@ -412,6 +413,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 { @Override public AssetFileDescriptor openTypedAssetFile(String callingPkg, Uri uri, String mimeType, Bundle opts, ICancellationSignal cancellationSignal) throws FileNotFoundException { + Bundle.setDefusable(opts, true); validateIncomingUri(uri); uri = getUriWithoutUserId(uri); enforceFilePermission(callingPkg, uri, "r", null); diff --git a/core/java/android/content/ContentResolver.java b/core/java/android/content/ContentResolver.java index 441f188f91e6..cd67b3ee8a3e 100644 --- a/core/java/android/content/ContentResolver.java +++ b/core/java/android/content/ContentResolver.java @@ -1412,7 +1412,9 @@ public abstract class ContentResolver { throw new IllegalArgumentException("Unknown URI " + uri); } try { - return provider.call(mPackageName, method, arg, extras); + final Bundle res = provider.call(mPackageName, method, arg, extras); + Bundle.setDefusable(res, true); + return res; } catch (RemoteException e) { // Arbitrary and not worth documenting, as Activity // Manager will kill this process shortly anyway. diff --git a/core/java/android/content/SyncRequest.java b/core/java/android/content/SyncRequest.java index f793d76520de..541ebbd32f11 100644 --- a/core/java/android/content/SyncRequest.java +++ b/core/java/android/content/SyncRequest.java @@ -147,7 +147,7 @@ public class SyncRequest implements Parcelable { } private SyncRequest(Parcel in) { - mExtras = in.readBundle(); + mExtras = Bundle.setDefusable(in.readBundle(), true); mSyncFlexTimeSecs = in.readLong(); mSyncRunTimeSecs = in.readLong(); mIsPeriodic = (in.readInt() != 0); diff --git a/core/java/android/content/res/ComplexColor.java b/core/java/android/content/res/ComplexColor.java index b297764629cf..58c6fc5174d3 100644 --- a/core/java/android/content/res/ComplexColor.java +++ b/core/java/android/content/res/ComplexColor.java @@ -23,6 +23,7 @@ import android.graphics.Color; /** * Defines an abstract class for the complex color information, like * {@link android.content.res.ColorStateList} or {@link android.content.res.GradientColor} + * @hide */ public abstract class ComplexColor { private int mChangingConfigurations; diff --git a/core/java/android/content/res/GradientColor.java b/core/java/android/content/res/GradientColor.java index f29656abe6c3..c49c4b28a413 100644 --- a/core/java/android/content/res/GradientColor.java +++ b/core/java/android/content/res/GradientColor.java @@ -68,6 +68,7 @@ import java.lang.annotation.RetentionPolicy; * * Also note if any color "item" element is defined, then startColor, centerColor and endColor will * be ignored. + * @hide */ public class GradientColor extends ComplexColor { private static final String TAG = "GradientColor"; diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index fb706fcb3c94..387fda717e48 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -999,6 +999,9 @@ public class Resources { return mResourcesImpl.loadColorStateList(this, value, id, theme); } + /** + * @hide + */ @Nullable public ComplexColor loadComplexColor(@NonNull TypedValue value, int id, @Nullable Theme theme) { return mResourcesImpl.loadComplexColor(this, value, id, theme); diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java index f6ac0bac125a..92134ee01de8 100644 --- a/core/java/android/content/res/TypedArray.java +++ b/core/java/android/content/res/TypedArray.java @@ -475,6 +475,7 @@ public class TypedArray { * been recycled. * @throws UnsupportedOperationException if the attribute is defined but is * not an integer color, color state list or GradientColor. + * @hide */ @Nullable public ComplexColor getComplexColor(@StyleableRes int index) { diff --git a/core/java/android/hardware/location/ContextHubManager.java b/core/java/android/hardware/location/ContextHubManager.java index 8deded259194..4ddf7673b58c 100644 --- a/core/java/android/hardware/location/ContextHubManager.java +++ b/core/java/android/hardware/location/ContextHubManager.java @@ -39,7 +39,7 @@ public final class ContextHubManager { private final Looper mMainLooper; private IContextHubService mContextHubService; - private ContextHubCallback mCallback; + private Callback mCallback; private Handler mCallbackHandler; /** @@ -62,8 +62,8 @@ public final class ContextHubManager { /** * An interface to receive asynchronous communication from the context hub. */ - public abstract static class ContextHubCallback { - protected ContextHubCallback() {} + public abstract static class Callback { + protected Callback() {} /** * Callback function called on message receipt from context hub. @@ -226,12 +226,12 @@ public final class ContextHubManager { * * @param callback Callback object * - * @see ContextHubCallback + * @see Callback * * @return int 0 on success, -1 otherwise */ - public int registerContextHubCallback(ContextHubCallback callback) { - return registerContextHubCallback(callback, null); + public int registerCallback(Callback callback) { + return registerCallback(callback, null); } /** @@ -240,11 +240,11 @@ public final class ContextHubManager { * @param callback Callback object * @param handler Handler object * - * @see ContextHubCallback + * @see Callback * * @return int 0 on success, -1 otherwise */ - public int registerContextHubCallback(ContextHubCallback callback, Handler handler) { + public int registerCallback(Callback callback, Handler handler) { synchronized(this) { if (mCallback != null) { Log.e(TAG, "Max number of callbacks reached!"); @@ -259,13 +259,13 @@ public final class ContextHubManager { /** * Unregister a callback for receive messages from the context hub. * - * @see ContextHubCallback + * @see Callback * * @param callback method to deregister * * @return int 0 on success, -1 otherwise */ - public int unregisterContextHubCallback(ContextHubCallback callback) { + public int unregisterCallback(Callback callback) { synchronized(this) { if (callback != mCallback) { Log.e(TAG, "Cannot recognize callback!"); @@ -284,7 +284,7 @@ public final class ContextHubManager { final ContextHubMessage message) { if (mCallback != null) { synchronized(this) { - final ContextHubCallback callback = mCallback; + final Callback callback = mCallback; Handler handler = mCallbackHandler == null ? new Handler(mMainLooper) : mCallbackHandler; handler.post(new Runnable() { diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java index 3792e5c03756..f9a7d192b5bb 100644 --- a/core/java/android/hardware/usb/UsbManager.java +++ b/core/java/android/hardware/usb/UsbManager.java @@ -54,6 +54,8 @@ public class UsbManager { * This is a sticky broadcast for clients that includes USB connected/disconnected state, * <ul> * <li> {@link #USB_CONNECTED} boolean indicating whether USB is connected or disconnected. + * <li> {@link #USB_HOST_CONNECTED} boolean indicating whether USB is connected or + * disconnected as host. * <li> {@link #USB_CONFIGURED} boolean indicating whether USB is configured. * currently zero if not configured, one for configured. * <li> {@link #USB_FUNCTION_ADB} boolean extra indicating whether the @@ -152,6 +154,14 @@ public class UsbManager { public static final String USB_CONNECTED = "connected"; /** + * Boolean extra indicating whether USB is connected or disconnected as host. + * Used in extras for the {@link #ACTION_USB_STATE} broadcast. + * + * {@hide} + */ + public static final String USB_HOST_CONNECTED = "host_connected"; + + /** * Boolean extra indicating whether USB is configured. * Used in extras for the {@link #ACTION_USB_STATE} broadcast. * diff --git a/core/java/android/inputmethodservice/IInputMethodWrapper.java b/core/java/android/inputmethodservice/IInputMethodWrapper.java index 857e3357e133..cc71a9c24bfb 100644 --- a/core/java/android/inputmethodservice/IInputMethodWrapper.java +++ b/core/java/android/inputmethodservice/IInputMethodWrapper.java @@ -36,6 +36,7 @@ import android.view.InputChannel; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputBinding; import android.view.inputmethod.InputConnection; +import android.view.inputmethod.InputConnectionInspector; import android.view.inputmethod.InputMethod; import android.view.inputmethod.InputMethodSession; import android.view.inputmethod.InputMethodSubtype; @@ -164,9 +165,10 @@ class IInputMethodWrapper extends IInputMethod.Stub return; case DO_START_INPUT: { SomeArgs args = (SomeArgs)msg.obj; + int missingMethods = msg.arg1; IInputContext inputContext = (IInputContext)args.arg1; InputConnection ic = inputContext != null - ? new InputConnectionWrapper(inputContext) : null; + ? new InputConnectionWrapper(inputContext, missingMethods) : null; EditorInfo info = (EditorInfo)args.arg2; info.makeCompatible(mTargetSdkVersion); inputMethod.startInput(ic, info); @@ -175,9 +177,10 @@ class IInputMethodWrapper extends IInputMethod.Stub } case DO_RESTART_INPUT: { SomeArgs args = (SomeArgs)msg.obj; + int missingMethods = msg.arg1; IInputContext inputContext = (IInputContext)args.arg1; InputConnection ic = inputContext != null - ? new InputConnectionWrapper(inputContext) : null; + ? new InputConnectionWrapper(inputContext, missingMethods) : null; EditorInfo info = (EditorInfo)args.arg2; info.makeCompatible(mTargetSdkVersion); inputMethod.restartInput(ic, info); @@ -246,8 +249,10 @@ class IInputMethodWrapper extends IInputMethod.Stub @Override public void bindInput(InputBinding binding) { + // This IInputContext is guaranteed to implement all the methods. + final int missingMethodFlags = 0; InputConnection ic = new InputConnectionWrapper( - IInputContext.Stub.asInterface(binding.getConnectionToken())); + IInputContext.Stub.asInterface(binding.getConnectionToken()), missingMethodFlags); InputBinding nu = new InputBinding(ic, binding); mCaller.executeOrSendMessage(mCaller.obtainMessageO(DO_SET_INPUT_CONTEXT, nu)); } @@ -258,15 +263,19 @@ class IInputMethodWrapper extends IInputMethod.Stub } @Override - public void startInput(IInputContext inputContext, EditorInfo attribute) { - mCaller.executeOrSendMessage(mCaller.obtainMessageOO(DO_START_INPUT, - inputContext, attribute)); + public void startInput(IInputContext inputContext, + @InputConnectionInspector.MissingMethodFlags final int missingMethods, + EditorInfo attribute) { + mCaller.executeOrSendMessage(mCaller.obtainMessageIOO(DO_START_INPUT, + missingMethods, inputContext, attribute)); } @Override - public void restartInput(IInputContext inputContext, EditorInfo attribute) { - mCaller.executeOrSendMessage(mCaller.obtainMessageOO(DO_RESTART_INPUT, - inputContext, attribute)); + public void restartInput(IInputContext inputContext, + @InputConnectionInspector.MissingMethodFlags final int missingMethods, + EditorInfo attribute) { + mCaller.executeOrSendMessage(mCaller.obtainMessageIOO(DO_RESTART_INPUT, + missingMethods, inputContext, attribute)); } @Override diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 5f1043ba8f1c..f0673fffc0d8 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -2744,7 +2744,9 @@ public class ConnectivityManager { if (networkCallback == null) { throw new IllegalArgumentException("null NetworkCallback"); } - if (need == null) throw new IllegalArgumentException("null NetworkCapabilities"); + if (need == null && action != REQUEST) { + throw new IllegalArgumentException("null NetworkCapabilities"); + } try { incCallbackHandlerRefCount(); synchronized(sNetworkCallback) { @@ -2767,7 +2769,7 @@ public class ConnectivityManager { } /** - * Helper function to requests a network with a particular legacy type. + * Helper function to request a network with a particular legacy type. * * This is temporarily public @hide so it can be called by system code that uses the * NetworkRequest API to request networks but relies on CONNECTIVITY_ACTION broadcasts for @@ -3011,6 +3013,28 @@ public class ConnectivityManager { } /** + * Registers to receive notifications about whichever network currently satisfies the + * system default {@link NetworkRequest}. The callbacks will continue to be called until + * either the application exits or {@link #unregisterNetworkCallback} is called + * <p>This method requires the caller to hold the permission + * {@link android.Manifest.permission#ACCESS_NETWORK_STATE}. + * + * @param networkCallback The {@link NetworkCallback} that the system will call as the + * system default network changes. + * @hide + */ + public void registerDefaultNetworkCallback(NetworkCallback networkCallback) { + // This works because if the NetworkCapabilities are null, + // ConnectivityService takes them from the default request. + // + // Since the capabilities are exactly the same as the default request's + // capabilities, this request is guaranteed, at all times, to be + // satisfied by the same network, if any, that satisfies the default + // request, i.e., the system default network. + sendRequestForNetwork(null, networkCallback, 0, REQUEST, TYPE_NONE); + } + + /** * Requests bandwidth update for a given {@link Network} and returns whether the update request * is accepted by ConnectivityService. Once accepted, ConnectivityService will poll underlying * network connection for updated bandwidth information. The caller will be notified via diff --git a/core/java/android/net/ConnectivityThread.java b/core/java/android/net/ConnectivityThread.java new file mode 100644 index 000000000000..55c3402bf39d --- /dev/null +++ b/core/java/android/net/ConnectivityThread.java @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.net; + +import android.os.HandlerThread; +import android.os.Looper; + +/** + * Shared singleton connectivity thread for the system. This is a thread for + * connectivity operations such as AsyncChannel connections to system services. + * Various connectivity manager objects can use this singleton as a common + * resource for their handlers instead of creating separate threads of their own. + * @hide + */ +public final class ConnectivityThread extends HandlerThread { + private static ConnectivityThread sInstance; + + private ConnectivityThread() { + super("ConnectivityThread"); + } + + private static synchronized ConnectivityThread getInstance() { + if (sInstance == null) { + sInstance = new ConnectivityThread(); + sInstance.start(); + } + return sInstance; + } + + public static ConnectivityThread get() { + return getInstance(); + } + + public static Looper getInstanceLooper() { + return getInstance().getLooper(); + } +} diff --git a/core/java/android/net/NetworkCapabilities.java b/core/java/android/net/NetworkCapabilities.java index e27c0fb2ddea..641861459426 100644 --- a/core/java/android/net/NetworkCapabilities.java +++ b/core/java/android/net/NetworkCapabilities.java @@ -248,7 +248,7 @@ public final class NetworkCapabilities implements Parcelable { * for a network to satisfy a request, all capabilities requested must be satisfied. * * @param capability the {@code NetworkCapabilities.NET_CAPABILITY_*} to be added. - * @return This NetworkCapability to facilitate chaining. + * @return This NetworkCapabilities instance, to facilitate chaining. * @hide */ public NetworkCapabilities addCapability(int capability) { @@ -263,7 +263,7 @@ public final class NetworkCapabilities implements Parcelable { * Removes (if found) the given capability from this {@code NetworkCapability} instance. * * @param capability the {@code NetworkCapabilities.NET_CAPABILTIY_*} to be removed. - * @return This NetworkCapability to facilitate chaining. + * @return This NetworkCapabilities instance, to facilitate chaining. * @hide */ public NetworkCapabilities removeCapability(int capability) { @@ -418,7 +418,7 @@ public final class NetworkCapabilities implements Parcelable { * {@code NetworkCapabilities.NET_CAPABILITY_*} listed above. * * @param transportType the {@code NetworkCapabilities.TRANSPORT_*} to be added. - * @return This NetworkCapability to facilitate chaining. + * @return This NetworkCapabilities instance, to facilitate chaining. * @hide */ public NetworkCapabilities addTransportType(int transportType) { @@ -434,7 +434,7 @@ public final class NetworkCapabilities implements Parcelable { * Removes (if found) the given transport from this {@code NetworkCapability} instance. * * @param transportType the {@code NetworkCapabilities.TRANSPORT_*} to be removed. - * @return This NetworkCapability to facilitate chaining. + * @return This NetworkCapabilities instance, to facilitate chaining. * @hide */ public NetworkCapabilities removeTransportType(int transportType) { @@ -578,14 +578,16 @@ public final class NetworkCapabilities implements Parcelable { * @param networkSpecifier An {@code String} of opaque format used to specify the bearer * specific network specifier where the bearer has a choice of * networks. + * @return This NetworkCapabilities instance, to facilitate chaining. * @hide */ - public void setNetworkSpecifier(String networkSpecifier) { + public NetworkCapabilities setNetworkSpecifier(String networkSpecifier) { if (TextUtils.isEmpty(networkSpecifier) == false && Long.bitCount(mTransportTypes) != 1) { throw new IllegalStateException("Must have a single transport specified to use " + "setNetworkSpecifier"); } mNetworkSpecifier = networkSpecifier; + return this; } /** diff --git a/core/java/android/net/NetworkTemplate.java b/core/java/android/net/NetworkTemplate.java index 5761d66dde87..d847cd0e7cf3 100644 --- a/core/java/android/net/NetworkTemplate.java +++ b/core/java/android/net/NetworkTemplate.java @@ -250,6 +250,16 @@ public class NetworkTemplate implements Parcelable { } } + public boolean isPersistable() { + switch (mMatchRule) { + case MATCH_MOBILE_WILDCARD: + case MATCH_WIFI_WILDCARD: + return false; + default: + return true; + } + } + public int getMatchRule() { return mMatchRule; } diff --git a/core/java/android/net/NetworkUtils.java b/core/java/android/net/NetworkUtils.java index 555032d522bf..141af3d49563 100644 --- a/core/java/android/net/NetworkUtils.java +++ b/core/java/android/net/NetworkUtils.java @@ -39,23 +39,6 @@ public class NetworkUtils { private static final String TAG = "NetworkUtils"; - /** Setting bit 0 indicates reseting of IPv4 addresses required */ - public static final int RESET_IPV4_ADDRESSES = 0x01; - - /** Setting bit 1 indicates reseting of IPv4 addresses required */ - public static final int RESET_IPV6_ADDRESSES = 0x02; - - /** Reset all addresses */ - public static final int RESET_ALL_ADDRESSES = RESET_IPV4_ADDRESSES | RESET_IPV6_ADDRESSES; - - /** - * Reset IPv6 or IPv4 sockets that are connected via the named interface. - * - * @param interfaceName is the interface to reset - * @param mask {@see #RESET_IPV4_ADDRESSES} and {@see #RESET_IPV6_ADDRESSES} - */ - public native static int resetConnections(String interfaceName, int mask); - /** * Attaches a socket filter that accepts DHCP packets to the given socket. */ diff --git a/core/java/android/net/TrafficStats.java b/core/java/android/net/TrafficStats.java index 95ffb44d22e5..cfd0468a6e27 100644 --- a/core/java/android/net/TrafficStats.java +++ b/core/java/android/net/TrafficStats.java @@ -147,8 +147,10 @@ public class TrafficStats { } /** - * System API for backup-related support components to tag network traffic - * appropriately. + * Set active tag to use when accounting {@link Socket} traffic originating + * from the current thread. The tag used internally is well-defined to + * distinguish all backup-related traffic. + * * @hide */ @SystemApi @@ -157,8 +159,10 @@ public class TrafficStats { } /** - * System API for restore-related support components to tag network traffic - * appropriately. + * Set active tag to use when accounting {@link Socket} traffic originating + * from the current thread. The tag used internally is well-defined to + * distinguish all restore-related traffic. + * * @hide */ @SystemApi @@ -205,7 +209,13 @@ public class TrafficStats { NetworkManagementSocketTagger.setThreadSocketStatsUid(uid); } - /** {@hide} */ + /** + * Clear any active UID set to account {@link Socket} traffic originating + * from the current thread. + * + * @see #setThreadStatsUid(int) + * @hide + */ @SystemApi public static void clearThreadStatsUid() { NetworkManagementSocketTagger.setThreadSocketStatsUid(-1); diff --git a/core/java/android/os/BatteryStats.java b/core/java/android/os/BatteryStats.java index 6df2a9d693d3..e730ad81fb92 100644 --- a/core/java/android/os/BatteryStats.java +++ b/core/java/android/os/BatteryStats.java @@ -1679,7 +1679,7 @@ public abstract class BatteryStats implements Parcelable { /** * Constant for device idle mode: active in full mode. */ - public static final int DEVICE_IDLE_MODE_FULL = 2; + public static final int DEVICE_IDLE_MODE_DEEP = 2; /** * Returns the time in microseconds that device has been in idle mode while @@ -2754,11 +2754,11 @@ public abstract class BatteryStats implements Parcelable { final long powerSaveModeEnabledTime = getPowerSaveModeEnabledTime(rawRealtime, which); final long deviceIdleModeLightTime = getDeviceIdleModeTime(DEVICE_IDLE_MODE_LIGHT, rawRealtime, which); - final long deviceIdleModeFullTime = getDeviceIdleModeTime(DEVICE_IDLE_MODE_FULL, + final long deviceIdleModeFullTime = getDeviceIdleModeTime(DEVICE_IDLE_MODE_DEEP, rawRealtime, which); final long deviceLightIdlingTime = getDeviceIdlingTime(DEVICE_IDLE_MODE_LIGHT, rawRealtime, which); - final long deviceIdlingTime = getDeviceIdlingTime(DEVICE_IDLE_MODE_FULL, + final long deviceIdlingTime = getDeviceIdlingTime(DEVICE_IDLE_MODE_DEEP, rawRealtime, which); final int connChanges = getNumConnectivityChange(which); final long phoneOnTime = getPhoneOnTime(rawRealtime, which); @@ -2844,14 +2844,14 @@ public abstract class BatteryStats implements Parcelable { getMobileRadioActiveTime(rawRealtime, which) / 1000, getMobileRadioActiveAdjustedTime(which) / 1000, interactiveTime / 1000, powerSaveModeEnabledTime / 1000, connChanges, deviceIdleModeFullTime / 1000, - getDeviceIdleModeCount(DEVICE_IDLE_MODE_FULL, which), deviceIdlingTime / 1000, - getDeviceIdlingCount(DEVICE_IDLE_MODE_FULL, which), + getDeviceIdleModeCount(DEVICE_IDLE_MODE_DEEP, which), deviceIdlingTime / 1000, + getDeviceIdlingCount(DEVICE_IDLE_MODE_DEEP, which), getMobileRadioActiveCount(which), getMobileRadioActiveUnknownTime(which) / 1000, deviceIdleModeLightTime / 1000, getDeviceIdleModeCount(DEVICE_IDLE_MODE_LIGHT, which), deviceLightIdlingTime / 1000, getDeviceIdlingCount(DEVICE_IDLE_MODE_LIGHT, which), getLongestDeviceIdleModeTime(DEVICE_IDLE_MODE_LIGHT), - getLongestDeviceIdleModeTime(DEVICE_IDLE_MODE_FULL)); + getLongestDeviceIdleModeTime(DEVICE_IDLE_MODE_DEEP)); // Dump screen brightness stats Object[] args = new Object[NUM_SCREEN_BRIGHTNESS_BINS]; @@ -3330,11 +3330,11 @@ public abstract class BatteryStats implements Parcelable { final long powerSaveModeEnabledTime = getPowerSaveModeEnabledTime(rawRealtime, which); final long deviceIdleModeLightTime = getDeviceIdleModeTime(DEVICE_IDLE_MODE_LIGHT, rawRealtime, which); - final long deviceIdleModeFullTime = getDeviceIdleModeTime(DEVICE_IDLE_MODE_FULL, + final long deviceIdleModeFullTime = getDeviceIdleModeTime(DEVICE_IDLE_MODE_DEEP, rawRealtime, which); final long deviceLightIdlingTime = getDeviceIdlingTime(DEVICE_IDLE_MODE_LIGHT, rawRealtime, which); - final long deviceIdlingTime = getDeviceIdlingTime(DEVICE_IDLE_MODE_FULL, + final long deviceIdlingTime = getDeviceIdlingTime(DEVICE_IDLE_MODE_DEEP, rawRealtime, which); final long phoneOnTime = getPhoneOnTime(rawRealtime, which); final long wifiRunningTime = getGlobalWifiRunningTime(rawRealtime, which); @@ -3411,7 +3411,7 @@ public abstract class BatteryStats implements Parcelable { formatTimeMs(sb, deviceIdlingTime / 1000); sb.append("("); sb.append(formatRatioLocked(deviceIdlingTime, whichBatteryRealtime)); - sb.append(") "); sb.append(getDeviceIdlingCount(DEVICE_IDLE_MODE_FULL, which)); + sb.append(") "); sb.append(getDeviceIdlingCount(DEVICE_IDLE_MODE_DEEP, which)); sb.append("x"); pw.println(sb.toString()); } @@ -3423,10 +3423,10 @@ public abstract class BatteryStats implements Parcelable { sb.append("("); sb.append(formatRatioLocked(deviceIdleModeFullTime, whichBatteryRealtime)); sb.append(") "); - sb.append(getDeviceIdleModeCount(DEVICE_IDLE_MODE_FULL, which)); + sb.append(getDeviceIdleModeCount(DEVICE_IDLE_MODE_DEEP, which)); sb.append("x"); sb.append(" -- longest "); - formatTimeMs(sb, getLongestDeviceIdleModeTime(DEVICE_IDLE_MODE_FULL)); + formatTimeMs(sb, getLongestDeviceIdleModeTime(DEVICE_IDLE_MODE_DEEP)); pw.println(sb.toString()); } if (phoneOnTime != 0) { diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java index 1097cadd55dc..05dd48b12e55 100644 --- a/core/java/android/os/Bundle.java +++ b/core/java/android/os/Bundle.java @@ -181,6 +181,14 @@ public final class Bundle extends BaseBundle implements Cloneable, Parcelable { } } + /** {@hide} */ + public static Bundle setDefusable(Bundle bundle, boolean defusable) { + if (bundle != null) { + bundle.setDefusable(defusable); + } + return bundle; + } + /** * Clones the current Bundle. The internal map is cloned, but the keys and * values to which it refers are copied by reference. diff --git a/core/java/android/os/Debug.java b/core/java/android/os/Debug.java index f3822413add3..55b107a215e4 100644 --- a/core/java/android/os/Debug.java +++ b/core/java/android/os/Debug.java @@ -19,8 +19,11 @@ package android.os; import com.android.internal.util.FastPrintWriter; import com.android.internal.util.TypedProperties; +import android.app.AppGlobals; +import android.content.Context; import android.util.Log; +import java.io.File; import java.io.FileDescriptor; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -100,14 +103,6 @@ public final class Debug */ private static final String DEFAULT_TRACE_BODY = "dmtrace"; private static final String DEFAULT_TRACE_EXTENSION = ".trace"; - private static class NoPreloadHolder { - private static final String DEFAULT_TRACE_PATH_PREFIX = - Environment.getLegacyExternalStorageDirectory().getPath() + "/"; - private static final String DEFAULT_TRACE_FILE_PATH = - DEFAULT_TRACE_PATH_PREFIX + DEFAULT_TRACE_BODY - + DEFAULT_TRACE_EXTENSION; - } - /** * This class is used to retrieved various statistics about the memory mappings for this @@ -938,109 +933,171 @@ public final class Debug } /** - * Start method tracing with default log name and buffer size. See <a -href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Log Viewer</a> for - * information about reading these files. Call stopMethodTracing() to stop - * tracing. + * Start method tracing with default log name and buffer size. + * <p> + * By default, the trace file is called "dmtrace.trace" and it's placed + * under your package-specific directory on primary shared/external storage, + * as returned by {@link Context#getExternalFilesDir(String)}. + * <p> + * See <a href="{@docRoot}guide/developing/tools/traceview.html">Traceview: + * A Graphical Log Viewer</a> for information about reading trace files. + * <p class="note"> + * When method tracing is enabled, the VM will run more slowly than usual, + * so the timings from the trace files should only be considered in relative + * terms (e.g. was run #1 faster than run #2). The times for native methods + * will not change, so don't try to use this to compare the performance of + * interpreted and native implementations of the same method. As an + * alternative, consider using sampling-based method tracing via + * {@link #startMethodTracingSampling(String, int, int)} or "native" tracing + * in the emulator via {@link #startNativeTracing()}. + * </p> */ public static void startMethodTracing() { - VMDebug.startMethodTracing(fixTraceName(null), 0, 0, false, 0); + VMDebug.startMethodTracing(fixTracePath(null), 0, 0, false, 0); } /** - * Start method tracing, specifying the trace log file name. The trace - * file will be put under "/sdcard" unless an absolute path is given. - * See <a - href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Log Viewer</a> for - * information about reading trace files. + * Start method tracing, specifying the trace log file path. + * <p> + * When a relative file path is given, the trace file will be placed under + * your package-specific directory on primary shared/external storage, as + * returned by {@link Context#getExternalFilesDir(String)}. + * <p> + * See <a href="{@docRoot}guide/developing/tools/traceview.html">Traceview: + * A Graphical Log Viewer</a> for information about reading trace files. + * <p class="note"> + * When method tracing is enabled, the VM will run more slowly than usual, + * so the timings from the trace files should only be considered in relative + * terms (e.g. was run #1 faster than run #2). The times for native methods + * will not change, so don't try to use this to compare the performance of + * interpreted and native implementations of the same method. As an + * alternative, consider using sampling-based method tracing via + * {@link #startMethodTracingSampling(String, int, int)} or "native" tracing + * in the emulator via {@link #startNativeTracing()}. + * </p> * - * @param traceName Name for the trace log file to create. - * If {@code traceName} is null, this value defaults to "/sdcard/dmtrace.trace". - * If the files already exist, they will be truncated. - * If the trace file given does not end in ".trace", it will be appended for you. + * @param tracePath Path to the trace log file to create. If {@code null}, + * this will default to "dmtrace.trace". If the file already + * exists, it will be truncated. If the path given does not end + * in ".trace", it will be appended for you. */ - public static void startMethodTracing(String traceName) { - startMethodTracing(traceName, 0, 0); + public static void startMethodTracing(String tracePath) { + startMethodTracing(tracePath, 0, 0); } /** - * Start method tracing, specifying the trace log file name and the - * buffer size. The trace files will be put under "/sdcard" unless an - * absolute path is given. See <a - href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Log Viewer</a> for - * information about reading trace files. - * @param traceName Name for the trace log file to create. - * If {@code traceName} is null, this value defaults to "/sdcard/dmtrace.trace". - * If the files already exist, they will be truncated. - * If the trace file given does not end in ".trace", it will be appended for you. + * Start method tracing, specifying the trace log file name and the buffer + * size. + * <p> + * When a relative file path is given, the trace file will be placed under + * your package-specific directory on primary shared/external storage, as + * returned by {@link Context#getExternalFilesDir(String)}. + * <p> + * See <a href="{@docRoot}guide/developing/tools/traceview.html">Traceview: + * A Graphical Log Viewer</a> for information about reading trace files. + * <p class="note"> + * When method tracing is enabled, the VM will run more slowly than usual, + * so the timings from the trace files should only be considered in relative + * terms (e.g. was run #1 faster than run #2). The times for native methods + * will not change, so don't try to use this to compare the performance of + * interpreted and native implementations of the same method. As an + * alternative, consider using sampling-based method tracing via + * {@link #startMethodTracingSampling(String, int, int)} or "native" tracing + * in the emulator via {@link #startNativeTracing()}. + * </p> * - * @param bufferSize The maximum amount of trace data we gather. If not given, it defaults to 8MB. + * @param tracePath Path to the trace log file to create. If {@code null}, + * this will default to "dmtrace.trace". If the file already + * exists, it will be truncated. If the path given does not end + * in ".trace", it will be appended for you. + * @param bufferSize The maximum amount of trace data we gather. If not + * given, it defaults to 8MB. */ - public static void startMethodTracing(String traceName, int bufferSize) { - startMethodTracing(traceName, bufferSize, 0); + public static void startMethodTracing(String tracePath, int bufferSize) { + startMethodTracing(tracePath, bufferSize, 0); } /** - * Start method tracing, specifying the trace log file name and the - * buffer size. The trace files will be put under "/sdcard" unless an - * absolute path is given. See <a - href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Log Viewer</a> for - * information about reading trace files. - * + * Start method tracing, specifying the trace log file name, the buffer + * size, and flags. + * <p> + * When a relative file path is given, the trace file will be placed under + * your package-specific directory on primary shared/external storage, as + * returned by {@link Context#getExternalFilesDir(String)}. * <p> - * When method tracing is enabled, the VM will run more slowly than - * usual, so the timings from the trace files should only be considered - * in relative terms (e.g. was run #1 faster than run #2). The times - * for native methods will not change, so don't try to use this to - * compare the performance of interpreted and native implementations of the - * same method. As an alternative, consider using sampling-based method - * tracing via {@link #startMethodTracingSampling(String, int, int)} or - * "native" tracing in the emulator via {@link #startNativeTracing()}. + * See <a href="{@docRoot}guide/developing/tools/traceview.html">Traceview: + * A Graphical Log Viewer</a> for information about reading trace files. + * <p class="note"> + * When method tracing is enabled, the VM will run more slowly than usual, + * so the timings from the trace files should only be considered in relative + * terms (e.g. was run #1 faster than run #2). The times for native methods + * will not change, so don't try to use this to compare the performance of + * interpreted and native implementations of the same method. As an + * alternative, consider using sampling-based method tracing via + * {@link #startMethodTracingSampling(String, int, int)} or "native" tracing + * in the emulator via {@link #startNativeTracing()}. * </p> * - * @param traceName Name for the trace log file to create. - * If {@code traceName} is null, this value defaults to "/sdcard/dmtrace.trace". - * If the files already exist, they will be truncated. - * If the trace file given does not end in ".trace", it will be appended for you. - * @param bufferSize The maximum amount of trace data we gather. If not given, it defaults to 8MB. - * @param flags Flags to control method tracing. The only one that is currently defined is {@link #TRACE_COUNT_ALLOCS}. + * @param tracePath Path to the trace log file to create. If {@code null}, + * this will default to "dmtrace.trace". If the file already + * exists, it will be truncated. If the path given does not end + * in ".trace", it will be appended for you. + * @param bufferSize The maximum amount of trace data we gather. If not + * given, it defaults to 8MB. + * @param flags Flags to control method tracing. The only one that is + * currently defined is {@link #TRACE_COUNT_ALLOCS}. */ - public static void startMethodTracing(String traceName, int bufferSize, - int flags) { - VMDebug.startMethodTracing(fixTraceName(traceName), bufferSize, flags, false, 0); + public static void startMethodTracing(String tracePath, int bufferSize, int flags) { + VMDebug.startMethodTracing(fixTracePath(tracePath), bufferSize, flags, false, 0); } /** * Start sampling-based method tracing, specifying the trace log file name, - * the buffer size, and the sampling interval. The trace files will be put - * under "/sdcard" unless an absolute path is given. See <a - href="{@docRoot}guide/developing/tools/traceview.html">Traceview: A Graphical Log Viewer</a> - * for information about reading trace files. + * the buffer size, and the sampling interval. + * <p> + * When a relative file path is given, the trace file will be placed under + * your package-specific directory on primary shared/external storage, as + * returned by {@link Context#getExternalFilesDir(String)}. + * <p> + * See <a href="{@docRoot}guide/developing/tools/traceview.html">Traceview: + * A Graphical Log Viewer</a> for information about reading trace files. * - * @param traceName Name for the trace log file to create. - * If {@code traceName} is null, this value defaults to "/sdcard/dmtrace.trace". - * If the files already exist, they will be truncated. - * If the trace file given does not end in ".trace", it will be appended for you. - * @param bufferSize The maximum amount of trace data we gather. If not given, it defaults to 8MB. - * @param intervalUs The amount of time between each sample in microseconds. + * @param tracePath Path to the trace log file to create. If {@code null}, + * this will default to "dmtrace.trace". If the file already + * exists, it will be truncated. If the path given does not end + * in ".trace", it will be appended for you. + * @param bufferSize The maximum amount of trace data we gather. If not + * given, it defaults to 8MB. + * @param intervalUs The amount of time between each sample in microseconds. */ - public static void startMethodTracingSampling(String traceName, - int bufferSize, int intervalUs) { - VMDebug.startMethodTracing(fixTraceName(traceName), bufferSize, 0, true, intervalUs); + public static void startMethodTracingSampling(String tracePath, int bufferSize, + int intervalUs) { + VMDebug.startMethodTracing(fixTracePath(tracePath), bufferSize, 0, true, intervalUs); } - + /** * Formats name of trace log file for method tracing. */ - private static String fixTraceName(String traceName) { - if (traceName == null) - traceName = NoPreloadHolder.DEFAULT_TRACE_FILE_PATH; - if (traceName.charAt(0) != '/') - traceName = NoPreloadHolder.DEFAULT_TRACE_PATH_PREFIX + traceName; - if (!traceName.endsWith(DEFAULT_TRACE_EXTENSION)) - traceName = traceName + DEFAULT_TRACE_EXTENSION; + private static String fixTracePath(String tracePath) { + if (tracePath == null || tracePath.charAt(0) != '/') { + final Context context = AppGlobals.getInitialApplication(); + final File dir; + if (context != null) { + dir = context.getExternalFilesDir(null); + } else { + dir = Environment.getExternalStorageDirectory(); + } - return traceName; + if (tracePath == null) { + tracePath = new File(dir, DEFAULT_TRACE_BODY).getAbsolutePath(); + } else { + tracePath = new File(dir, tracePath).getAbsolutePath(); + } + } + if (!tracePath.endsWith(DEFAULT_TRACE_EXTENSION)) { + tracePath += DEFAULT_TRACE_EXTENSION; + } + return tracePath; } /** diff --git a/core/java/android/os/HardwarePropertiesManager.java b/core/java/android/os/HardwarePropertiesManager.java index 9ca1dcd70242..0f2e33d8e7e1 100644 --- a/core/java/android/os/HardwarePropertiesManager.java +++ b/core/java/android/os/HardwarePropertiesManager.java @@ -33,13 +33,26 @@ public class HardwarePropertiesManager { private final IHardwarePropertiesManager mService; + /** + * @hide + */ @Retention(RetentionPolicy.SOURCE) @IntDef({ - DEVICE_TEMPERATURE_CPU, DEVICE_TEMPERATURE_GPU, DEVICE_TEMPERATURE_BATTERY + DEVICE_TEMPERATURE_CPU, DEVICE_TEMPERATURE_GPU, DEVICE_TEMPERATURE_BATTERY, + DEVICE_TEMPERATURE_SKIN }) public @interface DeviceTemperatureType {} /** + * @hide + */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({ + TEMPERATURE_CURRENT, TEMPERATURE_THROTTLING, TEMPERATURE_SHUTDOWN + }) + public @interface TemperatureSource {} + + /** * Device temperature types. These must match the values in * frameworks/native/include/hardwareproperties/HardwarePropertiesManager.h */ @@ -52,6 +65,21 @@ public class HardwarePropertiesManager { /** Temperature of battery in Celsius. */ public static final int DEVICE_TEMPERATURE_BATTERY = 2; + /** Temperature of device skin in Celsius. */ + public static final int DEVICE_TEMPERATURE_SKIN = 3; + + /** Get current temperature. */ + public static final int TEMPERATURE_CURRENT = 0; + + /** Get throttling temperature threshold. */ + public static final int TEMPERATURE_THROTTLING = 1; + + /** Get shutdown temperature threshold. */ + public static final int TEMPERATURE_SHUTDOWN = 2; + + /** Undefined temperature constant. */ + public static final float UNDEFINED_TEMPERATURE = -Float.MAX_VALUE; + /** Calling app context. */ private final Context mContext; @@ -65,32 +93,48 @@ public class HardwarePropertiesManager { * Return an array of device temperatures in Celsius. * * @param type type of requested device temperature, one of {@link #DEVICE_TEMPERATURE_CPU}, - * {@link #DEVICE_TEMPERATURE_GPU} or {@link #DEVICE_TEMPERATURE_BATTERY}. - * @return an array of requested float device temperatures. + * {@link #DEVICE_TEMPERATURE_GPU}, {@link #DEVICE_TEMPERATURE_BATTERY} or {@link + * #DEVICE_TEMPERATURE_SKIN}. + * @param source source of requested device temperature, one of {@link #TEMPERATURE_CURRENT}, + * {@link #TEMPERATURE_THROTTLING} or {@link #TEMPERATURE_SHUTDOWN}. + * @return an array of requested float device temperatures. Temperature equals to + * {@link #UNDEFINED_TEMPERATURE} if undefined. * Empty if platform doesn't provide the queried temperature. * * @throws SecurityException if a non profile or device owner tries to call this method. */ - public @NonNull float[] getDeviceTemperatures(@DeviceTemperatureType int type) { + public @NonNull float[] getDeviceTemperatures(@DeviceTemperatureType int type, + @TemperatureSource int source) { switch (type) { - case DEVICE_TEMPERATURE_CPU: - case DEVICE_TEMPERATURE_GPU: - case DEVICE_TEMPERATURE_BATTERY: - try { - return mService.getDeviceTemperatures(mContext.getOpPackageName(), type); - } catch (RemoteException e) { - throw e.rethrowFromSystemServer(); - } - default: - Log.w(TAG, "Unknown device temperature type."); - return new float[0]; + case DEVICE_TEMPERATURE_CPU: + case DEVICE_TEMPERATURE_GPU: + case DEVICE_TEMPERATURE_BATTERY: + case DEVICE_TEMPERATURE_SKIN: + switch (source) { + case TEMPERATURE_CURRENT: + case TEMPERATURE_THROTTLING: + case TEMPERATURE_SHUTDOWN: + try { + return mService.getDeviceTemperatures(mContext.getOpPackageName(), type, + source); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + default: + Log.w(TAG, "Unknown device temperature source."); + return new float[0]; + } + default: + Log.w(TAG, "Unknown device temperature type."); + return new float[0]; } } /** * Return an array of CPU usage info for each core. * - * @return an array of {@link android.os.CpuUsageInfo} for each core. + * @return an array of {@link android.os.CpuUsageInfo} for each core. Return {@code null} for + * each unplugged core. * Empty if CPU usage is not supported on this system. * * @throws SecurityException if a non profile or device owner tries to call this method. diff --git a/core/java/android/os/IHardwarePropertiesManager.aidl b/core/java/android/os/IHardwarePropertiesManager.aidl index bcf0dc85a5e1..1c86bd0297a2 100644 --- a/core/java/android/os/IHardwarePropertiesManager.aidl +++ b/core/java/android/os/IHardwarePropertiesManager.aidl @@ -22,7 +22,7 @@ import android.os.CpuUsageInfo; /** @hide */ interface IHardwarePropertiesManager { - float[] getDeviceTemperatures(String callingPackage, int type); + float[] getDeviceTemperatures(String callingPackage, int type, int source); CpuUsageInfo[] getCpuUsages(String callingPackage); float[] getFanSpeeds(String callingPackage); } diff --git a/core/java/android/os/INetworkManagementService.aidl b/core/java/android/os/INetworkManagementService.aidl index cd84c8fbc9e4..100f6a165b1d 100644 --- a/core/java/android/os/INetworkManagementService.aidl +++ b/core/java/android/os/INetworkManagementService.aidl @@ -97,12 +97,6 @@ interface INetworkManagementService void setInterfaceIpv6NdOffload(String iface, boolean enable); /** - * Retrieves the network routes currently configured on the specified - * interface - */ - RouteInfo[] getRoutes(String iface); - - /** * Add the specified route to the interface. */ void addRoute(int netId, in RouteInfo route); diff --git a/core/java/android/os/IPowerManager.aidl b/core/java/android/os/IPowerManager.aidl index dd10df33fe60..1d464c005cb9 100644 --- a/core/java/android/os/IPowerManager.aidl +++ b/core/java/android/os/IPowerManager.aidl @@ -50,6 +50,7 @@ interface IPowerManager boolean isLightDeviceIdleMode(); void reboot(boolean confirm, String reason, boolean wait); + void rebootSafeMode(boolean confirm, boolean wait); void shutdown(boolean confirm, String reason, boolean wait); void crash(String message); diff --git a/core/java/android/os/IUserManager.aidl b/core/java/android/os/IUserManager.aidl index bc2566b0ef64..c38bf3c74852 100644 --- a/core/java/android/os/IUserManager.aidl +++ b/core/java/android/os/IUserManager.aidl @@ -76,4 +76,5 @@ interface IUserManager { PersistableBundle getSeedAccountOptions(); void clearSeedAccountData(); boolean someUserHasSeedAccount(in String accountName, in String accountType); + boolean isManagedProfile(int userId); } diff --git a/core/java/android/os/PowerManager.java b/core/java/android/os/PowerManager.java index cb4caea93adb..8bc903b96bcf 100644 --- a/core/java/android/os/PowerManager.java +++ b/core/java/android/os/PowerManager.java @@ -426,6 +426,12 @@ public final class PowerManager { public static final String REBOOT_REQUESTED_BY_DEVICE_OWNER = "deviceowner"; /** + * The 'reason' value used when rebooting in safe mode + * @hide + */ + public static final String REBOOT_SAFE_MODE = "safemode"; + + /** * The value to pass as the 'reason' argument to android_reboot(). * @hide */ @@ -903,6 +909,21 @@ public final class PowerManager { } /** + * Reboot the device. Will not return if the reboot is successful. + * <p> + * Requires the {@link android.Manifest.permission#REBOOT} permission. + * </p> + * @hide + */ + public void rebootSafeMode() { + try { + mService.rebootSafeMode(false, true); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } + + /** * Returns true if the device is currently in power save mode. When in this mode, * applications should reduce their functionality in order to conserve battery as * much as possible. You can monitor for changes to this state with diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java index 0ff0154f2ed0..707d5f561ac2 100644 --- a/core/java/android/os/UserManager.java +++ b/core/java/android/os/UserManager.java @@ -822,8 +822,28 @@ public class UserManager { */ @SystemApi public boolean isManagedProfile() { - UserInfo user = getUserInfo(UserHandle.myUserId()); - return user != null ? user.isManagedProfile() : false; + try { + return mService.isManagedProfile(UserHandle.myUserId()); + } catch (RemoteException re) { + throw re.rethrowFromSystemServer(); + } + } + + /** + * Checks if the specified user is a managed profile. + * Requires {@link android.Manifest.permission#MANAGE_USERS} permission, otherwise the caller + * must be in the same profile group of specified user. + * + * @return whether the specified user is a managed profile. + * @hide + */ + @SystemApi + public boolean isManagedProfile(@UserIdInt int userId) { + try { + return mService.isManagedProfile(userId); + } catch (RemoteException re) { + throw re.rethrowFromSystemServer(); + } } /** @@ -964,8 +984,7 @@ public class UserManager { /** * Returns the UserInfo object describing a specific user. - * Requires {@link android.Manifest.permission#MANAGE_USERS} permission or the caller is - * in the same profile group of target user. + * Requires {@link android.Manifest.permission#MANAGE_USERS} permission. * @param userHandle the user handle of the user whose information is being requested. * @return the UserInfo object for a specific user. * @hide diff --git a/core/java/android/os/storage/VolumeInfo.java b/core/java/android/os/storage/VolumeInfo.java index ea0597d8c68c..4b706496db20 100644 --- a/core/java/android/os/storage/VolumeInfo.java +++ b/core/java/android/os/storage/VolumeInfo.java @@ -438,6 +438,10 @@ public class VolumeInfo implements Parcelable { final Intent intent = new Intent(DocumentsContract.ACTION_BROWSE); intent.addCategory(Intent.CATEGORY_DEFAULT); intent.setData(uri); + + // note that docsui treats this as *force* show advanced. So sending + // false permits advanced to be shown based on user preferences. + intent.putExtra(DocumentsContract.EXTRA_SHOW_ADVANCED, isPrimary()); intent.putExtra(DocumentsContract.EXTRA_SHOW_FILESIZE, true); return intent; } diff --git a/core/java/android/provider/DocumentsContract.java b/core/java/android/provider/DocumentsContract.java index 4ad7969d1911..441245956b8d 100644 --- a/core/java/android/provider/DocumentsContract.java +++ b/core/java/android/provider/DocumentsContract.java @@ -93,6 +93,9 @@ public final class DocumentsContract { public static final String EXTRA_PACKAGE_NAME = "android.content.extra.PACKAGE_NAME"; /** {@hide} */ + public static final String EXTRA_SHOW_ADVANCED = "android.content.extra.SHOW_ADVANCED"; + + /** {@hide} */ public static final String EXTRA_SHOW_FILESIZE = "android.content.extra.SHOW_FILESIZE"; /** {@hide} */ @@ -556,13 +559,22 @@ public final class DocumentsContract { public static final int FLAG_EMPTY = 1 << 16; /** + * Flag indicating that this root should only be visible to advanced + * users. + * + * @see #COLUMN_FLAGS + * @hide + */ + public static final int FLAG_ADVANCED = 1 << 17; + + /** * Flag indicating that this root has settings. * * @see #COLUMN_FLAGS * @see DocumentsContract#ACTION_DOCUMENT_ROOT_SETTINGS * @hide */ - public static final int FLAG_HAS_SETTINGS = 1 << 17; + public static final int FLAG_HAS_SETTINGS = 1 << 18; /** * Flag indicating that this root is on removable SD card storage. @@ -570,7 +582,7 @@ public final class DocumentsContract { * @see #COLUMN_FLAGS * @hide */ - public static final int FLAG_REMOVABLE_SD = 1 << 18; + public static final int FLAG_REMOVABLE_SD = 1 << 19; /** * Flag indicating that this root is on removable USB storage. @@ -578,7 +590,7 @@ public final class DocumentsContract { * @see #COLUMN_FLAGS * @hide */ - public static final int FLAG_REMOVABLE_USB = 1 << 19; + public static final int FLAG_REMOVABLE_USB = 1 << 20; } /** diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 5fc2899877f4..d8937b41eeae 100755 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -517,21 +517,18 @@ public final class Settings { "android.settings.USER_DICTIONARY_SETTINGS"; /** - * Activity Action: Show settings to configure the hardware keyboard layout. + * Activity Action: Show settings to configure the hardware keyboard. * <p> * In some cases, a matching Activity may not exist, so ensure you * safeguard against this. * <p> - * - * @see android.hardware.input.InputManager#ACTION_QUERY_KEYBOARD_LAYOUTS - * <p> * Input: Nothing. * <p> * Output: Nothing. */ @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) - public static final String ACTION_KEYBOARD_LAYOUT_SETTINGS = - "android.settings.KEYBOARD_LAYOUT_SETTINGS"; + public static final String ACTION_HARD_KEYBOARD_SETTINGS = + "android.settings.HARD_KEYBOARD_SETTINGS"; /** * Activity Action: Adds a word to the user dictionary. diff --git a/core/java/android/provider/UserDictionary.java b/core/java/android/provider/UserDictionary.java index a9b106ae7394..c6e58cbb0072 100644 --- a/core/java/android/provider/UserDictionary.java +++ b/core/java/android/provider/UserDictionary.java @@ -28,6 +28,9 @@ import android.text.TextUtils; * A provider of user defined words for input methods to use for predictive text input. * Applications and input methods may add words into the dictionary. Words can have associated * frequency information and locale information. + * + * <p><strong>NOTE: </strong>Starting on API 23, the user dictionary is only accessible through + * IME and spellchecker. */ public class UserDictionary { diff --git a/core/java/android/service/quicksettings/IQSService.aidl b/core/java/android/service/quicksettings/IQSService.aidl index 1d9050557dd1..5434e2ef5e2f 100644 --- a/core/java/android/service/quicksettings/IQSService.aidl +++ b/core/java/android/service/quicksettings/IQSService.aidl @@ -34,4 +34,5 @@ interface IQSService { void startUnlockAndRun(in Tile tile); void onDialogHidden(in Tile tile); + void onStartSuccessful(in Tile tile); } diff --git a/core/java/android/service/quicksettings/Tile.java b/core/java/android/service/quicksettings/Tile.java index 85f1955e8ebd..3d7d53ea67e8 100644 --- a/core/java/android/service/quicksettings/Tile.java +++ b/core/java/android/service/quicksettings/Tile.java @@ -37,8 +37,6 @@ public final class Tile implements Parcelable { private static final String TAG = "Tile"; /** - * This is the default state of any tile, until updated by the {@link TileService}. - * <p> * An unavailable state indicates that for some reason this tile is not currently * available to the user for some reason, and will have no click action. The tile's * icon will be tinted differently to reflect this state. @@ -57,7 +55,7 @@ public final class Tile implements Parcelable { /** * This represents a tile that is currently active. (e.g. wifi is connected, bluetooth is on, - * cast is casting). + * cast is casting). This is the default state. */ public static final int STATE_ACTIVE = 2; diff --git a/core/java/android/service/vr/IVrListener.aidl b/core/java/android/service/vr/IVrListener.aidl index b7273ba91187..afb13d316503 100644 --- a/core/java/android/service/vr/IVrListener.aidl +++ b/core/java/android/service/vr/IVrListener.aidl @@ -16,7 +16,9 @@ package android.service.vr; +import android.content.ComponentName; + /** @hide */ oneway interface IVrListener { - -}
\ No newline at end of file + void focusedActivityChanged(in ComponentName component); +} diff --git a/core/java/android/service/vr/VrListenerService.java b/core/java/android/service/vr/VrListenerService.java index 5f1f659710a7..9a5e95d7a4bd 100644 --- a/core/java/android/service/vr/VrListenerService.java +++ b/core/java/android/service/vr/VrListenerService.java @@ -23,7 +23,10 @@ import android.app.Service; import android.content.ComponentName; import android.content.Context; import android.content.Intent; +import android.os.Handler; import android.os.IBinder; +import android.os.Looper; +import android.os.Message; /** * A service that is bound from the system while running in virtual reality (VR) mode. @@ -55,19 +58,53 @@ public abstract class VrListenerService extends Service { @SdkConstant(SdkConstant.SdkConstantType.SERVICE_ACTION) public static final String SERVICE_INTERFACE = "android.service.vr.VrListenerService"; - /** - * @hide - */ - public static class VrListenerBinder extends IVrListener.Stub { - } + private final Handler mHandler; - private final VrListenerBinder mBinder = new VrListenerBinder(); + private static final int MSG_ON_CURRENT_VR_ACTIVITY_CHANGED = 1; + + private final IVrListener.Stub mBinder = new IVrListener.Stub() { + @Override + public void focusedActivityChanged(ComponentName component) { + mHandler.obtainMessage(MSG_ON_CURRENT_VR_ACTIVITY_CHANGED, component).sendToTarget(); + } + }; + + private final class VrListenerHandler extends Handler { + public VrListenerHandler(Looper looper) { + super(looper); + } + + @Override + public void handleMessage(Message msg) { + switch (msg.what) { + case MSG_ON_CURRENT_VR_ACTIVITY_CHANGED: { + VrListenerService.this.onCurrentVrActivityChanged((ComponentName) msg.obj); + } break; + } + } + } @Override public IBinder onBind(Intent intent) { return mBinder; } + public VrListenerService() { + mHandler = new VrListenerHandler(Looper.getMainLooper()); + } + + /** + * Called when the current activity using VR mode is changed. + * <p/> + * This will be called immediately when this service is initially bound, but is + * not guaranteed to be called before onUnbind. + * + * @param component the {@link ComponentName} of the new current VR activity. + */ + public void onCurrentVrActivityChanged(ComponentName component) { + // Override to implement + } + /** * Check if the given package is available to be enabled/disabled in VR mode settings. * diff --git a/core/java/android/text/util/Linkify.java b/core/java/android/text/util/Linkify.java index bd376ead2334..ca037a229b0a 100644 --- a/core/java/android/text/util/Linkify.java +++ b/core/java/android/text/util/Linkify.java @@ -16,6 +16,9 @@ package android.text.util; +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.telephony.PhoneNumberUtils; import android.text.method.LinkMovementMethod; import android.text.method.MovementMethod; @@ -29,6 +32,8 @@ import android.widget.TextView; import java.io.UnsupportedEncodingException; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.net.URLEncoder; import java.util.ArrayList; import java.util.Collections; @@ -41,19 +46,21 @@ import com.android.i18n.phonenumbers.PhoneNumberMatch; import com.android.i18n.phonenumbers.PhoneNumberUtil; import com.android.i18n.phonenumbers.PhoneNumberUtil.Leniency; +import libcore.util.EmptyArray; + /** * Linkify take a piece of text and a regular expression and turns all of the * regex matches in the text into clickable links. This is particularly - * useful for matching things like email addresses, web urls, etc. and making + * useful for matching things like email addresses, web URLs, etc. and making * them actionable. * - * Alone with the pattern that is to be matched, a url scheme prefix is also + * Alone with the pattern that is to be matched, a URL scheme prefix is also * required. Any pattern match that does not begin with the supplied scheme - * will have the scheme prepended to the matched text when the clickable url - * is created. For instance, if you are matching web urls you would supply - * the scheme <code>http://</code>. If the pattern matches example.com, which - * does not have a url scheme prefix, the supplied scheme will be prepended to - * create <code>http://example.com</code> when the clickable url link is + * will have the scheme prepended to the matched text when the clickable URL + * is created. For instance, if you are matching web URLs you would supply + * the scheme <code>http://</code>. If the pattern matches example.com, which + * does not have a URL scheme prefix, the supplied scheme will be prepended to + * create <code>http://example.com</code> when the clickable URL link is * created. */ @@ -97,6 +104,11 @@ public class Linkify { */ private static final int PHONE_NUMBER_MINIMUM_DIGITS = 5; + /** @hide */ + @IntDef(flag = true, value = { WEB_URLS, EMAIL_ADDRESSES, PHONE_NUMBERS, MAP_ADDRESSES, ALL }) + @Retention(RetentionPolicy.SOURCE) + public @interface LinkifyMask {} + /** * Filters out web URL matches that occur after an at-sign (@). This is * to prevent turning the domain name in an email address into a web link. @@ -152,10 +164,10 @@ public class Linkify { * MatchFilter enables client code to have more control over * what is allowed to match and become a link, and what is not. * - * For example: when matching web urls you would like things like + * For example: when matching web URLs you would like things like * http://www.example.com to match, as well as just example.com itelf. * However, you would not want to match against the domain in - * support@example.com. So, when matching against a web url pattern you + * support@example.com. So, when matching against a web URL pattern you * might also include a MatchFilter that disallows the match if it is * immediately preceded by an at-sign (@). */ @@ -203,8 +215,13 @@ public class Linkify { * If the mask is nonzero, it also removes any existing URLSpans * attached to the Spannable, to avoid problems if you call it * repeatedly on the same text. + * + * @param text Spannable whose text is to be marked-up with links + * @param mask Mask to define which kinds of links will be searched. + * + * @return True if at least one link is found and applied. */ - public static final boolean addLinks(Spannable text, int mask) { + public static final boolean addLinks(@NonNull Spannable text, @LinkifyMask int mask) { if (mask == 0) { return false; } @@ -255,8 +272,13 @@ public class Linkify { * the link types indicated in the mask into clickable links. If matches * are found the movement method for the TextView is set to * LinkMovementMethod. + * + * @param text TextView whose text is to be marked-up with links + * @param mask Mask to define which kinds of links will be searched. + * + * @return True if at least one link is found and applied. */ - public static final boolean addLinks(TextView text, int mask) { + public static final boolean addLinks(@NonNull TextView text, @LinkifyMask int mask) { if (mask == 0) { return false; } @@ -284,7 +306,7 @@ public class Linkify { } } - private static final void addLinkMovementMethod(TextView t) { + private static final void addLinkMovementMethod(@NonNull TextView t) { MovementMethod m = t.getMovementMethod(); if ((m == null) || !(m instanceof LinkMovementMethod)) { @@ -302,12 +324,12 @@ public class Linkify { * * @param text TextView whose text is to be marked-up with links * @param pattern Regex pattern to be used for finding links - * @param scheme Url scheme string (eg <code>http://</code> to be - * prepended to the url of links that do not have - * a scheme specified in the link text + * @param scheme URL scheme string (eg <code>http://</code>) to be + * prepended to the links that do not start with this scheme. */ - public static final void addLinks(TextView text, Pattern pattern, String scheme) { - addLinks(text, pattern, scheme, null, null); + public static final void addLinks(@NonNull TextView text, @NonNull Pattern pattern, + @Nullable String scheme) { + addLinks(text, pattern, scheme, null, null, null); } /** @@ -317,20 +339,45 @@ public class Linkify { * to LinkMovementMethod. * * @param text TextView whose text is to be marked-up with links - * @param p Regex pattern to be used for finding links - * @param scheme Url scheme string (eg <code>http://</code> to be - * prepended to the url of links that do not have - * a scheme specified in the link text + * @param pattern Regex pattern to be used for finding links + * @param scheme URL scheme string (eg <code>http://</code>) to be + * prepended to the links that do not start with this scheme. * @param matchFilter The filter that is used to allow the client code * additional control over which pattern matches are * to be converted into links. */ - public static final void addLinks(TextView text, Pattern p, String scheme, - MatchFilter matchFilter, TransformFilter transformFilter) { - SpannableString s = SpannableString.valueOf(text.getText()); + public static final void addLinks(@NonNull TextView text, @NonNull Pattern pattern, + @Nullable String scheme, @Nullable MatchFilter matchFilter, + @Nullable TransformFilter transformFilter) { + addLinks(text, pattern, scheme, null, matchFilter, transformFilter); + } - if (addLinks(s, p, scheme, matchFilter, transformFilter)) { - text.setText(s); + /** + * Applies a regex to the text of a TextView turning the matches into + * links. If links are found then UrlSpans are applied to the link + * text match areas, and the movement method for the text is changed + * to LinkMovementMethod. + * + * @param text TextView whose text is to be marked-up with links. + * @param pattern Regex pattern to be used for finding links. + * @param defaultScheme The default scheme to be prepended to links if the link does not + * start with one of the <code>schemes</code> given. + * @param schemes Array of schemes (eg <code>http://</code>) to check if the link found + * contains a scheme. Passing a null or empty value means prepend defaultScheme + * to all links. + * @param matchFilter The filter that is used to allow the client code additional control + * over which pattern matches are to be converted into links. + * @param transformFilter Filter to allow the client code to update the link found. + */ + public static final void addLinks(@NonNull TextView text, @NonNull Pattern pattern, + @Nullable String defaultScheme, @Nullable String[] schemes, + @Nullable MatchFilter matchFilter, @Nullable TransformFilter transformFilter) { + SpannableString spannable = SpannableString.valueOf(text.getText()); + + boolean linksAdded = addLinks(spannable, pattern, defaultScheme, schemes, matchFilter, + transformFilter); + if (linksAdded) { + text.setText(spannable); addLinkMovementMethod(text); } } @@ -339,37 +386,72 @@ public class Linkify { * Applies a regex to a Spannable turning the matches into * links. * - * @param text Spannable whose text is to be marked-up with - * links + * @param text Spannable whose text is to be marked-up with links * @param pattern Regex pattern to be used for finding links - * @param scheme Url scheme string (eg <code>http://</code> to be - * prepended to the url of links that do not have - * a scheme specified in the link text + * @param scheme URL scheme string (eg <code>http://</code>) to be + * prepended to the links that do not start with this scheme. */ - public static final boolean addLinks(Spannable text, Pattern pattern, String scheme) { - return addLinks(text, pattern, scheme, null, null); + public static final boolean addLinks(@NonNull Spannable text, @NonNull Pattern pattern, + @Nullable String scheme) { + return addLinks(text, pattern, scheme, null, null, null); } /** - * Applies a regex to a Spannable turning the matches into - * links. + * Applies a regex to a Spannable turning the matches into + * links. * - * @param s Spannable whose text is to be marked-up with - * links - * @param p Regex pattern to be used for finding links - * @param scheme Url scheme string (eg <code>http://</code> to be - * prepended to the url of links that do not have - * a scheme specified in the link text - * @param matchFilter The filter that is used to allow the client code - * additional control over which pattern matches are - * to be converted into links. + * @param spannable Spannable whose text is to be marked-up with links + * @param pattern Regex pattern to be used for finding links + * @param scheme URL scheme string (eg <code>http://</code>) to be + * prepended to the links that do not start with this scheme. + * @param matchFilter The filter that is used to allow the client code + * additional control over which pattern matches are + * to be converted into links. + * @param transformFilter Filter to allow the client code to update the link found. + * + * @return True if at least one link is found and applied. + */ + public static final boolean addLinks(@NonNull Spannable spannable, @NonNull Pattern pattern, + @Nullable String scheme, @Nullable MatchFilter matchFilter, + @Nullable TransformFilter transformFilter) { + return addLinks(spannable, pattern, scheme, null, matchFilter, + transformFilter); + } + + /** + * Applies a regex to a Spannable turning the matches into links. + * + * @param spannable Spannable whose text is to be marked-up with links. + * @param pattern Regex pattern to be used for finding links. + * @param defaultScheme The default scheme to be prepended to links if the link does not + * start with one of the <code>schemes</code> given. + * @param schemes Array of schemes (eg <code>http://</code>) to check if the link found + * contains a scheme. Passing a null or empty value means prepend defaultScheme + * to all links. + * @param matchFilter The filter that is used to allow the client code additional control + * over which pattern matches are to be converted into links. + * @param transformFilter Filter to allow the client code to update the link found. + * + * @return True if at least one link is found and applied. */ - public static final boolean addLinks(Spannable s, Pattern p, - String scheme, MatchFilter matchFilter, - TransformFilter transformFilter) { + public static final boolean addLinks(@NonNull Spannable spannable, @NonNull Pattern pattern, + @Nullable String defaultScheme, @Nullable String[] schemes, + @Nullable MatchFilter matchFilter, @Nullable TransformFilter transformFilter) { + final String[] schemesCopy; + if (defaultScheme == null) defaultScheme = ""; + if (schemes == null || schemes.length < 1) { + schemes = EmptyArray.STRING; + } + + schemesCopy = new String[schemes.length + 1]; + schemesCopy[0] = defaultScheme.toLowerCase(Locale.ROOT); + for (int index = 0; index < schemes.length; index++) { + String scheme = schemes[index]; + schemesCopy[index + 1] = (scheme == null) ? "" : scheme.toLowerCase(Locale.ROOT); + } + boolean hasMatches = false; - String prefix = (scheme == null) ? "" : scheme.toLowerCase(Locale.ROOT); - Matcher m = p.matcher(s); + Matcher m = pattern.matcher(spannable); while (m.find()) { int start = m.start(); @@ -377,14 +459,13 @@ public class Linkify { boolean allowed = true; if (matchFilter != null) { - allowed = matchFilter.acceptMatch(s, start, end); + allowed = matchFilter.acceptMatch(spannable, start, end); } if (allowed) { - String url = makeUrl(m.group(0), new String[] { prefix }, - m, transformFilter); + String url = makeUrl(m.group(0), schemesCopy, m, transformFilter); - applyLink(url, start, end, s); + applyLink(url, start, end, spannable); hasMatches = true; } } @@ -398,22 +479,20 @@ public class Linkify { text.setSpan(span, start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); } - private static final String makeUrl(String url, String[] prefixes, - Matcher m, TransformFilter filter) { + private static final String makeUrl(@NonNull String url, @NonNull String[] prefixes, + Matcher matcher, @Nullable TransformFilter filter) { if (filter != null) { - url = filter.transformUrl(m, url); + url = filter.transformUrl(matcher, url); } boolean hasPrefix = false; - + for (int i = 0; i < prefixes.length; i++) { - if (url.regionMatches(true, 0, prefixes[i], 0, - prefixes[i].length())) { + if (url.regionMatches(true, 0, prefixes[i], 0, prefixes[i].length())) { hasPrefix = true; // Fix capitalization if necessary - if (!url.regionMatches(false, 0, prefixes[i], 0, - prefixes[i].length())) { + if (!url.regionMatches(false, 0, prefixes[i], 0, prefixes[i].length())) { url = prefixes[i] + url.substring(prefixes[i].length()); } @@ -421,7 +500,7 @@ public class Linkify { } } - if (!hasPrefix) { + if (!hasPrefix && prefixes.length > 0) { url = prefixes[0] + url; } diff --git a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java index dcf987bc3c12..d9227cea3b60 100644 --- a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java +++ b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java @@ -16,17 +16,20 @@ package android.util.apk; +import android.system.ErrnoException; +import android.system.OsConstants; +import android.util.ArrayMap; import android.util.Pair; import java.io.ByteArrayInputStream; +import java.io.FileDescriptor; import java.io.IOException; import java.io.RandomAccessFile; import java.math.BigInteger; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import java.nio.MappedByteBuffer; -import java.nio.channels.FileChannel; +import java.nio.DirectByteBuffer; import java.security.DigestException; import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; @@ -52,11 +55,13 @@ import java.security.spec.X509EncodedKeySpec; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; +import libcore.io.Libcore; +import libcore.io.Os; + /** * APK Signature Scheme v2 verifier. * @@ -75,44 +80,17 @@ public class ApkSignatureSchemeV2Verifier { public static final int SF_ATTRIBUTE_ANDROID_APK_SIGNED_ID = 2; /** - * Returns {@code true} if the provided APK contains an APK Signature Scheme V2 - * signature. The signature will not be verified. + * Returns {@code true} if the provided APK contains an APK Signature Scheme V2 signature. + * + * <p><b>NOTE: This method does not verify the signature.</b> */ public static boolean hasSignature(String apkFile) throws IOException { try (RandomAccessFile apk = new RandomAccessFile(apkFile, "r")) { - long fileSize = apk.length(); - if (fileSize > Integer.MAX_VALUE) { - return false; - } - MappedByteBuffer apkContents; - try { - apkContents = apk.getChannel().map(FileChannel.MapMode.READ_ONLY, 0, fileSize); - } catch (IOException e) { - if (e.getCause() instanceof OutOfMemoryError) { - // TODO: Remove this temporary workaround once verifying large APKs is - // supported. Very large APKs cannot be memory-mapped. This verification code - // needs to change to use a different approach for verifying such APKs. - return false; // Pretend that this APK does not have a v2 signature. - } else { - throw new IOException("Failed to memory-map APK", e); - } - } - // ZipUtils and APK Signature Scheme v2 verifier expect little-endian byte order. - apkContents.order(ByteOrder.LITTLE_ENDIAN); - - final int centralDirOffset = - (int) getCentralDirOffset(apkContents, getEocdOffset(apkContents)); - // Find the APK Signing Block. - int apkSigningBlockOffset = findApkSigningBlock(apkContents, centralDirOffset); - ByteBuffer apkSigningBlock = - sliceFromTo(apkContents, apkSigningBlockOffset, centralDirOffset); - - // Find the APK Signature Scheme v2 Block inside the APK Signing Block. - findApkSignatureSchemeV2Block(apkSigningBlock); + findSignature(apk); return true; } catch (SignatureNotFoundException e) { + return false; } - return false; } /** @@ -135,90 +113,97 @@ public class ApkSignatureSchemeV2Verifier { * associated with each signer. * * @throws SignatureNotFoundException if the APK is not signed using APK Signature Scheme v2. - * @throws SecurityException if a APK Signature Scheme v2 signature of this APK does not verify. + * @throws SecurityException if an APK Signature Scheme v2 signature of this APK does not + * verify. * @throws IOException if an I/O error occurs while reading the APK file. */ - public static X509Certificate[][] verify(RandomAccessFile apk) + private static X509Certificate[][] verify(RandomAccessFile apk) throws SignatureNotFoundException, SecurityException, IOException { + SignatureInfo signatureInfo = findSignature(apk); + return verify(apk.getFD(), signatureInfo); + } - long fileSize = apk.length(); - if (fileSize > Integer.MAX_VALUE) { - throw new IOException("File too large: " + apk.length() + " bytes"); - } - MappedByteBuffer apkContents; - try { - apkContents = apk.getChannel().map(FileChannel.MapMode.READ_ONLY, 0, fileSize); - // Attempt to preload the contents into memory for faster overall verification (v2 and - // older) at the expense of somewhat increased latency for rejecting malformed APKs. - apkContents.load(); - } catch (IOException e) { - if (e.getCause() instanceof OutOfMemoryError) { - // TODO: Remove this temporary workaround once verifying large APKs is supported. - // Very large APKs cannot be memory-mapped. This verification code needs to change - // to use a different approach for verifying such APKs. - // This workaround pretends that this APK does not have a v2 signature. This works - // fine provided the APK is not actually v2-signed. If the APK is v2 signed, v2 - // signature stripping protection inside v1 signature verification code will reject - // this APK. - throw new SignatureNotFoundException("Failed to memory-map APK", e); - } else { - throw new IOException("Failed to memory-map APK", e); - } + /** + * APK Signature Scheme v2 block and additional information relevant to verifying the signatures + * contained in the block against the file. + */ + private static class SignatureInfo { + /** Contents of APK Signature Scheme v2 block. */ + private final ByteBuffer signatureBlock; + + /** Position of the APK Signing Block in the file. */ + private final long apkSigningBlockOffset; + + /** Position of the ZIP Central Directory in the file. */ + private final long centralDirOffset; + + /** Position of the ZIP End of Central Directory (EoCD) in the file. */ + private final long eocdOffset; + + /** Contents of ZIP End of Central Directory (EoCD) of the file. */ + private final ByteBuffer eocd; + + private SignatureInfo( + ByteBuffer signatureBlock, + long apkSigningBlockOffset, + long centralDirOffset, + long eocdOffset, + ByteBuffer eocd) { + this.signatureBlock = signatureBlock; + this.apkSigningBlockOffset = apkSigningBlockOffset; + this.centralDirOffset = centralDirOffset; + this.eocdOffset = eocdOffset; + this.eocd = eocd; } - return verify(apkContents); } /** - * Verifies APK Signature Scheme v2 signatures of the provided APK and returns the certificates - * associated with each signer. - * - * @param apkContents contents of the APK. The contents start at the current position and end - * at the limit of the buffer. + * Returns the APK Signature Scheme v2 block contained in the provided APK file and the + * additional information relevant for verifying the block against the file. * * @throws SignatureNotFoundException if the APK is not signed using APK Signature Scheme v2. - * @throws SecurityException if a APK Signature Scheme v2 signature of this APK does not verify. + * @throws IOException if an I/O error occurs while reading the APK file. */ - public static X509Certificate[][] verify(ByteBuffer apkContents) - throws SignatureNotFoundException, SecurityException { - // Avoid modifying byte order, position, limit, and mark of the original apkContents. - apkContents = apkContents.slice(); - - // ZipUtils and APK Signature Scheme v2 verifier expect little-endian byte order. - apkContents.order(ByteOrder.LITTLE_ENDIAN); - - final int eocdOffset = getEocdOffset(apkContents); - final int centralDirOffset = (int) getCentralDirOffset(apkContents, eocdOffset); + private static SignatureInfo findSignature(RandomAccessFile apk) + throws IOException, SignatureNotFoundException { + // Find the ZIP End of Central Directory (EoCD) record. + Pair<ByteBuffer, Long> eocdAndOffsetInFile = getEocd(apk); + ByteBuffer eocd = eocdAndOffsetInFile.first; + long eocdOffset = eocdAndOffsetInFile.second; + if (ZipUtils.isZip64EndOfCentralDirectoryLocatorPresent(apk, eocdOffset)) { + throw new SignatureNotFoundException("ZIP64 APK not supported"); + } - // Find the APK Signing Block. - int apkSigningBlockOffset = findApkSigningBlock(apkContents, centralDirOffset); - ByteBuffer apkSigningBlock = - sliceFromTo(apkContents, apkSigningBlockOffset, centralDirOffset); + // Find the APK Signing Block. The block immediately precedes the Central Directory. + long centralDirOffset = getCentralDirOffset(eocd, eocdOffset); + Pair<ByteBuffer, Long> apkSigningBlockAndOffsetInFile = + findApkSigningBlock(apk, centralDirOffset); + ByteBuffer apkSigningBlock = apkSigningBlockAndOffsetInFile.first; + long apkSigningBlockOffset = apkSigningBlockAndOffsetInFile.second; // Find the APK Signature Scheme v2 Block inside the APK Signing Block. ByteBuffer apkSignatureSchemeV2Block = findApkSignatureSchemeV2Block(apkSigningBlock); - // Verify the contents of the APK outside of the APK Signing Block using the APK Signature - // Scheme v2 Block. - return verify( - apkContents, + return new SignatureInfo( apkSignatureSchemeV2Block, apkSigningBlockOffset, centralDirOffset, - eocdOffset); + eocdOffset, + eocd); } /** - * Verifies the contents outside of the APK Signing Block using the provided APK Signature - * Scheme v2 Block. + * Verifies the contents of the provided APK file against the provided APK Signature Scheme v2 + * Block. + * + * @param signatureInfo APK Signature Scheme v2 Block and information relevant for verifying it + * against the APK file. */ private static X509Certificate[][] verify( - ByteBuffer apkContents, - ByteBuffer v2Block, - int apkSigningBlockOffset, - int centralDirOffset, - int eocdOffset) throws SecurityException { + FileDescriptor apkFileDescriptor, + SignatureInfo signatureInfo) throws SecurityException { int signerCount = 0; - Map<Integer, byte[]> contentDigests = new HashMap<>(); + Map<Integer, byte[]> contentDigests = new ArrayMap<>(); List<X509Certificate[]> signerCerts = new ArrayList<>(); CertificateFactory certFactory; try { @@ -228,7 +213,7 @@ public class ApkSignatureSchemeV2Verifier { } ByteBuffer signers; try { - signers = getLengthPrefixedSlice(v2Block); + signers = getLengthPrefixedSlice(signatureInfo.signatureBlock); } catch (IOException e) { throw new SecurityException("Failed to read list of signers", e); } @@ -255,10 +240,11 @@ public class ApkSignatureSchemeV2Verifier { verifyIntegrity( contentDigests, - apkContents, - apkSigningBlockOffset, - centralDirOffset, - eocdOffset); + apkFileDescriptor, + signatureInfo.apkSigningBlockOffset, + signatureInfo.centralDirOffset, + signatureInfo.eocdOffset, + signatureInfo.eocd); return signerCerts.toArray(new X509Certificate[signerCerts.size()][]); } @@ -401,25 +387,38 @@ public class ApkSignatureSchemeV2Verifier { private static void verifyIntegrity( Map<Integer, byte[]> expectedDigests, - ByteBuffer apkContents, - int apkSigningBlockOffset, - int centralDirOffset, - int eocdOffset) throws SecurityException { + FileDescriptor apkFileDescriptor, + long apkSigningBlockOffset, + long centralDirOffset, + long eocdOffset, + ByteBuffer eocdBuf) throws SecurityException { if (expectedDigests.isEmpty()) { throw new SecurityException("No digests provided"); } - ByteBuffer beforeApkSigningBlock = sliceFromTo(apkContents, 0, apkSigningBlockOffset); - ByteBuffer centralDir = sliceFromTo(apkContents, centralDirOffset, eocdOffset); + // We need to verify the integrity of the following three sections of the file: + // 1. Everything up to the start of the APK Signing Block. + // 2. ZIP Central Directory. + // 3. ZIP End of Central Directory (EoCD). + // Each of these sections is represented as a separate DataSource instance below. + + // To handle large APKs, these sections are read in 1 MB chunks using memory-mapped I/O to + // avoid wasting physical memory. In most APK verification scenarios, the contents of the + // APK are already there in the OS's page cache and thus mmap does not use additional + // physical memory. + DataSource beforeApkSigningBlock = + new MemoryMappedFileDataSource(apkFileDescriptor, 0, apkSigningBlockOffset); + DataSource centralDir = + new MemoryMappedFileDataSource( + apkFileDescriptor, centralDirOffset, eocdOffset - centralDirOffset); + // For the purposes of integrity verification, ZIP End of Central Directory's field Start of // Central Directory must be considered to point to the offset of the APK Signing Block. - byte[] eocdBytes = new byte[apkContents.capacity() - eocdOffset]; - apkContents.position(eocdOffset); - apkContents.get(eocdBytes); - ByteBuffer eocd = ByteBuffer.wrap(eocdBytes); - eocd.order(apkContents.order()); - ZipUtils.setZipEocdCentralDirectoryOffset(eocd, apkSigningBlockOffset); + eocdBuf = eocdBuf.duplicate(); + eocdBuf.order(ByteOrder.LITTLE_ENDIAN); + ZipUtils.setZipEocdCentralDirectoryOffset(eocdBuf, apkSigningBlockOffset); + DataSource eocd = new ByteBufferDataSource(eocdBuf); int[] digestAlgorithms = new int[expectedDigests.size()]; int digestAlgorithmCount = 0; @@ -427,30 +426,30 @@ public class ApkSignatureSchemeV2Verifier { digestAlgorithms[digestAlgorithmCount] = digestAlgorithm; digestAlgorithmCount++; } - Map<Integer, byte[]> actualDigests; + byte[][] actualDigests; try { actualDigests = computeContentDigests( digestAlgorithms, - new ByteBuffer[] {beforeApkSigningBlock, centralDir, eocd}); + new DataSource[] {beforeApkSigningBlock, centralDir, eocd}); } catch (DigestException e) { throw new SecurityException("Failed to compute digest(s) of contents", e); } - for (Map.Entry<Integer, byte[]> entry : expectedDigests.entrySet()) { - int digestAlgorithm = entry.getKey(); - byte[] expectedDigest = entry.getValue(); - byte[] actualDigest = actualDigests.get(digestAlgorithm); + for (int i = 0; i < digestAlgorithms.length; i++) { + int digestAlgorithm = digestAlgorithms[i]; + byte[] expectedDigest = expectedDigests.get(digestAlgorithm); + byte[] actualDigest = actualDigests[i]; if (!MessageDigest.isEqual(expectedDigest, actualDigest)) { throw new SecurityException( getContentDigestAlgorithmJcaDigestAlgorithm(digestAlgorithm) - + " digest of contents did not verify"); + + " digest of contents did not verify"); } } } - private static Map<Integer, byte[]> computeContentDigests( + private static byte[][] computeContentDigests( int[] digestAlgorithms, - ByteBuffer[] contents) throws DigestException { + DataSource[] contents) throws DigestException { // For each digest algorithm the result is computed as follows: // 1. Each segment of contents is split into consecutive chunks of 1 MB in size. // The final chunk will be shorter iff the length of segment is not a multiple of 1 MB. @@ -461,13 +460,18 @@ public class ApkSignatureSchemeV2Verifier { // chunks (uint32 little-endian) and the concatenation of digests of chunks of all // segments in-order. - int totalChunkCount = 0; - for (ByteBuffer input : contents) { - totalChunkCount += getChunkCount(input.remaining()); + long totalChunkCountLong = 0; + for (DataSource input : contents) { + totalChunkCountLong += getChunkCount(input.size()); + } + if (totalChunkCountLong >= Integer.MAX_VALUE / 1024) { + throw new DigestException("Too many chunks: " + totalChunkCountLong); } + int totalChunkCount = (int) totalChunkCountLong; - Map<Integer, byte[]> digestsOfChunks = new HashMap<>(totalChunkCount); - for (int digestAlgorithm : digestAlgorithms) { + byte[][] digestsOfChunks = new byte[digestAlgorithms.length][]; + for (int i = 0; i < digestAlgorithms.length; i++) { + int digestAlgorithm = digestAlgorithms[i]; int digestOutputSizeBytes = getContentDigestAlgorithmOutputSizeBytes(digestAlgorithm); byte[] concatenationOfChunkCountAndChunkDigests = new byte[5 + totalChunkCount * digestOutputSizeBytes]; @@ -476,49 +480,71 @@ public class ApkSignatureSchemeV2Verifier { totalChunkCount, concatenationOfChunkCountAndChunkDigests, 1); - digestsOfChunks.put(digestAlgorithm, concatenationOfChunkCountAndChunkDigests); + digestsOfChunks[i] = concatenationOfChunkCountAndChunkDigests; } byte[] chunkContentPrefix = new byte[5]; chunkContentPrefix[0] = (byte) 0xa5; int chunkIndex = 0; - for (ByteBuffer input : contents) { - while (input.hasRemaining()) { - int chunkSize = Math.min(input.remaining(), CHUNK_SIZE_BYTES); - ByteBuffer chunk = getByteBuffer(input, chunkSize); - for (int digestAlgorithm : digestAlgorithms) { - String jcaAlgorithmName = - getContentDigestAlgorithmJcaDigestAlgorithm(digestAlgorithm); - MessageDigest md; - try { - md = MessageDigest.getInstance(jcaAlgorithmName); - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException(jcaAlgorithmName + " digest not supported", e); - } - chunk.clear(); - setUnsignedInt32LittleEndian(chunk.remaining(), chunkContentPrefix, 1); - md.update(chunkContentPrefix); - md.update(chunk); - byte[] concatenationOfChunkCountAndChunkDigests = - digestsOfChunks.get(digestAlgorithm); + MessageDigest[] mds = new MessageDigest[digestAlgorithms.length]; + for (int i = 0; i < digestAlgorithms.length; i++) { + String jcaAlgorithmName = + getContentDigestAlgorithmJcaDigestAlgorithm(digestAlgorithms[i]); + try { + mds[i] = MessageDigest.getInstance(jcaAlgorithmName); + } catch (NoSuchAlgorithmException e) { + throw new RuntimeException(jcaAlgorithmName + " digest not supported", e); + } + } + // TODO: Compute digests of chunks in parallel when beneficial. This requires some research + // into how to parallelize (if at all) based on the capabilities of the hardware on which + // this code is running and based on the size of input. + int dataSourceIndex = 0; + for (DataSource input : contents) { + long inputOffset = 0; + long inputRemaining = input.size(); + while (inputRemaining > 0) { + int chunkSize = (int) Math.min(inputRemaining, CHUNK_SIZE_BYTES); + setUnsignedInt32LittleEndian(chunkSize, chunkContentPrefix, 1); + for (int i = 0; i < mds.length; i++) { + mds[i].update(chunkContentPrefix); + } + try { + input.feedIntoMessageDigests(mds, inputOffset, chunkSize); + } catch (IOException e) { + throw new DigestException( + "Failed to digest chunk #" + chunkIndex + " of section #" + + dataSourceIndex, + e); + } + for (int i = 0; i < digestAlgorithms.length; i++) { + int digestAlgorithm = digestAlgorithms[i]; + byte[] concatenationOfChunkCountAndChunkDigests = digestsOfChunks[i]; int expectedDigestSizeBytes = getContentDigestAlgorithmOutputSizeBytes(digestAlgorithm); - int actualDigestSizeBytes = md.digest(concatenationOfChunkCountAndChunkDigests, - 5 + chunkIndex * expectedDigestSizeBytes, expectedDigestSizeBytes); + MessageDigest md = mds[i]; + int actualDigestSizeBytes = + md.digest( + concatenationOfChunkCountAndChunkDigests, + 5 + chunkIndex * expectedDigestSizeBytes, + expectedDigestSizeBytes); if (actualDigestSizeBytes != expectedDigestSizeBytes) { throw new RuntimeException( "Unexpected output size of " + md.getAlgorithm() + " digest: " + actualDigestSizeBytes); } } + inputOffset += chunkSize; + inputRemaining -= chunkSize; chunkIndex++; } + dataSourceIndex++; } - Map<Integer, byte[]> result = new HashMap<>(digestAlgorithms.length); - for (Map.Entry<Integer, byte[]> entry : digestsOfChunks.entrySet()) { - int digestAlgorithm = entry.getKey(); - byte[] input = entry.getValue(); + byte[][] result = new byte[digestAlgorithms.length][]; + for (int i = 0; i < digestAlgorithms.length; i++) { + int digestAlgorithm = digestAlgorithms[i]; + byte[] input = digestsOfChunks[i]; String jcaAlgorithmName = getContentDigestAlgorithmJcaDigestAlgorithm(digestAlgorithm); MessageDigest md; try { @@ -527,49 +553,47 @@ public class ApkSignatureSchemeV2Verifier { throw new RuntimeException(jcaAlgorithmName + " digest not supported", e); } byte[] output = md.digest(input); - result.put(digestAlgorithm, output); + result[i] = output; } return result; } /** - * Finds the offset of ZIP End of Central Directory (EoCD). + * Returns the ZIP End of Central Directory (EoCD) and its offset in the file. * - * @throws SignatureNotFoundException If the EoCD could not be found + * @throws IOException if an I/O error occurs while reading the file. + * @throws SignatureNotFoundException if the EoCD could not be found. */ - private static int getEocdOffset(ByteBuffer apkContents) throws SignatureNotFoundException { - int eocdOffset = ZipUtils.findZipEndOfCentralDirectoryRecord(apkContents); - if (eocdOffset == -1) { + private static Pair<ByteBuffer, Long> getEocd(RandomAccessFile apk) + throws IOException, SignatureNotFoundException { + Pair<ByteBuffer, Long> eocdAndOffsetInFile = + ZipUtils.findZipEndOfCentralDirectoryRecord(apk); + if (eocdAndOffsetInFile == null) { throw new SignatureNotFoundException( "Not an APK file: ZIP End of Central Directory record not found"); } - return eocdOffset; + return eocdAndOffsetInFile; } - private static long getCentralDirOffset(ByteBuffer apkContents, int eocdOffset) + private static long getCentralDirOffset(ByteBuffer eocd, long eocdOffset) throws SignatureNotFoundException { - if (ZipUtils.isZip64EndOfCentralDirectoryLocatorPresent(apkContents, eocdOffset)) { - throw new SignatureNotFoundException("ZIP64 APK not supported"); - } - ByteBuffer eocd = sliceFromTo(apkContents, eocdOffset, apkContents.capacity()); - // Look up the offset of ZIP Central Directory. - long centralDirOffsetLong = ZipUtils.getZipEocdCentralDirectoryOffset(eocd); - if (centralDirOffsetLong >= eocdOffset) { + long centralDirOffset = ZipUtils.getZipEocdCentralDirectoryOffset(eocd); + if (centralDirOffset >= eocdOffset) { throw new SignatureNotFoundException( - "ZIP Central Directory offset out of range: " + centralDirOffsetLong + "ZIP Central Directory offset out of range: " + centralDirOffset + ". ZIP End of Central Directory offset: " + eocdOffset); } - long centralDirSizeLong = ZipUtils.getZipEocdCentralDirectorySizeBytes(eocd); - if (centralDirOffsetLong + centralDirSizeLong != eocdOffset) { + long centralDirSize = ZipUtils.getZipEocdCentralDirectorySizeBytes(eocd); + if (centralDirOffset + centralDirSize != eocdOffset) { throw new SignatureNotFoundException( "ZIP Central Directory is not immediately followed by End of Central" + " Directory"); } - return centralDirOffsetLong; + return centralDirOffset; } - private static final int getChunkCount(int inputSizeBytes) { + private static final long getChunkCount(long inputSizeBytes) { return (inputSizeBytes + CHUNK_SIZE_BYTES - 1) / CHUNK_SIZE_BYTES; } @@ -837,10 +861,9 @@ public class ApkSignatureSchemeV2Verifier { private static final int APK_SIGNATURE_SCHEME_V2_BLOCK_ID = 0x7109871a; - private static int findApkSigningBlock(ByteBuffer apkContents, int centralDirOffset) - throws SignatureNotFoundException { - checkByteOrderLittleEndian(apkContents); - + private static Pair<ByteBuffer, Long> findApkSigningBlock( + RandomAccessFile apk, long centralDirOffset) + throws IOException, SignatureNotFoundException { // FORMAT: // OFFSET DATA TYPE DESCRIPTION // * @+0 bytes uint64: size in bytes (excluding this field) @@ -853,32 +876,42 @@ public class ApkSignatureSchemeV2Verifier { "APK too small for APK Signing Block. ZIP Central Directory offset: " + centralDirOffset); } - // Check magic field present - if ((apkContents.getLong(centralDirOffset - 16) != APK_SIG_BLOCK_MAGIC_LO) - || (apkContents.getLong(centralDirOffset - 8) != APK_SIG_BLOCK_MAGIC_HI)) { + // Read the magic and offset in file from the footer section of the block: + // * uint64: size of block + // * 16 bytes: magic + ByteBuffer footer = ByteBuffer.allocate(24); + footer.order(ByteOrder.LITTLE_ENDIAN); + apk.seek(centralDirOffset - footer.capacity()); + apk.readFully(footer.array(), footer.arrayOffset(), footer.capacity()); + if ((footer.getLong(8) != APK_SIG_BLOCK_MAGIC_LO) + || (footer.getLong(16) != APK_SIG_BLOCK_MAGIC_HI)) { throw new SignatureNotFoundException( "No APK Signing Block before ZIP Central Directory"); } // Read and compare size fields - long apkSigBlockSizeLong = apkContents.getLong(centralDirOffset - 24); - if ((apkSigBlockSizeLong < 24) || (apkSigBlockSizeLong > Integer.MAX_VALUE - 8)) { + long apkSigBlockSizeInFooter = footer.getLong(0); + if ((apkSigBlockSizeInFooter < footer.capacity()) + || (apkSigBlockSizeInFooter > Integer.MAX_VALUE - 8)) { throw new SignatureNotFoundException( - "APK Signing Block size out of range: " + apkSigBlockSizeLong); + "APK Signing Block size out of range: " + apkSigBlockSizeInFooter); } - int apkSigBlockSizeFromFooter = (int) apkSigBlockSizeLong; - int totalSize = apkSigBlockSizeFromFooter + 8; - int apkSigBlockOffset = centralDirOffset - totalSize; + int totalSize = (int) (apkSigBlockSizeInFooter + 8); + long apkSigBlockOffset = centralDirOffset - totalSize; if (apkSigBlockOffset < 0) { throw new SignatureNotFoundException( "APK Signing Block offset out of range: " + apkSigBlockOffset); } - long apkSigBlockSizeFromHeader = apkContents.getLong(apkSigBlockOffset); - if (apkSigBlockSizeFromHeader != apkSigBlockSizeFromFooter) { + ByteBuffer apkSigBlock = ByteBuffer.allocate(totalSize); + apkSigBlock.order(ByteOrder.LITTLE_ENDIAN); + apk.seek(apkSigBlockOffset); + apk.readFully(apkSigBlock.array(), apkSigBlock.arrayOffset(), apkSigBlock.capacity()); + long apkSigBlockSizeInHeader = apkSigBlock.getLong(0); + if (apkSigBlockSizeInHeader != apkSigBlockSizeInFooter) { throw new SignatureNotFoundException( "APK Signing Block sizes in header and footer do not match: " - + apkSigBlockSizeFromHeader + " vs " + apkSigBlockSizeFromFooter); + + apkSigBlockSizeInHeader + " vs " + apkSigBlockSizeInFooter); } - return apkSigBlockOffset; + return Pair.create(apkSigBlock, apkSigBlockOffset); } private static ByteBuffer findApkSignatureSchemeV2Block(ByteBuffer apkSigningBlock) @@ -930,6 +963,8 @@ public class ApkSignatureSchemeV2Verifier { } public static class SignatureNotFoundException extends Exception { + private static final long serialVersionUID = 1L; + public SignatureNotFoundException(String message) { super(message); } @@ -940,6 +975,159 @@ public class ApkSignatureSchemeV2Verifier { } /** + * Source of data to be digested. + */ + private static interface DataSource { + + /** + * Returns the size (in bytes) of the data offered by this source. + */ + long size(); + + /** + * Feeds the specified region of this source's data into the provided digests. Each digest + * instance gets the same data. + * + * @param offset offset of the region inside this data source. + * @param size size (in bytes) of the region. + */ + void feedIntoMessageDigests(MessageDigest[] mds, long offset, int size) throws IOException; + } + + /** + * {@link DataSource} which provides data from a file descriptor by memory-mapping the sections + * of the file requested by + * {@link DataSource#feedIntoMessageDigests(MessageDigest[], long, int) feedIntoMessageDigests}. + */ + private static final class MemoryMappedFileDataSource implements DataSource { + private static final Os OS = Libcore.os; + private static final long MEMORY_PAGE_SIZE_BYTES = OS.sysconf(OsConstants._SC_PAGESIZE); + + private final FileDescriptor mFd; + private final long mFilePosition; + private final long mSize; + + /** + * Constructs a new {@code MemoryMappedFileDataSource} for the specified region of the file. + * + * @param position start position of the region in the file. + * @param size size (in bytes) of the region. + */ + public MemoryMappedFileDataSource(FileDescriptor fd, long position, long size) { + mFd = fd; + mFilePosition = position; + mSize = size; + } + + @Override + public long size() { + return mSize; + } + + @Override + public void feedIntoMessageDigests( + MessageDigest[] mds, long offset, int size) throws IOException { + // IMPLEMENTATION NOTE: After a lot of experimentation, the implementation of this + // method was settled on a straightforward mmap with prefaulting. + // + // This method is not using FileChannel.map API because that API does not offset a way + // to "prefault" the resulting memory pages. Without prefaulting, performance is about + // 10% slower on small to medium APKs, but is significantly worse for APKs in 500+ MB + // range. FileChannel.load (which currently uses madvise) doesn't help. Finally, + // invoking madvise (MADV_SEQUENTIAL) after mmap with prefaulting wastes quite a bit of + // time, which is not compensated for by faster reads. + + // We mmap the smallest region of the file containing the requested data. mmap requires + // that the start offset in the file must be a multiple of memory page size. We thus may + // need to mmap from an offset less than the requested offset. + long filePosition = mFilePosition + offset; + long mmapFilePosition = + (filePosition / MEMORY_PAGE_SIZE_BYTES) * MEMORY_PAGE_SIZE_BYTES; + int dataStartOffsetInMmapRegion = (int) (filePosition - mmapFilePosition); + long mmapRegionSize = size + dataStartOffsetInMmapRegion; + long mmapPtr = 0; + try { + mmapPtr = OS.mmap( + 0, // let the OS choose the start address of the region in memory + mmapRegionSize, + OsConstants.PROT_READ, + OsConstants.MAP_SHARED | OsConstants.MAP_POPULATE, // "prefault" all pages + mFd, + mmapFilePosition); + // Feeding a memory region into MessageDigest requires the region to be represented + // as a direct ByteBuffer. + ByteBuffer buf = new DirectByteBuffer( + size, + mmapPtr + dataStartOffsetInMmapRegion, + mFd, // not really needed, but just in case + null, // no need to clean up -- it's taken care of by the finally block + true // read only buffer + ); + for (MessageDigest md : mds) { + buf.position(0); + md.update(buf); + } + } catch (ErrnoException e) { + throw new IOException("Failed to mmap " + mmapRegionSize + " bytes", e); + } finally { + if (mmapPtr != 0) { + try { + OS.munmap(mmapPtr, mmapRegionSize); + } catch (ErrnoException ignored) {} + } + } + } + } + + /** + * {@link DataSource} which provides data from a {@link ByteBuffer}. + */ + private static final class ByteBufferDataSource implements DataSource { + /** + * Underlying buffer. The data is stored between position 0 and the buffer's capacity. + * The buffer's position is 0 and limit is equal to capacity. + */ + private final ByteBuffer mBuf; + + public ByteBufferDataSource(ByteBuffer buf) { + // Defensive copy, to avoid changes to mBuf being visible in buf. + mBuf = buf.slice(); + } + + @Override + public long size() { + return mBuf.capacity(); + } + + @Override + public void feedIntoMessageDigests( + MessageDigest[] mds, long offset, int size) throws IOException { + // There's no way to tell MessageDigest to read data from ByteBuffer from a position + // other than the buffer's current position. We thus need to change the buffer's + // position to match the requested offset. + // + // In the future, it may be necessary to compute digests of multiple regions in + // parallel. Given that digest computation is a slow operation, we enable multiple + // such requests to be fulfilled by this instance. This is achieved by serially + // creating a new ByteBuffer corresponding to the requested data range and then, + // potentially concurrently, feeding these buffers into MessageDigest instances. + ByteBuffer region; + synchronized (mBuf) { + mBuf.position((int) offset); + mBuf.limit((int) offset + size); + region = mBuf.slice(); + } + + for (MessageDigest md : mds) { + // Need to reset position to 0 at the start of each iteration because + // MessageDigest.update below sets it to the buffer's limit. + region.position(0); + md.update(region); + } + } + } + + /** * For legacy reasons we need to return exactly the original encoded certificate bytes, instead * of letting the underlying implementation have a shot at re-encoding the data. */ diff --git a/core/java/android/util/apk/ZipUtils.java b/core/java/android/util/apk/ZipUtils.java index a383d5c151dd..cdbac1802377 100644 --- a/core/java/android/util/apk/ZipUtils.java +++ b/core/java/android/util/apk/ZipUtils.java @@ -16,13 +16,17 @@ package android.util.apk; +import android.util.Pair; + +import java.io.IOException; +import java.io.RandomAccessFile; import java.nio.ByteBuffer; import java.nio.ByteOrder; /** * Assorted ZIP format helpers. * - * <p>NOTE: Most helper methods operating on {@code ByteBuffer} instances except that the byte + * <p>NOTE: Most helper methods operating on {@code ByteBuffer} instances expect that the byte * order of these buffers is little-endian. */ abstract class ZipUtils { @@ -35,9 +39,101 @@ abstract class ZipUtils { private static final int ZIP_EOCD_COMMENT_LENGTH_FIELD_OFFSET = 20; private static final int ZIP64_EOCD_LOCATOR_SIZE = 20; - private static final int ZIP64_EOCD_LOCATOR_SIG = 0x07064b50; + private static final int ZIP64_EOCD_LOCATOR_SIG_REVERSE_BYTE_ORDER = 0x504b0607; - private static final int UINT32_MAX_VALUE = 0xffff; + private static final int UINT16_MAX_VALUE = 0xffff; + + /** + * Returns the ZIP End of Central Directory record of the provided ZIP file. + * + * @return contents of the ZIP End of Central Directory record and the record's offset in the + * file or {@code null} if the file does not contain the record. + * + * @throws IOException if an I/O error occurs while reading the file. + */ + static Pair<ByteBuffer, Long> findZipEndOfCentralDirectoryRecord(RandomAccessFile zip) + throws IOException { + // ZIP End of Central Directory (EOCD) record is located at the very end of the ZIP archive. + // The record can be identified by its 4-byte signature/magic which is located at the very + // beginning of the record. A complication is that the record is variable-length because of + // the comment field. + // The algorithm for locating the ZIP EOCD record is as follows. We search backwards from + // end of the buffer for the EOCD record signature. Whenever we find a signature, we check + // the candidate record's comment length is such that the remainder of the record takes up + // exactly the remaining bytes in the buffer. The search is bounded because the maximum + // size of the comment field is 65535 bytes because the field is an unsigned 16-bit number. + + long fileSize = zip.length(); + if (fileSize < ZIP_EOCD_REC_MIN_SIZE) { + return null; + } + + // Optimization: 99.99% of APKs have a zero-length comment field in the EoCD record and thus + // the EoCD record offset is known in advance. Try that offset first to avoid unnecessarily + // reading more data. + Pair<ByteBuffer, Long> result = findZipEndOfCentralDirectoryRecord(zip, 0); + if (result != null) { + return result; + } + + // EoCD does not start where we expected it to. Perhaps it contains a non-empty comment + // field. Expand the search. The maximum size of the comment field in EoCD is 65535 because + // the comment length field is an unsigned 16-bit number. + return findZipEndOfCentralDirectoryRecord(zip, UINT16_MAX_VALUE); + } + + /** + * Returns the ZIP End of Central Directory record of the provided ZIP file. + * + * @param maxCommentSize maximum accepted size (in bytes) of EoCD comment field. The permitted + * value is from 0 to 65535 inclusive. The smaller the value, the faster this method + * locates the record, provided its comment field is no longer than this value. + * + * @return contents of the ZIP End of Central Directory record and the record's offset in the + * file or {@code null} if the file does not contain the record. + * + * @throws IOException if an I/O error occurs while reading the file. + */ + private static Pair<ByteBuffer, Long> findZipEndOfCentralDirectoryRecord( + RandomAccessFile zip, int maxCommentSize) throws IOException { + // ZIP End of Central Directory (EOCD) record is located at the very end of the ZIP archive. + // The record can be identified by its 4-byte signature/magic which is located at the very + // beginning of the record. A complication is that the record is variable-length because of + // the comment field. + // The algorithm for locating the ZIP EOCD record is as follows. We search backwards from + // end of the buffer for the EOCD record signature. Whenever we find a signature, we check + // the candidate record's comment length is such that the remainder of the record takes up + // exactly the remaining bytes in the buffer. The search is bounded because the maximum + // size of the comment field is 65535 bytes because the field is an unsigned 16-bit number. + + if ((maxCommentSize < 0) || (maxCommentSize > UINT16_MAX_VALUE)) { + throw new IllegalArgumentException("maxCommentSize: " + maxCommentSize); + } + + long fileSize = zip.length(); + if (fileSize < ZIP_EOCD_REC_MIN_SIZE) { + // No space for EoCD record in the file. + return null; + } + // Lower maxCommentSize if the file is too small. + maxCommentSize = (int) Math.min(maxCommentSize, fileSize - ZIP_EOCD_REC_MIN_SIZE); + + ByteBuffer buf = ByteBuffer.allocate(ZIP_EOCD_REC_MIN_SIZE + maxCommentSize); + buf.order(ByteOrder.LITTLE_ENDIAN); + long bufOffsetInFile = fileSize - buf.capacity(); + zip.seek(bufOffsetInFile); + zip.readFully(buf.array(), buf.arrayOffset(), buf.capacity()); + int eocdOffsetInBuf = findZipEndOfCentralDirectoryRecord(buf); + if (eocdOffsetInBuf == -1) { + // No EoCD record found in the buffer + return null; + } + // EoCD found + buf.position(eocdOffsetInBuf); + ByteBuffer eocd = buf.slice(); + eocd.order(ByteOrder.LITTLE_ENDIAN); + return Pair.create(eocd, bufOffsetInFile + eocdOffsetInBuf); + } /** * Returns the position at which ZIP End of Central Directory record starts in the provided @@ -45,7 +141,7 @@ abstract class ZipUtils { * * <p>NOTE: Byte order of {@code zipContents} must be little-endian. */ - public static int findZipEndOfCentralDirectoryRecord(ByteBuffer zipContents) { + private static int findZipEndOfCentralDirectoryRecord(ByteBuffer zipContents) { assertByteOrderLittleEndian(zipContents); // ZIP End of Central Directory (EOCD) record is located at the very end of the ZIP archive. @@ -56,14 +152,13 @@ abstract class ZipUtils { // end of the buffer for the EOCD record signature. Whenever we find a signature, we check // the candidate record's comment length is such that the remainder of the record takes up // exactly the remaining bytes in the buffer. The search is bounded because the maximum - // size of the comment field is 65535 bytes because the field is an unsigned 32-bit number. + // size of the comment field is 65535 bytes because the field is an unsigned 16-bit number. int archiveSize = zipContents.capacity(); if (archiveSize < ZIP_EOCD_REC_MIN_SIZE) { - System.out.println("File size smaller than EOCD min size"); return -1; } - int maxCommentLength = Math.min(archiveSize - ZIP_EOCD_REC_MIN_SIZE, UINT32_MAX_VALUE); + int maxCommentLength = Math.min(archiveSize - ZIP_EOCD_REC_MIN_SIZE, UINT16_MAX_VALUE); int eocdWithEmptyCommentStartPosition = archiveSize - ZIP_EOCD_REC_MIN_SIZE; for (int expectedCommentLength = 0; expectedCommentLength < maxCommentLength; expectedCommentLength++) { @@ -82,24 +177,28 @@ abstract class ZipUtils { } /** - * Returns {@code true} if the provided buffer contains a ZIP64 End of Central Directory + * Returns {@code true} if the provided file contains a ZIP64 End of Central Directory * Locator. * - * <p>NOTE: Byte order of {@code zipContents} must be little-endian. + * @param zipEndOfCentralDirectoryPosition offset of the ZIP End of Central Directory record + * in the file. + * + * @throws IOException if an I/O error occurs while reading the file. */ public static final boolean isZip64EndOfCentralDirectoryLocatorPresent( - ByteBuffer zipContents, int zipEndOfCentralDirectoryPosition) { - assertByteOrderLittleEndian(zipContents); + RandomAccessFile zip, long zipEndOfCentralDirectoryPosition) throws IOException { // ZIP64 End of Central Directory Locator immediately precedes the ZIP End of Central // Directory Record. - - int locatorPosition = zipEndOfCentralDirectoryPosition - ZIP64_EOCD_LOCATOR_SIZE; + long locatorPosition = zipEndOfCentralDirectoryPosition - ZIP64_EOCD_LOCATOR_SIZE; if (locatorPosition < 0) { return false; } - return zipContents.getInt(locatorPosition) == ZIP64_EOCD_LOCATOR_SIG; + zip.seek(locatorPosition); + // RandomAccessFile.readInt assumes big-endian byte order, but ZIP format uses + // little-endian. + return zip.readInt() == ZIP64_EOCD_LOCATOR_SIG_REVERSE_BYTE_ORDER; } /** diff --git a/core/java/android/view/IWindowSession.aidl b/core/java/android/view/IWindowSession.aidl index 6a2cc802e1f1..a1e2e946c48a 100644 --- a/core/java/android/view/IWindowSession.aidl +++ b/core/java/android/view/IWindowSession.aidl @@ -112,15 +112,18 @@ interface IWindowSession { * * @param window The window being modified. Must be attached to a parent window * or this call will fail. - * @param x The new x position - * @param y The new y position - * @param width The new width - * @param height The new height + * @param left The new left position + * @param top The new top position + * @param right The new right position + * @param bottom The new bottom position + * @param requestedWidth The new requested width + * @param requestedHeight The new requested height * @param deferTransactionUntilFrame Frame number from our parent (attached) to * defer this action until. * @param outFrame Rect in which is placed the new position/size on screen. */ void repositionChild(IWindow childWindow, int left, int top, int right, int bottom, + int requestedWidth, int requestedHeight, long deferTransactionUntilFrame, out Rect outFrame); /* diff --git a/core/java/android/view/SurfaceControl.java b/core/java/android/view/SurfaceControl.java index aa86c03c53c7..c30ede37a4ac 100644 --- a/core/java/android/view/SurfaceControl.java +++ b/core/java/android/view/SurfaceControl.java @@ -57,6 +57,7 @@ public class SurfaceControl { private static native void nativeSetMatrix(long nativeObject, float dsdx, float dtdx, float dsdy, float dtdy); private static native void nativeSetFlags(long nativeObject, int flags, int mask); private static native void nativeSetWindowCrop(long nativeObject, int l, int t, int r, int b); + private static native void nativeSetFinalCrop(long nativeObject, int l, int t, int r, int b); private static native void nativeSetLayerStack(long nativeObject, int layerStack); private static native boolean nativeClearContentFrameStats(long nativeObject); @@ -456,6 +457,16 @@ public class SurfaceControl { } } + public void setFinalCrop(Rect crop) { + checkNotReleased(); + if (crop != null) { + nativeSetFinalCrop(mNativeObject, + crop.left, crop.top, crop.right, crop.bottom); + } else { + nativeSetFinalCrop(mNativeObject, 0, 0, 0, 0); + } + } + public void setLayerStack(int layerStack) { checkNotReleased(); nativeSetLayerStack(mNativeObject, layerStack); diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java index 2c9d691214b0..477ffd9b5ba4 100644 --- a/core/java/android/view/SurfaceView.java +++ b/core/java/android/view/SurfaceView.java @@ -665,7 +665,9 @@ public class SurfaceView extends View { "postion = [%d, %d, %d, %d]", mWindowSpaceLeft, mWindowSpaceTop, mLocation[0], mLocation[1])); mSession.repositionChild(mWindow, mWindowSpaceLeft, mWindowSpaceTop, - mLocation[0], mLocation[1], -1, mWinFrame); + mLocation[0], mLocation[1], + mWindowSpaceWidth, mWindowSpaceHeight, + -1, mWinFrame); } catch (RemoteException ex) { Log.e(TAG, "Exception from relayout", ex); } @@ -700,7 +702,9 @@ public class SurfaceView extends View { right, bottom)); } // Just using mRTLastReportedPosition as a dummy rect here - session.repositionChild(window, left, top, right, bottom, frameNumber, + session.repositionChild(window, left, top, right, bottom, + mWindowSpaceWidth, mWindowSpaceHeight, + frameNumber, mRTLastReportedPosition); // Now overwrite mRTLastReportedPosition with our values mRTLastReportedPosition.set(left, top, right, bottom); diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java index a7bf73a6823c..6d35a58c3be4 100644 --- a/core/java/android/view/View.java +++ b/core/java/android/view/View.java @@ -5020,8 +5020,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (scrollabilityCache.scrollBar == null) { scrollabilityCache.scrollBar = new ScrollBarDrawable(); - scrollabilityCache.scrollBar.setCallback(this); scrollabilityCache.scrollBar.setState(getDrawableState()); + scrollabilityCache.scrollBar.setCallback(this); } final boolean fadeScrollbars = a.getBoolean(R.styleable.View_fadeScrollbars, true); @@ -13295,8 +13295,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (scrollCache.scrollBar == null) { scrollCache.scrollBar = new ScrollBarDrawable(); - scrollCache.scrollBar.setCallback(this); scrollCache.scrollBar.setState(getDrawableState()); + scrollCache.scrollBar.setCallback(this); } if (isHorizontalScrollBarEnabled() || isVerticalScrollBarEnabled()) { @@ -18002,7 +18002,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, * to clear the previous drawable. setVisible first while we still have the callback set. */ if (mBackground != null) { - if (isAttachedToWindow()) { + // It's possible for this method to be invoked from the View constructor before + // subclass constructors have run. Drawables can and should trigger invalidations + // and other activity with their callback on visibility changes, which shouldn't + // happen before subclass constructors finish. However, we won't have set the + // drawable as visible until the view becomes attached. This guard below keeps + // multiple calls to this method from constructors from causing issues. + if (mBackground.isVisible()) { mBackground.setVisible(false, false); } mBackground.setCallback(null); @@ -18049,7 +18055,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, // which requires the view set as the callback (us) to recognize the drawable as // belonging to it as per verifyDrawable. mBackground = background; - background.setCallback(this); if (background.isStateful()) { background.setState(getDrawableState()); } @@ -18059,6 +18064,9 @@ public class View implements Drawable.Callback, KeyEvent.Callback, applyBackgroundTint(); + // Set callback last, since the view may still be initializing. + background.setCallback(this); + if ((mPrivateFlags & PFLAG_SKIP_DRAW) != 0) { mPrivateFlags &= ~PFLAG_SKIP_DRAW; requestLayout = true; @@ -18091,6 +18099,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, mBackgroundSizeChanged = true; invalidate(true); + invalidateOutline(); } /** @@ -18234,7 +18243,13 @@ public class View implements Drawable.Callback, KeyEvent.Callback, } if (mForegroundInfo.mDrawable != null) { - if (isAttachedToWindow()) { + // It's possible for this method to be invoked from the View constructor before + // subclass constructors have run. Drawables can and should trigger invalidations + // and other activity with their callback on visibility changes, which shouldn't + // happen before subclass constructors finish. However, we won't have set the + // drawable as visible until the view becomes attached. This guard below keeps + // multiple calls to this method from constructors from causing issues. + if (mForegroundInfo.mDrawable.isVisible()) { mForegroundInfo.mDrawable.setVisible(false, false); } mForegroundInfo.mDrawable.setCallback(null); @@ -18247,7 +18262,6 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if ((mPrivateFlags & PFLAG_SKIP_DRAW) != 0) { mPrivateFlags &= ~PFLAG_SKIP_DRAW; } - foreground.setCallback(this); foreground.setLayoutDirection(getLayoutDirection()); if (foreground.isStateful()) { foreground.setState(getDrawableState()); @@ -18256,6 +18270,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback, if (isAttachedToWindow()) { foreground.setVisible(getWindowVisibility() == VISIBLE && isShown(), false); } + // Set callback last, since the view may still be initializing. + foreground.setCallback(this); } else if ((mViewFlags & WILL_NOT_DRAW) != 0 && mBackground == null) { mPrivateFlags |= PFLAG_SKIP_DRAW; } diff --git a/core/java/android/view/inputmethod/InputConnection.java b/core/java/android/view/inputmethod/InputConnection.java index 2a9706dc87d5..8002a8e9ba14 100644 --- a/core/java/android/view/inputmethod/InputConnection.java +++ b/core/java/android/view/inputmethod/InputConnection.java @@ -28,10 +28,24 @@ import android.view.KeyEvent; * cursor, committing text to the text box, and sending raw key events * to the application. * - * <p>Applications should never directly implement this interface, but - * instead subclass from {@link BaseInputConnection}. This will ensure - * that the application does not break when new methods are added to - * the interface.</p> + * <p>Starting from API Level {@link android.os.Build.VERSION_CODES#N}, + * the system can deal with the situation where the application directly + * implements this class but one or more of the following methods are + * not implemented.</p> + * <ul> + * <li>{@link #getSelectedText(int)}, which was introduced in + * {@link android.os.Build.VERSION_CODES#GINGERBREAD}.</li> + * <li>{@link #setComposingRegion(int, int)}, which was introduced + * in {@link android.os.Build.VERSION_CODES#GINGERBREAD}.</li> + * <li>{@link #commitCorrection(CorrectionInfo)}, which was introduced + * in {@link android.os.Build.VERSION_CODES#HONEYCOMB}.</li> + * <li>{@link #requestCursorUpdates(int)}, which was introduced in + * {@link android.os.Build.VERSION_CODES#LOLLIPOP}.</li> + * <li>{@link #deleteSurroundingTextInCodePoints(int, int)}}, which + * was introduced in {@link android.os.Build.VERSION_CODES#N}.</li> + * <li>{@link #getHandler()}}, which was introduced in + * {@link android.os.Build.VERSION_CODES#N}.</li> + * </ul> * * <h3>Implementing an IME or an editor</h3> * <p>Text input is the result of the synergy of two essential components: @@ -224,7 +238,9 @@ public interface InputConnection { * @param flags Supplies additional options controlling how the text is * returned. May be either 0 or {@link #GET_TEXT_WITH_STYLES}. * @return the text that is currently selected, if any, or null if - * no text is selected. + * no text is selected. In {@link android.os.Build.VERSION_CODES#N} and + * later, returns false when the target application does not implement + * this method. */ public CharSequence getSelectedText(int flags); @@ -371,7 +387,8 @@ public interface InputConnection { * If this is greater than the number of existing characters between the cursor and * the end of the text, then this method does not fail but deletes all the characters in * that range. - * @return true on success, false if the input connection is no longer valid. + * @return true on success, false if the input connection is no longer valid. Returns + * {@code false} when the target application does not implement this method. */ public boolean deleteSurroundingTextInCodePoints(int beforeLength, int afterLength); @@ -461,7 +478,8 @@ public interface InputConnection { * @param start the position in the text at which the composing region begins * @param end the position in the text at which the composing region ends * @return true on success, false if the input connection is no longer - * valid. + * valid. In {@link android.os.Build.VERSION_CODES#N} and later, false is returned when the + * target application does not implement this method. */ public boolean setComposingRegion(int start, int end); @@ -573,6 +591,8 @@ public interface InputConnection { * * @param correctionInfo Detailed information about the correction. * @return true on success, false if the input connection is no longer valid. + * In {@link android.os.Build.VERSION_CODES#N} and later, returns false + * when the target application does not implement this method. */ public boolean commitCorrection(CorrectionInfo correctionInfo); @@ -785,6 +805,8 @@ public interface InputConnection { * @return {@code true} if the request is scheduled. {@code false} to indicate that when the * application will not call * {@link InputMethodManager#updateCursorAnchorInfo(android.view.View, CursorAnchorInfo)}. + * In {@link android.os.Build.VERSION_CODES#N} and later, returns {@code false} also when the + * target application does not implement this method. */ public boolean requestCursorUpdates(int cursorUpdateMode); diff --git a/core/java/android/view/inputmethod/InputConnectionInspector.java b/core/java/android/view/inputmethod/InputConnectionInspector.java new file mode 100644 index 000000000000..46b2c3e0fbea --- /dev/null +++ b/core/java/android/view/inputmethod/InputConnectionInspector.java @@ -0,0 +1,224 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package android.view.inputmethod; + +import android.annotation.IntDef; +import android.annotation.NonNull; +import android.annotation.Nullable; + +import java.lang.annotation.Retention; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Collections; +import java.util.Map; +import java.util.WeakHashMap; + +import static java.lang.annotation.RetentionPolicy.SOURCE; + +/** + * @hide + */ +public final class InputConnectionInspector { + + @Retention(SOURCE) + @IntDef({MissingMethodFlags.GET_SELECTED_TEXT, + MissingMethodFlags.SET_COMPOSING_REGION, + MissingMethodFlags.COMMIT_CORRECTION, + MissingMethodFlags.REQUEST_CURSOR_UPDATES, + MissingMethodFlags.DELETE_SURROUNDING_TEXT_IN_CODE_POINTS, + MissingMethodFlags.GET_HANDLER, + }) + public @interface MissingMethodFlags { + /** + * {@link InputConnection#getSelectedText(int)} is available in + * {@link android.os.Build.VERSION_CODES#GINGERBREAD} and later. + */ + int GET_SELECTED_TEXT = 1 << 0; + /** + * {@link InputConnection#setComposingRegion(int, int)} is available in + * {@link android.os.Build.VERSION_CODES#GINGERBREAD} and later. + */ + int SET_COMPOSING_REGION = 1 << 1; + /** + * {@link InputConnection#commitCorrection(CorrectionInfo)} is available in + * {@link android.os.Build.VERSION_CODES#HONEYCOMB} and later. + */ + int COMMIT_CORRECTION = 1 << 2; + /** + * {@link InputConnection#requestCursorUpdates(int)} is available in + * {@link android.os.Build.VERSION_CODES#LOLLIPOP} and later. + */ + int REQUEST_CURSOR_UPDATES = 1 << 3; + /** + * {@link InputConnection#deleteSurroundingTextInCodePoints(int, int)}} is available in + * {@link android.os.Build.VERSION_CODES#N} and later. + */ + int DELETE_SURROUNDING_TEXT_IN_CODE_POINTS = 1 << 4; + /** + * {@link InputConnection#deleteSurroundingTextInCodePoints(int, int)}} is available in + * {@link android.os.Build.VERSION_CODES#N} and later. + */ + int GET_HANDLER = 1 << 5; + } + + private static final Map<Class, Integer> sMissingMethodsMap = Collections.synchronizedMap( + new WeakHashMap<>()); + + @MissingMethodFlags + public static int getMissingMethodFlags(@Nullable final InputConnection ic) { + if (ic == null) { + return 0; + } + // Optimization for a known class. + if (ic instanceof BaseInputConnection) { + return 0; + } + // Optimization for a known class. + if (ic instanceof InputConnectionWrapper) { + return ((InputConnectionWrapper) ic).getMissingMethodFlags(); + } + return getMissingMethodFlagsInternal(ic.getClass()); + } + + @MissingMethodFlags + public static int getMissingMethodFlagsInternal(@NonNull final Class clazz) { + final Integer cachedFlags = sMissingMethodsMap.get(clazz); + if (cachedFlags != null) { + return cachedFlags; + } + int flags = 0; + if (!hasGetSelectedText(clazz)) { + flags |= MissingMethodFlags.GET_SELECTED_TEXT; + } + if (!hasSetComposingRegion(clazz)) { + flags |= MissingMethodFlags.SET_COMPOSING_REGION; + } + if (!hasCommitCorrection(clazz)) { + flags |= MissingMethodFlags.COMMIT_CORRECTION; + } + if (!hasRequestCursorUpdate(clazz)) { + flags |= MissingMethodFlags.REQUEST_CURSOR_UPDATES; + } + if (!hasDeleteSurroundingTextInCodePoints(clazz)) { + flags |= MissingMethodFlags.DELETE_SURROUNDING_TEXT_IN_CODE_POINTS; + } + if (!hasGetHandler(clazz)) { + flags |= MissingMethodFlags.GET_HANDLER; + } + sMissingMethodsMap.put(clazz, flags); + return flags; + } + + private static boolean hasGetSelectedText(@NonNull final Class clazz) { + try { + final Method method = clazz.getMethod("getSelectedText", int.class); + return !Modifier.isAbstract(method.getModifiers()); + } catch (NoSuchMethodException e) { + return false; + } + } + + private static boolean hasSetComposingRegion(@NonNull final Class clazz) { + try { + final Method method = clazz.getMethod("setComposingRegion", int.class, int.class); + return !Modifier.isAbstract(method.getModifiers()); + } catch (NoSuchMethodException e) { + return false; + } + } + + private static boolean hasCommitCorrection(@NonNull final Class clazz) { + try { + final Method method = clazz.getMethod("commitCorrection", CorrectionInfo.class); + return !Modifier.isAbstract(method.getModifiers()); + } catch (NoSuchMethodException e) { + return false; + } + } + + private static boolean hasRequestCursorUpdate(@NonNull final Class clazz) { + try { + final Method method = clazz.getMethod("requestCursorUpdates", int.class); + return !Modifier.isAbstract(method.getModifiers()); + } catch (NoSuchMethodException e) { + return false; + } + } + + private static boolean hasDeleteSurroundingTextInCodePoints(@NonNull final Class clazz) { + try { + final Method method = clazz.getMethod("deleteSurroundingTextInCodePoints", int.class, + int.class); + return !Modifier.isAbstract(method.getModifiers()); + } catch (NoSuchMethodException e) { + return false; + } + } + + private static boolean hasGetHandler(@NonNull final Class clazz) { + try { + final Method method = clazz.getMethod("getHandler"); + return !Modifier.isAbstract(method.getModifiers()); + } catch (NoSuchMethodException e) { + return false; + } + } + + public static String getMissingMethodFlagsAsString(@MissingMethodFlags final int flags) { + final StringBuilder sb = new StringBuilder(); + boolean isEmpty = true; + if ((flags & MissingMethodFlags.GET_SELECTED_TEXT) != 0) { + sb.append("getSelectedText(int)"); + isEmpty = false; + } + if ((flags & MissingMethodFlags.SET_COMPOSING_REGION) != 0) { + if (!isEmpty) { + sb.append(","); + } + sb.append("setComposingRegion(int, int)"); + isEmpty = false; + } + if ((flags & MissingMethodFlags.COMMIT_CORRECTION) != 0) { + if (!isEmpty) { + sb.append(","); + } + sb.append("commitCorrection(CorrectionInfo)"); + isEmpty = false; + } + if ((flags & MissingMethodFlags.REQUEST_CURSOR_UPDATES) != 0) { + if (!isEmpty) { + sb.append(","); + } + sb.append("requestCursorUpdate(int)"); + isEmpty = false; + } + if ((flags & MissingMethodFlags.DELETE_SURROUNDING_TEXT_IN_CODE_POINTS) != 0) { + if (!isEmpty) { + sb.append(","); + } + sb.append("deleteSurroundingTextInCodePoints(int, int)"); + isEmpty = false; + } + if ((flags & MissingMethodFlags.GET_HANDLER) != 0) { + if (!isEmpty) { + sb.append(","); + } + sb.append("getHandler()"); + } + return sb.toString(); + } +} diff --git a/core/java/android/view/inputmethod/InputConnectionWrapper.java b/core/java/android/view/inputmethod/InputConnectionWrapper.java index 42d1442a35bb..381df49d8a69 100644 --- a/core/java/android/view/inputmethod/InputConnectionWrapper.java +++ b/core/java/android/view/inputmethod/InputConnectionWrapper.java @@ -26,6 +26,8 @@ import android.view.KeyEvent; public class InputConnectionWrapper implements InputConnection { private InputConnection mTarget; final boolean mMutable; + @InputConnectionInspector.MissingMethodFlags + private int mMissingMethodFlags; /** * Initializes a wrapper. @@ -40,6 +42,7 @@ public class InputConnectionWrapper implements InputConnection { public InputConnectionWrapper(InputConnection target, boolean mutable) { mMutable = mutable; mTarget = target; + mMissingMethodFlags = InputConnectionInspector.getMissingMethodFlags(target); } /** @@ -56,6 +59,15 @@ public class InputConnectionWrapper implements InputConnection { throw new SecurityException("not mutable"); } mTarget = target; + mMissingMethodFlags = InputConnectionInspector.getMissingMethodFlags(target); + } + + /** + * @hide + */ + @InputConnectionInspector.MissingMethodFlags + public int getMissingMethodFlags() { + return mMissingMethodFlags; } /** diff --git a/core/java/android/view/inputmethod/InputMethodManager.java b/core/java/android/view/inputmethod/InputMethodManager.java index 859df432eb8c..1d89cd083281 100644 --- a/core/java/android/view/inputmethod/InputMethodManager.java +++ b/core/java/android/view/inputmethod/InputMethodManager.java @@ -317,7 +317,6 @@ public final class InputMethodManager { /** * The InputConnection that was last retrieved from the served view. */ - InputConnection mServedInputConnection; ControlledInputConnectionWrapper mServedInputConnectionWrapper; /** * The completions that were last provided by the served view. @@ -498,7 +497,7 @@ public final class InputMethodManager { // from a thread that created mServedView. That could happen // the current activity is running in the system process. // In that case, we really should not call - // mServedInputConnection.finishComposingText. + // mServedInputConnectionWrapper.finishComposingText(). if (checkFocusNoStartInput(mHasBeenInactive, false)) { final int reason = active ? InputMethodClient.START_INPUT_REASON_ACTIVATED_BY_IMMS : @@ -562,7 +561,9 @@ public final class InputMethodManager { @Override public String toString() { - return "ControlledInputConnectionWrapper{mActive=" + mActive + return "ControlledInputConnectionWrapper{" + + "connection=" + getInputConnection() + + " mActive=" + mActive + " mParentInputMethodManager.mActive=" + mParentInputMethodManager.mActive + "}"; } @@ -780,7 +781,8 @@ public final class InputMethodManager { */ public boolean isAcceptingText() { checkFocus(); - return mServedInputConnection != null; + return mServedInputConnectionWrapper != null && + mServedInputConnectionWrapper.getInputConnection() != null; } /** @@ -815,7 +817,6 @@ public final class InputMethodManager { */ void clearConnectionLocked() { mCurrentTextBoxAttribute = null; - mServedInputConnection = null; if (mServedInputConnectionWrapper != null) { mServedInputConnectionWrapper.deactivate(); mServedInputConnectionWrapper = null; @@ -848,16 +849,21 @@ public final class InputMethodManager { * Notifies the served view that the current InputConnection will no longer be used. */ private void notifyInputConnectionFinished() { - if (mServedView != null && mServedInputConnection != null) { - // We need to tell the previously served view that it is no - // longer the input target, so it can reset its state. Schedule - // this call on its window's Handler so it will be on the correct - // thread and outside of our lock. - ViewRootImpl viewRootImpl = mServedView.getViewRootImpl(); - if (viewRootImpl != null) { - // This will result in a call to reportFinishInputConnection() below. - viewRootImpl.dispatchFinishInputConnection(mServedInputConnection); - } + if (mServedView == null || mServedInputConnectionWrapper == null) { + return; + } + final InputConnection inputConnection = mServedInputConnectionWrapper.getInputConnection(); + if (inputConnection == null) { + return; + } + // We need to tell the previously served view that it is no + // longer the input target, so it can reset its state. Schedule + // this call on its window's Handler so it will be on the correct + // thread and outside of our lock. + ViewRootImpl viewRootImpl = mServedView.getViewRootImpl(); + if (viewRootImpl != null) { + // This will result in a call to reportFinishInputConnection() below. + viewRootImpl.dispatchFinishInputConnection(inputConnection); } } @@ -866,7 +872,13 @@ public final class InputMethodManager { * @hide */ public void reportFinishInputConnection(InputConnection ic) { - if (mServedInputConnection != ic) { + final InputConnection currentConnection; + if (mServedInputConnectionWrapper == null) { + currentConnection = null; + } else { + currentConnection = mServedInputConnectionWrapper.getInputConnection(); + } + if (currentConnection != ic) { ic.finishComposingText(); // To avoid modifying the public InputConnection interface if (ic instanceof BaseInputConnection) { @@ -975,7 +987,17 @@ public final class InputMethodManager { * shown to the user, if needed. Call this if the user interacts with * your view in such a way that they have expressed they would like to * start performing input into it. - * + * + * <p><strong>Caveat:</strong> {@link ResultReceiver} instance passed to + * this method can be a long-lived object, because it may not be + * garbage-collected until all the corresponding {@link ResultReceiver} + * objects transferred to different processes get garbage-collected. + * Follow the general patterns to avoid memory leaks in Android. + * Consider to use {@link java.lang.ref.WeakReference} so that application + * logic objects such as {@link android.app.Activity} and {@link Context} + * can be garbage collected regardless of the lifetime of + * {@link ResultReceiver}. + * * @param view The currently focused view, which would like to receive * soft keyboard input. * @param flags Provides additional operating flags. Currently may be @@ -1044,7 +1066,17 @@ public final class InputMethodManager { * that is currently accepting input. This should be called as a result * of the user doing some actually than fairly explicitly requests to * have the input window hidden. - * + * + * <p><strong>Caveat:</strong> {@link ResultReceiver} instance passed to + * this method can be a long-lived object, because it may not be + * garbage-collected until all the corresponding {@link ResultReceiver} + * objects transferred to different processes get garbage-collected. + * Follow the general patterns to avoid memory leaks in Android. + * Consider to use {@link java.lang.ref.WeakReference} so that application + * logic objects such as {@link android.app.Activity} and {@link Context} + * can be garbage collected regardless of the lifetime of + * {@link ResultReceiver}. + * * @param windowToken The token of the window that is making the request, * as returned by {@link View#getWindowToken() View.getWindowToken()}. * @param flags Provides additional operating flags. Currently may be @@ -1222,8 +1254,8 @@ public final class InputMethodManager { mServedConnecting = false; // Notify the served view that its previous input connection is finished notifyInputConnectionFinished(); - mServedInputConnection = ic; ControlledInputConnectionWrapper servedContext; + final int missingMethodFlags; if (ic != null) { mCursorSelStart = tba.initialSelStart; mCursorSelEnd = tba.initialSelEnd; @@ -1231,11 +1263,20 @@ public final class InputMethodManager { mCursorCandEnd = -1; mCursorRect.setEmpty(); mCursorAnchorInfo = null; - final Handler icHandler = ic.getHandler(); + final Handler icHandler; + missingMethodFlags = InputConnectionInspector.getMissingMethodFlags(ic); + if ((missingMethodFlags & InputConnectionInspector.MissingMethodFlags.GET_HANDLER) + != 0) { + // InputConnection#getHandler() is not implemented. + icHandler = null; + } else { + icHandler = ic.getHandler(); + } servedContext = new ControlledInputConnectionWrapper( icHandler != null ? icHandler.getLooper() : vh.getLooper(), ic, this); } else { servedContext = null; + missingMethodFlags = 0; } if (mServedInputConnectionWrapper != null) { mServedInputConnectionWrapper.deactivate(); @@ -1248,7 +1289,7 @@ public final class InputMethodManager { + Integer.toHexString(controlFlags)); final InputBindResult res = mService.startInputOrWindowGainedFocus( startInputReason, mClient, windowGainingFocus, controlFlags, softInputMode, - windowFlags, tba, servedContext); + windowFlags, tba, servedContext, missingMethodFlags); if (DEBUG) Log.v(TAG, "Starting input: Bind result=" + res); if (res != null) { if (res.id != null) { @@ -1383,7 +1424,7 @@ public final class InputMethodManager { return false; } - InputConnection ic = null; + final ControlledInputConnectionWrapper ic; synchronized (mH) { if (mServedView == mNextServedView && !forceNewFocus) { return false; @@ -1403,7 +1444,7 @@ public final class InputMethodManager { return false; } - ic = mServedInputConnection; + ic = mServedInputConnectionWrapper; mServedView = mNextServedView; mCurrentTextBoxAttribute = null; @@ -1476,7 +1517,7 @@ public final class InputMethodManager { mService.startInputOrWindowGainedFocus( InputMethodClient.START_INPUT_REASON_WINDOW_FOCUS_GAIN_REPORT_ONLY, mClient, rootView.getWindowToken(), controlFlags, softInputMode, windowFlags, null, - null); + null, 0 /* missingMethodFlags */); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); } @@ -2252,7 +2293,7 @@ public final class InputMethodManager { } else { p.println(" mCurrentTextBoxAttribute: null"); } - p.println(" mServedInputConnection=" + mServedInputConnection); + p.println(" mServedInputConnectionWrapper=" + mServedInputConnectionWrapper); p.println(" mCompletions=" + Arrays.toString(mCompletions)); p.println(" mCursorRect=" + mCursorRect); p.println(" mCursorSelStart=" + mCursorSelStart diff --git a/core/java/android/webkit/IWebViewUpdateService.aidl b/core/java/android/webkit/IWebViewUpdateService.aidl index 5697dfc0188c..9434f0ccac4e 100644 --- a/core/java/android/webkit/IWebViewUpdateService.aidl +++ b/core/java/android/webkit/IWebViewUpdateService.aidl @@ -54,6 +54,11 @@ interface IWebViewUpdateService { WebViewProviderInfo[] getValidWebViewPackages(); /** + * Fetch all packages that could potentially implement WebView. + */ + WebViewProviderInfo[] getAllWebViewPackages(); + + /** * Used by DevelopmentSetting to get the name of the WebView provider currently in use. */ String getCurrentWebViewPackageName(); diff --git a/core/java/android/webkit/WebViewFactory.java b/core/java/android/webkit/WebViewFactory.java index c280b81f73a3..f1bf890b3c86 100644 --- a/core/java/android/webkit/WebViewFactory.java +++ b/core/java/android/webkit/WebViewFactory.java @@ -128,98 +128,9 @@ public final class WebViewFactory { public MissingWebViewPackageException(Exception e) { super(e); } } - private static String TAG_START = "webviewproviders"; - private static String TAG_WEBVIEW_PROVIDER = "webviewprovider"; - private static String TAG_PACKAGE_NAME = "packageName"; - private static String TAG_DESCRIPTION = "description"; - // Whether or not the provider must be explicitly chosen by the user to be used. - private static String TAG_AVAILABILITY = "availableByDefault"; - private static String TAG_SIGNATURE = "signature"; - private static String TAG_FALLBACK = "isFallback"; - - /** - * Reads all signatures at the current depth (within the current provider) from the XML parser. - */ - private static String[] readSignatures(XmlResourceParser parser) throws IOException, - XmlPullParserException { - List<String> signatures = new ArrayList<String>(); - int outerDepth = parser.getDepth(); - while(XmlUtils.nextElementWithin(parser, outerDepth)) { - if (parser.getName().equals(TAG_SIGNATURE)) { - // Parse the value within the signature tag - String signature = parser.nextText(); - signatures.add(signature); - } else { - Log.e(LOGTAG, "Found an element in a webview provider that is not a signature"); - } - } - return signatures.toArray(new String[signatures.size()]); - } - - /** - * Returns all packages declared in the framework resources as potential WebView providers. - * @hide - * */ - public static WebViewProviderInfo[] getWebViewPackages() { - int numFallbackPackages = 0; - XmlResourceParser parser = null; - List<WebViewProviderInfo> webViewProviders = new ArrayList<WebViewProviderInfo>(); - try { - parser = AppGlobals.getInitialApplication().getResources().getXml( - com.android.internal.R.xml.config_webview_packages); - XmlUtils.beginDocument(parser, TAG_START); - while(true) { - XmlUtils.nextElement(parser); - String element = parser.getName(); - if (element == null) { - break; - } - if (element.equals(TAG_WEBVIEW_PROVIDER)) { - String packageName = parser.getAttributeValue(null, TAG_PACKAGE_NAME); - if (packageName == null) { - throw new MissingWebViewPackageException( - "WebView provider in framework resources missing package name"); - } - String description = parser.getAttributeValue(null, TAG_DESCRIPTION); - if (description == null) { - throw new MissingWebViewPackageException( - "WebView provider in framework resources missing description"); - } - boolean availableByDefault = "true".equals( - parser.getAttributeValue(null, TAG_AVAILABILITY)); - boolean isFallback = "true".equals( - parser.getAttributeValue(null, TAG_FALLBACK)); - WebViewProviderInfo currentProvider = - new WebViewProviderInfo(packageName, description, availableByDefault, - isFallback, readSignatures(parser)); - if (currentProvider.isFallbackPackage()) { - numFallbackPackages++; - if (numFallbackPackages > 1) { - throw new AndroidRuntimeException( - "There can be at most one webview fallback package."); - } - } - webViewProviders.add(currentProvider); - } - else { - Log.e(LOGTAG, "Found an element that is not a webview provider"); - } - } - } catch(XmlPullParserException e) { - throw new MissingWebViewPackageException("Error when parsing WebView meta data " + e); - } catch(IOException e) { - throw new MissingWebViewPackageException("Error when parsing WebView meta data " + e); - } finally { - if (parser != null) parser.close(); - } - return webViewProviders.toArray(new WebViewProviderInfo[webViewProviders.size()]); - } - - // TODO (gsennton) remove when committing webview xts test change public static String getWebViewPackageName() { - WebViewProviderInfo[] providers = getWebViewPackages(); - return providers[0].packageName; + return null; } /** diff --git a/core/java/android/webkit/WebViewProviderInfo.java b/core/java/android/webkit/WebViewProviderInfo.java index 64c2caa58fd5..75ccf355ecd7 100644 --- a/core/java/android/webkit/WebViewProviderInfo.java +++ b/core/java/android/webkit/WebViewProviderInfo.java @@ -150,6 +150,8 @@ public class WebViewProviderInfo implements Parcelable { private WebViewProviderInfo(Parcel in) { packageName = in.readString(); description = in.readString(); + availableByDefault = (in.readInt() > 0); + isFallback = (in.readInt() > 0); signatures = in.createStringArray(); packageInfo = null; } @@ -163,6 +165,8 @@ public class WebViewProviderInfo implements Parcelable { public void writeToParcel(Parcel out, int flags) { out.writeString(packageName); out.writeString(description); + out.writeInt(availableByDefault ? 1 : 0); + out.writeInt(isFallback ? 1 : 0); out.writeStringArray(signatures); } diff --git a/core/java/android/widget/ImageView.java b/core/java/android/widget/ImageView.java index 222a040d2b3c..02065779ef91 100644 --- a/core/java/android/widget/ImageView.java +++ b/core/java/android/widget/ImageView.java @@ -911,11 +911,17 @@ public class ImageView extends View { } if (mDrawable != null) { - mDrawable.setCallback(null); - unscheduleDrawable(mDrawable); - if (isAttachedToWindow()) { + // It's possible for this method to be invoked from the constructor before + // subclass constructors have run. Drawables can and should trigger invalidations + // and other activity with their callback on visibility changes, which shouldn't + // happen before subclass constructors finish. However, we won't have set the + // drawable as visible until the view becomes attached. This guard below keeps + // multiple calls to this method from constructors from causing issues. + if (mDrawable.isVisible()) { mDrawable.setVisible(false, false); } + mDrawable.setCallback(null); + unscheduleDrawable(mDrawable); } mDrawable = d; diff --git a/core/java/android/widget/LinearLayout.java b/core/java/android/widget/LinearLayout.java index e0ef86c26b2b..9e8f778f1819 100644 --- a/core/java/android/widget/LinearLayout.java +++ b/core/java/android/widget/LinearLayout.java @@ -869,10 +869,10 @@ public class LinearLayout extends ViewGroup { // Either expand children with weight to take up available space or // shrink them if they extend beyond our current bounds. If we skipped // measurement on any children, we need to measure them now. - final int delta = heightSize - mTotalLength + int remainingExcess = heightSize - mTotalLength + (mAllowInconsistentMeasurement ? 0 : consumedExcessSpace); - if (skippedMeasure || delta != 0 && totalWeight > 0.0f) { - final float weightSum = mWeightSum > 0.0f ? mWeightSum : totalWeight; + if (skippedMeasure || remainingExcess != 0 && totalWeight > 0.0f) { + float remainingWeightSum = mWeightSum > 0.0f ? mWeightSum : totalWeight; mTotalLength = 0; @@ -883,9 +883,12 @@ public class LinearLayout extends ViewGroup { } final LayoutParams lp = (LayoutParams) child.getLayoutParams(); - final float childExtra = lp.weight; - if (childExtra > 0) { - final int share = (int) (childExtra * delta / weightSum); + final float childWeight = lp.weight; + if (childWeight > 0) { + final int share = (int) (childWeight * remainingExcess / remainingWeightSum); + remainingExcess -= share; + remainingWeightSum -= childWeight; + final int childHeight; if (lp.height == 0 && (!mAllowInconsistentMeasurement || heightMode == MeasureSpec.EXACTLY)) { @@ -1244,10 +1247,10 @@ public class LinearLayout extends ViewGroup { // Either expand children with weight to take up available space or // shrink them if they extend beyond our current bounds. If we skipped // measurement on any children, we need to measure them now. - final int delta = widthSize - mTotalLength + int remainingExcess = widthSize - mTotalLength + (mAllowInconsistentMeasurement ? 0 : usedExcessSpace); - if (skippedMeasure || delta != 0 && totalWeight > 0.0f) { - final float weightSum = mWeightSum > 0.0f ? mWeightSum : totalWeight; + if (skippedMeasure || remainingExcess != 0 && totalWeight > 0.0f) { + float remainingWeightSum = mWeightSum > 0.0f ? mWeightSum : totalWeight; maxAscent[0] = maxAscent[1] = maxAscent[2] = maxAscent[3] = -1; maxDescent[0] = maxDescent[1] = maxDescent[2] = maxDescent[3] = -1; @@ -1262,9 +1265,12 @@ public class LinearLayout extends ViewGroup { } final LayoutParams lp = (LayoutParams) child.getLayoutParams(); - final float childExtra = lp.weight; - if (childExtra > 0) { - final int share = (int) (childExtra * delta / weightSum); + final float childWeight = lp.weight; + if (childWeight > 0) { + final int share = (int) (childWeight * remainingExcess / remainingWeightSum); + remainingExcess -= share; + remainingWeightSum -= childWeight; + final int childWidth; if (lp.width == 0 && (!mAllowInconsistentMeasurement || widthMode == MeasureSpec.EXACTLY)) { diff --git a/core/java/android/widget/ListPopupWindow.java b/core/java/android/widget/ListPopupWindow.java index 36e0c77613aa..6a10743c1c56 100644 --- a/core/java/android/widget/ListPopupWindow.java +++ b/core/java/android/widget/ListPopupWindow.java @@ -1183,28 +1183,28 @@ public class ListPopupWindow implements ShowableListMenu { } // getMaxAvailableHeight() subtracts the padding, so we put it back - // to get the available height for the whole window - int padding = 0; - Drawable background = mPopup.getBackground(); + // to get the available height for the whole window. + final int padding; + final Drawable background = mPopup.getBackground(); if (background != null) { background.getPadding(mTempRect); padding = mTempRect.top + mTempRect.bottom; - // If we don't have an explicit vertical offset, determine one from the window - // background so that content will line up. + // If we don't have an explicit vertical offset, determine one from + // the window background so that content will line up. if (!mDropDownVerticalOffsetSet) { mDropDownVerticalOffset = -mTempRect.top; } } else { mTempRect.setEmpty(); + padding = 0; } // Max height available on the screen for a popup. - boolean ignoreBottomDecorations = + final boolean ignoreBottomDecorations = mPopup.getInputMethodMode() == PopupWindow.INPUT_METHOD_NOT_NEEDED; final int maxHeight = mPopup.getMaxAvailableHeight( getAnchorView(), mDropDownVerticalOffset, ignoreBottomDecorations); - if (mDropDownAlwaysVisible || mDropDownHeight == ViewGroup.LayoutParams.MATCH_PARENT) { return maxHeight + padding; } @@ -1213,25 +1213,30 @@ public class ListPopupWindow implements ShowableListMenu { switch (mDropDownWidth) { case ViewGroup.LayoutParams.WRAP_CONTENT: childWidthSpec = MeasureSpec.makeMeasureSpec( - mContext.getResources().getDisplayMetrics().widthPixels - - (mTempRect.left + mTempRect.right), + mContext.getResources().getDisplayMetrics().widthPixels + - (mTempRect.left + mTempRect.right), MeasureSpec.AT_MOST); break; case ViewGroup.LayoutParams.MATCH_PARENT: childWidthSpec = MeasureSpec.makeMeasureSpec( - mContext.getResources().getDisplayMetrics().widthPixels - - (mTempRect.left + mTempRect.right), + mContext.getResources().getDisplayMetrics().widthPixels + - (mTempRect.left + mTempRect.right), MeasureSpec.EXACTLY); break; default: childWidthSpec = MeasureSpec.makeMeasureSpec(mDropDownWidth, MeasureSpec.EXACTLY); break; } + + // Add padding only if the list has items in it, that way we don't show + // the popup if it is not needed. final int listContent = mDropDownList.measureHeightOfChildren(childWidthSpec, - 0, ListView.NO_POSITION, maxHeight - otherHeights, -1); - // add padding only if the list has items in it, that way we don't show - // the popup if it is not needed - if (listContent > 0) otherHeights += padding; + 0, DropDownListView.NO_POSITION, maxHeight - otherHeights, -1); + if (listContent > 0) { + final int listPadding = mDropDownList.getPaddingTop() + + mDropDownList.getPaddingBottom(); + otherHeights += padding + listPadding; + } return listContent + otherHeights; } diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index a1417f0cbb68..d1b5fc8dcd2e 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -2027,21 +2027,24 @@ public class PopupWindow { mAnchorYoff = yoff; } + final WindowManager.LayoutParams p = + (WindowManager.LayoutParams) mDecorView.getLayoutParams(); + if (updateDimension) { if (width == -1) { width = mPopupWidth; } else { mPopupWidth = width; + p.width = width; } if (height == -1) { height = mPopupHeight; } else { mPopupHeight = height; + p.height = height; } } - final WindowManager.LayoutParams p = - (WindowManager.LayoutParams) mDecorView.getLayoutParams(); final int x = p.x; final int y = p.y; if (updateLocation) { diff --git a/core/java/android/widget/RemoteViews.java b/core/java/android/widget/RemoteViews.java index 063288e2adfc..8bd63dfc2075 100644 --- a/core/java/android/widget/RemoteViews.java +++ b/core/java/android/widget/RemoteViews.java @@ -60,6 +60,7 @@ import android.widget.AdapterView.OnItemClickListener; import libcore.util.Objects; import com.android.internal.R; +import com.android.internal.util.Preconditions; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -1096,6 +1097,13 @@ public class RemoteViews implements Parcelable, Filter { memoryCounter.addBitmapMemory(mBitmaps.get(i)); } } + + @Override + protected BitmapCache clone() { + BitmapCache bitmapCache = new BitmapCache(); + bitmapCache.mBitmaps.addAll(mBitmaps); + return bitmapCache; + } } private class BitmapReflectionAction extends Action { @@ -2227,10 +2235,21 @@ public class RemoteViews implements Parcelable, Filter { public RemoteViews clone() { + Preconditions.checkState(mIsRoot, "RemoteView has been attached to another RemoteView. " + + "May only clone the root of a RemoteView hierarchy."); + Parcel p = Parcel.obtain(); + + // Do not parcel the Bitmap cache - doing so creates an expensive copy of all bitmaps. + // Instead pretend we're not owning the cache while parceling. + mIsRoot = false; writeToParcel(p, 0); p.setDataPosition(0); - RemoteViews rv = new RemoteViews(p); + mIsRoot = true; + + RemoteViews rv = new RemoteViews(p, mBitmapCache.clone()); + rv.mIsRoot = true; + p.recycle(); return rv; } @@ -2240,7 +2259,7 @@ public class RemoteViews implements Parcelable, Filter { } /** - * Reutrns the layout id of the root layout associated with this RemoteViews. In the case + * Returns the layout id of the root layout associated with this RemoteViews. In the case * that the RemoteViews has both a landscape and portrait root, this will return the layout * id associated with the portrait layout. * diff --git a/core/java/com/android/internal/app/AlertController.java b/core/java/com/android/internal/app/AlertController.java index aac7bc3810e9..753c0691222e 100644 --- a/core/java/com/android/internal/app/AlertController.java +++ b/core/java/com/android/internal/app/AlertController.java @@ -204,6 +204,9 @@ public class AlertController { mShowTitle = a.getBoolean(R.styleable.AlertDialog_showTitle, true); a.recycle(); + + /* We use a custom title so never request a window title */ + window.requestFeature(Window.FEATURE_NO_TITLE); } static boolean canTextInput(View v) { @@ -229,8 +232,6 @@ public class AlertController { } public void installContent() { - /* We use a custom title so never request a window title */ - mWindow.requestFeature(Window.FEATURE_NO_TITLE); int contentView = selectContentView(); mWindow.setContentView(contentView); setupView(); diff --git a/core/java/com/android/internal/app/ChooserActivity.java b/core/java/com/android/internal/app/ChooserActivity.java index 6085164b74d2..a4e489c5ccbf 100644 --- a/core/java/com/android/internal/app/ChooserActivity.java +++ b/core/java/com/android/internal/app/ChooserActivity.java @@ -433,8 +433,7 @@ public class ChooserActivity extends ResolverActivity { final ChooserTargetServiceConnection conn = new ChooserTargetServiceConnection(this, dri); - if (bindServiceAsUser(serviceIntent, conn, BIND_AUTO_CREATE | BIND_NOT_FOREGROUND, - UserHandle.CURRENT)) { + if (bindService(serviceIntent, conn, BIND_AUTO_CREATE | BIND_NOT_FOREGROUND)) { if (DEBUG) { Log.d(TAG, "Binding service connection for target " + dri + " intent " + serviceIntent); diff --git a/core/java/com/android/internal/app/ResolverActivity.java b/core/java/com/android/internal/app/ResolverActivity.java index 80e1db0527a5..5726de1e8c3e 100644 --- a/core/java/com/android/internal/app/ResolverActivity.java +++ b/core/java/com/android/internal/app/ResolverActivity.java @@ -76,6 +76,7 @@ import java.util.List; import java.util.Objects; import java.util.Set; +import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK; import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR; import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN; @@ -507,7 +508,9 @@ public class ResolverActivity extends Activity { mPackageMonitor.unregister(); mRegistered = false; } - if ((getIntent().getFlags()&Intent.FLAG_ACTIVITY_NEW_TASK) != 0 && !isVoiceInteraction()) { + final Intent intent = getIntent(); + if ((intent.getFlags() & FLAG_ACTIVITY_NEW_TASK) != 0 && !isVoiceInteraction() + && !mResolvingHome) { // This resolver is in the unusual situation where it has been // launched at the top of a new task. We don't let it be added // to the recent tasks shown to the user, and we need to make sure diff --git a/core/java/com/android/internal/os/BatteryStatsImpl.java b/core/java/com/android/internal/os/BatteryStatsImpl.java index d11787d86571..b0ef01281677 100644 --- a/core/java/com/android/internal/os/BatteryStatsImpl.java +++ b/core/java/com/android/internal/os/BatteryStatsImpl.java @@ -3444,7 +3444,7 @@ public class BatteryStatsImpl extends BatteryStats { public void noteDeviceIdleModeLocked(int mode, String activeReason, int activeUid) { final long elapsedRealtime = mClocks.elapsedRealtime(); final long uptime = mClocks.uptimeMillis(); - boolean nowIdling = mode == DEVICE_IDLE_MODE_FULL; + boolean nowIdling = mode == DEVICE_IDLE_MODE_DEEP; if (mDeviceIdling && !nowIdling && activeReason == null) { // We don't go out of general idling mode until explicitly taken out of // device idle through going active or significant motion. @@ -3492,7 +3492,7 @@ public class BatteryStatsImpl extends BatteryStats { mLongestLightIdleTime = lastDuration; } mDeviceIdleModeLightTimer.stopRunningLocked(elapsedRealtime); - } else if (mDeviceIdleMode == DEVICE_IDLE_MODE_FULL) { + } else if (mDeviceIdleMode == DEVICE_IDLE_MODE_DEEP) { if (lastDuration > mLongestFullIdleTime) { mLongestFullIdleTime = lastDuration; } @@ -3500,7 +3500,7 @@ public class BatteryStatsImpl extends BatteryStats { } if (mode == DEVICE_IDLE_MODE_LIGHT) { mDeviceIdleModeLightTimer.startRunningLocked(elapsedRealtime); - } else if (mode == DEVICE_IDLE_MODE_FULL) { + } else if (mode == DEVICE_IDLE_MODE_DEEP) { mDeviceIdleModeFullTimer.startRunningLocked(elapsedRealtime); } mDeviceIdleMode = mode; @@ -4452,7 +4452,7 @@ public class BatteryStatsImpl extends BatteryStats { switch (mode) { case DEVICE_IDLE_MODE_LIGHT: return mDeviceIdleModeLightTimer.getTotalTimeLocked(elapsedRealtimeUs, which); - case DEVICE_IDLE_MODE_FULL: + case DEVICE_IDLE_MODE_DEEP: return mDeviceIdleModeFullTimer.getTotalTimeLocked(elapsedRealtimeUs, which); } return 0; @@ -4462,7 +4462,7 @@ public class BatteryStatsImpl extends BatteryStats { switch (mode) { case DEVICE_IDLE_MODE_LIGHT: return mDeviceIdleModeLightTimer.getCountLocked(which); - case DEVICE_IDLE_MODE_FULL: + case DEVICE_IDLE_MODE_DEEP: return mDeviceIdleModeFullTimer.getCountLocked(which); } return 0; @@ -4472,7 +4472,7 @@ public class BatteryStatsImpl extends BatteryStats { switch (mode) { case DEVICE_IDLE_MODE_LIGHT: return mLongestLightIdleTime; - case DEVICE_IDLE_MODE_FULL: + case DEVICE_IDLE_MODE_DEEP: return mLongestFullIdleTime; } return 0; @@ -4482,7 +4482,7 @@ public class BatteryStatsImpl extends BatteryStats { switch (mode) { case DEVICE_IDLE_MODE_LIGHT: return mDeviceLightIdlingTimer.getTotalTimeLocked(elapsedRealtimeUs, which); - case DEVICE_IDLE_MODE_FULL: + case DEVICE_IDLE_MODE_DEEP: return mDeviceIdlingTimer.getTotalTimeLocked(elapsedRealtimeUs, which); } return 0; @@ -4492,7 +4492,7 @@ public class BatteryStatsImpl extends BatteryStats { switch (mode) { case DEVICE_IDLE_MODE_LIGHT: return mDeviceLightIdlingTimer.getCountLocked(which); - case DEVICE_IDLE_MODE_FULL: + case DEVICE_IDLE_MODE_DEEP: return mDeviceIdlingTimer.getCountLocked(which); } return 0; diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java index 919254a36a76..66cc97598ae8 100644 --- a/core/java/com/android/internal/os/Zygote.java +++ b/core/java/com/android/internal/os/Zygote.java @@ -149,6 +149,12 @@ public final class Zygote { native private static int nativeForkSystemServer(int uid, int gid, int[] gids, int debugFlags, int[][] rlimits, long permittedCapabilities, long effectiveCapabilities); + /** + * Zygote unmount storage space on initializing. + * This method is called once. + */ + native protected static void nativeUnmountStorageOnInit(); + private static void callPostForkChildHooks(int debugFlags, boolean isSystemServer, String instructionSet) { VM_HOOKS.postForkChild(debugFlags, isSystemServer, instructionSet); diff --git a/core/java/com/android/internal/os/ZygoteInit.java b/core/java/com/android/internal/os/ZygoteInit.java index 3abea26ab42b..b658f87a9689 100644 --- a/core/java/com/android/internal/os/ZygoteInit.java +++ b/core/java/com/android/internal/os/ZygoteInit.java @@ -643,6 +643,9 @@ public class ZygoteInit { // Zygote. Trace.setTracingEnabled(false); + // Zygote process unmounts root storage spaces. + Zygote.nativeUnmountStorageOnInit(); + if (startSystemServer) { startSystemServer(abiList, socketName); } diff --git a/core/java/com/android/internal/view/IInputConnectionWrapper.java b/core/java/com/android/internal/view/IInputConnectionWrapper.java index 3be15f3998ec..afa155437b1c 100644 --- a/core/java/com/android/internal/view/IInputConnectionWrapper.java +++ b/core/java/com/android/internal/view/IInputConnectionWrapper.java @@ -16,6 +16,8 @@ package com.android.internal.view; +import android.annotation.NonNull; +import android.annotation.Nullable; import android.os.Bundle; import android.os.Handler; import android.os.Looper; @@ -57,7 +59,8 @@ public abstract class IInputConnectionWrapper extends IInputContext.Stub { private static final int DO_CLEAR_META_KEY_STATES = 130; private static final int DO_REQUEST_UPDATE_CURSOR_ANCHOR_INFO = 140; - private WeakReference<InputConnection> mInputConnection; + @NonNull + private final WeakReference<InputConnection> mInputConnection; private Looper mMainLooper; private Handler mH; @@ -86,6 +89,11 @@ public abstract class IInputConnectionWrapper extends IInputContext.Stub { mH = new MyHandler(mMainLooper); } + @Nullable + public InputConnection getInputConnection() { + return mInputConnection.get(); + } + abstract protected boolean isActive(); /** diff --git a/core/java/com/android/internal/view/IInputMethod.aidl b/core/java/com/android/internal/view/IInputMethod.aidl index 77456da248ea..6ab1ec797a22 100644 --- a/core/java/com/android/internal/view/IInputMethod.aidl +++ b/core/java/com/android/internal/view/IInputMethod.aidl @@ -38,9 +38,9 @@ oneway interface IInputMethod { void unbindInput(); - void startInput(in IInputContext inputContext, in EditorInfo attribute); + void startInput(in IInputContext inputContext, int missingMethods, in EditorInfo attribute); - void restartInput(in IInputContext inputContext, in EditorInfo attribute); + void restartInput(in IInputContext inputContext, int missingMethods, in EditorInfo attribute); void createSession(in InputChannel channel, IInputSessionCallback callback); diff --git a/core/java/com/android/internal/view/IInputMethodManager.aidl b/core/java/com/android/internal/view/IInputMethodManager.aidl index 5576f13ba488..94c94c190e6b 100644 --- a/core/java/com/android/internal/view/IInputMethodManager.aidl +++ b/core/java/com/android/internal/view/IInputMethodManager.aidl @@ -57,7 +57,8 @@ interface IInputMethodManager { /* @InputMethodClient.StartInputReason */ int startInputReason, in IInputMethodClient client, in IBinder windowToken, int controlFlags, int softInputMode, int windowFlags, in EditorInfo attribute, - IInputContext inputContext); + IInputContext inputContext, + /* @InputConnectionInspector.MissingMethodFlags */ int missingMethodFlags); void showInputMethodPickerFromClient(in IInputMethodClient client, int auxiliarySubtypeMode); diff --git a/core/java/com/android/internal/view/InputConnectionWrapper.java b/core/java/com/android/internal/view/InputConnectionWrapper.java index fc672454a0a0..85b8606f7500 100644 --- a/core/java/com/android/internal/view/InputConnectionWrapper.java +++ b/core/java/com/android/internal/view/InputConnectionWrapper.java @@ -27,11 +27,15 @@ import android.view.inputmethod.CorrectionInfo; import android.view.inputmethod.ExtractedText; import android.view.inputmethod.ExtractedTextRequest; import android.view.inputmethod.InputConnection; +import android.view.inputmethod.InputConnectionInspector; +import android.view.inputmethod.InputConnectionInspector.MissingMethodFlags; public class InputConnectionWrapper implements InputConnection { private static final int MAX_WAIT_TIME_MILLIS = 2000; private final IInputContext mIInputContext; - + @MissingMethodFlags + private final int mMissingMethods; + static class InputContextCallback extends IInputContextCallback.Stub { private static final String TAG = "InputConnectionWrapper.ICC"; public int mSeq; @@ -191,8 +195,10 @@ public class InputConnectionWrapper implements InputConnection { } } - public InputConnectionWrapper(IInputContext inputContext) { + public InputConnectionWrapper(IInputContext inputContext, + @MissingMethodFlags final int missingMethods) { mIInputContext = inputContext; + mMissingMethods = missingMethods; } public CharSequence getTextAfterCursor(int length, int flags) { @@ -230,8 +236,12 @@ public class InputConnectionWrapper implements InputConnection { } return value; } - + public CharSequence getSelectedText(int flags) { + if (isMethodMissing(MissingMethodFlags.GET_SELECTED_TEXT)) { + // This method is not implemented. + return null; + } CharSequence value = null; try { InputContextCallback callback = InputContextCallback.getInstance(); @@ -295,6 +305,10 @@ public class InputConnectionWrapper implements InputConnection { } public boolean commitCompletion(CompletionInfo text) { + if (isMethodMissing(MissingMethodFlags.COMMIT_CORRECTION)) { + // This method is not implemented. + return false; + } try { mIInputContext.commitCompletion(text); return true; @@ -340,6 +354,10 @@ public class InputConnectionWrapper implements InputConnection { } public boolean setComposingRegion(int start, int end) { + if (isMethodMissing(MissingMethodFlags.SET_COMPOSING_REGION)) { + // This method is not implemented. + return false; + } try { mIInputContext.setComposingRegion(start, end); return true; @@ -412,6 +430,10 @@ public class InputConnectionWrapper implements InputConnection { } public boolean deleteSurroundingTextInCodePoints(int beforeLength, int afterLength) { + if (isMethodMissing(MissingMethodFlags.DELETE_SURROUNDING_TEXT_IN_CODE_POINTS)) { + // This method is not implemented. + return false; + } try { mIInputContext.deleteSurroundingTextInCodePoints(beforeLength, afterLength); return true; @@ -440,6 +462,10 @@ public class InputConnectionWrapper implements InputConnection { public boolean requestCursorUpdates(int cursorUpdateMode) { boolean result = false; + if (isMethodMissing(MissingMethodFlags.REQUEST_CURSOR_UPDATES)) { + // This method is not implemented. + return false; + } try { InputContextCallback callback = InputContextCallback.getInstance(); mIInputContext.requestUpdateCursorAnchorInfo(cursorUpdateMode, callback.mSeq, callback); @@ -460,4 +486,16 @@ public class InputConnectionWrapper implements InputConnection { // Nothing should happen when called from input method. return null; } + + private boolean isMethodMissing(@MissingMethodFlags final int methodFlag) { + return (mMissingMethods & methodFlag) == methodFlag; + } + + @Override + public String toString() { + return "InputConnectionWrapper{idHash=#" + + Integer.toHexString(System.identityHashCode(this)) + + " mMissingMethods=" + + InputConnectionInspector.getMissingMethodFlagsAsString(mMissingMethods) + "}"; + } } diff --git a/core/jni/Android.mk b/core/jni/Android.mk index c6db0ed6cb69..c685b0c14e2f 100644 --- a/core/jni/Android.mk +++ b/core/jni/Android.mk @@ -117,13 +117,10 @@ LOCAL_SRC_FILES:= \ android/graphics/Interpolator.cpp \ android/graphics/MaskFilter.cpp \ android/graphics/Matrix.cpp \ - android/graphics/MinikinSkia.cpp \ - android/graphics/MinikinUtils.cpp \ android/graphics/Movie.cpp \ android/graphics/NinePatch.cpp \ android/graphics/NinePatchPeeker.cpp \ android/graphics/Paint.cpp \ - android/graphics/PaintImpl.cpp \ android/graphics/Path.cpp \ android/graphics/PathMeasure.cpp \ android/graphics/PathEffect.cpp \ @@ -135,7 +132,6 @@ LOCAL_SRC_FILES:= \ android/graphics/Shader.cpp \ android/graphics/SurfaceTexture.cpp \ android/graphics/Typeface.cpp \ - android/graphics/TypefaceImpl.cpp \ android/graphics/Utils.cpp \ android/graphics/Xfermode.cpp \ android/graphics/YuvToJpegEncoder.cpp \ diff --git a/core/jni/android/graphics/Bitmap.cpp b/core/jni/android/graphics/Bitmap.cpp index 43e26b332f11..27b98306b72b 100755 --- a/core/jni/android/graphics/Bitmap.cpp +++ b/core/jni/android/graphics/Bitmap.cpp @@ -1,7 +1,6 @@ #define LOG_TAG "Bitmap" #include "Bitmap.h" -#include "Paint.h" #include "SkBitmap.h" #include "SkPixelRef.h" #include "SkImageEncoder.h" @@ -18,6 +17,7 @@ #include "android_nio_utils.h" #include "CreateJavaOutputStreamAdaptor.h" #include <Caches.h> +#include <hwui/Paint.h> #include "core_jni_helpers.h" diff --git a/core/jni/android/graphics/Camera.cpp b/core/jni/android/graphics/Camera.cpp index 6fcf6892d490..76d685149ec4 100644 --- a/core/jni/android/graphics/Camera.cpp +++ b/core/jni/android/graphics/Camera.cpp @@ -3,8 +3,8 @@ #include "SkCamera.h" -#include "Canvas.h" #include "GraphicsJNI.h" +#include <hwui/Canvas.h> static jfieldID gNativeInstanceFieldID; diff --git a/core/jni/android/graphics/CanvasProperty.cpp b/core/jni/android/graphics/CanvasProperty.cpp index 728bc1c3677e..c841d6a5125a 100644 --- a/core/jni/android/graphics/CanvasProperty.cpp +++ b/core/jni/android/graphics/CanvasProperty.cpp @@ -16,9 +16,9 @@ #include "jni.h" #include "GraphicsJNI.h" -#include "Paint.h" #include <core_jni_helpers.h> +#include <hwui/Paint.h> #include <utils/RefBase.h> #include <CanvasProperty.h> diff --git a/core/jni/android/graphics/FontFamily.cpp b/core/jni/android/graphics/FontFamily.cpp index 2e974a3ecaa3..6dc251c87e5e 100644 --- a/core/jni/android/graphics/FontFamily.cpp +++ b/core/jni/android/graphics/FontFamily.cpp @@ -31,9 +31,9 @@ #include <androidfw/AssetManager.h> #include "Utils.h" -#include "TypefaceImpl.h" +#include <hwui/MinikinSkia.h> +#include <hwui/Typeface.h> #include <minikin/FontFamily.h> -#include "MinikinSkia.h" #include <memory> diff --git a/core/jni/android/graphics/Graphics.cpp b/core/jni/android/graphics/Graphics.cpp index bd01c73adf80..1ead6188a8aa 100644 --- a/core/jni/android/graphics/Graphics.cpp +++ b/core/jni/android/graphics/Graphics.cpp @@ -7,13 +7,13 @@ #include "JNIHelp.h" #include "GraphicsJNI.h" -#include "Canvas.h" #include "SkCanvas.h" #include "SkDevice.h" #include "SkMath.h" #include "SkRegion.h" #include <android_runtime/AndroidRuntime.h> #include <cutils/ashmem.h> +#include <hwui/Canvas.h> #include <Caches.h> #include <TextureCache.h> diff --git a/core/jni/android/graphics/GraphicsJNI.h b/core/jni/android/graphics/GraphicsJNI.h index e99a3ffa2a47..5baa8f8740c2 100644 --- a/core/jni/android/graphics/GraphicsJNI.h +++ b/core/jni/android/graphics/GraphicsJNI.h @@ -11,15 +11,15 @@ #include "SkPoint.h" #include "SkRect.h" #include "SkImageDecoder.h" -#include <Canvas.h> #include <jni.h> +#include <hwui/Canvas.h> class SkBitmapRegionDecoder; class SkCanvas; namespace android { class Paint; -struct TypefaceImpl; +struct Typeface; } class GraphicsJNI { diff --git a/core/jni/android/graphics/Movie.cpp b/core/jni/android/graphics/Movie.cpp index 498c5902e5fd..71988f9cf44d 100644 --- a/core/jni/android/graphics/Movie.cpp +++ b/core/jni/android/graphics/Movie.cpp @@ -1,7 +1,5 @@ -#include "Canvas.h" #include "CreateJavaOutputStreamAdaptor.h" #include "GraphicsJNI.h" -#include "Paint.h" #include "ScopedLocalRef.h" #include "SkFrontBufferedStream.h" #include "SkMovie.h" @@ -12,6 +10,8 @@ #include <androidfw/Asset.h> #include <androidfw/ResourceTypes.h> +#include <hwui/Canvas.h> +#include <hwui/Paint.h> #include <jni.h> #include <netinet/in.h> diff --git a/core/jni/android/graphics/NinePatch.cpp b/core/jni/android/graphics/NinePatch.cpp index 3ccbb35cc960..4f2f3897469c 100644 --- a/core/jni/android/graphics/NinePatch.cpp +++ b/core/jni/android/graphics/NinePatch.cpp @@ -19,12 +19,12 @@ #define LOG_NDEBUG 1 #include <androidfw/ResourceTypes.h> +#include <hwui/Canvas.h> +#include <hwui/Paint.h> #include <utils/Log.h> #include <ResourceCache.h> -#include "Paint.h" -#include "Canvas.h" #include "SkCanvas.h" #include "SkRegion.h" #include "GraphicsJNI.h" diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp index d00e94ca4fd9..27d8fed51e8a 100644 --- a/core/jni/android/graphics/Paint.cpp +++ b/core/jni/android/graphics/Paint.cpp @@ -37,13 +37,13 @@ #include "unicode/ushape.h" #include "utils/Blur.h" +#include <hwui/MinikinSkia.h> +#include <hwui/MinikinUtils.h> +#include <hwui/Paint.h> +#include <hwui/Typeface.h> #include <minikin/GraphemeBreak.h> #include <minikin/Measurement.h> #include <unicode/utf16.h> -#include "MinikinSkia.h" -#include "MinikinUtils.h" -#include "Paint.h" -#include "TypefaceImpl.h" #include <cassert> #include <cstring> @@ -402,8 +402,8 @@ namespace PaintGlue { const int kElegantDescent = -500; const int kElegantLeading = 0; Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); - typeface = TypefaceImpl_resolveDefault(typeface); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); + typeface = Typeface::resolveDefault(typeface); FakedFont baseFont = typeface->fFontCollection->baseFontFaked(typeface->fStyle); float saveSkewX = paint->getTextSkewX(); bool savefakeBold = paint->isFakeBoldText(); @@ -474,7 +474,7 @@ namespace PaintGlue { return descent - ascent + leading; } - static jfloat doTextAdvances(JNIEnv *env, Paint *paint, TypefaceImpl* typeface, + static jfloat doTextAdvances(JNIEnv *env, Paint *paint, Typeface* typeface, const jchar *text, jint start, jint count, jint contextCount, jint bidiFlags, jfloatArray advances, jint advancesIndex) { NPE_CHECK_RETURN_ZERO(env, text); @@ -510,7 +510,7 @@ namespace PaintGlue { jcharArray text, jint index, jint count, jint contextIndex, jint contextCount, jint bidiFlags, jfloatArray advances, jint advancesIndex) { Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); jchar* textArray = env->GetCharArrayElements(text, NULL); jfloat result = doTextAdvances(env, paint, typeface, textArray + contextIndex, index - contextIndex, count, contextCount, bidiFlags, advances, advancesIndex); @@ -523,7 +523,7 @@ namespace PaintGlue { jstring text, jint start, jint end, jint contextStart, jint contextEnd, jint bidiFlags, jfloatArray advances, jint advancesIndex) { Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); const jchar* textArray = env->GetStringChars(text, NULL); jfloat result = doTextAdvances(env, paint, typeface, textArray + contextStart, start - contextStart, end - start, contextEnd - contextStart, bidiFlags, @@ -590,7 +590,7 @@ namespace PaintGlue { SkPath tmpPath; }; - static void getTextPath(JNIEnv* env, Paint* paint, TypefaceImpl* typeface, const jchar* text, + static void getTextPath(JNIEnv* env, Paint* paint, Typeface* typeface, const jchar* text, jint count, jint bidiFlags, jfloat x, jfloat y, SkPath* path) { Layout layout; MinikinUtils::doLayout(&layout, paint, bidiFlags, typeface, text, 0, count, count); @@ -613,7 +613,7 @@ namespace PaintGlue { jlong typefaceHandle, jint bidiFlags, jcharArray text, jint index, jint count, jfloat x, jfloat y, jlong pathHandle) { Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); SkPath* path = reinterpret_cast<SkPath*>(pathHandle); const jchar* textArray = env->GetCharArrayElements(text, NULL); getTextPath(env, paint, typeface, textArray + index, count, bidiFlags, x, y, path); @@ -624,7 +624,7 @@ namespace PaintGlue { jlong typefaceHandle, jint bidiFlags, jstring text, jint start, jint end, jfloat x, jfloat y, jlong pathHandle) { Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); SkPath* path = reinterpret_cast<SkPath*>(pathHandle); const jchar* textArray = env->GetStringChars(text, NULL); getTextPath(env, paint, typeface, textArray + start, end - start, bidiFlags, x, y, path); @@ -648,7 +648,7 @@ namespace PaintGlue { return paint->getLooper() && paint->getLooper()->asABlurShadow(NULL); } - static int breakText(JNIEnv* env, const Paint& paint, TypefaceImpl* typeface, const jchar text[], + static int breakText(JNIEnv* env, const Paint& paint, Typeface* typeface, const jchar text[], int count, float maxWidth, jint bidiFlags, jfloatArray jmeasured, const bool forwardScan) { size_t measuredCount = 0; @@ -685,7 +685,7 @@ namespace PaintGlue { NPE_CHECK_RETURN_ZERO(env, jtext); Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); bool forwardTextDirection; if (count < 0) { @@ -714,7 +714,7 @@ namespace PaintGlue { NPE_CHECK_RETURN_ZERO(env, jtext); Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); int count = env->GetStringLength(jtext); const jchar* text = env->GetStringChars(jtext, NULL); @@ -724,7 +724,7 @@ namespace PaintGlue { } static void doTextBounds(JNIEnv* env, const jchar* text, int count, jobject bounds, - const Paint& paint, TypefaceImpl* typeface, jint bidiFlags) { + const Paint& paint, Typeface* typeface, jint bidiFlags) { SkRect r; SkIRect ir; @@ -743,7 +743,7 @@ namespace PaintGlue { static void getStringBounds(JNIEnv* env, jobject, jlong paintHandle, jlong typefaceHandle, jstring text, jint start, jint end, jint bidiFlags, jobject bounds) { const Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); const jchar* textArray = env->GetStringChars(text, NULL); doTextBounds(env, textArray + start, end - start, bounds, *paint, typeface, bidiFlags); env->ReleaseStringChars(text, textArray); @@ -752,7 +752,7 @@ namespace PaintGlue { static void getCharArrayBounds(JNIEnv* env, jobject, jlong paintHandle, jlong typefaceHandle, jcharArray text, jint index, jint count, jint bidiFlags, jobject bounds) { const Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); const jchar* textArray = env->GetCharArrayElements(text, NULL); doTextBounds(env, textArray + index, count, bounds, *paint, typeface, bidiFlags); env->ReleaseCharArrayElements(text, const_cast<jchar*>(textArray), @@ -771,7 +771,7 @@ namespace PaintGlue { static jboolean hasGlyph(JNIEnv *env, jclass, jlong paintHandle, jlong typefaceHandle, jint bidiFlags, jstring string) { const Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); ScopedStringChars str(env, string); /* Start by rejecting unsupported base code point and variation selector pairs. */ @@ -820,7 +820,7 @@ namespace PaintGlue { return nGlyphs > 0 && !layoutContainsNotdef(layout); } - static jfloat doRunAdvance(const Paint* paint, TypefaceImpl* typeface, const jchar buf[], + static jfloat doRunAdvance(const Paint* paint, Typeface* typeface, const jchar buf[], jint start, jint count, jint bufSize, jboolean isRtl, jint offset) { int bidiFlags = isRtl ? kBidi_Force_RTL : kBidi_Force_LTR; if (offset == count) { @@ -837,7 +837,7 @@ namespace PaintGlue { jlong typefaceHandle, jcharArray text, jint start, jint end, jint contextStart, jint contextEnd, jboolean isRtl, jint offset) { const Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); jchar* textArray = (jchar*) env->GetPrimitiveArrayCritical(text, NULL); jfloat result = doRunAdvance(paint, typeface, textArray + contextStart, start - contextStart, end - start, contextEnd - contextStart, isRtl, @@ -846,7 +846,7 @@ namespace PaintGlue { return result; } - static jint doOffsetForAdvance(const Paint* paint, TypefaceImpl* typeface, const jchar buf[], + static jint doOffsetForAdvance(const Paint* paint, Typeface* typeface, const jchar buf[], jint start, jint count, jint bufSize, jboolean isRtl, jfloat advance) { int bidiFlags = isRtl ? kBidi_Force_RTL : kBidi_Force_LTR; std::unique_ptr<float[]> advancesArray(new float[count]); @@ -859,7 +859,7 @@ namespace PaintGlue { jlong typefaceHandle, jcharArray text, jint start, jint end, jint contextStart, jint contextEnd, jboolean isRtl, jfloat advance) { const Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); jchar* textArray = (jchar*) env->GetPrimitiveArrayCritical(text, NULL); jint result = doOffsetForAdvance(paint, typeface, textArray + contextStart, start - contextStart, end - start, contextEnd - contextStart, isRtl, advance); diff --git a/core/jni/android/graphics/Picture.cpp b/core/jni/android/graphics/Picture.cpp index 6e83f1b19f5f..07e14a211e64 100644 --- a/core/jni/android/graphics/Picture.cpp +++ b/core/jni/android/graphics/Picture.cpp @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "Canvas.h" #include "Picture.h" #include "SkStream.h" #include <memory> +#include <hwui/Canvas.h> namespace android { diff --git a/core/jni/android/graphics/Rasterizer.cpp b/core/jni/android/graphics/Rasterizer.cpp index a106ecfeb65f..3784f0d8a220 100644 --- a/core/jni/android/graphics/Rasterizer.cpp +++ b/core/jni/android/graphics/Rasterizer.cpp @@ -22,10 +22,11 @@ #include "jni.h" #include "GraphicsJNI.h" -#include "Paint.h" #include "SkLayerRasterizer.h" #include "core_jni_helpers.h" +#include <hwui/Paint.h> + // Rasterizer.java holds a pointer (jlong) to this guy class NativeRasterizer { public: diff --git a/core/jni/android/graphics/Typeface.cpp b/core/jni/android/graphics/Typeface.cpp index e97b768dd0cc..9a53cadf355b 100644 --- a/core/jni/android/graphics/Typeface.cpp +++ b/core/jni/android/graphics/Typeface.cpp @@ -20,50 +20,57 @@ #include "GraphicsJNI.h" #include "ScopedPrimitiveArray.h" #include "SkTypeface.h" -#include "TypefaceImpl.h" #include <android_runtime/android_util_AssetManager.h> #include <androidfw/AssetManager.h> +#include <hwui/Typeface.h> using namespace android; static jlong Typeface_createFromTypeface(JNIEnv* env, jobject, jlong familyHandle, jint style) { - TypefaceImpl* family = reinterpret_cast<TypefaceImpl*>(familyHandle); - TypefaceImpl* face = TypefaceImpl_createFromTypeface(family, (SkTypeface::Style)style); + Typeface* family = reinterpret_cast<Typeface*>(familyHandle); + Typeface* face = Typeface::createFromTypeface(family, (SkTypeface::Style)style); // TODO: the following logic shouldn't be necessary, the above should always succeed. // Try to find the closest matching font, using the standard heuristic if (NULL == face) { - face = TypefaceImpl_createFromTypeface(family, (SkTypeface::Style)(style ^ SkTypeface::kItalic)); + face = Typeface::createFromTypeface(family, (SkTypeface::Style)(style ^ SkTypeface::kItalic)); } for (int i = 0; NULL == face && i < 4; i++) { - face = TypefaceImpl_createFromTypeface(family, (SkTypeface::Style)i); + face = Typeface::createFromTypeface(family, (SkTypeface::Style)i); } return reinterpret_cast<jlong>(face); } static jlong Typeface_createWeightAlias(JNIEnv* env, jobject, jlong familyHandle, jint weight) { - TypefaceImpl* family = reinterpret_cast<TypefaceImpl*>(familyHandle); - TypefaceImpl* face = TypefaceImpl_createWeightAlias(family, weight); + Typeface* family = reinterpret_cast<Typeface*>(familyHandle); + Typeface* face = Typeface::createWeightAlias(family, weight); return reinterpret_cast<jlong>(face); } static void Typeface_unref(JNIEnv* env, jobject obj, jlong faceHandle) { - TypefaceImpl* face = reinterpret_cast<TypefaceImpl*>(faceHandle); - TypefaceImpl_unref(face); + Typeface* face = reinterpret_cast<Typeface*>(faceHandle); + if (face != NULL) { + face->unref(); + } } static jint Typeface_getStyle(JNIEnv* env, jobject obj, jlong faceHandle) { - TypefaceImpl* face = reinterpret_cast<TypefaceImpl*>(faceHandle); - return TypefaceImpl_getStyle(face); + Typeface* face = reinterpret_cast<Typeface*>(faceHandle); + return face->fSkiaStyle; } static jlong Typeface_createFromArray(JNIEnv *env, jobject, jlongArray familyArray) { ScopedLongArrayRO families(env, familyArray); - return reinterpret_cast<jlong>(TypefaceImpl_createFromFamilies(families.get(), families.size())); + std::vector<FontFamily*> familyVec; + for (size_t i = 0; i < families.size(); i++) { + FontFamily* family = reinterpret_cast<FontFamily*>(families[i]); + familyVec.push_back(family); + } + return reinterpret_cast<jlong>(Typeface::createFromFamilies(familyVec)); } static void Typeface_setDefault(JNIEnv *env, jobject, jlong faceHandle) { - TypefaceImpl* face = reinterpret_cast<TypefaceImpl*>(faceHandle); - return TypefaceImpl_setDefault(face); + Typeface* face = reinterpret_cast<Typeface*>(faceHandle); + return Typeface::setDefault(face); } /////////////////////////////////////////////////////////////////////////////// diff --git a/core/jni/android/graphics/pdf/PdfDocument.cpp b/core/jni/android/graphics/pdf/PdfDocument.cpp index 5d496e5ccae9..88e37e5545b5 100644 --- a/core/jni/android/graphics/pdf/PdfDocument.cpp +++ b/core/jni/android/graphics/pdf/PdfDocument.cpp @@ -19,7 +19,6 @@ #include "core_jni_helpers.h" #include <vector> -#include "Canvas.h" #include "CreateJavaOutputStreamAdaptor.h" #include "SkDocument.h" @@ -28,6 +27,8 @@ #include "SkStream.h" #include "SkRect.h" +#include <hwui/Canvas.h> + namespace android { struct PageRecord { diff --git a/core/jni/android_graphics_Canvas.cpp b/core/jni/android_graphics_Canvas.cpp index cf73316d494b..ded4daca0707 100644 --- a/core/jni/android_graphics_Canvas.cpp +++ b/core/jni/android_graphics_Canvas.cpp @@ -19,15 +19,14 @@ #include "core_jni_helpers.h" #include <androidfw/ResourceTypes.h> -#include <Canvas.h> +#include <hwui/Canvas.h> +#include <hwui/Paint.h> +#include <hwui/Typeface.h> +#include <minikin/Layout.h> #include "Bitmap.h" #include "SkDrawFilter.h" #include "SkGraphics.h" -#include "Paint.h" -#include "TypefaceImpl.h" - -#include "MinikinUtils.h" namespace android { @@ -475,111 +474,13 @@ static void drawBitmapMesh(JNIEnv* env, jobject, jlong canvasHandle, jobject jbi vertA.ptr(), colorA.ptr(), paint); } -static void simplifyPaint(int color, SkPaint* paint) { - paint->setColor(color); - paint->setShader(nullptr); - paint->setColorFilter(nullptr); - paint->setLooper(nullptr); - paint->setStrokeWidth(4 + 0.04 * paint->getTextSize()); - paint->setStrokeJoin(SkPaint::kRound_Join); - paint->setLooper(nullptr); -} - -class DrawTextFunctor { -public: - DrawTextFunctor(const Layout& layout, Canvas* canvas, uint16_t* glyphs, float* pos, - const SkPaint& paint, float x, float y, MinikinRect& bounds, - float totalAdvance) - : layout(layout), canvas(canvas), glyphs(glyphs), pos(pos), paint(paint), - x(x), y(y), bounds(bounds), totalAdvance(totalAdvance) { } - - void operator()(size_t start, size_t end) { - if (canvas->drawTextAbsolutePos()) { - for (size_t i = start; i < end; i++) { - glyphs[i] = layout.getGlyphId(i); - pos[2 * i] = x + layout.getX(i); - pos[2 * i + 1] = y + layout.getY(i); - } - } else { - for (size_t i = start; i < end; i++) { - glyphs[i] = layout.getGlyphId(i); - pos[2 * i] = layout.getX(i); - pos[2 * i + 1] = layout.getY(i); - } - } - - size_t glyphCount = end - start; - - if (CC_UNLIKELY(canvas->isHighContrastText() && paint.getAlpha() != 0)) { - // high contrast draw path - int color = paint.getColor(); - int channelSum = SkColorGetR(color) + SkColorGetG(color) + SkColorGetB(color); - bool darken = channelSum < (128 * 3); - - // outline - SkPaint outlinePaint(paint); - simplifyPaint(darken ? SK_ColorWHITE : SK_ColorBLACK, &outlinePaint); - outlinePaint.setStyle(SkPaint::kStrokeAndFill_Style); - canvas->drawText(glyphs + start, pos + (2 * start), glyphCount, outlinePaint, x, y, - bounds.mLeft, bounds.mTop, bounds.mRight, bounds.mBottom, totalAdvance); - - // inner - SkPaint innerPaint(paint); - simplifyPaint(darken ? SK_ColorBLACK : SK_ColorWHITE, &innerPaint); - innerPaint.setStyle(SkPaint::kFill_Style); - canvas->drawText(glyphs + start, pos + (2 * start), glyphCount, innerPaint, x, y, - bounds.mLeft, bounds.mTop, bounds.mRight, bounds.mBottom, totalAdvance); - } else { - // standard draw path - canvas->drawText(glyphs + start, pos + (2 * start), glyphCount, paint, x, y, - bounds.mLeft, bounds.mTop, bounds.mRight, bounds.mBottom, - totalAdvance); - } - } -private: - const Layout& layout; - Canvas* canvas; - uint16_t* glyphs; - float* pos; - const SkPaint& paint; - float x; - float y; - MinikinRect& bounds; - float totalAdvance; -}; - -void drawText(Canvas* canvas, const uint16_t* text, int start, int count, int contextCount, - float x, float y, int bidiFlags, const Paint& origPaint, TypefaceImpl* typeface) { - // minikin may modify the original paint - Paint paint(origPaint); - - Layout layout; - MinikinUtils::doLayout(&layout, &paint, bidiFlags, typeface, text, start, count, contextCount); - - size_t nGlyphs = layout.nGlyphs(); - std::unique_ptr<uint16_t[]> glyphs(new uint16_t[nGlyphs]); - std::unique_ptr<float[]> pos(new float[nGlyphs * 2]); - - x += MinikinUtils::xOffsetForTextAlign(&paint, layout); - - MinikinRect bounds; - layout.getBounds(&bounds); - if (!canvas->drawTextAbsolutePos()) { - bounds.offset(x, y); - } - - DrawTextFunctor f(layout, canvas, glyphs.get(), pos.get(), - paint, x, y, bounds, layout.getAdvance()); - MinikinUtils::forFontRun(layout, &paint, f); -} - static void drawTextChars(JNIEnv* env, jobject, jlong canvasHandle, jcharArray text, jint index, jint count, jfloat x, jfloat y, jint bidiFlags, jlong paintHandle, jlong typefaceHandle) { Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); jchar* jchars = env->GetCharArrayElements(text, NULL); - drawText(get_canvas(canvasHandle), jchars + index, 0, count, count, x, y, + get_canvas(canvasHandle)->drawText(jchars + index, 0, count, count, x, y, bidiFlags, *paint, typeface); env->ReleaseCharArrayElements(text, jchars, JNI_ABORT); } @@ -588,10 +489,10 @@ static void drawTextString(JNIEnv* env, jobject, jlong canvasHandle, jstring tex jint start, jint end, jfloat x, jfloat y, jint bidiFlags, jlong paintHandle, jlong typefaceHandle) { Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); const int count = end - start; const jchar* jchars = env->GetStringChars(text, NULL); - drawText(get_canvas(canvasHandle), jchars + start, 0, count, count, x, y, + get_canvas(canvasHandle)->drawText(jchars + start, 0, count, count, x, y, bidiFlags, *paint, typeface); env->ReleaseStringChars(text, jchars); } @@ -600,11 +501,11 @@ static void drawTextRunChars(JNIEnv* env, jobject, jlong canvasHandle, jcharArra jint count, jint contextIndex, jint contextCount, jfloat x, jfloat y, jboolean isRtl, jlong paintHandle, jlong typefaceHandle) { Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); const int bidiFlags = isRtl ? kBidi_Force_RTL : kBidi_Force_LTR; jchar* jchars = env->GetCharArrayElements(text, NULL); - drawText(get_canvas(canvasHandle), jchars + contextIndex, index - contextIndex, count, + get_canvas(canvasHandle)->drawText(jchars + contextIndex, index - contextIndex, count, contextCount, x, y, bidiFlags, *paint, typeface); env->ReleaseCharArrayElements(text, jchars, JNI_ABORT); } @@ -614,70 +515,28 @@ static void drawTextRunString(JNIEnv* env, jobject obj, jlong canvasHandle, jstr jfloat x, jfloat y, jboolean isRtl, jlong paintHandle, jlong typefaceHandle) { Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); int bidiFlags = isRtl ? kBidi_Force_RTL : kBidi_Force_LTR; jint count = end - start; jint contextCount = contextEnd - contextStart; const jchar* jchars = env->GetStringChars(text, NULL); - drawText(get_canvas(canvasHandle), jchars + contextStart, start - contextStart, count, + get_canvas(canvasHandle)->drawText(jchars + contextStart, start - contextStart, count, contextCount, x, y, bidiFlags, *paint, typeface); env->ReleaseStringChars(text, jchars); } -class DrawTextOnPathFunctor { -public: - DrawTextOnPathFunctor(const Layout& layout, Canvas* canvas, float hOffset, - float vOffset, const Paint& paint, const SkPath& path) - : layout(layout), canvas(canvas), hOffset(hOffset), vOffset(vOffset), - paint(paint), path(path) { - } - void operator()(size_t start, size_t end) { - uint16_t glyphs[1]; - for (size_t i = start; i < end; i++) { - glyphs[0] = layout.getGlyphId(i); - float x = hOffset + layout.getX(i); - float y = vOffset + layout.getY(i); - canvas->drawTextOnPath(glyphs, 1, path, x, y, paint); - } - } -private: - const Layout& layout; - Canvas* canvas; - float hOffset; - float vOffset; - const Paint& paint; - const SkPath& path; -}; - -static void drawTextOnPath(Canvas* canvas, const uint16_t* text, int count, int bidiFlags, - const SkPath& path, float hOffset, float vOffset, - const Paint& paint, TypefaceImpl* typeface) { - Paint paintCopy(paint); - Layout layout; - MinikinUtils::doLayout(&layout, &paintCopy, bidiFlags, typeface, text, 0, count, count); - hOffset += MinikinUtils::hOffsetForTextAlign(&paintCopy, layout, path); - - // Set align to left for drawing, as we don't want individual - // glyphs centered or right-aligned; the offset above takes - // care of all alignment. - paintCopy.setTextAlign(Paint::kLeft_Align); - - DrawTextOnPathFunctor f(layout, canvas, hOffset, vOffset, paintCopy, path); - MinikinUtils::forFontRun(layout, &paintCopy, f); -} - static void drawTextOnPathChars(JNIEnv* env, jobject, jlong canvasHandle, jcharArray text, jint index, jint count, jlong pathHandle, jfloat hOffset, jfloat vOffset, jint bidiFlags, jlong paintHandle, jlong typefaceHandle) { SkPath* path = reinterpret_cast<SkPath*>(pathHandle); Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); jchar* jchars = env->GetCharArrayElements(text, NULL); - drawTextOnPath(get_canvas(canvasHandle), jchars + index, count, bidiFlags, *path, + get_canvas(canvasHandle)->drawTextOnPath(jchars + index, count, bidiFlags, *path, hOffset, vOffset, *paint, typeface); env->ReleaseCharArrayElements(text, jchars, 0); @@ -688,12 +547,12 @@ static void drawTextOnPathString(JNIEnv* env, jobject, jlong canvasHandle, jstri jint bidiFlags, jlong paintHandle, jlong typefaceHandle) { SkPath* path = reinterpret_cast<SkPath*>(pathHandle); Paint* paint = reinterpret_cast<Paint*>(paintHandle); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(typefaceHandle); + Typeface* typeface = reinterpret_cast<Typeface*>(typefaceHandle); const jchar* jchars = env->GetStringChars(text, NULL); int count = env->GetStringLength(text); - drawTextOnPath(get_canvas(canvasHandle), jchars, count, bidiFlags, *path, + get_canvas(canvasHandle)->drawTextOnPath(jchars, count, bidiFlags, *path, hOffset, vOffset, *paint, typeface); env->ReleaseStringChars(text, jchars); diff --git a/core/jni/android_graphics_drawable_VectorDrawable.cpp b/core/jni/android_graphics_drawable_VectorDrawable.cpp index e17de17e06cc..a2662f9e81c7 100644 --- a/core/jni/android_graphics_drawable_VectorDrawable.cpp +++ b/core/jni/android_graphics_drawable_VectorDrawable.cpp @@ -19,9 +19,10 @@ #include "core_jni_helpers.h" #include "log/log.h" -#include "Paint.h" #include "VectorDrawable.h" +#include <hwui/Paint.h> + namespace android { using namespace uirenderer; using namespace uirenderer::VectorDrawable; diff --git a/core/jni/android_net_NetUtils.cpp b/core/jni/android_net_NetUtils.cpp index 880a79cc4f6d..23647871df87 100644 --- a/core/jni/android_net_NetUtils.cpp +++ b/core/jni/android_net_NetUtils.cpp @@ -41,7 +41,6 @@ extern "C" { int ifc_enable(const char *ifname); int ifc_disable(const char *ifname); -int ifc_reset_connections(const char *ifname, int reset_mask); } #define NETUTILS_PKG_NAME "android/net/NetworkUtils" @@ -50,21 +49,6 @@ namespace android { static const uint16_t kDhcpClientPort = 68; -static jint android_net_utils_resetConnections(JNIEnv* env, jobject clazz, - jstring ifname, jint mask) -{ - int result; - - const char *nameStr = env->GetStringUTFChars(ifname, NULL); - - ALOGD("android_net_utils_resetConnections in env=%p clazz=%p iface=%s mask=0x%x\n", - env, clazz, nameStr, mask); - - result = ::ifc_reset_connections(nameStr, mask); - env->ReleaseStringUTFChars(ifname, nameStr); - return (jint)result; -} - static void android_net_utils_attachDhcpFilter(JNIEnv *env, jobject clazz, jobject javaFd) { uint32_t ip_offset = sizeof(ether_header); @@ -181,7 +165,6 @@ static jboolean android_net_utils_queryUserAccess(JNIEnv *env, jobject thiz, jin */ static const JNINativeMethod gNetworkUtilMethods[] = { /* name, signature, funcPtr */ - { "resetConnections", "(Ljava/lang/String;I)I", (void *)android_net_utils_resetConnections }, { "bindProcessToNetwork", "(I)Z", (void*) android_net_utils_bindProcessToNetwork }, { "getBoundNetworkForProcess", "()I", (void*) android_net_utils_getBoundNetworkForProcess }, { "bindProcessToNetworkForHostResolution", "(I)Z", (void*) android_net_utils_bindProcessToNetworkForHostResolution }, diff --git a/core/jni/android_text_StaticLayout.cpp b/core/jni/android_text_StaticLayout.cpp index 83f76eab053d..13e4f1a59fd8 100644 --- a/core/jni/android_text_StaticLayout.cpp +++ b/core/jni/android_text_StaticLayout.cpp @@ -32,10 +32,12 @@ #include "SkPaint.h" #include "SkTypeface.h" -#include "MinikinSkia.h" -#include "MinikinUtils.h" -#include "Paint.h" -#include "minikin/LineBreaker.h" +#include <hwui/MinikinSkia.h> +#include <hwui/MinikinUtils.h> +#include <hwui/Paint.h> +#include <minikin/FontCollection.h> +#include <minikin/LineBreaker.h> +#include <minikin/MinikinFont.h> namespace android { @@ -154,7 +156,7 @@ static jfloat nAddStyleRun(JNIEnv* env, jclass, jlong nativePtr, jlong nativePaint, jlong nativeTypeface, jint start, jint end, jboolean isRtl) { LineBreaker* b = reinterpret_cast<LineBreaker*>(nativePtr); Paint* paint = reinterpret_cast<Paint*>(nativePaint); - TypefaceImpl* typeface = reinterpret_cast<TypefaceImpl*>(nativeTypeface); + Typeface* typeface = reinterpret_cast<Typeface*>(nativeTypeface); FontCollection *font; MinikinPaint minikinPaint; FontStyle style = MinikinUtils::prepareMinikinPaint(&minikinPaint, &font, paint, typeface); diff --git a/core/jni/android_view_DisplayListCanvas.cpp b/core/jni/android_view_DisplayListCanvas.cpp index c87a7701786c..6aac0e4975e8 100644 --- a/core/jni/android_view_DisplayListCanvas.cpp +++ b/core/jni/android_view_DisplayListCanvas.cpp @@ -28,11 +28,11 @@ #include <SkRegion.h> -#include <Canvas.h> #include <Rect.h> #include <RenderNode.h> #include <CanvasProperty.h> -#include <Paint.h> +#include <hwui/Canvas.h> +#include <hwui/Paint.h> #include <renderthread/RenderProxy.h> #include "core_jni_helpers.h" diff --git a/core/jni/android_view_HardwareLayer.cpp b/core/jni/android_view_HardwareLayer.cpp index 3a0ddc9fa825..6b774e8f23e3 100644 --- a/core/jni/android_view_HardwareLayer.cpp +++ b/core/jni/android_view_HardwareLayer.cpp @@ -24,8 +24,8 @@ #include <android_runtime/android_graphics_SurfaceTexture.h> #include <gui/GLConsumer.h> +#include <hwui/Paint.h> -#include <Paint.h> #include <SkBitmap.h> #include <SkCanvas.h> #include <SkMatrix.h> diff --git a/core/jni/android_view_RenderNode.cpp b/core/jni/android_view_RenderNode.cpp index a7ac5b8aae66..79b518fe53ee 100644 --- a/core/jni/android_view_RenderNode.cpp +++ b/core/jni/android_view_RenderNode.cpp @@ -30,7 +30,7 @@ #include <RenderNode.h> #include <renderthread/CanvasContext.h> #include <TreeInfo.h> -#include <Paint.h> +#include <hwui/Paint.h> #include "core_jni_helpers.h" diff --git a/core/jni/android_view_SurfaceControl.cpp b/core/jni/android_view_SurfaceControl.cpp index c838d038c4c2..d8233a0ea34b 100644 --- a/core/jni/android_view_SurfaceControl.cpp +++ b/core/jni/android_view_SurfaceControl.cpp @@ -309,6 +309,16 @@ static void nativeSetWindowCrop(JNIEnv* env, jclass clazz, jlong nativeObject, } } +static void nativeSetFinalCrop(JNIEnv* env, jclass clazz, jlong nativeObject, + jint l, jint t, jint r, jint b) { + SurfaceControl* const ctrl = reinterpret_cast<SurfaceControl *>(nativeObject); + Rect crop(l, t, r, b); + status_t err = ctrl->setFinalCrop(crop); + if (err < 0 && err != NO_INIT) { + doThrowIAE(env); + } +} + static void nativeSetLayerStack(JNIEnv* env, jclass clazz, jlong nativeObject, jint layerStack) { SurfaceControl* const ctrl = reinterpret_cast<SurfaceControl *>(nativeObject); status_t err = ctrl->setLayerStack(layerStack); @@ -630,6 +640,8 @@ static const JNINativeMethod sSurfaceControlMethods[] = { (void*)nativeSetFlags }, {"nativeSetWindowCrop", "(JIIII)V", (void*)nativeSetWindowCrop }, + {"nativeSetFinalCrop", "(JIIII)V", + (void*)nativeSetFinalCrop }, {"nativeSetLayerStack", "(JI)V", (void*)nativeSetLayerStack }, {"nativeGetBuiltInDisplay", "(I)Landroid/os/IBinder;", diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp index 612f4dfd1505..3f4b2a61321b 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -302,9 +302,6 @@ static bool MountEmulatedStorage(uid_t uid, jint mount_mode, return false; } - // Unmount storage provided by root namespace and mount requested view - UnmountTree("/storage"); - String8 storageSource; if (mount_mode == MOUNT_EXTERNAL_DEFAULT) { storageSource = "/mnt/runtime/default"; @@ -667,12 +664,24 @@ static jint com_android_internal_os_Zygote_nativeForkSystemServer( return pid; } +static void com_android_internal_os_Zygote_nativeUnmountStorageOnInit(JNIEnv* env, jclass) { + // Zygote process unmount root storage space initially before every child processes are forked. + // Every forked child processes (include SystemServer) only mount their own root storage space + // And no need unmount storage operation in MountEmulatedStorage method. + // Zygote process does not utilize root storage spaces and unshared its mount namespace from the ART. + + UnmountTree("/storage"); + return; +} + static const JNINativeMethod gMethods[] = { { "nativeForkAndSpecialize", "(II[II[[IILjava/lang/String;Ljava/lang/String;[ILjava/lang/String;Ljava/lang/String;)I", (void *) com_android_internal_os_Zygote_nativeForkAndSpecialize }, { "nativeForkSystemServer", "(II[II[[IJJ)I", - (void *) com_android_internal_os_Zygote_nativeForkSystemServer } + (void *) com_android_internal_os_Zygote_nativeForkSystemServer }, + { "nativeUnmountStorageOnInit", "()V", + (void *) com_android_internal_os_Zygote_nativeUnmountStorageOnInit } }; int register_com_android_internal_os_Zygote(JNIEnv* env) { diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 97a51d5e42b3..60f0544859bd 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -417,6 +417,7 @@ <protected-broadcast android:name="android.os.action.ACTION_EFFECTS_SUPPRESSOR_CHANGED" /> <protected-broadcast android:name="android.os.action.LIGHT_DEVICE_IDLE_MODE_CHANGED" /> <protected-broadcast android:name="android.os.storage.action.VOLUME_STATE_CHANGED" /> + <protected-broadcast android:name="android.os.storage.action.DISK_SCANNED" /> <protected-broadcast android:name="com.android.server.action.UPDATE_TWILIGHT_STATE" /> <protected-broadcast android:name="com.android.server.device_idle.STEP_IDLE_STATE" /> <protected-broadcast android:name="com.android.server.device_idle.STEP_LIGHT_IDLE_STATE" /> @@ -458,6 +459,9 @@ <protected-broadcast android:name="android.net.wifi.PASSPOINT_ICON_RECEIVED" /> <protected-broadcast android:name="com.android.server.notification.CountdownConditionProvider" /> + <!-- @hide UCE service Notification --> + <protected-broadcast android:name="com.android.ims.internal.uce.UCE_SERVICE_UP" /> + <!-- ====================================================================== --> <!-- RUNTIME PERMISSIONS --> <!-- ====================================================================== --> @@ -831,6 +835,26 @@ android:protectionLevel="dangerous"/> <!-- ====================================================================== --> + <!-- Permissions for accessing the UCE Service --> + <!-- ====================================================================== --> + + <!-- @hide Allows an application to Access UCE-Presence. + <p>Protection level: dangerous + --> + <permission android:name="android.permission.ACCESS_UCE_PRESENCE_SERVICE" + android:permissionGroup="android.permission-group.PHONE" + android:protectionLevel="dangerous"/> + + <!-- @hide Allows an application to Access UCE-OPTIONS. + <p>Protection level: dangerous + --> + <permission android:name="android.permission.ACCESS_UCE_OPTIONS_SERVICE" + android:permissionGroup="android.permission-group.PHONE" + android:protectionLevel="dangerous"/> + + + + <!-- ====================================================================== --> <!-- Permissions for accessing the device camera --> <!-- ====================================================================== --> <eat-comment /> diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml index dfdb6b0bb2c8..be140a515ae6 100644 --- a/core/res/res/values-af/strings.xml +++ b/core/res/res/values-af/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Redigeer met %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Deel met"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Deel met %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Stuur met"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Stuur met %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Kies \'n Tuis-program"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Gebruik %1$s as Tuis"</string> <string name="alwaysUse" msgid="4583018368000610438">"Gebruik hierdie aksie by verstek."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"DEEL"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"WEIER"</string> <string name="select_input_method" msgid="8547250819326693584">"Verander sleutelbord"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Kies sleutelborde"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Ander sleutelborde"</string> <string name="show_ime" msgid="2506087537466597099">"Hou dit op die skerm terwyl fisieke sleutelbord aktief is"</string> <string name="hardware" msgid="194658061510127999">"Wys virtuele sleutelbord"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Kies sleutelborduitleg"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Meer opsies"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s - %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s-%2$s%3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Interne geheue"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kaart"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g>-SD-kaart"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB-datastokkie"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Ontspeld"</string> <string name="app_info" msgid="6856026610594615344">"Programinligting"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Doen \'n fabriekterugstelling om hierdie toestel sonder beperkinge te gebruik"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Raak om meer te wete te kom."</string> </resources> diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml index 50f5f766ee33..a87090a1ec3f 100644 --- a/core/res/res/values-am/strings.xml +++ b/core/res/res/values-am/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"ያርትዑ በ%1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"በሚከተለው ያጋሩ፦"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"በ%1$s ያጋሩ"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"ይላኩ በ፦"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$sን በመጠቀም ይላኩ"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"የመነሻ መተግበሪያ ይምረጡ"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$sን እንደመነሻ ይጠቀሙ"</string> <string name="alwaysUse" msgid="4583018368000610438">"ለዕርምጃ ነባሪ ተጠቀም።"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"አጋራ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"አትቀበል"</string> <string name="select_input_method" msgid="8547250819326693584">"ቁልፍ ሰሌዳ ይቀይሩ"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"ቁልፍ ሰሌዳዎችን ምረጥ"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"ሌሎች ቁልፍ ሰሌዳዎች"</string> <string name="show_ime" msgid="2506087537466597099">"አካላዊ የቁልፍ ሰሌዳ ገቢር ሆኖ ሳለ በማያ ገጽ ላይ አቆየው"</string> <string name="hardware" msgid="194658061510127999">"ምናባዊ የቁልፍ ሰሌዳን አሳይ"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"የቁልፍ ሰሌዳ አቀማመጥ ምረጥ"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"ተጨማሪ አማራጮች"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s፣ %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s፣ %2$s፣ %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"ውስጣዊ ማከማቻ"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD ካርድ"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> ኤስዲ ካርድ"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"የዩኤስቢ አንጻፊ"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"ንቀል"</string> <string name="app_info" msgid="6856026610594615344">"የመተግበሪያ መረጃ"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"ይህን መሣሪያ ያለምንም ገደብ ለመጠቀም የፋብሪካ ዳግም ያስጀምሩ"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"የበለጠ ለመረዳት ይንኩ።"</string> </resources> diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml index fcde6912eff0..01d47cfef78e 100644 --- a/core/res/res/values-ar/strings.xml +++ b/core/res/res/values-ar/strings.xml @@ -923,6 +923,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"تعديل باستخدام %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"مشاركة مع"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"مشاركة مع %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"إرسال باستخدام"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"إرسال باستخدام %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"تحديد تطبيق صفحة رئيسية"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"استخدام %1$s كصفحة رئيسية"</string> <string name="alwaysUse" msgid="4583018368000610438">"الاستخدام بشكل افتراضي لهذا الإجراء."</string> @@ -1090,7 +1092,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"مشاركة"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"رفض"</string> <string name="select_input_method" msgid="8547250819326693584">"تغيير لوحة المفاتيح"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"اختيار لوحات المفاتيح"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"لوحات المفاتيح الأخرى"</string> <string name="show_ime" msgid="2506087537466597099">"استمرار عرضها على الشاشة أثناء نشاط لوحة المفاتيح الفعلية"</string> <string name="hardware" msgid="194658061510127999">"إظهار لوحة المفاتيح الظاهرية"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"تحديد تخطيط لوحة مفاتيح"</string> @@ -1258,7 +1260,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"المزيد من الخيارات"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s، %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s، %2$s، %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"وحدة تخزين داخلية"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"بطاقة SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"بطاقة SD من <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"محرك أقراص USB"</string> @@ -1638,7 +1641,6 @@ <string name="unpin_target" msgid="3556545602439143442">"إزالة تثبيت"</string> <string name="app_info" msgid="6856026610594615344">"معلومات عن التطبيق"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"يمكنك إعادة تعيين بيانات المصنع لاستخدام هذا الجهاز بدون قيود"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"المس للتعرف على مزيد من المعلومات."</string> </resources> diff --git a/core/res/res/values-az-rAZ/strings.xml b/core/res/res/values-az-rAZ/strings.xml index 3bc0ec36608d..58d81b2d790a 100644 --- a/core/res/res/values-az-rAZ/strings.xml +++ b/core/res/res/values-az-rAZ/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ilə düzəliş edin"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Bununla paylaşın"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ilə paylaşın"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"İstifadə edərək göndərin"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s istifadə edərək göndərin"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Əsas tətbiqi seçin"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s tətbiqini Əsas olaraq işlədin"</string> <string name="alwaysUse" msgid="4583018368000610438">"Bu fəaliyyət üçün defolt istifadə edin"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"PAYLAŞIN"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"RƏDD EDİN"</string> <string name="select_input_method" msgid="8547250819326693584">"Klaviaturanı dəyişin"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Klaviaturaları seçin"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Digər klaviaturalar"</string> <string name="show_ime" msgid="2506087537466597099">"Fiziki klaviatura aktiv olduğu halda ekranda saxlayın"</string> <string name="hardware" msgid="194658061510127999">"Virtual klaviaturanı göstərin"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Klaviatura sxemi seçin"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Əlavə seçimlər"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Daxili yaddaş"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD kart"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD kart"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB drayv"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Çıxarın"</string> <string name="app_info" msgid="6856026610594615344">"Tətbiq məlumatı"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Bu cihazı məhdudiyyətsiz istifadə etmək üçün zavod sıfırlaması edin"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Daha çox məlumat üçün toxunun."</string> </resources> diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml index be40fa85d663..b8c6fd392787 100644 --- a/core/res/res/values-b+sr+Latn/strings.xml +++ b/core/res/res/values-b+sr+Latn/strings.xml @@ -905,6 +905,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Izmenite pomoću aplikacije %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Delite pomoću"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Delite pomoću aplikacije %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Pošaljite pomoću:"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Pošaljite pomoću: %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Izaberite aplikaciju za početnu stranicu"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Koristite %1$s za početnu"</string> <string name="alwaysUse" msgid="4583018368000610438">"Podrazumevano koristi za ovu radnju."</string> @@ -1066,7 +1068,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"DELI"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ODBIJ"</string> <string name="select_input_method" msgid="8547250819326693584">"Promenite tastaturu"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Izaberite tastature"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Druge tastature"</string> <string name="show_ime" msgid="2506087537466597099">"Zadrži ga na ekranu dok je fizička tastatura aktivna"</string> <string name="hardware" msgid="194658061510127999">"Prikaži virtuelnu tastaturu"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Izbor rasporeda tastature"</string> @@ -1231,7 +1233,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Još opcija"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Interna memorija"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD kartica"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD kartica"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB disk"</string> @@ -1581,7 +1584,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Otkači"</string> <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Resetujte uređaj na fabrička podešavanja da biste ga koristili bez ograničenja"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Dodirnite da biste saznali više."</string> </resources> diff --git a/core/res/res/values-be-rBY-watch/strings.xml b/core/res/res/values-be-rBY-watch/strings.xml new file mode 100644 index 000000000000..41813df09357 --- /dev/null +++ b/core/res/res/values-be-rBY-watch/strings.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* //device/apps/common/assets/res/any/strings.xml +** +** Copyright 2015, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="android_upgrading_apk" msgid="1090732262010398759">"Праграма <xliff:g id="NUMBER_0">%1$d</xliff:g> з <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> + <string name="permgrouplab_sensors" msgid="202675452368612754">"Датчыкі"</string> +</resources> diff --git a/core/res/res/values-be-rBY/strings.xml b/core/res/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..502e1e92108e --- /dev/null +++ b/core/res/res/values-be-rBY/strings.xml @@ -0,0 +1,1608 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* //device/apps/common/assets/res/any/strings.xml +** +** Copyright 2006, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="byteShort" msgid="8340973892742019101">"B"</string> + <string name="kilobyteShort" msgid="5973789783504771878">"Кб"</string> + <string name="megabyteShort" msgid="6355851576770428922">"Мб"</string> + <string name="gigabyteShort" msgid="3259882455212193214">"Гб"</string> + <string name="terabyteShort" msgid="231613018159186962">"Тб"</string> + <string name="petabyteShort" msgid="5637816680144990219">"Пб"</string> + <string name="fileSizeSuffix" msgid="8897567456150907538">"<xliff:g id="NUMBER">%1$s</xliff:g> <xliff:g id="UNIT">%2$s</xliff:g>"</string> + <string name="durationDays" msgid="6652371460511178259">"<xliff:g id="DAYS">%1$d</xliff:g> сут"</string> + <string name="durationDayHours" msgid="2713107458736744435">"<xliff:g id="DAYS">%1$d</xliff:g> дз. <xliff:g id="HOURS">%2$d</xliff:g> гадз"</string> + <string name="durationDayHour" msgid="7293789639090958917">"<xliff:g id="DAYS">%1$d</xliff:g> дз. <xliff:g id="HOURS">%2$d</xliff:g> гадз"</string> + <string name="durationHours" msgid="4266858287167358988">"<xliff:g id="HOURS">%1$d</xliff:g> гадз"</string> + <string name="durationHourMinutes" msgid="9029176248692041549">"<xliff:g id="HOURS">%1$d</xliff:g> гадз <xliff:g id="MINUTES">%2$d</xliff:g> хв"</string> + <string name="durationHourMinute" msgid="2741677355177402539">"<xliff:g id="HOURS">%1$d</xliff:g> гадз <xliff:g id="MINUTES">%2$d</xliff:g> хв"</string> + <string name="durationMinutes" msgid="3134226679883579347">"<xliff:g id="MINUTES">%1$d</xliff:g> хв"</string> + <string name="durationMinute" msgid="7155301744174623818">"<xliff:g id="MINUTES">%1$d</xliff:g> хвіліна"</string> + <string name="durationMinuteSeconds" msgid="1424656185379003751">"<xliff:g id="MINUTES">%1$d</xliff:g> хв <xliff:g id="SECONDS">%2$d</xliff:g> с"</string> + <string name="durationMinuteSecond" msgid="3989228718067466680">"<xliff:g id="MINUTES">%1$d</xliff:g> хв <xliff:g id="SECONDS">%2$d</xliff:g> с"</string> + <string name="durationSeconds" msgid="8050088505238241405">"<xliff:g id="SECONDS">%1$d</xliff:g> с"</string> + <string name="durationSecond" msgid="985669622276420331">"<xliff:g id="SECONDS">%1$d</xliff:g> секунда"</string> + <string name="untitled" msgid="4638956954852782576">"<Без назвы>"</string> + <string name="emptyPhoneNumber" msgid="7694063042079676517">"(Няма нумара тэлефона)"</string> + <string name="unknownName" msgid="6867811765370350269">"Невядома"</string> + <string name="defaultVoiceMailAlphaTag" msgid="2660020990097733077">"Галасавая пошта"</string> + <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string> + <string name="mmiError" msgid="5154499457739052907">"Праблема падлучэння ці няправільны код MMI."</string> + <string name="mmiFdnError" msgid="5224398216385316471">"Выкарыстанне абмежаванае толькі дазволенымі нумарамі."</string> + <string name="serviceEnabled" msgid="8147278346414714315">"Служба была ўключана."</string> + <string name="serviceEnabledFor" msgid="6856228140453471041">"Служба была ўключана для:"</string> + <string name="serviceDisabled" msgid="1937553226592516411">"Служба была адключаная."</string> + <string name="serviceRegistered" msgid="6275019082598102493">"Рэгістрацыя прайшла паспяхова."</string> + <string name="serviceErased" msgid="1288584695297200972">"Паспяхова выдалена."</string> + <string name="passwordIncorrect" msgid="7612208839450128715">"Няправільны пароль."</string> + <string name="mmiComplete" msgid="8232527495411698359">"MMI завершаны."</string> + <string name="badPin" msgid="9015277645546710014">"Стары PIN-код уведзены няправільна."</string> + <string name="badPuk" msgid="5487257647081132201">"Няправільны PUK-код."</string> + <string name="mismatchPin" msgid="609379054496863419">"Уведзеныя PIN-коды не супадаюць."</string> + <string name="invalidPin" msgid="3850018445187475377">"Увядзіце PIN-код, які змяшчае ад 4 да 8 лічбаў."</string> + <string name="invalidPuk" msgid="8761456210898036513">"Увядзіце PUK з 8 лічбаў ці больш."</string> + <string name="needPuk" msgid="919668385956251611">"Ваша SIM-карта заблакавана PUK-кодам. Увядзіце PUK, каб разблакаваць карту."</string> + <string name="needPuk2" msgid="4526033371987193070">"Увядзіце PUK2 для разблакавання SIM-карты."</string> + <string name="enablePin" msgid="209412020907207950">"Не атрымалася, уключыце блакіроўку SIM/RUIM."</string> + <plurals name="pinpuk_attempts" formatted="false" msgid="1251012001539225582"> + <item quantity="one">У вас засталася <xliff:g id="NUMBER_1">%d</xliff:g> спроба перад тым, як SIM-карта будзе заблакіравана.</item> + <item quantity="few">У вас засталося <xliff:g id="NUMBER_1">%d</xliff:g> спробы перад тым, як SIM-карта будзе заблакіравана.</item> + <item quantity="many">У вас засталося <xliff:g id="NUMBER_1">%d</xliff:g> спроб перад тым, як SIM-карта будзе заблакіравана.</item> + <item quantity="other">У вас засталося <xliff:g id="NUMBER_1">%d</xliff:g> спробы перад тым, як SIM-карта будзе заблакіравана.</item> + </plurals> + <string name="imei" msgid="2625429890869005782">"IMEI"</string> + <string name="meid" msgid="4841221237681254195">"MEID"</string> + <string name="ClipMmi" msgid="6952821216480289285">"Ідэнтыфікатар АВН"</string> + <string name="ClirMmi" msgid="7784673673446833091">"Ідэнтыфікатар АВН"</string> + <string name="ColpMmi" msgid="3065121483740183974">"Ідэнтыфікатар падлучанай лініі"</string> + <string name="ColrMmi" msgid="4996540314421889589">"Абмежаванне ідэнтыфікатара падлучанай лініі"</string> + <string name="CfMmi" msgid="5123218989141573515">"Пераадрасацыя выкліку"</string> + <string name="CwMmi" msgid="9129678056795016867">"Чаканне выкліку"</string> + <string name="BaMmi" msgid="455193067926770581">"Забарона выкліку"</string> + <string name="PwdMmi" msgid="7043715687905254199">"Змена пароля"</string> + <string name="PinMmi" msgid="3113117780361190304">"Змена PIN-коду"</string> + <string name="CnipMmi" msgid="3110534680557857162">"Цяперашні нумар выкліку"</string> + <string name="CnirMmi" msgid="3062102121430548731">"Нумар выкліку абмежаваны"</string> + <string name="ThreeWCMmi" msgid="9051047170321190368">"Трохбаковы выклік"</string> + <string name="RuacMmi" msgid="7827887459138308886">"Адмова ад непажаданых раздражняючых выклікаў"</string> + <string name="CndMmi" msgid="3116446237081575808">"Дастаўка нумару выкліку"</string> + <string name="DndMmi" msgid="1265478932418334331">"Не турбаваць"</string> + <string name="CLIRDefaultOnNextCallOn" msgid="429415409145781923">"Налады ідэнтыфікатару АВН па змаўчанні абмежаваныя. Наступны выклік: абмежавана"</string> + <string name="CLIRDefaultOnNextCallOff" msgid="3092918006077864624">"Ідэнтыфікатар АВН па змаўчанні абмежаваны. Наступны выклік: не абмежавана"</string> + <string name="CLIRDefaultOffNextCallOn" msgid="6179425182856418465">"Па змаўчанні ідэнтыфікатар АВН не абмежаваны. Наступны выклік: абмежаваны"</string> + <string name="CLIRDefaultOffNextCallOff" msgid="2567998633124408552">"Налады ідэнтыфікатару АВН па змаўчанні: не абмяжавана. Наступны выклік: не абмежавана"</string> + <string name="serviceNotProvisioned" msgid="8614830180508686666">"Служба не прадастаўляецца."</string> + <string name="CLIRPermanent" msgid="3377371145926835671">"Вы не можаце змяніць налады ідэнтыфікатара абанента, якi тэлефануе."</string> + <string name="RestrictedOnData" msgid="8653794784690065540">"Служба дадзеных блакуецца."</string> + <string name="RestrictedOnEmergency" msgid="6581163779072833665">"Аварыйная служба блакуецца."</string> + <string name="RestrictedOnNormal" msgid="4953867011389750673">"Галасавая служба заблакаваная."</string> + <string name="RestrictedOnAllVoice" msgid="3396963652108151260">"Усе галасавыя службы заблакаваны."</string> + <string name="RestrictedOnSms" msgid="8314352327461638897">"Служба SMS заблакаваная."</string> + <string name="RestrictedOnVoiceData" msgid="996636487106171320">"Службы перадачы голаса/дадзеных заблакаваны."</string> + <string name="RestrictedOnVoiceSms" msgid="1888588152792023873">"Службы перадачы голаса і SMS заблакаваныя."</string> + <string name="RestrictedOnAll" msgid="5643028264466092821">"Усе службы перадачы дадзеных, галасавыя і SMS-службы заблакаваны."</string> + <string name="peerTtyModeFull" msgid="6165351790010341421">"Аднарангавая прылада запытала рэжым TTY FULL"</string> + <string name="peerTtyModeHco" msgid="5728602160669216784">"Аднарангавая прылада запытала рэжым TTY НСО"</string> + <string name="peerTtyModeVco" msgid="1742404978686538049">"Аднарангавая прылада запытала рэжым TTY VCO"</string> + <string name="peerTtyModeOff" msgid="3280819717850602205">"Аднарангавая прылада запытала рэжым TTY OFF"</string> + <string name="serviceClassVoice" msgid="1258393812335258019">"Голас"</string> + <string name="serviceClassData" msgid="872456782077937893">"Дадзеныя"</string> + <string name="serviceClassFAX" msgid="5566624998840486475">"Факс"</string> + <string name="serviceClassSMS" msgid="2015460373701527489">"SMS"</string> + <string name="serviceClassDataAsync" msgid="4523454783498551468">"Асінхронныя"</string> + <string name="serviceClassDataSync" msgid="7530000519646054776">"Сінхронныя"</string> + <string name="serviceClassPacket" msgid="6991006557993423453">"Пакет"</string> + <string name="serviceClassPAD" msgid="3235259085648271037">"PAD"</string> + <string name="roamingText0" msgid="7170335472198694945">"Індыкатар роўмінгу ўключаны"</string> + <string name="roamingText1" msgid="5314861519752538922">"Індыкатар роўмінгу адключаны"</string> + <string name="roamingText2" msgid="8969929049081268115">"Індыкатар роўмінгу міргае"</string> + <string name="roamingText3" msgid="5148255027043943317">"З раёну"</string> + <string name="roamingText4" msgid="8808456682550796530">"З будынку"</string> + <string name="roamingText5" msgid="7604063252850354350">"Роўмінг: пераважная сістэма"</string> + <string name="roamingText6" msgid="2059440825782871513">"Роўмінг: даступная сістэма"</string> + <string name="roamingText7" msgid="7112078724097233605">"Роўмінг: асацыятыўны партнёр"</string> + <string name="roamingText8" msgid="5989569778604089291">"Роўмінг: прэмiум-партнёр"</string> + <string name="roamingText9" msgid="7969296811355152491">"Роўмінг: поўная функцыянальнасць службы"</string> + <string name="roamingText10" msgid="3992906999815316417">"Роўмінг – частковая функцыянальнасць службы"</string> + <string name="roamingText11" msgid="4154476854426920970">"Банэр роўмінгу ўключаны"</string> + <string name="roamingText12" msgid="1189071119992726320">"Банэр роўмінгу адключаны"</string> + <string name="roamingTextSearching" msgid="8360141885972279963">"Пошук службы"</string> + <string name="wfcRegErrorTitle" msgid="2301376280632110664">"Wi-Fi-тэлефанія"</string> + <string-array name="wfcOperatorErrorAlertMessages"> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + </string-array> + <string name="wfcSpnFormat" msgid="8211621332478306568">"%s"</string> + <string name="wfcDataSpnFormat" msgid="1118052028767666883">"%s"</string> + <string name="wifi_calling_off_summary" msgid="8720659586041656098">"Выкл."</string> + <string name="wfc_mode_wifi_preferred_summary" msgid="1994113411286935263">"Прыярытэт Wi-Fi"</string> + <string name="wfc_mode_cellular_preferred_summary" msgid="5920549484600758786">"Прыярытэт мабільнай сеткі"</string> + <string name="wfc_mode_wifi_only_summary" msgid="2379919155237869320">"Толькі Wi-Fi"</string> + <string name="cfTemplateNotForwarded" msgid="1683685883841272560">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: не пераадрасоўваецца"</string> + <string name="cfTemplateForwarded" msgid="1302922117498590521">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g>"</string> + <string name="cfTemplateForwardedTime" msgid="9206251736527085256">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: <xliff:g id="DIALING_NUMBER">{1}</xliff:g> праз <xliff:g id="TIME_DELAY">{2}</xliff:g> с."</string> + <string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: не пераадрасоўваецца"</string> + <string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: не пераадрасоўваецца"</string> + <string name="fcComplete" msgid="3118848230966886575">"Код аб\'екта завершаны."</string> + <string name="fcError" msgid="3327560126588500777">"Праблема падлучэння ці няправільны код функцыі."</string> + <string name="httpErrorOk" msgid="1191919378083472204">"ОК"</string> + <string name="httpError" msgid="7956392511146698522">"Адбылася памылка сеткі."</string> + <string name="httpErrorLookup" msgid="4711687456111963163">"Не атрымалася знайсці URL."</string> + <string name="httpErrorUnsupportedAuthScheme" msgid="6299980280442076799">"Схема аўтэнтыфікацыі сайта не падтрымліваецца."</string> + <string name="httpErrorAuth" msgid="1435065629438044534">"Памылка аўтэнтыфікацыі."</string> + <string name="httpErrorProxyAuth" msgid="1788207010559081331">"Праверка сапраўднасці праз проксі-сервер скончылася няўдала."</string> + <string name="httpErrorConnect" msgid="8714273236364640549">"Немагчыма падлучыцца да сервера."</string> + <string name="httpErrorIO" msgid="2340558197489302188">"Немагчыма звязацца з серверам. Паўтарыце спробу пазней."</string> + <string name="httpErrorTimeout" msgid="4743403703762883954">"Час чакання злучэння з серверам скончыўся."</string> + <string name="httpErrorRedirectLoop" msgid="8679596090392779516">"Старонка змяшчае зашмат перанакіраванняў сервера."</string> + <string name="httpErrorUnsupportedScheme" msgid="5015730812906192208">"Пратакол не падтрымліваецца."</string> + <string name="httpErrorFailedSslHandshake" msgid="96549606000658641">"Немагчыма ўсталяваць бяспечнае злучэнне."</string> + <string name="httpErrorBadUrl" msgid="3636929722728881972">"Немагчыма адкрыць старонку, таму што URL несапраўдны."</string> + <string name="httpErrorFile" msgid="2170788515052558676">"Немагчыма атрымаць доступ да файла."</string> + <string name="httpErrorFileNotFound" msgid="6203856612042655084">"Немагчыма знайсці патрабаваны файл."</string> + <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Апрацоўваецца занадта шмат запытаў. Паспрабуйце яшчэ раз пазней."</string> + <string name="notification_title" msgid="8967710025036163822">"Памылка ўваходу ва ўлiковы запiс <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string> + <string name="contentServiceSync" msgid="8353523060269335667">"Сінхранізацыя"</string> + <string name="contentServiceSyncNotificationTitle" msgid="397743349191901458">"Сінхранізацыя"</string> + <string name="contentServiceTooManyDeletesNotificationDesc" msgid="8100981435080696431">"Занадта шмат выдаленняў <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string> + <string name="low_memory" product="tablet" msgid="6494019234102154896">"Памяць планшэта поўная. Выдаліце некаторыя файлы, каб вызваліць месца."</string> + <string name="low_memory" product="watch" msgid="4415914910770005166">"Сховішча гадзінніка перапоўнена. Выдаліце некаторыя файлы, каб вызваліць месца."</string> + <string name="low_memory" product="tv" msgid="516619861191025923">"Сховішча тэлевізара перапоўнена. Выдаліце некаторыя файлы, каб вызваліць месца."</string> + <string name="low_memory" product="default" msgid="3475999286680000541">"Памяць тэлефона поўная. Выдаліце некаторыя файлы, каб вызваліць месца."</string> + <string name="ssl_ca_cert_warning" msgid="5848402127455021714">"За сеткай можа назіраць"</string> + <string name="ssl_ca_cert_noti_by_unknown" msgid="4475437862189850602">"Невядомая трэцяя асоба"</string> + <string name="ssl_ca_cert_noti_by_administrator" msgid="550758088185764312">"Адміністратар вашага працоўнага профілю"</string> + <string name="ssl_ca_cert_noti_managed" msgid="4030263497686867141">"<xliff:g id="MANAGING_DOMAIN">%s</xliff:g>"</string> + <string name="work_profile_deleted" msgid="5005572078641980632">"Рабочы профіль выдалены"</string> + <string name="work_profile_deleted_description" msgid="6305147513054341102">"Рабочы профіль выдалены з-за адсутнасці праграмы адміністравання."</string> + <string name="work_profile_deleted_details" msgid="226615743462361248">"Праграма для адміністравання рабочага профілю адсутнічае або пашкоджана. У выніку гэтага ваш рабочы профіль і звязаныя з ім даныя былі выдаленыя. Звярніцеся па дапамогу да адміністратара."</string> + <string name="work_profile_deleted_description_dpm_wipe" msgid="6019770344820507579">"Ваш працоўны профіль больш не даступны на гэтай прыладзе."</string> + <string name="factory_reset_warning" msgid="5423253125642394387">"Даныя вашай прылады будуць сцерты"</string> + <string name="factory_reset_message" msgid="4905025204141900666">"Праграма для адміністравання не можа быць выкарыстана, таму што ў яе адсутнічаюць кампаненты або яна пашкоджана. Зараз даныя вашай прылады будуць сцерты. Звярніцеся па дапамогу да адміністратара."</string> + <string name="me" msgid="6545696007631404292">"Я"</string> + <string name="power_dialog" product="tablet" msgid="8545351420865202853">"Параметры планшэта"</string> + <string name="power_dialog" product="tv" msgid="6153888706430556356">"Параметры ТБ"</string> + <string name="power_dialog" product="default" msgid="1319919075463988638">"Параметры тэлефона"</string> + <string name="silent_mode" msgid="7167703389802618663">"Бязгучны рэжым"</string> + <string name="turn_on_radio" msgid="3912793092339962371">"Уключыць бесправадную сетку"</string> + <string name="turn_off_radio" msgid="8198784949987062346">"Адключыць бесправадную сетку"</string> + <string name="screen_lock" msgid="799094655496098153">"Блакіроўка экрана"</string> + <string name="power_off" msgid="4266614107412865048">"Выключыць"</string> + <string name="silent_mode_silent" msgid="319298163018473078">"Званок выкл."</string> + <string name="silent_mode_vibrate" msgid="7072043388581551395">"Званок з вібрацыяй"</string> + <string name="silent_mode_ring" msgid="8592241816194074353">"Званок укл."</string> + <string name="reboot_to_update_title" msgid="6212636802536823850">"Сістэмнае абнаўленне Android"</string> + <string name="reboot_to_update_prepare" msgid="6305853831955310890">"Падрыхтоўка да абнаўлення..."</string> + <string name="reboot_to_update_package" msgid="3871302324500927291">"Апрацоўка пакета абнаўлення..."</string> + <string name="reboot_to_update_reboot" msgid="6428441000951565185">"Перазапуск..."</string> + <string name="reboot_to_reset_title" msgid="4142355915340627490">"Скід да заводскіх налад"</string> + <string name="reboot_to_reset_message" msgid="2432077491101416345">"Перазапуск..."</string> + <string name="shutdown_progress" msgid="2281079257329981203">"Выключэнне..."</string> + <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Планшэт будзе адключаны."</string> + <string name="shutdown_confirm" product="tv" msgid="476672373995075359">"Ваш тэлевізар будзе выключаны."</string> + <string name="shutdown_confirm" product="watch" msgid="3490275567476369184">"Ваш гадзіннік будзе выключаны."</string> + <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Ваш тэлефон будзе выключаны."</string> + <string name="shutdown_confirm_question" msgid="2906544768881136183">"Закрыць?"</string> + <string name="reboot_safemode_title" msgid="7054509914500140361">"Перазагрузка ў бяспечным рэжыме"</string> + <string name="reboot_safemode_confirm" msgid="55293944502784668">"Хочаце перазагрузіцца ў бяспечным рэжыме? Гэта дазволіць адключыць усе іншыя ўсталяваныя прыкладанні. Пасля перазагрузкi iх праца будзе адноўлена."</string> + <string name="recent_tasks_title" msgid="3691764623638127888">"Апошнія"</string> + <string name="no_recent_tasks" msgid="8794906658732193473">"Няма апошніх прыкладанняў."</string> + <string name="global_actions" product="tablet" msgid="408477140088053665">"Параметры планшэта"</string> + <string name="global_actions" product="tv" msgid="7240386462508182976">"Параметры ТБ"</string> + <string name="global_actions" product="default" msgid="2406416831541615258">"Параметры тэлефона"</string> + <string name="global_action_lock" msgid="2844945191792119712">"Блакіроўка экрана"</string> + <string name="global_action_power_off" msgid="4471879440839879722">"Выключыць"</string> + <string name="global_action_bug_report" msgid="7934010578922304799">"Справаздача пра памылкі"</string> + <string name="bugreport_title" msgid="2667494803742548533">"Справаздача пра памылку"</string> + <string name="bugreport_message" msgid="398447048750350456">"Будзе збiрацца iнфармацыя пра бягучы стан прылады, якая будзе адпраўляцца на электронную пошту. Стварэнне справаздачы пра памылкi зойме некаторы час."</string> + <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Інтэрактыўная справаздача"</string> + <string name="bugreport_option_interactive_summary" msgid="8180152634022797629">"Выкарыстоўвайце ў большасці выпадкаў. Гэта дазваляе сачыць за ходам справаздачы і ўводзіць дадатковыя звесткі аб праблеме. Могуць быць прапушчаны некаторыя раздзелы, якія выкарыстоўваюцца менш і паведаміць пра якія зойме шмат часу."</string> + <string name="bugreport_option_full_title" msgid="6354382025840076439">"Поўная справаздача"</string> + <string name="bugreport_option_full_summary" msgid="6687306111256813257">"Выкарыстоўвайце гэту опцыю, каб забяспечыць мінімальнае ўмяшанне сістэмы, калі прылада не адказвае ці працуе занадта павольна або калі вам патрэбны ўсе раздзелы справаздачы. Выкарыстоўваючы гэту опцыю, вы не зможаце зрабіць здымак экрана або ўвесці больш падрабязную інфармацыю."</string> + <plurals name="bugreport_countdown" formatted="false" msgid="6878900193900090368"> + <item quantity="one">Здымак экрана для справаздачы пра памылкі будзе зроблены праз <xliff:g id="NUMBER_1">%d</xliff:g> секунду.</item> + <item quantity="few">Здымак экрана для справаздачы пра памылкі будзе зроблены праз <xliff:g id="NUMBER_1">%d</xliff:g> секунды.</item> + <item quantity="many">Здымак экрана для справаздачы пра памылкі будзе зроблены праз <xliff:g id="NUMBER_1">%d</xliff:g> секунд.</item> + <item quantity="other">Здымак экрана для справаздачы пра памылкі будзе зроблены праз <xliff:g id="NUMBER_1">%d</xliff:g> секунды.</item> + </plurals> + <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Бязгучны рэжым"</string> + <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Гук выкл."</string> + <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"Гук уключаны"</string> + <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Рэжым \"У самалёце\""</string> + <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Уключаны рэжым \"У самалёце\""</string> + <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Рэжым \"У самалёце\" адключаны"</string> + <string name="global_action_settings" msgid="1756531602592545966">"Налады"</string> + <string name="global_action_assist" msgid="3892832961594295030">"Дапамога"</string> + <string name="global_action_voice_assist" msgid="7751191495200504480">"Галас. дапамога"</string> + <string name="global_action_lockdown" msgid="8751542514724332873">"Заблакір. зараз"</string> + <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string> + <string name="notification_hidden_text" msgid="1135169301897151909">"Змесціва схавана"</string> + <string name="notification_hidden_by_policy_text" msgid="9004631276932584600">"Змесціва, схаванае ў адпаведнасці з палітыкай"</string> + <string name="safeMode" msgid="2788228061547930246">"Бяспечны рэжым"</string> + <string name="android_system_label" msgid="6577375335728551336">"Сістэма Android"</string> + <string name="user_owner_label" msgid="2804351898001038951">"Асабістыя"</string> + <string name="managed_profile_label" msgid="6260850669674791528">"Працоўны"</string> + <string name="permgrouplab_contacts" msgid="3657758145679177612">"Кантакты"</string> + <string name="permgroupdesc_contacts" msgid="6951499528303668046">"атрымліваць доступ да вашых кантактаў"</string> + <string name="permgrouplab_location" msgid="7275582855722310164">"Месцазнаходжанне"</string> + <string name="permgroupdesc_location" msgid="1346617465127855033">"атрымліваць доступ да месцазнаходжання гэтай прылады"</string> + <string name="permgrouplab_calendar" msgid="5863508437783683902">"Каляндар"</string> + <string name="permgroupdesc_calendar" msgid="3889615280211184106">"атрымліваць доступ да вашага календара"</string> + <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string> + <string name="permgroupdesc_sms" msgid="4656988620100940350">"адпраўляць і праглядаць SMS-паведамленні"</string> + <string name="permgrouplab_storage" msgid="1971118770546336966">"Сховішча"</string> + <string name="permgroupdesc_storage" msgid="637758554581589203">"атрымліваць доступ да фатаграфій, медыяфайлаў і файлаў на вашай прыладзе"</string> + <string name="permgrouplab_microphone" msgid="171539900250043464">"Мікрафон"</string> + <string name="permgroupdesc_microphone" msgid="4988812113943554584">"запісваць аўдыя"</string> + <string name="permgrouplab_camera" msgid="4820372495894586615">"Камера"</string> + <string name="permgroupdesc_camera" msgid="3250611594678347720">"рабіць фатаздымкі і запісваць відэа"</string> + <string name="permgrouplab_phone" msgid="5229115638567440675">"Тэлефон"</string> + <string name="permgroupdesc_phone" msgid="6234224354060641055">"рабіць тэлефонныя выклікі і кіраваць імі"</string> + <string name="permgrouplab_sensors" msgid="416037179223226722">"Датчыкі цела"</string> + <string name="permgroupdesc_sensors" msgid="7147968539346634043">"атрымліваць з датчыка даныя асноўных фізіялагічных паказчыкаў"</string> + <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Атрымайце змесцiва акна"</string> + <string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"Вывучыце змесцiва акна, з якiм вы працуеце."</string> + <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Уключыце Explore by Touch"</string> + <string name="capability_desc_canRequestTouchExploration" msgid="5800552516779249356">"Элемент, да якiх дакраналiся, могуць быць агучаны, а экран будзе працаваць з жэстамi."</string> + <string name="capability_title_canRequestEnhancedWebAccessibility" msgid="1739881766522594073">"Уключыце паляпшэнне вэб-даступнасці"</string> + <string name="capability_desc_canRequestEnhancedWebAccessibility" msgid="7881063961507511765">"Сцэнарыi могуць быць усталяваны, каб зрабіць змесцiва прыкладання больш даступным."</string> + <string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Глядзiце, што набiраеце"</string> + <string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Уключае ў сябе асабістыя дадзеныя, такія як нумары крэдытных карт і паролі."</string> + <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Кіраваць павелічэннем дысплэя"</string> + <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Кіраваць маштабам дысплэя і пазіцыянаваннем."</string> + <string name="capability_title_canPerformGestures" msgid="7418984730362576862">"Выконваць жэсты"</string> + <string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"Можна кранаць, праводзіць пальцам, маштабаваць шчыпком, а таксама выконваць іншыя жэсты."</string> + <string name="permlab_statusBar" msgid="7417192629601890791">"адключаць ці змяняць радок стану"</string> + <string name="permdesc_statusBar" msgid="8434669549504290975">"Дазваляе прыкладанням адключаць радок стану або дадаваць і выдаляць сістэмныя значкі."</string> + <string name="permlab_statusBarService" msgid="4826835508226139688">"быць панэллю стану"</string> + <string name="permdesc_statusBarService" msgid="716113660795976060">"Дазваляе прыкладанням быць радком стану."</string> + <string name="permlab_expandStatusBar" msgid="1148198785937489264">"разгарнуць/згарнуць радок стану"</string> + <string name="permdesc_expandStatusBar" msgid="6917549437129401132">"Дазваляе прыкладанню разгортваць ці згортваць радок стану."</string> + <string name="permlab_install_shortcut" msgid="4279070216371564234">"усталёўваць ярлыкі"</string> + <string name="permdesc_install_shortcut" msgid="8341295916286736996">"Дазваляе праграме дадаваць ярлыкі на Галоўны экран без умяшання карыстальніка."</string> + <string name="permlab_uninstall_shortcut" msgid="4729634524044003699">"выдаляць ярлыкі"</string> + <string name="permdesc_uninstall_shortcut" msgid="6745743474265057975">"Дазваляе праграме выдаляць ярлыкі з Галоўнага экрана без умяшання карыстальніка."</string> + <string name="permlab_processOutgoingCalls" msgid="3906007831192990946">"перанакіраванне зыходзячых выклікіаў"</string> + <string name="permdesc_processOutgoingCalls" msgid="5156385005547315876">"Дазваляе праграме бачыць набраны нумар падчас выходнага выкліку з магчымасцю перанакіравання выкліку на іншы нумар або спынення выкліку ў цэлым."</string> + <string name="permlab_receiveSms" msgid="8673471768947895082">"атрыманне тэкставых паведамленняў (SMS)"</string> + <string name="permdesc_receiveSms" msgid="6424387754228766939">"Дазваляе прыкладанням атрымліваць і апрацоўваць SMS-паведамленні. Гэта значыць, што прыкладанне можа кантраляваць або выдаляць паведамленні, адпраўленыя на прыладу, не паказваючы іх вам."</string> + <string name="permlab_receiveMms" msgid="1821317344668257098">"атрыманне тэкставых паведамленняў (MMS)"</string> + <string name="permdesc_receiveMms" msgid="533019437263212260">"Дазваляе прыкладанням атрымліваць і апрацоўваць MMS-паведамленнi. Гэта значыць, што прыкладанне можа кантраляваць або выдаляць паведамленні, адпраўленыя на прыладу, не паказваючы іх вам."</string> + <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"чытаць паведамленні базавай станцыі"</string> + <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Дазваляе прыкладанню чытаць паведамленні базавай станцыі, атрыманыя прыладай. Папярэджанні базавай станцыі дасылаюцца ў некаторыя месцы, каб папярэдзіць вас аб надзвычайных сітуацыях. Шкоднасныя прыкладанні могуць уплываць на прадукцыйнасць ці працу прылады пры атрыманні паведамлення базавай станцыі аб надзвычайнай сітуацыі."</string> + <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"чытаць падпісаныя каналы"</string> + <string name="permdesc_subscribedFeedsRead" msgid="5557058907906144505">"Дазваляе прыкладанням атрымліваць інфармацыю пра каналы, якія сінхранізуюцца ў бягучы момант."</string> + <string name="permlab_sendSms" msgid="7544599214260982981">"адпраўляць і праглядаць SMS-паведамленні"</string> + <string name="permdesc_sendSms" msgid="7094729298204937667">"Дазваляе прыкладанне для адпраўкі SMS паведамленняў. Гэта можа прывесці да нечаканых абвінавачванняў. Шкоднасныя праграмы могуць каштаваць вам грошай на адпраўку паведамленняў без вашага пацвярджэння."</string> + <string name="permlab_readSms" msgid="8745086572213270480">"чытанне сваiх тэкставых паведамленняў (SMS ці MMS)"</string> + <string name="permdesc_readSms" product="tablet" msgid="2467981548684735522">"Дазваляе прыкладанню чытаць SMS-паведамленнi, якія захоўваюцца на планшэце ці SIM-карце. Гэта дазваляе прыкладанням чытаць ўсе SMS-паведамленні, незалежна ад змесцiва або прыватнасці."</string> + <string name="permdesc_readSms" product="tv" msgid="5102425513647038535">"Дазваляе праграме чытаць SMS-паведамленні, якія захоўваюцца на вашым тэлевізары або на SIM-карце. Гэта дазваляе праграме чытаць усе SMS-паведамленні, незалежна ад змесцiва або канфідэнцыяльнасці."</string> + <string name="permdesc_readSms" product="default" msgid="3695967533457240550">"Дазваляе прыкладанню чытаць SMS-паведамленні, якія захоўваюцца ў тэлефоне або на SIM-карце. Гэта дазваляе прыкладанням чытаць ўсе SMS-паведамленні, незалежна ад змесцiва або прыватнасці."</string> + <string name="permlab_receiveWapPush" msgid="5991398711936590410">"атрыманне тэкставых паведамленняў (WAP)"</string> + <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Дазваляе прыкладанням атрымліваць і апрацоўваць паведамленні WAP. Дзякуючы гэтаму дазволу можна кантраляваць або выдаляць паведамленні, пасланыя вам, не паказваючы іх."</string> + <string name="permlab_getTasks" msgid="6466095396623933906">"атрымаць запушчаныя прыкладанні"</string> + <string name="permdesc_getTasks" msgid="7454215995847658102">"Дазваляе прыкладанню атрымлiваць звесткi пра прыкладаннi, запушчаныя зараз i нядаўна. Прыкладанне можа знайсцi iнфармацыю пра тое, якiя прыкладаннi выкарыстоўваюцца на прыладзе."</string> + <string name="permlab_manageProfileAndDeviceOwners" msgid="7918181259098220004">"кіраваць профілем і ўладальнікамі прылады"</string> + <string name="permdesc_manageProfileAndDeviceOwners" msgid="106894851498657169">"Дазваляе праграмам задаваць уладальнікаў профіляў і ўладальніка прылады."</string> + <string name="permlab_reorderTasks" msgid="2018575526934422779">"змяніць парадак запушчаных прыкладанняў"</string> + <string name="permdesc_reorderTasks" msgid="7734217754877439351">"Дазваляе прыкладанню перамяшчаць заданні на пярэдні план і ў фон. Шкоднасныя прыкладанні могуць прымусова рабіць сябе асноўнымі без вашага ведама."</string> + <string name="permlab_enableCarMode" msgid="5684504058192921098">"дазваляць рэжым \"У аўтамабілі\""</string> + <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Дазваляе прыкладанню ўключаць рэжым гучнай сувязi."</string> + <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"закрыццё іншых прыкладанняў"</string> + <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Дазваляе прыкладанню завяршаць фонавыя працэсы іншых прыкладанняў. Гэта можа спынiць працу iншых прыкладанняў."</string> + <string name="permlab_systemAlertWindow" msgid="3543347980839518613">"прыарытэт перад іншымі прыкладаннямі"</string> + <string name="permdesc_systemAlertWindow" msgid="8584678381972820118">"Прыкладанне можа з\'яўляцца паверх iншых прыкладанняў. Яны могуць шкодзiць адно аднаму падчас працы iнтэрфейсаў або змяняць тое, што вы бачыце ў iншых прыкладаннях."</string> + <string name="permlab_persistentActivity" msgid="8841113627955563938">"прымусіць прыкладанне працаваць заўсёды"</string> + <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Дазваляе прыкладанню захоўваць некаторыя пастаянныя часткi ў памяцi. Гэта можа абмежаваць аб\'ём памяці, даступнай для іншых прыкладанняў, i запаволiць працу планшэта."</string> + <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Дазваляе праграме пастаянна захоўваць некаторыя свае часткi ў памяцi. Гэта можа абмежаваць аб\'ём памяці, даступнай для іншых праграм, i запаволiць працу тэлевізара."</string> + <string name="permdesc_persistentActivity" product="default" msgid="4384760047508278272">"Дазваляе прыкладанню захоўваць некаторыя пастаянныя часткi ў памяцi. Гэта можа абмежаваць аб\'ём памяці, даступнай для іншых прыкладанняў, i запаволiць працу тэлефона."</string> + <string name="permlab_getPackageSize" msgid="7472921768357981986">"вымерыць прастору для захоўвання прыкладання"</string> + <string name="permdesc_getPackageSize" msgid="3921068154420738296">"Дазваляе прыкладанням атрымліваць яго код, дадзеныя і аб\'ём кэш-памяці"</string> + <string name="permlab_writeSettings" msgid="2226195290955224730">"змена сістэмных налад"</string> + <string name="permdesc_writeSettings" msgid="7775723441558907181">"Дазваляе прыкладаннем змяняць дадзеныя налад сістэмы. Шкоднасныя прыкладанні могуць пашкодзіць канфігурацыю вашай сістэмы."</string> + <string name="permlab_receiveBootCompleted" msgid="5312965565987800025">"запуск пры загрузцы сістэмы"</string> + <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"Дазваляе прыкладанню самастойна запускацца, як толькі сістэма будзе цалкам загружана. Гэта можа павялічыць час запуску планшэту і дазволіць прыкладанню запаволіць увесь планшэт, прымушаючы яго працаваць заўсёды."</string> + <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"Дазваляе праграме самастойна запускацца, як толькі сістэма будзе цалкам загружана. Гэта можа павялічыць час запуску тэлевізара і дазволіць праграме, пастаянна працуючы, запаволіць увесь тэлевізар."</string> + <string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"Дазваляе прыкладанням самастойна запускацца, як толькі сістэма будзе цалкам запушчана. Гэта можа павялічыць час запуску тэлефону і дазволіць прыкладанню запаволіць увесь тэлефон, прымушаючы яго працаваць заўсёды."</string> + <string name="permlab_broadcastSticky" msgid="7919126372606881614">"адпраўляць нетэрмiновую рассылку"</string> + <string name="permdesc_broadcastSticky" product="tablet" msgid="7749760494399915651">"Дазваляе прыкладанням адпраўляць далейшыя звязаныя перадачы, якія застаюцца пасля заканчэння асноўнай перадачы. Злоўжыванне можа зрабіць працу планшэта павольнай або няўстойлівай, прымушаючы яго выкарыстоўваць занадта шмат памяці."</string> + <string name="permdesc_broadcastSticky" product="tv" msgid="6839285697565389467">"Дазваляе праграме адпраўляць «ліпучыя» трансляцыі, якія застаюцца актыўнымі пасля завяршэння перадачы. Злоўжыванне гэтым можа зрабіць працу тэлевізара павольнай або няўстойлівай, прымушаючы яго выкарыстоўваць занадта шмат памяці."</string> + <string name="permdesc_broadcastSticky" product="default" msgid="2825803764232445091">"Дазваляе прыкладанню адпраўляць далейшыя звязаныя перадачы, якія застаюцца пасля заканчэння асноўнай перадачы. Злоўжыванне можа зрабіць працу тэлефона павольнай або няўстойлівай, прымушаючы яго выкарыстоўваць занадта шмат памяці."</string> + <string name="permlab_readContacts" msgid="8348481131899886131">"чытанне кантактаў"</string> + <string name="permdesc_readContacts" product="tablet" msgid="5294866856941149639">"Дазваляе прыкладанням счытваць дадзеныя аб кантактах, якія захоўваюцца на планшэце, у тым ліку звесткi пра тое, як часта вы выклiкалi канкрэтных абанентаў, пiсалi iм па электроннай пошце або кантактавалi іншымi спосабамі. Дзякуючы гэтаму дазволу прыкладаннi могуць захоўваць дадзеныя гiсторыi выклiкаў, а шкоднасныя прыкладаннi могуць адпраўляць кантактныя дадзеныя без вашага ведама."</string> + <string name="permdesc_readContacts" product="tv" msgid="1839238344654834087">"Дазваляе праграме счытваць даныя аб кантактах, якія захоўваюцца на вашым тэлевізары, у тым ліку звесткi пра тое, як часта вы выклiкалi канкрэтных абанентаў, пiсалi iм па электроннай пошце або кантактавалi з імі іншымi спосабамі. Праграмы з гэтым дазволам могуць захоўваць даныя вашай гiсторыi выклiкаў, а шкодныя праграмы могуць абагульваць даныя аб кантактах без вашага ведама."</string> + <string name="permdesc_readContacts" product="default" msgid="8440654152457300662">"Дазваляе прыкладанням счытваць дадзеныя аб кантактах, якія захоўваюцца на тэлефоне, у тым ліку звесткi пра частату, з якой вы выклiкалi iх, пiсалi iм па электроннай пошце ці кантактавалi іншым спосабам. Дзякуючы гэтаму дазволу прыкладаннi могуць захоўваць дадзеныя гiсторыi выклiкаў, а шкоднасныя прыкладаннi могуць адпраўляць кантактныя дадзеныя без вашага ведама."</string> + <string name="permlab_writeContacts" msgid="5107492086416793544">"змена кантактаў"</string> + <string name="permdesc_writeContacts" product="tablet" msgid="897243932521953602">"Дазваляе прыкладанням змяняць дадзеныя аб кантактах, якія захоўваюцца на планшэце, у тым ліку частата, з якой вы выклiкалi асоб, пiсалi па электроннай пошце ці іншым спосабам кантактавалi з iмі. З гэтым дазволам прыкладаннi змогуць выдаляць кантактныя дадзеныя."</string> + <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Дазваляе праграме змяняць даныя аб кантактах, якія захоўваюцца на вашым тэлевізары, у тым ліку звесткi пра тое, як часта вы выклiкалi канкрэтных абанентаў, пiсалi iм па электроннай пошце або кантактавалi з імі іншымi спосабамі. Гэта дазваляе праграмам выдаляць даныя аб кантактах."</string> + <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Дазваляе прыкладанням змяняць дадзеныя аб кантактах, якія захоўваюцца на тэлефоне, у тым ліку частата, з якой вы выклiкалi асоб, пiсалi па электроннай пошце ці іншым спосабам кантактавалi з iмі. З гэтым дазволам прыкладаннi змогуць выдаляць кантактныя дадзеныя."</string> + <string name="permlab_readCallLog" msgid="3478133184624102739">"чытанне гiсторыi выклікаў"</string> + <string name="permdesc_readCallLog" product="tablet" msgid="3700645184870760285">"Дазваляе прыкладанням чытаць гiсторыю выклiкаў планшэта, у тым лiку дадзеныя пра ўваходныя i выходныя выклiкi. Дзякуючы гэтаму дазволу прыкладаннi могуць захоўваць дадзеныя гiсторыi выклiкаў, а шкоднасныя прыкладаннi могуць адпраўляць гiсторыю выклiкаў без вашага ведама."</string> + <string name="permdesc_readCallLog" product="tv" msgid="5611770887047387926">"Дазваляе праграме счытваць гiсторыю выклiкаў тэлевізара, у тым лiку даныя пра ўваходныя i выходныя выклiкi. Праграмы з гэтым дазволам могуць захоўваць даныя вашай гiсторыi выклiкаў, а шкодныя праграмы могуць абагульваць гiсторыю выклiкаў без вашага ведама."</string> + <string name="permdesc_readCallLog" product="default" msgid="5777725796813217244">"Дазваляе прыкладанням чытаць гiсторыю выклiкаў тэлефона, у тым лiку дадзеныя пра ўваходныя i выходныя выклiкi. Дзякуючы гэтаму дазволу прыкладаннi могуць захоўваць дадзеныя гiсторыi выклiкаў, а шкоднасныя прыкладаннi могуць адпраўляць гiсторыю выклiкаў без вашага ведама."</string> + <string name="permlab_writeCallLog" msgid="8552045664743499354">"запіс гiсторыi выклікаў"</string> + <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Дазваляе прыкладанню змяняць гiсторыю выклiкаў планшэта, у тым лiку дадзеныя пра ўваходныя i зыходныя выклiкi. Шкоднасныя прыкладаннi могуць выкарыстоўваць гэта, каб выдаляць або змяняць гiсторыю выклікаў."</string> + <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Дазваляе праграме змяняць гiсторыю выклiкаў вашага тэлевізара, у тым лiку даныя пра ўваходныя i выходныя выклiкi. Шкодныя праграмы могуць выкарыстоўваць гэта, каб выдаляць або змяняць гiсторыю выклікаў."</string> + <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Дазваляе прыкладанням змяняць гiсторыю выклiкаў тэлефону, у тым лiку дадзеныя пра ўваходныя і зыходныя выклiкi. Шкоднасныя прыкладаннi могуць выкарыстоўваць гэта, каб выдаляць або змяняць гiсторыю выклікаў."</string> + <string name="permlab_bodySensors" msgid="4683341291818520277">"атрымліваць доступ да датчыкаў цела (напрыклад, пульсометраў)"</string> + <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Дазваляе праграме атрымліваць доступ да даных з датчыкаў, якія назіраюць за вашым фізічным станам, напрыклад, за частатой пульсу."</string> + <string name="permlab_readCalendar" msgid="5972727560257612398">"чытаць падзеі календара, а таксама прыватную інфармацыю"</string> + <string name="permdesc_readCalendar" product="tablet" msgid="4216462049057658723">"Дазваляе прыкладанню чытаць усе мерапрыемствы з календара, захаваныя на вашым планшэце, у тым ліку з сябрамi або калегамi. Гэта дазваляе прыкладанню адпраўляць дадзеныя календара, нягледзячы на прыватнасць i адчувальнасць."</string> + <string name="permdesc_readCalendar" product="tv" msgid="3191352452242394196">"Дазваляе праграме счытваць усе падзеі з календара, захаваныя на вашым тэлевізары, у тым ліку падзеі сяброў або калег. Гэта можа дазволіць праграме абагульваць або захоўваць даныя вашага календара, нягледзячы на канфідэнцыяльнасць або сакрэтнасць."</string> + <string name="permdesc_readCalendar" product="default" msgid="7434548682470851583">"Дазваляе прыкладанню чытаць усе мерапрыемствы з календара, захаваныя на вашым тэлефоне, у тым ліку з сябрамi або калегамi. Гэта дазваляе прыкладанню адпраўляць дадзеныя календара, нягледзячы на прыватнасць i адчувальнасць."</string> + <string name="permlab_writeCalendar" msgid="8438874755193825647">"дадаваць ці змяняць падзеі календара і адпраўляць электронную пошту да гасцей без ведама ўладальнікаў"</string> + <string name="permdesc_writeCalendar" product="tablet" msgid="6679035520113668528">"Дазваляе прыкладанню дадаваць, выдаляць, змяняць мерапрыемствы, якія можна рэдагаваць на планшэце, у тым ліку сустрэчы с сябрамi i калегамi. Гэта дазваляе прыкладанню адпраўляць паведамленні ад уладальнiкаў календароў або змяняць мерапрыемствы без ведама уладальнiкаў."</string> + <string name="permdesc_writeCalendar" product="tv" msgid="1273290605500902507">"Дазваляе праграме дадаваць, выдаляць, змяняць падзеі, якія вы можаце рэдагаваць на сваім тэлевізары, у тым ліку падзеі сяброў або калег. Гэта дазваляе праграме адпраўляць паведамленні ад імя уладальнiкаў календароў або змяняць падзеі без ведама ўладальнiкаў."</string> + <string name="permdesc_writeCalendar" product="default" msgid="2324469496327249376">"Дазваляе прыкладанню дадаваць, выдаляць, змяняць мерапрыемствы, якія можна рэдагаваць на тэлефоне, у тым ліку сустрэчы с сябрамi i калегамi. Гэта дазваляе прыкладанню адпраўляць паведамленні ад уладальнiкаў календароў або змяняць мерапрыемствы без ведама уладальнiкаў."</string> + <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"доступ да дадатковых камандаў пастаўшчыка месцазнаходжання"</string> + <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Дазваляе праграме атрымліваць доступ да дадатковых каманд службаў вызначэння месцазнаходжання. Гэта можа дазволіць праграме ўмешвацца ў функцыянаванне GPS або іншых крыніц даных аб месцазнаходжаннi."</string> + <string name="permlab_accessFineLocation" msgid="251034415460950944">"атрымліваць доступ да дакладнага месцазнаходжання (на аснове GPS і сеткі)"</string> + <string name="permdesc_accessFineLocation" msgid="5295047563564981250">"Дазваляе прыкладанню вызначаць дакладнае месцазнаходжанне з дапамогай GPS або сеткавых крынiц месцазнаходжання, напрыклад веж сотавай сувязi i Wi-Fi. Гэтыя службы вызначэння месцазнаходжання павiнны быць уключаны i даступныя для вашай прылады i прыкладання. Прыкладаннi могуць выкарыстоўваць гэта, каб вызначаць ваша прыблiзнае месцазнаходжанне, а таксама спажываць дадатковае сiлкаванне."</string> + <string name="permlab_accessCoarseLocation" msgid="7715277613928539434">"атрымліваць доступ да прыблізнага месцазнаходжання (на аснове даных сеткі)"</string> + <string name="permdesc_accessCoarseLocation" msgid="2538200184373302295">"Дазваляе прыкладанню вызначаць прыблiзнае месцазнаходжанне. Гэта месцазнаходжанне вызначаецца спецыяльнымi службамi з выкарыстаннем сеткавых крынiц месцазнаходжання, напрыклад веж сотавай сувязi i Wi-Fi. Службы вызначэння месцазнаходжання павiнны быць уключаны i даступныя для вашай прылады i прыкладання. Прыкладаннi могуць выкарыстоўваць гэта, каб вызначаць ваша прыблiзнае месцазнаходжанне."</string> + <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"змяняць налады аудыё"</string> + <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Дазваляе прыкладанням змяняць глабальныя налады гуку, такія як моц і тое, што дынамік выкарыстоўваецца для выхаду."</string> + <string name="permlab_recordAudio" msgid="3876049771427466323">"запісваць аўдыё"</string> + <string name="permdesc_recordAudio" msgid="4906839301087980680">"Дазваляе прыкладанню запісваць аўдыё з дапамогай мікрафона. Дзякуючы гэтаму дазволу прыкладаннi могуць запiсваць аўдыё ў любы час без вашага пацвярджэння."</string> + <string name="permlab_sim_communication" msgid="2935852302216852065">"адпраўляць каманды на SIM-карту"</string> + <string name="permdesc_sim_communication" msgid="5725159654279639498">"Дазваляе праграме адпраўляць каманды SIM-карце. Гэта вельмі небяспечна."</string> + <string name="permlab_camera" msgid="3616391919559751192">"рабіць фатаграфіі і відэа"</string> + <string name="permdesc_camera" msgid="8497216524735535009">"Дазваляе прыкладанню рабiць фотаздымкi і здымаць відэа з дапамогай камеры. Дзякуючы ггэтаму дазволу прыкладанне можа ў любы час выкарыстоўваць камеру без вашага пацверджання."</string> + <string name="permlab_vibrate" msgid="7696427026057705834">"кіраванне вібрацыяй"</string> + <string name="permdesc_vibrate" msgid="6284989245902300945">"Дазваляе прыкладанням кіраваць вібрацыяй."</string> + <string name="permlab_callPhone" msgid="3925836347681847954">"непасрэдна набіраць тэлефонныя нумары"</string> + <string name="permdesc_callPhone" msgid="3740797576113760827">"Дазваляе прыкладанням званiць на тэлефонныя нумары без вашага ўмяшання. Гэта можа прывесці да нечаканага спагнання сродкаў або званкоў. Звярніце ўвагу, што прыкладанне не можа рабiць экстраныя выклікi. Шкоднасныя прыкладаннi могуць спаганяць з вас сродкi, робячы званкі без вашага пацверджання."</string> + <string name="permlab_accessImsCallService" msgid="3574943847181793918">"атрымліваць доступ да сэрвісу выклікаў IMS"</string> + <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"Дазваляе праграмам выкарыстоўваць службу IMS, каб рабіць выклікі без вашага ўмяшання."</string> + <string name="permlab_readPhoneState" msgid="9178228524507610486">"чытанне статусу тэлефона і ідэнтыфікацыя"</string> + <string name="permdesc_readPhoneState" msgid="1639212771826125528">"Дазваляе прыкладанням атрымлiваць доступ да функцый тэлефона на прыладзе. Дзякуючы гэтаму дазволу прыкладанне можа вызначаць iдэнтыфiкатары нумару тэлефона i прылады, незалежна ад таго, цi актыўны выклiк, i аддалены нумар, на якi робiцца выклiк."</string> + <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"прадухіліць планшэт ад пераходу ў рэжым сну"</string> + <string name="permlab_wakeLock" product="tv" msgid="2601193288949154131">"прадухіленне пераходу тэлевізара ў рэжым сну"</string> + <string name="permlab_wakeLock" product="default" msgid="573480187941496130">"забараняць тэлефону пераходзіць ў рэжым сну"</string> + <string name="permdesc_wakeLock" product="tablet" msgid="7311319824400447868">"Дазваляе прыкладанням прадухіляць пераход планшэта ў рэжым сну."</string> + <string name="permdesc_wakeLock" product="tv" msgid="3208534859208996974">"Дазваляе праграме прадухіляць пераход тэлевізара ў рэжым сну."</string> + <string name="permdesc_wakeLock" product="default" msgid="8559100677372928754">"Дазваляе прыкладанням прадухіляць тэлефон ад пераходу ў рэжым сну."</string> + <string name="permlab_transmitIr" msgid="7545858504238530105">"карыстацца інфрачырвоным перадатчыкам"</string> + <string name="permdesc_transmitIr" product="tablet" msgid="5358308854306529170">"Дазваляе праграме выкарыстоўваць інфрачырвоны перадатчык планшэта."</string> + <string name="permdesc_transmitIr" product="tv" msgid="3926790828514867101">"Дазваляе праграме выкарыстоўваць інфрачырвоны перадатчык тэлевізара."</string> + <string name="permdesc_transmitIr" product="default" msgid="7957763745020300725">"Дазваляе праграме выкарыстоўваць інфрачырвоны перадатчык тэлефона."</string> + <string name="permlab_setWallpaper" msgid="6627192333373465143">"усталёўваць шпалеры"</string> + <string name="permdesc_setWallpaper" msgid="7373447920977624745">"Дазваляе прыкладанням ксталёўваць сiстэмныя шпалеры."</string> + <string name="permlab_setWallpaperHints" msgid="3278608165977736538">"наладка памеру шпалер"</string> + <string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"Дазваляе прыкладанням задаваць падказкі па памеры сістэмных шпалер."</string> + <string name="permlab_setTimeZone" msgid="2945079801013077340">"усталёўваць часавы пояс"</string> + <string name="permdesc_setTimeZone" product="tablet" msgid="1676983712315827645">"Дазваляе прыкладанням змяняць гадзінны пояс планшэта."</string> + <string name="permdesc_setTimeZone" product="tv" msgid="888864653946175955">"Дазваляе праграме змяняць часавы пояс тэлевізара."</string> + <string name="permdesc_setTimeZone" product="default" msgid="4499943488436633398">"Дазваляе прыкладанню змяняць гадзінны пояс тэлефона."</string> + <string name="permlab_getAccounts" msgid="1086795467760122114">"пошук уліковых запісаў на прыладзе"</string> + <string name="permdesc_getAccounts" product="tablet" msgid="2741496534769660027">"Дазваляе прыкладанню атрымлiваць спіс уліковых запісаў, вядомых планшэту. Сярод iх могуць быць улiковыя запiсы, створаныя прыкладаннямi, якiя вы ўсталявалi."</string> + <string name="permdesc_getAccounts" product="tv" msgid="4190633395633907543">"Дазваляе праграме атрымлiваць спіс уліковых запісаў, вядомых тэлевізару. Сярод iх могуць быць любыя ўлiковыя запiсы, створаныя праграмамі, якiя вы ўсталявалi."</string> + <string name="permdesc_getAccounts" product="default" msgid="3448316822451807382">"Дазваляе прыкладанню атрымлiваць спіс уліковых запісаў, вядомых тэлефону. Сярод iх могуць быць улiковыя запiсы, створаныя прыкладаннямi, якiя вы ўсталявалi."</string> + <string name="permlab_accessNetworkState" msgid="4951027964348974773">"прагляд сеткавых злучэнняў"</string> + <string name="permdesc_accessNetworkState" msgid="8318964424675960975">"Дазваляе прыкладанню праглядаць звесткi пра падключэннi да сеткi, напрыклад пра тое, якiя сеткi iснуюць i з якiмi ёсць сувязь."</string> + <string name="permlab_createNetworkSockets" msgid="7934516631384168107">"атрымліваць поўны доступ да сеткі"</string> + <string name="permdesc_createNetworkSockets" msgid="3403062187779724185">"Дазваляе прыкладанням ствараць сеткавыя сокеты і выкарыстоўваць уласныя сеткавыя пратаколы. браўзер і іншыя прыкладаннi прадастаўляюць сродкі для перадачы дадзеных у Iнтэрнэт, так што гэты дазвол для перадачы дадзеных у Iнтэрнэце не патрабуецца."</string> + <string name="permlab_changeNetworkState" msgid="958884291454327309">"змяніць падлучэнне да сеткі"</string> + <string name="permdesc_changeNetworkState" msgid="6789123912476416214">"Дазваляе прыкладанням змяняць стан сеткавага падключэння."</string> + <string name="permlab_changeTetherState" msgid="5952584964373017960">"змяніць прывязку да падлучэння"</string> + <string name="permdesc_changeTetherState" msgid="1524441344412319780">"Дазваляе прыкладанням змяняць стан прывязкі да сеткі."</string> + <string name="permlab_accessWifiState" msgid="5202012949247040011">"прагляд злучэнняў Wi-Fi"</string> + <string name="permdesc_accessWifiState" msgid="5002798077387803726">"Дазваляе прыкладанню праглядаць звесткi пра падключэннi да сеткi, напрыклад пра тое, дзе ёсць сеткi Wi-Fi i якiя прылады Wi-Fi да iх падключаны."</string> + <string name="permlab_changeWifiState" msgid="6550641188749128035">"падключэнне да сеткі Wi-Fi і адключэнне ад яе"</string> + <string name="permdesc_changeWifiState" msgid="7137950297386127533">"Дазваляе прыкладанням падключацца да кропак доступу Wi-Fi і адключацца ад iх, а таксама ўносіць змяненні ў канфiгурацыю прылад сеткі Wi-Fi."</string> + <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"дазваляе прыём Wi-Fi Multicast"</string> + <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"Дазваляе прыкладанням атрымліваць пакеты, адпраўленыя на ўсе прылады з сеткi Wi-Fi з дапамогай групавых адрасоў, а не толькі на ваш планшэт. Будзе выкарыстоўвацца больш энергіі, чым у рэжыме нешматадраснай перадачы."</string> + <string name="permdesc_changeWifiMulticastState" product="tv" msgid="9031975661145014160">"Дазваляе праграме атрымліваць пакеты, адпраўленыя ўсім прыладам у сетцы Wi-Fi з дапамогай адрасоў шматадраснай рассылкі, а не толькі на ваш тэлевізар. Будзе выкарыстоўвацца больш энергіі, чым у нешматадрасным рэжыме."</string> + <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"Дазваляе прыкладанням атрымліваць пакеты, адпраўленыя на ўсе прылады з сеткi Wi-Fi з дапамогай групавых адрасоў, а не толькі на ваш тэлефон. Будзе выкарыстоўвацца больш энергіі, чым у рэжыме нешматадраснай перадачы."</string> + <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"атрыманне доступу да налад прылады Bluetooth"</string> + <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"Дазваляе прыкладанням наладжваць лакальны планшэт Bluetooth, выяўляць і падлучаць выдаленыя прылады."</string> + <string name="permdesc_bluetoothAdmin" product="tv" msgid="3373125682645601429">"Дазваляе праграме наладжваць канфігурацыю лакальнага тэлевізара з Bluetooth, а таксама выяўляць аддаленыя прылады і спалучацца з імі."</string> + <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"Дазваляе прыкладанням наладжваць лакальны тэлефон Bluetooth, а таксама знаходзіць выдаленыя прылады i падлучацца да ix."</string> + <string name="permlab_accessWimaxState" msgid="4195907010610205703">"падключаць да WiMAX i адключаць ад яго"</string> + <string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Дазваляе прыкладанню вызначаць, ці ўключаны WiMAX, і інфармацыю пра любую сетку WiMAX, якая спалучана з iншымi."</string> + <string name="permlab_changeWimaxState" msgid="340465839241528618">"Змяніць стан WiMAX"</string> + <string name="permdesc_changeWimaxState" product="tablet" msgid="3156456504084201805">"Дазваляе прыкладанням падключаць планшэт да сеткі WiMAX i адключаць яго ад яе."</string> + <string name="permdesc_changeWimaxState" product="tv" msgid="6022307083934827718">"Дазваляе праграме падлучаць тэлевізар да сетак WiMAX і адлучаць яго ад іх."</string> + <string name="permdesc_changeWimaxState" product="default" msgid="697025043004923798">"Дазваляе прыкладанням падключацца да сетак WiMAX і адключацца ад iх."</string> + <string name="permlab_bluetooth" msgid="6127769336339276828">"падлучэнне да прылады Bluetooth"</string> + <string name="permdesc_bluetooth" product="tablet" msgid="3480722181852438628">"Дазваляе прыкладанню праглядаць канфігурацыю Bluetooth на планшэце , а таксама здзяйсняць і прымаць злучэнні са спалучанымі прыладамі."</string> + <string name="permdesc_bluetooth" product="tv" msgid="3974124940101104206">"Дазваляе праграме праглядаць канфігурацыю Bluetooth на тэлевізары, а таксама выконваць і прымаць злучэнні са спалучанымі прыладамі."</string> + <string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"Дазваляе прыкладанню праглядаць канфігурацыю Bluetooth на тэлефоне , а таксама здзяйсняць і прымаць злучэнні са спалучанымі прыладамі."</string> + <string name="permlab_nfc" msgid="4423351274757876953">"кантроль Near Field Communication"</string> + <string name="permdesc_nfc" msgid="7120611819401789907">"Дазваляе прыкладаннzv спалучацца з тэгамі, картамі і счытваючымі прыладамі Near Field Communication (NFC)."</string> + <string name="permlab_disableKeyguard" msgid="3598496301486439258">"адключэнне блакiроўкi экрана"</string> + <string name="permdesc_disableKeyguard" msgid="6034203065077122992">"Дазваляе прыкладанням адключаць блакiроўку клавіятуры і любыя сродкі абароны, звязаныя з паролем. Прыкладам гэтага з\'яўляецца адключэнне тэлефонам блакiроўкi клавіятуры пры атрыманні ўваходнага выкліку і паўторнае ўключэнне блакiроўкi клавіятуры, калі выклік завершаны."</string> + <string name="permlab_manageFingerprint" msgid="5640858826254575638">"кіраваць апаратнымі сродкамі для адбіткаў пальцаў"</string> + <string name="permdesc_manageFingerprint" msgid="178208705828055464">"Дазваляе праграме выкарыстоўваць спосабы дадання і выдалення шаблонаў адбіткаў пальцаў для выкарыстання."</string> + <string name="permlab_useFingerprint" msgid="3150478619915124905">"выкарыстоўваць апаратныя сродкі для адбіткаў пальцаў"</string> + <string name="permdesc_useFingerprint" msgid="9165097460730684114">"Дазваляе праграме выкарыстоўваць апаратныя сродкі распазнання адбіткаў пальцаў для аўтэнтыфікацыі"</string> + <string name="fingerprint_acquired_partial" msgid="735082772341716043">"Выяўлена частка адбіткаў пальцаў. Паспрабуйце яшчэ раз."</string> + <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"Не атрымалася апрацаваць адбітак пальца. Паспрабуйце яшчэ раз."</string> + <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"Датчык адбіткаў пальцаў брудны. Ачысціце яго і паспрабуйце яшчэ раз."</string> + <string name="fingerprint_acquired_too_fast" msgid="6470642383109155969">"Палец рухаўся занадта хутка. Паспрабуйце яшчэ раз."</string> + <string name="fingerprint_acquired_too_slow" msgid="59250885689661653">"Палец рухаўся занадта павольна. Паспрабуйце яшчэ раз."</string> + <string-array name="fingerprint_acquired_vendor"> + </string-array> + <string name="fingerprint_error_hw_not_available" msgid="7955921658939936596">"Апаратныя сродкі адбіткаў пальцаў недаступныя."</string> + <string name="fingerprint_error_no_space" msgid="1055819001126053318">"Адбіткі пальцаў нельга захаваць. Выдаліце існы адбітак."</string> + <string name="fingerprint_error_timeout" msgid="3927186043737732875">"Час чакання адбіткаў пальцаў выйшаў. Паспрабуйце яшчэ раз."</string> + <string name="fingerprint_error_canceled" msgid="4402024612660774395">"Аперацыя з адбіткамі пальцаў скасавана."</string> + <string name="fingerprint_error_lockout" msgid="5536934748136933450">"Занадта шмат спроб. Паспрабуйце яшчэ раз пазней."</string> + <string name="fingerprint_error_unable_to_process" msgid="6107816084103552441">"Паспрабуйце яшчэ раз."</string> + <string name="fingerprint_name_template" msgid="5870957565512716938">"Палец <xliff:g id="FINGERID">%d</xliff:g>"</string> + <string-array name="fingerprint_error_vendor"> + </string-array> + <string name="fingerprint_icon_content_description" msgid="2340202869968465936">"Значок адбіткаў пальцаў"</string> + <string name="permlab_readSyncSettings" msgid="6201810008230503052">"чытаць параметры сінхранізацыі"</string> + <string name="permdesc_readSyncSettings" msgid="2706745674569678644">"Дазваляе прыкладанням чытаць параметры сінхранізацыі для ўліковага запісу. Напрыклад, яны могуць вызначыць, цi сiнхранiзавана з улiковым запiсам прыкладанне \"Кантакты\"."</string> + <string name="permlab_writeSyncSettings" msgid="5408694875793945314">"уключэнне ці адключэнне сінхранізацыi"</string> + <string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"Дазваляе прыкладанню змяняць налады сінхранізацыі для ўліковага запісу. Напрыклад, гэта можа выкарыстоўвацца для ўключэння сінхранізацыі прыкладання \"Кантакты\" з уліковым запісам."</string> + <string name="permlab_readSyncStats" msgid="7396577451360202448">"чытаць статыстыку сінхранізацыі"</string> + <string name="permdesc_readSyncStats" msgid="1510143761757606156">"Дазваляе прыкладанням чытаць статыстыку сінхранізацыі для ўліковага запісу, у тым ліку гісторыю сінхранізацыі мерапрыемстваў і наколькі сінхранізаваны дадзеныя."</string> + <string name="permlab_sdcardRead" product="nosdcard" msgid="367275095159405468">"чытанне змесціва USB-назапашв."</string> + <string name="permlab_sdcardRead" product="default" msgid="2188156462934977940">"чытанне змесціва SD-карты"</string> + <string name="permdesc_sdcardRead" product="nosdcard" msgid="3446988712598386079">"Дазваляе праграме счытваць змесціва вашага USB-сховішча."</string> + <string name="permdesc_sdcardRead" product="default" msgid="2607362473654975411">"Дазваляе праграме счытваць змесціва вашай SD-карты."</string> + <string name="permlab_sdcardWrite" product="nosdcard" msgid="8485979062254666748">"зм. або выд. змес. USB-назап."</string> + <string name="permlab_sdcardWrite" product="default" msgid="8805693630050458763">"змяніць або выдаліць змесціва SD-карты"</string> + <string name="permdesc_sdcardWrite" product="nosdcard" msgid="6175406299445710888">"Дазваляе прыкладаням выконваць запіс ва USB-назапашвальнік."</string> + <string name="permdesc_sdcardWrite" product="default" msgid="4337417790936632090">"Дазваляе прыкладанням запісваць на SD-карту."</string> + <string name="permlab_use_sip" msgid="2052499390128979920">"ажыццяўленне/прыманне выклікаў SIP"</string> + <string name="permdesc_use_sip" msgid="2297804849860225257">"Дазваляе праграме рабіць і прымаць выклікі SIP."</string> + <string name="permlab_register_sim_subscription" msgid="3166535485877549177">"рэгістрацыя новых падлучэнняў сувязі SIM"</string> + <string name="permdesc_register_sim_subscription" msgid="2138909035926222911">"Дазваляе праграме рэгістраваць новыя падлучэнні сувязі SIM."</string> + <string name="permlab_register_call_provider" msgid="108102120289029841">"рэгістрацыя новых падлучэнняў сувязі"</string> + <string name="permdesc_register_call_provider" msgid="7034310263521081388">"Дазваляе праграме рэгістраваць новыя падлучэнні сувязі."</string> + <string name="permlab_connection_manager" msgid="1116193254522105375">"кіраванне падлучэннямі сувязі"</string> + <string name="permdesc_connection_manager" msgid="5925480810356483565">"Дазваляе праграме кіраваць падлучэннямі сувязі."</string> + <string name="permlab_bind_incall_service" msgid="6773648341975287125">"узаемадзеянне з экранам бягучага выкліку"</string> + <string name="permdesc_bind_incall_service" msgid="8343471381323215005">"Дазваляе праграме кіраваць тым, калі і як карыстальнік бачыць экран бягучага выкліку."</string> + <string name="permlab_bind_connection_service" msgid="3557341439297014940">"узаемадзеянне са службамі тэлефаніі"</string> + <string name="permdesc_bind_connection_service" msgid="4008754499822478114">"Дазваляе праграме ўзаемадзейнічаць са службамі тэлефаніі, каб рабіць/прымаць выклікі."</string> + <string name="permlab_control_incall_experience" msgid="9061024437607777619">"прапанаванне аперацый, звязаных з выклікам"</string> + <string name="permdesc_control_incall_experience" msgid="915159066039828124">"Дазваляе праграме прапаноўваць аперацыі, звязаныя з выклікам."</string> + <string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"чытаць дадзеныя выкарыстання сеткі"</string> + <string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Дазваляе прыкладанню счытваць дадзеныя аб гісторыі выкарыстання сеткі для пэўных сетак і прыкладанняў."</string> + <string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"кіраванне палітыкай сеткі"</string> + <string name="permdesc_manageNetworkPolicy" msgid="7537586771559370668">"Дазваляе прыкладаннм кіраваць сеткавымі палітыкамі і вызначаць правілы пэўных прыкладанняў."</string> + <string name="permlab_modifyNetworkAccounting" msgid="5088217309088729650">"змяніць улік выкарыстання сеткі"</string> + <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Дазваляе прыкладанням змяняць метад уліку выкарыстання сеткі прыкладаннямі. Не для выкарыстання звычайнымі прыкладаннямі."</string> + <string name="permlab_accessNotifications" msgid="7673416487873432268">"доступ да паведамленняў"</string> + <string name="permdesc_accessNotifications" msgid="458457742683431387">"Дазваляе прыкладанню атрымлiваць, правяраць i выдаляць апавяшчэннi, у тым лiку апублiкаваныя iншымi прыкладаннямi."</string> + <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"прывязка да службы апавяшчэння слухача"</string> + <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Дазваляе ўладальніку прывязвацца да верхняга ўзроўню інтэрфейсу службы апавяшчэння слухачоў. Ніколі не патрэбнае для звычайных прыкладанняў."</string> + <string name="permlab_bindConditionProviderService" msgid="1180107672332704641">"прывязка да службы пастаўшчыка ўмоў"</string> + <string name="permdesc_bindConditionProviderService" msgid="1680513931165058425">"Дазваляе ўладальніку выконваць прывязку да інтэрфейсу верхняга ўзроўню пастаўшчыка ўмоў. Ніколі не павінна патрабавацца для звычайных праграм."</string> + <string name="permlab_bindDreamService" msgid="4153646965978563462">"прывязка да службы экраннай застаўкі"</string> + <string name="permdesc_bindDreamService" msgid="7325825272223347863">"Дазваляе ўладальніку выконваць прывязку да інтэрфейсу верхняга ўзроўню службы экраннай застаўкі. Ніколі не павінна патрабавацца для звычайных праграм."</string> + <string name="permlab_invokeCarrierSetup" msgid="3699600833975117478">"выклікаць праграму аператарскай канфігурацыі"</string> + <string name="permdesc_invokeCarrierSetup" msgid="4159549152529111920">"Дазваляе трымальніку выклікаць праграму аператарскай канфігурацыі. Ніколі не павінна патрабавацца для звычайных праграм."</string> + <string name="permlab_accessNetworkConditions" msgid="8206077447838909516">"Дазваляе праграме праслухоўваць даныя назіранняў за станам сеткі."</string> + <string name="permdesc_accessNetworkConditions" msgid="6899102075825272211">"Дазваляе праграме праслухоўваць даныя назіранняў за станам сеткі. Ніколі не павінна патрабавацца для звычайных праграм."</string> + <string name="permlab_setInputCalibration" msgid="4902620118878467615">"змена каліброўкі прылады ўводу"</string> + <string name="permdesc_setInputCalibration" msgid="4527511047549456929">"Дазваляе праграме змяняць параметры каліброўкі сэнсарнага экрана. Ніколі не павінна патрабавацца для звычайных праграм."</string> + <string name="permlab_accessDrmCertificates" msgid="7436886640723203615">"доступ да сертыфікатаў DRM"</string> + <string name="permdesc_accessDrmCertificates" msgid="8073288354426159089">"Дазваляе праграме выконваць забеспячэнне і выкарыстанне сертыфікатаў DRM. Ніколі не павінна патрабавацца для звычайных праграм."</string> + <string name="permlab_handoverStatus" msgid="7820353257219300883">"атрымліваць стан перадачы Android Beam"</string> + <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Дазваляе праграме атрымліваць інфармацыю аб бягучых перадачах Android Beam"</string> + <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"выдаленне сертыфікатаў DRM"</string> + <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Дазваляе праграме выдаляць сертыфікаты DRM. Ніколі не павінна патрабавацца для звычайных праграм."</string> + <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"прывязка да службы паведамленняў аператара"</string> + <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Дазваляе ўладальніку выконваць прывязку да інтэрфейсу верхняга ўзроўню службы паведамленняў аператара. Ніколі не павінна патрабавацца для звычайных праграм."</string> + <string name="permlab_bindCarrierServices" msgid="3233108656245526783">"прывязвацца з сэрвісаў аператара"</string> + <string name="permdesc_bindCarrierServices" msgid="1391552602551084192">"Дазваляе ўладальніку ажыццяўляць прывязку да сэрвісаў аператара. Ніколі не павінна патрабавацца для звычайных праграм."</string> + <string name="permlab_access_notification_policy" msgid="4247510821662059671">"атрымліваць доступ да рэжыму «Не турбаваць»"</string> + <string name="permdesc_access_notification_policy" msgid="3296832375218749580">"Дазваляе праграме чытаць і выконваць запіс у канфігурацыю рэжыму «Не турбаваць»."</string> + <string name="policylab_limitPassword" msgid="4497420728857585791">"Устанавіць правілы паролю"</string> + <string name="policydesc_limitPassword" msgid="2502021457917874968">"Кіраваць даўжынёй і сімваламі, дазволенымі пры ўводзе пароляў і PIN-кодаў блакіроўкі экрана."</string> + <string name="policylab_watchLogin" msgid="914130646942199503">"Сачыць за спробамі разблакоўкі экрана"</string> + <string name="policydesc_watchLogin" product="tablet" msgid="3215729294215070072">"Сачыць за колькасцю няправільных набраных пароляў падчас разблакоўкі экрана і блакаваць планшэт або сціраць усе дадзеныя на ім, калі няправільны пароль набраны занадта шмат разоў."</string> + <string name="policydesc_watchLogin" product="TV" msgid="2707817988309890256">"Сачыць за колькасцю няправільна набраных пароляў падчас разблакіроўкі экрана і блакіраваць тэлевізар або сціраць усе даныя на ім, калі няправільны пароль набраны занадта шмат разоў."</string> + <string name="policydesc_watchLogin" product="default" msgid="5712323091846761073">"Сачыць за колькасцю няправільных набраных пароляў падчас разблакоўкі экрана і блакаваць тяэлефон або сціраць усе дадзеныя на ім, калі набрана занадта шмат няправільных пароляў."</string> + <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="4280246270601044505">"Сачыць за колькасцю няправільна набраных пароляў падчас разблакіроўкі экрана і блакіраваць планшэт або сцерці ўсе даныя гэтага карыстальніка, калі няправільны пароль набраны занадта шмат разоў."</string> + <string name="policydesc_watchLogin_secondaryUser" product="TV" msgid="3484832653564483250">"Сачыць за колькасцю няправільна набраных пароляў падчас разблакіроўкі экрана і блакіраваць тэлевізар або сцерці ўсе даныя гэтага карыстальніка, калі няправільны пароль набраны занадта шмат разоў."</string> + <string name="policydesc_watchLogin_secondaryUser" product="default" msgid="2185480427217127147">"Сачыць за колькасцю няправільна набраных пароляў падчас разблакіроўкі экрана і блакіраваць тэлефон або сцерці ўсе даныя гэтага карыстальніка, калі няправільны пароль набраны занадта шмат разоў."</string> + <string name="policylab_resetPassword" msgid="4934707632423915395">"Змяніць блакіроўку экрана"</string> + <string name="policydesc_resetPassword" msgid="1278323891710619128">"Змяніць блакіроўку экрана."</string> + <string name="policylab_forceLock" msgid="2274085384704248431">"Заблакаваць экран"</string> + <string name="policydesc_forceLock" msgid="1141797588403827138">"Кіраванне часам і спосабам блакавання экрана"</string> + <string name="policylab_wipeData" msgid="3910545446758639713">"Сцерці ўсе дадзеныя"</string> + <string name="policydesc_wipeData" product="tablet" msgid="4306184096067756876">"Выдаліць дадзеныя з планшэта без папярэджання, выканаўшы скід налад."</string> + <string name="policydesc_wipeData" product="tv" msgid="5816221315214527028">"Сцерці даныя з тэлевізара без папярэджання, выканаўшы скід да заводскіх налад."</string> + <string name="policydesc_wipeData" product="default" msgid="5096895604574188391">"Выдаліць дадзеныя з тэлефона без папярэджання, выканаўшы скід налад."</string> + <string name="policylab_wipeData_secondaryUser" msgid="8362863289455531813">"Сцерці карыстальніцкія даныя"</string> + <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="6336255514635308054">"Сцерці даныя гэтага карыстальніка на дадзеным планшэце без папярэджання."</string> + <string name="policydesc_wipeData_secondaryUser" product="tv" msgid="2086473496848351810">"Сцерці даныя гэтага карыстальніка на дадзеным тэлевізары без папярэджання."</string> + <string name="policydesc_wipeData_secondaryUser" product="default" msgid="6787904546711590238">"Сцерці даныя гэтага карыстальніка на дадзеным тэлефоне без папярэджання."</string> + <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Усталяваць глабальны проксі прылады"</string> + <string name="policydesc_setGlobalProxy" msgid="8459859731153370499">"Задаць агульны проксі-cервер прылады, які будзе выкарыстоўвацца, калі прылада актыўная. Толькі ўладальнік прылады можа задаць агульны проксі-сервер."</string> + <string name="policylab_expirePassword" msgid="5610055012328825874">"Задаць тэрмін дзеяння пароля блакіроўкі экрана"</string> + <string name="policydesc_expirePassword" msgid="5367525762204416046">"Змяняць частату, з якой павінны мяняцца пароль, PIN-код або ўзор блакіроўкі экрана."</string> + <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Усталяваць шыфраванне сховішча."</string> + <string name="policydesc_encryptedStorage" msgid="2637732115325316992">"Запыт на шыфраванне захаваных дадзеных прыкладанняў."</string> + <string name="policylab_disableCamera" msgid="6395301023152297826">"Адключыць камеры"</string> + <string name="policydesc_disableCamera" msgid="2306349042834754597">"Забараніць выкарыстанне ўсіх камер прылады."</string> + <string name="policylab_disableKeyguardFeatures" msgid="8552277871075367771">"Адкл.некат.функцыі блак.экрана"</string> + <string name="policydesc_disableKeyguardFeatures" msgid="2044755691354158439">"Забараніць выкарыстанне некаторых функцый блакіроўкі экрана."</string> + <string-array name="phoneTypes"> + <item msgid="8901098336658710359">"Галоўная старонка"</item> + <item msgid="869923650527136615">"Мабільны"</item> + <item msgid="7897544654242874543">"Працоўны"</item> + <item msgid="1103601433382158155">"Працоўны факс"</item> + <item msgid="1735177144948329370">"Хатні факс"</item> + <item msgid="603878674477207394">"Пэйджар"</item> + <item msgid="1650824275177931637">"Іншы"</item> + <item msgid="9192514806975898961">"Асаблівы"</item> + </string-array> + <string-array name="emailAddressTypes"> + <item msgid="8073994352956129127">"Хатні"</item> + <item msgid="7084237356602625604">"Працоўны"</item> + <item msgid="1112044410659011023">"Іншы"</item> + <item msgid="2374913952870110618">"Карыстальніцкі"</item> + </string-array> + <string-array name="postalAddressTypes"> + <item msgid="6880257626740047286">"На Галоўную старонку"</item> + <item msgid="5629153956045109251">"Працоўны"</item> + <item msgid="4966604264500343469">"Іншы"</item> + <item msgid="4932682847595299369">"Карыстальніцкі"</item> + </string-array> + <string-array name="imAddressTypes"> + <item msgid="1738585194601476694">"Хатні"</item> + <item msgid="1359644565647383708">"Працоўны"</item> + <item msgid="7868549401053615677">"Іншы"</item> + <item msgid="3145118944639869809">"Карыстальніцкі"</item> + </string-array> + <string-array name="organizationTypes"> + <item msgid="7546335612189115615">"Працоўны"</item> + <item msgid="4378074129049520373">"Іншае"</item> + <item msgid="3455047468583965104">"Карыстальніцкі"</item> + </string-array> + <string-array name="imProtocols"> + <item msgid="8595261363518459565">"AIM"</item> + <item msgid="7390473628275490700">"Windows Live"</item> + <item msgid="7882877134931458217">"Yahoo"</item> + <item msgid="5035376313200585242">"Skype"</item> + <item msgid="7532363178459444943">"QQ"</item> + <item msgid="3713441034299660749">"Google Talk"</item> + <item msgid="2506857312718630823">"ICQ"</item> + <item msgid="1648797903785279353">"Jabber"</item> + </string-array> + <string name="phoneTypeCustom" msgid="1644738059053355820">"Карыстальніцкі"</string> + <string name="phoneTypeHome" msgid="2570923463033985887">"Галоўная старонка"</string> + <string name="phoneTypeMobile" msgid="6501463557754751037">"Мабільны"</string> + <string name="phoneTypeWork" msgid="8863939667059911633">"Працоўны"</string> + <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Працоўны факс"</string> + <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Хатні факс"</string> + <string name="phoneTypePager" msgid="7582359955394921732">"Пэйджар"</string> + <string name="phoneTypeOther" msgid="1544425847868765990">"Іншы"</string> + <string name="phoneTypeCallback" msgid="2712175203065678206">"Зваротны выклік"</string> + <string name="phoneTypeCar" msgid="8738360689616716982">"Машына"</string> + <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Асноўны тэлефон кампаніі"</string> + <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string> + <string name="phoneTypeMain" msgid="6766137010628326916">"Галоўны"</string> + <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Іншы факс"</string> + <string name="phoneTypeRadio" msgid="4093738079908667513">"Радыё"</string> + <string name="phoneTypeTelex" msgid="3367879952476250512">"Тэлекс"</string> + <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string> + <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Працоўны мабільны нумар"</string> + <string name="phoneTypeWorkPager" msgid="649938731231157056">"Працоўны пэйджар"</string> + <string name="phoneTypeAssistant" msgid="5596772636128562884">"Асістэнт"</string> + <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string> + <string name="eventTypeCustom" msgid="7837586198458073404">"Карыстальніцкі"</string> + <string name="eventTypeBirthday" msgid="2813379844211390740">"Дзень нараджэння"</string> + <string name="eventTypeAnniversary" msgid="3876779744518284000">"Гадавіна"</string> + <string name="eventTypeOther" msgid="7388178939010143077">"Іншае"</string> + <string name="emailTypeCustom" msgid="8525960257804213846">"Карыстальніцкі"</string> + <string name="emailTypeHome" msgid="449227236140433919">"Галоўная старонка"</string> + <string name="emailTypeWork" msgid="3548058059601149973">"Працоўны"</string> + <string name="emailTypeOther" msgid="2923008695272639549">"Іншы"</string> + <string name="emailTypeMobile" msgid="119919005321166205">"Мабільны"</string> + <string name="postalTypeCustom" msgid="8903206903060479902">"Карыстальніцкі"</string> + <string name="postalTypeHome" msgid="8165756977184483097">"Галоўная старонка"</string> + <string name="postalTypeWork" msgid="5268172772387694495">"Працоўны"</string> + <string name="postalTypeOther" msgid="2726111966623584341">"Іншы"</string> + <string name="imTypeCustom" msgid="2074028755527826046">"Карыстальніцкі"</string> + <string name="imTypeHome" msgid="6241181032954263892">"Галоўная старонка"</string> + <string name="imTypeWork" msgid="1371489290242433090">"Працоўны"</string> + <string name="imTypeOther" msgid="5377007495735915478">"Іншы"</string> + <string name="imProtocolCustom" msgid="6919453836618749992">"Карыстальніцкі"</string> + <string name="imProtocolAim" msgid="7050360612368383417">"AIM"</string> + <string name="imProtocolMsn" msgid="144556545420769442">"Windows Live"</string> + <string name="imProtocolYahoo" msgid="8271439408469021273">"Yahoo"</string> + <string name="imProtocolSkype" msgid="9019296744622832951">"Skype"</string> + <string name="imProtocolQq" msgid="8887484379494111884">"QQ"</string> + <string name="imProtocolGoogleTalk" msgid="493902321140277304">"Hangouts"</string> + <string name="imProtocolIcq" msgid="1574870433606517315">"ICQ"</string> + <string name="imProtocolJabber" msgid="2279917630875771722">"Jabber"</string> + <string name="imProtocolNetMeeting" msgid="8287625655986827971">"NetMeeting"</string> + <string name="orgTypeWork" msgid="29268870505363872">"Працоўная"</string> + <string name="orgTypeOther" msgid="3951781131570124082">"Іншая"</string> + <string name="orgTypeCustom" msgid="225523415372088322">"Карыстальніцкі"</string> + <string name="relationTypeCustom" msgid="3542403679827297300">"Карыстальніцкі"</string> + <string name="relationTypeAssistant" msgid="6274334825195379076">"Памочнік"</string> + <string name="relationTypeBrother" msgid="8757913506784067713">"Брат"</string> + <string name="relationTypeChild" msgid="1890746277276881626">"Дзіця"</string> + <string name="relationTypeDomesticPartner" msgid="6904807112121122133">"Унутраны Партнёр"</string> + <string name="relationTypeFather" msgid="5228034687082050725">"Бацька"</string> + <string name="relationTypeFriend" msgid="7313106762483391262">"Сябар/сяброўка"</string> + <string name="relationTypeManager" msgid="6365677861610137895">"Кіраўнік"</string> + <string name="relationTypeMother" msgid="4578571352962758304">"Маці"</string> + <string name="relationTypeParent" msgid="4755635567562925226">"Бацька"</string> + <string name="relationTypePartner" msgid="7266490285120262781">"Партнёр"</string> + <string name="relationTypeReferredBy" msgid="101573059844135524">"Запрошаны"</string> + <string name="relationTypeRelative" msgid="1799819930085610271">"Адносны"</string> + <string name="relationTypeSister" msgid="1735983554479076481">"Сястра"</string> + <string name="relationTypeSpouse" msgid="394136939428698117">"Муж/жонка"</string> + <string name="sipAddressTypeCustom" msgid="2473580593111590945">"Карыстальніцкі"</string> + <string name="sipAddressTypeHome" msgid="6093598181069359295">"Галоўная старонка"</string> + <string name="sipAddressTypeWork" msgid="6920725730797099047">"Працоўны"</string> + <string name="sipAddressTypeOther" msgid="4408436162950119849">"Іншае"</string> + <string name="quick_contacts_not_available" msgid="746098007828579688">"Адсутнічае праграма для прагляду гэтага кантакту."</string> + <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"Увядзіце PIN-код"</string> + <string name="keyguard_password_enter_puk_code" msgid="4800725266925845333">"Увядзіце PUK-код і новы PIN-код"</string> + <string name="keyguard_password_enter_puk_prompt" msgid="1341112146710087048">"PUK"</string> + <string name="keyguard_password_enter_pin_prompt" msgid="8027680321614196258">"Новы PIN-код"</string> + <string name="keyguard_password_entry_touch_hint" msgid="7858547464982981384"><font size="17">"Дакраніцеся, каб увесці пароль"</font></string> + <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"Увядзіце пароль для разблакавання"</string> + <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"Каб разблакаваць, увядзіце PIN-код"</string> + <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"Няправільны PIN-код."</string> + <string name="keyguard_label_text" msgid="861796461028298424">"Каб разблакаваць, націсніце \"Меню\", затым 0."</string> + <string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"Нумар экстранай службы"</string> + <string name="lockscreen_carrier_default" msgid="6169005837238288522">"Не абслугоўваецца"</string> + <string name="lockscreen_screen_locked" msgid="7288443074806832904">"Экран заблакаваны."</string> + <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Націсніце \"Меню\", каб разблакаваць, або зрабіце экстраны выклік."</string> + <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Націсніце \"Меню\", каб разблакаваць."</string> + <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Намалюйце камбінацыю разблакоўкі, каб разблакаваць"</string> + <string name="lockscreen_emergency_call" msgid="5298642613417801888">"Экстранная сітуацыя"</string> + <string name="lockscreen_return_to_call" msgid="5244259785500040021">"Вярнуцца да выкліку"</string> + <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Правільна!"</string> + <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Паспрабуйце яшчэ раз"</string> + <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Паўтарыце спробу"</string> + <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Перавышана максімальная колькасць спроб разблакоўкі праз Фэйскантроль"</string> + <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"Няма SIM-карты"</string> + <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"Няма SIM-карты ў планшэце."</string> + <string name="lockscreen_missing_sim_message" product="tv" msgid="1943633865476989599">"У тэлевізары няма SIM-карты."</string> + <string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"У тэлефоне няма SIM-карты."</string> + <string name="lockscreen_missing_sim_instructions" msgid="5372787138023272615">"Усталюйце SIM-карту."</string> + <string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"SIM-карта адсутнічае ці не чытаецца. Устаўце SIM-карту."</string> + <string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"SIM-карту немагчыма выкарыстоўваць"</string> + <string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"Ваша SIM-карта была адключана назаўсёды.\n Звяжыцеся з аператарам бесправадной сувязі, каб атрымаць іншую SIM-карту."</string> + <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"Папярэдні трэк"</string> + <string name="lockscreen_transport_next_description" msgid="573285210424377338">"Наступны трэк"</string> + <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"Прыпыніць"</string> + <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"Прайграць"</string> + <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"Спыніць"</string> + <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"Перамотка назад"</string> + <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"Перамотка ўперад"</string> + <string name="emergency_calls_only" msgid="6733978304386365407">"Толькі экстраныя выклікі"</string> + <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Сетка заблакаваная"</string> + <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM-карта заблакавана PUK-кодам."</string> + <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"Глядзіце \"Інструкцыю для карыстальніка\" або звяжыцеся са службай тэхнiчнай падтрымкі."</string> + <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"SIM-карта заблакаваная."</string> + <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"Разблакаванне SIM-карты..."</string> + <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"Вы няправільна ўвялі графічны ключ разблакавання пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. \n\nПаўтарыце спробу праз наступную колькасць секунд: <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> + <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="2725973286239344555">"Вы няправільна ўвялі пароль пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. \n\nПаўтарыце спробу праз наступную колькасць секунд: <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> + <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="6216672706545696955">"Вы няправільна ўвялі PIN-код пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. \n\nПаўтарыце спробу праз наступную колькасць секунд: <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="9191611984625460820">"Вы няправільна ўвялі графічны ключ разблакавання пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) вам будзе прапанавана разблакаваць планшэт з дапамогай уваходу ў Google.\n\n Паўтарыце спробу праз наступную колькасць секунд: <xliff:g id="NUMBER_2">%3$d</xliff:g>."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="5316664559603394684">"Вы няправільна нарысавалі ўзор разблакіроўкі столькі разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) вам будзе прапанавана разблакіраваць тэлевізар з дапамогай імя карыстальніка Google.\n\n Паўтарыце спробу праз <xliff:g id="NUMBER_2">%3$d</xliff:g> с."</string> + <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="2590227559763762751">"Вы няправільна ўвялі графічны ключ разблакавання пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) вам будзе прапанавана разблакаваць тэлефон з дапамогай уваходу ў Google.\n\n Паўтарыце спробу праз наступную колькасць секунд: <xliff:g id="NUMBER_2">%3$d</xliff:g>."</string> + <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="6128106399745755604">"Вы няправільна спрабавалі разблакаваць планшэт некалькi разоў (<xliff:g id="NUMBER_0">%1$d</xliff:g>). Пасля яшчэ некалькiх спробаў (<xliff:g id="NUMBER_1">%2$d</xliff:g>) ён будзе скінуты да заводскіх налад i карыстальнiцкiя дадзеныя будуць згубленыя."</string> + <string name="lockscreen_failed_attempts_almost_at_wipe" product="tv" msgid="950408382418270260">"Вы не змаглі разблакіраваць тэлевізар столькі разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) ён будзе скінуты да заводскіх налад i карыстальнiцкiя даныя будуць згублены."</string> + <string name="lockscreen_failed_attempts_almost_at_wipe" product="default" msgid="8603565142156826565">"Вы няправільна спрабавалі разблакаваць планшэт некалькi разоў (<xliff:g id="NUMBER_0">%1$d</xliff:g>). Пасля яшчэ некалькiх спробаў (<xliff:g id="NUMBER_1">%2$d</xliff:g>) ён будзе скінуты да заводскіх налад i карыстальнiцкiя дадзеныя будуць згубленыя."</string> + <string name="lockscreen_failed_attempts_now_wiping" product="tablet" msgid="280873516493934365">"Вы няправільна спрабавалі разблакаваць планшэт некалькi разоў (<xliff:g id="NUMBER">%d</xliff:g>). Цяпер ён будзе скінуты да заводскіх налад."</string> + <string name="lockscreen_failed_attempts_now_wiping" product="tv" msgid="3195755534096192191">"Вы не змаглі разблакіраваць тэлевізар столькі разоў: <xliff:g id="NUMBER">%d</xliff:g>. Цяпер ён будзе скінуты да заводскіх налад."</string> + <string name="lockscreen_failed_attempts_now_wiping" product="default" msgid="3025504721764922246">"Вы няправільна спрабавалі разблакаваць тэлефон некалькi разоў (<xliff:g id="NUMBER">%d</xliff:g>). Цяпер ён будзе скінуты да заводскіх налад."</string> + <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6251480343394389665">"Паўтарыце спробу праз <xliff:g id="NUMBER">%d</xliff:g> с."</string> + <string name="lockscreen_forgot_pattern_button_text" msgid="2626999449610695930">"Забылі ўзор?"</string> + <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"Разблакаванне ўліковага запісу"</string> + <string name="lockscreen_glogin_too_many_attempts" msgid="2751368605287288808">"Занадта шмат спроб паўтарыць шаблон!"</string> + <string name="lockscreen_glogin_instructions" msgid="3931816256100707784">"Каб разблакаваць, увайдзіце ў свой уліковы запіс Google."</string> + <string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"Імя карыстальніка (электронная пошта)"</string> + <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Пароль"</string> + <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Увайсці"</string> + <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Няправільнае імя карыстальніка ці пароль."</string> + <string name="lockscreen_glogin_account_recovery_hint" msgid="1696924763690379073">"Забыліся на імя карыстальніка або пароль?\nНаведайце "<b>"google.com/accounts/recovery"</b></string> + <string name="lockscreen_glogin_checking_password" msgid="7114627351286933867">"Праверка..."</string> + <string name="lockscreen_unlock_label" msgid="737440483220667054">"Разблакаваць"</string> + <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Гук уключаны"</string> + <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Гук выключаны"</string> + <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"Ключ пачаты"</string> + <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Ключ выдалены"</string> + <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Сотавы дададзены"</string> + <string name="lockscreen_access_pattern_cell_added_verbose" msgid="7264580781744026939">"Дададзена клетка <xliff:g id="CELL_INDEX">%1$s</xliff:g>"</string> + <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Ключ завершаны"</string> + <string name="lockscreen_access_pattern_area" msgid="400813207572953209">"Вобласць узора."</string> + <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. ВIджэт %2$d з %3$d."</string> + <string name="keyguard_accessibility_add_widget" msgid="8273277058724924654">"Дадаць віджэт"</string> + <string name="keyguard_accessibility_widget_empty_slot" msgid="1281505703307930757">"Пусты"</string> + <string name="keyguard_accessibility_unlock_area_expanded" msgid="2278106022311170299">"Вобласць разблакіроўкі разгарнута."</string> + <string name="keyguard_accessibility_unlock_area_collapsed" msgid="6366992066936076396">"Вобласць разблакіроўкі згарнута."</string> + <string name="keyguard_accessibility_widget" msgid="6527131039741808240">"Віджэт <xliff:g id="WIDGET_INDEX">%1$s</xliff:g>."</string> + <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"Селектар карыстальнiка"</string> + <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Стан"</string> + <string name="keyguard_accessibility_camera" msgid="8904231194181114603">"Камера"</string> + <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Налады мультымедыя"</string> + <string name="keyguard_accessibility_widget_reorder_start" msgid="8736853615588828197">"Змяненне парадку віджэтаў пачалося."</string> + <string name="keyguard_accessibility_widget_reorder_end" msgid="7170190950870468320">"Змяненне парадку віджэтаў скончылася."</string> + <string name="keyguard_accessibility_widget_deleted" msgid="4426204263929224434">"Віджэт <xliff:g id="WIDGET_INDEX">%1$s</xliff:g> выдалены."</string> + <string name="keyguard_accessibility_expand_lock_area" msgid="519859720934178024">"Разгарнуць вобласць разблакіроўкі."</string> + <string name="keyguard_accessibility_slide_unlock" msgid="2959928478764697254">"Разблакiроўка слайда."</string> + <string name="keyguard_accessibility_pattern_unlock" msgid="1490840706075246612">"Узор разблакiроўкі."</string> + <string name="keyguard_accessibility_face_unlock" msgid="4817282543351718535">"Фэйскантроль"</string> + <string name="keyguard_accessibility_pin_unlock" msgid="2469687111784035046">"PIN-код разблакiроўкі."</string> + <string name="keyguard_accessibility_password_unlock" msgid="7675777623912155089">"Пароль разблакiроўкі."</string> + <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">"Вобласць узора."</string> + <string name="keyguard_accessibility_slide_area" msgid="6736064494019979544">"Вобласць слайда."</string> + <string name="password_keyboard_label_symbol_key" msgid="992280756256536042">"123"</string> + <string name="password_keyboard_label_alpha_key" msgid="8001096175167485649">"ABC"</string> + <string name="password_keyboard_label_alt_key" msgid="1284820942620288678">"Alt"</string> + <string name="granularity_label_character" msgid="7336470535385009523">"Знак"</string> + <string name="granularity_label_word" msgid="7075570328374918660">"слова"</string> + <string name="granularity_label_link" msgid="5815508880782488267">"спасылка"</string> + <string name="granularity_label_line" msgid="5764267235026120888">"радок"</string> + <string name="factorytest_failed" msgid="5410270329114212041">"Не атрымалася выканаць заводскую праверку"</string> + <string name="factorytest_not_system" msgid="4435201656767276723">"Дзеянне FACTORY_TEST падтрымліваецца толькі для пакетаў, усталяваных на шляху /system/app."</string> + <string name="factorytest_no_action" msgid="872991874799998561">"Пакет, які выконвае дзеянне FACTORY_TEST, не знойдзены."</string> + <string name="factorytest_reboot" msgid="6320168203050791643">"Перазагрузіць"</string> + <string name="js_dialog_title" msgid="1987483977834603872">"На старонцы з адрасам <xliff:g id="TITLE">%s</xliff:g> вызначана:"</string> + <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string> + <string name="js_dialog_before_unload_title" msgid="2619376555525116593">"Пацвердзіце пераход"</string> + <string name="js_dialog_before_unload_positive_button" msgid="3112752010600484130">"Пакінуць гэту старонку"</string> + <string name="js_dialog_before_unload_negative_button" msgid="5614861293026099715">"Заставацца на гэтай старонцы"</string> + <string name="js_dialog_before_unload" msgid="3468816357095378590">"<xliff:g id="MESSAGE">%s</xliff:g>\n\nВы ўпэўнены, што хочаце пакiнуць гэту старонку?"</string> + <string name="save_password_label" msgid="6860261758665825069">"Пацвердзіць"</string> + <string name="double_tap_toast" msgid="4595046515400268881">"Падказка: двойчы націсніце, каб павялічыць або паменшыць."</string> + <string name="autofill_this_form" msgid="4616758841157816676">"Аўтазапаўненне"</string> + <string name="setup_autofill" msgid="7103495070180590814">"Усталяванне аўтазапаўнення"</string> + <string name="autofill_address_name_separator" msgid="6350145154779706772">" "</string> + <string name="autofill_address_summary_name_format" msgid="3268041054899214945">"$1$2$3"</string> + <string name="autofill_address_summary_separator" msgid="7483307893170324129">", "</string> + <string name="autofill_address_summary_format" msgid="4874459455786827344">"$1$2$3"</string> + <string name="autofill_province" msgid="2231806553863422300">"Правінцыя"</string> + <string name="autofill_postal_code" msgid="4696430407689377108">"Паштовы індэкс"</string> + <string name="autofill_state" msgid="6988894195520044613">"Штат"</string> + <string name="autofill_zip_code" msgid="8697544592627322946">"Паштовы індэкс"</string> + <string name="autofill_county" msgid="237073771020362891">"Акруга"</string> + <string name="autofill_island" msgid="4020100875984667025">"Востраў"</string> + <string name="autofill_district" msgid="8400735073392267672">"Раён"</string> + <string name="autofill_department" msgid="5343279462564453309">"Аддзел"</string> + <string name="autofill_prefecture" msgid="2028499485065800419">"Прэфектура"</string> + <string name="autofill_parish" msgid="8202206105468820057">"Прыход"</string> + <string name="autofill_area" msgid="3547409050889952423">"Плошча"</string> + <string name="autofill_emirate" msgid="2893880978835698818">"Эмірат"</string> + <string name="permlab_readHistoryBookmarks" msgid="3775265775405106983">"чытанне вэб-закладак і гісторыi"</string> + <string name="permdesc_readHistoryBookmarks" msgid="8462378226600439658">"Дазваляе прыкладанню счытваць усе URL-адрасы, якiя былi наведаны ў браўзеры, а таксама ўсе закладкi. Увага: гэты дазвол нельга ажыццяўляць пабочнымi браўзерамi або iншымi прыкладаннямi з уласцiвасцямi браўзера."</string> + <string name="permlab_writeHistoryBookmarks" msgid="3714785165273314490">"запіс вэб-закладак і гісторыi"</string> + <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="6825527469145760922">"Дазваляе прыкладанням змяняць гісторыю браўзера або закладкі, якiя захоўваюцца на планшэце. Гэта можа дазволіць прыкладанню выдаляць або змяняць дадзеныя браўзера. Увага: гэты дазвол не распаўсюджваецца на пабочныя браўзеры i iншыя прыкладаннi з функцыямi браўзера."</string> + <string name="permdesc_writeHistoryBookmarks" product="tv" msgid="7007393823197766548">"Дазваляе праграме змяняць гісторыю Браўзера або закладкі, якiя захоўваюцца на вашым тэлевізары. Гэта можа дазволіць праграме сціраць або змяняць даныя Браўзера. Увага: гэты дазвол можа не распаўсюджвацца на староннія браўзеры або iншыя праграмы з магчымасцямі прагляду вэб-старонак."</string> + <string name="permdesc_writeHistoryBookmarks" product="default" msgid="8497389531014185509">"Дазваляе прыкладанню змяняць гісторыю браўзера, і закладкі, захаваныя ў тэлефоне. Гэта дазволіць прыкладанню выдаляць або змяняць дадзеныя браўзера. Увага: гэты дазвол можа не дзейнiчаць для іншых браўзераў і іншых прыкладанняў з магчымасцямі вэб-браўзера."</string> + <string name="permlab_setAlarm" msgid="1379294556362091814">"усталёўка сігналу"</string> + <string name="permdesc_setAlarm" msgid="316392039157473848">"Дазваляе прыкладанню ўсталёўваць сігнал на ўсталяваным прыкладанні будзільніка. Пэўныя прыкладанні будзільніка не могуць рэалізоўваць гэтую магчымасць."</string> + <string name="permlab_addVoicemail" msgid="5525660026090959044">"дадаць галасавое паведамленне"</string> + <string name="permdesc_addVoicemail" msgid="6604508651428252437">"Дазваляе прыкладанням дадаваць паведамленні ў вашу скрыню галасавой пошты."</string> + <string name="permlab_writeGeolocationPermissions" msgid="5962224158955273932">"змяніць дазволы геапазіцыянавання для браўзэра"</string> + <string name="permdesc_writeGeolocationPermissions" msgid="1083743234522638747">"Дазваляе прыкладанням змяняць дазволы геалакацыі браўзэра. Шкоднасныя прыкладанні могуць выкарыстоўваць гэта, каб дазваляць адпраўку інфармацыі аб месцазнаходжанні выпадковым вэб-сайтам."</string> + <string name="save_password_message" msgid="767344687139195790">"Вы хочаце, каб браўзэр запомніў гэты пароль?"</string> + <string name="save_password_notnow" msgid="6389675316706699758">"Не цяпер"</string> + <string name="save_password_remember" msgid="6491879678996749466">"Запомніць"</string> + <string name="save_password_never" msgid="8274330296785855105">"Ніколі"</string> + <string name="open_permission_deny" msgid="7374036708316629800">"У вас няма дазволу на адкрыццё гэтай старонкі."</string> + <string name="text_copied" msgid="4985729524670131385">"Тэкст скапіяваны ў буфер абмену."</string> + <string name="more_item_label" msgid="4650918923083320495">"Больш"</string> + <string name="prepend_shortcut_label" msgid="2572214461676015642">"Меню+"</string> + <string name="menu_space_shortcut_label" msgid="2410328639272162537">"прабел"</string> + <string name="menu_enter_shortcut_label" msgid="2743362785111309668">"enter"</string> + <string name="menu_delete_shortcut_label" msgid="3658178007202748164">"выдаліць"</string> + <string name="search_go" msgid="8298016669822141719">"Пошук"</string> + <string name="search_hint" msgid="1733947260773056054">"Пошук..."</string> + <string name="searchview_description_search" msgid="6749826639098512120">"Пошук"</string> + <string name="searchview_description_query" msgid="5911778593125355124">"Запыт на пошук"</string> + <string name="searchview_description_clear" msgid="1330281990951833033">"Выдаліць запыт"</string> + <string name="searchview_description_submit" msgid="2688450133297983542">"Адправіць запыт"</string> + <string name="searchview_description_voice" msgid="2453203695674994440">"Галасавы пошук"</string> + <string name="enable_explore_by_touch_warning_title" msgid="7460694070309730149">"Уключыць функцыю Explore by Touch?"</string> + <string name="enable_explore_by_touch_warning_message" product="tablet" msgid="8655887539089910577">"Служба доступу <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> запытвае ўключэнне функцыі Explore by Touch. Калі функцыя Explore by Touch будзе ўключаная, вы зможаце пачуць або ўбачыць апісанні таго, што знаходзіцца пад вашым пальцам, або выконваць жэсты для ўзаемадзеяння з планшэтам."</string> + <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"Служба доступу <xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> запытвае ўключэнне функцыі Explore by Touch. Калі функцыя Explore by Touch будзе ўключаная, вы зможаце пачуць або ўбачыць апісанні таго, што знаходзіцца пад вашым пальцам, або выконваць жэсты для ўзаемадзеяння з тэлефонам."</string> + <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 месяц таму"</string> + <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Раней, чым 1 месяц таму"</string> + <plurals name="last_num_days" formatted="false" msgid="5104533550723932025"> + <item quantity="one">Апошні <xliff:g id="COUNT_1">%d</xliff:g> дзень</item> + <item quantity="few">Апошнія <xliff:g id="COUNT_1">%d</xliff:g> дні</item> + <item quantity="many">Апошнія <xliff:g id="COUNT_1">%d</xliff:g> дзён</item> + <item quantity="other">Апошнія <xliff:g id="COUNT_1">%d</xliff:g> дня</item> + </plurals> + <string name="last_month" msgid="3959346739979055432">"Апошні месяц"</string> + <string name="older" msgid="5211975022815554840">"Раней"</string> + <string name="preposition_for_date" msgid="9093949757757445117">"дата: <xliff:g id="DATE">%s</xliff:g>"</string> + <string name="preposition_for_time" msgid="5506831244263083793">"у <xliff:g id="TIME">%s</xliff:g>"</string> + <string name="preposition_for_year" msgid="5040395640711867177">"у <xliff:g id="YEAR">%s</xliff:g>"</string> + <string name="day" msgid="8144195776058119424">"дзень"</string> + <string name="days" msgid="4774547661021344602">"д."</string> + <string name="hour" msgid="2126771916426189481">"гадзіна"</string> + <string name="hours" msgid="894424005266852993">"г."</string> + <string name="minute" msgid="9148878657703769868">"хв."</string> + <string name="minutes" msgid="5646001005827034509">"хв."</string> + <string name="second" msgid="3184235808021478">"с."</string> + <string name="seconds" msgid="3161515347216589235">"с."</string> + <string name="week" msgid="5617961537173061583">"тыдзень"</string> + <string name="weeks" msgid="6509623834583944518">"тыд."</string> + <string name="year" msgid="4001118221013892076">"год"</string> + <string name="years" msgid="6881577717993213522">"г."</string> + <plurals name="duration_seconds" formatted="false" msgid="4527986939729687805"> + <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> секунда</item> + <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> секунды</item> + <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> секунд</item> + <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> секунды</item> + </plurals> + <plurals name="duration_minutes" formatted="false" msgid="643786953939956125"> + <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> хвіліна</item> + <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> хвіліны</item> + <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> хвілін</item> + <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> хвіліны</item> + </plurals> + <plurals name="duration_hours" formatted="false" msgid="6826233369186668274"> + <item quantity="one"><xliff:g id="COUNT">%d</xliff:g> гадзіна</item> + <item quantity="few"><xliff:g id="COUNT">%d</xliff:g> гадзіны</item> + <item quantity="many"><xliff:g id="COUNT">%d</xliff:g> гадзін</item> + <item quantity="other"><xliff:g id="COUNT">%d</xliff:g> гадзіны</item> + </plurals> + <string name="VideoView_error_title" msgid="3534509135438353077">"Праблема з відэа"</string> + <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"Відэа не падыходзіць для патокавай перадачы на гэту прыладу."</string> + <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Немагчыма прайграць гэта відэа."</string> + <string name="VideoView_error_button" msgid="2822238215100679592">"ОК"</string> + <string name="relative_time" msgid="1818557177829411417">"<xliff:g id="DATE">%1$s</xliff:g>, <xliff:g id="TIME">%2$s</xliff:g>"</string> + <string name="noon" msgid="7245353528818587908">"апоўдні"</string> + <string name="Noon" msgid="3342127745230013127">"Поўдзень"</string> + <string name="midnight" msgid="7166259508850457595">"апоўначы"</string> + <string name="Midnight" msgid="5630806906897892201">"Апоўначы"</string> + <string name="elapsed_time_short_format_mm_ss" msgid="4431555943828711473">"<xliff:g id="MINUTES">%1$02d</xliff:g>:<xliff:g id="SECONDS">%2$02d</xliff:g>"</string> + <string name="elapsed_time_short_format_h_mm_ss" msgid="1846071997616654124">"<xliff:g id="HOURS">%1$d</xliff:g>:<xliff:g id="MINUTES">%2$02d</xliff:g>:<xliff:g id="SECONDS">%3$02d</xliff:g>"</string> + <string name="selectAll" msgid="6876518925844129331">"Вылучыць усё"</string> + <string name="cut" msgid="3092569408438626261">"Выразаць"</string> + <string name="copy" msgid="2681946229533511987">"Капіяваць"</string> + <string name="paste" msgid="5629880836805036433">"Уставіць"</string> + <string name="paste_as_plain_text" msgid="5427792741908010675">"Уставіць як звычайны тэкст"</string> + <string name="replace" msgid="5781686059063148930">"Замяніць..."</string> + <string name="delete" msgid="6098684844021697789">"Выдаліць"</string> + <string name="copyUrl" msgid="2538211579596067402">"Скапіяваць URL"</string> + <string name="selectTextMode" msgid="1018691815143165326">"Выбраць тэкст"</string> + <string name="undo" msgid="7905788502491742328">"Адрабіць"</string> + <string name="redo" msgid="7759464876566803888">"Узнавіць"</string> + <string name="textSelectionCABTitle" msgid="5236850394370820357">"Вылучэнне тэксту"</string> + <string name="addToDictionary" msgid="4352161534510057874">"Дадаць у слоўнік"</string> + <string name="deleteText" msgid="6979668428458199034">"Выдалiць"</string> + <string name="inputMethod" msgid="1653630062304567879">"Метад уводу"</string> + <string name="editTextMenuTitle" msgid="4909135564941815494">"Дзеянні з тэкстам"</string> + <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Месца для захавання на зыходзе"</string> + <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Некаторыя сістэмныя функцыі могуць не працаваць"</string> + <string name="low_internal_storage_view_text_no_boot" msgid="6935190099204693424">"Не хапае сховішча для сістэмы. Пераканайцеся, што ў вас ёсць 250 МБ свабоднага месца, і перазапусціце."</string> + <string name="app_running_notification_title" msgid="8718335121060787914">"Прыкладанне <xliff:g id="APP_NAME">%1$s</xliff:g> працуе"</string> + <string name="app_running_notification_text" msgid="4653586947747330058">"Націсніце, каб атрымаць дадатковую інфармацыю або спыніць праграму."</string> + <string name="ok" msgid="5970060430562524910">"ОК"</string> + <string name="cancel" msgid="6442560571259935130">"Адмяніць"</string> + <string name="yes" msgid="5362982303337969312">"ОК"</string> + <string name="no" msgid="5141531044935541497">"Адмяніць"</string> + <string name="dialog_alert_title" msgid="2049658708609043103">"Увага"</string> + <string name="loading" msgid="7933681260296021180">"Загрузка..."</string> + <string name="capital_on" msgid="1544682755514494298">"Уключыць"</string> + <string name="capital_off" msgid="6815870386972805832">"Адключана"</string> + <string name="whichApplication" msgid="4533185947064773386">"Завяршыць дзеянне з дапамогай"</string> + <string name="whichApplicationNamed" msgid="8260158865936942783">"Завяршыць дзеянне з дапамогай %1$s"</string> + <string name="whichViewApplication" msgid="3272778576700572102">"Адкрыць з дапамогай"</string> + <string name="whichViewApplicationNamed" msgid="2286418824011249620">"Адкрыць з дапамогай %1$s"</string> + <string name="whichEditApplication" msgid="144727838241402655">"Рэдагаваць з дапамогай"</string> + <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Рэдагаваць з дапамогай %1$s"</string> + <string name="whichSendApplication" msgid="6902512414057341668">"Падзяліцца праз"</string> + <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Падзяліцца праз %s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Адправіць з дапамогай"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Адправіць з дапамогай %1$s"</string> + <string name="whichHomeApplication" msgid="4307587691506919691">"Выберыце праграму Галоўнай старонкі"</string> + <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Выкарыстоўваць %1$s у якасці праграмы Галоўнай старонкі"</string> + <string name="alwaysUse" msgid="4583018368000610438">"Выкарыстоўваць па змаўчанні для гэтага дзеяння."</string> + <string name="use_a_different_app" msgid="8134926230585710243">"Выкарыстоўваць іншую праграму"</string> + <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Ачысціць па змаўчанні ў раздзеле \"Налады сістэмы > Прыкладанні > Спампаваныя\"."</string> + <string name="chooseActivity" msgid="7486876147751803333">"Выберыце дзеянне"</string> + <string name="chooseUsbActivity" msgid="6894748416073583509">"Выберыце прыкладанне для USB-прылады"</string> + <string name="noApplications" msgid="2991814273936504689">"Няма прыкладанняў, якія могуць выконваць гэты працэс."</string> + <string name="aerr_application" msgid="250320989337856518">"Праграма <xliff:g id="APPLICATION">%1$s</xliff:g> спынілася"</string> + <string name="aerr_process" msgid="6201597323218674729">"Працэс <xliff:g id="PROCESS">%1$s</xliff:g> спыніўся"</string> + <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> шматразова спыняе працу"</string> + <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> шматразова спыняе працу"</string> + <string name="aerr_restart" msgid="9001379185665886595">"Перазапусціць праграму"</string> + <string name="aerr_reset" msgid="7645427603514220451">"Скінуць і перазапусціць праграму"</string> + <string name="aerr_report" msgid="5371800241488400617">"Адправіць водгук"</string> + <string name="aerr_close" msgid="2991640326563991340">"Закрыць"</string> + <string name="aerr_mute" msgid="1974781923723235953">"Адключыць гук да перазагрузкі прылады"</string> + <string name="aerr_wait" msgid="3199956902437040261">"Пачакаць"</string> + <string name="aerr_close_app" msgid="3269334853724920302">"Закрыць праграму"</string> + <string name="anr_title" msgid="4351948481459135709"></string> + <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> не адказвае"</string> + <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> не адказвае"</string> + <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> не адказвае"</string> + <string name="anr_process" msgid="6156880875555921105">"Працэс <xliff:g id="PROCESS">%1$s</xliff:g> не адказвае"</string> + <string name="force_close" msgid="8346072094521265605">"ОК"</string> + <string name="report" msgid="4060218260984795706">"Справаздача"</string> + <string name="wait" msgid="7147118217226317732">"Чакаць"</string> + <string name="webpage_unresponsive" msgid="3272758351138122503">"Старонка не адказвае на запыты.\n\nЗакрыць яе?"</string> + <string name="launch_warning_title" msgid="1547997780506713581">"Прыкл. перанакіраванае"</string> + <string name="launch_warning_replace" msgid="6202498949970281412">"Прыкладанне <xliff:g id="APP_NAME">%1$s</xliff:g> зараз запушчанае."</string> + <string name="launch_warning_original" msgid="188102023021668683">"Прыкладанне <xliff:g id="APP_NAME">%1$s</xliff:g> запушчанае."</string> + <string name="screen_compat_mode_scale" msgid="3202955667675944499">"Шкала"</string> + <string name="screen_compat_mode_show" msgid="4013878876486655892">"Заўсёды паказваць"</string> + <string name="screen_compat_mode_hint" msgid="1064524084543304459">"Зноў уключыце гэта ў раздзеле \"Сістэмныя налады > Прыкладанні > Спампаваныя\"."</string> + <string name="smv_application" msgid="3307209192155442829">"Прыкладанне <xliff:g id="APPLICATION">%1$s</xliff:g> (працэс <xliff:g id="PROCESS">%2$s</xliff:g>) парушыла ўласную палітыку StrictMode."</string> + <string name="smv_process" msgid="5120397012047462446">"Працэс <xliff:g id="PROCESS">%1$s</xliff:g> парушыў уласную палітыку StrictMode."</string> + <string name="android_upgrading_title" msgid="1584192285441405746">"Абнаўленне Android..."</string> + <string name="android_start_title" msgid="8418054686415318207">"Android запускаецца..."</string> + <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Аптымізацыя сховішча."</string> + <string name="android_upgrading_apk" msgid="7904042682111526169">"Аптымізацыя прыкладання <xliff:g id="NUMBER_0">%1$d</xliff:g> з <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> + <string name="android_preparing_apk" msgid="8162599310274079154">"Падрыхтоўка <xliff:g id="APPNAME">%1$s</xliff:g>."</string> + <string name="android_upgrading_starting_apps" msgid="451464516346926713">"Запуск прыкладанняў."</string> + <string name="android_upgrading_complete" msgid="1405954754112999229">"Завяршэнне загрузкі."</string> + <string name="heavy_weight_notification" msgid="9087063985776626166">"Прыкладанне \"<xliff:g id="APP">%1$s</xliff:g>\" запушчанае"</string> + <string name="heavy_weight_notification_detail" msgid="1721681741617898865">"Націсніце, каб перайсці да прыкладання"</string> + <string name="heavy_weight_switcher_title" msgid="7153167085403298169">"Пераключыць прыкладанні?"</string> + <string name="heavy_weight_switcher_text" msgid="7022631924534406403">"Ужо запушчана іншае прыкладанне, якое павінна быць спынена перад запускам новага."</string> + <string name="old_app_action" msgid="493129172238566282">"Вярнуцца да <xliff:g id="OLD_APP">%1$s</xliff:g>"</string> + <string name="old_app_description" msgid="2082094275580358049">"Не запускайце новыя прыкладанні."</string> + <string name="new_app_action" msgid="5472756926945440706">"Запусціць <xliff:g id="OLD_APP">%1$s</xliff:g>"</string> + <string name="new_app_description" msgid="1932143598371537340">"Спыніць старыя прыкладанні без захавання."</string> + <string name="dump_heap_notification" msgid="2618183274836056542">"Працэс <xliff:g id="PROC">%1$s</xliff:g> перавысіў ліміт памяці"</string> + <string name="dump_heap_notification_detail" msgid="2075673362317481664">"Быў сабраны дамп кучы; дакраніцеся, каб абагуліць"</string> + <string name="dump_heap_title" msgid="5864292264307651673">"Абагуліць дамп дынамічнай вобласці?"</string> + <string name="dump_heap_text" msgid="4809417337240334941">"Працэс <xliff:g id="PROC">%1$s</xliff:g> перавысіў ліміт памяці працэсу <xliff:g id="SIZE">%2$s</xliff:g>. Дамп дынамічнай вобласці даступны для вас, вы можаце абагуліць яго з распрацоўшчыкам. Будзьце асцярожныя: гэты дамп дынамічнай вобласці можа ўтрымліваць асабістую інфармацыю, да якой маюць доступ праграмы."</string> + <string name="sendText" msgid="5209874571959469142">"Выберыце дзеянне для тэкста"</string> + <string name="volume_ringtone" msgid="6885421406845734650">"Гучнасць званка"</string> + <string name="volume_music" msgid="5421651157138628171">"Гучнасць прайгравальніка"</string> + <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"Прайграваецца праз Bluetooth"</string> + <string name="volume_music_hint_silent_ringtone_selected" msgid="8310739960973156272">"Усталяваны ціхі рэжым"</string> + <string name="volume_call" msgid="3941680041282788711">"Гучнасць падчас размовы"</string> + <string name="volume_bluetooth_call" msgid="2002891926351151534">"Гучнасць Bluetooth падчас выкліку"</string> + <string name="volume_alarm" msgid="1985191616042689100">"Гучнасць будзільніка"</string> + <string name="volume_notification" msgid="2422265656744276715">"Гучнасць апавяшчэнняў"</string> + <string name="volume_unknown" msgid="1400219669770445902">"Гучнасць"</string> + <string name="volume_icon_description_bluetooth" msgid="6538894177255964340">"Гучнасць Bluetooth"</string> + <string name="volume_icon_description_ringer" msgid="3326003847006162496">"Гучнасць рынгтона"</string> + <string name="volume_icon_description_incall" msgid="8890073218154543397">"Гучнасць выкліка"</string> + <string name="volume_icon_description_media" msgid="4217311719665194215">"Гучнасць прайгравальніка"</string> + <string name="volume_icon_description_notification" msgid="7044986546477282274">"Гучнасць апавяшчэнняў"</string> + <string name="ringtone_default" msgid="3789758980357696936">"Рынгтон па змаўчаннi"</string> + <string name="ringtone_default_with_actual" msgid="8129563480895990372">"Рынгтон па змаўчаннi (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string> + <string name="ringtone_silent" msgid="7937634392408977062">"Няма"</string> + <string name="ringtone_picker_title" msgid="3515143939175119094">"Рынгтоны"</string> + <string name="ringtone_unknown" msgid="5477919988701784788">"Невядомы рынгтон"</string> + <plurals name="wifi_available" formatted="false" msgid="7900333017752027322"> + <item quantity="one">сетка Wi-Fi даступная</item> + <item quantity="few">сеткі Wi-Fi даступныя</item> + <item quantity="many">сетак Wi-Fi даступна</item> + <item quantity="other">сеткі Wi-Fi даступна</item> + </plurals> + <plurals name="wifi_available_detailed" formatted="false" msgid="1140699367193975606"> + <item quantity="one">адкрытая сетка Wi-Fi даступная</item> + <item quantity="few">адкрытыя сеткі Wi-Fi даступныя</item> + <item quantity="many">адкрытых сетак Wi-Fi даступна</item> + <item quantity="other">адкрытай сеткі Wi-Fi даступна</item> + </plurals> + <string name="wifi_available_sign_in" msgid="9157196203958866662">"Уваход у сетку Wi-Fi"</string> + <string name="network_available_sign_in" msgid="1848877297365446605">"Увайдзіце ў сетку"</string> + <!-- no translation found for network_available_sign_in_detailed (8000081941447976118) --> + <skip /> + <string name="wifi_no_internet" msgid="8451173622563841546">"У Wi-Fi няма доступу да Інтэрнэту"</string> + <string name="wifi_no_internet_detailed" msgid="7593858887662270131">"Дакраніцеся, каб убачыць параметры"</string> + <string name="wifi_watchdog_network_disabled" msgid="7904214231651546347">"Немагчыма падключыцца да Wi-Fi"</string> + <string name="wifi_watchdog_network_disabled_detailed" msgid="5548780776418332675">" дрэннае падключэнне да Інтэрнэту."</string> + <string name="wifi_connect_alert_title" msgid="8455846016001810172">"Дазволіць падключэнне?"</string> + <string name="wifi_connect_alert_message" msgid="6451273376815958922">"Праграма %1$s хоча падлучыцца да сеткі Wi-Fi %2$s"</string> + <string name="wifi_connect_default_application" msgid="7143109390475484319">"Праграма"</string> + <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"Wi-Fi Direct"</string> + <string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"Пачаць работу Wi-Fi Direct. Гэта адключыць кліента або кропку доступу Wi-Fi."</string> + <string name="wifi_p2p_failed_message" msgid="3763669677935623084">"Немагчыма запусціць Wi-Fi Direct."</string> + <string name="wifi_p2p_enabled_notification_title" msgid="2068321881673734886">"Wi-Fi Direct уключаны"</string> + <string name="wifi_p2p_enabled_notification_message" msgid="1638949953993894335">"Дакраніцеся, каб наладзіць"</string> + <string name="accept" msgid="1645267259272829559">"Прыняць"</string> + <string name="decline" msgid="2112225451706137894">"Адхіліць"</string> + <string name="wifi_p2p_invitation_sent_title" msgid="1318975185112070734">"Запрашэнне адпраўлена"</string> + <string name="wifi_p2p_invitation_to_connect_title" msgid="4958803948658533637">"Запрашэнне далучыцца"</string> + <string name="wifi_p2p_from_message" msgid="570389174731951769">"Ад:"</string> + <string name="wifi_p2p_to_message" msgid="248968974522044099">"Каму:"</string> + <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Увядзіце патрэбны PIN-код:"</string> + <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN-код"</string> + <string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="8012981257742232475">"Тэлефон будзе часова адключаны ад сеткі Wi-Fi, пакуль ён падлучаны да прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> + <string name="wifi_p2p_frequency_conflict_message" product="tv" msgid="3087858235069421128">"Тэлевізар будзе часова адключаны ад сеткі Wi-Fi, пакуль ён падключаны да прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> + <string name="wifi_p2p_frequency_conflict_message" product="default" msgid="7363907213787469151">"Тэлефон будзе часова адключаны ад Wi-Fi, пакуль ён падлучаны да прылады <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string> + <string name="select_character" msgid="3365550120617701745">"Уставіць сімвал"</string> + <string name="sms_control_title" msgid="7296612781128917719">"Адпраўка SMS"</string> + <string name="sms_control_message" msgid="3867899169651496433">"Прыкладанне <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> дасылае вялікую колькасць SMS-паведамленняў. Дазволіць гэтаму прыкладанню працягваць адпраўляць паведамленні?"</string> + <string name="sms_control_yes" msgid="3663725993855816807">"Дазволіць"</string> + <string name="sms_control_no" msgid="625438561395534982">"Забараніць"</string> + <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> хоча адправiць паведамленне на адрас <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string> + <string name="sms_short_code_details" msgid="5873295990846059400">"Гэта "<b>"можа прывесці да спагнання аплаты"</b>" з рахунку вашага мабільнага тэлефона."</string> + <string name="sms_premium_short_code_details" msgid="7869234868023975"><b>"Гэта прывядзе да спагнання аплаты з рахунку вашага мабільнага тэлефона."</b></string> + <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Адправiць"</string> + <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Адмена"</string> + <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Захаваць мой выбар"</string> + <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"Пазней гэта можна змянiць у раздзеле \"Налады > Прыкладаннi\""</string> + <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Заўсёды дазваляць"</string> + <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Ніколі не дазваляць"</string> + <string name="sim_removed_title" msgid="6227712319223226185">"SIM-карта выдаленая"</string> + <string name="sim_removed_message" msgid="5450336489923274918">"Мабільная сетка будзе недаступная да перазагрузкі з сапраўднай SIM-картай."</string> + <string name="sim_done_button" msgid="827949989369963775">"Гатова"</string> + <string name="sim_added_title" msgid="3719670512889674693">"SIM-карта дадазеная"</string> + <string name="sim_added_message" msgid="7797975656153714319">"Перазапусціце прыладу, каб атрымаць доступ да мабільнай сеткі."</string> + <string name="sim_restart_button" msgid="4722407842815232347">"Перазапусціць"</string> + <string name="carrier_app_dialog_message" msgid="7066156088266319533">"Каб ваша новая SIM-карта працавала належным чынам, вам неабходна ўсталяваць і адкрыць праграму ад вашага аператара."</string> + <string name="carrier_app_dialog_button" msgid="7900235513678617329">"АТРЫМАЦЬ ПРАГРАМУ"</string> + <string name="carrier_app_dialog_not_now" msgid="6361378684292268027">"НЕ ЗАРАЗ"</string> + <string name="carrier_app_notification_title" msgid="8921767385872554621">"Устаўлена новая SIM-карта"</string> + <string name="carrier_app_notification_text" msgid="1132487343346050225">"Краніце, каб наладзіць"</string> + <string name="time_picker_dialog_title" msgid="8349362623068819295">"Усталяваць час"</string> + <string name="date_picker_dialog_title" msgid="5879450659453782278">"Усталяваць дату"</string> + <string name="date_time_set" msgid="5777075614321087758">"Задаць"</string> + <string name="date_time_done" msgid="2507683751759308828">"Гатова"</string> + <string name="perms_new_perm_prefix" msgid="8257740710754301407"><font size="12" fgcolor="#ff33b5e5">"НОВАЕ: "</font></string> + <string name="perms_description_app" msgid="5139836143293299417">"Прадастаўленыя прыкладаннем <xliff:g id="APP_NAME">%1$s</xliff:g>."</string> + <string name="no_permissions" msgid="7283357728219338112">"Дазволу не патрабуецца"</string> + <string name="perm_costs_money" msgid="4902470324142151116">"за гэта можа спаганяцца плата"</string> + <string name="dlg_ok" msgid="7376953167039865701">"ОК"</string> + <string name="usb_charging_notification_title" msgid="4004114449249406402">"USB для зарадкі"</string> + <string name="usb_mtp_notification_title" msgid="8396264943589760855">"USB для перадачы файлаў"</string> + <string name="usb_ptp_notification_title" msgid="1347328437083192112">"USB для перадачы фота"</string> + <string name="usb_midi_notification_title" msgid="4850904915889144654">"USB для MIDI"</string> + <string name="usb_accessory_notification_title" msgid="7848236974087653666">"Падключаны да USB-прылады"</string> + <string name="usb_notification_message" msgid="7347368030849048437">"Дакраніцеся, каб атрымаць больш параметраў."</string> + <string name="adb_active_notification_title" msgid="6729044778949189918">"Прылада адладкі USB падключана"</string> + <string name="adb_active_notification_message" msgid="1016654627626476142">"Націсніце, каб адключыць адладку USB."</string> + <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Стварэнне справаздачы пра памылку…"</string> + <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Падзяліцца справаздачай пра памылку?"</string> + <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Перадача справаздачы пра памылку..."</string> + <string name="share_remote_bugreport_notification_message_finished" msgid="8610614010660772643">"ІТ-адміністратар запытаў справаздачу пра памылку для яе ліквідацыі на гэтай прыладзе. Можа адбыцца абагуленне праграм і даных."</string> + <string name="share_remote_bugreport_action" msgid="6249476773913384948">"АБАГУЛІЦЬ"</string> + <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"АДХІЛІЦЬ"</string> + <string name="select_input_method" msgid="8547250819326693584">"Змяніць клавіятуру"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Іншыя праграмныя клавіятуры"</string> + <string name="show_ime" msgid="2506087537466597099">"Захоўваць яе на экране ў той час, калі фізічная клавіятура актыўная"</string> + <string name="hardware" msgid="194658061510127999">"Паказаць віртуальную клавіятуру"</string> + <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Выбраць раскладку клавіятуры"</string> + <string name="select_keyboard_layout_notification_message" msgid="4465907700449257063">"Націсніце, каб выбраць раскладку клавіятуры."</string> + <string name="fast_scroll_alphabet" msgid="5433275485499039199">" АБВГДЕЁЖЗІЙКЛМНОПРСТУЎФХЦЧШ\'ЫЬЭЮЯ"</string> + <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string> + <string name="candidates_style" msgid="4333913089637062257"><u>"кандыдат."</u></string> + <string name="ext_media_checking_notification_title" msgid="5734005953288045806">"Падрыхтоўка <xliff:g id="NAME">%s</xliff:g>"</string> + <string name="ext_media_checking_notification_message" msgid="4747432538578886744">"Праверка на наяўнасць памылак"</string> + <string name="ext_media_new_notification_message" msgid="7589986898808506239">"Выяўлены новы носьбіт <xliff:g id="NAME">%s</xliff:g>"</string> + <string name="ext_media_ready_notification_message" msgid="4083398150380114462">"Для перадачы фатаграфій і медыяфайлаў"</string> + <string name="ext_media_unmountable_notification_title" msgid="8295123366236989588">"Пашкоджаны носьбіт <xliff:g id="NAME">%s</xliff:g>"</string> + <string name="ext_media_unmountable_notification_message" msgid="1586311304430052169">"Носьбіт <xliff:g id="NAME">%s</xliff:g> пашкоджаны. Дакраніцеся, каб выправіць."</string> + <string name="ext_media_unsupported_notification_title" msgid="3797642322958803257">"<xliff:g id="NAME">%s</xliff:g> не падтрымліваецца"</string> + <string name="ext_media_unsupported_notification_message" msgid="8789610369456474891">"Гэта прылада не падтрымлівае носьбіт <xliff:g id="NAME">%s</xliff:g>. Дакраніцеся, каб наладзіць яго ў фармаце, які падтрымліваецца."</string> + <string name="ext_media_badremoval_notification_title" msgid="3206248947375505416">"Носьбіт <xliff:g id="NAME">%s</xliff:g> нечакана выняты"</string> + <string name="ext_media_badremoval_notification_message" msgid="380176703346946313">"Адключыце носьбіт <xliff:g id="NAME">%s</xliff:g>, перш чым вымаць яго, каб пазбегнуць страты даных."</string> + <string name="ext_media_nomedia_notification_title" msgid="1704840188641749091">"Носьбіт <xliff:g id="NAME">%s</xliff:g> выдалены"</string> + <string name="ext_media_nomedia_notification_message" msgid="6471542972147056586">"Носьбіт <xliff:g id="NAME">%s</xliff:g> выдалены; устаўце новы"</string> + <string name="ext_media_unmounting_notification_title" msgid="640674168454809372">"Выманне <xliff:g id="NAME">%s</xliff:g> працягваецца..."</string> + <string name="ext_media_unmounting_notification_message" msgid="4182843895023357756">"Не выдаляць"</string> + <string name="ext_media_init_action" msgid="7952885510091978278">"Наладзіць"</string> + <string name="ext_media_unmount_action" msgid="1121883233103278199">"Выняць"</string> + <string name="ext_media_browse_action" msgid="8322172381028546087">"Праглядзець"</string> + <string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> адсутнічае"</string> + <string name="ext_media_missing_message" msgid="5761133583368750174">"Паўторна ўстаўце прыладу"</string> + <string name="ext_media_move_specific_title" msgid="1471100343872375842">"Перамяшчэнне <xliff:g id="NAME">%s</xliff:g>"</string> + <string name="ext_media_move_title" msgid="1022809140035962662">"Перамяшчэнне даных"</string> + <string name="ext_media_move_success_title" msgid="8575300932957954671">"Перамяшчэнне завершана"</string> + <string name="ext_media_move_success_message" msgid="4199002148206265426">"Даныя перамешчаны на <xliff:g id="NAME">%s</xliff:g>"</string> + <string name="ext_media_move_failure_title" msgid="7613189040358789908">"Не атрымалася перамясціць даныя"</string> + <string name="ext_media_move_failure_message" msgid="1978096440816403360">"Даныя пакінуты ў зыходным месцы"</string> + <string name="ext_media_status_removed" msgid="6576172423185918739">"Носьбіт выдалены"</string> + <string name="ext_media_status_unmounted" msgid="2551560878416417752">"Носьбіт выняты"</string> + <string name="ext_media_status_checking" msgid="6193921557423194949">"Праверка..."</string> + <string name="ext_media_status_mounted" msgid="7253821726503179202">"Гатова"</string> + <string name="ext_media_status_mounted_ro" msgid="8020978752406021015">"Толькі чытанне"</string> + <string name="ext_media_status_bad_removal" msgid="8395398567890329422">"Носьбіт выдалены небяспечна"</string> + <string name="ext_media_status_unmountable" msgid="805594039236667894">"Носьбіт пашкоджаны"</string> + <string name="ext_media_status_unsupported" msgid="4691436711745681828">"Не падтрымлiваецца"</string> + <string name="ext_media_status_ejecting" msgid="5463887263101234174">"Выманне..."</string> + <string name="ext_media_status_formatting" msgid="1085079556538644861">"Фарматаванне..."</string> + <string name="ext_media_status_missing" msgid="5638633895221670766">"Носьбіт не ўстаўлены"</string> + <string name="activity_list_empty" msgid="1675388330786841066">"Адпаведныя дзеянні не знойдзены."</string> + <string name="permlab_route_media_output" msgid="6243022988998972085">"накіроўваць вывад мультымедыйнага змесціва"</string> + <string name="permdesc_route_media_output" msgid="4932818749547244346">"Дазваляе прыкладанням маршрутызаваць мультымедыйны выхад на iншыя знешнiя прылады."</string> + <string name="permlab_readInstallSessions" msgid="3713753067455750349">"чытаць сеансы ўсталёўкі"</string> + <string name="permdesc_readInstallSessions" msgid="2049771699626019849">"Дазваляе праграме счытваць сеансы ўсталёўкі. Гэта дазваляе ёй праглядаць інфармацыю аб актыўных усталёўках пакета."</string> + <string name="permlab_requestInstallPackages" msgid="5782013576218172577">"запытваць усталёўку пакетаў"</string> + <string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"Дазваляе праграме запытваць усталёўку пакетаў."</string> + <string name="tutorial_double_tap_to_zoom_message_short" msgid="4070433208160063538">"Двойчы дакраніцеся, каб змянiць маштаб"</string> + <string name="gadget_host_error_inflating" msgid="4882004314906466162">"Немагчыма дадаць віджэт."</string> + <string name="ime_action_go" msgid="8320845651737369027">"Пачаць"</string> + <string name="ime_action_search" msgid="658110271822807811">"Пошук"</string> + <string name="ime_action_send" msgid="2316166556349314424">"Адправіць"</string> + <string name="ime_action_next" msgid="3138843904009813834">"Далей"</string> + <string name="ime_action_done" msgid="8971516117910934605">"Гатова"</string> + <string name="ime_action_previous" msgid="1443550039250105948">"Назад"</string> + <string name="ime_action_default" msgid="2840921885558045721">"Выканаць"</string> + <string name="dial_number_using" msgid="5789176425167573586">"Набраць нумар\nз выкарыстаннем <xliff:g id="NUMBER">%s</xliff:g>"</string> + <string name="create_contact_using" msgid="4947405226788104538">"Стварыць кантакт\nз дапамогай<xliff:g id="NUMBER">%s</xliff:g>"</string> + <string name="grant_credentials_permission_message_header" msgid="2106103817937859662">"Гэтыя адно або некалькі прыкладанняў запытваюць дазвол на доступ да вашага ўліковага запісу цяпер і ў будучыні."</string> + <string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"Дазволіць гэты запыт?"</string> + <string name="grant_permissions_header_text" msgid="6874497408201826708">"Запыт на доступ"</string> + <string name="allow" msgid="7225948811296386551">"Дазволіць"</string> + <string name="deny" msgid="2081879885755434506">"Забараніць"</string> + <string name="permission_request_notification_title" msgid="6486759795926237907">"Дазвол запытаны"</string> + <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"Запытаны дазвол\nдля ўліковага запісу <xliff:g id="ACCOUNT">%s</xliff:g>"</string> + <string name="forward_intent_to_owner" msgid="1207197447013960896">"Вы выкарыстоўваеце гэту праграму па-за межамі свайго працоўнага профілю"</string> + <string name="forward_intent_to_work" msgid="621480743856004612">"Вы выкарыстоўваеце гэту праграму ў сваім працоўным профілі"</string> + <string name="input_method_binding_label" msgid="1283557179944992649">"Метад уводу"</string> + <string name="sync_binding_label" msgid="3687969138375092423">"Сінхранізацыя"</string> + <string name="accessibility_binding_label" msgid="4148120742096474641">"Спецыяльныя магчымасці"</string> + <string name="wallpaper_binding_label" msgid="1240087844304687662">"Шпалеры"</string> + <string name="chooser_wallpaper" msgid="7873476199295190279">"Змена шпалер"</string> + <string name="notification_listener_binding_label" msgid="2014162835481906429">"Слухач апавяшчэння"</string> + <string name="vr_listener_binding_label" msgid="4316591939343607306">"Сродак праслухоўвання ў рэжыме віртуальнай рэальнасці (VR)"</string> + <string name="condition_provider_service_binding_label" msgid="1321343352906524564">"Пастаўшчык умоў"</string> + <string name="notification_ranker_binding_label" msgid="774540592299064747">"Служба ацэнкі важнасці апавяшчэнняў"</string> + <string name="vpn_title" msgid="19615213552042827">"VPN актываваны"</string> + <string name="vpn_title_long" msgid="6400714798049252294">"VPN актывуецца прыкладаннем <xliff:g id="APP">%s</xliff:g>"</string> + <string name="vpn_text" msgid="3011306607126450322">"Дакраніцеся, каб кіраваць сеткай."</string> + <string name="vpn_text_long" msgid="6407351006249174473">"Падлучаны да сеанса \"<xliff:g id="SESSION">%s</xliff:g>\". Дакраніцеся, каб кiраваць сеткай."</string> + <string name="vpn_lockdown_connecting" msgid="6443438964440960745">"Падключэнне заўсёды ўключанага VPN..."</string> + <string name="vpn_lockdown_connected" msgid="8202679674819213931">"Заўсёды ўключаны i падключаны VPN"</string> + <string name="vpn_lockdown_error" msgid="6009249814034708175">"Памылка заўсёды ўключанага VPN"</string> + <string name="vpn_lockdown_config" msgid="6415899150671537970">"Націсніце, каб змяніць налады"</string> + <string name="upload_file" msgid="2897957172366730416">"Выберыце файл"</string> + <string name="no_file_chosen" msgid="6363648562170759465">"Файл не выбраны"</string> + <string name="reset" msgid="2448168080964209908">"Скінуць"</string> + <string name="submit" msgid="1602335572089911941">"Перадаць"</string> + <string name="car_mode_disable_notification_title" msgid="3164768212003864316">"Рэжым \"У машыне\" ўключаны"</string> + <string name="car_mode_disable_notification_message" msgid="8035230537563503262">"Дакраніцеся, каб выйсці з рэжыму \"Штурман\"."</string> + <string name="tethered_notification_title" msgid="3146694234398202601">"USB-мадэм або кропка доступу Wi-Fi актыўныя"</string> + <string name="tethered_notification_message" msgid="6857031760103062982">"Націсніце, каб наладзіць."</string> + <string name="back_button_label" msgid="2300470004503343439">"Назад"</string> + <string name="next_button_label" msgid="1080555104677992408">"Далей"</string> + <string name="skip_button_label" msgid="1275362299471631819">"Прапусціць"</string> + <string name="no_matches" msgid="8129421908915840737">"Няма супадзенняў"</string> + <string name="find_on_page" msgid="1946799233822820384">"Знайсці на старонцы"</string> + <plurals name="matches_found" formatted="false" msgid="1210884353962081884"> + <item quantity="one"><xliff:g id="INDEX">%d</xliff:g> з <xliff:g id="TOTAL">%d</xliff:g></item> + <item quantity="few"><xliff:g id="INDEX">%d</xliff:g> з <xliff:g id="TOTAL">%d</xliff:g></item> + <item quantity="many"><xliff:g id="INDEX">%d</xliff:g> з <xliff:g id="TOTAL">%d</xliff:g></item> + <item quantity="other"><xliff:g id="INDEX">%d</xliff:g> з <xliff:g id="TOTAL">%d</xliff:g></item> + </plurals> + <string name="action_mode_done" msgid="7217581640461922289">"Гатова"</string> + <string name="progress_erasing" product="nosdcard" msgid="4521573321524340058">"Выдаленне дадзеных з USB-назапашвальнiка..."</string> + <string name="progress_erasing" product="default" msgid="6596988875507043042">"Выдаленне дадзеных з SD-карты..."</string> + <string name="share" msgid="1778686618230011964">"Адкрыць доступ"</string> + <string name="find" msgid="4808270900322985960">"Пошук"</string> + <string name="websearch" msgid="4337157977400211589">"Вэб-пошук"</string> + <string name="find_next" msgid="5742124618942193978">"Знайсці нiжэй"</string> + <string name="find_previous" msgid="2196723669388360506">"Знайсці вышэй"</string> + <string name="gpsNotifTicker" msgid="5622683912616496172">"Запыт пра месцазнаходжанне ад карыстальніка <xliff:g id="NAME">%s</xliff:g>"</string> + <string name="gpsNotifTitle" msgid="5446858717157416839">"Запыт месцазнаходжання"</string> + <string name="gpsNotifMessage" msgid="1374718023224000702">"Запыт ад карыстальнiка <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SERVICE">%2$s</xliff:g>)"</string> + <string name="gpsVerifYes" msgid="2346566072867213563">"Так"</string> + <string name="gpsVerifNo" msgid="1146564937346454865">"Не"</string> + <string name="sync_too_many_deletes" msgid="5296321850662746890">"Выдаліць перавышаны ліміт"</string> + <string name="sync_too_many_deletes_desc" msgid="496551671008694245">"Выдалена элементаў для тыпу сінхранiзацыi \"<xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>\": <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g>. Уліковы запіс <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. Што вы жадаеце зрабіць?"</string> + <string name="sync_really_delete" msgid="2572600103122596243">"Выдаліць элементы."</string> + <string name="sync_undo_deletes" msgid="2941317360600338602">"Скасаваць выдаленні"</string> + <string name="sync_do_nothing" msgid="3743764740430821845">"Нічога зараз не рабіць"</string> + <string name="choose_account_label" msgid="5655203089746423927">"Выберыце ўліковы запіс"</string> + <string name="add_account_label" msgid="2935267344849993553">"Дадаць уліковы запіс"</string> + <string name="add_account_button_label" msgid="3611982894853435874">"Дадаць уліковы запіс"</string> + <string name="number_picker_increment_button" msgid="2412072272832284313">"Павялічыць"</string> + <string name="number_picker_decrement_button" msgid="476050778386779067">"Паменшыць"</string> + <string name="number_picker_increment_scroll_mode" msgid="3073101067441638428">"Націсніце і ўтрымлівайце <xliff:g id="VALUE">%s</xliff:g>."</string> + <string name="number_picker_increment_scroll_action" msgid="9101473045891835490">"Правядзіце пальцам уверх, каб павялічыць, або ўніз, каб паменшыць."</string> + <string name="time_picker_increment_minute_button" msgid="8865885114028614321">"Павялічыць лічбу хвілін."</string> + <string name="time_picker_decrement_minute_button" msgid="6246834937080684791">"Паменшыць лічбу хвілін."</string> + <string name="time_picker_increment_hour_button" msgid="3652056055810223139">"Павялічыць лічбу гадзін."</string> + <string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"Паменшыць лічбу гадзін."</string> + <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Усталяваць час пасля паўдня"</string> + <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Усталяваць час да паўдня"</string> + <string name="date_picker_increment_month_button" msgid="5369998479067934110">"Павялічыць лічбу месяца"</string> + <string name="date_picker_decrement_month_button" msgid="1832698995541726019">"Паменшыць лічбу месяца"</string> + <string name="date_picker_increment_day_button" msgid="7130465412308173903">"Павялічыць лічбу дня"</string> + <string name="date_picker_decrement_day_button" msgid="4131881521818750031">"Паменшыць лічбу дня"</string> + <string name="date_picker_increment_year_button" msgid="6318697384310808899">"Павялічыць лічбу года"</string> + <string name="date_picker_decrement_year_button" msgid="4482021813491121717">"Паменшыць лічбу года"</string> + <string name="date_picker_prev_month_button" msgid="2858244643992056505">"Папярэдні месяц"</string> + <string name="date_picker_next_month_button" msgid="5559507736887605055">"Наступны месяц"</string> + <string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Alt"</string> + <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"Адмена"</string> + <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"Выдаліць"</string> + <string name="keyboardview_keycode_done" msgid="1992571118466679775">"Гатова"</string> + <string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"Змена рэжыму"</string> + <string name="keyboardview_keycode_shift" msgid="2270748814315147690">"Shift"</string> + <string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enter"</string> + <string name="activitychooserview_choose_application" msgid="2125168057199941199">"Выберыце прыкладанне"</string> + <string name="activitychooserview_choose_application_error" msgid="8624618365481126668">"Не атрымалася запусціць <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> + <string name="shareactionprovider_share_with" msgid="806688056141131819">"Апублікаваць з дапамогай"</string> + <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Адправiць з дапамогай прыкладання <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string> + <string name="content_description_sliding_handle" msgid="415975056159262248">"Ручка для перасоўвання. Націсніце і ўтрымлівайце."</string> + <string name="description_target_unlock_tablet" msgid="3833195335629795055">"Прагартайце, каб разблакаваць."</string> + <string name="keyboard_headset_required_to_hear_password" msgid="7011927352267668657">"Каб праслухаць паролi, падключыце гарнiтуру."</string> + <string name="keyboard_password_character_no_headset" msgid="2859873770886153678">"Кропка."</string> + <string name="action_bar_home_description" msgid="5293600496601490216">"Перайсці да пачатковай старонкі"</string> + <string name="action_bar_up_description" msgid="2237496562952152589">"Перайсці ўверх"</string> + <string name="action_menu_overflow_description" msgid="2295659037509008453">"Больш налад"</string> + <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> + <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> + <string name="storage_sd_card" msgid="3282948861378286745">"SD-карта"</string> + <string name="storage_sd_card_label" msgid="6347111320774379257">"SD-карта <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> + <string name="storage_usb_drive" msgid="6261899683292244209">"USB-дыск"</string> + <string name="storage_usb_drive_label" msgid="4501418548927759953">"USB-дыск <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> + <string name="storage_usb" msgid="3017954059538517278">"USB-назапашвальнік"</string> + <string name="extract_edit_menu_button" msgid="8940478730496610137">"Рэдагаваць"</string> + <string name="data_usage_warning_title" msgid="1955638862122232342">"Папярэджанне выкарыстання дадзеных"</string> + <string name="data_usage_warning_body" msgid="2814673551471969954">"Дакраніцеся, каб прагледзець гісторыю выкарыстання і налады."</string> + <string name="data_usage_3g_limit_title" msgid="4361523876818447683">"Дасягнуты ліміт трафіку 2G-3G"</string> + <string name="data_usage_4g_limit_title" msgid="4609566827219442376">"Дасягнуты ліміт трафіку 4G"</string> + <string name="data_usage_mobile_limit_title" msgid="557158376602636112">"Дасягн. ліміт маб.перадачы даных"</string> + <string name="data_usage_wifi_limit_title" msgid="5803363779034792676">"Дасягн. ліміт перад. даных Wi-Fi"</string> + <string name="data_usage_limit_body" msgid="291731708279614081">"Перад.даных спын. да канца цыкла"</string> + <string name="data_usage_3g_limit_snoozed_title" msgid="7026739121138005231">"Перавышаны ліміт 2G-3G"</string> + <string name="data_usage_4g_limit_snoozed_title" msgid="1106562779311209039">"Перавышаны ліміт дадзеных 4G"</string> + <string name="data_usage_mobile_limit_snoozed_title" msgid="4941346653729943789">"Перавыш.ліміт маб.перадачы даных"</string> + <string name="data_usage_wifi_limit_snoozed_title" msgid="8743856006384825974">"Перав. ліміт па дадзеным Wi-Fi"</string> + <string name="data_usage_limit_snoozed_body" msgid="7035490278298441767">"Аб\'ём <xliff:g id="SIZE">%s</xliff:g> перавышае устаноўл. мяжу."</string> + <string name="data_usage_restricted_title" msgid="5965157361036321914">"Зыходныя дадзеныя абмежаваныя"</string> + <string name="data_usage_restricted_body" msgid="6741521330997452990">"Націсніце, каб зняць абмежаванне."</string> + <string name="ssl_certificate" msgid="6510040486049237639">"Сертыфікат бяспекі"</string> + <string name="ssl_certificate_is_valid" msgid="6825263250774569373">"Гэты сертыфікат сапраўдны."</string> + <string name="issued_to" msgid="454239480274921032">"Выдадзены:"</string> + <string name="common_name" msgid="2233209299434172646">"Звычайнае імя:"</string> + <string name="org_name" msgid="6973561190762085236">"Арганізацыя:"</string> + <string name="org_unit" msgid="7265981890422070383">"Аддзел арганізацыі:"</string> + <string name="issued_by" msgid="2647584988057481566">"Выдана:"</string> + <string name="validity_period" msgid="8818886137545983110">"Тэрмін дзеяння:"</string> + <string name="issued_on" msgid="5895017404361397232">"Выдадзены:"</string> + <string name="expires_on" msgid="3676242949915959821">"Заканчваецца:"</string> + <string name="serial_number" msgid="758814067660862493">"Серыйны нумар:"</string> + <string name="fingerprints" msgid="4516019619850763049">"Адбіткі пальцаў:"</string> + <string name="sha256_fingerprint" msgid="4391271286477279263">"Адбітак пальцаў SHA-256:"</string> + <string name="sha1_fingerprint" msgid="7930330235269404581">"Адбіткі пальцаў SHA-1:"</string> + <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"Прагледзець усё"</string> + <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"Выберыце працэс"</string> + <string name="share_action_provider_share_with" msgid="5247684435979149216">"Апублікаваць з дапамогай"</string> + <string name="sending" msgid="3245653681008218030">"Адпраўка..."</string> + <string name="launchBrowserDefault" msgid="2057951947297614725">"Запусцiць браўзер?"</string> + <string name="SetupCallDefault" msgid="5834948469253758575">"Прыняць выклік?"</string> + <string name="activity_resolver_use_always" msgid="8017770747801494933">"Заўсёды"</string> + <string name="activity_resolver_use_once" msgid="2404644797149173758">"Толькі адзін раз"</string> + <string name="activity_resolver_work_profiles_support" msgid="185598180676883455">"%1$s не падтрымлівае працоўны профіль"</string> + <string name="default_audio_route_name" product="tablet" msgid="4617053898167127471">"Планшэт"</string> + <string name="default_audio_route_name" product="tv" msgid="9158088547603019321">"ТБ"</string> + <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Тэлефон"</string> + <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Навушнікі"</string> + <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Дынамікі станцыi"</string> + <string name="default_media_route_name_hdmi" msgid="2450970399023478055">"HDMI"</string> + <string name="default_audio_route_category_name" msgid="3722811174003886946">"Сістэма"</string> + <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth-аўдыё"</string> + <string name="wireless_display_route_description" msgid="9070346425023979651">"Бесправадны дысплей"</string> + <string name="media_route_button_content_description" msgid="591703006349356016">"Перадача"</string> + <string name="media_route_chooser_title" msgid="1751618554539087622">"Падлучыцца да прылады"</string> + <string name="media_route_chooser_title_for_remote_display" msgid="3395541745872017583">"Трансліраваць экран на прыладу"</string> + <string name="media_route_chooser_searching" msgid="4776236202610828706">"Пошук прылад..."</string> + <string name="media_route_chooser_extended_settings" msgid="87015534236701604">"Налады"</string> + <string name="media_route_controller_disconnect" msgid="8966120286374158649">"Адлучыць"</string> + <string name="media_route_status_scanning" msgid="7279908761758293783">"Сканiраванне..."</string> + <string name="media_route_status_connecting" msgid="6422571716007825440">"Падключэнне..."</string> + <string name="media_route_status_available" msgid="6983258067194649391">"Даступна"</string> + <string name="media_route_status_not_available" msgid="6739899962681886401">"Недаступны"</string> + <string name="media_route_status_in_use" msgid="4533786031090198063">"Выкарыстоўваецца"</string> + <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Убудаваны экран"</string> + <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"Экран HDMI"</string> + <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Оверлей # <xliff:g id="ID">%1$d</xliff:g>"</string> + <string name="display_manager_overlay_display_title" msgid="652124517672257172">"<xliff:g id="NAME">%1$s</xliff:g>: <xliff:g id="WIDTH">%2$d</xliff:g>x<xliff:g id="HEIGHT">%3$d</xliff:g>, <xliff:g id="DPI">%4$d</xliff:g> кр. на цалю"</string> + <string name="display_manager_overlay_display_secure_suffix" msgid="6022119702628572080">", бяспечны"</string> + <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"Забылі ключ"</string> + <string name="kg_wrong_pattern" msgid="1850806070801358830">"Няправільна ключ"</string> + <string name="kg_wrong_password" msgid="2333281762128113157">"Няправiльны пароль"</string> + <string name="kg_wrong_pin" msgid="1131306510833563801">"Няправільны PIN-код"</string> + <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Паўтарыце спробу праз <xliff:g id="NUMBER">%1$d</xliff:g> с."</string> + <string name="kg_pattern_instructions" msgid="398978611683075868">"Намалюйце ключ"</string> + <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Увядзіце PIN-код SIM-карты"</string> + <string name="kg_pin_instructions" msgid="2377242233495111557">"Увядзіце PIN-код"</string> + <string name="kg_password_instructions" msgid="5753646556186936819">"Увядзіце пароль"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM-карта зараз адключана. Увядзіце PUK-код, каб працягнуць. Звяжыцеся са сваiм аператарам, каб атрымаць дадатковую iнфармацыю."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Увядзіце жаданы PIN-код"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Пацвердзіце жадан PIN-код"</string> + <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Разблакiроўка SIM-карты..."</string> + <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Няправільны PIN-код."</string> + <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Увядзіце PIN-код, які змяшчае ад 4 да 8 лічбаў."</string> + <string name="kg_invalid_sim_puk_hint" msgid="6025069204539532000">"PUK-код павінен змяшчаць 8 лічбаў."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Паўторна увядзіце правільны PUK-код. Неаднаразовыя спробы назаўжды адключаць SIM-карту."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN-коды не супадаюць"</string> + <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Занадта шмат спроб паўтарыць шаблон!"</string> + <string name="kg_login_instructions" msgid="1100551261265506448">"Каб разблакiраваць, увайдзіце ў свой уліковы запіс Google."</string> + <string name="kg_login_username_hint" msgid="5718534272070920364">"Імя карыстальніка (электронная пошта)"</string> + <string name="kg_login_password_hint" msgid="9057289103827298549">"Пароль"</string> + <string name="kg_login_submit_button" msgid="5355904582674054702">"Увайсцi"</string> + <string name="kg_login_invalid_input" msgid="5754664119319872197">"Няправільнае імя карыстальніка ці пароль."</string> + <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Забыліся на імя карыстальніка або пароль?\nНаведайце "<b>"google.com/accounts/recovery"</b></string> + <string name="kg_login_checking_password" msgid="1052685197710252395">"Праверка ўлiковага запiсу..."</string> + <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Вы няправільна ўвялі PIN-код пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. \n\nПаўтарыце спробу праз <xliff:g id="NUMBER_1">%2$d</xliff:g> с."</string> + <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Вы няправільна ўвялі пароль пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. \n\nПаўтарыце спробу праз <xliff:g id="NUMBER_1">%2$d</xliff:g> с."</string> + <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Вы няправільна ўвялі графічны ключ разблакiроўкi пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. \n\nПаўтарыце спробу праз <xliff:g id="NUMBER_1">%2$d</xliff:g> с."</string> + <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="1575557200627128949">"Вы няправільна спрабавалі разблакiраваць планшэт некалькi разоў (<xliff:g id="NUMBER_0">%1$d</xliff:g>). Пасля яшчэ некалькiх спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) ён будзе скінуты да заводскіх налад i карыстальнiцкiя дадзеныя будуць згубленыя."</string> + <string name="kg_failed_attempts_almost_at_wipe" product="tv" msgid="5621231220154419413">"Вы не змаглі разблакіраваць тэлевізар столькі разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) ён будзе скінуты да заводскіх налад i карыстальнiцкiя даныя будуць згублены."</string> + <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="4051015943038199910">"Вы няправільна спрабавалі разблакiраваць планшэт некалькi разоў (<xliff:g id="NUMBER_0">%1$d</xliff:g>). Пасля яшчэ некалькiх спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) ён будзе скінуты да завадскіх налад i карыстальнiцкiя дадзеныя будуць згубленыя."</string> + <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="2072996269148483637">"Вы няправільна спрабавалі разблакiраваць планшэт некалькi разоў (<xliff:g id="NUMBER">%d</xliff:g>). Цяпер ён будзе скінуты да завадскіх налад."</string> + <string name="kg_failed_attempts_now_wiping" product="tv" msgid="4987878286750741463">"Вы не змаглі разблакіраваць тэлевізар столькі разоў: <xliff:g id="NUMBER">%d</xliff:g>. Цяпер ён будзе скінуты да заводскіх налад."</string> + <string name="kg_failed_attempts_now_wiping" product="default" msgid="4817627474419471518">"Вы няправільна спрабавалі разблакiраваць тэлефон некалькi разоў (<xliff:g id="NUMBER">%d</xliff:g>). Цяпер ён будзе скінуты да завадскіх налад."</string> + <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Вы няправільна ўвялі графічны ключ разблакiроўкi пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) вам будзе прапанавана разблакiраваць тэлефон, увайшоўшы ў Google.\n\n Паўтарыце спробу праз <xliff:g id="NUMBER_2">%3$d</xliff:g> с."</string> + <string name="kg_failed_attempts_almost_at_login" product="tv" msgid="4224651132862313471">"Вы няправільна ўвялі ўзор разблакiроўкi столькі разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) вам будзе прапанавана разблакiраваць тэлевізар з дапамогай уліковага запісу вашай электроннай пошты.\n\n Паўтарыце спробу праз <xliff:g id="NUMBER_2">%3$d</xliff:g> с."</string> + <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Вы няправільна ўвялі графічны ключ разблакiроўкi пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) вам будзе прапанавана разблакiраваць тэлефон, увайшоўшы ў Google.\n\n Паўтарыце спробу праз <xliff:g id="NUMBER_2">%3$d</xliff:g> с."</string> + <string name="kg_text_message_separator" product="default" msgid="4160700433287233771">" — "</string> + <string name="kg_reordering_delete_drop_target_text" msgid="7899202978204438708">"Выдалiць"</string> + <string name="safe_media_volume_warning" product="default" msgid="2276318909314492312">"Павялiчыць гук вышэй рэкамендаванага ўзроўню?\n\nДоўгае праслухоўванне музыкi на вялiкай гучнасцi можа пашкодзiць ваш слых."</string> + <string name="continue_to_enable_accessibility" msgid="1626427372316070258">"Утрымлiвайце два пальцы, каб уключыць доступ."</string> + <string name="accessibility_enabled" msgid="1381972048564547685">"Даступнасць уключана."</string> + <string name="enable_accessibility_canceled" msgid="3833923257966635673">"Даступнасць адменена."</string> + <string name="user_switched" msgid="3768006783166984410">"Бягучы карыстальнік <xliff:g id="NAME">%1$s</xliff:g>."</string> + <string name="user_switching_message" msgid="2871009331809089783">"Пераход да <xliff:g id="NAME">%1$s</xliff:g>..."</string> + <string name="user_logging_out_message" msgid="8939524935808875155">"<xliff:g id="NAME">%1$s</xliff:g> выходзіць з сістэмы…"</string> + <string name="owner_name" msgid="2716755460376028154">"Уладальнік"</string> + <string name="error_message_title" msgid="4510373083082500195">"Памылка"</string> + <string name="error_message_change_not_allowed" msgid="1347282344200417578">"Ваш адміністратар не дазваляе гэту змену"</string> + <string name="app_not_found" msgid="3429141853498927379">"Прыкладанне для гэтага дзеяння не знойдзенае"</string> + <string name="revoke" msgid="5404479185228271586">"Ануляваць"</string> + <string name="mediasize_iso_a0" msgid="1994474252931294172">"ISO A0"</string> + <string name="mediasize_iso_a1" msgid="3333060421529791786">"ISO A1"</string> + <string name="mediasize_iso_a2" msgid="3097535991925798280">"ISO A2"</string> + <string name="mediasize_iso_a3" msgid="3023213259314236123">"ISO A3"</string> + <string name="mediasize_iso_a4" msgid="231745325296873764">"ISO A4"</string> + <string name="mediasize_iso_a5" msgid="3484327407340865411">"ISO A5"</string> + <string name="mediasize_iso_a6" msgid="4861908487129577530">"ISO A6"</string> + <string name="mediasize_iso_a7" msgid="5890208588072936130">"ISO A7"</string> + <string name="mediasize_iso_a8" msgid="4319425041085816612">"ISO A8"</string> + <string name="mediasize_iso_a9" msgid="4882220529506432008">"ISO A9"</string> + <string name="mediasize_iso_a10" msgid="2382866026365359391">"ISO A10"</string> + <string name="mediasize_iso_b0" msgid="3651827147402009675">"ISO B0"</string> + <string name="mediasize_iso_b1" msgid="6072859628278739957">"ISO В1"</string> + <string name="mediasize_iso_b2" msgid="1348731852150380378">"ISO В2"</string> + <string name="mediasize_iso_b3" msgid="2612510181259261379">"ISO B3"</string> + <string name="mediasize_iso_b4" msgid="695151378838115434">"ISO B4"</string> + <string name="mediasize_iso_b5" msgid="4863754285582212487">"ISO B5"</string> + <string name="mediasize_iso_b6" msgid="5305816292139647241">"ISO В6"</string> + <string name="mediasize_iso_b7" msgid="531673542602786624">"ISO B7"</string> + <string name="mediasize_iso_b8" msgid="9164474595708850034">"ISO B8"</string> + <string name="mediasize_iso_b9" msgid="282102976764774160">"ISO B9"</string> + <string name="mediasize_iso_b10" msgid="4517141714407898976">"ISO B10"</string> + <string name="mediasize_iso_c0" msgid="3103521357901591100">"ISO C0"</string> + <string name="mediasize_iso_c1" msgid="1231954105985048595">"ISO C1"</string> + <string name="mediasize_iso_c2" msgid="927702816980087462">"ISO С2"</string> + <string name="mediasize_iso_c3" msgid="835154173518304159">"ISO C3"</string> + <string name="mediasize_iso_c4" msgid="5095951985108194011">"ISO C4"</string> + <string name="mediasize_iso_c5" msgid="1985397450332305739">"ISO C5"</string> + <string name="mediasize_iso_c6" msgid="8147421924174693013">"ISO C6"</string> + <string name="mediasize_iso_c7" msgid="8993994925276122950">"ISO C7"</string> + <string name="mediasize_iso_c8" msgid="6871178104139598957">"ISO С8"</string> + <string name="mediasize_iso_c9" msgid="7983532635227561362">"ISO C9"</string> + <string name="mediasize_iso_c10" msgid="5040764293406765584">"ISO C10"</string> + <string name="mediasize_na_letter" msgid="2841414839888344296">"Letter"</string> + <string name="mediasize_na_gvrnmt_letter" msgid="5295836838862962809">"Government Letter"</string> + <string name="mediasize_na_legal" msgid="8621364037680465666">"Legal"</string> + <string name="mediasize_na_junior_legal" msgid="3309324162155085904">"Junior Legal"</string> + <string name="mediasize_na_ledger" msgid="5567030340509075333">"Ledger"</string> + <string name="mediasize_na_tabloid" msgid="4571735038501661757">"Tabloid"</string> + <string name="mediasize_na_index_3x5" msgid="5182901917818625126">"Index Card 3x5"</string> + <string name="mediasize_na_index_4x6" msgid="7687620625422312396">"Index Card 4x6"</string> + <string name="mediasize_na_index_5x8" msgid="8834215284646872800">"Index Card 5x8"</string> + <string name="mediasize_na_monarch" msgid="213639906956550754">"Monarch"</string> + <string name="mediasize_na_quarto" msgid="835778493593023223">"Quarto"</string> + <string name="mediasize_na_foolscap" msgid="1573911237983677138">"Foolscap"</string> + <string name="mediasize_chinese_roc_8k" msgid="3626855847189438896">"ROC 8K"</string> + <string name="mediasize_chinese_roc_16k" msgid="9182191577022943355">"ROC 16K"</string> + <string name="mediasize_chinese_prc_1" msgid="4793232644980170500">"PRC 1"</string> + <string name="mediasize_chinese_prc_2" msgid="5404109730975720670">"PRC 2"</string> + <string name="mediasize_chinese_prc_3" msgid="1335092253339363526">"PRC 3"</string> + <string name="mediasize_chinese_prc_4" msgid="9167997800486569834">"PRC 4"</string> + <string name="mediasize_chinese_prc_5" msgid="845875168823541497">"PRC 5"</string> + <string name="mediasize_chinese_prc_6" msgid="3220325667692648789">"PRC 6"</string> + <string name="mediasize_chinese_prc_7" msgid="1776792138507038527">"PRC 7"</string> + <string name="mediasize_chinese_prc_8" msgid="1417176642687456692">"PRC 8"</string> + <string name="mediasize_chinese_prc_9" msgid="4785983473123798365">"PRC 9"</string> + <string name="mediasize_chinese_prc_10" msgid="7847982299391851899">"PRC 10"</string> + <string name="mediasize_chinese_prc_16k" msgid="262793383539980677">"PRC 16K"</string> + <string name="mediasize_chinese_om_pa_kai" msgid="5256815579447959814">"Pa Kai"</string> + <string name="mediasize_chinese_om_dai_pa_kai" msgid="7336412963441354407">"Dai Pa Kai"</string> + <string name="mediasize_chinese_om_jurro_ku_kai" msgid="6324465444100490742">"Jurro Ku Kai"</string> + <string name="mediasize_japanese_jis_b10" msgid="1787262845627694376">"JIS B10"</string> + <string name="mediasize_japanese_jis_b9" msgid="3336035783663287470">"JIS B9"</string> + <string name="mediasize_japanese_jis_b8" msgid="6195398299104345731">"JIS B8"</string> + <string name="mediasize_japanese_jis_b7" msgid="1674621886902828884">"JIS B7"</string> + <string name="mediasize_japanese_jis_b6" msgid="4170576286062657435">"JIS B6"</string> + <string name="mediasize_japanese_jis_b5" msgid="4899297958100032533">"JIS B5"</string> + <string name="mediasize_japanese_jis_b4" msgid="4213158129126666847">"JIS B4"</string> + <string name="mediasize_japanese_jis_b3" msgid="8513715307410310696">"JIS B3"</string> + <string name="mediasize_japanese_jis_b2" msgid="4777690211897131190">"JIS В2"</string> + <string name="mediasize_japanese_jis_b1" msgid="4608142385457034603">"JIS В1"</string> + <string name="mediasize_japanese_jis_b0" msgid="7587108366572243991">"JIS B0"</string> + <string name="mediasize_japanese_jis_exec" msgid="5244075432263649068">"JIS Exec"</string> + <string name="mediasize_japanese_chou4" msgid="4941652015032631361">"Chou4"</string> + <string name="mediasize_japanese_chou3" msgid="6387319169263957010">"Chou3"</string> + <string name="mediasize_japanese_chou2" msgid="1299112025415343982">"Chou2"</string> + <string name="mediasize_japanese_hagaki" msgid="8070115620644254565">"Hagaki"</string> + <string name="mediasize_japanese_oufuku" msgid="6049065587307896564">"Oufuku"</string> + <string name="mediasize_japanese_kahu" msgid="6872696027560065173">"Kahu"</string> + <string name="mediasize_japanese_kaku2" msgid="2359077233775455405">"Kaku2"</string> + <string name="mediasize_japanese_you4" msgid="2091777168747058008">"You4"</string> + <string name="mediasize_unknown_portrait" msgid="3088043641616409762">"Невядомы (кніжная арыентацыя)"</string> + <string name="mediasize_unknown_landscape" msgid="4876995327029361552">"Невядомы (альбомная арыентацыя)"</string> + <string name="write_fail_reason_cancelled" msgid="7091258378121627624">"Скасавана"</string> + <string name="write_fail_reason_cannot_write" msgid="8132505417935337724">"Памылка запісу змесціва"</string> + <string name="reason_unknown" msgid="6048913880184628119">"невядома"</string> + <string name="reason_service_unavailable" msgid="7824008732243903268">"Служба друку не ўключана"</string> + <string name="print_service_installed_title" msgid="2246317169444081628">"Усталявана служба <xliff:g id="NAME">%s</xliff:g>"</string> + <string name="print_service_installed_message" msgid="5897362931070459152">"Краніце, каб уключыць"</string> + <string name="restr_pin_enter_admin_pin" msgid="783643731895143970">"Увядзіце PIN-код адміністратара"</string> + <string name="restr_pin_enter_pin" msgid="3395953421368476103">"Увядзіце PIN-код"</string> + <string name="restr_pin_incorrect" msgid="8571512003955077924">"Няправільны"</string> + <string name="restr_pin_enter_old_pin" msgid="1462206225512910757">"Бягучы PIN-код"</string> + <string name="restr_pin_enter_new_pin" msgid="5959606691619959184">"Новы PIN-код"</string> + <string name="restr_pin_confirm_pin" msgid="8501523829633146239">"Пацвердзіць новы PIN-код"</string> + <string name="restr_pin_create_pin" msgid="8017600000263450337">"Стварыць PIN-код для абмежавання змянення"</string> + <string name="restr_pin_error_doesnt_match" msgid="2224214190906994548">"PIN-коды не супадаюць. Паўтарыце спробу."</string> + <string name="restr_pin_error_too_short" msgid="8173982756265777792">"PIN-код занадта кароткі. Павінен змяшчаць не менш за 4 лічбы."</string> + <plurals name="restr_pin_countdown" formatted="false" msgid="9061246974881224688"> + <item quantity="one">Паспрабуйце яшчэ раз праз <xliff:g id="COUNT">%d</xliff:g> секунду</item> + <item quantity="few">Паспрабуйце яшчэ раз праз <xliff:g id="COUNT">%d</xliff:g> секунды</item> + <item quantity="many">Паспрабуйце яшчэ раз праз <xliff:g id="COUNT">%d</xliff:g> секунд</item> + <item quantity="other">Паспрабуйце яшчэ раз праз <xliff:g id="COUNT">%d</xliff:g> секунды</item> + </plurals> + <string name="restr_pin_try_later" msgid="973144472490532377">"Паўтарыце спробу пазней"</string> + <string name="immersive_cling_title" msgid="8394201622932303336">"Прагляд у поўнаэкранным рэжыме"</string> + <string name="immersive_cling_description" msgid="3482371193207536040">"Для выхаду правядзіце зверху ўніз."</string> + <string name="immersive_cling_positive" msgid="5016839404568297683">"Зразумела"</string> + <string name="done_label" msgid="2093726099505892398">"Гатова"</string> + <string name="hour_picker_description" msgid="6698199186859736512">"Кругавы паўзунок гадзін"</string> + <string name="minute_picker_description" msgid="8606010966873791190">"Кругавы паўзунок хвілін"</string> + <string name="select_hours" msgid="6043079511766008245">"Выберыце гадзіны"</string> + <string name="select_minutes" msgid="3974345615920336087">"Выберыце хвіліны"</string> + <string name="select_day" msgid="7774759604701773332">"Выберыце месяц і дзень"</string> + <string name="select_year" msgid="7952052866994196170">"Выберыце год"</string> + <string name="deleted_key" msgid="7659477886625566590">"Выдалена: <xliff:g id="KEY">%1$s</xliff:g>"</string> + <string name="managed_profile_label_badge" msgid="2355652472854327647">"<xliff:g id="LABEL">%1$s</xliff:g> (праца)"</string> + <string name="lock_to_app_toast" msgid="7570091317001980053">"Каб адмацаваць гэты экран, краніце і ўтрымлівайце кнопкі «Назад» і «Агляд» адначасова."</string> + <string name="lock_to_app_toast_accessible" msgid="8239120109365070664">"Каб адмацаваць гэты экран, краніце і ўтрымлівайце кнопку «Агляд»."</string> + <string name="lock_to_app_toast_locked" msgid="9125176335701699164">"Праграма замацавана: адмацаванне на гэтай прыладзе не дапускаецца."</string> + <string name="lock_to_app_start" msgid="6643342070839862795">"Экран замацаваны"</string> + <string name="lock_to_app_exit" msgid="8598219838213787430">"Экран адмацаваны"</string> + <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Запытваць PIN-код перад адмацаваннем"</string> + <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Запытваць узор разблакіроўкі перад адмацаваннем"</string> + <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Запытваць пароль перад адмацаваннем"</string> + <string name="dock_forced_resizable" msgid="5914261505436217520">"Праграма можа не працаваць у рэжыме дзялення экрана."</string> + <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"Праграма не падтрымлівае функцыю дзялення экрана."</string> + <string name="package_installed_device_owner" msgid="8420696545959087545">"Усталявана вашым адміністратарам"</string> + <string name="package_updated_device_owner" msgid="8856631322440187071">"Абноўлена вашым адміністратарам"</string> + <string name="package_deleted_device_owner" msgid="7650577387493101353">"Выдалена вашым адміністратарам"</string> + <string name="battery_saver_description" msgid="1960431123816253034">"Каб падоўжыць час працы акумулятара, у рэжыме эканоміі зараду памяншаецца прадукцыйнасць вашай прылады, абмяжоўваецца выкарыстанне вібрацыі, службаў вызначэння месцазнаходжання і большасці задач фонавай перадачы даных. Электронная пошта, абмен паведамленнямі і іншыя праграмы, якія выкарыстоўваюць сінхранізацыю, могуць не абнаўляцца, пакуль вы іх не адкрыеце.\n\nРэжым эканоміі зараду адключаецца аўтаматычна, калі прылада зараджаецца."</string> + <plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848"> + <item quantity="one">На %1$d хвіліну (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="few">На %1$d хвіліны (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="many">На %1$d хвілін (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="other">На %1$d хвіліны (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + </plurals> + <plurals name="zen_mode_duration_minutes_summary_short" formatted="false" msgid="6830154222366042597"> + <item quantity="one">На %1$d хв (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="few">На %1$d хв (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="many">На %1$d хв (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="other">На %1$d хв (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + </plurals> + <plurals name="zen_mode_duration_hours_summary" formatted="false" msgid="8152974162096743862"> + <item quantity="one">На %1$d гадзіну (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="few">На %1$d гадзіны (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="many">На %1$d гадзін (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="other">На %1$d гадзіны (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + </plurals> + <plurals name="zen_mode_duration_hours_summary_short" formatted="false" msgid="4787552595253082371"> + <item quantity="one">На %1$d гадз (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="few">На %1$d гадз (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="many">На %1$d гадз (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + <item quantity="other">На %1$d гадз (да <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item> + </plurals> + <plurals name="zen_mode_duration_minutes" formatted="false" msgid="5127407202506485571"> + <item quantity="one">На %d хвіліну</item> + <item quantity="few">На %d хвіліны</item> + <item quantity="many">На %d хвілін</item> + <item quantity="other">На %d хвіліны</item> + </plurals> + <plurals name="zen_mode_duration_minutes_short" formatted="false" msgid="2199350154433426128"> + <item quantity="one">На %d хв</item> + <item quantity="few">На %d хв</item> + <item quantity="many">На %d хв</item> + <item quantity="other">На %d хв</item> + </plurals> + <plurals name="zen_mode_duration_hours" formatted="false" msgid="3938821308277433854"> + <item quantity="one">На %d гадзіну</item> + <item quantity="few">На %d гадзіны</item> + <item quantity="many">На %d гадзін</item> + <item quantity="other">На %d гадзіны</item> + </plurals> + <plurals name="zen_mode_duration_hours_short" formatted="false" msgid="6748277774662434217"> + <item quantity="one">На %d гадз</item> + <item quantity="few">На %d гадз</item> + <item quantity="many">На %d гадз</item> + <item quantity="other">На %d гадз</item> + </plurals> + <string name="zen_mode_until" msgid="7336308492289875088">"Да <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> + <string name="zen_mode_alarm" msgid="9128205721301330797">"Да <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> (наступны будзільнік)"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Пакуль вы не выключыце гэта"</string> + <string name="zen_mode_forever_dnd" msgid="3792132696572189081">"Пакуль вы не выключыце рэжым «Не турбаваць»"</string> + <string name="zen_mode_rule_name_combination" msgid="191109939968076477">"<xliff:g id="FIRST">%1$s</xliff:g> / <xliff:g id="REST">%2$s</xliff:g>"</string> + <string name="toolbar_collapse_description" msgid="2821479483960330739">"Згарнуць"</string> + <string name="zen_mode_feature_name" msgid="5254089399895895004">"Не турбаваць"</string> + <string name="zen_mode_downtime_feature_name" msgid="2626974636779860146">"Час бяздзеяння"</string> + <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Будні вечар"</string> + <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Выхадныя"</string> + <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Падзея"</string> + <string name="muted_by" msgid="6147073845094180001">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> адключыў(-ла) гук"</string> + <string name="system_error_wipe_data" msgid="6608165524785354962">"На вашай прыладзе ўзнікла ўнутраная праблема, і яна можа працаваць нестабільна, пакуль вы не зробіце скід да заводскіх налад."</string> + <string name="system_error_manufacturer" msgid="8086872414744210668">"На вашай прыладзе ўзнікла ўнутраная праблема. Для атрымання дадатковай інфармацыі звярніцеся да вытворцы."</string> + <string name="stk_cc_ussd_to_dial" msgid="5202342984749947872">"Запыт USSD зменены на запыт DIAL."</string> + <string name="stk_cc_ussd_to_ss" msgid="2345360594181405482">"Запыт USSD зменены на запыт SS."</string> + <string name="stk_cc_ussd_to_ussd" msgid="7466087659967191653">"Запыт USSD зменены на новы запыт USSD."</string> + <string name="stk_cc_ss_to_dial" msgid="2151304435775557162">"Запыт SS зменены на запыт DIAL."</string> + <string name="stk_cc_ss_to_ussd" msgid="3951862188105305589">"Запыт SS зменены на запыт USSD."</string> + <string name="stk_cc_ss_to_ss" msgid="5470768854991452695">"Запыт SS зменены на новы запыт SS."</string> + <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Працоўны профіль"</string> + <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Перыферыйны USB-порт Android"</string> + <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string> + <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"Перыферыйны USB-порт"</string> + <string name="floating_toolbar_open_overflow_description" msgid="4797287862999444631">"Дадатковыя параметры"</string> + <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Закрыць лішак"</string> + <string name="maximize_button_text" msgid="7543285286182446254">"Разгарнуць"</string> + <string name="close_button_text" msgid="3937902162644062866">"Закрыць"</string> + <plurals name="selected_count" formatted="false" msgid="7187339492915744615"> + <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> выбраны</item> + <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> выбрана</item> + <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> выбрана</item> + <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> выбрана</item> + </plurals> + <string name="importance_from_user" msgid="7318955817386549931">"Вы задалі важнасць гэтых апавяшчэнняў."</string> + <string name="importance_from_person" msgid="9160133597262938296">"Гэта важна, бо з гэтым звязаны пэўныя людзі."</string> + <string name="user_creation_account_exists" msgid="1942606193570143289">"Дазволіць <xliff:g id="APP">%1$s</xliff:g> стварыць новага Карыстальніка з уліковым запісам <xliff:g id="ACCOUNT">%2$s</xliff:g>?"</string> + <string name="user_creation_adding" msgid="4482658054622099197">"Дазволіць <xliff:g id="APP">%1$s</xliff:g> стварыць новага Карыстальніка з уліковым запісам <xliff:g id="ACCOUNT">%2$s</xliff:g> (Карыстальнік з гэтым уліковым запісам ужо існуе)?"</string> + <string name="language_selection_title" msgid="2680677278159281088">"Дадаць мову"</string> + <string name="country_selection_title" msgid="2954859441620215513">"Параметры рэгіёна"</string> + <string name="search_language_hint" msgid="7042102592055108574">"Увядзіце назву мовы"</string> + <string name="language_picker_section_suggested" msgid="8414489646861640885">"Прапанаваныя"</string> + <string name="language_picker_section_all" msgid="3097279199511617537">"Усе мовы"</string> + <string name="locale_search_menu" msgid="2560710726687249178">"Шукаць"</string> + <string name="work_mode_off_title" msgid="8954725060677558855">"Рэжым працы АДКЛЮЧАНЫ"</string> + <string name="work_mode_off_message" msgid="3286169091278094476">"Дазволіць функцыянаванне працоўнага профілю, у тым ліку праграм, фонавай сінхранізацыі і звязаных з імі функцый."</string> + <string name="work_mode_turn_on" msgid="2062544985670564875">"Уключыць"</string> + <string name="new_sms_notification_title" msgid="8442817549127555977">"У вас ёсць новыя паведамленні"</string> + <string name="new_sms_notification_content" msgid="7002938807812083463">"Праглядзець праз праграму для SMS"</string> + <string name="user_encrypted_title" msgid="9054897468831672082">"Частка функц. можа быць абмеж."</string> + <string name="user_encrypted_message" msgid="4923292604515744267">"Краніце, каб разблакіраваць"</string> + <string name="user_encrypted_detail" msgid="5708447464349420392">"Карыст. даныя заблакіраваны"</string> + <string name="profile_encrypted_detail" msgid="3700965619978314974">"Рабочы профіль заблакіраваны"</string> + <string name="profile_encrypted_message" msgid="6964994232310195874">"Кран., каб разбл. раб. профіль"</string> + <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Падлучана да <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string> + <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Краніце для прагляду файлаў"</string> + <string name="pin_target" msgid="3052256031352291362">"Замацаваць"</string> + <string name="unpin_target" msgid="3556545602439143442">"Адмацаваць"</string> + <string name="app_info" msgid="6856026610594615344">"Інфармацыя пра праграму"</string> + <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Выканайце скід да заводскіх налад, каб выкарыстоўваць гэту прыладу без абмежаванняў"</string> + <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Краніце, каб даведацца больш."</string> +</resources> diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml index 40e9572c02b9..62d0d3725abc 100644 --- a/core/res/res/values-bg/strings.xml +++ b/core/res/res/values-bg/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Редактиране чрез %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Споделяне чрез"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Споделяне чрез %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Изпращане посредством"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Изпращане посредством %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Избиране на начално приложение"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Използване на %1$s като начално приложение"</string> <string name="alwaysUse" msgid="4583018368000610438">"Използване по подразбиране за това действие."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"СПОДЕЛЯНЕ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ОТХВЪРЛЯНЕ"</string> <string name="select_input_method" msgid="8547250819326693584">"Промяна на клавиатурата"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Избиране на клавиатури"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Други клавиатури"</string> <string name="show_ime" msgid="2506087537466597099">"Показване на екрана, докато физическата клавиатура е активна"</string> <string name="hardware" msgid="194658061510127999">"Показване на вирт. клавиатура"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Избиране на клавиатурна подредба"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Още опции"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"„%1$s“ – %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"„%1$s“, „%2$s“ – %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Вътрешно хранилище"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD карта"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"SD карта от <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB устройство"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Освобождаване"</string> <string name="app_info" msgid="6856026610594615344">"Информация за приложението"</string> <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Възстановете фабричните настройки на това устройство, за да го използвате без ограничения"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Докоснете, за да научите повече."</string> </resources> diff --git a/core/res/res/values-bn-rBD/strings.xml b/core/res/res/values-bn-rBD/strings.xml index 92bd3e7d82d1..cbe8ecaa9dd6 100644 --- a/core/res/res/values-bn-rBD/strings.xml +++ b/core/res/res/values-bn-rBD/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s দিয়ে সম্পাদনা করুন"</string> <string name="whichSendApplication" msgid="6902512414057341668">"এর সাথে শেয়ার করুন"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s এর সাথে শেয়ার করুন"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"এটি ব্যবহার করে পাঠান"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s ব্যবহার করে পাঠান"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"একটি হোম অ্যাপ্লিকেশন নির্বাচন করুন"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"হোম হিসাবে %1$s ব্যবহার করুন"</string> <string name="alwaysUse" msgid="4583018368000610438">"এই ক্রিয়াটির জন্য এটিকে ডিফল্টরুপে ব্যবহার করুন৷"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"শেয়ার করুন"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"অস্বীকার করুন"</string> <string name="select_input_method" msgid="8547250819326693584">"কীবোর্ড পরিবর্তন করুন"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"কীবোর্ড চয়ন করুন"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"অন্যান্য কীবোর্ড"</string> <string name="show_ime" msgid="2506087537466597099">"ফিজিক্যাল কীবোর্ড সক্রিয় থাকার সময় এটিকে স্ক্রীনে রাখুন"</string> <string name="hardware" msgid="194658061510127999">"ভার্চুয়াল কীবোর্ড দেখান"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"কীবোর্ডের লেআউট নির্বাচন করুন"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"আরো বিকল্প"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"অভ্যন্তরীণ সঞ্চয়স্থান"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD কার্ড"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD কার্ড"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ড্রাইভ"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"আনপিন করুন"</string> <string name="app_info" msgid="6856026610594615344">"অ্যাপ্লিকেশানের তথ্য"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"কোনো বিধিনিষেধ ছাড়াই এই ডিভাইসটিকে ব্যবহার করতে ফ্যাক্টরি রিসেট করুন"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"আরো জানতে স্পর্শ করুন৷"</string> </resources> diff --git a/core/res/res/values-bs-rBA-watch/strings.xml b/core/res/res/values-bs-rBA-watch/strings.xml new file mode 100644 index 000000000000..51d41209acbc --- /dev/null +++ b/core/res/res/values-bs-rBA-watch/strings.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* //device/apps/common/assets/res/any/strings.xml +** +** Copyright 2015, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="android_upgrading_apk" msgid="1090732262010398759">"<xliff:g id="NUMBER_0">%1$d</xliff:g>. aplikac. od <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> + <string name="permgrouplab_sensors" msgid="202675452368612754">"Senzori"</string> +</resources> diff --git a/core/res/res/values-bs-rBA/strings.xml b/core/res/res/values-bs-rBA/strings.xml index ca7a80aed734..6e7d8d2a2320 100644 --- a/core/res/res/values-bs-rBA/strings.xml +++ b/core/res/res/values-bs-rBA/strings.xml @@ -905,6 +905,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Uredi koristeći %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Podijeli koristeći"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Podijeli koristeći %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Pošalji koristeći"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Pošalji koristeći %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Odaberi glavnu aplikaciju"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Koristi %1$s kao glavnu aplikaciju"</string> <string name="alwaysUse" msgid="4583018368000610438">"Koristiti kao zadanu rezoluciju za ovu akciju."</string> @@ -1066,7 +1068,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"PODIJELI"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ODBACI"</string> <string name="select_input_method" msgid="8547250819326693584">"Promijeni tastaturu"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Odaberite tastature"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Ostale tastature"</string> <string name="show_ime" msgid="2506087537466597099">"Prikaži na ekranu dok je fizička tastatura aktivna"</string> <string name="hardware" msgid="194658061510127999">"Prikaži virtualnu tastaturu"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Odaberite raspored tastature"</string> @@ -1231,7 +1233,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Više opcija"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Interna pohrana"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD kartica"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD kartica"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB disk"</string> @@ -1581,7 +1584,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Otkači"</string> <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Vratite uređaj na fabričke postavke kako biste ga koristili bez ograničenja"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Dodirnite da saznate više."</string> </resources> diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml index a73741204300..9044a1ae4faf 100644 --- a/core/res/res/values-ca/strings.xml +++ b/core/res/res/values-ca/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edita amb %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Comparteix amb"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Comparteix amb %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Envia mitjançant"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Envia mitjançant %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Seleccionar una aplicació Inici"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Utilitzar %1$s com a Inici"</string> <string name="alwaysUse" msgid="4583018368000610438">"Utilitza-ho de manera predeterminada per a aquesta acció."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"COMPARTEIX"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"REBUTJA"</string> <string name="select_input_method" msgid="8547250819326693584">"Canvia el teclat"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Tria els teclats"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Altres teclats"</string> <string name="show_ime" msgid="2506087537466597099">"El deixa a la pantalla mentre el teclat físic està actiu"</string> <string name="hardware" msgid="194658061510127999">"Mostra el teclat virtual"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Selecciona una disposició de teclat"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Més opcions"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Emmagatzematge intern"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Targeta SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Targeta SD de: <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Unitat USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"No fixis"</string> <string name="app_info" msgid="6856026610594615344">"Informació de l\'aplicació"</string> <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Restableix les dades de fàbrica del dispositiu per utilitzar-lo sense restriccions"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toca per obtenir més informació."</string> </resources> diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 5b6a213b5101..237d44d3645e 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -911,6 +911,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Upravit v aplikaci %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Sdílet v aplikaci"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Sdílet v aplikaci %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Odeslat pomocí aplikace"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Odeslat pomocí aplikace %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Výběr aplikace na plochu"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Jako plochu používat aplikaci %1$s."</string> <string name="alwaysUse" msgid="4583018368000610438">"Použít jako výchozí nastavení pro tuto činnost."</string> @@ -1074,7 +1076,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"SDÍLET"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ODMÍTNOUT"</string> <string name="select_input_method" msgid="8547250819326693584">"Změna klávesnice"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Vybrat klávesnici"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Další klávesnice"</string> <string name="show_ime" msgid="2506087537466597099">"Ponechat na obrazovce, když je aktivní fyzická klávesnice"</string> <string name="hardware" msgid="194658061510127999">"Zobrazit virtuální klávesnici"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Výběr rozložení klávesnice"</string> @@ -1240,7 +1242,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Další možnosti"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s – %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s – %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Interní úložiště"</string> + <string name="storage_internal" msgid="3570990907910199483">"Interní sdílené úložiště"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Karta SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"SD karta <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Jednotka USB"</string> @@ -1600,7 +1602,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Odepnout"</string> <string name="app_info" msgid="6856026610594615344">"Informace o aplikaci"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Chcete-li toto zařízení používat bez omezení, obnovte jej do továrního nastavení"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Klepnutím zobrazíte další informace."</string> </resources> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index 06861e7568de..8875eade3315 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Rediger med %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Del med"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Del med %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Send via"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Send via %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Vælg en startapp"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Brug %1$s som startapp"</string> <string name="alwaysUse" msgid="4583018368000610438">"Brug som standard til denne handling."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"DEL"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"AFVIS"</string> <string name="select_input_method" msgid="8547250819326693584">"Skift tastatur"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Vælg tastaturer"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Andre tastaturer"</string> <string name="show_ime" msgid="2506087537466597099">"Behold den på skærmen, mens det fysiske tastatur er aktivt"</string> <string name="hardware" msgid="194658061510127999">"Vis virtuelt tastatur"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Vælg tastaturlayout"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Flere valgmuligheder"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Intern lagerplads"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kort"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"SD-kort fra <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB-drev"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Frigør"</string> <string name="app_info" msgid="6856026610594615344">"Oplysninger om appen"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Gendan fabriksdataene på enheden for at bruge den uden begrænsninger"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Tryk for at få flere oplysninger."</string> </resources> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 30188b52beb5..a1183e9cfcc5 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Mit %1$s bearbeiten"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Freigeben über"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Für %1$s freigeben"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Senden via"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Senden via %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Start-App auswählen"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s als Start-App verwenden"</string> <string name="alwaysUse" msgid="4583018368000610438">"Immer für diese Aktion verwenden"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"TEILEN"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ABLEHNEN"</string> <string name="select_input_method" msgid="8547250819326693584">"Tastatur ändern"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Tastatur auswählen"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Weitere Tastaturen"</string> <string name="show_ime" msgid="2506087537466597099">"Auf dem Display einblenden, wenn die physische Tastatur aktiv ist"</string> <string name="hardware" msgid="194658061510127999">"Virtuelle Tastatur einblenden"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Tastaturlayout auswählen"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Weitere Optionen"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s. %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s. %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Interner Speicher"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD-Karte"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"SD-Karte von <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB-Speichergerät"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Markierung entfernen"</string> <string name="app_info" msgid="6856026610594615344">"App-Informationen"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Gerät auf Werkseinstellungen zurücksetzen, um es ohne Einschränkungen zu nutzen"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Für weitere Informationen tippen."</string> </resources> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 10914950d81a..4e5f8fb4a80d 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Επεξεργασία με %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Κοινή χρήση με"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Κοινή χρήση με %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Αποστολή μέσω"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Αποστολή μέσω %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Επιλέξτε μια εφαρμογή Αρχικής σελίδας"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Χρήση %1$s ως Αρχικής σελίδας"</string> <string name="alwaysUse" msgid="4583018368000610438">"Χρήση από προεπιλογή για αυτήν την ενέργεια."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ΚΟΙΝΟΠΟΙΗΣΗ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ΑΠΟΡΡΙΨΗ"</string> <string name="select_input_method" msgid="8547250819326693584">"Αλλαγή πληκτρολογίου"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Επιλογή πληκτρολογίων"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Άλλα πληκτρολόγια"</string> <string name="show_ime" msgid="2506087537466597099">"Να παραμένει στην οθόνη όταν είναι ενεργό το φυσικό πληκτρολόγιο"</string> <string name="hardware" msgid="194658061510127999">"Εμφάνιση εικονικού πληκτρολ."</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Επιλογή διάταξης πληκτρολογίου"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Περισσότερες επιλογές"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Εσωτερικός αποθηκευτικός χώρος"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Κάρτα SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Κάρτα SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Μονάδα USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Ξεκαρφίτσωμα"</string> <string name="app_info" msgid="6856026610594615344">"Πληροφορίες εφαρμογής"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Επαναφέρετε τις εργοστασιακές ρυθμίσεις για να χρησιμοποιήσετε αυτήν τη συσκευή χωρίς περιορισμούς"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Αγγίξτε για να μάθετε περισσότερα."</string> </resources> diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml index 58d45baae6eb..335f1f0c8d34 100644 --- a/core/res/res/values-en-rAU/strings.xml +++ b/core/res/res/values-en-rAU/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit with %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Send using"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Send using %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Select a Home app"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Use %1$s as Home"</string> <string name="alwaysUse" msgid="4583018368000610438">"Use by default for this action."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"SHARE"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"DECLINE"</string> <string name="select_input_method" msgid="8547250819326693584">"Change keyboard"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Choose keyboards"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Other keyboards"</string> <string name="show_ime" msgid="2506087537466597099">"Keep it on screen while physical keyboard is active"</string> <string name="hardware" msgid="194658061510127999">"Show virtual keyboard"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Select keyboard layout"</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"More options"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Internal storage"</string> + <string name="storage_internal" msgid="3570990907910199483">"Internal shared storage"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD card"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD card"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB drive"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Unpin"</string> <string name="app_info" msgid="6856026610594615344">"App info"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Factory reset to use this device without restrictions"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Touch to find out more."</string> </resources> diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml index 58d45baae6eb..335f1f0c8d34 100644 --- a/core/res/res/values-en-rGB/strings.xml +++ b/core/res/res/values-en-rGB/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit with %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Send using"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Send using %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Select a Home app"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Use %1$s as Home"</string> <string name="alwaysUse" msgid="4583018368000610438">"Use by default for this action."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"SHARE"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"DECLINE"</string> <string name="select_input_method" msgid="8547250819326693584">"Change keyboard"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Choose keyboards"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Other keyboards"</string> <string name="show_ime" msgid="2506087537466597099">"Keep it on screen while physical keyboard is active"</string> <string name="hardware" msgid="194658061510127999">"Show virtual keyboard"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Select keyboard layout"</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"More options"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Internal storage"</string> + <string name="storage_internal" msgid="3570990907910199483">"Internal shared storage"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD card"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD card"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB drive"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Unpin"</string> <string name="app_info" msgid="6856026610594615344">"App info"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Factory reset to use this device without restrictions"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Touch to find out more."</string> </resources> diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml index 58d45baae6eb..335f1f0c8d34 100644 --- a/core/res/res/values-en-rIN/strings.xml +++ b/core/res/res/values-en-rIN/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit with %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Send using"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Send using %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Select a Home app"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Use %1$s as Home"</string> <string name="alwaysUse" msgid="4583018368000610438">"Use by default for this action."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"SHARE"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"DECLINE"</string> <string name="select_input_method" msgid="8547250819326693584">"Change keyboard"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Choose keyboards"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Other keyboards"</string> <string name="show_ime" msgid="2506087537466597099">"Keep it on screen while physical keyboard is active"</string> <string name="hardware" msgid="194658061510127999">"Show virtual keyboard"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Select keyboard layout"</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"More options"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Internal storage"</string> + <string name="storage_internal" msgid="3570990907910199483">"Internal shared storage"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD card"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD card"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB drive"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Unpin"</string> <string name="app_info" msgid="6856026610594615344">"App info"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Factory reset to use this device without restrictions"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Touch to find out more."</string> </resources> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 225116fb44dd..2484fe538740 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar con %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Compartir con"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Compartir con %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Enviar con"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Enviar con %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Seleccionar una aplicación de la pantalla principal"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Utilizar %1$s como aplicación de la pantalla principal"</string> <string name="alwaysUse" msgid="4583018368000610438">"Utilizar de manera predeterminada en esta acción."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"COMPARTIR"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"RECHAZAR"</string> <string name="select_input_method" msgid="8547250819326693584">"Cambiar el teclado"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Seleccionar teclados"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Otros teclados"</string> <string name="show_ime" msgid="2506087537466597099">"Mantener en la pantalla cuando el teclado físico está activo"</string> <string name="hardware" msgid="194658061510127999">"Mostrar teclado virtual"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Selecciona un diseño de teclado"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Más opciones"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Almacenamiento interno"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Tarjeta SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Tarjeta SD de <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Unidad USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"No fijar"</string> <string name="app_info" msgid="6856026610594615344">"Información de la app"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Restablece la configuración de fábrica para usar este dispositivo sin restricciones"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toca para obtener más información."</string> </resources> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 5ce171172b97..6521ccada950 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar con %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Compartir con"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Compartir con %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Enviar con"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Enviar con %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Selecciona una aplicación de inicio"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Usar %1$s como aplicación de inicio"</string> <string name="alwaysUse" msgid="4583018368000610438">"Usar siempre para esta acción"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"COMPARTIR"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"RECHAZAR"</string> <string name="select_input_method" msgid="8547250819326693584">"Cambiar teclado"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Elegir teclados"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Otros teclados"</string> <string name="show_ime" msgid="2506087537466597099">"Debe seguir en pantalla mientras el teclado físico esté activo"</string> <string name="hardware" msgid="194658061510127999">"Mostrar teclado virtual"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Selecciona un diseño de teclado"</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Más opciones"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Almacenamiento interno"</string> + <string name="storage_internal" msgid="3570990907910199483">"Almacenamiento interno compartido"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Tarjeta SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Tarjeta SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Unidad USB"</string> @@ -1506,7 +1508,7 @@ </plurals> <string name="zen_mode_until" msgid="7336308492289875088">"Hasta las <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string> <string name="zen_mode_alarm" msgid="9128205721301330797">"Hasta las <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> (próxima alarma)"</string> - <string name="zen_mode_forever" msgid="7420011936770086993">"Hasta apagar el dispositivo"</string> + <string name="zen_mode_forever" msgid="7420011936770086993">"Hasta desactivar esta opción"</string> <string name="zen_mode_forever_dnd" msgid="3792132696572189081">"Hasta que desactives la opción No molestar"</string> <string name="zen_mode_rule_name_combination" msgid="191109939968076477">"<xliff:g id="FIRST">%1$s</xliff:g>/<xliff:g id="REST">%2$s</xliff:g>"</string> <string name="toolbar_collapse_description" msgid="2821479483960330739">"Contraer"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"No fijar"</string> <string name="app_info" msgid="6856026610594615344">"Información de la aplicación"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Restablece los datos de fábrica para usar este dispositivo sin restricciones"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toca para obtener más información."</string> </resources> diff --git a/core/res/res/values-et-rEE/strings.xml b/core/res/res/values-et-rEE/strings.xml index 3ce50d986816..3905a558238a 100644 --- a/core/res/res/values-et-rEE/strings.xml +++ b/core/res/res/values-et-rEE/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Muutmine rakendusega %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Jagamine:"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Jagamine rakendusega %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Saada rakendusega"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Saada rakendusega %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Avaekraani rakenduse valimine"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Rakenduse %1$s kasutamine avaekraanina"</string> <string name="alwaysUse" msgid="4583018368000610438">"Kasuta vaikimisi selleks toiminguks."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"JAGA"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"KEELDU"</string> <string name="select_input_method" msgid="8547250819326693584">"Klaviatuuri muutmine"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Vali klaviatuurid"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Muud klaviatuurid"</string> <string name="show_ime" msgid="2506087537466597099">"Hoia seda ekraanil, kui füüsiline klaviatuur on aktiivne"</string> <string name="hardware" msgid="194658061510127999">"Virtuaalse klaviatuuri kuvam."</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Klaviatuuri paigutuse valimine"</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Rohkem valikuid"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Sisemine salvestusruum"</string> + <string name="storage_internal" msgid="3570990907910199483">"Sisemine jagatud mäluruum"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kaart"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Tootja <xliff:g id="MANUFACTURER">%s</xliff:g> SD-kaart"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB-ketas"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Vabasta"</string> <string name="app_info" msgid="6856026610594615344">"Rakenduse teave"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Seadme piiranguteta kasutamiseks lähtestage see tehaseandmetele"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Lisateabe saamiseks puudutage."</string> </resources> diff --git a/core/res/res/values-eu-rES/strings.xml b/core/res/res/values-eu-rES/strings.xml index 6c41c2c0538e..ed5db6c36a79 100644 --- a/core/res/res/values-eu-rES/strings.xml +++ b/core/res/res/values-eu-rES/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editatu %1$s aplikazioarekin"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Partekatu hauen bidez:"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Partekatu %1$s aplikazioarekin"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Bidali honen bidez:"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Bidali %1$s bidez"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Hautatu hasierako aplikazioa"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Erabili %1$s hasierako aplikazio gisa"</string> <string name="alwaysUse" msgid="4583018368000610438">"Erabili modu lehenetsian ekintza honetarako."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"PARTEKATU"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"BAZTERTU"</string> <string name="select_input_method" msgid="8547250819326693584">"Aldatu teklatua"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Aukeratu teklatuak"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Beste teklatu batzuk"</string> <string name="show_ime" msgid="2506087537466597099">"Erakutsi pantailan teklatu fisikoa aktibo dagoen bitartean"</string> <string name="hardware" msgid="194658061510127999">"Erakutsi teklatu birtuala"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Hautatu teklatuaren diseinua"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Aukera gehiago"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Barneko memoria"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD txartela"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD txartela"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB unitatea"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Kendu aingura"</string> <string name="app_info" msgid="6856026610594615344">"Aplikazioari buruzko informazioa"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Berrezarri jatorrizko ezarpenak gailua murriztapenik gabe erabili ahal izateko"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Sakatu informazio gehiago lortzeko."</string> </resources> diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml index aba5e08a6a93..b1430389f97b 100644 --- a/core/res/res/values-fa/strings.xml +++ b/core/res/res/values-fa/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"ویرایش با %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"اشتراکگذاری با"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"اشتراکگذاری با %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"ارسال با استفاده از"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"ارسال با استفاده از %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"انتخاب یک برنامه صفحه اصلی"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"استفاده از %1$s به عنوان برنامه صفحه اصلی"</string> <string name="alwaysUse" msgid="4583018368000610438">"استفاده به صورت پیشفرض برای این عملکرد."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"اشتراکگذاری"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"نپذیرفتن"</string> <string name="select_input_method" msgid="8547250819326693584">"تغییر صفحهکلید"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"انتخاب صفحهکلیدها"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"صفحهکلیدهای دیگر"</string> <string name="show_ime" msgid="2506087537466597099">"وقتی صفحهکلید فیزیکی فعال است این ویرایشگر را روی صفحه نگهمیدارد"</string> <string name="hardware" msgid="194658061510127999">"نمایش صفحهکلید مجازی"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"انتخاب طرحبندی صفحهکلید"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"سایر گزینهها"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"حافظهٔ داخلی"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"کارت SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"کارت SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"درایو USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"برداشتن پین"</string> <string name="app_info" msgid="6856026610594615344">"اطلاعات برنامه"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"برای استفاده بدون محدودیت از این دستگاه، بازنشانی کارخانهای انجام دهید"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"برای یادگیری بیشتر لمس کنید."</string> </resources> diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml index e52d8707c6c2..8bb613e2170b 100644 --- a/core/res/res/values-fi/strings.xml +++ b/core/res/res/values-fi/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Muokkaa sovelluksessa %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Jaa sovelluksessa"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Jaa sovelluksessa %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Lähetä sovelluksella"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Lähetä sovelluksella %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Valitse aloitusruutusovellus"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Käytä aloitusruutuna: %1$s"</string> <string name="alwaysUse" msgid="4583018368000610438">"Käytä oletuksena tälle toiminnolle."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"JAA"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"HYLKÄÄ"</string> <string name="select_input_method" msgid="8547250819326693584">"Vaihda näppäimistö"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Valitse näppäimistöt"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Muut näppäimistöt"</string> <string name="show_ime" msgid="2506087537466597099">"Pidä näytöllä, kun fyysinen näppäimistö on aktiivinen."</string> <string name="hardware" msgid="194658061510127999">"Näytä virtuaalinen näppäimistö"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Valitse näppäimistöasettelu"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Lisää asetuksia"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Sisäinen tallennustila"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kortti"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"SD-kortti: <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB-asema"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Irrota"</string> <string name="app_info" msgid="6856026610594615344">"Sovelluksen tiedot"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Palauta tehdasasetukset, jotta voit käyttää tätä laitetta rajoituksitta"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Lue lisätietoja koskettamalla."</string> </resources> diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml index acfd0a656572..3375e1854e9a 100644 --- a/core/res/res/values-fr-rCA/strings.xml +++ b/core/res/res/values-fr-rCA/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Modifier avec %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Partager"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Partager avec %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Envoyer avec"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Envoyer avec %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Sélectionner une application pour l\'écran d\'accueil"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Utiliser %1$s comme écran d\'accueil"</string> <string name="alwaysUse" msgid="4583018368000610438">"Utiliser cette application par défaut pour cette action"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"PARTAGER"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"REFUSER"</string> <string name="select_input_method" msgid="8547250819326693584">"Changer de clavier"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Choisir les claviers"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Autres claviers"</string> <string name="show_ime" msgid="2506087537466597099">"Afficher lorsque le clavier physique est activé"</string> <string name="hardware" msgid="194658061510127999">"Afficher le clavier virtuel"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Sélectionnez la disposition du clavier"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Plus d\'options"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Mémoire de stockage interne"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Carte SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Carte mémoire SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Clé USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Annuler l\'épinglage"</string> <string name="app_info" msgid="6856026610594615344">"Détails de l\'application"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Rétablissez la configuration d\'usine de cet appareil pour l\'utiliser sans restrictions"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Touchez ici pour en savoir plus."</string> </resources> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index d3bb5d0405fa..741d0e1bea33 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Modifier avec %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Partager avec"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Partager avec %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Envoyer avec"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Envoyer avec %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Sélectionner une application de l\'écran d\'accueil"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Utiliser %1$s comme écran d\'accueil"</string> <string name="alwaysUse" msgid="4583018368000610438">"Utiliser cette application par défaut pour cette action"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"PARTAGER"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"REFUSER"</string> <string name="select_input_method" msgid="8547250819326693584">"Changer de clavier"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Sélectionner des claviers"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Autres claviers"</string> <string name="show_ime" msgid="2506087537466597099">"Afficher lorsque le clavier physique est activé"</string> <string name="hardware" msgid="194658061510127999">"Afficher le clavier virtuel"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Sélectionnez la disposition du clavier"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Plus d\'options"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Mémoire de stockage interne"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Carte SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Carte SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Clé USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Retirer"</string> <string name="app_info" msgid="6856026610594615344">"Infos sur l\'appli"</string> <string name="negative_duration" msgid="5688706061127375131">"− <xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Rétablir la configuration d\'usine pour utiliser cet appareil sans restrictions"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Appuyez ici pour en savoir plus."</string> </resources> diff --git a/core/res/res/values-gl-rES/strings.xml b/core/res/res/values-gl-rES/strings.xml index 6a2b7f3454d2..be83dabcf7b0 100644 --- a/core/res/res/values-gl-rES/strings.xml +++ b/core/res/res/values-gl-rES/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar con %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Compartir con"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Compartir con %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Enviar a través de"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Enviar a través de %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Selecciona unha aplicación de Inicio"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Utiliza %1$s como aplicación de Inicio"</string> <string name="alwaysUse" msgid="4583018368000610438">"Usar de forma predeterminada para esta acción."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"COMPARTIR"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ANULAR"</string> <string name="select_input_method" msgid="8547250819326693584">"Cambiar teclado"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Seleccionar teclados"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Outros teclados"</string> <string name="show_ime" msgid="2506087537466597099">"Manteno na pantalla mentres o teclado físico estea activo"</string> <string name="hardware" msgid="194658061510127999">"Mostrar teclado virtual"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Seleccionar deseño de teclado"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Máis opcións"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Almacenamento interno"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Tarxeta SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Tarxeta SD de <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Unidade USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Soltar"</string> <string name="app_info" msgid="6856026610594615344">"Información da aplicación"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Restablecemento dos valores de fábrica para usar este dispositivo sen restricións"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toca para acceder a máis información"</string> </resources> diff --git a/core/res/res/values-gu-rIN/strings.xml b/core/res/res/values-gu-rIN/strings.xml index 7595a88a8dfc..4389cffa9141 100644 --- a/core/res/res/values-gu-rIN/strings.xml +++ b/core/res/res/values-gu-rIN/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s સાથે સંપાદિત કરો"</string> <string name="whichSendApplication" msgid="6902512414057341668">"આની સાથે શેર કરો"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s સાથે શેર કરો"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"આનો ઉપયોગ કરીને મોકલો"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s નો ઉપયોગ કરીને મોકલો"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"હોમ એપ્લિકેશન પસંદ કરો"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"હોમ તરીકે %1$s નો ઉપયોગ કરો"</string> <string name="alwaysUse" msgid="4583018368000610438">"આ ક્રિયા માટે ડિફોલ્ટ તરીકે ઉપયોગમાં લો."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"શેર કરો"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"નકારો"</string> <string name="select_input_method" msgid="8547250819326693584">"કીબોર્ડ બદલો"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"કીબોર્ડ્સ પસંદ કરો"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"અન્ય કીબોર્ડ્સ"</string> <string name="show_ime" msgid="2506087537466597099">"જ્યારે ભૌતિક કીબોર્ડ સક્રિય હોય ત્યારે તેને સ્ક્રીન પર રાખો"</string> <string name="hardware" msgid="194658061510127999">"વર્ચ્યુઅલ કીબોર્ડ બતાવો"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"કીબોર્ડ લેઆઉટ પસંદ કરો."</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"વધુ વિકલ્પો"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"આંતરિક સંગ્રહ"</string> + <string name="storage_internal" msgid="3570990907910199483">"આંતરિક શેર કરેલો સ્ટોરેજ"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD કાર્ડ"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD કાર્ડ"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ડ્રાઇવ"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"અનપિન કરો"</string> <string name="app_info" msgid="6856026610594615344">"ઍપ્લિકેશન માહિતી"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"આ ઉપકરણનો પ્રતિબંધો વિના ઉપયોગ કરવા માટે ફેક્ટરી રીસેટ કરો"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"વધુ જાણવા માટે ટચ કરો."</string> </resources> diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml index 3c33b38a0af1..18c40073f167 100644 --- a/core/res/res/values-hi/strings.xml +++ b/core/res/res/values-hi/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s से संपादित करें"</string> <string name="whichSendApplication" msgid="6902512414057341668">"इससे साझा करें"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s से साझा करें"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"इसका उपयोग करके भेजें"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s का उपयोग करके भेजें"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"होम ऐप्स चुनें"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"होम के रूप में %1$s का उपयोग करें"</string> <string name="alwaysUse" msgid="4583018368000610438">"इस क्रिया के लिए डिफ़ॉल्ट रूप से उपयोग करें."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"साझा करें"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"अस्वीकार करें"</string> <string name="select_input_method" msgid="8547250819326693584">"कीबोर्ड बदलें"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"कीबोर्ड चुनें"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"अन्य कीबोर्ड"</string> <string name="show_ime" msgid="2506087537466597099">"भौतिक कीबोर्ड के सक्रिय होने के दौरान इसे स्क्रीन पर बनाए रखें"</string> <string name="hardware" msgid="194658061510127999">"वर्चुअल कीबोर्ड दिखाएं"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"कीबोर्ड लेआउट को चुनें"</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"अधिक विकल्प"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"मोबाइल मेमोरी"</string> + <string name="storage_internal" msgid="3570990907910199483">"आंतरिक साझा मेमोरी"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD कार्ड"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD कार्ड"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB डिस्क"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"अनपिन करें"</string> <string name="app_info" msgid="6856026610594615344">"ऐप की जानकारी"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"इस डिवाइस को प्रतिबंधों के बिना उपयोग करने के लिए फ़ैक्टरी रीसेट करें"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"अधिक जानने के लिए स्पर्श करें."</string> </resources> diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml index 862ee6050b93..2ce73f433d1d 100644 --- a/core/res/res/values-hr/strings.xml +++ b/core/res/res/values-hr/strings.xml @@ -905,6 +905,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Uređivanje pomoću aplikacije %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Dijeljenje pomoću aplikacije"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Dijeljenje pomoću aplikacije %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Pošalji aplikacijom"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Slanje aplikacijom %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Odaberite početnu aplikaciju"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Upotrijebite %1$s kao početnu aplikaciju"</string> <string name="alwaysUse" msgid="4583018368000610438">"Koristi se kao zadana postavka za ovu lokaciju."</string> @@ -1066,7 +1068,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"DIJELI"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ODBIJ"</string> <string name="select_input_method" msgid="8547250819326693584">"Promjena tipkovnice"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Odaberi tipkovnice"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Ostale tipkovnice"</string> <string name="show_ime" msgid="2506087537466597099">"Zadržava se na zaslonu dok je fizička tipkovnica aktivna"</string> <string name="hardware" msgid="194658061510127999">"Prikaži virtualnu tipkovnicu"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Odaberite izgled tipkovnice"</string> @@ -1231,7 +1233,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Više opcija"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Interna pohrana"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD kartica"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD kartica"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB pogon"</string> @@ -1581,7 +1584,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Otkvači"</string> <string name="app_info" msgid="6856026610594615344">"Informacije o aplikaciji"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Uređaj je vraćen na tvorničke postavke da biste ga mogli upotrebljavati bez ograničenja"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Dodirnite da biste saznali više."</string> </resources> diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml index d6114fa58fe7..bf23b71b1c17 100644 --- a/core/res/res/values-hu/strings.xml +++ b/core/res/res/values-hu/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Szerkesztés a következővel: %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Megosztás a következővel:"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Megosztás a következővel: %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Küldés a következővel:"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Küldés a következővel: %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Válasszon kezdőalkalmazást"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"A(z) %1$s használata kezdőalkalmazásként"</string> <string name="alwaysUse" msgid="4583018368000610438">"Ez legyen az alapértelmezett program ehhez a művelethez."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"MEGOSZTÁS"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ELUTASÍTÁS"</string> <string name="select_input_method" msgid="8547250819326693584">"Billentyűzet megváltoztatása"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Billentyűzetek kiválasztása"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Más billentyűzetek"</string> <string name="show_ime" msgid="2506087537466597099">"Maradjon a képernyőn, amíg a billentyűzet aktív"</string> <string name="hardware" msgid="194658061510127999">"Virtuális billentyűzet"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Válasszon billentyűzetkiosztást"</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"További lehetőségek"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Belső tárhely"</string> + <string name="storage_internal" msgid="3570990907910199483">"Belső közös tárhely"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kártya"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD-kártya"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB-meghajtó"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Feloldás"</string> <string name="app_info" msgid="6856026610594615344">"Alkalmazásinformáció"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Állítsa vissza a gyári beállításokat az eszköz korlátozások nélküli használata érdekében"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Érintse meg a további információkért."</string> </resources> diff --git a/core/res/res/values-hy-rAM/strings.xml b/core/res/res/values-hy-rAM/strings.xml index 0b2fe576cb43..8921e88dba10 100644 --- a/core/res/res/values-hy-rAM/strings.xml +++ b/core/res/res/values-hy-rAM/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Խմբագրել հետևյալով՝ %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Տարածել"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Տարածել ըստ %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Ուղարկել այս հավելվածով"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Ուղարկել %1$s հավելվածով"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Ընտրեք Հիմնական հավելվածը"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Օգտագործել %1$s-ը՝ որպես Հիմնական"</string> <string name="alwaysUse" msgid="4583018368000610438">"Օգտագործել լռելյայն այս գործողության համար:"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ՏՐԱՄԱԴՐԵԼ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ՄԵՐԺԵԼ"</string> <string name="select_input_method" msgid="8547250819326693584">"Փոխել ստեղնաշարը"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Ընտրել ստեղնաշար"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Այլ ստեղնաշարեր"</string> <string name="show_ime" msgid="2506087537466597099">"Պահել էկրանին մինչդեռ ֆիզիկական ստեղնաշարն ակտիվ է"</string> <string name="hardware" msgid="194658061510127999">"Ցույց տալ վիրտուալ ստեղնաշարը"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Ընտրեք ստեղնաշարի դիրքը"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Ավելի շատ ընտրանքներ"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Ներքին պահոց"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD քարտ"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"SD քարտ <xliff:g id="MANUFACTURER">%s</xliff:g>-ից"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB սարքավար"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Ապամրացնել"</string> <string name="app_info" msgid="6856026610594615344">"Հավելվածի տվյալներ"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Սարքն առանց սահմանափակումների օգտագործելու համար կատարեք գործարանային վերակայում"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Հպեք՝ ավելին իմանալու համար:"</string> </resources> diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml index fca667a9c98c..e7c706dc792f 100644 --- a/core/res/res/values-in/strings.xml +++ b/core/res/res/values-in/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit dengan %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Bagikan dengan"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Bagikan dengan %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Kirim menggunakan"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Kirim menggunakan %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Pilih aplikasi Beranda"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Gunakan %1$s sebagai aplikasi Beranda"</string> <string name="alwaysUse" msgid="4583018368000610438">"Gunakan secara default untuk tindakan ini."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"BAGIKAN"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"TOLAK"</string> <string name="select_input_method" msgid="8547250819326693584">"Ubah keyboard"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Pilih keyboard"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Keyboard lainnya"</string> <string name="show_ime" msgid="2506087537466597099">"Pertahankan di layar jika keyboard fisik masih aktif"</string> <string name="hardware" msgid="194658061510127999">"Tampilkan keyboard virtual"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Pilih tata letak keyboard"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Opsi lainnya"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Penyimpanan internal"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Kartu SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Kartu SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Drive USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Lepas pin"</string> <string name="app_info" msgid="6856026610594615344">"Info aplikasi"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Dikembalikan ke setelan pabrik agar perangkat ini dapat digunakan tanpa batasan"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Sentuh untuk mempelajari lebih lanjut."</string> </resources> diff --git a/core/res/res/values-is-rIS/strings.xml b/core/res/res/values-is-rIS/strings.xml index dc4121484659..5edb125c49b6 100644 --- a/core/res/res/values-is-rIS/strings.xml +++ b/core/res/res/values-is-rIS/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Breyta með %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Deila með"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Deila með %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Senda með því að nota"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Senda með því að nota %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Veldu heimaforrit"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Nota %1$s sem heimaforrit"</string> <string name="alwaysUse" msgid="4583018368000610438">"Nota sjálfgefið fyrir þessa aðgerð."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"DEILA"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"HAFNA"</string> <string name="select_input_method" msgid="8547250819326693584">"Skipta um lyklaborð"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Velja lyklaborð"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Önnur lyklaborð"</string> <string name="show_ime" msgid="2506087537466597099">"Haltu því á skjánum meðan vélbúnaðarlyklaborðið er virkt"</string> <string name="hardware" msgid="194658061510127999">"Sýna sýndarlyklaborð"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Veldu lyklaskipan"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Fleiri valkostir"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Innbyggð geymsla"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kort"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"SD-kort frá <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB-drif"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Losa"</string> <string name="app_info" msgid="6856026610594615344">"Forritsupplýsingar"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Núllstilltu til að nota þetta tæki án takmarkana"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Snertu til að fá frekari upplýsingar."</string> </resources> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index c43470ba178e..73775a0e35c5 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Modifica con %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Condividi con"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Condividi con %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Invia tramite"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Invia tramite %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Seleziona un\'app Home"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Utilizza %1$s come Home"</string> <string name="alwaysUse" msgid="4583018368000610438">"Usa come predefinita per questa azione."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"CONDIVIDI"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"RIFIUTO"</string> <string name="select_input_method" msgid="8547250819326693584">"Cambia tastiera"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Scegli tastiera"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Altre tastiere"</string> <string name="show_ime" msgid="2506087537466597099">"Tieni sullo schermo quando è attiva la tastiera fisica"</string> <string name="hardware" msgid="194658061510127999">"Mostra tastiera virtuale"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Seleziona layout tastiera"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Altre opzioni"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Memoria interna"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Scheda SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Scheda SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Unità USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Sblocca"</string> <string name="app_info" msgid="6856026610594615344">"Informazioni app"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Esegui il ripristino dei dati di fabbrica per utilizzare il dispositivo senza limitazioni"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Tocca per ulteriori informazioni."</string> </resources> diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml index 246140b3c3ee..b06434ec1070 100644 --- a/core/res/res/values-iw/strings.xml +++ b/core/res/res/values-iw/strings.xml @@ -911,6 +911,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"ערוך באמצעות %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"שתף באמצעות"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"שתף באמצעות %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"שליחה באמצעות"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"שליחה באמצעות %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"בחר אפליקציה שתשמש כדף הבית"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"השתמש ב-%1$s כדף הבית"</string> <string name="alwaysUse" msgid="4583018368000610438">"השתמש כברירת מחדל עבור פעולה זו."</string> @@ -1074,7 +1076,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"שתף"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"דחה"</string> <string name="select_input_method" msgid="8547250819326693584">"שינוי מקלדת"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"בחר מקלדות"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"מקלדות אחרות"</string> <string name="show_ime" msgid="2506087537466597099">"השאר אותו במסך בזמן שהמקלדת הפיזית פעילה"</string> <string name="hardware" msgid="194658061510127999">"הצג מקלדת וירטואלית"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"בחירת פריסת מקלדת"</string> @@ -1240,7 +1242,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"אפשרויות נוספות"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"אחסון פנימי"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"כרטיס SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"כרטיס SD של <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"כונן USB"</string> @@ -1600,7 +1603,6 @@ <string name="unpin_target" msgid="3556545602439143442">"בטל הצמדה"</string> <string name="app_info" msgid="6856026610594615344">"פרטי אפליקציה"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"איפוס להגדרות היצרן כדי לאפשר שימוש במכשיר ללא מגבלות"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"גע לקבלת מידע נוסף."</string> </resources> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 1cd079be243d..14d64b01c61d 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$sで編集"</string> <string name="whichSendApplication" msgid="6902512414057341668">"共有"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$sで共有"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"送信に使用するアプリ"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"送信に使用するアプリ: %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"ホームアプリを選択"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"ホームとして%1$sを使用"</string> <string name="alwaysUse" msgid="4583018368000610438">"常にこの操作で使用する"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"共有する"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"共有しない"</string> <string name="select_input_method" msgid="8547250819326693584">"キーボードの変更"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"キーボードの選択"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"その他のキーボード"</string> <string name="show_ime" msgid="2506087537466597099">"物理キーボードが有効になっている間は、画面に表示されます"</string> <string name="hardware" msgid="194658061510127999">"仮想キーボードの表示"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"キーボードレイアウトの選択"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"その他のオプション"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s、%2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s、%2$s、%3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"内部ストレージ"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SDカード"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g>製SDカード"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USBドライブ"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"固定を解除"</string> <string name="app_info" msgid="6856026610594615344">"アプリ情報"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"制限なしでこの端末を使用するには初期状態にリセットしてください"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"タップして詳細をご確認ください。"</string> </resources> diff --git a/core/res/res/values-ka-rGE/strings.xml b/core/res/res/values-ka-rGE/strings.xml index 8ff6a09bb841..92e57b7138a5 100644 --- a/core/res/res/values-ka-rGE/strings.xml +++ b/core/res/res/values-ka-rGE/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"რედაქტირება %1$s-ით"</string> <string name="whichSendApplication" msgid="6902512414057341668">"გაზიარება:"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s-თან გაზიარება"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"გაგზავნა:"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"გაგზავნა %1$s-ის მეშვეობით"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"აირჩიეთ Home აპი"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s-ის გამოყენება ......Home-ად"</string> <string name="alwaysUse" msgid="4583018368000610438">"ამ ქმედებისთვის ნაგულისხმევად გამოყენება."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"გაზიარება"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"უარყოფა"</string> <string name="select_input_method" msgid="8547250819326693584">"კლავიატურის შეცვლა"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"კლავიატურების არჩევა"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"სხვა კლავიატურები"</string> <string name="show_ime" msgid="2506087537466597099">"აქტიური ფიზიკური კლავიატურისას ეკრანზე შენარჩუნება"</string> <string name="hardware" msgid="194658061510127999">"ვირტუალური კლავიატურის ჩვენება"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"შეარჩიეთ კლავიატურის განლაგება."</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"მეტი ვარიანტები"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"შიდა მეხსიერება"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD ბარათი"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD ბარათი"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB დისკი"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"ჩამაგრების მოხსნა"</string> <string name="app_info" msgid="6856026610594615344">"აპის შესახებ"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"ამ მოწყობილობის შეზღუდვების გარეშე გამოსაყენებლად, დააბრუნეთ ქარხნული პარამეტრები"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"შეეხეთ მეტის გასაგებად."</string> </resources> diff --git a/core/res/res/values-kk-rKZ/strings.xml b/core/res/res/values-kk-rKZ/strings.xml index a0e987d135ff..85621ede4460 100644 --- a/core/res/res/values-kk-rKZ/strings.xml +++ b/core/res/res/values-kk-rKZ/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s көмегімен өңдеу"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Бөлісу"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s қолданбасымен бөлісу"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Келесі арқылы жіберу"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s арқылы жіберу"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"«Негізгі» қолданбасын таңдау"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s «Негізгі» ретінде пайдалану"</string> <string name="alwaysUse" msgid="4583018368000610438">"Бұл әрекет үшін бастапқы параметрін қолданыңыз."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"БӨЛІСУ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ҚАБЫЛДАМАУ"</string> <string name="select_input_method" msgid="8547250819326693584">"Пернетақтаны өзгерту"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Пернетақталарды таңдау"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Басқа пернетақталар"</string> <string name="show_ime" msgid="2506087537466597099">"Физикалық пернетақта белсенді кезде оны экранда ұстау"</string> <string name="hardware" msgid="194658061510127999">"Виртуалды пернетақтаны көрсету"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Пернетақта орналасуын таңдау"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Басқа опциялар"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Ішкі жад"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD картасы"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD картасы"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB дискі"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Босату"</string> <string name="app_info" msgid="6856026610594615344">"Қолданба ақпараты"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Осы құрылғыны шектеусіз пайдалану үшін зауыттық параметрлерді қалпына келтіріңіз"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Қосымша мәліметтер алу үшін түртіңіз."</string> </resources> diff --git a/core/res/res/values-km-rKH/strings.xml b/core/res/res/values-km-rKH/strings.xml index e586c78c9573..e9be6b6b8ee4 100644 --- a/core/res/res/values-km-rKH/strings.xml +++ b/core/res/res/values-km-rKH/strings.xml @@ -901,6 +901,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"កែសម្រួលជាមួយ %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"ចែករំលែកជាមួយ"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"ចែករំលែកជាមួយ"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"ផ្ញើដោយប្រើ"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"ផ្ញើដោយប្រើ %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"ជ្រើសកម្មវិធីដើម"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"ប្រើ %1$s ជាដើម"</string> <string name="alwaysUse" msgid="4583018368000610438">"ប្រើតាមលំនាំដើមសម្រាប់សកម្មភាពនេះ។"</string> @@ -1060,7 +1062,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ចែករំលែក"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"បដិសេធ"</string> <string name="select_input_method" msgid="8547250819326693584">"ប្ដូរក្ដារចុច"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"ជ្រើសក្ដារចុច"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"ក្តារចុចផ្សេងទៀត"</string> <string name="show_ime" msgid="2506087537466597099">"ទុកវានៅលើអេក្រង់ខណៈពេលក្តារចុចពិតប្រាកដកំពុងសកម្ម"</string> <string name="hardware" msgid="194658061510127999">"បង្ហាញក្ដារចុចនិម្មិត"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"ជ្រើសប្លង់ក្ដារចុច"</string> @@ -1224,7 +1226,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"ជម្រើសច្រើនទៀត"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"ឧបករណ៍ផ្ទុកខាងក្នុង"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"កាតអេសឌី"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"កាត SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"ឧបករណ៍ផ្ទុក USB"</string> @@ -1564,7 +1567,6 @@ <string name="unpin_target" msgid="3556545602439143442">"មិនខ្ទាស់"</string> <string name="app_info" msgid="6856026610594615344">"ព័ត៌មានកម្មវិធី"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"កំណត់ដូចចេញពីរោងចក្រឡើងវិញដើម្បីប្រើឧបករណ៍នេះដោយគ្មានការរឹតបន្តឹង"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"ប៉ះ ដើម្បីស្វែងយល់បន្ថែម។"</string> </resources> diff --git a/core/res/res/values-kn-rIN/strings.xml b/core/res/res/values-kn-rIN/strings.xml index 74aa8019d5f8..2e04419b963d 100644 --- a/core/res/res/values-kn-rIN/strings.xml +++ b/core/res/res/values-kn-rIN/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ಜೊತೆಗೆ ಸಂಪಾದಿಸಿ"</string> <string name="whichSendApplication" msgid="6902512414057341668">"ಹಂಚಿಕೊಳ್ಳಿ"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಿ"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"ಇದನ್ನು ಬಳಸಿಕೊಂಡು ಕಳುಹಿಸಿ"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s ಬಳಸಿಕೊಂಡು ಕಳುಹಿಸಿ"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"ಹೋಮ್ ಅಪ್ಲಿಕೇಶನ್ ಆಯ್ಕೆಮಾಡಿ"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"ಹೋಮ್ ಎಂಬಂತೆ %1$s ಅನ್ನು ಬಳಸಿ"</string> <string name="alwaysUse" msgid="4583018368000610438">"ಈ ಕ್ರಿಯೆಗೆ ಡೀಫಾಲ್ಟ್ ಆಗಿ ಬಳಸಿ."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ಹಂಚಿಕೊಳ್ಳಿ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ನಿರಾಕರಿಸು"</string> <string name="select_input_method" msgid="8547250819326693584">"ಕೀಬೋರ್ಡ್ ಬದಲಿಸಿ"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"ಕೀಬೋರ್ಡ್ಗಳನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"ಇತರೆ ಕೀಬೋರ್ಡ್ಗಳು"</string> <string name="show_ime" msgid="2506087537466597099">"ಭೌತಿಕ ಕೀಬೋರ್ಡ್ ಸಕ್ರಿಯವಾಗಿರುವಾಗ ಅದನ್ನು ಪರದೆಯ ಮೇಲೆ ಇರಿಸಿಕೊಳ್ಳಿ"</string> <string name="hardware" msgid="194658061510127999">"ವರ್ಚ್ಯುಯಲ್ ಕೀಬೋರ್ಡ್ ತೋರಿಸು"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"ಕೀಬೋರ್ಡ್ ಲೇಔಟ್ ಆಯ್ಕೆಮಾಡಿ"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳು"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"ಆಂತರಿಕ ಸಂಗ್ರಹಣೆ"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD ಕಾರ್ಡ್"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD ಕಾರ್ಡ್"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ಡ್ರೈವ್"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"ಅನ್ಪಿನ್"</string> <string name="app_info" msgid="6856026610594615344">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"ನಿರ್ಬಂಧಗಳು ಇಲ್ಲದೆಯೇ ಈ ಸಾಧನವನ್ನು ಬಳಸಲು ಫ್ಯಾಕ್ಟರಿ ಮರುಹೊಂದಿಸಿ"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"ಇನ್ನಷ್ಟು ತಿಳಿಯಲು ಸ್ಪರ್ಶಿಸಿ."</string> </resources> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index 3c09cfb8b43c..b61df80a53b8 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s(으)로 수정"</string> <string name="whichSendApplication" msgid="6902512414057341668">"공유 대상"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s와(과) 공유"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"전송 시 사용할 앱"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"전송 시 사용할 앱: %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"홈 앱 선택"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s을(를) 홈 앱으로 사용"</string> <string name="alwaysUse" msgid="4583018368000610438">"이 작업에 대해 기본값으로 사용"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"공유"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"거부"</string> <string name="select_input_method" msgid="8547250819326693584">"키보드 변경"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"키보드 선택"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"기타 키보드"</string> <string name="show_ime" msgid="2506087537466597099">"물리적 키보드가 활성 상태인 경우 화면에 켜 둠"</string> <string name="hardware" msgid="194658061510127999">"가상 키보드 표시"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"키보드 레이아웃 선택"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"옵션 더보기"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"내부 저장소"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD 카드"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD 카드"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB 드라이브"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"고정 해제"</string> <string name="app_info" msgid="6856026610594615344">"앱 정보"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"제한 없이 기기를 사용하기 위한 초기화"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"자세한 내용을 보려면 터치하세요."</string> </resources> diff --git a/core/res/res/values-ky-rKG/strings.xml b/core/res/res/values-ky-rKG/strings.xml index d10a50f04b7a..55b2b7c2babe 100644 --- a/core/res/res/values-ky-rKG/strings.xml +++ b/core/res/res/values-ky-rKG/strings.xml @@ -900,6 +900,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s менен түзөтүү"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Төмөнкү менен бөлүшүү"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s менен бөлүшүү"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Колдонуп жөнөтүү"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s колдонуп жөнөтүү"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Башкы бет колдонмосун тандаңыз"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Башкы бет колдонмосу катары %1$s пайдалануу"</string> <string name="alwaysUse" msgid="4583018368000610438">"Бул аракет үчүн демейки боюнча колдонулсун."</string> @@ -1059,7 +1061,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"БӨЛҮШҮҮ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ЧЕТКЕ КАГУУ"</string> <string name="select_input_method" msgid="8547250819326693584">"Баскычтопту өзгөртүү"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Баскычтопторду тандаңыз"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Башка баскычтоптор"</string> <string name="show_ime" msgid="2506087537466597099">"Баскычтоп иштетилгенде экранда көрүнүп турсун"</string> <string name="hardware" msgid="194658061510127999">"Виртуалдык баскычтоп"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Тергичтин жайгашуусун тандоо"</string> @@ -1223,7 +1225,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Дагы параметрлер"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Ички сактагыч"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD-карта"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD карта"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB түзмөк"</string> @@ -1563,7 +1566,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Кадоодон алып коюу"</string> <string name="app_info" msgid="6856026610594615344">"Колдонмо тууралуу"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Бул түзмөктү чектөөсүз колдонуу үчүн аны баштапкы абалга келтириңиз"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Көбүрөөк билүү үчүн тийип коюңуз."</string> </resources> diff --git a/core/res/res/values-lo-rLA/strings.xml b/core/res/res/values-lo-rLA/strings.xml index 46cc85aa3080..5d1c37eabea1 100644 --- a/core/res/res/values-lo-rLA/strings.xml +++ b/core/res/res/values-lo-rLA/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"ແກ້ໄຂໃນ %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"ແບ່ງປັນກັບ"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"ແບ່ງປັນກັບ %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"ສົ່ງໂດຍໃຊ້"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"ສົ່ງໂດຍໃຊ້ %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"ເລືອກແອັບຯໂຮມ"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"ໃຊ້ %1$s ເປັນໜ້າຫຼັກ"</string> <string name="alwaysUse" msgid="4583018368000610438">"ໃຊ້ໂດຍຄ່າເລີ່ມຕົນສຳລັບການເຮັດວຽກນີ້."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ແບ່ງປັນ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ປະຕິເສດ"</string> <string name="select_input_method" msgid="8547250819326693584">"ປ່ຽນແປ້ນພິມ"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"ເລືອກແປ້ນພິມ"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"ແປ້ນພິມອື່ນໆ"</string> <string name="show_ime" msgid="2506087537466597099">"ເປີດໃຊ້ໃຫ້ມັນຢູ່ໃນໜ້າຈໍໃນຂະນະທີ່ໃຊ້ແປ້ນພິມພາຍນອກຢູ່"</string> <string name="hardware" msgid="194658061510127999">"ສະແດງແປ້ນພິມສະເໝືອນ"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"ເລືອກຮູບແບບແປ້ນພິມ"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"ໂຕເລືອກອື່ນ"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"ບ່ອນຈັດເກັບຂໍ້ມູນພາຍໃນ"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD card"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> ແຜ່ນ SD"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ດຣ້າຍ"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"ຖອນປັກໝຸດ"</string> <string name="app_info" msgid="6856026610594615344">"ຂໍ້ມູນແອັບ"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"ຣີເຊັດໃຫ້ເປັນຄ່າໂຮງງານເພື່ອໃຊ້ອຸປະກອນນີ້ໂດຍບໍ່ມີຂໍ້ຈຳກັດ"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"ແຕະເພື່ອສຶກສາເພີ່ມເຕີມ."</string> </resources> diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml index 0efdfcaf9896..1460b9b0707e 100644 --- a/core/res/res/values-lt/strings.xml +++ b/core/res/res/values-lt/strings.xml @@ -911,6 +911,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Redaguoti naudojant %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Bendrinti naudojant"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Bendrinti naudojant %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Siųsti naudojant"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Siųsti naudojant „%1$s“"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Pasirinkti pagrindinę programą"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Naudoti „%1$s“ kaip pagrindinę programą"</string> <string name="alwaysUse" msgid="4583018368000610438">"Šiam veiksmui tai naudoti pagal numatytuosius nustatymus."</string> @@ -1074,7 +1076,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"BENDRINTI"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ATMESTI"</string> <string name="select_input_method" msgid="8547250819326693584">"Klaviatūros keitimas"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Pasirinkti klaviatūras"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Kitos klaviatūros"</string> <string name="show_ime" msgid="2506087537466597099">"Palikti ekrane, kol fizinė klaviatūra aktyvi"</string> <string name="hardware" msgid="194658061510127999">"Rodyti virtualiąją klaviatūrą"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Pasirinkite klaviatūros išdėstymą"</string> @@ -1240,7 +1242,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Daugiau parinkčių"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Vidinė atmintis"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD kortelė"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"„<xliff:g id="MANUFACTURER">%s</xliff:g>“ SD kortelė"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Atmintukas"</string> @@ -1600,7 +1603,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Atsegti"</string> <string name="app_info" msgid="6856026610594615344">"Programos informacija"</string> <string name="negative_duration" msgid="5688706061127375131">"–<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Atkurkite gamyklinius nustatymus, kad galėtumėte naudoti šį įrenginį be apribojimų"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Palieskite, kad sužinotumėte daugiau."</string> </resources> diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml index f5c59219eb99..566180f70af8 100644 --- a/core/res/res/values-lv/strings.xml +++ b/core/res/res/values-lv/strings.xml @@ -905,6 +905,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Rediģēt, izmantojot %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Kopīgot, izmantojot"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Kopīgot, izmantojot %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Sūtīšana, izmantojot..."</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Sūtīšana, izmantojot: %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Sākuma lietotnes atlase"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"“%1$s” kā sākuma lietotnes izmantošana"</string> <string name="alwaysUse" msgid="4583018368000610438">"Pēc noklusējuma izmantot šai darbībai."</string> @@ -1066,7 +1068,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"KOPĪGOT"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"NORAIDĪT"</string> <string name="select_input_method" msgid="8547250819326693584">"Tastatūras maiņa"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Izvēlēties tastatūru"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Citas tastatūras"</string> <string name="show_ime" msgid="2506087537466597099">"Paturēt ekrānā, kamēr ir aktīva fiziskā tastatūra"</string> <string name="hardware" msgid="194658061510127999">"Virtuālās tastatūras rādīšana"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Atlasiet tastatūras izkārtojumu"</string> @@ -1231,7 +1233,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Vairāk opciju"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s: %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s: %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Iekšējā atmiņa"</string> + <string name="storage_internal" msgid="3570990907910199483">"Iekšējā kopīgotā krātuve"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD karte"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD karte"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB disks"</string> @@ -1581,7 +1583,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Atspraust"</string> <string name="app_info" msgid="6856026610594615344">"Lietotnes informācija"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Rūpnīcas datu atiestatīšana ierīces neierobežotai izmantošanai"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Pieskarieties, lai uzzinātu vairāk."</string> </resources> diff --git a/core/res/res/values-mcc310-mnc160-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc160-be-rBY/strings.xml new file mode 100644 index 000000000000..39ec232ed937 --- /dev/null +++ b/core/res/res/values-mcc310-mnc160-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3017901214286816293">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="7068215934335709161">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="2031160810542298336">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc160-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc160-bs-rBA/strings.xml new file mode 100644 index 000000000000..20e163a96f9f --- /dev/null +++ b/core/res/res/values-mcc310-mnc160-bs-rBA/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3017901214286816293">"Da biste pozivali i slali poruke preko Wi-Fi-ja, prvo zatražite od operatera da postavi tu uslugu. Potom u Postavkama ponovo uključite Wi-Fi pozivanje."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="7068215934335709161">"Registrirajte se kod svog operatera"</item> + </string-array> + <string name="wfcSpnFormat" msgid="2031160810542298336">"Wi-Fi pozivanje preko operatera %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc200-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc200-be-rBY/strings.xml new file mode 100644 index 000000000000..20431f680e53 --- /dev/null +++ b/core/res/res/values-mcc310-mnc200-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9107329079910661798">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2841003137832065541">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6806975706640442517">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc210-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc210-be-rBY/strings.xml new file mode 100644 index 000000000000..463b405b9154 --- /dev/null +++ b/core/res/res/values-mcc310-mnc210-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="5217754856196352581">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4688475512286389971">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5475635312889002673">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc220-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc220-be-rBY/strings.xml new file mode 100644 index 000000000000..2c6bd396ae45 --- /dev/null +++ b/core/res/res/values-mcc310-mnc220-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6238990105876016549">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="2866631708941520085">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="3422704506272221128">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc230-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc230-be-rBY/strings.xml new file mode 100644 index 000000000000..24d65fc843e9 --- /dev/null +++ b/core/res/res/values-mcc310-mnc230-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="9007462326786949889">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="6747587721329739803">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="903741468703044544">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc240-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc240-be-rBY/strings.xml new file mode 100644 index 000000000000..42e1e3497f31 --- /dev/null +++ b/core/res/res/values-mcc310-mnc240-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2734345662112241986">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5561711399459051107">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="6383482961309785661">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc250-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc250-be-rBY/strings.xml new file mode 100644 index 000000000000..490c2787398e --- /dev/null +++ b/core/res/res/values-mcc310-mnc250-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="3177110876268966">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5743977848030289234">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1221554601313232001">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc260-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc260-be-rBY/strings.xml new file mode 100644 index 000000000000..497366b9db58 --- /dev/null +++ b/core/res/res/values-mcc310-mnc260-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2015, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="7239039348648848288">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="483847327467331298">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="4982938551498609442">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc260-bs-rBA/strings.xml b/core/res/res/values-mcc310-mnc260-bs-rBA/strings.xml new file mode 100644 index 000000000000..64e486289f94 --- /dev/null +++ b/core/res/res/values-mcc310-mnc260-bs-rBA/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2015, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="7239039348648848288">"Da biste pozivali i slali poruke preko Wi-Fi-ja, prvo zatražite od operatera da postavi tu uslugu. Potom u Postavkama ponovo uključite Wi-Fi pozivanje."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="483847327467331298">"Registrirajte se kod svog operatera"</item> + </string-array> + <string name="wfcSpnFormat" msgid="4982938551498609442">"Wi-Fi pozivanje preko operatera %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc270-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc270-be-rBY/strings.xml new file mode 100644 index 000000000000..43e6fc5b079f --- /dev/null +++ b/core/res/res/values-mcc310-mnc270-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="6674750523418536585">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5880767641285399402">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="5634367913183683816">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc310-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc310-be-rBY/strings.xml new file mode 100644 index 000000000000..1cdbdb1d7cf6 --- /dev/null +++ b/core/res/res/values-mcc310-mnc310-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="1972026366984640493">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="1383416528714661108">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="7770475174975527040">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc490-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc490-be-rBY/strings.xml new file mode 100644 index 000000000000..51d502280c16 --- /dev/null +++ b/core/res/res/values-mcc310-mnc490-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="2780619740658228275">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="4633656294483906293">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="1518868466785799436">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc660-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc660-be-rBY/strings.xml new file mode 100644 index 000000000000..66523ed1e647 --- /dev/null +++ b/core/res/res/values-mcc310-mnc660-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="4027376374798357928">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="5536938168415300276">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="979929705672330">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mcc310-mnc800-be-rBY/strings.xml b/core/res/res/values-mcc310-mnc800-be-rBY/strings.xml new file mode 100644 index 000000000000..0a48e5e28a5b --- /dev/null +++ b/core/res/res/values-mcc310-mnc800-be-rBY/strings.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** Copyright 2016, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You my obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<!-- These resources are around just to allow their values to be customized + for different hardware and product builds. --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wfcOperatorErrorAlertMessages"> + <item msgid="8435554129271297367">"Каб рабіць выклікі і адпраўляць паведамленні па Wi-Fi, спачатку папрасіце свайго аператара наладзіць гэту паслугу. Затым зноў уключыце Wi-Fi-тэлефанію ў меню Налады."</item> + </string-array> + <string-array name="wfcOperatorErrorNotificationMessages"> + <item msgid="8993797655078232716">"Зарэгіструйцеся ў свайго аператара"</item> + </string-array> + <string name="wfcSpnFormat" msgid="8604078859021657352">"Wi-Fi-тэлефанія %s"</string> +</resources> diff --git a/core/res/res/values-mk-rMK/strings.xml b/core/res/res/values-mk-rMK/strings.xml index 1fbf3630bcef..c4ef82cb434b 100644 --- a/core/res/res/values-mk-rMK/strings.xml +++ b/core/res/res/values-mk-rMK/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Уреди со %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Сподели со"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Сподели со %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Испрати преку"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Испрати преку %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Изберете ја апликацијата Почетен"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Користете ја %1$s како Почетен"</string> <string name="alwaysUse" msgid="4583018368000610438">"Користи ја стандардно за ова дејство."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"СПОДЕЛИ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ОДБИЈ"</string> <string name="select_input_method" msgid="8547250819326693584">"Измени тастатура"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Избери тастатури"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Други тастатури"</string> <string name="show_ime" msgid="2506087537466597099">"Прикажувај го на екранот додека е активна физичката тастатура"</string> <string name="hardware" msgid="194658061510127999">"Прикажи виртуелна тастатура"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Избери изглед на тастатура"</string> @@ -1224,7 +1226,8 @@ <!-- no translation found for action_bar_home_description_format (7965984360903693903) --> <skip /> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Внатрешна меморија"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"СД картичка"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> СД-картичка"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"УСБ-меморија"</string> @@ -1564,7 +1567,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Откачете"</string> <string name="app_info" msgid="6856026610594615344">"Информации за апликација"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Ресетирајте до фабричките поставки за уредов да го користите без ограничувања"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Допрете за да дознаете повеќе."</string> </resources> diff --git a/core/res/res/values-ml-rIN/strings.xml b/core/res/res/values-ml-rIN/strings.xml index 2fa6786226fa..9b9650115040 100644 --- a/core/res/res/values-ml-rIN/strings.xml +++ b/core/res/res/values-ml-rIN/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ഉപയോഗിച്ച് എഡിറ്റുചെയ്യുക"</string> <string name="whichSendApplication" msgid="6902512414057341668">"ഇതുമായി പങ്കിടുക"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s എന്നതുമായി പങ്കിടുക"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"ഇനിപ്പറയുന്നത് ഉപയോഗിച്ച് അയയ്ക്കുക"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s ഉപയോഗിച്ച് അയയ്ക്കുക"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"ഒരു ഹോം അപ്ലിക്കേഷൻ തിരഞ്ഞെടുക്കുക"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"ഹോമായി %1$s എന്നത് ഉപയോഗിക്കുക"</string> <string name="alwaysUse" msgid="4583018368000610438">"ഈ പ്രവർത്തനത്തിന് സ്ഥിരമായി ഉപയോഗിക്കുക."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"പങ്കിടുക"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"നിരസിക്കുക"</string> <string name="select_input_method" msgid="8547250819326693584">"കീബോഡ് മാറ്റുക"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"കീബോർഡുകൾ തിരഞ്ഞെടുക്കുക"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"മറ്റ് കീബോർഡുകൾ"</string> <string name="show_ime" msgid="2506087537466597099">"ഫിസിക്കൽ കീബോർഡ് സജീവമായിരിക്കുമ്പോൾ സ്ക്രീനിൽ നിലനിർത്തുക"</string> <string name="hardware" msgid="194658061510127999">"വെർച്വൽ കീബോർഡ് കാണിക്കുക"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"കീബോർഡ് ലേഔട്ട് തിരഞ്ഞെടുക്കുക"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"കൂടുതൽ ഓപ്ഷനുകള്"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"ആന്തരിക സ്റ്റോറേജ്"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD കാർഡ്"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD കാർഡ്"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ഡ്രൈവ്"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"അൺപിൻ ചെയ്യുക"</string> <string name="app_info" msgid="6856026610594615344">"ആപ്പ് വിവരം"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"നിയന്ത്രണങ്ങൾ ഇല്ലാതെ ഈ ഉപകരണം ഉപയോഗിക്കാൻ ഫാക്ടറി റീസെറ്റ് നടത്തുക"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"കൂടുതലറിയുന്നതിന് സ്പർശിക്കുക."</string> </resources> diff --git a/core/res/res/values-mn-rMN/strings.xml b/core/res/res/values-mn-rMN/strings.xml index 9956dbf0c319..ef34b466fab5 100644 --- a/core/res/res/values-mn-rMN/strings.xml +++ b/core/res/res/values-mn-rMN/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ашиглан засварлах"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Хуваалцах"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ашиглан хуваалцах"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Ашиглан илгээх"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s-г ашиглан илгээх"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Үндсэн апп-г сонгох"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s-г Үндсэн-р ашиглах"</string> <string name="alwaysUse" msgid="4583018368000610438">"Энэ ажиллагааг үндсэн болгох."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ХУВААЛЦАХ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ТАТГАЛЗАХ"</string> <string name="select_input_method" msgid="8547250819326693584">"Гарыг өөрчлөх"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Гар сонгох"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Бусад гар"</string> <string name="show_ime" msgid="2506087537466597099">"Бодит гар идэвхтэй үед үүнийг дэлгэцэнд харуулна уу"</string> <string name="hardware" msgid="194658061510127999">"Хийсвэр гарыг харуулах"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Гарын схемийг сонгох"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Нэмэлт сонголтууд"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Дотоод сан"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD карт"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD карт"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB диск"</string> @@ -1560,7 +1563,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Unpin"</string> <string name="app_info" msgid="6856026610594615344">"Апп-н мэдээлэл"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Энэ төхөөрөмжийг хязгаарлалтгүй ашиглахын тулд үйлдвэрийн тохиргоонд дахин тохируулна уу"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Дэлгэрэнгүй үзэх бол дарна уу."</string> </resources> diff --git a/core/res/res/values-mr-rIN/strings.xml b/core/res/res/values-mr-rIN/strings.xml index 40f780780d61..7baa543491e6 100644 --- a/core/res/res/values-mr-rIN/strings.xml +++ b/core/res/res/values-mr-rIN/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s सह संपादित करा"</string> <string name="whichSendApplication" msgid="6902512414057341668">"यांच्यासह सामायिक करा"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s सह सामायिक करा"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"वापरून पाठवा"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s वापरून पाठवा"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"मुख्यपृष्ठ अॅप निवडा"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"मुख्यपृष्ठ म्हणून %1$s वापरा"</string> <string name="alwaysUse" msgid="4583018368000610438">"या क्रियेसाठी डीफॉल्टनुसार वापरा."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"सामायिक करा"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"नकार द्या"</string> <string name="select_input_method" msgid="8547250819326693584">"कीबोर्ड बदला"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"कीबोर्ड निवडा"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"इतर कीबोर्ड"</string> <string name="show_ime" msgid="2506087537466597099">"भौतिक कीबोर्ड सक्रिय असताना त्यास स्क्रीनवर ठेवा"</string> <string name="hardware" msgid="194658061510127999">"व्हर्च्युअल कीबोर्ड दर्शवा"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"कीबोर्ड लेआउट निवडा"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"अधिक पर्याय"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"अंतर्गत संचयन"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD कार्ड"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD कार्ड"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ड्राइव्ह"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"अनपिन करा"</string> <string name="app_info" msgid="6856026610594615344">"अॅप माहिती"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"हे डिव्हाइस निर्बंधांशिवाय वापरण्यासाठी फॅक्टरी रीसेट करा"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"अधिक जाणून घेण्यासाठी स्पर्श करा."</string> </resources> diff --git a/core/res/res/values-ms-rMY/strings.xml b/core/res/res/values-ms-rMY/strings.xml index 2154bda338cf..c2e3bfe4c243 100644 --- a/core/res/res/values-ms-rMY/strings.xml +++ b/core/res/res/values-ms-rMY/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit dengan %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Kongsi dengan"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Kongsi dengan %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Hantar menggunakan"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Hantar menggunakan %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Pilih apl Laman Utama"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Gunakan %1$s sebagai Laman Utama"</string> <string name="alwaysUse" msgid="4583018368000610438">"Gunakannya secara lalai untuk tindakan ini."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"KONGSI"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"TOLAK"</string> <string name="select_input_method" msgid="8547250819326693584">"Tukar papan kekunci"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Pilih papan kekunci"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Papan kekunci lain"</string> <string name="show_ime" msgid="2506087537466597099">"Pastikannya pada skrin, semasa papan kekunci fizikal aktif"</string> <string name="hardware" msgid="194658061510127999">"Tunjukkan papan kekunci maya"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Pilih susun atur papan kekunci"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Lagi pilihan"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Storan dalaman"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Kad SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Kad SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Pemacu USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Nyahsemat"</string> <string name="app_info" msgid="6856026610594615344">"Maklumat apl"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Lakukan tetapan semula kilang untuk menggunakan peranti ini tanpa sekatan"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Ketik untuk mengetahui lebih lanjut."</string> </resources> diff --git a/core/res/res/values-my-rMM/strings.xml b/core/res/res/values-my-rMM/strings.xml index 4a934f018116..0c55986e5c0e 100644 --- a/core/res/res/values-my-rMM/strings.xml +++ b/core/res/res/values-my-rMM/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s နှင့် တည်းဖြတ်ရန်"</string> <string name="whichSendApplication" msgid="6902512414057341668">"...နှင့် မျှဝေရန်"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$sနှင့် မျှဝေရန်"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"ကိုအသုံးပြု၍ ပို့ပါ"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s ကိုအသုံးပြု၍ ပို့ပါ"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"ပင်မ appကို ရွေးပါ"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$sကို ပင်မအဖြစ် သုံးပါ"</string> <string name="alwaysUse" msgid="4583018368000610438">"ဤလှုပ်ရှားမှုအတွက် မူရင်းအတိုင်း အသုံးပြုပါ။"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"မျှဝေပါ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ငြင်းပယ်ပါ"</string> <string name="select_input_method" msgid="8547250819326693584">"ကီးဘုတ် ပြောင်းလဲရန်"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"ကီးဘုတ်များကို ရွေးရန်"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"အခြားကီးဘုတ်များ"</string> <string name="show_ime" msgid="2506087537466597099">"စက်၏ကီးဘုတ်ကိုအသုံးပြုနေစဉ် ၎င်းကိုမျက်နှာပြင်ပေါ်တွင် ထားပါ"</string> <string name="hardware" msgid="194658061510127999">"ကီးဘုတ်အတုပြရန်"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"လက်ကွက် အပြင်အဆင်ရွေးရန်"</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"ပိုမိုရွေးချယ်စရာများ"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s ၊ %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s ၊ %2$s ၊ %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"စက်တွင်း သိုလှောင်ထားမှု"</string> + <string name="storage_internal" msgid="3570990907910199483">"စက်တွင်းမျှဝေထားသည့် သိုလှောင်ခန်း"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD ကဒ်"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD ကဒ်"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ဒရိုက်ဗ်"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"ဖြုတ်ပါ"</string> <string name="app_info" msgid="6856026610594615344">"အက်ပ်အချက်အလက်"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"ဤစက်ပစ္စည်းကို ကန့်သတ်ချက်များမပါဘဲ အသုံးပြုရန် စက်ရုံထုတ်ဆက်တင်အတိုင်း ပြန်လည်သတ်မှတ်ပါ"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"ပိုမိုလေ့လာရန် တို့ပါ။"</string> </resources> diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml index 79a5a8603458..78173216c2a4 100644 --- a/core/res/res/values-nb/strings.xml +++ b/core/res/res/values-nb/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Rediger med %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Del med"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Del med %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Send via"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Send via %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Velg en startsideapp"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Bruk %1$s som startside"</string> <string name="alwaysUse" msgid="4583018368000610438">"Bruk som standardvalg."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"DEL"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"AVSLÅ"</string> <string name="select_input_method" msgid="8547250819326693584">"Endre tastatur"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Velg tastatur"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Andre tastaturoppsett"</string> <string name="show_ime" msgid="2506087537466597099">"Ha den på skjermen mens det fysiske tastaturet er aktivt"</string> <string name="hardware" msgid="194658061510127999">"Vis det virtuelle tastaturet"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Velg tastaturoppsett"</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Flere alternativer"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s – %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s – %2$s – %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Intern lagring"</string> + <string name="storage_internal" msgid="3570990907910199483">"Delt internlagring"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kort"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD-kort"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB-stasjon"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Løsne"</string> <string name="app_info" msgid="6856026610594615344">"Info om appen"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Tilbakestill til fabrikkstandard for å bruke denne enheten uten begrensninger"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Trykk for å finne ut mer."</string> </resources> diff --git a/core/res/res/values-ne-rNP/strings.xml b/core/res/res/values-ne-rNP/strings.xml index db7cd0193d46..459eccdc9dcf 100644 --- a/core/res/res/values-ne-rNP/strings.xml +++ b/core/res/res/values-ne-rNP/strings.xml @@ -905,6 +905,8 @@ <skip /> <string name="whichSendApplication" msgid="6902512414057341668">"साझेदारी गर्नुहोस्..."</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s सँग साझेदारी गर्नुहोस्"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"यसको प्रयोग गरी पठाउनुहोस्"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s को प्रयोग गरी पठाउनुहोस्"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"गृह अनुप्रयोग चयन गर्नुहोस्"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s लाई गृहको रूपमा प्रयोग गर्नुहोस्"</string> <string name="alwaysUse" msgid="4583018368000610438">"यस कार्यको लागि पूर्वनिर्धारितबाट प्रयोग गर्नुहोस्।"</string> @@ -1064,7 +1066,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"साझेदारी गर्नुहोस्"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"अस्वीकार गर्नुहोस्"</string> <string name="select_input_method" msgid="8547250819326693584">"कुञ्जीपाटी परिवर्तन गर्नुहोस्"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"कीबोर्ड छान्नुहोस्"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"अन्य किबोर्डहरू"</string> <string name="show_ime" msgid="2506087537466597099">"भौतिक किबोर्ड सक्रिय हुँदा यसलाई स्क्रिनमा राख्नुहोस्"</string> <string name="hardware" msgid="194658061510127999">"भर्चुअल किबोर्ड देखाउनुहोस्"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"किबोर्ड रूपरेखा चयन गर्नुहोस्"</string> @@ -1228,7 +1230,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"थप विकल्पहरू"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"आन्तरिक भण्डारण"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD कार्ड"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD कार्ड"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ड्राइभ"</string> @@ -1568,7 +1571,6 @@ <string name="unpin_target" msgid="3556545602439143442">"अनपिन गर्नुहोस्"</string> <string name="app_info" msgid="6856026610594615344">"अनुप्रयोगका बारे जानकारी"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"यस यन्त्रलाई सीमितताहरू बिना प्रयोग गर्नका लागि फ्याक्ट्री रिसेट गर्नुहोस्"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"थप जान्नका लागि छुनुहोस्।"</string> </resources> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index c7c95e195ed8..e8279af74d31 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Bewerken met %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Delen met"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Delen met %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Verzenden met"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Verzenden met %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Een startschermapp selecteren"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s gebruiken voor startscherm"</string> <string name="alwaysUse" msgid="4583018368000610438">"Standaard gebruiken voor deze actie."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"DELEN"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"WEIGEREN"</string> <string name="select_input_method" msgid="8547250819326693584">"Toetsenbord wijzigen"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Toetsenborden kiezen"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Andere toetsenborden"</string> <string name="show_ime" msgid="2506087537466597099">"Dit op het scherm weergeven terwijl het fysieke toetsenbord actief is"</string> <string name="hardware" msgid="194658061510127999">"Virtueel toetsenbord tonen"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Toetsenbordindeling selecteren"</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Meer opties"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Interne opslag"</string> + <string name="storage_internal" msgid="3570990907910199483">"Interne gedeelde opslag"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kaart"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD-kaart"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB-drive"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Losmaken"</string> <string name="app_info" msgid="6856026610594615344">"App-info"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Zet dit apparaat terug op de fabrieksinstellingen om het zonder beperkingen te gebruiken"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Tik voor meer informatie."</string> </resources> diff --git a/core/res/res/values-pa-rIN/strings.xml b/core/res/res/values-pa-rIN/strings.xml index cbb26282b582..f74b93cf6d77 100644 --- a/core/res/res/values-pa-rIN/strings.xml +++ b/core/res/res/values-pa-rIN/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ਨਾਲ ਸੰਪਾਦਿਤ ਕਰੋ"</string> <string name="whichSendApplication" msgid="6902512414057341668">"ਇਸ ਨਾਲ ਸ਼ੇਅਰ ਕਰੋ"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ਨਾਲ ਸ਼ੇਅਰ ਕਰੋ"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"ਇਸ ਦੀ ਵਰਤੋਂ ਨਾਲ ਭੇਜੋ"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s ਦੀ ਵਰਤੋਂ ਨਾਲ ਭੇਜੋ"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"ਇੱਕ ਹੋਮ ਐਪ ਚੁਣੋ"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"ਘਰ ਦੇ ਤੌਰ ਤੇ %1$s ਨੂੰ ਵਰਤੋ"</string> <string name="alwaysUse" msgid="4583018368000610438">"ਇਸ ਕਿਰਿਆ ਲਈ ਬਾਇ ਡਿਫੌਲਟ ਵਰਤੋ।"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ਸਾਂਝੀ ਕਰੋ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ਅਸਵੀਕਾਰ ਕਰੋ"</string> <string name="select_input_method" msgid="8547250819326693584">"ਕੀਬੋਰਡ ਬਦਲੋ"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"ਕੀਬੋਰਡਸ ਚੁਣੋ"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"ਹੋਰ ਕੀ-ਬੋਰਡ"</string> <string name="show_ime" msgid="2506087537466597099">"ਭੌਤਿਕ ਕੀ-ਬੋਰਡ ਸਰਗਰਮ ਹੋਣ ਦੌਰਾਨ ਇਸ ਨੂੰ ਸਕ੍ਰੀਨ \'ਤੇ ਬਣਾਈ ਰੱਖੋ"</string> <string name="hardware" msgid="194658061510127999">"ਵਰਚੁਅਲ ਕੀ-ਬੋਰਡ ਵਿਖਾਓ"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"ਕੀਬੋਰਡ ਲੇਆਊਟ ਚੁਣੋ"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"ਹੋਰ ਚੋਣਾਂ"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"ਅੰਦਰੂਨੀ ਸਟੋਰੇਜ"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD ਕਾਰਡ"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD ਕਾਰਡ"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ਡ੍ਰਾਇਵ"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"ਅਨਪਿੰਨ ਕਰੋ"</string> <string name="app_info" msgid="6856026610594615344">"ਐਪ ਜਾਣਕਾਰੀ"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"ਇਸ ਡੀਵਾਈਸ ਨੂੰ ਬਿਨਾਂ ਪਾਬੰਦੀਆਂ ਦੇ ਵਰਤਣ ਲਈ ਫੈਕਟਰੀ ਰੀਸੈੱਟ ਕਰੋ"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"ਹੋਰ ਜਾਣਨ ਲਈ ਸਪਰਸ਼ ਕਰੋ।"</string> </resources> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 5eb6b563a08a..6e4091a09e34 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -911,6 +911,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edytuj w aplikacji %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Udostępnij przez:"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Udostępnij przez %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Wyślij za pomocą"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Wyślij za pomocą %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Wybierz aplikację ekranu głównego"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Użyj %1$s jako ekranu głównego"</string> <string name="alwaysUse" msgid="4583018368000610438">"Domyślne dla tej czynności"</string> @@ -1074,7 +1076,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"UDOSTĘPNIJ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ODRZUĆ"</string> <string name="select_input_method" msgid="8547250819326693584">"Zmień klawiaturę"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Wybierz klawiatury"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Inne klawiatury"</string> <string name="show_ime" msgid="2506087537466597099">"Pozostaw na ekranie, gdy aktywna jest klawiatura fizyczna"</string> <string name="hardware" msgid="194658061510127999">"Pokaż klawiaturę wirtualną"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Wybierz układ klawiatury"</string> @@ -1240,7 +1242,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Więcej opcji"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Pamięć wewnętrzna"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Karta SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Karta SD (<xliff:g id="MANUFACTURER">%s</xliff:g>)"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Dysk USB"</string> @@ -1600,7 +1603,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Odepnij"</string> <string name="app_info" msgid="6856026610594615344">"O aplikacji"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Aby używać tego urządzenia bez ograniczeń, przywróć ustawienia fabryczne"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Kliknij, by dowiedzieć się więcej."</string> </resources> diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml index 21f6665d7677..62ee01c89760 100644 --- a/core/res/res/values-pt-rBR/strings.xml +++ b/core/res/res/values-pt-rBR/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar com %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Compartilhar com"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Compartilhar com %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Enviar usando"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Enviar usando %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Selecione um app de Página inicial"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Usar %1$s como Página inicial"</string> <string name="alwaysUse" msgid="4583018368000610438">"Usar como padrão para esta ação."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"COMPARTILHAR"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"RECUSAR"</string> <string name="select_input_method" msgid="8547250819326693584">"Alterar teclado"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Escolher teclados"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Outros teclados"</string> <string name="show_ime" msgid="2506087537466597099">"Manter na tela enquanto o teclado físico estiver ativo"</string> <string name="hardware" msgid="194658061510127999">"Mostrar teclado virtual"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Selecione o layout de teclado"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Mais opções"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Armazenamento interno"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Cartão SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Cartão SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Drive USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Liberar guia"</string> <string name="app_info" msgid="6856026610594615344">"Informações do app"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Redefinir para a configuração original para usar este dispositivo sem restrições"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toque para saber mais."</string> </resources> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index 011ad4ecfa73..331cd9dda2ab 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar com %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Partilhar com"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Partilhar com %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Enviar com"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Enviar com %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Selecione uma aplicação Página inicial"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Utilizar %1$s como Página inicial"</string> <string name="alwaysUse" msgid="4583018368000610438">"Utilizar por predefinição para esta acção."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"PARTILHAR"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"RECUSAR"</string> <string name="select_input_method" msgid="8547250819326693584">"Alterar teclado"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Escolher teclados"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Outros teclados"</string> <string name="show_ime" msgid="2506087537466597099">"Manter no ecrã enquanto o teclado físico estiver ativo"</string> <string name="hardware" msgid="194658061510127999">"Mostrar o teclado virtual"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Selecionar esquema de teclado"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Mais opções"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"memória de armazenamento interno"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Cartão SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Cartão SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Unidade USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Soltar"</string> <string name="app_info" msgid="6856026610594615344">"Informações da aplicação"</string> <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Repor os dados de fábrica para utilizar o dispositivo sem restrições"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toque para saber mais."</string> </resources> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 21f6665d7677..62ee01c89760 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar com %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Compartilhar com"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Compartilhar com %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Enviar usando"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Enviar usando %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Selecione um app de Página inicial"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Usar %1$s como Página inicial"</string> <string name="alwaysUse" msgid="4583018368000610438">"Usar como padrão para esta ação."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"COMPARTILHAR"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"RECUSAR"</string> <string name="select_input_method" msgid="8547250819326693584">"Alterar teclado"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Escolher teclados"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Outros teclados"</string> <string name="show_ime" msgid="2506087537466597099">"Manter na tela enquanto o teclado físico estiver ativo"</string> <string name="hardware" msgid="194658061510127999">"Mostrar teclado virtual"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Selecione o layout de teclado"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Mais opções"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Armazenamento interno"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Cartão SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Cartão SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Drive USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Liberar guia"</string> <string name="app_info" msgid="6856026610594615344">"Informações do app"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Redefinir para a configuração original para usar este dispositivo sem restrições"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Toque para saber mais."</string> </resources> diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml index fe5139eb618e..dd4faad18f61 100644 --- a/core/res/res/values-ro/strings.xml +++ b/core/res/res/values-ro/strings.xml @@ -905,6 +905,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editați cu %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Trimiteți prin"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Distribuiți cu %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Trimiteți folosind"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Trimiteți folosind %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Selectați o aplicație de pe ecranul de pornire"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Utilizați %1$s ca ecran de pornire"</string> <string name="alwaysUse" msgid="4583018368000610438">"Se utilizează în mod prestabilit pentru această acțiune."</string> @@ -1066,7 +1068,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"TRIMITEȚI"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"REFUZAȚI"</string> <string name="select_input_method" msgid="8547250819326693584">"Schimbați tastatura"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Alegeți tastaturi"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Alte tastaturi"</string> <string name="show_ime" msgid="2506087537466597099">"Se păstrează pe ecran cât timp este activată tastatura fizică"</string> <string name="hardware" msgid="194658061510127999">"Afișați tastatura virtuală"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Selectați aspectul tastaturii"</string> @@ -1231,7 +1233,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Mai multe opțiuni"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Stocare internă"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Card SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Card SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Unitate USB"</string> @@ -1581,7 +1584,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Anulați fixarea"</string> <string name="app_info" msgid="6856026610594615344">"Informații despre aplicație"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Reveniți la setările din fabrică pentru a folosi acest dispozitiv fără restricții"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Atingeți pentru a afla mai multe."</string> </resources> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 40c85510bb48..4d618acb4069 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -911,6 +911,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Редактировать с помощью приложения \"%1$s\""</string> <string name="whichSendApplication" msgid="6902512414057341668">"Поделиться с помощью:"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Поделиться через %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Выберите приложение"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Отправка с помощью %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Выберите главное приложение"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Назначьте приложение \"%1$s\" главным"</string> <string name="alwaysUse" msgid="4583018368000610438">"По умолчанию для этого действия"</string> @@ -1074,7 +1076,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ПРЕДОСТАВИТЬ ДОСТУП"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ОТКЛОНИТЬ"</string> <string name="select_input_method" msgid="8547250819326693584">"Выбор раскладки"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Выбрать раскладку"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Другие клавиатуры"</string> <string name="show_ime" msgid="2506087537466597099">"Показывать на экране, когда физическая клавиатура включена"</string> <string name="hardware" msgid="194658061510127999">"Виртуальная клавиатура"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Выберите раскладку клавиатуры"</string> @@ -1240,7 +1242,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Ещё"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Внутр. накопитель"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD-карта"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"SD-карта <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB-накопитель"</string> @@ -1600,7 +1603,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Открепить"</string> <string name="app_info" msgid="6856026610594615344">"О приложении"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Сброс до заводских настроек для работы без ограничений"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Нажмите, чтобы узнать больше."</string> </resources> diff --git a/core/res/res/values-si-rLK/strings.xml b/core/res/res/values-si-rLK/strings.xml index 4f0c9713d901..5dbb9223134f 100644 --- a/core/res/res/values-si-rLK/strings.xml +++ b/core/res/res/values-si-rLK/strings.xml @@ -901,6 +901,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s සමඟ සංස්කරණය කරන්න"</string> <string name="whichSendApplication" msgid="6902512414057341668">"සමඟ බෙදාගන්න"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%s සමඟ බෙදාගන්න"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"මෙය භාවිතයෙන් යවන්න"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s භාවිතයෙන් යවන්න"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"මුල් පිටු යෙදුම තෝරන්න"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"මුල් පිටු යෙදුම ලෙස %1$s න් භාවිතා කරන්න"</string> <string name="alwaysUse" msgid="4583018368000610438">"මෙම ක්රියාව සඳහා සුපුරුද්දෙන් භාවිත කරන්න."</string> @@ -1060,7 +1062,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"බෙදා ගන්න"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ප්රතික්ෂේප කරන්න"</string> <string name="select_input_method" msgid="8547250819326693584">"යතුරු පුවරු වෙනස් කිරීම"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"යතුරු පුවරු තෝරන්න"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"වෙනත් යතුරු පුවරු"</string> <string name="show_ime" msgid="2506087537466597099">"භෞතික යතුරු පුවරුව සක්රිය අතරතුර එය තිරය මත තබා ගන්න"</string> <string name="hardware" msgid="194658061510127999">"අතථ්ය යතුරු පුවරුව පෙන්වන්න"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"යතුරු පුවරුවට පිරිසැලැස්ම තෝරන්න"</string> @@ -1224,7 +1226,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"තවත් විකල්ප"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"අභ්යන්තර ආචයනය"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD පත"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD කාඩ්පත"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ධාවකය"</string> @@ -1564,7 +1567,6 @@ <string name="unpin_target" msgid="3556545602439143442">"ගලවන්න"</string> <string name="app_info" msgid="6856026610594615344">"යෙදුම් තොරතුරු"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"සීමා කිරීම්වලින් තොරව මෙම උපාංගය භාවිත කිරීමට කර්මාන්ත ශාලා යළි සැකසීම"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"තව දැන ගැනීමට ස්පර්ශ කරන්න."</string> </resources> diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml index 46304349394d..75a2129d934f 100644 --- a/core/res/res/values-sk/strings.xml +++ b/core/res/res/values-sk/strings.xml @@ -911,6 +911,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Upraviť v aplikácii %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Zdieľať"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Zdieľať v aplikácii %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Odoslať pomocou aplikácie"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Odoslať pomocou aplikácie %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Výber aplikácie na plochu"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Ako plochu používať aplikáciu %1$s"</string> <string name="alwaysUse" msgid="4583018368000610438">"Použiť ako predvolené nastavenie pre túto akciu."</string> @@ -1074,7 +1076,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ZDIEĽAŤ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ODMIETNUŤ"</string> <string name="select_input_method" msgid="8547250819326693584">"Zmeniť klávesnicu"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Vybrať klávesnicu"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Ďalšie klávesnice"</string> <string name="show_ime" msgid="2506087537466597099">"Ponechať na obrazovke, keď je aktívna fyzická klávesnica"</string> <string name="hardware" msgid="194658061510127999">"Zobraziť virtuálnu klávesnicu"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Zvoľte rozloženie klávesnice"</string> @@ -1240,7 +1242,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Viac možností"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Interné úložisko"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD karta"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"SD karta <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Disk USB"</string> @@ -1600,7 +1603,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Uvoľniť"</string> <string name="app_info" msgid="6856026610594615344">"Info o aplikácii"</string> <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Ak chcete toto zariadenie používať bez obmedzení, obnovte na ňom továrenské nastavenia"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Klepnutím získate ďalšie informácie."</string> </resources> diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml index bf6075239b16..579880a4a42e 100644 --- a/core/res/res/values-sl/strings.xml +++ b/core/res/res/values-sl/strings.xml @@ -911,6 +911,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Urejanje z aplikacijo %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Skupna raba z aplikacijo"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Skupna raba z aplikacijo %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Pošiljanje z aplikacijo"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Pošiljanje z aplikacijo %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Izbira aplikacije na začetnem zaslonu"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Uporaba aplikacije %1$s na začetnem zaslonu"</string> <string name="alwaysUse" msgid="4583018368000610438">"Privzeta uporaba za to dejanje."</string> @@ -1074,7 +1076,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"SKUPNA RABA"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"NE SPREJMEM"</string> <string name="select_input_method" msgid="8547250819326693584">"Sprememba tipkovnice"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Izbira tipkovnic"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Druge tipkovnice"</string> <string name="show_ime" msgid="2506087537466597099">"Ohrani na zaslonu, dokler je aktivna fizična tipkovnica"</string> <string name="hardware" msgid="194658061510127999">"Pokaži navidezno tipkovnico"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Izberite razporeditev tipkovnice"</string> @@ -1240,7 +1242,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Več možnosti"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Notranja shramba"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Kartica SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Kartica SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Pogon USB"</string> @@ -1600,7 +1603,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Odpenjanje"</string> <string name="app_info" msgid="6856026610594615344">"Podatki o aplikaciji"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Ponastavitev naprave na tovarniške nastavitve za uporabo brez omejitev"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Dotaknite se, če želite izvedeti več."</string> </resources> diff --git a/core/res/res/values-sq-rAL/strings.xml b/core/res/res/values-sq-rAL/strings.xml index 8b78c767efe6..b39f297beda7 100644 --- a/core/res/res/values-sq-rAL/strings.xml +++ b/core/res/res/values-sq-rAL/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Redakto me %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Shpërnda publikisht me"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Shpërnda publikisht me %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Dërgo me"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Dërgo me %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Përzgjidh një aplikacion nga ekrani bazë"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Përdore %1$s si faqe bazë"</string> <string name="alwaysUse" msgid="4583018368000610438">"Përdore si parametër të paracaktuar për këtë veprim."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"SHPËRNDA"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"REFUZO"</string> <string name="select_input_method" msgid="8547250819326693584">"Ndërro tastierë"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Zgjidh tastierat"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Tastierat e tjera"</string> <string name="show_ime" msgid="2506087537466597099">"Mbaje në ekran ndërsa tastiera fizike është aktive"</string> <string name="hardware" msgid="194658061510127999">"Shfaq tastierën virtuale"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Përzgjidh planin e tastierës"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Opsione të tjera"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Hapësira e brendshme ruajtëse"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Karta SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Karta SD nga <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB-ja"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Zhgozhdo"</string> <string name="app_info" msgid="6856026610594615344">"Informacioni mbi aplikacionin"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Rivendos cilësimet e fabrikës për ta përdorur këtë pajisje pa kufizime"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Prek për të mësuar më shumë."</string> </resources> diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml index c68ec8867957..74fc273acbd1 100644 --- a/core/res/res/values-sr/strings.xml +++ b/core/res/res/values-sr/strings.xml @@ -905,6 +905,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Измените помоћу апликације %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Делите помоћу"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Делите помоћу апликације %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Пошаљите помоћу:"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Пошаљите помоћу: %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Изаберите апликацију за почетну страницу"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Користите %1$s за почетну"</string> <string name="alwaysUse" msgid="4583018368000610438">"Подразумевано користи за ову радњу."</string> @@ -1066,7 +1068,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ДЕЛИ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ОДБИЈ"</string> <string name="select_input_method" msgid="8547250819326693584">"Промените тастатуру"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Изаберите тастатуре"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Друге тастатуре"</string> <string name="show_ime" msgid="2506087537466597099">"Задржи га на екрану док је физичка тастатура активна"</string> <string name="hardware" msgid="194658061510127999">"Прикажи виртуелну тастатуру"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Избор распореда тастатуре"</string> @@ -1231,7 +1233,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Још опција"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Интерна меморија"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD картица"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD картица"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB диск"</string> @@ -1581,7 +1584,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Откачи"</string> <string name="app_info" msgid="6856026610594615344">"Информације о апликацији"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Ресетујте уређај на фабричка подешавања да бисте га користили без ограничења"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Додирните да бисте сазнали више."</string> </resources> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 46b1bf6d6f3d..610fa072e137 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Redigera med %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Dela med"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Dela med %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Skicka med"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Skicka med %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Välj en startsidesapp"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Använd %1$s som startsida"</string> <string name="alwaysUse" msgid="4583018368000610438">"Använd som standard för denna åtgärd."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"DELA"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"AVVISA"</string> <string name="select_input_method" msgid="8547250819326693584">"Byt tangentbord"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Välj tangentbord"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Andra tangentbord"</string> <string name="show_ime" msgid="2506087537466597099">"Ha kvar den på skärmen när det fysiska tangentbordet används"</string> <string name="hardware" msgid="194658061510127999">"Visa virtuellt tangentbord"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Välj en tangentbordslayout"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Fler alternativ"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"lagring"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD-kort"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"SD-kort (<xliff:g id="MANUFACTURER">%s</xliff:g>)"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB-enhet"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Lossa"</string> <string name="app_info" msgid="6856026610594615344">"Info om appen"</string> <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Återställ enheten till standardinställningarna om du vill använda den utan begränsningar"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Tryck här om du vill läsa mer."</string> </resources> diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml index fa3d151316cf..3d4bc60d66ad 100644 --- a/core/res/res/values-sw/strings.xml +++ b/core/res/res/values-sw/strings.xml @@ -901,6 +901,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Badilisha kwa %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Shiriki na"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Shiriki na %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Tuma kwa kutumia"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Tuma kwa kutumia %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Chagua programu ya Mwanzo"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Tumia %1$s kama programu ya Mwanzo"</string> <string name="alwaysUse" msgid="4583018368000610438">"Tumia kama chaguo-msingi la kitendo hiki."</string> @@ -1060,7 +1062,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"SHIRIKI"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"KATAA"</string> <string name="select_input_method" msgid="8547250819326693584">"Badilisha kibodi"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Chagua kibodi"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Kibodi zingine"</string> <string name="show_ime" msgid="2506087537466597099">"Iweke kwenye skrini wakati kibodi inapotumika"</string> <string name="hardware" msgid="194658061510127999">"Onyesha kibodi pepe"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Teua mpangilio wa kibodi"</string> @@ -1224,7 +1226,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Chaguo zaidi"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Hifadhi ya mfumo"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Kadi ya SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Kadi ya SD iliyotengenezwa na <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Hifadhi ya USB"</string> @@ -1564,7 +1567,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Bandua"</string> <string name="app_info" msgid="6856026610594615344">"Maelezo ya programu"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Rejesha mipangilio iliyotoka nayo kiwandani ili utumie kifaa hiki bila vikwazo"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Gusa ili kupata maelezo zaidi."</string> </resources> diff --git a/core/res/res/values-ta-rIN/strings.xml b/core/res/res/values-ta-rIN/strings.xml index 57bde42a2f81..9411f5b7ba54 100644 --- a/core/res/res/values-ta-rIN/strings.xml +++ b/core/res/res/values-ta-rIN/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s மூலம் திருத்து"</string> <string name="whichSendApplication" msgid="6902512414057341668">"இதன் மூலம் பகிர்"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s மூலம் பகிர்"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"இதைப் பயன்படுத்தி அனுப்பு:"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$sஐப் பயன்படுத்தி அனுப்பு"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"முகப்புப் பயன்பாட்டைத் தேர்வுசெய்க"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$sஐ முகப்பாகப் பயன்படுத்து"</string> <string name="alwaysUse" msgid="4583018368000610438">"இந்தச் செயலுக்கு இயல்பாகப் பயன்படுத்து."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"பகிர்"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"வேண்டாம்"</string> <string name="select_input_method" msgid="8547250819326693584">"விசைப்பலகையை மாற்று"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"விசைப்பலகைகளைத் தேர்வுசெய்க"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"பிற விசைப்பலகைகள்"</string> <string name="show_ime" msgid="2506087537466597099">"கைமுறை விசைப்பலகை இயக்கத்தில் இருக்கும் போது IMEஐ திரையில் வைத்திரு"</string> <string name="hardware" msgid="194658061510127999">"விர்ச்சுவல் விசைப்பலகையை காட்டு"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"விசைப்பலகைத் தளவமைப்பைத் தேர்ந்தெடுக்கவும்"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"மேலும் விருப்பங்கள்"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"அகச் சேமிப்பிடம்"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD கார்டு"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD கார்டு"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB டிரைவ்"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"பின்னை அகற்று"</string> <string name="app_info" msgid="6856026610594615344">"பயன்பாட்டுத் தகவல்"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"இந்தச் சாதனத்தைக் கட்டுப்பாடுகளின்றிப் பயன்படுத்த, ஆரம்ப நிலைக்கு மீட்டமைக்கவும்"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"மேலும் அறிய தொடவும்."</string> </resources> diff --git a/core/res/res/values-te-rIN/strings.xml b/core/res/res/values-te-rIN/strings.xml index d2381fc0a729..9beb1e10ea5b 100644 --- a/core/res/res/values-te-rIN/strings.xml +++ b/core/res/res/values-te-rIN/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$sతో సవరించు"</string> <string name="whichSendApplication" msgid="6902512414057341668">"దీనితో భాగస్వామ్యం చేయి"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$sతో భాగస్వామ్యం చేయి"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"దీన్ని ఉపయోగించి పంపండి"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$sని ఉపయోగించి పంపండి"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"హోమ్ అనువర్తనాన్ని ఎంచుకోండి"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$sని హోమ్గా ఉపయోగించండి"</string> <string name="alwaysUse" msgid="4583018368000610438">"ఈ చర్యకు డిఫాల్ట్గా ఉపయోగించండి."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"భాగస్వామ్యం చేయి"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"తిరస్కరిస్తున్నాను"</string> <string name="select_input_method" msgid="8547250819326693584">"కీబోర్డ్ను మార్చు"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"కీబోర్డ్లను ఎంచుకోండి"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"ఇతర కీబోర్డ్లు"</string> <string name="show_ime" msgid="2506087537466597099">"దీన్ని భౌతిక కీబోర్డ్ సక్రియంగా ఉన్నప్పుడు స్క్రీన్పై ఉంచుతుంది"</string> <string name="hardware" msgid="194658061510127999">"వర్చువల్ కీబోర్డ్ను చూపు"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"కీబోర్డ్ లేఅవుట్ను ఎంచుకోండి"</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"మరిన్ని ఎంపికలు"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"అంతర్గత నిల్వ"</string> + <string name="storage_internal" msgid="3570990907910199483">"అంతర్గత భాగస్వామ్య నిల్వ"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD కార్డు"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD కార్డ్"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB డ్రైవ్"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"అన్పిన్ చేయి"</string> <string name="app_info" msgid="6856026610594615344">"అనువర్తన సమాచారం"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"ఈ పరికరాన్ని ఎటువంటి పరిమితులు లేకుండా ఉపయోగించడానికి ఫ్యాక్టరీ రీసెట్ చేయండి"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"మరింత తెలుసుకోవడానికి తాకండి."</string> </resources> diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml index 1eedd0190766..353da8a7a780 100644 --- a/core/res/res/values-th/strings.xml +++ b/core/res/res/values-th/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"แก้ไขด้วย %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"แชร์กับ"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"แชร์กับ %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"ส่งโดยใช้"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"ส่งโดยใช้ %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"เลือกแอปหน้าแรก"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"ใช้ %1$s เป็นหน้าแรก"</string> <string name="alwaysUse" msgid="4583018368000610438">"ใช้ค่าเริ่มต้นสำหรับการทำงานนี้"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"แชร์"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ปฏิเสธ"</string> <string name="select_input_method" msgid="8547250819326693584">"เปลี่ยนแป้นพิมพ์"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"เลือกแป้นพิมพ์"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"แป้นพิมพ์อื่นๆ"</string> <string name="show_ime" msgid="2506087537466597099">"เปิดทิ้งไว้บนหน้าจอในระหว่างใช้งานแป้นพิมพ์จริง"</string> <string name="hardware" msgid="194658061510127999">"แสดงแป้นพิมพ์เสมือน"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"เลือกรูปแบบแป้นพิมพ์"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"ตัวเลือกเพิ่มเติม"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"ที่จัดเก็บข้อมูลภายใน"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"การ์ด SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"การ์ด SD ของ <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"ไดรฟ์ USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"เลิกปักหมุด"</string> <string name="app_info" msgid="6856026610594615344">"ข้อมูลแอป"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"รีเซ็ตเป็นค่าเริ่มต้นเพื่อใช้อุปกรณ์นี้โดยไร้ข้อจำกัด"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"แตะเพื่อเรียนรู้เพิ่มเติม"</string> </resources> diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml index d785cf4f398b..41ada1cb7bdb 100644 --- a/core/res/res/values-tl/strings.xml +++ b/core/res/res/values-tl/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"I-edit gamit ang %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Ibahagi gamit ang"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Ibahagi gamit ang %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Ipadala gamit ang"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Ipadala gamit ang %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Pumili ng app sa Home"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Gamitin ang %1$s bilang Home"</string> <string name="alwaysUse" msgid="4583018368000610438">"Gamitin bilang default para sa pagkilos na ito."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"IBAHAGI"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"TANGGIHAN"</string> <string name="select_input_method" msgid="8547250819326693584">"Baguhin ang keyboard"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Pumili ng mga keyboard"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Iba pang mga keyboard"</string> <string name="show_ime" msgid="2506087537466597099">"Panatilihin ito sa screen habang aktibo ang pisikal na keyboard"</string> <string name="hardware" msgid="194658061510127999">"Ipakita ang virtual keyboard"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Pumili ng layout ng keyboard"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Higit pang mga pagpipilian"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Panloob na storage"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD card"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD card"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB drive"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"I-unpin"</string> <string name="app_info" msgid="6856026610594615344">"Impormasyon ng app"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"I-factory reset upang magamit ang device na ito nang walang mga paghihigpit"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Pindutin upang matuto nang higit pa."</string> </resources> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index d4f2891c9d01..3a044634d860 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ile düzenle"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Şununla paylaş:"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ile paylaş"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Göndermek için kullanılacak uygulama"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s uygulamasını kullanarak gönderin"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Ana Ekran uygulaması seçin"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Ana Ekran olarak %1$s uygulamasını kullanın"</string> <string name="alwaysUse" msgid="4583018368000610438">"Varsayılan olarak bu işlem için kullan."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"PAYLAŞ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"REDDET"</string> <string name="select_input_method" msgid="8547250819326693584">"Klavyeyi değiştir"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Klavyeyi seç"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Diğer klavyeler"</string> <string name="show_ime" msgid="2506087537466597099">"Fiziksel klavye etkin durumdayken ekranda tut"</string> <string name="hardware" msgid="194658061510127999">"Sanal klavyeyi göster"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Klavye düzeni seçin"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Diğer seçenekler"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Dahili depolama birimi"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD kart"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD kartı"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB sürücü"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Sabitlemeyi kaldır"</string> <string name="app_info" msgid="6856026610594615344">"Uygulama bilgileri"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Bu cihazı kısıtlama olmadan kullanmak için fabrika ayarlarına sıfırlayın"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Daha fazla bilgi edinmek için dokunun."</string> </resources> diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml index aba18b58b83b..8142aa03372d 100644 --- a/core/res/res/values-uk/strings.xml +++ b/core/res/res/values-uk/strings.xml @@ -911,6 +911,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Редагувати за допомогою %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Надіслати через"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Надіслати через %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Надіслати через додаток"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Надіслати через додаток %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Вибрати головний додаток"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Зробити додаток %1$s головним"</string> <string name="alwaysUse" msgid="4583018368000610438">"Використ. за умовч. для цієї дії."</string> @@ -1074,7 +1076,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ПОДІЛИТИСЯ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"ВІДХИЛИТИ"</string> <string name="select_input_method" msgid="8547250819326693584">"Змінити клавіатуру"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Вибрати клавіатури"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Інші клавіатури"</string> <string name="show_ime" msgid="2506087537466597099">"Утримуйте на екрані, коли активна фізична клавіатура"</string> <string name="hardware" msgid="194658061510127999">"Показати віртуальну клавіатуру"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Виберіть розкладку клавіатури"</string> @@ -1240,7 +1242,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Інші варіанти"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Внутрішня пам’ять"</string> + <string name="storage_internal" msgid="3570990907910199483">"Внутрішнє спільне сховище"</string> <string name="storage_sd_card" msgid="3282948861378286745">"Карта SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Карта SD (<xliff:g id="MANUFACTURER">%s</xliff:g>)"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Носій USB"</string> @@ -1600,7 +1602,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Відкріпити"</string> <string name="app_info" msgid="6856026610594615344">"Про додаток"</string> <string name="negative_duration" msgid="5688706061127375131">"-<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Відновіть заводські параметри, щоб використовувати пристрій без обмежень"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Торкніться, щоб дізнатися більше."</string> </resources> diff --git a/core/res/res/values-ur-rPK/strings.xml b/core/res/res/values-ur-rPK/strings.xml index 47e6e885e15f..565cdd962250 100644 --- a/core/res/res/values-ur-rPK/strings.xml +++ b/core/res/res/values-ur-rPK/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s کے ساتھ ترمیم کریں"</string> <string name="whichSendApplication" msgid="6902512414057341668">"اس کے ساتھ اشتراک کریں"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s کے ساتھ اشتراک کریں"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"بھیجیں بذریعہ"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"بھیجیں بذریعہ %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"ایک Home ایپ منتخب کریں"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s کو Home کے بطور استعمال کریں"</string> <string name="alwaysUse" msgid="4583018368000610438">"اس کارروائی کیلئے بطور ڈیفالٹ استعمال کریں۔"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"اشتراک کریں"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"مسترد کریں"</string> <string name="select_input_method" msgid="8547250819326693584">"کی بورڈ تبدیل کریں"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"کی بورڈز منتخب کریں"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"دیگر کی بورڈز"</string> <string name="show_ime" msgid="2506087537466597099">"جب فزیکل کی بورڈ فعال ہو تو IME کو اسکرین پر رکھیں"</string> <string name="hardware" msgid="194658061510127999">"ورچوئل کی بورڈ دکھائیں"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"کی بورڈ کا خاکہ منتخب کریں"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"مزید اختیارات"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"داخلی اسٹوریج"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD کارڈ"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD کارڈ"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB ڈرائیو"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"پن ہٹائیں"</string> <string name="app_info" msgid="6856026610594615344">"ایپ کی معلومات"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"بغیر کسی حدود کے استعمال کرنے کیلئے اس آلے کو فیکٹری ری سیٹ کریں"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"مزید جاننے کیلئے ٹچ کریں۔"</string> </resources> diff --git a/core/res/res/values-uz-rUZ/strings.xml b/core/res/res/values-uz-rUZ/strings.xml index 88a417b5d531..1a8124540710 100644 --- a/core/res/res/values-uz-rUZ/strings.xml +++ b/core/res/res/values-uz-rUZ/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"“%1$s” yordamida tahrirlash"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Ulashish…"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"“%1$s” orqali ulashish"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Ilovani tanlang"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"%1$s yordamida yuborish"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Bosh ilovani tanlash"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"%1$s: Bosh ilova sifatida foydalanish"</string> <string name="alwaysUse" msgid="4583018368000610438">"Ushbu amaldan standart sifatida foydalanish"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"ULASHISH"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"RAD ETISH"</string> <string name="select_input_method" msgid="8547250819326693584">"Klaviaturani o‘zgartirish"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Klaviaturani tanlash"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Boshqa klaviaturalar"</string> <string name="show_ime" msgid="2506087537466597099">"Tashqi klaviaturadan foydalanilayotganda buni ekranda saqlab turish"</string> <string name="hardware" msgid="194658061510127999">"Virtual klaviatura ko‘rsatilsin"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Tugmalar tartibini tanlash"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Ko‘proq sozlamalar"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Ichki xotira"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD karta"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD kartasi"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB xotira"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Olib tashlash"</string> <string name="app_info" msgid="6856026610594615344">"Ilova haqida"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Bu qurilmadan cheklovlarsiz foydalanish uchun zavod sozlamalarini tiklang"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Ko‘proq o‘rganish uchun bosing."</string> </resources> diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml index b67008e02851..7302f7af23aa 100644 --- a/core/res/res/values-vi/strings.xml +++ b/core/res/res/values-vi/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Chỉnh sửa bằng %1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Chia sẻ với"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Chia sẻ với %1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Gửi bằng"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Gửi bằng %1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Chọn ứng dụng Home"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Sử dụng %1$s làm Home"</string> <string name="alwaysUse" msgid="4583018368000610438">"Sử dụng theo mặc định đối với tác vụ này."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"CHIA SẺ"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"TỪ CHỐI"</string> <string name="select_input_method" msgid="8547250819326693584">"Thay đổi bàn phím"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Chọn bàn phím"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Bàn phím khác"</string> <string name="show_ime" msgid="2506087537466597099">"Tiếp tục sử dụng ứng dụng trên màn hình trong khi bàn phím thực đang hoạt động"</string> <string name="hardware" msgid="194658061510127999">"Hiển thị bàn phím ảo"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Chọn bố cục bàn phím"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Tùy chọn khác"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Bộ nhớ trong"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Thẻ SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"Thẻ SD <xliff:g id="MANUFACTURER">%s</xliff:g>"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Ổ USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Bỏ ghim"</string> <string name="app_info" msgid="6856026610594615344">"Thông tin ứng dụng"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Khôi phục cài đặt gốc để sử dụng thiết bị này mà không bị hạn chế"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Chạm để tìm hiểu thêm."</string> </resources> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index d9e5a145ccd3..4c90e1ce1597 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"使用%1$s编辑"</string> <string name="whichSendApplication" msgid="6902512414057341668">"分享方式"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"使用%1$s分享"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"通过以下应用发送："</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"通过1$s发送"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"选择主屏幕应用"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"将“%1$s”设为主屏幕应用"</string> <string name="alwaysUse" msgid="4583018368000610438">"设为默认选项。"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"分享"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"拒绝"</string> <string name="select_input_method" msgid="8547250819326693584">"更改键盘"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"选择键盘"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"其他键盘"</string> <string name="show_ime" msgid="2506087537466597099">"连接到实体键盘时使其在屏幕上保持显示状态"</string> <string name="hardware" msgid="194658061510127999">"显示虚拟键盘"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"选择键盘布局"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"更多选项"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s：%2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s - %2$s：%3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"内部存储设备"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD卡"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD 卡"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"U 盘"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"取消固定"</string> <string name="app_info" msgid="6856026610594615344">"应用信息"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"恢复出厂设置即可正常使用此设备，不受任何限制"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"触摸即可了解详情。"</string> </resources> diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml index 64de938faff0..e15aaf2bb877 100644 --- a/core/res/res/values-zh-rHK/strings.xml +++ b/core/res/res/values-zh-rHK/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"使用 %1$s 編輯"</string> <string name="whichSendApplication" msgid="6902512414057341668">"分享對象"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"與 %1$s 分享"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"使用以下應用程式傳送："</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"使用「%1$s」傳送"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"選取主螢幕應用程式"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"使用「%1$s」作為主螢幕"</string> <string name="alwaysUse" msgid="4583018368000610438">"設定用於執行這項操作。"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"分享"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"拒絕"</string> <string name="select_input_method" msgid="8547250819326693584">"變更鍵盤"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"選擇鍵盤"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"其他鍵盤"</string> <string name="show_ime" msgid="2506087537466597099">"在實體鍵盤處於連接狀態時保持顯示"</string> <string name="hardware" msgid="194658061510127999">"顯示虛擬鍵盤"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"選取鍵盤配置"</string> @@ -1222,7 +1224,7 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"更多選項"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s：%2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s (%2$s)：%3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"內部儲存空間"</string> + <string name="storage_internal" msgid="3570990907910199483">"內部共用儲存空間"</string> <string name="storage_sd_card" msgid="3282948861378286745">"SD 記憶卡"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD 卡"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB 驅動器"</string> @@ -1562,7 +1564,6 @@ <string name="unpin_target" msgid="3556545602439143442">"取消固定"</string> <string name="app_info" msgid="6856026610594615344">"應用程式資料"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"將此裝置回復至原廠設定後，使用將不受限制"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"輕觸以瞭解詳情。"</string> </resources> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 756c52d62d07..a782d40ce3f7 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"使用 %1$s 編輯"</string> <string name="whichSendApplication" msgid="6902512414057341668">"選擇分享工具"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"透過 %1$s 分享"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"透過以下應用程式傳送："</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"透過「%1$s」傳送"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"選取主螢幕應用程式"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"使用「%1$s」做為主螢幕"</string> <string name="alwaysUse" msgid="4583018368000610438">"設為預設應用程式。"</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"分享"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"拒絕"</string> <string name="select_input_method" msgid="8547250819326693584">"變更鍵盤"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"選擇鍵盤"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"其他鍵盤"</string> <string name="show_ime" msgid="2506087537466597099">"有連接的實體鍵盤時保持顯示"</string> <string name="hardware" msgid="194658061510127999">"顯示虛擬鍵盤"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"選取鍵盤配置"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"更多選項"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s：%2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s - %2$s：%3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"內部儲存空間"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"SD 卡"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> SD 卡"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"USB 隨身碟"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"取消固定"</string> <string name="app_info" msgid="6856026610594615344">"應用程式資訊"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"恢復原廠設定即可正常使用這個裝置"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"輕觸即可瞭解詳情。"</string> </resources> diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml index 6ff550b7e2a8..23d72dc05127 100644 --- a/core/res/res/values-zu/strings.xml +++ b/core/res/res/values-zu/strings.xml @@ -899,6 +899,8 @@ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Hlela nge-%1$s"</string> <string name="whichSendApplication" msgid="6902512414057341668">"Yabelana no-"</string> <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Yabelana no-%1$s"</string> + <string name="whichSendToApplication" msgid="8272422260066642057">"Thumela usebenzisa"</string> + <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Thumela usebenzisa i-%1$s"</string> <string name="whichHomeApplication" msgid="4307587691506919691">"Khetha uhlelo lokusebenza lasekhaya"</string> <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Sebenzisa i-%1$s njengekhaya"</string> <string name="alwaysUse" msgid="4583018368000610438">"Sebenzisa ngokuzenzakalelayo kulesenzo."</string> @@ -1058,7 +1060,7 @@ <string name="share_remote_bugreport_action" msgid="6249476773913384948">"YABELANA"</string> <string name="decline_remote_bugreport_action" msgid="6230987241608770062">"YENQABA"</string> <string name="select_input_method" msgid="8547250819326693584">"Shintsha ikhibhodi"</string> - <string name="configure_input_methods" msgid="4769971288371946846">"Khetha amakhibhodi"</string> + <string name="configure_input_methods" msgid="5673193194563164021">"Amanye amakhibhodi"</string> <string name="show_ime" msgid="2506087537466597099">"Yigcine kusikrini ngenkathi kusebenza ikhibhodi ephathekayo"</string> <string name="hardware" msgid="194658061510127999">"Bonisa ikhibhodi ebonakalayo"</string> <string name="select_keyboard_layout_notification_title" msgid="1407367017263030773">"Khetha isendlalelo sekhibhodi"</string> @@ -1222,7 +1224,8 @@ <string name="action_menu_overflow_description" msgid="2295659037509008453">"Izinketho ezingaphezulu"</string> <string name="action_bar_home_description_format" msgid="7965984360903693903">"%1$s, %2$s"</string> <string name="action_bar_home_subtitle_description_format" msgid="6985546530471780727">"%1$s, %2$s, %3$s"</string> - <string name="storage_internal" msgid="4891916833657929263">"Isitoreji sangaphakathi"</string> + <!-- no translation found for storage_internal (3570990907910199483) --> + <skip /> <string name="storage_sd_card" msgid="3282948861378286745">"Ikhadi le-SD"</string> <string name="storage_sd_card_label" msgid="6347111320774379257">"<xliff:g id="MANUFACTURER">%s</xliff:g> ikhadi le-SD"</string> <string name="storage_usb_drive" msgid="6261899683292244209">"Idrayivu ye-USB"</string> @@ -1562,7 +1565,6 @@ <string name="unpin_target" msgid="3556545602439143442">"Susa ukuphina"</string> <string name="app_info" msgid="6856026610594615344">"Ulwazi lohlelo lokusebenza"</string> <string name="negative_duration" msgid="5688706061127375131">"−<xliff:g id="TIME">%1$s</xliff:g>"</string> - <!-- no translation found for audit_safemode_notification (6416076898350685856) --> - <skip /> + <string name="audit_safemode_notification" msgid="6416076898350685856">"Setha kabusha ukuze usebenzise idivayisi ngaphandle kwemikhawulo"</string> <string name="audit_safemode_notification_details" msgid="1860601176690176413">"Thinta ukuze ufunde kabanzi."</string> </resources> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 8c75a7f4f969..74ce753412a0 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -2943,8 +2943,8 @@ <!-- Title of the pop-up dialog in which the user switches keyboard, also known as input method. --> <string name="select_input_method">Change keyboard</string> - <!-- Title of a button to open the settings to enable or disable keyboards, also known as input methods [CHAR LIMIT=30] --> - <string name="configure_input_methods">Choose keyboards</string> + <!-- Title of a button to open the settings to enable or disable other soft keyboards (also known as input methods) [CHAR LIMIT=30] --> + <string name="configure_input_methods">Other keyboards</string> <!-- Summary text of a toggle switch to enable/disable use of the IME while a physical keyboard is connected --> <string name="show_ime">Keep it on screen while physical keyboard is active</string> @@ -3368,8 +3368,8 @@ tapping/clicking the whole thing is going to do. --> <string name="action_bar_home_subtitle_description_format">%1$s, %2$s, %3$s</string> - <!-- Storage description for internal storage. [CHAR LIMIT=NONE] --> - <string name="storage_internal">Internal storage</string> + <!-- Storage description for internal shared storage. [CHAR LIMIT=NONE] --> + <string name="storage_internal">Internal shared storage</string> <!-- Storage description for a generic SD card. [CHAR LIMIT=NONE] --> <string name="storage_sd_card">SD card</string> diff --git a/core/tests/coretests/res/layout/remote_views_test.xml b/core/tests/coretests/res/layout/remote_views_test.xml new file mode 100644 index 000000000000..c5f7a47c1e96 --- /dev/null +++ b/core/tests/coretests/res/layout/remote_views_test.xml @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2016 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/layout" + android:orientation="vertical"> + + <TextView android:id="@+id/text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + + <ImageView android:id="@+id/image" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + +</LinearLayout> diff --git a/core/tests/coretests/src/android/view/RemoteViewsTest.java b/core/tests/coretests/src/android/view/RemoteViewsTest.java new file mode 100644 index 000000000000..9c4fd7047334 --- /dev/null +++ b/core/tests/coretests/src/android/view/RemoteViewsTest.java @@ -0,0 +1,127 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License + */ + +package android.view; + +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.junit.runner.RunWith; + +import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.drawable.BitmapDrawable; +import android.graphics.drawable.Drawable; +import android.support.test.InstrumentationRegistry; +import android.support.test.filters.SmallTest; +import android.support.test.runner.AndroidJUnit4; +import android.widget.ImageView; +import android.widget.LinearLayout; +import android.widget.RemoteViews; +import android.widget.TextView; + +import com.android.frameworks.coretests.R; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; + +/** + * Tests for RemoteViews. + */ +@RunWith(AndroidJUnit4.class) +@SmallTest +public class RemoteViewsTest { + + @Rule + public final ExpectedException exception = ExpectedException.none(); + + private Context mContext; + private String mPackage; + private LinearLayout mContainer; + + @Before + public void setup() { + mContext = InstrumentationRegistry.getContext(); + mPackage = mPackage; + mContainer = new LinearLayout(mContext); + } + + @Test + public void clone_doesNotCopyBitmap() { + RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test); + Bitmap bitmap = Bitmap.createBitmap(10, 10, Bitmap.Config.ARGB_8888); + + original.setImageViewBitmap(R.id.image, bitmap); + RemoteViews clone = original.clone(); + View inflated = clone.apply(mContext, mContainer); + + Drawable drawable = ((ImageView) inflated.findViewById(R.id.image)).getDrawable(); + assertSame(bitmap, ((BitmapDrawable)drawable).getBitmap()); + } + + @Test + public void clone_originalCanStillBeApplied() { + RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test); + + RemoteViews clone = original.clone(); + + clone.apply(mContext, mContainer); + } + + @Test + public void clone_clones() { + RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test); + + RemoteViews clone = original.clone(); + original.setTextViewText(R.id.text, "test"); + View inflated = clone.apply(mContext, mContainer); + + TextView textView = (TextView) inflated.findViewById(R.id.text); + assertEquals("", textView.getText()); + } + + @Test + public void clone_child_fails() { + RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test); + RemoteViews child = new RemoteViews(mPackage, R.layout.remote_views_test); + + original.addView(R.id.layout, child); + + exception.expect(IllegalStateException.class); + RemoteViews clone = child.clone(); + } + + @Test + public void clone_repeatedly() { + RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test); + + original.clone(); + original.clone(); + + original.apply(mContext, mContainer); + } + + @Test + public void clone_chained() { + RemoteViews original = new RemoteViews(mPackage, R.layout.remote_views_test); + + RemoteViews clone = original.clone().clone(); + + clone.apply(mContext, mContainer); + } + +} diff --git a/core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java b/core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java index 923b8299a60a..3fbc16a655aa 100644 --- a/core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java +++ b/core/tests/coretests/src/android/widget/TextViewActivityMouseTest.java @@ -44,6 +44,7 @@ import com.android.frameworks.coretests.R; import android.support.test.espresso.Espresso; import android.test.ActivityInstrumentationTestCase2; import android.test.suitebuilder.annotation.SmallTest; +import android.test.suitebuilder.annotation.Suppress; import android.view.MotionEvent; import android.widget.espresso.ContextMenuUtils; @@ -97,6 +98,7 @@ public class TextViewActivityMouseTest extends ActivityInstrumentationTestCase2< } @SmallTest + @Suppress public void testContextMenu() throws Exception { final String text = "abc def ghi."; onView(withId(R.id.textview)).perform(click()); diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index ae9ebc762d76..46a0f438e8a4 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -804,7 +804,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { } private interface VectorDrawableAnimator { - void init(AnimatorSet set); + void init(@NonNull AnimatorSet set); void start(); void end(); void reset(); @@ -818,21 +818,44 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { } private static class VectorDrawableAnimatorUI implements VectorDrawableAnimator { - private AnimatorSet mSet = new AnimatorSet(); + // mSet is only initialized in init(). So we need to check whether it is null before any + // operation. + private AnimatorSet mSet = null; private final Drawable mDrawable; + // Caching the listener in the case when listener operation is called before the mSet is + // setup by init(). + private ArrayList<AnimatorListener> mListenerArray = null; - VectorDrawableAnimatorUI(AnimatedVectorDrawable drawable) { + VectorDrawableAnimatorUI(@NonNull AnimatedVectorDrawable drawable) { mDrawable = drawable; } @Override - public void init(AnimatorSet set) { - mSet = set; + public void init(@NonNull AnimatorSet set) { + if (mSet != null) { + // Already initialized + throw new UnsupportedOperationException("VectorDrawableAnimator cannot be " + + "re-initialized"); + } + // Keep a deep copy of the set, such that set can be still be constantly representing + // the static content from XML file. + mSet = set.clone(); + + // If there are listeners added before calling init(), now they should be setup. + if (mListenerArray != null && !mListenerArray.isEmpty()) { + for (int i = 0; i < mListenerArray.size(); i++) { + mSet.addListener(mListenerArray.get(i)); + } + mListenerArray.clear(); + mListenerArray = null; + } } + // Although start(), reset() and reverse() should call init() already, it is better to + // protect these functions from NPE in any situation. @Override public void start() { - if (mSet.isStarted()) { + if (mSet == null || mSet.isStarted()) { return; } mSet.start(); @@ -841,51 +864,74 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { @Override public void end() { + if (mSet == null) { + return; + } mSet.end(); } @Override public void reset() { + if (mSet == null) { + return; + } start(); mSet.cancel(); } @Override public void reverse() { + if (mSet == null) { + return; + } mSet.reverse(); invalidateOwningView(); } @Override public boolean canReverse() { - return mSet.canReverse(); + return mSet != null && mSet.canReverse(); } @Override public void setListener(AnimatorListener listener) { - mSet.addListener(listener); + if (mSet == null) { + if (mListenerArray == null) { + mListenerArray = new ArrayList<AnimatorListener>(); + } + mListenerArray.add(listener); + } else { + mSet.addListener(listener); + } } @Override public void removeListener(AnimatorListener listener) { - mSet.removeListener(listener); + if (mSet == null) { + if (mListenerArray == null) { + return; + } + mListenerArray.remove(listener); + } else { + mSet.removeListener(listener); + } } @Override public void onDraw(Canvas canvas) { - if (mSet.isStarted()) { + if (mSet != null && mSet.isStarted()) { invalidateOwningView(); } } @Override public boolean isStarted() { - return mSet.isStarted(); + return mSet != null && mSet.isStarted(); } @Override public boolean isRunning() { - return mSet.isRunning(); + return mSet != null && mSet.isRunning(); } private void invalidateOwningView() { @@ -928,7 +974,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { } @Override - public void init(AnimatorSet set) { + public void init(@NonNull AnimatorSet set) { if (mInitialized) { // Already initialized throw new UnsupportedOperationException("VectorDrawableAnimator cannot be " + diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java index fd3b9b47fe1a..5b1cc80665f0 100644 --- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java +++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java @@ -748,7 +748,14 @@ public class NinePatchDrawable extends Drawable { setDither(state.mDither); } - mTargetDensity = Drawable.resolveDensity(res, mTargetDensity); + // The nine-patch may have been created without a Resources object, in + // which case we should try to match the density of the nine patch (if + // available). + if (res == null && state.mNinePatch != null) { + mTargetDensity = state.mNinePatch.getDensity(); + } else { + mTargetDensity = Drawable.resolveDensity(res, mTargetDensity); + } mTintFilter = updateTintFilter(mTintFilter, state.mTint, state.mTintMode); computeBitmapSize(); } diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index bd069ffeddad..e75fb9870e0b 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -53,8 +53,15 @@ import java.util.HashMap; import java.util.Stack; /** - * This lets you create a drawable based on an XML vector graphic. It can be - * defined in an XML file with the <code><vector></code> element. + * This lets you create a drawable based on an XML vector graphic. + * <p/> + * <strong>Note:</strong> To optimize for the re-drawing performance, one bitmap cache is created + * for each VectorDrawable. Therefore, referring to the same VectorDrawable means sharing the same + * bitmap cache. If these references don't agree upon on the same size, the bitmap will be recreated + * and redrawn every time size is changed. In other words, if a VectorDrawable is used for + * different sizes, it is more efficient to create multiple VectorDrawables, one for each size. + * <p/> + * VectorDrawable can be defined in an XML file with the <code><vector></code> element. * <p/> * The vector drawable has the following elements: * <p/> diff --git a/libs/hwui/Android.mk b/libs/hwui/Android.mk index ca077389b629..516591b2f099 100644 --- a/libs/hwui/Android.mk +++ b/libs/hwui/Android.mk @@ -12,6 +12,11 @@ HWUI_ENABLE_OPENGL_VALIDATION := true hwui_src_files := \ font/CacheTexture.cpp \ font/Font.cpp \ + hwui/Canvas.cpp \ + hwui/MinikinSkia.cpp \ + hwui/MinikinUtils.cpp \ + hwui/PaintImpl.cpp \ + hwui/Typeface.cpp \ renderstate/Blend.cpp \ renderstate/MeshState.cpp \ renderstate/OffscreenBufferPool.cpp \ @@ -41,7 +46,6 @@ hwui_src_files := \ AnimatorManager.cpp \ AssetAtlas.cpp \ Caches.cpp \ - Canvas.cpp \ CanvasState.cpp \ ClipArea.cpp \ DamageAccumulator.cpp \ @@ -143,7 +147,9 @@ endef hwui_c_includes += \ external/skia/include/private \ - external/skia/src/core + external/skia/src/core \ + external/harfbuzz_ng/src \ + external/freetype/include ifneq (false,$(ANDROID_ENABLE_RENDERSCRIPT)) hwui_cflags += -DANDROID_ENABLE_RENDERSCRIPT diff --git a/libs/hwui/BakedOpRenderer.cpp b/libs/hwui/BakedOpRenderer.cpp index bb3ea3fa6b54..20f102bac351 100644 --- a/libs/hwui/BakedOpRenderer.cpp +++ b/libs/hwui/BakedOpRenderer.cpp @@ -198,8 +198,9 @@ void BakedOpRenderer::drawRects(const float* rects, int count, const SkPaint* pa LOG_ALWAYS_FATAL_IF(mRenderTarget.frameBufferId != 0, "decoration only supported for FBO 0"); // TODO: Currently assume full FBO damage, due to FrameInfoVisualizer::unionDirty. - // Should should scissor safely. + // Should should scissor/set mHasDrawn safely. mRenderState.scissor().setEnabled(false); + mHasDrawn = true; Glop glop; GlopBuilder(mRenderState, mCaches, &glop) .setRoundRectClipState(nullptr) diff --git a/libs/hwui/BakedOpState.cpp b/libs/hwui/BakedOpState.cpp index 26653f77daeb..859036543b4a 100644 --- a/libs/hwui/BakedOpState.cpp +++ b/libs/hwui/BakedOpState.cpp @@ -82,6 +82,16 @@ ResolvedRenderState::ResolvedRenderState(LinearAllocator& allocator, Snapshot& s } } +ResolvedRenderState::ResolvedRenderState(LinearAllocator& allocator, Snapshot& snapshot, + const Matrix4& localTransform, const ClipBase* localClip) { + transform.loadMultiply(*snapshot.transform, localTransform); + clipState = snapshot.mutateClipArea().serializeIntersectedClip(allocator, + localClip, *(snapshot.transform)); + clippedBounds = clipState->rect; + clipSideFlags = OpClipSideFlags::Full; + localProjectionPathMask = nullptr; +} + ResolvedRenderState::ResolvedRenderState(LinearAllocator& allocator, Snapshot& snapshot) : transform(*snapshot.transform) , clipState(snapshot.mutateClipArea().serializeClip(allocator)) diff --git a/libs/hwui/BakedOpState.h b/libs/hwui/BakedOpState.h index ffe2901782a9..4e3cb8a15e24 100644 --- a/libs/hwui/BakedOpState.h +++ b/libs/hwui/BakedOpState.h @@ -55,6 +55,10 @@ public: ResolvedRenderState(LinearAllocator& allocator, Snapshot& snapshot, const RecordedOp& recordedOp, bool expandForStroke); + // Constructor for unbounded ops *with* transform/clip + ResolvedRenderState(LinearAllocator& allocator, Snapshot& snapshot, + const Matrix4& localTransform, const ClipBase* localClip); + // Constructor for unbounded ops without transform/clip (namely shadows) ResolvedRenderState(LinearAllocator& allocator, Snapshot& snapshot); @@ -111,8 +115,14 @@ public: return bakedState; } + static BakedOpState* tryConstructUnbounded(LinearAllocator& allocator, + Snapshot& snapshot, const RecordedOp& recordedOp) { + if (CC_UNLIKELY(snapshot.getRenderTargetClip().isEmpty())) return nullptr; + return allocator.create_trivial<BakedOpState>(allocator, snapshot, recordedOp); + } + enum class StrokeBehavior { - // stroking is forced, regardless of style on paint + // stroking is forced, regardless of style on paint (such as for lines) Forced, // stroking is defined by style on paint StyleDefined, @@ -167,6 +177,13 @@ private: , roundRectClipState(snapshot.roundRectClipState) , op(&recordedOp) {} + // TODO: fix this brittleness + BakedOpState(LinearAllocator& allocator, Snapshot& snapshot, const RecordedOp& recordedOp) + : computedState(allocator, snapshot, recordedOp.localMatrix, recordedOp.localClip) + , alpha(snapshot.alpha) + , roundRectClipState(snapshot.roundRectClipState) + , op(&recordedOp) {} + BakedOpState(LinearAllocator& allocator, Snapshot& snapshot, const ShadowOp* shadowOpPtr) : computedState(allocator, snapshot) , alpha(snapshot.alpha) diff --git a/libs/hwui/Canvas.cpp b/libs/hwui/Canvas.cpp deleted file mode 100644 index 11ae1a137e2e..000000000000 --- a/libs/hwui/Canvas.cpp +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "Canvas.h" - -#include "DisplayListCanvas.h" -#include "RecordingCanvas.h" -#include <SkDrawFilter.h> - -namespace android { - -Canvas* Canvas::create_recording_canvas(int width, int height) { -#if HWUI_NEW_OPS - return new uirenderer::RecordingCanvas(width, height); -#else - return new uirenderer::DisplayListCanvas(width, height); -#endif -} - -void Canvas::drawTextDecorations(float x, float y, float length, const SkPaint& paint) { - uint32_t flags; - SkDrawFilter* drawFilter = getDrawFilter(); - if (drawFilter) { - SkPaint paintCopy(paint); - drawFilter->filter(&paintCopy, SkDrawFilter::kText_Type); - flags = paintCopy.getFlags(); - } else { - flags = paint.getFlags(); - } - if (flags & (SkPaint::kUnderlineText_Flag | SkPaint::kStrikeThruText_Flag)) { - // Same values used by Skia - const float kStdStrikeThru_Offset = (-6.0f / 21.0f); - const float kStdUnderline_Offset = (1.0f / 9.0f); - const float kStdUnderline_Thickness = (1.0f / 18.0f); - - SkScalar left = x; - SkScalar right = x + length; - float textSize = paint.getTextSize(); - float strokeWidth = fmax(textSize * kStdUnderline_Thickness, 1.0f); - if (flags & SkPaint::kUnderlineText_Flag) { - SkScalar top = y + textSize * kStdUnderline_Offset - 0.5f * strokeWidth; - SkScalar bottom = y + textSize * kStdUnderline_Offset + 0.5f * strokeWidth; - drawRect(left, top, right, bottom, paint); - } - if (flags & SkPaint::kStrikeThruText_Flag) { - SkScalar top = y + textSize * kStdStrikeThru_Offset - 0.5f * strokeWidth; - SkScalar bottom = y + textSize * kStdStrikeThru_Offset + 0.5f * strokeWidth; - drawRect(left, top, right, bottom, paint); - } - } -} - -} // namespace android diff --git a/libs/hwui/CanvasState.cpp b/libs/hwui/CanvasState.cpp index 43ff33f2b997..e2149d1e4a69 100644 --- a/libs/hwui/CanvasState.cpp +++ b/libs/hwui/CanvasState.cpp @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "Canvas.h" #include "CanvasState.h" +#include "hwui/Canvas.h" #include "utils/MathUtils.h" namespace android { diff --git a/libs/hwui/DisplayListCanvas.cpp b/libs/hwui/DisplayListCanvas.cpp index a14bdc4693e6..2dccf32a7c78 100644 --- a/libs/hwui/DisplayListCanvas.cpp +++ b/libs/hwui/DisplayListCanvas.cpp @@ -418,7 +418,7 @@ void DisplayListCanvas::drawVectorDrawable(VectorDrawableRoot* tree) { addDrawOp(new (alloc()) DrawVectorDrawableOp(tree)); } -void DisplayListCanvas::drawTextOnPath(const uint16_t* glyphs, int count, +void DisplayListCanvas::drawGlyphsOnPath(const uint16_t* glyphs, int count, const SkPath& path, float hOffset, float vOffset, const SkPaint& paint) { if (!glyphs || count <= 0) return; @@ -429,7 +429,7 @@ void DisplayListCanvas::drawTextOnPath(const uint16_t* glyphs, int count, addDrawOp(op); } -void DisplayListCanvas::drawText(const uint16_t* glyphs, const float* positions, +void DisplayListCanvas::drawGlyphs(const uint16_t* glyphs, const float* positions, int count, const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop, float boundsRight, float boundsBottom, float totalAdvance) { diff --git a/libs/hwui/DisplayListCanvas.h b/libs/hwui/DisplayListCanvas.h index a703e227fc8d..d6a5794734d6 100644 --- a/libs/hwui/DisplayListCanvas.h +++ b/libs/hwui/DisplayListCanvas.h @@ -17,12 +17,12 @@ #ifndef ANDROID_HWUI_DISPLAY_LIST_RENDERER_H #define ANDROID_HWUI_DISPLAY_LIST_RENDERER_H -#include "Canvas.h" #include "CanvasState.h" #include "DisplayList.h" #include "RenderNode.h" #include "ResourceCache.h" #include "SkiaCanvasProxy.h" +#include "hwui/Canvas.h" #include "utils/Macros.h" #include <SkDrawFilter.h> @@ -209,10 +209,10 @@ public: virtual void drawVectorDrawable(VectorDrawableRoot* tree) override; // Text - virtual void drawText(const uint16_t* glyphs, const float* positions, int count, + virtual void drawGlyphs(const uint16_t* glyphs, const float* positions, int count, const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop, float boundsRight, float boundsBottom, float totalAdvance) override; - virtual void drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& path, + virtual void drawGlyphsOnPath(const uint16_t* glyphs, int count, const SkPath& path, float hOffset, float vOffset, const SkPaint& paint) override; virtual bool drawTextAbsolutePos() const override { return false; } diff --git a/libs/hwui/FrameBuilder.cpp b/libs/hwui/FrameBuilder.cpp index 50b21a40d7c3..dc967e046f11 100644 --- a/libs/hwui/FrameBuilder.cpp +++ b/libs/hwui/FrameBuilder.cpp @@ -16,11 +16,11 @@ #include "FrameBuilder.h" -#include "Canvas.h" #include "LayerUpdateQueue.h" #include "RenderNode.h" #include "VectorDrawable.h" #include "renderstate/OffscreenBufferPool.h" +#include "hwui/Canvas.h" #include "utils/FatVector.h" #include "utils/PaintUtils.h" #include "utils/TraceUtils.h" @@ -574,7 +574,7 @@ void FrameBuilder::deferCirclePropsOp(const CirclePropsOp& op) { } void FrameBuilder::deferFunctorOp(const FunctorOp& op) { - BakedOpState* bakedState = tryBakeOpState(op); + BakedOpState* bakedState = tryBakeUnboundedOpState(op); if (!bakedState) return; // quick rejected currentLayer().deferUnmergeableOp(mAllocator, bakedState, OpBatchType::Functor); } @@ -663,7 +663,7 @@ void FrameBuilder::deferTextOp(const TextOp& op) { } void FrameBuilder::deferTextOnPathOp(const TextOnPathOp& op) { - BakedOpState* bakedState = tryBakeOpState(op); + BakedOpState* bakedState = tryBakeUnboundedOpState(op); if (!bakedState) return; // quick rejected currentLayer().deferUnmergeableOp(mAllocator, bakedState, textBatchId(*(op.paint))); } diff --git a/libs/hwui/FrameBuilder.h b/libs/hwui/FrameBuilder.h index f44306a931bf..8a00d336dc08 100644 --- a/libs/hwui/FrameBuilder.h +++ b/libs/hwui/FrameBuilder.h @@ -173,6 +173,10 @@ private: BakedOpState* tryBakeOpState(const RecordedOp& recordedOp) { return BakedOpState::tryConstruct(mAllocator, *mCanvasState.writableSnapshot(), recordedOp); } + BakedOpState* tryBakeUnboundedOpState(const RecordedOp& recordedOp) { + return BakedOpState::tryConstructUnbounded(mAllocator, *mCanvasState.writableSnapshot(), recordedOp); + } + // should always be surrounded by a save/restore pair, and not called if DisplayList is null void deferNodePropsAndOps(RenderNode& node); diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 7693fdcbe817..c0994272c964 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -17,7 +17,6 @@ #include <GpuMemoryTracker.h> #include "OpenGLRenderer.h" -#include "Canvas.h" #include "DeferredDisplayList.h" #include "GammaFontRenderer.h" #include "Glop.h" @@ -32,6 +31,7 @@ #include "SkiaShader.h" #include "Vector.h" #include "VertexBuffer.h" +#include "hwui/Canvas.h" #include "utils/GLUtils.h" #include "utils/PaintUtils.h" #include "utils/TraceUtils.h" diff --git a/libs/hwui/RecordedOp.h b/libs/hwui/RecordedOp.h index c37458d31029..96a57b6a8efe 100644 --- a/libs/hwui/RecordedOp.h +++ b/libs/hwui/RecordedOp.h @@ -257,8 +257,10 @@ struct CirclePropsOp : RecordedOp { }; struct FunctorOp : RecordedOp { - FunctorOp(BASE_PARAMS_PAINTLESS, Functor* functor) - : SUPER_PAINTLESS(FunctorOp) + // Note: undefined record-time bounds, since this op fills the clip + // TODO: explicitly define bounds + FunctorOp(const Matrix4& localMatrix, const ClipBase* localClip, Functor* functor) + : RecordedOp(RecordedOpId::FunctorOp, Rect(), localMatrix, localClip, nullptr) , functor(functor) {} Functor* functor; }; @@ -385,9 +387,10 @@ struct TextOp : RecordedOp { }; struct TextOnPathOp : RecordedOp { - TextOnPathOp(BASE_PARAMS, const glyph_t* glyphs, int glyphCount, - const SkPath* path, float hOffset, float vOffset) - : SUPER(TextOnPathOp) + // TODO: explicitly define bounds + TextOnPathOp(const Matrix4& localMatrix, const ClipBase* localClip, const SkPaint* paint, + const glyph_t* glyphs, int glyphCount, const SkPath* path, float hOffset, float vOffset) + : RecordedOp(RecordedOpId::TextOnPathOp, Rect(), localMatrix, localClip, paint) , glyphs(glyphs) , glyphCount(glyphCount) , path(path) diff --git a/libs/hwui/RecordingCanvas.cpp b/libs/hwui/RecordingCanvas.cpp index 11eb825a56b0..cf78781e8f81 100644 --- a/libs/hwui/RecordingCanvas.cpp +++ b/libs/hwui/RecordingCanvas.cpp @@ -24,14 +24,6 @@ namespace android { namespace uirenderer { -#define MIL_PIX 1000000 -static Rect sUnreasonablyLargeBounds(-MIL_PIX, -MIL_PIX, MIL_PIX, MIL_PIX); - -static const Rect& getConservativeOpBounds(const ClipBase* clip) { - // if op is clipped, that rect can be used, but otherwise just use a conservatively large rect - return clip ? clip->rect : sUnreasonablyLargeBounds; -} - RecordingCanvas::RecordingCanvas(size_t width, size_t height) : mState(*this) , mResourceCache(ResourceCache::getInstance()) { @@ -249,12 +241,10 @@ void RecordingCanvas::drawColor(int color, SkXfermode::Mode mode) { } void RecordingCanvas::drawPaint(const SkPaint& paint) { - const ClipBase* clip = getRecordedClip(); - addOp(alloc().create_trivial<RectOp>( - getConservativeOpBounds(clip), - Matrix4::identity(), - clip, - refPaint(&paint))); + SkRect bounds; + if (getClipBounds(&bounds)) { + drawRect(bounds.fLeft, bounds.fTop, bounds.fRight, bounds.fBottom, paint); + } } static Rect calcBoundsOfPoints(const float* points, int floatCount) { @@ -524,7 +514,7 @@ void RecordingCanvas::drawNinePatch(const SkBitmap& bitmap, const android::Res_p } // Text -void RecordingCanvas::drawText(const uint16_t* glyphs, const float* positions, int glyphCount, +void RecordingCanvas::drawGlyphs(const uint16_t* glyphs, const float* positions, int glyphCount, const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop, float boundsRight, float boundsBottom, float totalAdvance) { if (!glyphs || !positions || glyphCount <= 0 || PaintUtils::paintWillNotDrawText(paint)) return; @@ -540,15 +530,13 @@ void RecordingCanvas::drawText(const uint16_t* glyphs, const float* positions, i drawTextDecorations(x, y, totalAdvance, paint); } -void RecordingCanvas::drawTextOnPath(const uint16_t* glyphs, int glyphCount, const SkPath& path, +void RecordingCanvas::drawGlyphsOnPath(const uint16_t* glyphs, int glyphCount, const SkPath& path, float hOffset, float vOffset, const SkPaint& paint) { if (!glyphs || glyphCount <= 0 || PaintUtils::paintWillNotDrawText(paint)) return; glyphs = refBuffer<glyph_t>(glyphs, glyphCount); - auto clip = getRecordedClip(); addOp(alloc().create_trivial<TextOnPathOp>( - getConservativeOpBounds(clip), // TODO: explicitly define bounds *(mState.currentSnapshot()->transform), - clip, + getRecordedClip(), refPaint(&paint), glyphs, glyphCount, refPath(&path), hOffset, vOffset)); } @@ -599,11 +587,9 @@ void RecordingCanvas::drawLayer(DeferredLayerUpdater* layerHandle) { void RecordingCanvas::callDrawGLFunction(Functor* functor) { mDisplayList->functors.push_back(functor); - auto clip = getRecordedClip(); addOp(alloc().create_trivial<FunctorOp>( - getConservativeOpBounds(clip), *(mState.currentSnapshot()->transform), - clip, + getRecordedClip(), functor)); } diff --git a/libs/hwui/RecordingCanvas.h b/libs/hwui/RecordingCanvas.h index 719872d35169..1eb4fa0b884f 100644 --- a/libs/hwui/RecordingCanvas.h +++ b/libs/hwui/RecordingCanvas.h @@ -17,12 +17,12 @@ #ifndef ANDROID_HWUI_RECORDING_CANVAS_H #define ANDROID_HWUI_RECORDING_CANVAS_H -#include "Canvas.h" #include "CanvasState.h" #include "DisplayList.h" #include "ResourceCache.h" #include "SkiaCanvasProxy.h" #include "Snapshot.h" +#include "hwui/Canvas.h" #include "utils/LinearAllocator.h" #include "utils/Macros.h" #include "utils/NinePatch.h" @@ -191,10 +191,10 @@ public: const SkPaint* paint) override; // Text - virtual void drawText(const uint16_t* glyphs, const float* positions, int glyphCount, + virtual void drawGlyphs(const uint16_t* glyphs, const float* positions, int glyphCount, const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop, float boundsRight, float boundsBottom, float totalAdvance) override; - virtual void drawTextOnPath(const uint16_t* glyphs, int glyphCount, const SkPath& path, + virtual void drawGlyphsOnPath(const uint16_t* glyphs, int glyphCount, const SkPath& path, float hOffset, float vOffset, const SkPaint& paint) override; virtual bool drawTextAbsolutePos() const override { return false; } diff --git a/libs/hwui/RenderProperties.cpp b/libs/hwui/RenderProperties.cpp index 0b0f0fa4f304..f577785110d3 100644 --- a/libs/hwui/RenderProperties.cpp +++ b/libs/hwui/RenderProperties.cpp @@ -23,9 +23,9 @@ #include <SkPath.h> #include <SkPathOps.h> -#include "Canvas.h" #include "Matrix.h" #include "OpenGLRenderer.h" +#include "hwui/Canvas.h" #include "utils/MathUtils.h" namespace android { diff --git a/libs/hwui/SkiaCanvas.cpp b/libs/hwui/SkiaCanvas.cpp index bd4442dc378d..b1ecb7112207 100644 --- a/libs/hwui/SkiaCanvas.cpp +++ b/libs/hwui/SkiaCanvas.cpp @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "Canvas.h" #include "CanvasProperty.h" #include "Layer.h" #include "RenderNode.h" +#include "hwui/Canvas.h" #include <SkCanvas.h> #include <SkClipStack.h> @@ -147,11 +147,11 @@ public: float dstLeft, float dstTop, float dstRight, float dstBottom, const SkPaint* paint) override; - virtual void drawText(const uint16_t* text, const float* positions, int count, + virtual void drawGlyphs(const uint16_t* text, const float* positions, int count, const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop, float boundsRight, float boundsBottom, float totalAdvance) override; - virtual void drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& path, + virtual void drawGlyphsOnPath(const uint16_t* glyphs, int count, const SkPath& path, float hOffset, float vOffset, const SkPaint& paint) override; virtual bool drawTextAbsolutePos() const override { return true; } @@ -757,7 +757,7 @@ void SkiaCanvas::drawVectorDrawable(VectorDrawableRoot* vectorDrawable) { // Canvas draw operations: Text // ---------------------------------------------------------------------------- -void SkiaCanvas::drawText(const uint16_t* text, const float* positions, int count, +void SkiaCanvas::drawGlyphs(const uint16_t* text, const float* positions, int count, const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop, float boundsRight, float boundsBottom, float totalAdvance) { @@ -772,7 +772,7 @@ void SkiaCanvas::drawText(const uint16_t* text, const float* positions, int coun drawTextDecorations(x, y, totalAdvance, paint); } -void SkiaCanvas::drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& path, +void SkiaCanvas::drawGlyphsOnPath(const uint16_t* glyphs, int count, const SkPath& path, float hOffset, float vOffset, const SkPaint& paint) { mCanvas->drawTextOnPathHV(glyphs, count << 1, path, hOffset, vOffset, paint); } diff --git a/libs/hwui/SkiaCanvasProxy.cpp b/libs/hwui/SkiaCanvasProxy.cpp index 6530d4ed8d50..c6124803eb6a 100644 --- a/libs/hwui/SkiaCanvasProxy.cpp +++ b/libs/hwui/SkiaCanvasProxy.cpp @@ -290,7 +290,7 @@ void SkiaCanvasProxy::onDrawText(const void* text, size_t byteLength, SkScalar x } static_assert(sizeof(SkPoint) == sizeof(float)*2, "SkPoint is no longer two floats"); - mCanvas->drawText(glyphs.glyphIDs, &pointStorage[0].fX, glyphs.count, glyphs.paint, + mCanvas->drawGlyphs(glyphs.glyphIDs, &pointStorage[0].fX, glyphs.count, glyphs.paint, x, y, bounds.fLeft, bounds.fTop, bounds.fRight, bounds.fBottom, 0); } @@ -326,7 +326,7 @@ void SkiaCanvasProxy::onDrawPosText(const void* text, size_t byteLength, const S bounds.offset(x, y); static_assert(sizeof(SkPoint) == sizeof(float)*2, "SkPoint is no longer two floats"); - mCanvas->drawText(glyphs.glyphIDs, &posArray[0].fX, glyphs.count, glyphs.paint, x, y, + mCanvas->drawGlyphs(glyphs.glyphIDs, &posArray[0].fX, glyphs.count, glyphs.paint, x, y, bounds.fLeft, bounds.fTop, bounds.fRight, bounds.fBottom, 0); } @@ -344,7 +344,7 @@ void SkiaCanvasProxy::onDrawTextOnPath(const void* text, size_t byteLength, cons const SkMatrix* matrix, const SkPaint& origPaint) { // convert to glyphIDs if necessary GlyphIDConverter glyphs(text, byteLength, origPaint); - mCanvas->drawTextOnPath(glyphs.glyphIDs, glyphs.count, path, 0, 0, glyphs.paint); + mCanvas->drawGlyphsOnPath(glyphs.glyphIDs, glyphs.count, path, 0, 0, glyphs.paint); } void SkiaCanvasProxy::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y, diff --git a/libs/hwui/SkiaCanvasProxy.h b/libs/hwui/SkiaCanvasProxy.h index e342d192ea31..973c55fe2236 100644 --- a/libs/hwui/SkiaCanvasProxy.h +++ b/libs/hwui/SkiaCanvasProxy.h @@ -20,7 +20,7 @@ #include <cutils/compiler.h> #include <SkCanvas.h> -#include "Canvas.h" +#include "hwui/Canvas.h" namespace android { namespace uirenderer { diff --git a/libs/hwui/Snapshot.cpp b/libs/hwui/Snapshot.cpp index cf5e69a1e6ae..d7842801fdd8 100644 --- a/libs/hwui/Snapshot.cpp +++ b/libs/hwui/Snapshot.cpp @@ -16,7 +16,7 @@ #include "Snapshot.h" -#include "Canvas.h" +#include "hwui/Canvas.h" namespace android { namespace uirenderer { diff --git a/libs/hwui/VectorDrawable.h b/libs/hwui/VectorDrawable.h index 4d2fed096adf..7a45bf5ca8a8 100644 --- a/libs/hwui/VectorDrawable.h +++ b/libs/hwui/VectorDrawable.h @@ -17,7 +17,7 @@ #ifndef ANDROID_HWUI_VPATH_H #define ANDROID_HWUI_VPATH_H -#include "Canvas.h" +#include "hwui/Canvas.h" #include <SkBitmap.h> #include <SkColor.h> diff --git a/libs/hwui/hwui/Canvas.cpp b/libs/hwui/hwui/Canvas.cpp new file mode 100644 index 000000000000..8c3eea35e783 --- /dev/null +++ b/libs/hwui/hwui/Canvas.cpp @@ -0,0 +1,220 @@ +/* + * Copyright (C) 2015 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "Canvas.h" + +#include "DisplayListCanvas.h" +#include "RecordingCanvas.h" +#include "MinikinUtils.h" +#include "Paint.h" +#include "Typeface.h" + +#include <SkDrawFilter.h> + +namespace android { + +Canvas* Canvas::create_recording_canvas(int width, int height) { +#if HWUI_NEW_OPS + return new uirenderer::RecordingCanvas(width, height); +#else + return new uirenderer::DisplayListCanvas(width, height); +#endif +} + +void Canvas::drawTextDecorations(float x, float y, float length, const SkPaint& paint) { + uint32_t flags; + SkDrawFilter* drawFilter = getDrawFilter(); + if (drawFilter) { + SkPaint paintCopy(paint); + drawFilter->filter(&paintCopy, SkDrawFilter::kText_Type); + flags = paintCopy.getFlags(); + } else { + flags = paint.getFlags(); + } + if (flags & (SkPaint::kUnderlineText_Flag | SkPaint::kStrikeThruText_Flag)) { + // Same values used by Skia + const float kStdStrikeThru_Offset = (-6.0f / 21.0f); + const float kStdUnderline_Offset = (1.0f / 9.0f); + const float kStdUnderline_Thickness = (1.0f / 18.0f); + + SkScalar left = x; + SkScalar right = x + length; + float textSize = paint.getTextSize(); + float strokeWidth = fmax(textSize * kStdUnderline_Thickness, 1.0f); + if (flags & SkPaint::kUnderlineText_Flag) { + SkScalar top = y + textSize * kStdUnderline_Offset - 0.5f * strokeWidth; + SkScalar bottom = y + textSize * kStdUnderline_Offset + 0.5f * strokeWidth; + drawRect(left, top, right, bottom, paint); + } + if (flags & SkPaint::kStrikeThruText_Flag) { + SkScalar top = y + textSize * kStdStrikeThru_Offset - 0.5f * strokeWidth; + SkScalar bottom = y + textSize * kStdStrikeThru_Offset + 0.5f * strokeWidth; + drawRect(left, top, right, bottom, paint); + } + } +} + +static void simplifyPaint(int color, SkPaint* paint) { + paint->setColor(color); + paint->setShader(nullptr); + paint->setColorFilter(nullptr); + paint->setLooper(nullptr); + paint->setStrokeWidth(4 + 0.04 * paint->getTextSize()); + paint->setStrokeJoin(SkPaint::kRound_Join); + paint->setLooper(nullptr); +} + +class DrawTextFunctor { +public: + DrawTextFunctor(const Layout& layout, Canvas* canvas, uint16_t* glyphs, float* pos, + const SkPaint& paint, float x, float y, MinikinRect& bounds, float totalAdvance) + : layout(layout) + , canvas(canvas) + , glyphs(glyphs) + , pos(pos) + , paint(paint) + , x(x) + , y(y) + , bounds(bounds) + , totalAdvance(totalAdvance) { + } + + void operator()(size_t start, size_t end) { + if (canvas->drawTextAbsolutePos()) { + for (size_t i = start; i < end; i++) { + glyphs[i] = layout.getGlyphId(i); + pos[2 * i] = x + layout.getX(i); + pos[2 * i + 1] = y + layout.getY(i); + } + } else { + for (size_t i = start; i < end; i++) { + glyphs[i] = layout.getGlyphId(i); + pos[2 * i] = layout.getX(i); + pos[2 * i + 1] = layout.getY(i); + } + } + + size_t glyphCount = end - start; + + if (CC_UNLIKELY(canvas->isHighContrastText() && paint.getAlpha() != 0)) { + // high contrast draw path + int color = paint.getColor(); + int channelSum = SkColorGetR(color) + SkColorGetG(color) + SkColorGetB(color); + bool darken = channelSum < (128 * 3); + + // outline + SkPaint outlinePaint(paint); + simplifyPaint(darken ? SK_ColorWHITE : SK_ColorBLACK, &outlinePaint); + outlinePaint.setStyle(SkPaint::kStrokeAndFill_Style); + canvas->drawGlyphs(glyphs + start, pos + (2 * start), glyphCount, outlinePaint, x, y, + bounds.mLeft, bounds.mTop, bounds.mRight, bounds.mBottom, totalAdvance); + + // inner + SkPaint innerPaint(paint); + simplifyPaint(darken ? SK_ColorBLACK : SK_ColorWHITE, &innerPaint); + innerPaint.setStyle(SkPaint::kFill_Style); + canvas->drawGlyphs(glyphs + start, pos + (2 * start), glyphCount, innerPaint, x, y, + bounds.mLeft, bounds.mTop, bounds.mRight, bounds.mBottom, totalAdvance); + } else { + // standard draw path + canvas->drawGlyphs(glyphs + start, pos + (2 * start), glyphCount, paint, x, y, + bounds.mLeft, bounds.mTop, bounds.mRight, bounds.mBottom, totalAdvance); + } + } +private: + const Layout& layout; + Canvas* canvas; + uint16_t* glyphs; + float* pos; + const SkPaint& paint; + float x; + float y; + MinikinRect& bounds; + float totalAdvance; +}; + +void Canvas::drawText(const uint16_t* text, int start, int count, int contextCount, + float x, float y, int bidiFlags, const Paint& origPaint, Typeface* typeface) { + // minikin may modify the original paint + Paint paint(origPaint); + + Layout layout; + MinikinUtils::doLayout(&layout, &paint, bidiFlags, typeface, text, start, count, contextCount); + + size_t nGlyphs = layout.nGlyphs(); + std::unique_ptr<uint16_t[]> glyphs(new uint16_t[nGlyphs]); + std::unique_ptr<float[]> pos(new float[nGlyphs * 2]); + + x += MinikinUtils::xOffsetForTextAlign(&paint, layout); + + MinikinRect bounds; + layout.getBounds(&bounds); + if (!drawTextAbsolutePos()) { + bounds.offset(x, y); + } + + DrawTextFunctor f(layout, this, glyphs.get(), pos.get(), + paint, x, y, bounds, layout.getAdvance()); + MinikinUtils::forFontRun(layout, &paint, f); +} + +class DrawTextOnPathFunctor { +public: + DrawTextOnPathFunctor(const Layout& layout, Canvas* canvas, float hOffset, + float vOffset, const Paint& paint, const SkPath& path) + : layout(layout) + , canvas(canvas) + , hOffset(hOffset) + , vOffset(vOffset) + , paint(paint) + , path(path) { + } + + void operator()(size_t start, size_t end) { + uint16_t glyphs[1]; + for (size_t i = start; i < end; i++) { + glyphs[0] = layout.getGlyphId(i); + float x = hOffset + layout.getX(i); + float y = vOffset + layout.getY(i); + canvas->drawGlyphsOnPath(glyphs, 1, path, x, y, paint); + } + } +private: + const Layout& layout; + Canvas* canvas; + float hOffset; + float vOffset; + const Paint& paint; + const SkPath& path; +}; + +void Canvas::drawTextOnPath(const uint16_t* text, int count, int bidiFlags, const SkPath& path, + float hOffset, float vOffset, const Paint& paint, Typeface* typeface) { + Paint paintCopy(paint); + Layout layout; + MinikinUtils::doLayout(&layout, &paintCopy, bidiFlags, typeface, text, 0, count, count); + hOffset += MinikinUtils::hOffsetForTextAlign(&paintCopy, layout, path); + + // Set align to left for drawing, as we don't want individual + // glyphs centered or right-aligned; the offset above takes + // care of all alignment. + paintCopy.setTextAlign(Paint::kLeft_Align); + + DrawTextOnPathFunctor f(layout, this, hOffset, vOffset, paintCopy, path); + MinikinUtils::forFontRun(layout, &paintCopy, f); +} + +} // namespace android diff --git a/libs/hwui/Canvas.h b/libs/hwui/hwui/Canvas.h index 27facdf652cd..dc669f0b526a 100644 --- a/libs/hwui/Canvas.h +++ b/libs/hwui/hwui/Canvas.h @@ -59,6 +59,9 @@ class Tree; }; typedef uirenderer::VectorDrawable::Tree VectorDrawableRoot; +class Paint; +struct Typeface; + class ANDROID_API Canvas { public: virtual ~Canvas() {}; @@ -207,12 +210,12 @@ public: * drawText: count is of glyphs * totalAdvance: used to define width of text decorations (underlines, strikethroughs). */ - virtual void drawText(const uint16_t* glyphs, const float* positions, int count, + virtual void drawGlyphs(const uint16_t* glyphs, const float* positions, int count, const SkPaint& paint, float x, float y, float boundsLeft, float boundsTop, float boundsRight, float boundsBottom, float totalAdvance) = 0; /** drawTextOnPath: count is of glyphs */ - virtual void drawTextOnPath(const uint16_t* glyphs, int count, const SkPath& path, + virtual void drawGlyphsOnPath(const uint16_t* glyphs, int count, const SkPath& path, float hOffset, float vOffset, const SkPaint& paint) = 0; /** @@ -229,6 +232,16 @@ public: */ virtual void drawVectorDrawable(VectorDrawableRoot* tree); + /** + * Converts utf16 text to glyphs, calculating position and boundary, + * and delegating the final draw to virtual drawGlyphs method. + */ + void drawText(const uint16_t* text, int start, int count, int contextCount, + float x, float y, int bidiFlags, const Paint& origPaint, Typeface* typeface); + + void drawTextOnPath(const uint16_t* text, int count, int bidiFlags, const SkPath& path, + float hOffset, float vOffset, const Paint& paint, Typeface* typeface); + protected: void drawTextDecorations(float x, float y, float length, const SkPaint& paint); }; diff --git a/core/jni/android/graphics/MinikinSkia.cpp b/libs/hwui/hwui/MinikinSkia.cpp index 8ac5d4664687..b9e33589885e 100644 --- a/core/jni/android/graphics/MinikinSkia.cpp +++ b/libs/hwui/hwui/MinikinSkia.cpp @@ -14,14 +14,12 @@ * limitations under the License. */ -#include <SkTypeface.h> -#include <SkPaint.h> +#include "MinikinSkia.h" -#define LOG_TAG "Minikin" +#include <SkPaint.h> +#include <SkTypeface.h> #include <cutils/log.h> -#include "MinikinSkia.h" - namespace android { MinikinFontSkia::MinikinFontSkia(SkTypeface *typeface) : diff --git a/core/jni/android/graphics/MinikinSkia.h b/libs/hwui/hwui/MinikinSkia.h index 8f469ba01ddd..1d50168adac0 100644 --- a/core/jni/android/graphics/MinikinSkia.h +++ b/libs/hwui/hwui/MinikinSkia.h @@ -17,11 +17,15 @@ #ifndef _ANDROID_GRAPHICS_MINIKIN_SKIA_H_ #define _ANDROID_GRAPHICS_MINIKIN_SKIA_H_ +#include <cutils/compiler.h> #include <minikin/MinikinFont.h> +class SkPaint; +class SkTypeface; + namespace android { -class MinikinFontSkia : public MinikinFont { +class ANDROID_API MinikinFontSkia : public MinikinFont { public: // Note: this takes ownership of the reference (will unref on dtor) explicit MinikinFontSkia(SkTypeface *typeface); diff --git a/core/jni/android/graphics/MinikinUtils.cpp b/libs/hwui/hwui/MinikinUtils.cpp index 309d35b90260..67b775d98356 100644 --- a/core/jni/android/graphics/MinikinUtils.cpp +++ b/libs/hwui/hwui/MinikinUtils.cpp @@ -13,22 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +#include "MinikinUtils.h" -#define LOG_TAG "Minikin" -#include <cutils/log.h> -#include <string> - -#include "SkPathMeasure.h" #include "Paint.h" -#include "TypefaceImpl.h" +#include "SkPathMeasure.h" +#include "Typeface.h" -#include "MinikinUtils.h" +#include <cutils/log.h> +#include <string> namespace android { FontStyle MinikinUtils::prepareMinikinPaint(MinikinPaint* minikinPaint, FontCollection** pFont, - const Paint* paint, TypefaceImpl* typeface) { - const TypefaceImpl* resolvedFace = TypefaceImpl_resolveDefault(typeface); + const Paint* paint, Typeface* typeface) { + const Typeface* resolvedFace = Typeface::resolveDefault(typeface); *pFont = resolvedFace->fFontCollection; FontStyle resolved = resolvedFace->fStyle; @@ -53,7 +51,7 @@ FontStyle MinikinUtils::prepareMinikinPaint(MinikinPaint* minikinPaint, FontColl } void MinikinUtils::doLayout(Layout* layout, const Paint* paint, int bidiFlags, - TypefaceImpl* typeface, const uint16_t* buf, size_t start, size_t count, + Typeface* typeface, const uint16_t* buf, size_t start, size_t count, size_t bufSize) { FontCollection *font; MinikinPaint minikinPaint; @@ -62,7 +60,7 @@ void MinikinUtils::doLayout(Layout* layout, const Paint* paint, int bidiFlags, layout->doLayout(buf, start, count, bufSize, bidiFlags, minikinStyle, minikinPaint); } -float MinikinUtils::measureText(const Paint* paint, int bidiFlags, TypefaceImpl* typeface, +float MinikinUtils::measureText(const Paint* paint, int bidiFlags, Typeface* typeface, const uint16_t* buf, size_t start, size_t count, size_t bufSize, float *advances) { FontCollection *font; MinikinPaint minikinPaint; @@ -71,8 +69,8 @@ float MinikinUtils::measureText(const Paint* paint, int bidiFlags, TypefaceImpl* font, advances); } -bool MinikinUtils::hasVariationSelector(TypefaceImpl* typeface, uint32_t codepoint, uint32_t vs) { - const TypefaceImpl* resolvedFace = TypefaceImpl_resolveDefault(typeface); +bool MinikinUtils::hasVariationSelector(Typeface* typeface, uint32_t codepoint, uint32_t vs) { + const Typeface* resolvedFace = Typeface::resolveDefault(typeface); return resolvedFace->fFontCollection->hasVariationSelector(codepoint, vs); } diff --git a/core/jni/android/graphics/MinikinUtils.h b/libs/hwui/hwui/MinikinUtils.h index 91525397b2ba..cfaa961ac1fc 100644 --- a/core/jni/android/graphics/MinikinUtils.h +++ b/libs/hwui/hwui/MinikinUtils.h @@ -24,33 +24,34 @@ #ifndef _ANDROID_GRAPHICS_MINIKIN_UTILS_H_ #define _ANDROID_GRAPHICS_MINIKIN_UTILS_H_ +#include <cutils/compiler.h> #include <minikin/Layout.h> #include "Paint.h" #include "MinikinSkia.h" -#include "TypefaceImpl.h" +#include "Typeface.h" namespace android { class MinikinUtils { public: - static FontStyle prepareMinikinPaint(MinikinPaint* minikinPaint, FontCollection** pFont, - const Paint* paint, TypefaceImpl* typeface); + ANDROID_API static FontStyle prepareMinikinPaint(MinikinPaint* minikinPaint, FontCollection** pFont, + const Paint* paint, Typeface* typeface); - static void doLayout(Layout* layout, const Paint* paint, int bidiFlags, - TypefaceImpl* typeface, const uint16_t* buf, size_t start, size_t count, + ANDROID_API static void doLayout(Layout* layout, const Paint* paint, int bidiFlags, + Typeface* typeface, const uint16_t* buf, size_t start, size_t count, size_t bufSize); - static float measureText(const Paint* paint, int bidiFlags, TypefaceImpl* typeface, + ANDROID_API static float measureText(const Paint* paint, int bidiFlags, Typeface* typeface, const uint16_t* buf, size_t start, size_t count, size_t bufSize, float *advances); - static bool hasVariationSelector(TypefaceImpl* typeface, uint32_t codepoint, uint32_t vs); + ANDROID_API static bool hasVariationSelector(Typeface* typeface, uint32_t codepoint, uint32_t vs); - static float xOffsetForTextAlign(Paint* paint, const Layout& layout); + ANDROID_API static float xOffsetForTextAlign(Paint* paint, const Layout& layout); - static float hOffsetForTextAlign(Paint* paint, const Layout& layout, const SkPath& path); + ANDROID_API static float hOffsetForTextAlign(Paint* paint, const Layout& layout, const SkPath& path); // f is a functor of type void f(size_t start, size_t end); template <typename F> - static void forFontRun(const Layout& layout, Paint* paint, F& f) { + ANDROID_API static void forFontRun(const Layout& layout, Paint* paint, F& f) { float saveSkewX = paint->getTextSkewX(); bool savefakeBold = paint->isFakeBoldText(); MinikinFont* curFont = NULL; diff --git a/core/jni/android/graphics/Paint.h b/libs/hwui/hwui/Paint.h index cb6e622ccced..69c321ca0caa 100644 --- a/core/jni/android/graphics/Paint.h +++ b/libs/hwui/hwui/Paint.h @@ -17,6 +17,8 @@ #ifndef ANDROID_GRAPHICS_PAINT_H_ #define ANDROID_GRAPHICS_PAINT_H_ +#include <cutils/compiler.h> + #include <SkPaint.h> #include <string> @@ -24,7 +26,7 @@ namespace android { -class Paint : public SkPaint { +class ANDROID_API Paint : public SkPaint { public: Paint(); Paint(const Paint& paint); @@ -45,7 +47,7 @@ public: return mLetterSpacing; } - void setFontFeatureSettings(const std::string &fontFeatureSettings) { + void setFontFeatureSettings(const std::string& fontFeatureSettings) { mFontFeatureSettings = fontFeatureSettings; } diff --git a/core/jni/android/graphics/PaintImpl.cpp b/libs/hwui/hwui/PaintImpl.cpp index bd513ae60823..1172a0e044b1 100644 --- a/core/jni/android/graphics/PaintImpl.cpp +++ b/libs/hwui/hwui/PaintImpl.cpp @@ -15,10 +15,6 @@ */ #include "Paint.h" -#include <SkPaint.h> - -#define LOG_TAG "Paint" -#include <cutils/log.h> namespace android { diff --git a/core/jni/android/graphics/TypefaceImpl.cpp b/libs/hwui/hwui/Typeface.cpp index da56290c94f9..fa8ad5d6ce32 100644 --- a/core/jni/android/graphics/TypefaceImpl.cpp +++ b/libs/hwui/hwui/Typeface.cpp @@ -20,26 +20,21 @@ * being, that choice is hidden under the USE_MINIKIN compile-time flag. */ -#define LOG_TAG "TypefaceImpl" - -#include "jni.h" // for jlong, remove when being passed proper type +#include "Typeface.h" +#include "MinikinSkia.h" #include "SkTypeface.h" +#include "SkPaint.h" -#include <vector> #include <minikin/FontCollection.h> #include <minikin/FontFamily.h> #include <minikin/Layout.h> -#include "SkPaint.h" -#include "MinikinSkia.h" - -#include "TypefaceImpl.h" -#include "Utils.h" +#include <utils/Log.h> namespace android { // Resolve the 1..9 weight based on base weight and bold flag -static void resolveStyle(TypefaceImpl* typeface) { +static void resolveStyle(Typeface* typeface) { int weight = typeface->fBaseWeight / 100; if (typeface->fSkiaStyle & SkTypeface::kBold) { weight += 3; @@ -51,7 +46,7 @@ static void resolveStyle(TypefaceImpl* typeface) { typeface->fStyle = FontStyle(weight, italic); } -TypefaceImpl* gDefaultTypeface = NULL; +Typeface* gDefaultTypeface = NULL; pthread_once_t gDefaultTypefaceOnce = PTHREAD_ONCE_INIT; // This installs a default typeface (from a hardcoded path) that allows @@ -90,7 +85,7 @@ static void getDefaultTypefaceOnce() { if (gDefaultTypeface == NULL) { // We expect the client to set a default typeface, but provide a // default so we can make progress before that happens. - gDefaultTypeface = new TypefaceImpl; + gDefaultTypeface = new Typeface; gDefaultTypeface->fFontCollection = makeFontCollection(); gDefaultTypeface->fSkiaStyle = SkTypeface::kNormal; gDefaultTypeface->fBaseWeight = 400; @@ -98,7 +93,7 @@ static void getDefaultTypefaceOnce() { } } -TypefaceImpl* TypefaceImpl_resolveDefault(TypefaceImpl* src) { +Typeface* Typeface::resolveDefault(Typeface* src) { if (src == NULL) { pthread_once(&gDefaultTypefaceOnce, getDefaultTypefaceOnce); return gDefaultTypeface; @@ -107,9 +102,9 @@ TypefaceImpl* TypefaceImpl_resolveDefault(TypefaceImpl* src) { } } -TypefaceImpl* TypefaceImpl_createFromTypeface(TypefaceImpl* src, SkTypeface::Style style) { - TypefaceImpl* resolvedFace = TypefaceImpl_resolveDefault(src); - TypefaceImpl* result = new TypefaceImpl; +Typeface* Typeface::createFromTypeface(Typeface* src, SkTypeface::Style style) { + Typeface* resolvedFace = Typeface::resolveDefault(src); + Typeface* result = new Typeface; if (result != 0) { result->fFontCollection = resolvedFace->fFontCollection; result->fFontCollection->Ref(); @@ -120,9 +115,9 @@ TypefaceImpl* TypefaceImpl_createFromTypeface(TypefaceImpl* src, SkTypeface::Sty return result; } -TypefaceImpl* TypefaceImpl_createWeightAlias(TypefaceImpl* src, int weight) { - TypefaceImpl* resolvedFace = TypefaceImpl_resolveDefault(src); - TypefaceImpl* result = new TypefaceImpl; +Typeface* Typeface::createWeightAlias(Typeface* src, int weight) { + Typeface* resolvedFace = Typeface::resolveDefault(src); + Typeface* result = new Typeface; if (result != 0) { result->fFontCollection = resolvedFace->fFontCollection; result->fFontCollection->Ref(); @@ -133,15 +128,10 @@ TypefaceImpl* TypefaceImpl_createWeightAlias(TypefaceImpl* src, int weight) { return result; } -TypefaceImpl* TypefaceImpl_createFromFamilies(const jlong* families, size_t size) { - std::vector<FontFamily *>familyVec; - for (size_t i = 0; i < size; i++) { - FontFamily* family = reinterpret_cast<FontFamily*>(families[i]); - familyVec.push_back(family); - } - TypefaceImpl* result = new TypefaceImpl; - result->fFontCollection = new FontCollection(familyVec); - if (size == 0) { +Typeface* Typeface::createFromFamilies(const std::vector<FontFamily*>& families) { + Typeface* result = new Typeface; + result->fFontCollection = new FontCollection(families); + if (families.empty()) { ALOGW("createFromFamilies creating empty collection"); result->fSkiaStyle = SkTypeface::kNormal; } else { @@ -162,18 +152,12 @@ TypefaceImpl* TypefaceImpl_createFromFamilies(const jlong* families, size_t size return result; } -void TypefaceImpl_unref(TypefaceImpl* face) { - if (face != NULL) { - face->fFontCollection->Unref(); - } - delete face; -} - -int TypefaceImpl_getStyle(TypefaceImpl* face) { - return face->fSkiaStyle; +void Typeface::unref() { + fFontCollection->Unref(); + delete this; } -void TypefaceImpl_setDefault(TypefaceImpl* face) { +void Typeface::setDefault(Typeface* face) { gDefaultTypeface = face; } diff --git a/core/jni/android/graphics/TypefaceImpl.h b/libs/hwui/hwui/Typeface.h index 4b14917eaaf2..8862e5a5a911 100644 --- a/core/jni/android/graphics/TypefaceImpl.h +++ b/libs/hwui/hwui/Typeface.h @@ -18,15 +18,15 @@ #ifndef _ANDROID_GRAPHICS_TYPEFACE_IMPL_H_ #define _ANDROID_GRAPHICS_TYPEFACE_IMPL_H_ -#include "jni.h" // for jlong, eventually remove #include "SkTypeface.h" -#include <androidfw/AssetManager.h> +#include <cutils/compiler.h> #include <minikin/FontCollection.h> +#include <vector> namespace android { -struct TypefaceImpl { +struct ANDROID_API Typeface { FontCollection *fFontCollection; // style used for constructing and querying Typeface objects @@ -36,29 +36,19 @@ struct TypefaceImpl { // resolved style actually used for rendering FontStyle fStyle; -}; - -// Note: it would be cleaner if the following functions were member -// functions (static or otherwise) of the TypefaceImpl class. However, -// that can't be easily accommodated in the case where TypefaceImpl -// is just a pointer to SkTypeface, in the non-USE_MINIKIN case. -// TODO: when #ifdef USE_MINIKIN is removed, move to member functions. -TypefaceImpl* TypefaceImpl_resolveDefault(TypefaceImpl* src); + void unref(); -TypefaceImpl* TypefaceImpl_createFromTypeface(TypefaceImpl* src, SkTypeface::Style style); + static Typeface* resolveDefault(Typeface* src); -TypefaceImpl* TypefaceImpl_createWeightAlias(TypefaceImpl* src, int baseweight); + static Typeface* createFromTypeface(Typeface* src, SkTypeface::Style style); -// When we remove the USE_MINIKIN ifdef, probably a good idea to move the casting -// (from jlong to FontFamily*) to the caller in Typeface.cpp. -TypefaceImpl* TypefaceImpl_createFromFamilies(const jlong* families, size_t size); + static Typeface* createWeightAlias(Typeface* src, int baseweight); -void TypefaceImpl_unref(TypefaceImpl* face); + static Typeface* createFromFamilies(const std::vector<FontFamily*>& families); -int TypefaceImpl_getStyle(TypefaceImpl* face); - -void TypefaceImpl_setDefault(TypefaceImpl* face); + static void setDefault(Typeface* face); +}; } diff --git a/libs/hwui/hwui_static_deps.mk b/libs/hwui/hwui_static_deps.mk index 7d4ef0f1f31e..299095217a8d 100644 --- a/libs/hwui/hwui_static_deps.mk +++ b/libs/hwui/hwui_static_deps.mk @@ -21,8 +21,11 @@ LOCAL_SHARED_LIBRARIES += \ libskia \ libui \ libgui \ - libprotobuf-cpp-lite + libprotobuf-cpp-lite \ + libharfbuzz_ng \ + libft2 \ + libminikin ifneq (false,$(ANDROID_ENABLE_RENDERSCRIPT)) LOCAL_SHARED_LIBRARIES += libRS libRScpp -endif
\ No newline at end of file +endif diff --git a/libs/hwui/renderthread/CanvasContext.cpp b/libs/hwui/renderthread/CanvasContext.cpp index c539d63daed3..31eec8cf3173 100644 --- a/libs/hwui/renderthread/CanvasContext.cpp +++ b/libs/hwui/renderthread/CanvasContext.cpp @@ -19,7 +19,6 @@ #include "AnimationContext.h" #include "Caches.h" -#include "Canvas.h" #include "DeferredLayerUpdater.h" #include "EglManager.h" #include "LayerUpdateQueue.h" @@ -27,6 +26,7 @@ #include "OpenGLRenderer.h" #include "Properties.h" #include "RenderThread.h" +#include "hwui/Canvas.h" #include "renderstate/RenderState.h" #include "renderstate/Stencil.h" #include "protos/hwui.pb.h" diff --git a/libs/hwui/tests/common/TestUtils.cpp b/libs/hwui/tests/common/TestUtils.cpp index c809ff4f85e8..a4aee61a7b11 100644 --- a/libs/hwui/tests/common/TestUtils.cpp +++ b/libs/hwui/tests/common/TestUtils.cpp @@ -87,7 +87,7 @@ void TestUtils::layoutTextUnscaled(const SkPaint& paint, const char* text, *outTotalAdvance = totalAdvance; } -void TestUtils::drawTextToCanvas(TestCanvas* canvas, const char* text, +void TestUtils::drawUtf8ToCanvas(TestCanvas* canvas, const char* text, const SkPaint& paint, float x, float y) { // drawing text requires GlyphID TextEncoding (which JNI layer would have done) LOG_ALWAYS_FATAL_IF(paint.getTextEncoding() != SkPaint::kGlyphID_TextEncoding, @@ -113,11 +113,11 @@ void TestUtils::drawTextToCanvas(TestCanvas* canvas, const char* text, // Force left alignment, since alignment offset is already baked in SkPaint alignPaintCopy(paint); alignPaintCopy.setTextAlign(SkPaint::kLeft_Align); - canvas->drawText(glyphs.data(), positions.data(), glyphs.size(), alignPaintCopy, x, y, + canvas->drawGlyphs(glyphs.data(), positions.data(), glyphs.size(), alignPaintCopy, x, y, bounds.left, bounds.top, bounds.right, bounds.bottom, totalAdvance); } -void TestUtils::drawTextToCanvas(TestCanvas* canvas, const char* text, +void TestUtils::drawUtf8ToCanvas(TestCanvas* canvas, const char* text, const SkPaint& paint, const SkPath& path) { // drawing text requires GlyphID TextEncoding (which JNI layer would have done) LOG_ALWAYS_FATAL_IF(paint.getTextEncoding() != SkPaint::kGlyphID_TextEncoding, @@ -130,7 +130,7 @@ void TestUtils::drawTextToCanvas(TestCanvas* canvas, const char* text, SkUnichar unichar = SkUTF8_NextUnichar(&text); glyphs.push_back(autoCache.getCache()->unicharToGlyph(unichar)); } - canvas->drawTextOnPath(glyphs.data(), glyphs.size(), path, 0, 0, paint); + canvas->drawGlyphsOnPath(glyphs.data(), glyphs.size(), path, 0, 0, paint); } void TestUtils::TestTask::run() { @@ -143,5 +143,13 @@ void TestUtils::TestTask::run() { renderState.onGLContextDestroyed(); } +std::unique_ptr<uint16_t[]> TestUtils::utf8ToUtf16(const char* str) { + const size_t strLen = strlen(str); + const ssize_t utf16Len = utf8_to_utf16_length((uint8_t*) str, strLen); + std::unique_ptr<uint16_t[]> dst(new uint16_t[utf16Len + 1]); + utf8_to_utf16((uint8_t*) str, strLen, (char16_t*) dst.get()); + return dst; +} + } /* namespace uirenderer */ } /* namespace android */ diff --git a/libs/hwui/tests/common/TestUtils.h b/libs/hwui/tests/common/TestUtils.h index 28ac1166fc5c..a5e7a5fb808c 100644 --- a/libs/hwui/tests/common/TestUtils.h +++ b/libs/hwui/tests/common/TestUtils.h @@ -207,12 +207,14 @@ public: std::vector<glyph_t>* outGlyphs, std::vector<float>* outPositions, float* outTotalAdvance, Rect* outBounds); - static void drawTextToCanvas(TestCanvas* canvas, const char* text, + static void drawUtf8ToCanvas(TestCanvas* canvas, const char* text, const SkPaint& paint, float x, float y); - static void drawTextToCanvas(TestCanvas* canvas, const char* text, + static void drawUtf8ToCanvas(TestCanvas* canvas, const char* text, const SkPaint& paint, const SkPath& path); + static std::unique_ptr<uint16_t[]> utf8ToUtf16(const char* str); + private: static void syncHierarchyPropertiesAndDisplayListImpl(RenderNode* node) { node->syncProperties(); diff --git a/libs/hwui/tests/common/scenes/ListViewAnimation.cpp b/libs/hwui/tests/common/scenes/ListViewAnimation.cpp index 43e247e68bc0..ab368c059de0 100644 --- a/libs/hwui/tests/common/scenes/ListViewAnimation.cpp +++ b/libs/hwui/tests/common/scenes/ListViewAnimation.cpp @@ -136,9 +136,9 @@ private: textPaint.setAntiAlias(true); char buf[256]; snprintf(buf, sizeof(buf), "This card is #%d", cardId); - TestUtils::drawTextToCanvas(&canvas, buf, textPaint, cardHeight, dp(25)); + TestUtils::drawUtf8ToCanvas(&canvas, buf, textPaint, cardHeight, dp(25)); textPaint.setTextSize(dp(15)); - TestUtils::drawTextToCanvas(&canvas, "This is some more text on the card", textPaint, + TestUtils::drawUtf8ToCanvas(&canvas, "This is some more text on the card", textPaint, cardHeight, dp(45)); canvas.drawBitmap(createRandomCharIcon(), dp(10), dp(10), nullptr); diff --git a/libs/hwui/tests/common/scenes/TextAnimation.cpp b/libs/hwui/tests/common/scenes/TextAnimation.cpp index 1823db2940aa..be8f48b9fd17 100644 --- a/libs/hwui/tests/common/scenes/TextAnimation.cpp +++ b/libs/hwui/tests/common/scenes/TextAnimation.cpp @@ -39,14 +39,14 @@ public: paint.setColor(Color::Black); for (int i = 0; i < 10; i++) { - TestUtils::drawTextToCanvas(&canvas, "Test string", paint, 400, i * 100); + TestUtils::drawUtf8ToCanvas(&canvas, "Test string", paint, 400, i * 100); } SkPath path; path.addOval(SkRect::MakeLTRB(100, 100, 300, 300)); paint.setColor(Color::Blue_500); - TestUtils::drawTextToCanvas(&canvas, "This is a neat circle of text!", paint, path); + TestUtils::drawUtf8ToCanvas(&canvas, "This is a neat circle of text!", paint, path); }); canvas.drawRenderNode(card.get()); } diff --git a/libs/hwui/tests/unit/CanvasStateTests.cpp b/libs/hwui/tests/unit/CanvasStateTests.cpp index 68d74ee1e91d..0afabd83f5cc 100644 --- a/libs/hwui/tests/unit/CanvasStateTests.cpp +++ b/libs/hwui/tests/unit/CanvasStateTests.cpp @@ -16,9 +16,9 @@ #include "CanvasState.h" -#include "Canvas.h" #include "Matrix.h" #include "Rect.h" +#include "hwui/Canvas.h" #include "utils/LinearAllocator.h" #include <gtest/gtest.h> diff --git a/libs/hwui/tests/unit/FrameBuilderTests.cpp b/libs/hwui/tests/unit/FrameBuilderTests.cpp index 31555f2f86ec..a467b5c15560 100644 --- a/libs/hwui/tests/unit/FrameBuilderTests.cpp +++ b/libs/hwui/tests/unit/FrameBuilderTests.cpp @@ -274,8 +274,8 @@ TEST(FrameBuilder, textMerging) { paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); paint.setAntiAlias(true); paint.setTextSize(50); - TestUtils::drawTextToCanvas(&canvas, "Test string1", paint, 100, 0); // will be top clipped - TestUtils::drawTextToCanvas(&canvas, "Test string1", paint, 100, 100); // not clipped + TestUtils::drawUtf8ToCanvas(&canvas, "Test string1", paint, 100, 0); // will be top clipped + TestUtils::drawUtf8ToCanvas(&canvas, "Test string1", paint, 100, 100); // not clipped }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(400, 400), 400, 400, TestUtils::createSyncedNodeList(node), sLightGeometry, nullptr); @@ -305,7 +305,7 @@ TEST(FrameBuilder, textStrikethrough) { textPaint.setStrikeThruText(true); textPaint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); for (int i = 0; i < LOOPS; i++) { - TestUtils::drawTextToCanvas(&canvas, "test text", textPaint, 10, 100 * (i + 1)); + TestUtils::drawUtf8ToCanvas(&canvas, "test text", textPaint, 10, 100 * (i + 1)); } }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(200, 2000), 200, 2000, @@ -361,7 +361,7 @@ TEST(FrameBuilder, textStyle) { // They'll get merged, but with for (auto style : styles) { paint.setStyle(style); - TestUtils::drawTextToCanvas(&canvas, "Test string1", paint, 100, 100); + TestUtils::drawUtf8ToCanvas(&canvas, "Test string1", paint, 100, 100); } }); FrameBuilder frameBuilder(sEmptyLayerUpdateQueue, SkRect::MakeWH(400, 400), 400, 400, diff --git a/libs/hwui/tests/unit/RecordingCanvasTests.cpp b/libs/hwui/tests/unit/RecordingCanvasTests.cpp index 5e613fd50c3e..6ab5110aaa9a 100644 --- a/libs/hwui/tests/unit/RecordingCanvasTests.cpp +++ b/libs/hwui/tests/unit/RecordingCanvasTests.cpp @@ -18,6 +18,8 @@ #include <RecordedOp.h> #include <RecordingCanvas.h> +#include <hwui/Paint.h> +#include <minikin/Layout.h> #include <tests/common/TestUtils.h> #include <utils/Color.h> @@ -131,13 +133,13 @@ TEST(RecordingCanvas, drawRoundRect) { << "Non-rounded rects should be converted"; } -TEST(RecordingCanvas, drawText) { +TEST(RecordingCanvas, drawGlyphs) { auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) { SkPaint paint; paint.setAntiAlias(true); paint.setTextSize(20); paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); - TestUtils::drawTextToCanvas(&canvas, "test text", paint, 25, 25); + TestUtils::drawUtf8ToCanvas(&canvas, "test text", paint, 25, 25); }); int count = 0; @@ -152,7 +154,7 @@ TEST(RecordingCanvas, drawText) { ASSERT_EQ(1, count); } -TEST(RecordingCanvas, drawText_strikeThruAndUnderline) { +TEST(RecordingCanvas, drawGlyphs_strikeThruAndUnderline) { auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) { SkPaint paint; paint.setAntiAlias(true); @@ -162,7 +164,7 @@ TEST(RecordingCanvas, drawText_strikeThruAndUnderline) { for (int j = 0; j < 2; j++) { paint.setUnderlineText(i != 0); paint.setStrikeThruText(j != 0); - TestUtils::drawTextToCanvas(&canvas, "test text", paint, 25, 25); + TestUtils::drawUtf8ToCanvas(&canvas, "test text", paint, 25, 25); } } }); @@ -184,18 +186,18 @@ TEST(RecordingCanvas, drawText_strikeThruAndUnderline) { EXPECT_EQ(RecordedOpId::RectOp, ops[index++]->opId); // strikethrough } -TEST(RecordingCanvas, drawText_forceAlignLeft) { +TEST(RecordingCanvas, drawGlyphs_forceAlignLeft) { auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) { SkPaint paint; paint.setAntiAlias(true); paint.setTextSize(20); paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); paint.setTextAlign(SkPaint::kLeft_Align); - TestUtils::drawTextToCanvas(&canvas, "test text", paint, 25, 25); + TestUtils::drawUtf8ToCanvas(&canvas, "test text", paint, 25, 25); paint.setTextAlign(SkPaint::kCenter_Align); - TestUtils::drawTextToCanvas(&canvas, "test text", paint, 25, 25); + TestUtils::drawUtf8ToCanvas(&canvas, "test text", paint, 25, 25); paint.setTextAlign(SkPaint::kRight_Align); - TestUtils::drawTextToCanvas(&canvas, "test text", paint, 25, 25); + TestUtils::drawUtf8ToCanvas(&canvas, "test text", paint, 25, 25); }); int count = 0; @@ -223,8 +225,7 @@ TEST(RecordingCanvas, drawColor) { auto op = *(dl->getOps()[0]); EXPECT_EQ(RecordedOpId::RectOp, op.opId); EXPECT_EQ(nullptr, op.localClip); - EXPECT_TRUE(op.unmappedBounds.contains(Rect(-1000, -1000, 1000, 1000))) - << "no clip, unmappedBounds should resolve to be much larger than DL bounds"; + EXPECT_TRUE(op.unmappedBounds.contains(Rect(200, 200))) << "Expect recording/clip bounds"; } TEST(RecordingCanvas, backgroundAndImage) { @@ -577,7 +578,7 @@ TEST(RecordingCanvas, refPaint) { canvas.drawRect(0, 0, 200, 10, paint); SkPaint paintCopy(paint); canvas.drawRect(0, 10, 200, 20, paintCopy); - TestUtils::drawTextToCanvas(&canvas, "helloworld", paint, 50, 25); + TestUtils::drawUtf8ToCanvas(&canvas, "helloworld", paint, 50, 25); // only here do we use different paint ptr paint.setColor(SK_ColorRED); @@ -598,5 +599,54 @@ TEST(RecordingCanvas, refPaint) { EXPECT_NE(&paint, ops[3]->paint); } +TEST(RecordingCanvas, drawText) { + auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) { + Paint paint; + paint.setAntiAlias(true); + paint.setTextSize(20); + paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); + std::unique_ptr<uint16_t[]> dst = TestUtils::utf8ToUtf16("HELLO"); + canvas.drawText(dst.get(), 0, 5, 5, 25, 25, kBidi_Force_LTR, paint, NULL); + }); + + int count = 0; + playbackOps(*dl, [&count](const RecordedOp& op) { + count++; + ASSERT_EQ(RecordedOpId::TextOp, op.opId); + EXPECT_EQ(nullptr, op.localClip); + EXPECT_TRUE(op.localMatrix.isIdentity()); + EXPECT_TRUE(op.unmappedBounds.getHeight() >= 10); + EXPECT_TRUE(op.unmappedBounds.getWidth() >= 25); + }); + ASSERT_EQ(1, count); +} + +TEST(RecordingCanvas, drawTextInHighContrast) { + auto dl = TestUtils::createDisplayList<RecordingCanvas>(200, 200, [](RecordingCanvas& canvas) { + canvas.setHighContrastText(true); + Paint paint; + paint.setColor(SK_ColorWHITE); + paint.setAntiAlias(true); + paint.setTextSize(20); + paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding); + std::unique_ptr<uint16_t[]> dst = TestUtils::utf8ToUtf16("HELLO"); + canvas.drawText(dst.get(), 0, 5, 5, 25, 25, kBidi_Force_LTR, paint, NULL); + }); + + int count = 0; + playbackOps(*dl, [&count](const RecordedOp& op) { + ASSERT_EQ(RecordedOpId::TextOp, op.opId); + if (count++ == 0) { + EXPECT_EQ(SK_ColorBLACK, op.paint->getColor()); + EXPECT_EQ(SkPaint::kStrokeAndFill_Style, op.paint->getStyle()); + } else { + EXPECT_EQ(SK_ColorWHITE, op.paint->getColor()); + EXPECT_EQ(SkPaint::kFill_Style, op.paint->getStyle()); + } + + }); + ASSERT_EQ(2, count); +} + } // namespace uirenderer } // namespace android diff --git a/location/java/android/location/GnssClock.java b/location/java/android/location/GnssClock.java index 2af479066c7b..df42a7328a99 100644 --- a/location/java/android/location/GnssClock.java +++ b/location/java/android/location/GnssClock.java @@ -471,6 +471,11 @@ public final class GnssClock implements Parcelable { "DriftUncertaintyNanosPerSecond", hasDriftUncertaintyNanosPerSecond() ? mDriftUncertaintyNanosPerSecond : null)); + builder.append(String.format( + format, + "HardwareClockDiscontinuityCount", + mHardwareClockDiscontinuityCount)); + return builder.toString(); } diff --git a/location/java/android/location/GnssMeasurement.java b/location/java/android/location/GnssMeasurement.java index a7eb73f0b0bf..17ce5336187a 100644 --- a/location/java/android/location/GnssMeasurement.java +++ b/location/java/android/location/GnssMeasurement.java @@ -57,7 +57,10 @@ public final class GnssMeasurement implements Parcelable { private static final int HAS_CARRIER_PHASE = (1<<11); private static final int HAS_CARRIER_PHASE_UNCERTAINTY = (1<<12); - /** The status of multipath. */ + /** + * The status of the multipath indicator. + * @hide + */ @Retention(RetentionPolicy.SOURCE) @IntDef({MULTIPATH_INDICATOR_UNKNOWN, MULTIPATH_INDICATOR_DETECTED, MULTIPATH_INDICATOR_NOT_USED}) diff --git a/location/java/android/location/GnssMeasurementsEvent.java b/location/java/android/location/GnssMeasurementsEvent.java index 86841ff97a38..ec252a8b6b04 100644 --- a/location/java/android/location/GnssMeasurementsEvent.java +++ b/location/java/android/location/GnssMeasurementsEvent.java @@ -33,7 +33,10 @@ import java.util.Collections; * Events are delivered to registered instances of {@link Callback}. */ public final class GnssMeasurementsEvent implements Parcelable { - /** The status of GNSS measurements event. */ + /** + * The status of the GNSS measurements event. + * @hide + */ @Retention(RetentionPolicy.SOURCE) @IntDef({STATUS_NOT_SUPPORTED, STATUS_READY, STATUS_GNSS_LOCATION_DISABLED}) public @interface GnssMeasurementsStatus {} diff --git a/location/java/android/location/GnssNavigationMessage.java b/location/java/android/location/GnssNavigationMessage.java index e5c0f276b142..a5eace8fc966 100644 --- a/location/java/android/location/GnssNavigationMessage.java +++ b/location/java/android/location/GnssNavigationMessage.java @@ -33,7 +33,10 @@ public final class GnssNavigationMessage implements Parcelable { private static final byte[] EMPTY_ARRAY = new byte[0]; - /** The type of the GPS Clock. */ + /** + * The type of the GPS Clock. + * @hide + */ @Retention(RetentionPolicy.SOURCE) @IntDef({TYPE_UNKNOWN, TYPE_GPS_L1CA, TYPE_GPS_L2CNAV, TYPE_GPS_L5CNAV, TYPE_GPS_CNAV2, TYPE_GLO_L1CA, TYPE_BDS_D1, TYPE_BDS_D2, TYPE_GAL_I, TYPE_GAL_F}) diff --git a/location/java/android/location/GnssNavigationMessageEvent.java b/location/java/android/location/GnssNavigationMessageEvent.java index 0df730d3842a..992dfc39d350 100644 --- a/location/java/android/location/GnssNavigationMessageEvent.java +++ b/location/java/android/location/GnssNavigationMessageEvent.java @@ -30,7 +30,10 @@ import java.security.InvalidParameterException; * Events are delivered to registered instances of {@link Callback}. */ public final class GnssNavigationMessageEvent implements Parcelable { - /** The status of GPS measurements event. */ + /** + * The status of GPS measurements event. + * @hide + */ @Retention(RetentionPolicy.SOURCE) @IntDef({STATUS_NOT_SUPPORTED, STATUS_READY, STATUS_GNSS_LOCATION_DISABLED}) public @interface GnssNavigationMessageStatus {} diff --git a/location/java/android/location/GnssStatus.java b/location/java/android/location/GnssStatus.java index 2a42fc62268c..9c509d6b3a50 100644 --- a/location/java/android/location/GnssStatus.java +++ b/location/java/android/location/GnssStatus.java @@ -41,7 +41,10 @@ public final class GnssStatus { /** Constellation type constant for Galileo. */ public static final int CONSTELLATION_GALILEO = 6; - /** Constellation type. */ + /** + * Constellation type. + * @hide + */ @Retention(RetentionPolicy.SOURCE) @IntDef({CONSTELLATION_UNKNOWN, CONSTELLATION_GPS, CONSTELLATION_SBAS, CONSTELLATION_GLONASS, CONSTELLATION_QZSS, CONSTELLATION_BEIDOU, CONSTELLATION_GALILEO}) diff --git a/location/java/android/location/Location.java b/location/java/android/location/Location.java index 4d0d1bd64b0e..50f0badf6ac1 100644 --- a/location/java/android/location/Location.java +++ b/location/java/android/location/Location.java @@ -891,7 +891,7 @@ public class Location implements Parcelable { l.mSpeed = in.readFloat(); l.mBearing = in.readFloat(); l.mAccuracy = in.readFloat(); - l.mExtras = in.readBundle(); + l.mExtras = Bundle.setDefusable(in.readBundle(), true); return l; } diff --git a/media/java/android/media/AudioDeviceCallback.java b/media/java/android/media/AudioDeviceCallback.java index d9f0037ce206..a5b1d2402183 100644 --- a/media/java/android/media/AudioDeviceCallback.java +++ b/media/java/android/media/AudioDeviceCallback.java @@ -19,7 +19,7 @@ package android.media; /** * AudioDeviceCallback defines the mechanism by which applications can receive notifications * of audio device connection and disconnection events. - * @see AudioManager#registerAudioDeviceCallback. + * @see AudioManager#registerAudioDeviceCallback(AudioDeviceCallback, android.os.Handler handler). */ public abstract class AudioDeviceCallback { /** diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index abb6f4e9964c..a4484e757ac5 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -256,6 +256,11 @@ public final class AudioFormat implements Parcelable { public static final int ENCODING_AAC_HE_V2 = 12; /** Audio data format: compressed audio wrapped in PCM for HDMI * or S/PDIF passthrough. + * IEC61937 uses a stereo stream of 16-bit samples as the wrapper. + * So the channel mask for the track must be {@link #CHANNEL_OUT_STEREO}. + * Data should be written to the stream in a short[] array. + * If the data is written in a byte[] array then there may be endian problems + * on some platforms when converting to short internally. */ public static final int ENCODING_IEC61937 = 13; diff --git a/media/java/android/media/AudioTrack.java b/media/java/android/media/AudioTrack.java index e1dab092a3f7..d9caf030a8fb 100644 --- a/media/java/android/media/AudioTrack.java +++ b/media/java/android/media/AudioTrack.java @@ -806,6 +806,15 @@ public class AudioTrack implements AudioRouting } mSampleRate = sampleRateInHz; + // IEC61937 is based on stereo. We could coerce it to stereo. + // But the application needs to know the stream is stereo so that + // it is encoded and played correctly. So better to just reject it. + if (audioFormat == AudioFormat.ENCODING_IEC61937 + && channelConfig != AudioFormat.CHANNEL_OUT_STEREO) { + throw new IllegalArgumentException( + "ENCODING_IEC61937 must be configured as CHANNEL_OUT_STEREO"); + } + //-------------- // channel config mChannelConfiguration = channelConfig; diff --git a/media/java/android/media/ExifInterface.java b/media/java/android/media/ExifInterface.java index ed358d3d270a..a5b317949e41 100644 --- a/media/java/android/media/ExifInterface.java +++ b/media/java/android/media/ExifInterface.java @@ -651,6 +651,7 @@ public class ExifInterface { private final String mFilename; private final FileDescriptor mSeekableFileDescriptor; private final AssetManager.AssetInputStream mAssetInputStream; + private final boolean mIsInputStream; private boolean mIsRaw; private final HashMap[] mAttributes = new HashMap[EXIF_TAGS.length]; private boolean mHasThumbnail; @@ -669,20 +670,26 @@ public class ExifInterface { if (filename == null) { throw new IllegalArgumentException("filename cannot be null"); } - FileInputStream in = new FileInputStream(filename); + FileInputStream in = null; mAssetInputStream = null; mFilename = filename; - if (isSeekableFD(in.getFD())) { - mSeekableFileDescriptor = in.getFD(); - } else { - mSeekableFileDescriptor = null; + mIsInputStream = false; + try { + in = new FileInputStream(filename); + if (isSeekableFD(in.getFD())) { + mSeekableFileDescriptor = in.getFD(); + } else { + mSeekableFileDescriptor = null; + } + loadAttributes(in); + } finally { + IoUtils.closeQuietly(in); } - loadAttributes(in); } /** * Reads Exif tags from the specified image file descriptor. Attribute mutation is supported - * for seekable file descriptors only. + * for writable and seekable file descriptors only. */ public ExifInterface(FileDescriptor fileDescriptor) throws IOException { if (fileDescriptor == null) { @@ -692,10 +699,25 @@ public class ExifInterface { mFilename = null; if (isSeekableFD(fileDescriptor)) { mSeekableFileDescriptor = fileDescriptor; + // Keep the original file descriptor in order to save attributes when it's seekable. + // Otherwise, just close the given file descriptor after reading it because the save + // feature won't be working. + try { + fileDescriptor = Os.dup(fileDescriptor); + } catch (ErrnoException e) { + e.rethrowAsIOException(); + } } else { mSeekableFileDescriptor = null; } - loadAttributes(new FileInputStream(fileDescriptor)); + mIsInputStream = false; + FileInputStream in = null; + try { + in = new FileInputStream(fileDescriptor); + loadAttributes(in); + } finally { + IoUtils.closeQuietly(in); + } } /** @@ -718,6 +740,7 @@ public class ExifInterface { mAssetInputStream = null; mSeekableFileDescriptor = null; } + mIsInputStream = true; loadAttributes(inputStream); } @@ -800,41 +823,43 @@ public class ExifInterface { * determine whether the image data format is JPEG or not. */ private void loadAttributes(@NonNull InputStream in) throws IOException { - // Initialize mAttributes. - for (int i = 0; i < EXIF_TAGS.length; ++i) { - mAttributes[i] = new HashMap(); - } - - // Process RAW input stream - if (mAssetInputStream != null) { - long asset = mAssetInputStream.getNativeAsset(); - if (handleRawResult(nativeGetRawAttributesFromAsset(asset))) { - return; - } - } else if (mSeekableFileDescriptor != null) { - if (handleRawResult(nativeGetRawAttributesFromFileDescriptor( - mSeekableFileDescriptor))) { - return; + try { + // Initialize mAttributes. + for (int i = 0; i < EXIF_TAGS.length; ++i) { + mAttributes[i] = new HashMap(); } - } else { - in = new BufferedInputStream(in, JPEG_SIGNATURE_SIZE); - if (!isJpegInputStream((BufferedInputStream) in) && handleRawResult( - nativeGetRawAttributesFromInputStream(in))) { - return; + + // Process RAW input stream + if (mAssetInputStream != null) { + long asset = mAssetInputStream.getNativeAsset(); + if (handleRawResult(nativeGetRawAttributesFromAsset(asset))) { + return; + } + } else if (mSeekableFileDescriptor != null) { + if (handleRawResult(nativeGetRawAttributesFromFileDescriptor( + mSeekableFileDescriptor))) { + return; + } + } else { + in = new BufferedInputStream(in, JPEG_SIGNATURE_SIZE); + if (!isJpegInputStream((BufferedInputStream) in) && handleRawResult( + nativeGetRawAttributesFromInputStream(in))) { + return; + } } - } - // Process JPEG input stream - try { + // Process JPEG input stream getJpegAttributes(in); } catch (IOException e) { // Ignore exceptions in order to keep the compatibility with the old versions of // ExifInterface. - Log.w(TAG, "Invalid JPEG", e); - } - - if (DEBUG) { - printAttributes(); + Log.w(TAG, "Invalid JPEG: ExifInterface got an unsupported image format file" + + "(ExifInterface supports JPEG and some RAW image formats only) " + + "or a corrupted JPEG file to ExifInterface.", e); + } finally { + if (DEBUG) { + printAttributes(); + } } } @@ -878,10 +903,6 @@ public class ExifInterface { break; } } - - if (DEBUG) { - printAttributes(); - } return true; } @@ -915,7 +936,7 @@ public class ExifInterface { throw new UnsupportedOperationException( "ExifInterface does not support saving attributes on RAW formats."); } - if (mSeekableFileDescriptor == null && mFilename == null) { + if (mIsInputStream || (mSeekableFileDescriptor == null && mFilename == null)) { throw new UnsupportedOperationException( "ExifInterface does not support saving attributes for the current input."); } @@ -1001,8 +1022,9 @@ public class ExifInterface { } else if (mFilename != null) { in = new FileInputStream(mFilename); } else if (mSeekableFileDescriptor != null) { - Os.lseek(mSeekableFileDescriptor, 0, OsConstants.SEEK_SET); - in = new FileInputStream(mSeekableFileDescriptor); + FileDescriptor fileDescriptor = Os.dup(mSeekableFileDescriptor); + Os.lseek(fileDescriptor, 0, OsConstants.SEEK_SET); + in = new FileInputStream(fileDescriptor); } if (in == null) { // Should not be reached this. @@ -1207,7 +1229,8 @@ public class ExifInterface { int length = dataInputStream.readUnsignedShort() - 2; bytesRead += 2; if (DEBUG) { - Log.d(TAG, "JPEG segment: " + marker + " (length: " + (length + 2) + ")"); + Log.d(TAG, "JPEG segment: " + Integer.toHexString(marker & 0xff) + " (length: " + + (length + 2) + ")"); } if (length < 0) { throw new IOException("Invalid length"); @@ -1270,7 +1293,9 @@ public class ExifInterface { case MARKER_SOF13: case MARKER_SOF14: case MARKER_SOF15: { - dataInputStream.skipBytes(1); + if (dataInputStream.skipBytes(1) != 1) { + throw new IOException("Invalid SOFx"); + } setAttribute("ImageLength", String.valueOf(dataInputStream.readUnsignedShort())); setAttribute("ImageWidth", String.valueOf(dataInputStream.readUnsignedShort())); @@ -1285,7 +1310,9 @@ public class ExifInterface { if (length < 0) { throw new IOException("Invalid length"); } - dataInputStream.skipBytes(length); + if (dataInputStream.skipBytes(length) != length) { + throw new IOException("Invalid JPEG segment"); + } bytesRead += length; } } @@ -1317,10 +1344,11 @@ public class ExifInterface { byte[] bytes = new byte[4096]; while (true) { - if (dataInputStream.readByte() != MARKER) { + byte marker = dataInputStream.readByte(); + if (marker != MARKER) { throw new IOException("Invalid marker"); } - byte marker = dataInputStream.readByte(); + marker = dataInputStream.readByte(); switch (marker) { case MARKER_APP1: { int length = dataInputStream.readUnsignedShort() - 2; @@ -1341,6 +1369,8 @@ public class ExifInterface { } } // Copy non-EXIF APP1 segment. + dataOutputStream.writeByte(MARKER); + dataOutputStream.writeByte(marker); dataOutputStream.writeUnsignedShort(length + 2); if (length >= 6) { length -= 6; @@ -1644,7 +1674,7 @@ public class ExifInterface { String tagName = (String) sExifTagMapsForReading[hint].get(tagNumber); if (DEBUG) { - Log.d(TAG, String.format("hint: %d, tagNumber: %d, tagName: %s, dataFormat: %d," + + Log.d(TAG, String.format("hint: %d, tagNumber: %d, tagName: %s, dataFormat: %d, " + "numberOfComponents: %d", hint, tagNumber, tagName, dataFormat, numberOfComponents)); } @@ -2025,6 +2055,12 @@ public class ExifInterface { int bytesWritten = 0; int dataFormat = getDataFormatOfExifEntryValue(entryValue); + if (dataFormat == IFD_FORMAT_STRING) { + byte[] asciiArray = (entryValue + '\0').getBytes(Charset.forName("US-ASCII")); + dataOutputStream.write(asciiArray); + return asciiArray.length; + } + // Values can be composed of several components. Each component is separated by char ','. String[] components = entryValue.split(","); for (String component : components) { @@ -2037,11 +2073,6 @@ public class ExifInterface { dataOutputStream.writeDouble(Double.parseDouble(component)); bytesWritten += 8; break; - case IFD_FORMAT_STRING: - byte[] asciiArray = (component + '\0').getBytes(Charset.forName("US-ASCII")); - dataOutputStream.write(asciiArray); - bytesWritten += asciiArray.length; - break; case IFD_FORMAT_SRATIONAL: String[] rationalNumber = component.split("/"); dataOutputStream.writeInt(Integer.parseInt(rationalNumber[0])); @@ -2060,11 +2091,31 @@ public class ExifInterface { // See TIFF 6.0 spec Types. page 15. // Take the first component if there are more than one component. if (entryValue.contains(",")) { - entryValue = entryValue.split(",")[0]; + String[] entryValues = entryValue.split(","); + int dataFormat = getDataFormatOfExifEntryValue(entryValues[0]); + if (dataFormat == IFD_FORMAT_STRING) { + return IFD_FORMAT_STRING; + } + for (int i = 1; i < entryValues.length; ++i) { + if (getDataFormatOfExifEntryValue(entryValues[i]) != dataFormat) { + return IFD_FORMAT_STRING; + } + } + return dataFormat; } if (entryValue.contains("/")) { - return IFD_FORMAT_SRATIONAL; + String[] rationalNumber = entryValue.split("/"); + if (rationalNumber.length == 2) { + try { + Integer.parseInt(rationalNumber[0]); + Integer.parseInt(rationalNumber[1]); + return IFD_FORMAT_SRATIONAL; + } catch (NumberFormatException e) { + // Ignored + } + } + return IFD_FORMAT_STRING; } try { Integer.parseInt(entryValue); @@ -2084,6 +2135,9 @@ public class ExifInterface { // Determines the size of EXIF entry value. private static int getSizeOfExifEntryValue(int dataFormat, String entryValue) { // See TIFF 6.0 spec Types page 15. + if (dataFormat == IFD_FORMAT_STRING) { + return (entryValue + '\0').getBytes(Charset.forName("US-ASCII")).length; + } int bytesEstimated = 0; String[] components = entryValue.split(","); for (String component : components) { @@ -2094,10 +2148,6 @@ public class ExifInterface { case IFD_FORMAT_DOUBLE: bytesEstimated += 8; break; - case IFD_FORMAT_STRING: - bytesEstimated - += (component + '\0').getBytes(Charset.forName("US-ASCII")).length; - break; case IFD_FORMAT_SRATIONAL: bytesEstimated += 8; break; diff --git a/media/java/android/media/IMediaResourceMonitor.aidl b/media/java/android/media/IMediaResourceMonitor.aidl index 7b4bc3962ff1..cf0e56d1e786 100644 --- a/media/java/android/media/IMediaResourceMonitor.aidl +++ b/media/java/android/media/IMediaResourceMonitor.aidl @@ -19,6 +19,6 @@ package android.media; /** {@hide} */ interface IMediaResourceMonitor { - oneway void notifyResourceGranted(in int pid, String type, String subType, long value); + oneway void notifyResourceGranted(in int pid, in int type); } diff --git a/media/java/android/media/MediaMetadata.java b/media/java/android/media/MediaMetadata.java index 722605f5d544..9ebf10f52728 100644 --- a/media/java/android/media/MediaMetadata.java +++ b/media/java/android/media/MediaMetadata.java @@ -365,7 +365,7 @@ public final class MediaMetadata implements Parcelable { } private MediaMetadata(Parcel in) { - mBundle = in.readBundle(); + mBundle = Bundle.setDefusable(in.readBundle(), true); } /** diff --git a/media/java/android/media/tv/TvInputManager.java b/media/java/android/media/tv/TvInputManager.java index 3eb335940d8e..c72a7a027e90 100644 --- a/media/java/android/media/tv/TvInputManager.java +++ b/media/java/android/media/tv/TvInputManager.java @@ -114,6 +114,13 @@ public final class TvInputManager { */ public static final int VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY = VIDEO_UNAVAILABLE_REASON_END; + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({VIDEO_UNAVAILABLE_REASON_UNKNOWN, VIDEO_UNAVAILABLE_REASON_TUNING, + VIDEO_UNAVAILABLE_REASON_WEAK_SIGNAL, VIDEO_UNAVAILABLE_REASON_BUFFERING, + VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY}) + public @interface VideoUnavailableReason {} + /** * Status for {@link TvInputService.Session#notifyTimeShiftStatusChanged(int)} and * {@link TvView.TvInputCallback#onTimeShiftStatusChanged(String, int)}: Unknown status. Also @@ -143,6 +150,12 @@ public final class TvInputManager { */ public static final int TIME_SHIFT_STATUS_AVAILABLE = 3; + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({TIME_SHIFT_STATUS_UNKNOWN, TIME_SHIFT_STATUS_UNSUPPORTED, + TIME_SHIFT_STATUS_UNAVAILABLE, TIME_SHIFT_STATUS_AVAILABLE}) + public @interface TimeShiftStatus {} + /** * Value returned by {@link TvInputService.Session#onTimeShiftGetCurrentPosition()} and * {@link TvInputService.Session#onTimeShiftGetStartPosition()} when time shifting has not @@ -208,6 +221,11 @@ public final class TvInputManager { */ public static final int INPUT_STATE_DISCONNECTED = 2; + /** @hide */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({INPUT_STATE_CONNECTED, INPUT_STATE_CONNECTED_STANDBY, INPUT_STATE_DISCONNECTED}) + public @interface InputState {} + /** * Broadcast intent action when the user blocked content ratings change. For use with the * {@link #isRatingBlocked}. @@ -696,7 +714,7 @@ public final class TvInputManager { * <li>{@link TvInputManager#INPUT_STATE_DISCONNECTED} * </ul> */ - public void onInputStateChanged(String inputId, int state) { + public void onInputStateChanged(String inputId, @InputState int state) { } /** @@ -1170,6 +1188,7 @@ public final class TvInputManager { * @param inputId The ID of the TV input. * @throws IllegalArgumentException if the argument is {@code null}. */ + @InputState public int getInputState(@NonNull String inputId) { Preconditions.checkNotNull(inputId); synchronized (mLock) { diff --git a/media/java/android/media/tv/TvInputService.java b/media/java/android/media/tv/TvInputService.java index 88be68609597..612a14745698 100644 --- a/media/java/android/media/tv/TvInputService.java +++ b/media/java/android/media/tv/TvInputService.java @@ -528,7 +528,8 @@ public abstract class TvInputService extends Service { * </ul> * @see #notifyVideoAvailable */ - public void notifyVideoUnavailable(final int reason) { + public void notifyVideoUnavailable( + @TvInputManager.VideoUnavailableReason final int reason) { if (reason < TvInputManager.VIDEO_UNAVAILABLE_REASON_START || reason > TvInputManager.VIDEO_UNAVAILABLE_REASON_END) { Log.e(TAG, "notifyVideoUnavailable - unknown reason: " + reason); @@ -660,7 +661,7 @@ public abstract class TvInputService extends Service { * <li>{@link TvInputManager#TIME_SHIFT_STATUS_AVAILABLE} * </ul> */ - public void notifyTimeShiftStatusChanged(final int status) { + public void notifyTimeShiftStatusChanged(@TvInputManager.TimeShiftStatus final int status) { executeOrPostRunnableOnMainThread(new Runnable() { @MainThread @Override diff --git a/media/java/android/media/tv/TvView.java b/media/java/android/media/tv/TvView.java index 6ca6193cb0be..02ee0cc8deb5 100644 --- a/media/java/android/media/tv/TvView.java +++ b/media/java/android/media/tv/TvView.java @@ -964,7 +964,8 @@ public class TvView extends ViewGroup { * <li>{@link TvInputManager#VIDEO_UNAVAILABLE_REASON_AUDIO_ONLY} * </ul> */ - public void onVideoUnavailable(String inputId, int reason) { + public void onVideoUnavailable( + String inputId, @TvInputManager.VideoUnavailableReason int reason) { } /** @@ -1009,7 +1010,8 @@ public class TvView extends ViewGroup { * <li>{@link TvInputManager#TIME_SHIFT_STATUS_AVAILABLE} * </ul> */ - public void onTimeShiftStatusChanged(String inputId, int status) { + public void onTimeShiftStatusChanged( + String inputId, @TvInputManager.TimeShiftStatus int status) { } } diff --git a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/ExifInterfaceTest.java b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/ExifInterfaceTest.java index 5bd607922c81..6207f7d59809 100644 --- a/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/ExifInterfaceTest.java +++ b/media/tests/MediaFrameworkTest/src/com/android/mediaframeworktest/unit/ExifInterfaceTest.java @@ -417,13 +417,15 @@ public class ExifInterfaceTest extends AndroidTestCase { testExifInterfaceForRaw(LG_G4_ISO_800_DNG, R.array.lg_g4_iso_800_dng); } - public void testCorruptedImage() throws Throwable { + public void testDoNotFailOnCorruptedImage() throws Throwable { + // To keep the compatibility with old versions of ExifInterface, even on a corrupted image, + // it shouldn't raise any exceptions except an IOException when unable to open a file. byte[] bytes = new byte[1024]; try { new ExifInterface(new ByteArrayInputStream(bytes)); - fail("Should not reach here!"); + // Always success } catch (IOException e) { - // Success + fail("Should not reach here!"); } } diff --git a/packages/BackupRestoreConfirmation/res/values-be-rBY/strings.xml b/packages/BackupRestoreConfirmation/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..24662fe53467 --- /dev/null +++ b/packages/BackupRestoreConfirmation/res/values-be-rBY/strings.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="backup_confirm_title" msgid="827563724209303345">"Поўнае рэзервовае капіяванне"</string> + <string name="restore_confirm_title" msgid="5469365809567486602">"Поўнае аднаўленне"</string> + <string name="backup_confirm_text" msgid="1878021282758896593">"Было прапанавана поўнае рэзервовае капіяванне ўсіх дадзеных на падлучаным настольным кампутары. Дазволіць гэта?\n\nКалі вы самі не запытвалі рэзервовае капiяванне, спынiце аперацыю."</string> + <string name="allow_backup_button_label" msgid="4217228747769644068">"Рэзервовае капіяванне дадзеных"</string> + <string name="deny_backup_button_label" msgid="6009119115581097708">"Не ствараць рэзервовыя копіі"</string> + <string name="restore_confirm_text" msgid="7499866728030461776">"Запытана поўнае аднаўленне ўсіх дадзеных з падлучанага настольнага кампутара. Дазволіць гэта?\n\nКалі вы самі не запытвалі аднаўленне, не дазваляйце працягваць аперацыю. Гэта прывядзе да замены якіх-небудзь дадзеных, якія зараз знаходзяцца на прыладзе."</string> + <string name="allow_restore_button_label" msgid="3081286752277127827">"Аднавіць мае дадзеныя"</string> + <string name="deny_restore_button_label" msgid="1724367334453104378">"Не аднаўляць"</string> + <string name="current_password_text" msgid="8268189555578298067">"Увядзіце ваш бягучы пароль рэзервовага капіявання ніжэй:"</string> + <string name="device_encryption_restore_text" msgid="1570864916855208992">"Увядзіце нiжэй пароль для расшыфравання прылады."</string> + <string name="device_encryption_backup_text" msgid="5866590762672844664">"Увядзіце пароль для расшыфравання прылады. Ён таксама будзе выкарыстоўвацца для расшыфравання рэзервовай копіі."</string> + <string name="backup_enc_password_text" msgid="4981585714795233099">"Увядзіце пароль, які выкарыстоўваецца для шыфравання ўсіх дадзеных рэзервовага капіявання. Калі гэтае поле пакінуць пустым, будзе выкарыстоўвацца бягучы пароль рэзервовага капіявання:"</string> + <string name="backup_enc_password_optional" msgid="1350137345907579306">"Калі вы жадаеце зашыфраваць усе дадзеныя рэзервовага капіявання, увядзіце пароль ніжэй:"</string> + <string name="backup_enc_password_required" msgid="7889652203371654149">"Даныя на вашай прыладзе зашыфраваны, таму вы павінны зашыфраваць рэзервовую копію. Калі ласка, увядзіце пароль ніжэй:"</string> + <string name="restore_enc_password_text" msgid="6140898525580710823">"Калі дадзеныя для аднаўлення зашыфраваныя, увядзіце пароль ніжэй:"</string> + <string name="toast_backup_started" msgid="550354281452756121">"Рэзервовае капіяванне..."</string> + <string name="toast_backup_ended" msgid="3818080769548726424">"Рэзервовае капіяванне скончылася"</string> + <string name="toast_restore_started" msgid="7881679218971277385">"Пачынаецца аднаўленне..."</string> + <string name="toast_restore_ended" msgid="1764041639199696132">"Аднаўленне скончылася"</string> + <string name="toast_timeout" msgid="5276598587087626877">"Тайм-аўт аперацыі"</string> +</resources> diff --git a/packages/BackupRestoreConfirmation/res/values-bs-rBA/strings.xml b/packages/BackupRestoreConfirmation/res/values-bs-rBA/strings.xml new file mode 100644 index 000000000000..53b0bcebca48 --- /dev/null +++ b/packages/BackupRestoreConfirmation/res/values-bs-rBA/strings.xml @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="backup_confirm_title" msgid="827563724209303345">"Napraviti potpunu rezervnu kopiju"</string> + <string name="restore_confirm_title" msgid="5469365809567486602">"Izvrši potpuno obnavljanje"</string> + <string name="backup_confirm_text" msgid="1878021282758896593">"Zatraženo je pravljenje potpune rezervne kopije svih podataka na povezani računar. Da li želite da dozvolite to?\n\nPrekinite radnju ukoliko to niste sami zatražili."</string> + <string name="allow_backup_button_label" msgid="4217228747769644068">"Napravi rezervnu kopiju mojih podataka"</string> + <string name="deny_backup_button_label" msgid="6009119115581097708">"Nemoj napraviti rezervnu kopiju"</string> + <string name="restore_confirm_text" msgid="7499866728030461776">"Sa povezanog računara je upućen zahtjev za potpuno obnavljanje svih podataka. Želite li to dozvoliti?\n\nUkoliko niste uputili zahtjev za obnavljanje, prekinite radnju. Ovim će zamijeniti svi podaci koji su trenutno na uređaju!"</string> + <string name="allow_restore_button_label" msgid="3081286752277127827">"Obnovi moje podatke"</string> + <string name="deny_restore_button_label" msgid="1724367334453104378">"Prekinuti obnavljanje podataka"</string> + <string name="current_password_text" msgid="8268189555578298067">"Ispod unesite svoju trenutnu lozinku za rezervnu kopiju:"</string> + <string name="device_encryption_restore_text" msgid="1570864916855208992">"Ispod unesite svoju lozinku za šifriranje uređaja."</string> + <string name="device_encryption_backup_text" msgid="5866590762672844664">"Molimo vas unesite svoju lozinku za šifriranje uređaja ispod. Ona će se koristiti i za šifriranje arhive rezervnih kopija."</string> + <string name="backup_enc_password_text" msgid="4981585714795233099">"Unesite lozinku za šifriranje potpune rezervne kopije podataka. Ukoliko ne unesete lozinku, primijenit će se vaša trenutna lozinka za rezervnu kopiju:"</string> + <string name="backup_enc_password_optional" msgid="1350137345907579306">"Ukoliko želite šifrirati potpunu rezervnu kopiju podataka, unesite lozinku ispod:"</string> + <string name="backup_enc_password_required" msgid="7889652203371654149">"Pošto je vaš uređaj šifriran, potrebno je šifrirati rezervnu kopiju. Unesite šifru ispod:"</string> + <string name="restore_enc_password_text" msgid="6140898525580710823">"Ukoliko su podaci za obnavljanje šifrirani, unesite lozinku ispod:"</string> + <string name="toast_backup_started" msgid="550354281452756121">"Pravljenje rezervne kopije..."</string> + <string name="toast_backup_ended" msgid="3818080769548726424">"Pravljenje rezervne kopije završeno"</string> + <string name="toast_restore_started" msgid="7881679218971277385">"Počinje obnavljanje podataka..."</string> + <string name="toast_restore_ended" msgid="1764041639199696132">"Obnavljanje podatka završeno"</string> + <string name="toast_timeout" msgid="5276598587087626877">"Isteklo je vrijeme za izvršenje radnje"</string> +</resources> diff --git a/packages/BackupRestoreConfirmation/res/values-ro/strings.xml b/packages/BackupRestoreConfirmation/res/values-ro/strings.xml index d863091fc4d4..966e7f9d9af1 100644 --- a/packages/BackupRestoreConfirmation/res/values-ro/strings.xml +++ b/packages/BackupRestoreConfirmation/res/values-ro/strings.xml @@ -22,18 +22,18 @@ <string name="allow_backup_button_label" msgid="4217228747769644068">"Creați copii de rezervă pentru datele dvs."</string> <string name="deny_backup_button_label" msgid="6009119115581097708">"Nu creați copii de rezervă"</string> <string name="restore_confirm_text" msgid="7499866728030461776">"S-a solicitat o restabilire completă a tuturor datelor de pe un computer desktop conectat. Doriți să permiteți acest lucru?\n\nDacă nu dvs. ați solicitat această restabilire, nu permiteți continuarea operațiunii. Acest proces va înlocui toate datele existente în prezent pe dispozitiv!"</string> - <string name="allow_restore_button_label" msgid="3081286752277127827">"Restabiliţi datele dvs."</string> + <string name="allow_restore_button_label" msgid="3081286752277127827">"Restabiliți datele dvs."</string> <string name="deny_restore_button_label" msgid="1724367334453104378">"Nu restabiliți"</string> - <string name="current_password_text" msgid="8268189555578298067">"Introduceţi mai jos parola actuală pentru copia de rezervă:"</string> - <string name="device_encryption_restore_text" msgid="1570864916855208992">"Introduceţi mai jos parola pentru criptarea dispozitivului."</string> - <string name="device_encryption_backup_text" msgid="5866590762672844664">"Introduceţi mai jos parola de criptare a dispozitivului. Aceasta va fi utilizată, de asemenea, pentru a cripta arhiva copiei de rezervă."</string> - <string name="backup_enc_password_text" msgid="4981585714795233099">"Introduceţi o parolă pentru a o utiliza la criptarea datelor copiei de rezervă complete. Dacă acest câmp rămâne necompletat, pentru copierea de rezervă se va utiliza parola dvs. actuală."</string> - <string name="backup_enc_password_optional" msgid="1350137345907579306">"Dacă doriți să criptaţi datele copiei de rezervă complete, introduceţi o parolă mai jos:"</string> + <string name="current_password_text" msgid="8268189555578298067">"Introduceți mai jos parola actuală pentru copia de rezervă:"</string> + <string name="device_encryption_restore_text" msgid="1570864916855208992">"Introduceți mai jos parola pentru criptarea dispozitivului."</string> + <string name="device_encryption_backup_text" msgid="5866590762672844664">"Introduceți mai jos parola de criptare a dispozitivului. Aceasta va fi utilizată, de asemenea, pentru a cripta arhiva copiei de rezervă."</string> + <string name="backup_enc_password_text" msgid="4981585714795233099">"Introduceți o parolă pentru a o utiliza la criptarea datelor copiei de rezervă complete. Dacă acest câmp rămâne necompletat, pentru copierea de rezervă se va utiliza parola dvs. actuală."</string> + <string name="backup_enc_password_optional" msgid="1350137345907579306">"Dacă doriți să criptați datele copiei de rezervă complete, introduceți o parolă mai jos:"</string> <string name="backup_enc_password_required" msgid="7889652203371654149">"Întrucât dispozitivul este criptat, trebuie să criptați backupurile. Introduceți o parolă mai jos:"</string> - <string name="restore_enc_password_text" msgid="6140898525580710823">"Dacă datele pentru restabilire sunt criptate, introduceţi parola mai jos:"</string> + <string name="restore_enc_password_text" msgid="6140898525580710823">"Dacă datele pentru restabilire sunt criptate, introduceți parola mai jos:"</string> <string name="toast_backup_started" msgid="550354281452756121">"Se începe copierea de rezervă..."</string> <string name="toast_backup_ended" msgid="3818080769548726424">"Copierea de rezervă a fost finalizată"</string> - <string name="toast_restore_started" msgid="7881679218971277385">"Se porneşte restabilirea..."</string> + <string name="toast_restore_started" msgid="7881679218971277385">"Se pornește restabilirea..."</string> <string name="toast_restore_ended" msgid="1764041639199696132">"Restabilirea s-a încheiat"</string> <string name="toast_timeout" msgid="5276598587087626877">"Operația a expirat"</string> </resources> diff --git a/packages/CaptivePortalLogin/res/values-be-rBY/strings.xml b/packages/CaptivePortalLogin/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..5391946a67e0 --- /dev/null +++ b/packages/CaptivePortalLogin/res/values-be-rBY/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="5934709770924185752">"CaptivePortalLogin"</string> + <string name="action_use_network" msgid="6076184727448466030">"Выкарыстоўваць гэтую сетку як ёсць"</string> + <string name="action_do_not_use_network" msgid="4577366536956516683">"Не выкарыстоўваць гэту сетку"</string> + <string name="action_bar_label" msgid="917235635415966620">"Увайсці ў сетку"</string> + <string name="ssl_error_warning" msgid="6653188881418638872">"У сеткі, да якой вы спрабуеце далучыцца, ёсць праблемы з бяспекай."</string> + <string name="ssl_error_example" msgid="647898534624078900">"Напрыклад, старонка ўваходу можа не належаць указанай арганізацыі."</string> + <string name="ssl_error_continue" msgid="6492718244923937110">"Усё роўна працягнуць праз браўзер"</string> +</resources> diff --git a/packages/CaptivePortalLogin/res/values-bs-rBA/strings.xml b/packages/CaptivePortalLogin/res/values-bs-rBA/strings.xml new file mode 100644 index 000000000000..3237e5eab461 --- /dev/null +++ b/packages/CaptivePortalLogin/res/values-bs-rBA/strings.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="5934709770924185752">"Prijava na zaštitnom portalu"</string> + <string name="action_use_network" msgid="6076184727448466030">"Koristi ovu mrežu kakva jeste"</string> + <string name="action_do_not_use_network" msgid="4577366536956516683">"Ne koristi ovu mrežu"</string> + <string name="action_bar_label" msgid="917235635415966620">"Prijavi me na mrežu"</string> + <string name="ssl_error_warning" msgid="6653188881418638872">"Mreža kojoj pokušavate pristupiti ima sigurnosnih problema."</string> + <string name="ssl_error_example" msgid="647898534624078900">"Naprimjer, stranica za prijavu možda ne pripada prikazanoj organizaciji."</string> + <string name="ssl_error_continue" msgid="6492718244923937110">"Ipak nastavi preko preglednika"</string> +</resources> diff --git a/packages/DefaultContainerService/res/values-be-rBY/strings.xml b/packages/DefaultContainerService/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..68621b6dbc09 --- /dev/null +++ b/packages/DefaultContainerService/res/values-be-rBY/strings.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** +** Copyright 2008, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="service_name" msgid="4841491635055379553">"Памочнік дост. да пакетаў"</string> +</resources> diff --git a/packages/DefaultContainerService/res/values-bs-rBA/strings.xml b/packages/DefaultContainerService/res/values-bs-rBA/strings.xml new file mode 100644 index 000000000000..56b7db12b48e --- /dev/null +++ b/packages/DefaultContainerService/res/values-bs-rBA/strings.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** +** Copyright 2008, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="service_name" msgid="4841491635055379553">"Pomoćnik pristupa paketu"</string> +</resources> diff --git a/packages/DocumentsUI/Android.mk b/packages/DocumentsUI/Android.mk index d5e48b5855e7..3197abddb7a3 100644 --- a/packages/DocumentsUI/Android.mk +++ b/packages/DocumentsUI/Android.mk @@ -31,9 +31,13 @@ LOCAL_AAPT_FLAGS := \ --extra-packages android.support.v7.recyclerview LOCAL_JACK_FLAGS := \ - -D jack.assert.policy=enable \ -D jack.optimization.inner-class.accessors=true +# Only enable asserts on userdebug/eng builds +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +LOCAL_JACK_FLAGS += -D jack.assert.policy=enable +endif + LOCAL_PACKAGE_NAME := DocumentsUI LOCAL_CERTIFICATE := platform diff --git a/packages/DocumentsUI/AndroidManifest.xml b/packages/DocumentsUI/AndroidManifest.xml index 6fe239e400dc..be08385797de 100644 --- a/packages/DocumentsUI/AndroidManifest.xml +++ b/packages/DocumentsUI/AndroidManifest.xml @@ -45,7 +45,7 @@ android:name=".LauncherActivity" android:theme="@android:style/Theme.NoDisplay" android:icon="@drawable/ic_files_app" - android:label="@string/files_label"> + android:label="@string/downloads_label"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> @@ -56,7 +56,7 @@ android:name=".FilesActivity" android:theme="@style/DocumentsTheme" android:icon="@drawable/ic_files_app" - android:label="@string/files_label" + android:label="@string/downloads_label" android:documentLaunchMode="intoExisting"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -107,7 +107,7 @@ </intent-filter> </receiver> - <receiver android:name=".BootReceiver"> + <receiver android:name=".BootReceiver" android:enabled="false"> <intent-filter> <action android:name="android.intent.action.BOOT_COMPLETED" /> </intent-filter> diff --git a/packages/DocumentsUI/res/animator/dir_enter.xml b/packages/DocumentsUI/res/animator/dir_enter.xml index 43c50bd6d4d9..570104e8272c 100644 --- a/packages/DocumentsUI/res/animator/dir_enter.xml +++ b/packages/DocumentsUI/res/animator/dir_enter.xml @@ -21,7 +21,7 @@ android:valueTo="1f" android:propertyName="alpha" android:valueType="floatType" - android:duration="@android:integer/config_mediumAnimTime" + android:duration="200" android:interpolator="@android:interpolator/decelerate_quad" /> <!-- position property maps to AnimationView.setPosition --> @@ -30,7 +30,7 @@ android:valueFrom="1" android:valueTo="0" android:valueType="floatType" - android:duration="@android:integer/config_mediumAnimTime" + android:duration="350" android:interpolator="@android:interpolator/decelerate_quad" /> </set> diff --git a/packages/DocumentsUI/res/animator/dir_leave.xml b/packages/DocumentsUI/res/animator/dir_leave.xml index 75746556d1aa..5929625ecdc9 100644 --- a/packages/DocumentsUI/res/animator/dir_leave.xml +++ b/packages/DocumentsUI/res/animator/dir_leave.xml @@ -21,7 +21,8 @@ android:valueTo="0f" android:propertyName="alpha" android:valueType="floatType" - android:duration="@android:integer/config_mediumAnimTime" + android:duration="150" + android:startOffset="100" android:interpolator="@android:interpolator/decelerate_quad" /> <!-- position property maps to AnimationView.setPosition --> @@ -30,7 +31,7 @@ android:valueTo="1" android:propertyName="position" android:valueType="floatType" - android:duration="@android:integer/config_mediumAnimTime" + android:duration="250" android:interpolator="@android:interpolator/accelerate_quad" /> </set>
\ No newline at end of file diff --git a/packages/DocumentsUI/res/color/item_details.xml b/packages/DocumentsUI/res/color/item_details.xml index 769b94472a31..ac21fe348594 100644 --- a/packages/DocumentsUI/res/color/item_details.xml +++ b/packages/DocumentsUI/res/color/item_details.xml @@ -18,9 +18,5 @@ <item android:state_enabled="true" android:color="?android:attr/textColorPrimary" - android:alpha="0.63" /> - <item - android:state_enabled="false" - android:color="?android:attr/textColorPrimary" - android:alpha="0.3" /> + android:alpha="0.54" /> </selector> diff --git a/packages/DocumentsUI/res/color/item_title.xml b/packages/DocumentsUI/res/color/item_title.xml index ef6aea33fece..9fff2f1bc0d5 100644 --- a/packages/DocumentsUI/res/color/item_title.xml +++ b/packages/DocumentsUI/res/color/item_title.xml @@ -17,9 +17,10 @@ <selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_enabled="true" - android:color="?android:attr/textColorPrimary" /> + android:color="?android:attr/textColorPrimary" + android:alpha="0.87" /> <item android:state_enabled="false" android:color="?android:attr/textColorPrimary" - android:alpha="0.3" /> + android:alpha="0.54" /> </selector> diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_launcher_download.png b/packages/DocumentsUI/res/drawable-hdpi/ic_launcher_download.png Binary files differnew file mode 100644 index 000000000000..f958bbd3c255 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-hdpi/ic_launcher_download.png diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_launcher_download.png b/packages/DocumentsUI/res/drawable-mdpi/ic_launcher_download.png Binary files differnew file mode 100644 index 000000000000..f2e937663c2c --- /dev/null +++ b/packages/DocumentsUI/res/drawable-mdpi/ic_launcher_download.png diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_launcher_download.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_launcher_download.png Binary files differnew file mode 100644 index 000000000000..4dc533638757 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_launcher_download.png diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_launcher_download.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_launcher_download.png Binary files differnew file mode 100644 index 000000000000..8716290969da --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_launcher_download.png diff --git a/packages/DocumentsUI/res/drawable-xxxhdpi/ic_launcher_download.png b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_launcher_download.png Binary files differnew file mode 100644 index 000000000000..f5be21991761 --- /dev/null +++ b/packages/DocumentsUI/res/drawable-xxxhdpi/ic_launcher_download.png diff --git a/packages/DocumentsUI/res/drawable/ic_files_app.xml b/packages/DocumentsUI/res/drawable/ic_files_app.xml index ff7189e94e8b..76e3ba6a8528 100644 --- a/packages/DocumentsUI/res/drawable/ic_files_app.xml +++ b/packages/DocumentsUI/res/drawable/ic_files_app.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <bitmap xmlns:android="http://schemas.android.com/apk/res/android" - android:src="@drawable/icon256" + android:src="@drawable/ic_launcher_download" android:tint="?android:attr/colorControlNormal" android:autoMirrored="true" /> diff --git a/packages/DocumentsUI/res/drawable/icon256.png b/packages/DocumentsUI/res/drawable/icon256.png Binary files differdeleted file mode 100644 index 631c95144f60..000000000000 --- a/packages/DocumentsUI/res/drawable/icon256.png +++ /dev/null diff --git a/packages/DocumentsUI/res/layout/item_dir_grid.xml b/packages/DocumentsUI/res/layout/item_dir_grid.xml index 429a972c5d94..36af9b952d69 100644 --- a/packages/DocumentsUI/res/layout/item_dir_grid.xml +++ b/packages/DocumentsUI/res/layout/item_dir_grid.xml @@ -23,14 +23,16 @@ android:elevation="@dimen/grid_item_elevation" android:focusable="true" > + <!-- The height is 48px. + paddingTop (9dp) + @dimen/check_icon_size (30dp) + paddingBottom (9dp) --> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - android:paddingBottom="16dp" - android:paddingLeft="12dp" + android:paddingBottom="9dp" + android:paddingLeft="9dp" android:paddingRight="12dp" - android:paddingTop="16dp" + android:paddingTop="9dp" android:gravity="center_vertical"> <FrameLayout diff --git a/packages/DocumentsUI/res/values-af/strings.xml b/packages/DocumentsUI/res/values-af/strings.xml index 17e2c31aa6fb..5abb9d7e2717 100644 --- a/packages/DocumentsUI/res/values-af/strings.xml +++ b/packages/DocumentsUI/res/values-af/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"Hernoem"</string> <string name="rename_error" msgid="4203041674883412606">"Kon nie dokument hernoem nie"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Sommige lêers is omgeskakel"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Gee <xliff:g id="APPNAME"><b>^1</b></xliff:g> toegang tot <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>-gids op <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Moenie weer vra nie"</string> <string name="allow" msgid="7225948811296386551">"Laat toe"</string> <string name="deny" msgid="2081879885755434506">"Weier"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Vee <xliff:g id="COUNT_1">%1$d</xliff:g> lêers uit?</item> - <item quantity="one">Vee <xliff:g id="COUNT_0">%1$d</xliff:g> lêer uit?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> gekies</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> gekies</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-am/strings.xml b/packages/DocumentsUI/res/values-am/strings.xml index 0cb68de1b21e..b77b82ccc7b5 100644 --- a/packages/DocumentsUI/res/values-am/strings.xml +++ b/packages/DocumentsUI/res/values-am/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"እንደገና ሰይም"</string> <string name="rename_error" msgid="4203041674883412606">"ሰነዱን ዳግም መሰየም አልተሳካም"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"አንዳንድ ፋይሎች ተለውጠዋል"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> በ<xliff:g id="STORAGE"><i>^3</i></xliff:g> ላይ የ<xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ማውጫ መደረሻ ይሰጠው?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"ዳግም አትጠይቅ"</string> <string name="allow" msgid="7225948811296386551">"ይፍቀዱ"</string> <string name="deny" msgid="2081879885755434506">"ያስተባብሉ"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎች ይሰረዙ?</item> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ፋይሎች ይሰረዙ?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ተመርጠዋል</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ተመርጠዋል</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ar/strings.xml b/packages/DocumentsUI/res/values-ar/strings.xml index 4a30257754b4..1625043e2d62 100644 --- a/packages/DocumentsUI/res/values-ar/strings.xml +++ b/packages/DocumentsUI/res/values-ar/strings.xml @@ -138,20 +138,10 @@ <string name="menu_rename" msgid="7678802479104285353">"إعادة تسمية"</string> <string name="rename_error" msgid="4203041674883412606">"أخفقت إعادة تسمية المستند."</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"تم تحويل بعض الملفات"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"هل تريد منح التطبيق <xliff:g id="APPNAME"><b>^1</b></xliff:g> حق الوصول إلى الدليل <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> على <xliff:g id="STORAGE"><i>^3</i></xliff:g>؟"</string> + <string name="never_ask_again" msgid="4295278542972859268">"عدم السؤال مرة أخرى"</string> <string name="allow" msgid="7225948811296386551">"السماح"</string> <string name="deny" msgid="2081879885755434506">"رفض"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="zero">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملف؟</item> - <item quantity="two">هل تريد حذف ملفين (<xliff:g id="COUNT_1">%1$d</xliff:g>)؟</item> - <item quantity="few">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملفات؟</item> - <item quantity="many">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملفًا؟</item> - <item quantity="other">هل تريد حذف <xliff:g id="COUNT_1">%1$d</xliff:g> ملف؟</item> - <item quantity="one">هل تريد حذف <xliff:g id="COUNT_0">%1$d</xliff:g> ملف؟</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="zero">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="two">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g></item> @@ -160,4 +150,9 @@ <item quantity="other">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">تم تحديد <xliff:g id="COUNT_0">%1$d</xliff:g></item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"هل تريد حذف \"<xliff:g id="NAME">%1$s</xliff:g>\"؟"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"هل تريد حذف المجلد \"<xliff:g id="NAME">%1$s</xliff:g>\" ومحتوياته؟"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-az-rAZ/strings.xml b/packages/DocumentsUI/res/values-az-rAZ/strings.xml index b4326803975f..0f0eda4ea488 100644 --- a/packages/DocumentsUI/res/values-az-rAZ/strings.xml +++ b/packages/DocumentsUI/res/values-az-rAZ/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"Adını dəyişdirin"</string> <string name="rename_error" msgid="4203041674883412606">"Sənəd adını dəyişmək uğursuz oldu"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Bəzi fayllar konvertasiya edilib"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g> yaddaşında <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> kataloquna <xliff:g id="APPNAME"><b>^1</b></xliff:g> girişi təqdim edilsin?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Bir daha soruşmayın"</string> <string name="allow" msgid="7225948811296386551">"İcazə verin"</string> <string name="deny" msgid="2081879885755434506">"Rədd et"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> fayl silinsin?</item> - <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> fayl silinsin?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> seçilib</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> seçilib</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml b/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml index 3e365036ed8c..7bbf9426fedd 100644 --- a/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml +++ b/packages/DocumentsUI/res/values-b+sr+Latn/strings.xml @@ -117,20 +117,18 @@ <string name="menu_rename" msgid="7678802479104285353">"Preimenuj"</string> <string name="rename_error" msgid="4203041674883412606">"Preimenovanje dokumenta nije uspelo"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Neke datoteke su konvertovane"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Želite li da aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> odobrite pristup direktorijumu <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> na memorijskom prostoru <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Ne pitaj ponovo"</string> <string name="allow" msgid="7225948811296386551">"Dozvoli"</string> <string name="deny" msgid="2081879885755434506">"Odbij"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku?</item> - <item quantity="few">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke?</item> - <item quantity="other">Želite li da izbrišete <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one">Izabrana je <xliff:g id="COUNT_1">%1$d</xliff:g> stavka</item> <item quantity="few">Izabrane su <xliff:g id="COUNT_1">%1$d</xliff:g> stavke</item> <item quantity="other">Izabrano je <xliff:g id="COUNT_1">%1$d</xliff:g> stavki</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Želite li da izbrišete „<xliff:g id="NAME">%1$s</xliff:g>“?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Želite li da izbrišete direktorijum „<xliff:g id="NAME">%1$s</xliff:g>“ i njegov sadržaj?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-be-rBY/strings.xml b/packages/DocumentsUI/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..4621d9bfba31 --- /dev/null +++ b/packages/DocumentsUI/res/values-be-rBY/strings.xml @@ -0,0 +1,144 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_label" msgid="2783841764617238354">"Дакументы"</string> + <string name="files_label" msgid="6051402950202690279">"Файлы"</string> + <string name="downloads_label" msgid="959113951084633612">"Спампоўкі"</string> + <string name="title_open" msgid="4353228937663917801">"Адкрыць з"</string> + <string name="title_save" msgid="2433679664882857999">"Захаваць у"</string> + <string name="menu_create_dir" msgid="2547620241173881754">"Новая папка"</string> + <string name="menu_grid" msgid="6878021334497835259">"У выглядзе табліцы"</string> + <string name="menu_list" msgid="7279285939892417279">"У выглядзе спіса"</string> + <string name="menu_sort" msgid="7677740407158414452">"Сартаваць па:"</string> + <string name="menu_search" msgid="3816712084502856974">"Шукаць"</string> + <string name="menu_settings" msgid="8239065133341597825">"Налады сховішча"</string> + <string name="menu_open" msgid="432922957274920903">"Адкрыць"</string> + <string name="menu_save" msgid="2394743337684426338">"Захаваць"</string> + <string name="menu_share" msgid="3075149983979628146">"Абагуліць"</string> + <string name="menu_delete" msgid="8138799623850614177">"Выдаліць"</string> + <string name="menu_select_all" msgid="8323579667348729928">"Выбраць усё"</string> + <string name="menu_copy" msgid="3612326052677229148">"Капіраваць у..."</string> + <string name="menu_move" msgid="1828090633118079817">"Перамясціць у..."</string> + <string name="menu_new_window" msgid="1226032889278727538">"Новае акно"</string> + <string name="menu_copy_to_clipboard" msgid="489311381979634291">"Капіраваць"</string> + <string name="menu_paste_from_clipboard" msgid="2071583031180257091">"Уставіць"</string> + <string name="menu_advanced_show" msgid="4693652895715631401">"Паказаць унутр. сховішча"</string> + <string name="menu_advanced_hide" msgid="4218809952721972589">"Схаваць унутр. сховішча"</string> + <string name="menu_file_size_show" msgid="3240323619260823076">"Паказаць памеры файлаў"</string> + <string name="menu_file_size_hide" msgid="8881975928502581042">"Схаваць памеры файлаў"</string> + <string name="button_select" msgid="527196987259139214">"Выбраць"</string> + <string name="button_copy" msgid="8706475544635021302">"Капіраваць"</string> + <string name="button_move" msgid="2202666023104202232">"Перамясціць"</string> + <string name="button_dismiss" msgid="3714065566893946085">"Адхіліць"</string> + <string name="button_retry" msgid="4392027584153752797">"Паўтарыце спробу"</string> + <string name="sort_name" msgid="9183560467917256779">"Па назве"</string> + <string name="sort_date" msgid="586080032956151448">"Па даце ўнясення змен"</string> + <string name="sort_size" msgid="3350681319735474741">"Па памеры"</string> + <string name="drawer_open" msgid="4545466532430226949">"Паказаць каранёвыя папкі"</string> + <string name="drawer_close" msgid="7602734368552123318">"Схаваць каранёвыя папкі"</string> + <string name="save_error" msgid="6167009778003223664">"Не атрымалася захаваць дакумент"</string> + <string name="create_error" msgid="3735649141335444215">"Не атрымалася стварыць папку"</string> + <string name="query_error" msgid="5999895349602476581">"Зараз немагчыма загрузіць змесціва"</string> + <string name="root_recent" msgid="4470053704320518133">"Апошнія"</string> + <string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> свабодна"</string> + <string name="root_type_service" msgid="2178854894416775409">"Службы захоўвання"</string> + <string name="root_type_shortcut" msgid="3318760609471618093">"Ярлыкі"</string> + <string name="root_type_device" msgid="7121342474653483538">"Прылады"</string> + <string name="root_type_apps" msgid="8838065367985945189">"Іншыя праграмы"</string> + <string name="empty" msgid="7858882803708117596">"Няма элементаў"</string> + <string name="no_results" msgid="6622510343880730446">"Няма супадзенняў у %1$s"</string> + <string name="toast_no_application" msgid="4632640357724698144">"Немагчыма адкрыць файл"</string> + <string name="toast_failed_delete" msgid="2180678019407244069">"Немагчыма выдаліць некаторыя дакументы"</string> + <string name="share_via" msgid="8966594246261344259">"Абагуліць праз"</string> + <string name="copy_notification_title" msgid="6374299806748219777">"Капіраванне файлаў"</string> + <string name="move_notification_title" msgid="6193835179777284805">"Перамяшчэнне файлаў"</string> + <string name="delete_notification_title" msgid="3329403967712437496">"Выдаленне файлаў"</string> + <string name="copy_remaining" msgid="6283790937387975095">"Засталося <xliff:g id="DURATION">%s</xliff:g>"</string> + <plurals name="copy_begin" formatted="false" msgid="9071199452634086365"> + <item quantity="one">Капіраванне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item> + <item quantity="few">Капіраванне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item> + <item quantity="many">Капіраванне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item> + <item quantity="other">Капіраванне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item> + </plurals> + <plurals name="move_begin" formatted="false" msgid="8430330882138871643"> + <item quantity="one">Перамяшчэнне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item> + <item quantity="few">Перамяшчэнне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item> + <item quantity="many">Перамяшчэнне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item> + <item quantity="other">Перамяшчэнне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item> + </plurals> + <plurals name="deleting" formatted="false" msgid="5054338566802559411"> + <item quantity="one">Выдаленне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item> + <item quantity="few">Выдаленне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item> + <item quantity="many">Выдаленне <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item> + <item quantity="other">Выдаленне <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item> + </plurals> + <string name="undo" msgid="7905788502491742328">"Адрабіць"</string> + <string name="copy_preparing" msgid="3896202461003039386">"Падрыхтоўка да капіравання..."</string> + <string name="move_preparing" msgid="2772219441375531410">"Падрыхтоўка да перамяшчэння..."</string> + <string name="delete_preparing" msgid="5655813182533491992">"Падрыхтоўка да выдалення..."</string> + <plurals name="copy_error_notification_title" formatted="false" msgid="7160447124922897689"> + <item quantity="one">Не атрымалася скапіраваць <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item> + <item quantity="few">Не атрымалася скапіраваць <xliff:g id="COUNT_1">%1$d</xliff:g> файлы</item> + <item quantity="many">Не атрымалася скапіраваць <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў</item> + <item quantity="other">Не атрымалася скапіраваць <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item> + </plurals> + <plurals name="move_error_notification_title" formatted="false" msgid="2710901971014783012"> + <item quantity="one">Не атрымалася перамясціць <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item> + <item quantity="few">Не атрымалася перамясціць <xliff:g id="COUNT_1">%1$d</xliff:g> файлы</item> + <item quantity="many">Не атрымалася перамясціць <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў</item> + <item quantity="other">Не атрымалася перамясціць <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item> + </plurals> + <plurals name="delete_error_notification_title" formatted="false" msgid="7228393157786591199"> + <item quantity="one">Не атрымалася выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файл</item> + <item quantity="few">Не атрымалася выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файлы</item> + <item quantity="many">Не атрымалася выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў</item> + <item quantity="other">Не атрымалася выдаліць <xliff:g id="COUNT_1">%1$d</xliff:g> файла</item> + </plurals> + <string name="notification_touch_for_details" msgid="6268189413228855582">"Дакраніцеся, каб прагледзець больш падрабязна"</string> + <string name="close" msgid="3043722427445528732">"Закрыць"</string> + <string name="copy_failure_alert_content" msgid="4563147454522476183">"Не былі скапіраваны наступныя файлы: <xliff:g id="LIST">%1$s</xliff:g>"</string> + <string name="move_failure_alert_content" msgid="2635075788682922861">"Не былі перамешчаны наступныя файлы: <xliff:g id="LIST">%1$s</xliff:g>"</string> + <string name="copy_converted_warning_content" msgid="5753861488218674361">"Гэтыя файлы былі сканвертаваныя ў іншы фармат: <xliff:g id="LIST">%1$s</xliff:g>"</string> + <plurals name="clipboard_files_clipped" formatted="false" msgid="855459017537058539"> + <item quantity="one">У буфер абмену скапіраваны <xliff:g id="COUNT_1">%1$d</xliff:g> файл.</item> + <item quantity="few">У буфер абмену скапіраваны <xliff:g id="COUNT_1">%1$d</xliff:g> файлы.</item> + <item quantity="many">У буфер абмену скапіравана <xliff:g id="COUNT_1">%1$d</xliff:g> файлаў.</item> + <item quantity="other">У буфер абмену скапіравана <xliff:g id="COUNT_1">%1$d</xliff:g> файла.</item> + </plurals> + <string name="clipboard_files_cannot_paste" msgid="2878324825602325706">"Немагчыма ўставіць выбраныя файлы ў гэта месца."</string> + <string name="menu_rename" msgid="7678802479104285353">"Перайменаваць"</string> + <string name="rename_error" msgid="4203041674883412606">"Не атрымалася перайменаваць дакумент"</string> + <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Некаторыя файлы былі сканвертаваныя"</string> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Даць праграме <xliff:g id="APPNAME"><b>^1</b></xliff:g> доступ да дырэкторыі <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> у <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Больш не пытацца"</string> + <string name="allow" msgid="7225948811296386551">"Дазволіць"</string> + <string name="deny" msgid="2081879885755434506">"Забараніць"</string> + <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> + <item quantity="one">Выбраны <xliff:g id="COUNT_1">%1$d</xliff:g></item> + <item quantity="few">Выбраны <xliff:g id="COUNT_1">%1$d</xliff:g></item> + <item quantity="many">Выбрана <xliff:g id="COUNT_1">%1$d</xliff:g></item> + <item quantity="other">Выбрана <xliff:g id="COUNT_1">%1$d</xliff:g></item> + </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> +</resources> diff --git a/packages/DocumentsUI/res/values-bg/strings.xml b/packages/DocumentsUI/res/values-bg/strings.xml index a1ac5c95eeac..329f92f89625 100644 --- a/packages/DocumentsUI/res/values-bg/strings.xml +++ b/packages/DocumentsUI/res/values-bg/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Преименуване"</string> <string name="rename_error" msgid="4203041674883412606">"Преименуването на документа не бе успешно"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Някои файлове бяха преобразувани"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Да се предостави ли на <xliff:g id="APPNAME"><b>^1</b></xliff:g> достъп до директорията „<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>“ в/ъв <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Без повторно питане"</string> <string name="allow" msgid="7225948811296386551">"Разрешаване"</string> <string name="deny" msgid="2081879885755434506">"Отказване"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Искате ли да изтриете <xliff:g id="COUNT_1">%1$d</xliff:g> файла?</item> - <item quantity="one">Искате ли да изтриете <xliff:g id="COUNT_0">%1$d</xliff:g> файл?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other">Избрахте <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">Избрахте <xliff:g id="COUNT_0">%1$d</xliff:g></item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Искате ли да изтриете „<xliff:g id="NAME">%1$s</xliff:g>“?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Искате ли да изтриете папката „<xliff:g id="NAME">%1$s</xliff:g>“ и съдържанието в нея?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-bn-rBD/strings.xml b/packages/DocumentsUI/res/values-bn-rBD/strings.xml index 7b881949d062..936e2ddb6dce 100644 --- a/packages/DocumentsUI/res/values-bn-rBD/strings.xml +++ b/packages/DocumentsUI/res/values-bn-rBD/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"পুনঃনামকরণ"</string> <string name="rename_error" msgid="4203041674883412606">"দস্তাবেজের পুনঃনামকরণ ব্যর্থ হয়েছে৷"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"কিছু ফাইল রূপান্তরিত হয়েছে"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> কে <xliff:g id="STORAGE"><i>^3</i></xliff:g> এ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> সংগ্রহ অ্যাক্সেস করার মঞ্জুরি দিতে চান?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"আর জিজ্ঞাসা করবেন না"</string> <string name="allow" msgid="7225948811296386551">"অনুমতি দিন"</string> <string name="deny" msgid="2081879885755434506">"আস্বীকার করুন"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল মুছবেন?</item> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি ফাইল মুছবেন?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>টি নির্বাচন করা হয়েছে</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>টি নির্বাচন করা হয়েছে</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" মুছবেন?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ফোল্ডার এবং এটির সামগ্রীগুলিকে মুছবেন?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-bs-rBA/strings.xml b/packages/DocumentsUI/res/values-bs-rBA/strings.xml index 9daa80affdc8..d23c88436efd 100644 --- a/packages/DocumentsUI/res/values-bs-rBA/strings.xml +++ b/packages/DocumentsUI/res/values-bs-rBA/strings.xml @@ -117,20 +117,20 @@ <string name="menu_rename" msgid="7678802479104285353">"Preimenuj"</string> <string name="rename_error" msgid="4203041674883412606">"Nije uspjelo preimenovanje dokumenta"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Neke od datoteka su pretvorene"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Omogućiti <xliff:g id="APPNAME"><b>^1</b></xliff:g> pristup direktoriju <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> sa <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Ne pitaj ponovo"</string> <string name="allow" msgid="7225948811296386551">"Dozvoli"</string> <string name="deny" msgid="2081879885755434506">"Odbijte"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajl.</item> - <item quantity="few">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajla.</item> - <item quantity="other">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> fajlova.</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> stavka je odabrana</item> <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> stavke su odabrane</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> stavki je odabrano</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ca/strings.xml b/packages/DocumentsUI/res/values-ca/strings.xml index b7d887e64f1f..044350a76c3f 100644 --- a/packages/DocumentsUI/res/values-ca/strings.xml +++ b/packages/DocumentsUI/res/values-ca/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Canvia el nom"</string> <string name="rename_error" msgid="4203041674883412606">"No s\'ha pogut canviar el nom del document"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"S\'han convertit alguns fitxers"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Vols que l\'aplicació <xliff:g id="APPNAME"><b>^1</b></xliff:g> tingui accés al directori <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> de l\'emmagatzematge <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"No m\'ho demanis més"</string> <string name="allow" msgid="7225948811296386551">"Permet"</string> <string name="deny" msgid="2081879885755434506">"Denega"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Vols suprimir <xliff:g id="COUNT_1">%1$d</xliff:g> fitxers?</item> - <item quantity="one">Vols suprimir <xliff:g id="COUNT_0">%1$d</xliff:g> fitxer?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elements seleccionats</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> element seleccionat</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Vols suprimir el fitxer <xliff:g id="NAME">%1$s</xliff:g>?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Vols suprimir la carpeta <xliff:g id="NAME">%1$s</xliff:g> i el seu contingut?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-cs/strings.xml b/packages/DocumentsUI/res/values-cs/strings.xml index d58615d2dbd4..ca6f3f15afa4 100644 --- a/packages/DocumentsUI/res/values-cs/strings.xml +++ b/packages/DocumentsUI/res/values-cs/strings.xml @@ -124,22 +124,19 @@ <string name="menu_rename" msgid="7678802479104285353">"Přejmenovat"</string> <string name="rename_error" msgid="4203041674883412606">"Dokument se nepodařilo přejmenovat."</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Některé soubory byly převedeny"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Chcete aplikaci <xliff:g id="APPNAME"><b>^1</b></xliff:g> udělit přístup k adresáři <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> v úložišti <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Příště se neptat"</string> <string name="allow" msgid="7225948811296386551">"Povolit"</string> <string name="deny" msgid="2081879885755434506">"Odepřít"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="few">Smazat <xliff:g id="COUNT_1">%1$d</xliff:g> soubory?</item> - <item quantity="many">Smazat <xliff:g id="COUNT_1">%1$d</xliff:g> souboru?</item> - <item quantity="other">Smazat <xliff:g id="COUNT_1">%1$d</xliff:g> souborů?</item> - <item quantity="one">Smazat <xliff:g id="COUNT_0">%1$d</xliff:g> soubor?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="few">Vybrány <xliff:g id="COUNT_1">%1$d</xliff:g> položky</item> <item quantity="many">Vybráno <xliff:g id="COUNT_1">%1$d</xliff:g> položky</item> <item quantity="other">Vybráno <xliff:g id="COUNT_1">%1$d</xliff:g> položek</item> <item quantity="one">Vybrána <xliff:g id="COUNT_0">%1$d</xliff:g> položka</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Smazat soubor <xliff:g id="NAME">%1$s</xliff:g>?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Smazat složku <xliff:g id="NAME">%1$s</xliff:g> a její obsah?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-da/strings.xml b/packages/DocumentsUI/res/values-da/strings.xml index 99338f6c9d85..c4e7770933e4 100644 --- a/packages/DocumentsUI/res/values-da/strings.xml +++ b/packages/DocumentsUI/res/values-da/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Omdøb"</string> <string name="rename_error" msgid="4203041674883412606">"Dokumentet kunne ikke omdøbes"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Nogle filer er konverteret"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Vil du give <xliff:g id="APPNAME"><b>^1</b></xliff:g> adgang til mappen <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> på <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Spørg ikke igen"</string> <string name="allow" msgid="7225948811296386551">"Tillad"</string> <string name="deny" msgid="2081879885755434506">"Afvis"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Vil du slette <xliff:g id="COUNT_1">%1$d</xliff:g> filer?</item> - <item quantity="other">Vil du slette <xliff:g id="COUNT_1">%1$d</xliff:g> filer?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one">Der er valgt <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="other">Der er valgt <xliff:g id="COUNT_1">%1$d</xliff:g></item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Vil du slette \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Vil du slette mappen \"<xliff:g id="NAME">%1$s</xliff:g>\" og dens indhold?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-de/strings.xml b/packages/DocumentsUI/res/values-de/strings.xml index 373b05825d8a..766222cd8b02 100644 --- a/packages/DocumentsUI/res/values-de/strings.xml +++ b/packages/DocumentsUI/res/values-de/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Umbenennen"</string> <string name="rename_error" msgid="4203041674883412606">"Dokument konnte nicht umbenannt werden"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Einige Dateien wurden konvertiert"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> Zugriff auf das Verzeichnis <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> auf <xliff:g id="STORAGE"><i>^3</i></xliff:g> geben?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Nicht mehr fragen"</string> <string name="allow" msgid="7225948811296386551">"Zulassen"</string> <string name="deny" msgid="2081879885755434506">"Ablehnen"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Möchtest du <xliff:g id="COUNT_1">%1$d</xliff:g> Dateien löschen?</item> - <item quantity="one">Möchtest du <xliff:g id="COUNT_0">%1$d</xliff:g> Datei löschen?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ausgewählt</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ausgewählt</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" löschen?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Ordner \"<xliff:g id="NAME">%1$s</xliff:g>\" und dessen Inhalte löschen?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-el/strings.xml b/packages/DocumentsUI/res/values-el/strings.xml index 539a7c632ad8..3bbcf776236f 100644 --- a/packages/DocumentsUI/res/values-el/strings.xml +++ b/packages/DocumentsUI/res/values-el/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Μετονομασία"</string> <string name="rename_error" msgid="4203041674883412606">"Αποτυχία μετονομασίας εγγράφου"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Ορισμένα αρχεία μετατράπηκαν"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Να εκχωρηθεί στην εφαρμογή <xliff:g id="APPNAME"><b>^1</b></xliff:g> πρόσβαση στον κατάλογο <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> στον αποθηκευτικό χώρο <xliff:g id="STORAGE"><i>^3</i></xliff:g>;"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Να μην ερωτηθώ ξανά"</string> <string name="allow" msgid="7225948811296386551">"Να επιτρέπεται"</string> <string name="deny" msgid="2081879885755434506">"Άρνηση"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Να διαγραφούν <xliff:g id="COUNT_1">%1$d</xliff:g> αρχεία;</item> - <item quantity="one">Να διαγραφεί <xliff:g id="COUNT_0">%1$d</xliff:g> αρχείο;</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> επιλεγμένα</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> επιλεγμένο</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Να διαγραφεί το αρχείο \"<xliff:g id="NAME">%1$s</xliff:g>\";"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Να διαγραφεί ο φάκελος \"<xliff:g id="NAME">%1$s</xliff:g>\" και τα περιεχόμενά του;"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-en-rAU/strings.xml b/packages/DocumentsUI/res/values-en-rAU/strings.xml index 1693bdb7984e..d28b6750590f 100644 --- a/packages/DocumentsUI/res/values-en-rAU/strings.xml +++ b/packages/DocumentsUI/res/values-en-rAU/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"rename"</string> <string name="rename_error" msgid="4203041674883412606">"Failed to rename document"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Some files were converted"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Grant <xliff:g id="APPNAME"><b>^1</b></xliff:g> access to <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> directory on <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Don\'t ask again"</string> <string name="allow" msgid="7225948811296386551">"Allow"</string> <string name="deny" msgid="2081879885755434506">"Deny"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> files?</item> - <item quantity="one">Delete <xliff:g id="COUNT_0">%1$d</xliff:g> file?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selected</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Delete \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Delete folder \"<xliff:g id="NAME">%1$s</xliff:g>\" and its contents?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-en-rGB/strings.xml b/packages/DocumentsUI/res/values-en-rGB/strings.xml index 1693bdb7984e..d28b6750590f 100644 --- a/packages/DocumentsUI/res/values-en-rGB/strings.xml +++ b/packages/DocumentsUI/res/values-en-rGB/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"rename"</string> <string name="rename_error" msgid="4203041674883412606">"Failed to rename document"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Some files were converted"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Grant <xliff:g id="APPNAME"><b>^1</b></xliff:g> access to <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> directory on <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Don\'t ask again"</string> <string name="allow" msgid="7225948811296386551">"Allow"</string> <string name="deny" msgid="2081879885755434506">"Deny"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> files?</item> - <item quantity="one">Delete <xliff:g id="COUNT_0">%1$d</xliff:g> file?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selected</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Delete \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Delete folder \"<xliff:g id="NAME">%1$s</xliff:g>\" and its contents?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-en-rIN/strings.xml b/packages/DocumentsUI/res/values-en-rIN/strings.xml index 1693bdb7984e..d28b6750590f 100644 --- a/packages/DocumentsUI/res/values-en-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-en-rIN/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"rename"</string> <string name="rename_error" msgid="4203041674883412606">"Failed to rename document"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Some files were converted"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Grant <xliff:g id="APPNAME"><b>^1</b></xliff:g> access to <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> directory on <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Don\'t ask again"</string> <string name="allow" msgid="7225948811296386551">"Allow"</string> <string name="deny" msgid="2081879885755434506">"Deny"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Delete <xliff:g id="COUNT_1">%1$d</xliff:g> files?</item> - <item quantity="one">Delete <xliff:g id="COUNT_0">%1$d</xliff:g> file?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selected</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selected</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Delete \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Delete folder \"<xliff:g id="NAME">%1$s</xliff:g>\" and its contents?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-es-rUS/strings.xml b/packages/DocumentsUI/res/values-es-rUS/strings.xml index 8ad0439f9561..6d847b590cfe 100644 --- a/packages/DocumentsUI/res/values-es-rUS/strings.xml +++ b/packages/DocumentsUI/res/values-es-rUS/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Cambiar nombre"</string> <string name="rename_error" msgid="4203041674883412606">"No se pudo cambiar el nombre del documento"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Se convirtieron algunos archivos"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"¿Otorgar acceso a <xliff:g id="APPNAME"><b>^1</b></xliff:g> al directorio <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> en <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"No volver a preguntar"</string> <string name="allow" msgid="7225948811296386551">"Permitir"</string> <string name="deny" msgid="2081879885755434506">"Denegar"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">¿Deseas borrar <xliff:g id="COUNT_1">%1$d</xliff:g> archivos?</item> - <item quantity="one">¿Deseas borrar <xliff:g id="COUNT_0">%1$d</xliff:g> archivo?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementos seleccionados</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento seleccionado</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"¿Deseas borrar \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"¿Deseas borrar la carpeta \"<xliff:g id="NAME">%1$s</xliff:g>\" y su contenido?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-es/strings.xml b/packages/DocumentsUI/res/values-es/strings.xml index c3a4648aedf5..15b569442327 100644 --- a/packages/DocumentsUI/res/values-es/strings.xml +++ b/packages/DocumentsUI/res/values-es/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Cambiar nombre"</string> <string name="rename_error" msgid="4203041674883412606">"Error al cambiar el nombre del documento"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Se han convertido algunos archivos"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"¿Permitir que <xliff:g id="APPNAME"><b>^1</b></xliff:g> acceda al directorio <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> (<xliff:g id="STORAGE"><i>^3</i></xliff:g>)?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"No volver a preguntar"</string> <string name="allow" msgid="7225948811296386551">"Permitir"</string> <string name="deny" msgid="2081879885755434506">"Denegar"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">¿Eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> archivos?</item> - <item quantity="one">¿Eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> archivo?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> seleccionados</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> seleccionado</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"¿Eliminar <xliff:g id="NAME">%1$s</xliff:g>?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"¿Eliminar la carpeta <xliff:g id="NAME">%1$s</xliff:g> y su contenido?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-et-rEE/strings.xml b/packages/DocumentsUI/res/values-et-rEE/strings.xml index 76f1ef79291f..ed60aa94b647 100644 --- a/packages/DocumentsUI/res/values-et-rEE/strings.xml +++ b/packages/DocumentsUI/res/values-et-rEE/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Nimeta ümber"</string> <string name="rename_error" msgid="4203041674883412606">"Dokumendi ümbernimetamine ebaõnnestus"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Mõned failid teisendati"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Kas anda rakendusele <xliff:g id="APPNAME"><b>^1</b></xliff:g> juurdepääs kataloogile <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> salvestusruumis <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Ära enam küsi"</string> <string name="allow" msgid="7225948811296386551">"Luba"</string> <string name="deny" msgid="2081879885755434506">"Keela"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Kas kustutada <xliff:g id="COUNT_1">%1$d</xliff:g> faili?</item> - <item quantity="one">Kas kustutada <xliff:g id="COUNT_0">%1$d</xliff:g> fail?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> on valitud</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> on valitud</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Kas kustutada fail „<xliff:g id="NAME">%1$s</xliff:g>”?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Kas kustutada kaust „<xliff:g id="NAME">%1$s</xliff:g>” ja selle sisu?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-eu-rES/strings.xml b/packages/DocumentsUI/res/values-eu-rES/strings.xml index ea776576c5e7..f3d68b0dc870 100644 --- a/packages/DocumentsUI/res/values-eu-rES/strings.xml +++ b/packages/DocumentsUI/res/values-eu-rES/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Aldatu izena"</string> <string name="rename_error" msgid="4203041674883412606">"Ezin izan zaio aldatu izena dokumentuari"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Artxibo batzuk bihurtu dira"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> aplikazioari <xliff:g id="STORAGE"><i>^3</i></xliff:g> unitateko <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> direktorioa atzitzeko baimena eman nahi diozu?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Ez galdetu berriro"</string> <string name="allow" msgid="7225948811296386551">"Onartu"</string> <string name="deny" msgid="2081879885755434506">"Ukatu"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> fitxategi ezabatu nahi dituzu?</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> fitxategi ezabatu nahi duzu?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> hautatuta</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> hautatuta</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ezabatu nahi duzu?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" karpeta eta bertako edukia ezabatu nahi duzu?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-fa/strings.xml b/packages/DocumentsUI/res/values-fa/strings.xml index 4c2a34211314..80e1aa80b294 100644 --- a/packages/DocumentsUI/res/values-fa/strings.xml +++ b/packages/DocumentsUI/res/values-fa/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"تغییر نام"</string> <string name="rename_error" msgid="4203041674883412606">"نام سند تغییر نکرد"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"بعضی از فایلها تبدیل شدند"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"به <xliff:g id="APPNAME"><b>^1</b></xliff:g> اجازه داده شود به فهرست راهنمای <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> در <xliff:g id="STORAGE"><i>^3</i></xliff:g> دسترسی داشته باشد؟"</string> + <string name="never_ask_again" msgid="4295278542972859268">"دوباره سؤال نشود"</string> <string name="allow" msgid="7225948811296386551">"ارزیابیشده"</string> <string name="deny" msgid="2081879885755434506">"اجازه ندارد"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> فایل حذف شود؟</item> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فایل حذف شود؟</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> مورد انتخاب شد</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> مورد انتخاب شد</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-fi/strings.xml b/packages/DocumentsUI/res/values-fi/strings.xml index a586f7c60d8b..279aad78a550 100644 --- a/packages/DocumentsUI/res/values-fi/strings.xml +++ b/packages/DocumentsUI/res/values-fi/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Nimeä uudelleen"</string> <string name="rename_error" msgid="4203041674883412606">"Dokumentin nimen muuttaminen epäonnistui."</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Joitakin tiedostoja muunnettiin."</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Myönnetäänkö sovellukselle <xliff:g id="APPNAME"><b>^1</b></xliff:g> sijainnissa <xliff:g id="STORAGE"><i>^3</i></xliff:g> olevan hakemiston <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> käyttöoikeus?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Älä kysy uudestaan"</string> <string name="allow" msgid="7225948811296386551">"Salli"</string> <string name="deny" msgid="2081879885755434506">"Kiellä"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Poistetaanko <xliff:g id="COUNT_1">%1$d</xliff:g> tiedostoa?</item> - <item quantity="one">Poistetaanko <xliff:g id="COUNT_0">%1$d</xliff:g> tiedosto?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> valittu</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> valittu</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Poistetaanko <xliff:g id="NAME">%1$s</xliff:g>?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Poistetaanko kansio <xliff:g id="NAME">%1$s</xliff:g> ja sen sisältö?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-fr-rCA/strings.xml b/packages/DocumentsUI/res/values-fr-rCA/strings.xml index cb3a1236b676..347a3f29969c 100644 --- a/packages/DocumentsUI/res/values-fr-rCA/strings.xml +++ b/packages/DocumentsUI/res/values-fr-rCA/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Renommer"</string> <string name="rename_error" msgid="4203041674883412606">"Impossible de renommer le document"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Certains fichiers ont été convertis"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Accorder à <xliff:g id="APPNAME"><b>^1</b></xliff:g> l\'accès au répertoire <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> sur <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Ne plus me demander"</string> <string name="allow" msgid="7225948811296386551">"Autoriser"</string> <string name="deny" msgid="2081879885755434506">"Refuser"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> fichier?</item> - <item quantity="other">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> élément sélectionné</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> éléments sélectionnés</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Supprimer « <xliff:g id="NAME">%1$s</xliff:g> »?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Supprimer le dossier « <xliff:g id="NAME">%1$s</xliff:g> » et son contenu?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-fr/strings.xml b/packages/DocumentsUI/res/values-fr/strings.xml index 0cbc14153c2e..6030bdea2f53 100644 --- a/packages/DocumentsUI/res/values-fr/strings.xml +++ b/packages/DocumentsUI/res/values-fr/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Renommer"</string> <string name="rename_error" msgid="4203041674883412606">"Échec du changement de nom du document."</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Certains fichiers ont été convertis"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Autoriser <xliff:g id="APPNAME"><b>^1</b></xliff:g> à accéder à l\'annuaire \"<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>\" sur <xliff:g id="STORAGE"><i>^3</i></xliff:g> ?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Ne plus demander"</string> <string name="allow" msgid="7225948811296386551">"Autoriser"</string> <string name="deny" msgid="2081879885755434506">"Refuser"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> fichier ?</item> - <item quantity="other">Supprimer <xliff:g id="COUNT_1">%1$d</xliff:g> fichiers ?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> élément sélectionné</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> éléments sélectionnés</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Supprimer \"<xliff:g id="NAME">%1$s</xliff:g>\" ?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Supprimer le dossier \"<xliff:g id="NAME">%1$s</xliff:g>\" et son contenu ?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-gl-rES/strings.xml b/packages/DocumentsUI/res/values-gl-rES/strings.xml index 1f8ecadf6d8e..58181f890ebb 100644 --- a/packages/DocumentsUI/res/values-gl-rES/strings.xml +++ b/packages/DocumentsUI/res/values-gl-rES/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Cambiar nome"</string> <string name="rename_error" msgid="4203041674883412606">"Non se puido cambiar o nome do documento"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Convertéronse algúns ficheiros"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Queres outorgar acceso a <xliff:g id="APPNAME"><b>^1</b></xliff:g> ao directorio <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> no almacenamento de <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Non preguntar de novo"</string> <string name="allow" msgid="7225948811296386551">"Permitir"</string> <string name="deny" msgid="2081879885755434506">"Rexeitar"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Queres eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros?</item> - <item quantity="one">Queres eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other">Seleccionáronse <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">Seleccionouse <xliff:g id="COUNT_0">%1$d</xliff:g></item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Queres eliminar \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Queres eliminar o cartafol \"<xliff:g id="NAME">%1$s</xliff:g>\" e o seu contido?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-gu-rIN/strings.xml b/packages/DocumentsUI/res/values-gu-rIN/strings.xml index 7fc21b6bbf89..2cce5a31c501 100644 --- a/packages/DocumentsUI/res/values-gu-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-gu-rIN/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"નામ બદલો"</string> <string name="rename_error" msgid="4203041674883412606">"દસ્તાવેજનું નામ બદલવામાં નિષ્ફળ થયાં"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"કેટલીક ફાઇલો રૂપાંતરિત કરી હતી"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ને <xliff:g id="STORAGE"><i>^3</i></xliff:g> પર <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> નિર્દેશિકાની ઍક્સેસ આપીએ?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"ફરીથી પૂછશો નહીં"</string> <string name="allow" msgid="7225948811296386551">"મંજૂરી આપો"</string> <string name="deny" msgid="2081879885755434506">"નકારો"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ કાઢી નાખીએ?</item> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ફાઇલ કાઢી નાખીએ?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> પસંદ કરી</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> પસંદ કરી</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ને કાઢી નાખીએ?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ફોલ્ડર અને તેની સામગ્રીઓને કાઢી નાખીએ?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-hi/strings.xml b/packages/DocumentsUI/res/values-hi/strings.xml index 87dfb5fc8246..9f57f0bf3a7f 100644 --- a/packages/DocumentsUI/res/values-hi/strings.xml +++ b/packages/DocumentsUI/res/values-hi/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"नाम बदलें"</string> <string name="rename_error" msgid="4203041674883412606">"दस्तावेज़ का नाम बदलना विफल रहा"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"कुछ फ़ाइलें रूपांतरित हो गई थीं"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> को <xliff:g id="STORAGE"><i>^3</i></xliff:g> पर <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> निर्देशिका का एक्सेस दें?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"फिर से ना पूछें"</string> <string name="allow" msgid="7225948811296386551">"अनुमति दें"</string> <string name="deny" msgid="2081879885755434506">"अस्वीकारें"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें हटाएं?</item> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फ़ाइलें हटाएं?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> चयनित</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> चयनित</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" को हटाएं?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" फ़ोल्डर और उसकी सामग्रियां हटाएं?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-hr/strings.xml b/packages/DocumentsUI/res/values-hr/strings.xml index f86877e67c6f..0d42d5dd32d3 100644 --- a/packages/DocumentsUI/res/values-hr/strings.xml +++ b/packages/DocumentsUI/res/values-hr/strings.xml @@ -117,20 +117,18 @@ <string name="menu_rename" msgid="7678802479104285353">"Promijeni naziv"</string> <string name="rename_error" msgid="4203041674883412606">"Naziv dokumenta nije promijenjen"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Neke su datoteke konvertirane"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Želite li aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> odobriti pristup direktoriju <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> na pohrani <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Više me ne pitaj"</string> <string name="allow" msgid="7225948811296386551">"Dopusti"</string> <string name="deny" msgid="2081879885755434506">"Odbij"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteku?</item> - <item quantity="few">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke?</item> - <item quantity="other">Želite li izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteka?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one">Odabrano: <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="few">Odabrano: <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="other">Odabrano: <xliff:g id="COUNT_1">%1$d</xliff:g></item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Želite li izbrisati datoteku \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Želite li izbrisati mapu \"<xliff:g id="NAME">%1$s</xliff:g>\" i njezin sadržaj?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-hu/strings.xml b/packages/DocumentsUI/res/values-hu/strings.xml index 14662ad377b0..37bfcfa347f3 100644 --- a/packages/DocumentsUI/res/values-hu/strings.xml +++ b/packages/DocumentsUI/res/values-hu/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Átnevezés"</string> <string name="rename_error" msgid="4203041674883412606">"Nem sikerült átnevezni a dokumentumot"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Egyes fájlokat konvertált a rendszer"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Hozzáférést biztosít a(z) <xliff:g id="APPNAME"><b>^1</b></xliff:g> számára a(z) <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> könyvtárhoz itt: <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Ne jelenjen meg többé"</string> <string name="allow" msgid="7225948811296386551">"Engedélyezés"</string> <string name="deny" msgid="2081879885755434506">"Elutasítás"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Töröl <xliff:g id="COUNT_1">%1$d</xliff:g> fájlt?</item> - <item quantity="one">Töröl <xliff:g id="COUNT_0">%1$d</xliff:g> fájlt?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> kiválasztva</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> kiválasztva</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Törli a következőt: „<xliff:g id="NAME">%1$s</xliff:g>”?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Törli „<xliff:g id="NAME">%1$s</xliff:g>” mappát a tartalmával együtt?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-hy-rAM/strings.xml b/packages/DocumentsUI/res/values-hy-rAM/strings.xml index ecd7669c1d2a..22e44b0fec53 100644 --- a/packages/DocumentsUI/res/values-hy-rAM/strings.xml +++ b/packages/DocumentsUI/res/values-hy-rAM/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"Վերանվանել"</string> <string name="rename_error" msgid="4203041674883412606">"Չհաջողվեց վերանվանել փաստաթուղթը"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Որոշ ֆայլեր փոխարկվել են"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> հավելվածին տրամադրե՞լ <xliff:g id="STORAGE"><i>^3</i></xliff:g>-ի <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> գրացուցակն օգտագործելու թույլտվություն:"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Այլևս չհարցնել"</string> <string name="allow" msgid="7225948811296386551">"Թույլատրել"</string> <string name="deny" msgid="2081879885755434506">"Մերժել"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Ջնջե՞լ <xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ:</item> - <item quantity="other">Ջնջե՞լ <xliff:g id="COUNT_1">%1$d</xliff:g> ֆայլ:</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one">Ընտրված է՝ <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="other">Ընտրված է՝ <xliff:g id="COUNT_1">%1$d</xliff:g></item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-in/strings.xml b/packages/DocumentsUI/res/values-in/strings.xml index b27674e4d82b..f9aae9d205b2 100644 --- a/packages/DocumentsUI/res/values-in/strings.xml +++ b/packages/DocumentsUI/res/values-in/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Ganti nama"</string> <string name="rename_error" msgid="4203041674883412606">"Gagal mengganti nama dokumen"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Beberapa file dikonversi"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Beri <xliff:g id="APPNAME"><b>^1</b></xliff:g> akses ke direktori <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> di <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Jangan tanya lagi"</string> <string name="allow" msgid="7225948811296386551">"Izinkan"</string> <string name="deny" msgid="2081879885755434506">"Tolak"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Hapus <xliff:g id="COUNT_1">%1$d</xliff:g> file?</item> - <item quantity="one">Hapus <xliff:g id="COUNT_0">%1$d</xliff:g> file?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dipilih</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dipilih</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Hapus \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Hapus folder \"<xliff:g id="NAME">%1$s</xliff:g>\" dan kontennya?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-is-rIS/strings.xml b/packages/DocumentsUI/res/values-is-rIS/strings.xml index f351cb807ae7..a2a0d9b7e0f1 100644 --- a/packages/DocumentsUI/res/values-is-rIS/strings.xml +++ b/packages/DocumentsUI/res/values-is-rIS/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Endurnefna"</string> <string name="rename_error" msgid="4203041674883412606">"Ekki tókst að endurnefna skjalið"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Sumum skrám var umbreytt"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Veita <xliff:g id="APPNAME"><b>^1</b></xliff:g> aðgang að skráasafninu <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> á <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Ekki spyrja aftur"</string> <string name="allow" msgid="7225948811296386551">"Leyfa"</string> <string name="deny" msgid="2081879885755434506">"Hafna"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Eyða <xliff:g id="COUNT_1">%1$d</xliff:g> skrá?</item> - <item quantity="other">Eyða <xliff:g id="COUNT_1">%1$d</xliff:g> skrám?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> valið</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> valin</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Eyða „<xliff:g id="NAME">%1$s</xliff:g>“?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Eyða möppunni „<xliff:g id="NAME">%1$s</xliff:g>“ og öllu innihaldi hennar?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-it/strings.xml b/packages/DocumentsUI/res/values-it/strings.xml index 3eb14c0ee6ee..ddede45a1c47 100644 --- a/packages/DocumentsUI/res/values-it/strings.xml +++ b/packages/DocumentsUI/res/values-it/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Rinomina"</string> <string name="rename_error" msgid="4203041674883412606">"Ridenominazione documento non riuscita"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Alcuni file sono stati convertiti"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Concedere all\'app <xliff:g id="APPNAME"><b>^1</b></xliff:g> l\'accesso alla directory <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> su <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Non chiedermelo più"</string> <string name="allow" msgid="7225948811296386551">"Consenti"</string> <string name="deny" msgid="2081879885755434506">"Nega"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Eliminare <xliff:g id="COUNT_1">%1$d</xliff:g> file?</item> - <item quantity="one">Eliminare <xliff:g id="COUNT_0">%1$d</xliff:g> file?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> elementi selezionati</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> elemento selezionato</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Eliminare \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Eliminare la cartella \"<xliff:g id="NAME">%1$s</xliff:g>\" e i relativi contenuti?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-iw/strings.xml b/packages/DocumentsUI/res/values-iw/strings.xml index 3b0aef8a56e9..e2658c35fec7 100644 --- a/packages/DocumentsUI/res/values-iw/strings.xml +++ b/packages/DocumentsUI/res/values-iw/strings.xml @@ -124,22 +124,21 @@ <string name="menu_rename" msgid="7678802479104285353">"שנה שם"</string> <string name="rename_error" msgid="4203041674883412606">"ניסיון שינוי שם המסמך נכשל"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"קבצים מסוימים הומרו"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"האם להעניק לאפליקציה <xliff:g id="APPNAME"><b>^1</b></xliff:g> גישה לספריה <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> באחסון <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"אל תשאל שוב"</string> <string name="allow" msgid="7225948811296386551">"אפשר"</string> <string name="deny" msgid="2081879885755434506">"דחה"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="two">האם למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים?</item> - <item quantity="many">האם למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים?</item> - <item quantity="other">האם למחוק <xliff:g id="COUNT_1">%1$d</xliff:g> קבצים?</item> - <item quantity="one">האם למחוק קובץ <xliff:g id="COUNT_0">%1$d</xliff:g>?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> נבחרו</item> <item quantity="many"><xliff:g id="COUNT_1">%1$d</xliff:g> נבחרו</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> נבחרו</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> נבחר</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ja/strings.xml b/packages/DocumentsUI/res/values-ja/strings.xml index 23b7ab67ee5b..3cad318db17f 100644 --- a/packages/DocumentsUI/res/values-ja/strings.xml +++ b/packages/DocumentsUI/res/values-ja/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"名前を変更"</string> <string name="rename_error" msgid="4203041674883412606">"ドキュメントの名前を変更できませんでした"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"一部のファイルが変換されました"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"「<xliff:g id="STORAGE"><i>^3</i></xliff:g>」の「<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>」ディレクトリに「<xliff:g id="APPNAME"><b>^1</b></xliff:g>」へのアクセスを許可しますか？"</string> + <string name="never_ask_again" msgid="4295278542972859268">"今後表示しない"</string> <string name="allow" msgid="7225948811296386551">"許可"</string> <string name="deny" msgid="2081879885755434506">"拒否"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 個のファイルを削除しますか？</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個のファイルを削除しますか？</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> 個を選択中</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> 個を選択中</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"「<xliff:g id="NAME">%1$s</xliff:g>」を削除しますか？"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"フォルダ「<xliff:g id="NAME">%1$s</xliff:g>」とそのコンテンツを削除しますか？"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ka-rGE/strings.xml b/packages/DocumentsUI/res/values-ka-rGE/strings.xml index fc36bdbc868e..afd419849341 100644 --- a/packages/DocumentsUI/res/values-ka-rGE/strings.xml +++ b/packages/DocumentsUI/res/values-ka-rGE/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"გადარქმევა"</string> <string name="rename_error" msgid="4203041674883412606">"დოკუმენტის გადარქმევა ვერ მოხერხდა"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ზოგიერთი ფაილი გარდაქმნილია"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"გსურთ, <xliff:g id="APPNAME"><b>^1</b></xliff:g> სარგებლობდეს <xliff:g id="STORAGE"><i>^3</i></xliff:g>-ის დირექტორიაზე „<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>“ წვდომის უფლებით?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"აღარ მკითხოთ"</string> <string name="allow" msgid="7225948811296386551">"უფლების მიცემა"</string> <string name="deny" msgid="2081879885755434506">"აკრძალვა"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">გსურთ <xliff:g id="COUNT_1">%1$d</xliff:g> ფაილის წაშლა?</item> - <item quantity="one">გსურთ <xliff:g id="COUNT_0">%1$d</xliff:g> ფაილის წაშლა?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other">არჩეულია <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">არჩეულია <xliff:g id="COUNT_0">%1$d</xliff:g></item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml index 101392d3ab99..21a8260553a1 100644 --- a/packages/DocumentsUI/res/values-kk-rKZ/strings.xml +++ b/packages/DocumentsUI/res/values-kk-rKZ/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Атын өзгерту"</string> <string name="rename_error" msgid="4203041674883412606">"Құжат қайта аталмады"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Кейбір файлдар түрлендірілді"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> қолданбасына <xliff:g id="STORAGE"><i>^3</i></xliff:g> қоймасындағы <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> каталогына өтуге рұқсат беру керек пе?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Қайта сұралмасын"</string> <string name="allow" msgid="7225948811296386551">"Рұқсат беру"</string> <string name="deny" msgid="2081879885755434506">"Бас тарту"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файлды жою керек пе?</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файлды жою керек пе?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> таңдалды</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> таңдалды</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" жою керек пе?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" қалтасын және оның мазмұнын жою керек пе?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-km-rKH/strings.xml b/packages/DocumentsUI/res/values-km-rKH/strings.xml index 2ee35fe45fd7..5a049addb79b 100644 --- a/packages/DocumentsUI/res/values-km-rKH/strings.xml +++ b/packages/DocumentsUI/res/values-km-rKH/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"ប្ដូរឈ្មោះ"</string> <string name="rename_error" msgid="4203041674883412606">"បានបរាជ័យក្នុងការប្តូរឈ្មោះឯកសារ"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ឯកសារមួយចំនួនត្រូវបានបម្លែង"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"ផ្តល់សិទ្ធិឲ្យ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ចូលដំណើរការថត <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> នៅលើ <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"កុំសួរទៀត"</string> <string name="allow" msgid="7225948811296386551">"អនុញ្ញាត"</string> <string name="deny" msgid="2081879885755434506">"បដិសេធ"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">លុបឯកសារ <xliff:g id="COUNT_1">%1$d</xliff:g> ច្បាប់ឬ?</item> - <item quantity="one">លុបឯកសារ <xliff:g id="COUNT_0">%1$d</xliff:g> ច្បាប់ឬ?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other">បានជ្រើស <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">បានជ្រើស <xliff:g id="COUNT_0">%1$d</xliff:g></item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"លុប \"<xliff:g id="NAME">%1$s</xliff:g>\" ឬ?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"លុបថតឯកសារ \"<xliff:g id="NAME">%1$s</xliff:g>\" និងមាតិការបស់វាឬ?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-kn-rIN/strings.xml b/packages/DocumentsUI/res/values-kn-rIN/strings.xml index b74d6a20431b..924b14a01019 100644 --- a/packages/DocumentsUI/res/values-kn-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-kn-rIN/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"ಮರುಹೆಸರಿಸು"</string> <string name="rename_error" msgid="4203041674883412606">"ಡಾಕ್ಯುಮೆಂಟ್ ಮರುಹೆಸರಿಸಲು ವಿಫಲವಾಗಿದೆ"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ಕೆಲವು ಫೈಲ್ಗಳನ್ನು ಪರಿವರ್ತಿಸಲಾಗಿದೆ"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g> ರಲ್ಲಿ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ಡೈರೆಕ್ಟರಿಗೆ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ಪ್ರವೇಶ ನೀಡುವುದೇ?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"ಮತ್ತೆ ಕೇಳಬೇಡಿ"</string> <string name="allow" msgid="7225948811296386551">"ಅನುಮತಿಸು"</string> <string name="deny" msgid="2081879885755434506">"ನಿರಾಕರಿಸು"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಅಳಿಸುವುದೇ?</item> - <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> ಫೈಲ್ಗಳನ್ನು ಅಳಿಸುವುದೇ?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ಆಯ್ಕೆಮಾಡಲಾಗಿದೆ</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ko/strings.xml b/packages/DocumentsUI/res/values-ko/strings.xml index 3c2da975504c..df0cbf2c1975 100644 --- a/packages/DocumentsUI/res/values-ko/strings.xml +++ b/packages/DocumentsUI/res/values-ko/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"이름 바꾸기"</string> <string name="rename_error" msgid="4203041674883412606">"문서 이름을 변경하지 못했습니다."</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"일부 파일이 변환되었습니다."</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g>이(가) <xliff:g id="STORAGE"><i>^3</i></xliff:g>에서 <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> 디렉토리에 액세스하도록 허용하시겠습니까?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"다시 묻지 않음"</string> <string name="allow" msgid="7225948811296386551">"허용"</string> <string name="deny" msgid="2081879885755434506">"거부"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">파일 <xliff:g id="COUNT_1">%1$d</xliff:g>개를 삭제하시겠습니까?</item> - <item quantity="one">파일 <xliff:g id="COUNT_0">%1$d</xliff:g>개를 삭제하시겠습니까?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>개 선택됨</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g>개 선택됨</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"<xliff:g id="NAME">%1$s</xliff:g>을(를) 삭제하시겠습니까?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\'<xliff:g id="NAME">%1$s</xliff:g>\' 폴더와 폴더에 포함된 콘텐츠를 삭제하시겠습니까?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ky-rKG/strings.xml b/packages/DocumentsUI/res/values-ky-rKG/strings.xml index 865e717ced16..84bc37fd43f4 100644 --- a/packages/DocumentsUI/res/values-ky-rKG/strings.xml +++ b/packages/DocumentsUI/res/values-ky-rKG/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"Аталышын өзгөртүү"</string> <string name="rename_error" msgid="4203041674883412606">"Документтин аталышы өзгөртүлбөй калды"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Айрым файлдардын форматы өзгөртүлдү"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> колдонмосуна <xliff:g id="STORAGE"><i>^3</i></xliff:g> түзмөгүндөгү <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> папканы пайдалануу мүмкүнчүлүгү берилсинби?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Экинчи суралбасын"</string> <string name="allow" msgid="7225948811296386551">"Уруксат берүү"</string> <string name="deny" msgid="2081879885755434506">"Жок"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> файл жок кылынсынбы?</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> файл жок кылынсынбы?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> тандалды</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> тандалды</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-lo-rLA/strings.xml b/packages/DocumentsUI/res/values-lo-rLA/strings.xml index 4f4a3753995a..4c891aaa69c6 100644 --- a/packages/DocumentsUI/res/values-lo-rLA/strings.xml +++ b/packages/DocumentsUI/res/values-lo-rLA/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"ປ່ຽນຊື່"</string> <string name="rename_error" msgid="4203041674883412606">"ປ່ຽນຊື່ເອກະສານບໍ່ສຳເລັດ"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ປ່ຽນແປງບາງໄຟລ໌ແລ້ວ"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"ອະນຸຍາດສິດເຂົ້າເຖິງໃຫ້ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ເພື່ອເຂົ້າໄດເຣກທໍຣີ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ຢູ່ <xliff:g id="STORAGE"><i>^3</i></xliff:g> ບໍ?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"ບໍ່ຕ້ອງຖາມຄືນ"</string> <string name="allow" msgid="7225948811296386551">"ອະນຸຍາດ"</string> <string name="deny" msgid="2081879885755434506">"ປະຕິເສດ"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">ລຶບ <xliff:g id="COUNT_1">%1$d</xliff:g> ໄຟລ໌ອອກບໍ?</item> - <item quantity="one">ລຶບ <xliff:g id="COUNT_0">%1$d</xliff:g> ໄຟລ໌ອອກບໍ?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other">ເລືອກ <xliff:g id="COUNT_1">%1$d</xliff:g> ແລ້ວ</item> <item quantity="one">ເລືອກ <xliff:g id="COUNT_0">%1$d</xliff:g> ແລ້ວ</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"ລຶບ \"<xliff:g id="NAME">%1$s</xliff:g>\" ອອກບໍ?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"ລຶບໂຟນເດີ \"<xliff:g id="NAME">%1$s</xliff:g>\" ແລະ ເນື້ອຫາທັງໝົດຂອງມັນອອກບໍ?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-lt/strings.xml b/packages/DocumentsUI/res/values-lt/strings.xml index fa653fc96392..8aec2d471ff9 100644 --- a/packages/DocumentsUI/res/values-lt/strings.xml +++ b/packages/DocumentsUI/res/values-lt/strings.xml @@ -124,22 +124,19 @@ <string name="menu_rename" msgid="7678802479104285353">"Pervardyti"</string> <string name="rename_error" msgid="4203041674883412606">"Nepavyko pervardyti dokumento"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Kai kurie failai buvo konvertuoti"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Suteikti „<xliff:g id="APPNAME"><b>^1</b></xliff:g>“ prieigą prie katalogo „<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>“ <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Daugiau neklausti"</string> <string name="allow" msgid="7225948811296386551">"Leisti"</string> <string name="deny" msgid="2081879885755434506">"Atmesti"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failą?</item> - <item quantity="few">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failus?</item> - <item quantity="many">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failo?</item> - <item quantity="other">Ištrinti <xliff:g id="COUNT_1">%1$d</xliff:g> failų?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one">Pasirinktas <xliff:g id="COUNT_1">%1$d</xliff:g> elementas</item> <item quantity="few">Pasirinkti <xliff:g id="COUNT_1">%1$d</xliff:g> elementai</item> <item quantity="many">Pasirinkta <xliff:g id="COUNT_1">%1$d</xliff:g> elemento</item> <item quantity="other">Pasirinkta <xliff:g id="COUNT_1">%1$d</xliff:g> elementų</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Ištrinti „<xliff:g id="NAME">%1$s</xliff:g>“?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Ištrinti aplanką „<xliff:g id="NAME">%1$s</xliff:g>“ ir jo turinį?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-lv/strings.xml b/packages/DocumentsUI/res/values-lv/strings.xml index 8fd73e4dd412..be2f0b7fa71c 100644 --- a/packages/DocumentsUI/res/values-lv/strings.xml +++ b/packages/DocumentsUI/res/values-lv/strings.xml @@ -117,20 +117,18 @@ <string name="menu_rename" msgid="7678802479104285353">"Pārdēvēt"</string> <string name="rename_error" msgid="4203041674883412606">"Neizdevās pārdēvēt dokumentu"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Daži faili tika pārveidoti."</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Vai atļaut lietotnei <xliff:g id="APPNAME"><b>^1</b></xliff:g> piekļūt direktorijam <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> šajā krātuvē: <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Turpmāk vairs nejautāt"</string> <string name="allow" msgid="7225948811296386551">"Atļaut"</string> <string name="deny" msgid="2081879885755434506">"Noraidīt"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="zero">Vai izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> failus?</item> - <item quantity="one">Vai izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> failu?</item> - <item quantity="other">Vai izdzēst <xliff:g id="COUNT_1">%1$d</xliff:g> failus?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="zero"><xliff:g id="COUNT_1">%1$d</xliff:g> atlasīti</item> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> atlasīts</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> atlasīti</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Vai izdzēst failu “<xliff:g id="NAME">%1$s</xliff:g>”?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Vai izdzēst mapi “<xliff:g id="NAME">%1$s</xliff:g>” un tās saturu?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-mk-rMK/strings.xml b/packages/DocumentsUI/res/values-mk-rMK/strings.xml index 12455da1e7f6..e9c7f3fae4cc 100644 --- a/packages/DocumentsUI/res/values-mk-rMK/strings.xml +++ b/packages/DocumentsUI/res/values-mk-rMK/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Преименувај"</string> <string name="rename_error" msgid="4203041674883412606">"Не успеа да се преименува документот"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Некои датотеки беа конвертирани"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Овозможете пристап на <xliff:g id="APPNAME"><b>^1</b></xliff:g> до директориумот <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> на <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Не прашувај повторно"</string> <string name="allow" msgid="7225948811296386551">"Дозволи"</string> <string name="deny" msgid="2081879885755434506">"Одбиј"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Да се избрише <xliff:g id="COUNT_1">%1$d</xliff:g> датотека?</item> - <item quantity="other">Да се избришат <xliff:g id="COUNT_1">%1$d</xliff:g> датотеки?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> е избрана</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> се избрани</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Да се избрише „<xliff:g id="NAME">%1$s</xliff:g>“?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Да се избрише папката „<xliff:g id="NAME">%1$s</xliff:g>“ и нејзините содржини?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ml-rIN/strings.xml b/packages/DocumentsUI/res/values-ml-rIN/strings.xml index 0c0420d568fa..e71e62a67ba1 100644 --- a/packages/DocumentsUI/res/values-ml-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-ml-rIN/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"പേരുമാറ്റുക"</string> <string name="rename_error" msgid="4203041674883412606">"ഡോക്യുമെന്റിന്റെ പേരുമാറ്റുന്നത് പരാജയപ്പെട്ടു"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ചില ഫയലുകൾ പരിവർത്തനം ചെയ്യപ്പെട്ടു"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g> സ്റ്റോറേജിലെ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> എന്ന ഡയറക്റ്ററിയിലേക്ക് <xliff:g id="APPNAME"><b>^1</b></xliff:g> ആപ്പിന് ആക്സസ് അനുവദിക്കണോ?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"വീണ്ടും ആവശ്യപ്പെടരുത്"</string> <string name="allow" msgid="7225948811296386551">"അനുവദിക്കുക"</string> <string name="deny" msgid="2081879885755434506">"നിരസിക്കുക"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ഫയലുകൾ ഇല്ലാതാക്കണോ?</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ഫയൽ ഇല്ലാതാക്കണോ?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> തിരഞ്ഞെടുത്തു</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> തിരഞ്ഞെടുത്തു</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-mn-rMN/strings.xml b/packages/DocumentsUI/res/values-mn-rMN/strings.xml index 2af8556ebd39..64cc2a8162e3 100644 --- a/packages/DocumentsUI/res/values-mn-rMN/strings.xml +++ b/packages/DocumentsUI/res/values-mn-rMN/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Нэр өөрчлөх"</string> <string name="rename_error" msgid="4203041674883412606">"Баримт бичгийн нэрийн өөрчилж чадсангүй"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Зарим файлыг хөрвүүлсэн"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g>-д байгаа <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> лавлагаанд хандахыг <xliff:g id="APPNAME"><b>^1</b></xliff:g>-д зөвшөөрөх үү?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Дахин бүү асуу"</string> <string name="allow" msgid="7225948811296386551">"Зөвшөөрөх"</string> <string name="deny" msgid="2081879885755434506">"Татгалзах"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> файлыг устгах уу?</item> - <item quantity="one"> <xliff:g id="COUNT_0">%1$d</xliff:g> файлыг устгах уу?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> сонгосон</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> сонгосон</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\"-г устгах уу?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" фолдер болон үүний агуулгыг устгах уу?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-mr-rIN/strings.xml b/packages/DocumentsUI/res/values-mr-rIN/strings.xml index 6256a9954380..415eda8b75a9 100644 --- a/packages/DocumentsUI/res/values-mr-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-mr-rIN/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"पुनर्नामित करा"</string> <string name="rename_error" msgid="4203041674883412606">"दस्तऐवज पुनर्नामित करण्यात अयशस्वी झाले"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"काही फायली रूपांतरित केल्या होत्या"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g> वर <xliff:g id="APPNAME"><b>^1</b></xliff:g> ला <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> निर्देशिकेवर प्रवेशाची मंजूरी द्यायची?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"पुन्हा विचारू नका"</string> <string name="allow" msgid="7225948811296386551">"अनुमती द्या"</string> <string name="deny" msgid="2081879885755434506">"नकार द्या"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one"> <xliff:g id="COUNT_1">%1$d</xliff:g> फाईल हटवायची?</item> - <item quantity="other"> <xliff:g id="COUNT_1">%1$d</xliff:g> फायली हटवायच्या?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> निवडला</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> निवडले</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ms-rMY/strings.xml b/packages/DocumentsUI/res/values-ms-rMY/strings.xml index df896a20bb99..c5f4771a5d84 100644 --- a/packages/DocumentsUI/res/values-ms-rMY/strings.xml +++ b/packages/DocumentsUI/res/values-ms-rMY/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Namakan semula"</string> <string name="rename_error" msgid="4203041674883412606">"Gagal menamakan semula dokumen"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Sesetengah fail telah ditukarkan"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Beri <xliff:g id="APPNAME"><b>^1</b></xliff:g> akses kepada direktori <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> di <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Jangan tanya lagi"</string> <string name="allow" msgid="7225948811296386551">"Benarkan"</string> <string name="deny" msgid="2081879885755434506">"Nafi"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Padamkan <xliff:g id="COUNT_1">%1$d</xliff:g> fail?</item> - <item quantity="one">Padamkan <xliff:g id="COUNT_0">%1$d</xliff:g> fail?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dipilih</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dipilih</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Padamkan \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Padamkan folder \"<xliff:g id="NAME">%1$s</xliff:g>\" dan kandungannya?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-my-rMM/strings.xml b/packages/DocumentsUI/res/values-my-rMM/strings.xml index 14193b22f346..bdfd1a2248cc 100644 --- a/packages/DocumentsUI/res/values-my-rMM/strings.xml +++ b/packages/DocumentsUI/res/values-my-rMM/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"အမည်ပြောင်းရန်"</string> <string name="rename_error" msgid="4203041674883412606">"စာရွက်စာတမ်းကို အမည်ပြောင်းခြင်း မအောင်မြင်ပါ"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"အချို့ဖိုင်များကို ပြောင်းလဲထားသည်"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ကို <xliff:g id="STORAGE"><i>^3</i></xliff:g> ရှိ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> လမ်းညွှန်အား အသုံးပြုခွင့်ပေးမလား။"</string> + <string name="never_ask_again" msgid="4295278542972859268">"နောက်ထပ်မမေးပါနှင့်"</string> <string name="allow" msgid="7225948811296386551">"ခွင့်ပြုသည်"</string> <string name="deny" msgid="2081879885755434506">"ငြင်းပယ်သည်"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">ဖိုင် <xliff:g id="COUNT_1">%1$d</xliff:g> ခုကိုဖျက်မလား။</item> - <item quantity="one">ဖိုင် <xliff:g id="COUNT_0">%1$d</xliff:g> ခုကိုဖျက်မလား။</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ခုရွေးချယ်ထားသည်</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ခုရွေးချယ်ထားသည်</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ကိုဖျက်မလား။"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ဖိုင်တွဲနှင့် ၎င်းတွင်ပါဝင်သည့် အကြောင်းအရာများကို ဖျက်မလား။"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-nb/strings.xml b/packages/DocumentsUI/res/values-nb/strings.xml index 7d37078e11d1..5922d1c4d48d 100644 --- a/packages/DocumentsUI/res/values-nb/strings.xml +++ b/packages/DocumentsUI/res/values-nb/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Gi nytt navn"</string> <string name="rename_error" msgid="4203041674883412606">"Kunne ikke gi dokumentet nytt navn"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Noen filer er konvertert"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Vil du gi <xliff:g id="APPNAME"><b>^1</b></xliff:g> tilgang til <xliff:g id="DIRECTORY"><i>^2</i></xliff:g>-katalogen på <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Ikke spør igjen"</string> <string name="allow" msgid="7225948811296386551">"Tillat"</string> <string name="deny" msgid="2081879885755434506">"Avslå"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Vil du slette <xliff:g id="COUNT_1">%1$d</xliff:g> filer?</item> - <item quantity="one">Vil du slette <xliff:g id="COUNT_0">%1$d</xliff:g> fil?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> er valgt</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> er valgt</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Vil du slette «<xliff:g id="NAME">%1$s</xliff:g>»?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Vil du slette «<xliff:g id="NAME">%1$s</xliff:g>»-mappen og innholdet i den?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ne-rNP/strings.xml b/packages/DocumentsUI/res/values-ne-rNP/strings.xml index 5a06cd266f17..4bc814b8534f 100644 --- a/packages/DocumentsUI/res/values-ne-rNP/strings.xml +++ b/packages/DocumentsUI/res/values-ne-rNP/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"पुन: नामाकरण गर्नुहोस्"</string> <string name="rename_error" msgid="4203041674883412606">"कागजात पुन: नामाकरण गर्न असफल भयो"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"केही फाइलहरू परिवर्तन गरिएका थिए"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> लाई <xliff:g id="STORAGE"><i>^3</i></xliff:g> मा भएको <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> निर्देशिकामा पहुँच गर्न अनुमति दिने हो?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"फेरि नसोध्नुहोस्"</string> <string name="allow" msgid="7225948811296386551">"अनुमति दिनुहोस्"</string> <string name="deny" msgid="2081879885755434506">"अस्वीकार गर्नुहोस्"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> फाइलहरूलाई मेट्ने हो?</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> फाइललाई मेट्ने हो?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> लाई चयन गरियो</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> लाई चयन गरियो</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-nl/strings.xml b/packages/DocumentsUI/res/values-nl/strings.xml index 0e022af1ba2d..f1b3ed7a24e0 100644 --- a/packages/DocumentsUI/res/values-nl/strings.xml +++ b/packages/DocumentsUI/res/values-nl/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Naam wijzigen"</string> <string name="rename_error" msgid="4203041674883412606">"Kan naam van document niet wijzigen"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Sommige bestanden zijn geconverteerd"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> toegang verlenen tot de map <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> op <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Niet meer vragen"</string> <string name="allow" msgid="7225948811296386551">"Toestaan"</string> <string name="deny" msgid="2081879885755434506">"Weigeren"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> bestanden verwijderen?</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> bestand verwijderen?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> geselecteerd</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> geselecteerd</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"<xliff:g id="NAME">%1$s</xliff:g> verwijderen?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Map <xliff:g id="NAME">%1$s</xliff:g> en de bijbehorende inhoud verwijderen?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-pa-rIN/strings.xml b/packages/DocumentsUI/res/values-pa-rIN/strings.xml index 4cfe638860b6..f9f94123a2e3 100644 --- a/packages/DocumentsUI/res/values-pa-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-pa-rIN/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"ਮੁੜ-ਨਾਮਕਰਨ ਕਰੋ"</string> <string name="rename_error" msgid="4203041674883412606">"ਦਸਤਾਵੇਜ਼ ਦਾ ਮੁੜ-ਨਾਮਕਰਨ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"ਕੁਝ ਫ਼ਾਈਲਾਂ ਤਬਦੀਲ ਕੀਤੀਆਂ ਗਈਆਂ ਸਨ"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"ਕੀ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ਨੂੰ <xliff:g id="STORAGE"><i>^3</i></xliff:g> \'ਤੇ <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ਡਾਇਰੈਕਟਰੀ \'ਤੇ ਪਹੁੰਚ ਦੇਣੀ ਹੈ?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"ਦੁਬਾਰਾ ਨਾ ਪੁੱਛੋ"</string> <string name="allow" msgid="7225948811296386551">"ਆਗਿਆ ਦਿਓ"</string> <string name="deny" msgid="2081879885755434506">"ਅਸਵੀਕਾਰ ਕਰੋ"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">ਕੀ <xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?</item> - <item quantity="other">ਕੀ <xliff:g id="COUNT_1">%1$d</xliff:g> ਫ਼ਾਈਲਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ਚੁਣੀ ਗਈ</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ਚੁਣੀਆਂ ਗਈਆਂ</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-pl/strings.xml b/packages/DocumentsUI/res/values-pl/strings.xml index b10d8a25152c..7a35bc243ed2 100644 --- a/packages/DocumentsUI/res/values-pl/strings.xml +++ b/packages/DocumentsUI/res/values-pl/strings.xml @@ -124,22 +124,19 @@ <string name="menu_rename" msgid="7678802479104285353">"Zmień nazwę"</string> <string name="rename_error" msgid="4203041674883412606">"Nie udało się zmienić nazwy dokumentu"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Niektóre pliki zostały przekonwertowane"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Zezwolić aplikacji <xliff:g id="APPNAME"><b>^1</b></xliff:g> na dostęp do katalogu <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> w pamięci masowej <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Nie pytaj ponownie"</string> <string name="allow" msgid="7225948811296386551">"Zezwól"</string> <string name="deny" msgid="2081879885755434506">"Odmów"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="few">Usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> pliki?</item> - <item quantity="many">Usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> plików?</item> - <item quantity="other">Usunąć <xliff:g id="COUNT_1">%1$d</xliff:g> pliku?</item> - <item quantity="one">Usunąć <xliff:g id="COUNT_0">%1$d</xliff:g> plik?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="few">Wybrano <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="many">Wybrano <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="other">Wybrano <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">Wybrano <xliff:g id="COUNT_0">%1$d</xliff:g></item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Usunąć „<xliff:g id="NAME">%1$s</xliff:g>”?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Usunąć folder „<xliff:g id="NAME">%1$s</xliff:g>” i jego zawartość?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-pt-rBR/strings.xml b/packages/DocumentsUI/res/values-pt-rBR/strings.xml index 26ec421e21b8..b765cd0d15bb 100644 --- a/packages/DocumentsUI/res/values-pt-rBR/strings.xml +++ b/packages/DocumentsUI/res/values-pt-rBR/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Renomear"</string> <string name="rename_error" msgid="4203041674883412606">"Falha ao renomear documento"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Alguns arquivos foram convertidos"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Conceder ao <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> no <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Não perguntar novamente"</string> <string name="allow" msgid="7225948811296386551">"Permitir"</string> <string name="deny" msgid="2081879885755434506">"Negar"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos?</item> - <item quantity="other">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Excluir \" <xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Excluir pasta \"<xliff:g id="NAME">%1$s</xliff:g>\" e o respectivo conteúdo?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-pt-rPT/strings.xml b/packages/DocumentsUI/res/values-pt-rPT/strings.xml index 490c4d71e75c..1edd1c049a2c 100644 --- a/packages/DocumentsUI/res/values-pt-rPT/strings.xml +++ b/packages/DocumentsUI/res/values-pt-rPT/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Mudar o nome"</string> <string name="rename_error" msgid="4203041674883412606">"Falha ao mudar o nome do documento"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Alguns ficheiros foram convertidos"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Pretende conceder a <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> no(a) <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Não perguntar novamente"</string> <string name="allow" msgid="7225948811296386551">"Permitir"</string> <string name="deny" msgid="2081879885755434506">"Recusar"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Pretende eliminar <xliff:g id="COUNT_1">%1$d</xliff:g> ficheiros?</item> - <item quantity="one">Pretende eliminar <xliff:g id="COUNT_0">%1$d</xliff:g> ficheiro?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selecionado</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Pretende eliminar \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Pretende eliminar a pasta \"<xliff:g id="NAME">%1$s</xliff:g>\" e os respetivos conteúdos?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-pt/strings.xml b/packages/DocumentsUI/res/values-pt/strings.xml index 26ec421e21b8..b765cd0d15bb 100644 --- a/packages/DocumentsUI/res/values-pt/strings.xml +++ b/packages/DocumentsUI/res/values-pt/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Renomear"</string> <string name="rename_error" msgid="4203041674883412606">"Falha ao renomear documento"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Alguns arquivos foram convertidos"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Conceder ao <xliff:g id="APPNAME"><b>^1</b></xliff:g> acesso ao diretório <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> no <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Não perguntar novamente"</string> <string name="allow" msgid="7225948811296386551">"Permitir"</string> <string name="deny" msgid="2081879885755434506">"Negar"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos?</item> - <item quantity="other">Excluir <xliff:g id="COUNT_1">%1$d</xliff:g> arquivos?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selecionados</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Excluir \" <xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Excluir pasta \"<xliff:g id="NAME">%1$s</xliff:g>\" e o respectivo conteúdo?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ro/strings.xml b/packages/DocumentsUI/res/values-ro/strings.xml index ef34f3a20097..10f6aee035cc 100644 --- a/packages/DocumentsUI/res/values-ro/strings.xml +++ b/packages/DocumentsUI/res/values-ro/strings.xml @@ -117,20 +117,18 @@ <string name="menu_rename" msgid="7678802479104285353">"Redenumiți"</string> <string name="rename_error" msgid="4203041674883412606">"Documentul nu a putut fi redenumit"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Unele fișiere au fost convertite"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Permiteți aplicației <xliff:g id="APPNAME"><b>^1</b></xliff:g> accesul la directorul <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> de pe <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Nu mai întreba"</string> <string name="allow" msgid="7225948811296386551">"Permiteți"</string> <string name="deny" msgid="2081879885755434506">"Refuzați"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="few">Ștergeți <xliff:g id="COUNT_1">%1$d</xliff:g> fișiere?</item> - <item quantity="other">Ștergeți <xliff:g id="COUNT_1">%1$d</xliff:g> de fișiere?</item> - <item quantity="one">Ștergeți <xliff:g id="COUNT_0">%1$d</xliff:g> fișier?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> selectate</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> selectate</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> selectat</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Ștergeți „<xliff:g id="NAME">%1$s</xliff:g>”?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Ștergeți dosarul „<xliff:g id="NAME">%1$s</xliff:g>” și conținutul acestuia?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ru/strings.xml b/packages/DocumentsUI/res/values-ru/strings.xml index b94b2a5e7cdf..d9f400979d24 100644 --- a/packages/DocumentsUI/res/values-ru/strings.xml +++ b/packages/DocumentsUI/res/values-ru/strings.xml @@ -124,22 +124,19 @@ <string name="menu_rename" msgid="7678802479104285353">"Переименовать"</string> <string name="rename_error" msgid="4203041674883412606">"Не удалось переименовать документ"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Формат некоторых файлов изменен"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Открыть приложению \"<xliff:g id="APPNAME"><b>^1</b></xliff:g>\" доступ к папке \"<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>\" на устройстве \"<xliff:g id="STORAGE"><i>^3</i></xliff:g>\"?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Больше не спрашивать"</string> <string name="allow" msgid="7225948811296386551">"Разрешить"</string> <string name="deny" msgid="2081879885755434506">"Отклонить"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файл?</item> - <item quantity="few">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла?</item> - <item quantity="many">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файлов?</item> - <item quantity="other">Удалить <xliff:g id="COUNT_1">%1$d</xliff:g> файла?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="few">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="many">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="other">Выбрано: <xliff:g id="COUNT_1">%1$d</xliff:g></item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Удалить файл \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Удалить папку \"<xliff:g id="NAME">%1$s</xliff:g>\" со всем содержимым?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-si-rLK/strings.xml b/packages/DocumentsUI/res/values-si-rLK/strings.xml index a0d764e336b9..41ee22602684 100644 --- a/packages/DocumentsUI/res/values-si-rLK/strings.xml +++ b/packages/DocumentsUI/res/values-si-rLK/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"යළි නම් කරන්න"</string> <string name="rename_error" msgid="4203041674883412606">"ලේඛනය යළි නම් කිරීම අසාර්ථක විය"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"සමහර ගොනු පරිවර්තනය කරන ලදී"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> හට <xliff:g id="STORAGE"><i>^3</i></xliff:g> මත <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> නාමාවලිය වෙත ප්රවේශය දෙන්නද?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"නැවත අසන්න එපා"</string> <string name="allow" msgid="7225948811296386551">"අවසර දෙන්න"</string> <string name="deny" msgid="2081879885755434506">"ප්රතික්ෂේප කරන්න"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g>ක් මකන්නද?</item> - <item quantity="other">ගොනු <xliff:g id="COUNT_1">%1$d</xliff:g>ක් මකන්නද?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g>ක් තෝරන ලදී</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g>ක් තෝරන ලදී</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-sk/strings.xml b/packages/DocumentsUI/res/values-sk/strings.xml index 06b7a10b482a..518093c8814e 100644 --- a/packages/DocumentsUI/res/values-sk/strings.xml +++ b/packages/DocumentsUI/res/values-sk/strings.xml @@ -124,22 +124,19 @@ <string name="menu_rename" msgid="7678802479104285353">"Premenovať"</string> <string name="rename_error" msgid="4203041674883412606">"Premenovanie dokumentu zlyhalo"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Niektoré súbory boli konvertované"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Udeliť aplikácii <xliff:g id="APPNAME"><b>^1</b></xliff:g> prístup k adresáru <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> v úložisku <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Nabudúce sa nepýtať"</string> <string name="allow" msgid="7225948811296386551">"Povoliť"</string> <string name="deny" msgid="2081879885755434506">"Zamietnuť"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="few">Odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> súbory?</item> - <item quantity="many">Odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> súboru?</item> - <item quantity="other">Odstrániť <xliff:g id="COUNT_1">%1$d</xliff:g> súborov?</item> - <item quantity="one">Odstrániť <xliff:g id="COUNT_0">%1$d</xliff:g> súbor?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="few">Vybraté: <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="many">Vybraté: <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="other">Vybraté: <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">Vybraté: <xliff:g id="COUNT_0">%1$d</xliff:g></item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Odstrániť <xliff:g id="NAME">%1$s</xliff:g>?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Odstrániť priečinok <xliff:g id="NAME">%1$s</xliff:g> a jeho obsah?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-sl/strings.xml b/packages/DocumentsUI/res/values-sl/strings.xml index ee7bdc9aec91..39cfed7d2d71 100644 --- a/packages/DocumentsUI/res/values-sl/strings.xml +++ b/packages/DocumentsUI/res/values-sl/strings.xml @@ -124,22 +124,19 @@ <string name="menu_rename" msgid="7678802479104285353">"Preimenuj"</string> <string name="rename_error" msgid="4203041674883412606">"Dokumenta ni bilo mogoče preimenovati"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Nekatere datoteke so bile pretvorjene"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Želite aplikaciji <xliff:g id="APPNAME"><b>^1</b></xliff:g> dovoliti dostop do imenika <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> v shrambi <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Ne sprašuj več"</string> <string name="allow" msgid="7225948811296386551">"Dovoli"</string> <string name="deny" msgid="2081879885755434506">"Zavrni"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteko?</item> - <item quantity="two">Želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteki?</item> - <item quantity="few">Želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datoteke?</item> - <item quantity="other">Želite izbrisati <xliff:g id="COUNT_1">%1$d</xliff:g> datotek?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> izbran</item> <item quantity="two"><xliff:g id="COUNT_1">%1$d</xliff:g> izbrana</item> <item quantity="few"><xliff:g id="COUNT_1">%1$d</xliff:g> izbrani</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> izbranih</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Ali želite izbrisati »<xliff:g id="NAME">%1$s</xliff:g>«?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Ali želite izbrisati mapo »<xliff:g id="NAME">%1$s</xliff:g>« in njeno vsebino?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-sq-rAL/strings.xml b/packages/DocumentsUI/res/values-sq-rAL/strings.xml index 352da58dda7b..f5ebbbcbce58 100644 --- a/packages/DocumentsUI/res/values-sq-rAL/strings.xml +++ b/packages/DocumentsUI/res/values-sq-rAL/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Riemërto"</string> <string name="rename_error" msgid="4203041674883412606">"Riemërtimi i dokumentit dështoi"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Disa skedarë u konvertuan"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Jepi aplikacionit <xliff:g id="APPNAME"><b>^1</b></xliff:g> qasje te direktoria <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> në <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Mos pyet përsëri"</string> <string name="allow" msgid="7225948811296386551">"Lejo"</string> <string name="deny" msgid="2081879885755434506">"Moho"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Të fshihen <xliff:g id="COUNT_1">%1$d</xliff:g> skedarë?</item> - <item quantity="one">Të fshihet <xliff:g id="COUNT_0">%1$d</xliff:g> skedar?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> të zgjedhur</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> i zgjedhur</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Të fshihet \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Të fshihet dosja \"<xliff:g id="NAME">%1$s</xliff:g>\" dhe përmbajtja e saj?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-sr/strings.xml b/packages/DocumentsUI/res/values-sr/strings.xml index 0ba3da1f8c30..6a6488e01a4e 100644 --- a/packages/DocumentsUI/res/values-sr/strings.xml +++ b/packages/DocumentsUI/res/values-sr/strings.xml @@ -117,20 +117,18 @@ <string name="menu_rename" msgid="7678802479104285353">"Преименуј"</string> <string name="rename_error" msgid="4203041674883412606">"Преименовање документа није успело"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Неке датотеке су конвертоване"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Желите ли да апликацији <xliff:g id="APPNAME"><b>^1</b></xliff:g> одобрите приступ директоријуму <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> на меморијском простору <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Не питај поново"</string> <string name="allow" msgid="7225948811296386551">"Дозволи"</string> <string name="deny" msgid="2081879885755434506">"Одбиј"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Желите ли да избришете <xliff:g id="COUNT_1">%1$d</xliff:g> датотеку?</item> - <item quantity="few">Желите ли да избришете <xliff:g id="COUNT_1">%1$d</xliff:g> датотеке?</item> - <item quantity="other">Желите ли да избришете <xliff:g id="COUNT_1">%1$d</xliff:g> датотека?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one">Изабрана је <xliff:g id="COUNT_1">%1$d</xliff:g> ставка</item> <item quantity="few">Изабране су <xliff:g id="COUNT_1">%1$d</xliff:g> ставке</item> <item quantity="other">Изабрано је <xliff:g id="COUNT_1">%1$d</xliff:g> ставки</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Желите ли да избришете „<xliff:g id="NAME">%1$s</xliff:g>“?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Желите ли да избришете директоријум „<xliff:g id="NAME">%1$s</xliff:g>“ и његов садржај?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-sv/strings.xml b/packages/DocumentsUI/res/values-sv/strings.xml index 081c331e2ea7..8b55b22a854b 100644 --- a/packages/DocumentsUI/res/values-sv/strings.xml +++ b/packages/DocumentsUI/res/values-sv/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Byt namn"</string> <string name="rename_error" msgid="4203041674883412606">"Det gick inte att byta namn på dokumentet"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Vissa filer konverterades"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Vill du ge <xliff:g id="APPNAME"><b>^1</b></xliff:g> åtkomst till katalogen <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> på <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Fråga inte igen"</string> <string name="allow" msgid="7225948811296386551">"Tillåt"</string> <string name="deny" msgid="2081879885755434506">"Neka"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Radera <xliff:g id="COUNT_1">%1$d</xliff:g> filer?</item> - <item quantity="one">Radera <xliff:g id="COUNT_0">%1$d</xliff:g> fil?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> har valts</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> har valts</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Vill du radera <xliff:g id="NAME">%1$s</xliff:g>?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Vill du radera mappen <xliff:g id="NAME">%1$s</xliff:g> och dess innehåll?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-sw/strings.xml b/packages/DocumentsUI/res/values-sw/strings.xml index fc4d555208e2..482c7eca5c24 100644 --- a/packages/DocumentsUI/res/values-sw/strings.xml +++ b/packages/DocumentsUI/res/values-sw/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Badilisha jina"</string> <string name="rename_error" msgid="4203041674883412606">"Imeshindwa kubadilisha jina la hati"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Baadhi ya faili zimebadilishwa muundo"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Ungependa kuruhusu <xliff:g id="APPNAME"><b>^1</b></xliff:g> ifikie saraka ya <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> kwenye <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Usiniulize tena"</string> <string name="allow" msgid="7225948811296386551">"Ruhusu"</string> <string name="deny" msgid="2081879885755434506">"Kataza"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Ungependa kufuta faili <xliff:g id="COUNT_1">%1$d</xliff:g>?</item> - <item quantity="one">Ungependa kufuta faili <xliff:g id="COUNT_0">%1$d</xliff:g>?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other">Imechagua <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">Imechagua <xliff:g id="COUNT_0">%1$d</xliff:g></item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Ungependa kufuta \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Ungependa kufuta folda ya \"<xliff:g id="NAME">%1$s</xliff:g>\" na maudhui yake?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ta-rIN/strings.xml b/packages/DocumentsUI/res/values-ta-rIN/strings.xml index 30bdc9dd588e..b32c324dad6b 100644 --- a/packages/DocumentsUI/res/values-ta-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-ta-rIN/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"மறுபெயரிடு"</string> <string name="rename_error" msgid="4203041674883412606">"ஆவணத்திற்கு மறுபெயரிடுவதில் தோல்வி"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"சில கோப்புகள் மாற்றப்பட்டன"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="STORAGE"><i>^3</i></xliff:g> இல் உள்ள <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> கோப்பகத்தை அணுக <xliff:g id="APPNAME"><b>^1</b></xliff:g>ஐ அனுமதிக்கவா?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"மீண்டும் கேட்காதே"</string> <string name="allow" msgid="7225948811296386551">"அனுமதி"</string> <string name="deny" msgid="2081879885755434506">"நிராகரி"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> கோப்புகளை நீக்கவா?</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> கோப்பை நீக்கவா?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டன</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> தேர்ந்தெடுக்கப்பட்டது</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\"ஐ நீக்கவா?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" கோப்புறையையும் அதன் உள்ளடக்கத்தையும் நீக்கவா?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-te-rIN/strings.xml b/packages/DocumentsUI/res/values-te-rIN/strings.xml index c11840a22201..e77fd667ac92 100644 --- a/packages/DocumentsUI/res/values-te-rIN/strings.xml +++ b/packages/DocumentsUI/res/values-te-rIN/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"పేరు మార్చు"</string> <string name="rename_error" msgid="4203041674883412606">"పత్రం పేరు మార్చడంలో విఫలమైంది"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"కొన్ని పైల్లు మార్చబడ్డాయి"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g>కి <xliff:g id="STORAGE"><i>^3</i></xliff:g>లో <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> డైరెక్టరీ ప్రాప్యతను మంజూరు చేయాలా?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"మళ్లీ అడగవద్దు"</string> <string name="allow" msgid="7225948811296386551">"అనుమతించండి"</string> <string name="deny" msgid="2081879885755434506">"తిరస్కరించండి"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఫైల్లను తొలగించాలా?</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఫైల్ను తొలగించాలా?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ఎంచుకోబడ్డాయి</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ఎంచుకోబడింది</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\"ని తొలగించాలా?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" ఫోల్డర్ని మరియు అందులోని కంటెంట్లను తొలగించాలా?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-th/strings.xml b/packages/DocumentsUI/res/values-th/strings.xml index aba869c42895..4d94795de623 100644 --- a/packages/DocumentsUI/res/values-th/strings.xml +++ b/packages/DocumentsUI/res/values-th/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"เปลี่ยนชื่อ"</string> <string name="rename_error" msgid="4203041674883412606">"ไม่สามารถเปลี่ยนชื่อเอกสาร"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"แปลงบางไฟล์แล้ว"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"ให้สิทธิ์ <xliff:g id="APPNAME"><b>^1</b></xliff:g> ในการเข้าถึงไดเรกทอรี <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ใน <xliff:g id="STORAGE"><i>^3</i></xliff:g> ไหม"</string> + <string name="never_ask_again" msgid="4295278542972859268">"ไม่ต้องถามอีก"</string> <string name="allow" msgid="7225948811296386551">"อนุญาต"</string> <string name="deny" msgid="2081879885755434506">"ปฏิเสธ"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">ลบ <xliff:g id="COUNT_1">%1$d</xliff:g> ไฟล์ใช่ไหม</item> - <item quantity="one">ลบ <xliff:g id="COUNT_0">%1$d</xliff:g> ไฟล์ใช่ไหม</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other">เลือกไว้ <xliff:g id="COUNT_1">%1$d</xliff:g> รายการ</item> <item quantity="one">เลือกไว้ <xliff:g id="COUNT_0">%1$d</xliff:g> รายการ</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-tl/strings.xml b/packages/DocumentsUI/res/values-tl/strings.xml index a76a30623ac7..f395a5bc7c27 100644 --- a/packages/DocumentsUI/res/values-tl/strings.xml +++ b/packages/DocumentsUI/res/values-tl/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Palitan ang pangalan"</string> <string name="rename_error" msgid="4203041674883412606">"Hindi napalitan ang pangalan ng dokumento"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Na-convert ang ilang file"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Bigyan ang <xliff:g id="APPNAME"><b>^1</b></xliff:g> ng access sa directory ng <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> sa <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Huwag nang tatanunging muli"</string> <string name="allow" msgid="7225948811296386551">"Payagan"</string> <string name="deny" msgid="2081879885755434506">"Tanggihan"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Gusto mo bang i-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> file?</item> - <item quantity="other">Gusto mo bang i-delete ang <xliff:g id="COUNT_1">%1$d</xliff:g> na file?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> ang napili</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ang napili</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Gusto mo bang i-delete ang \"<xliff:g id="NAME">%1$s</xliff:g>?\""</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Gusto mo bang i-delete ang folder na \"<xliff:g id="NAME">%1$s</xliff:g>\" at ang mga content nito?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-tr/strings.xml b/packages/DocumentsUI/res/values-tr/strings.xml index f5e6258d88a6..bc4db0db2cb3 100644 --- a/packages/DocumentsUI/res/values-tr/strings.xml +++ b/packages/DocumentsUI/res/values-tr/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Yeniden Adlandır"</string> <string name="rename_error" msgid="4203041674883412606">"Dokümanın adı değiştirilemedi"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Bazı dosyalar dönüştürüldü"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> uygulamasına <xliff:g id="STORAGE"><i>^3</i></xliff:g> depolama alanındaki <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> dizinine erişim izni verilsin mi?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Tekrar sorma"</string> <string name="allow" msgid="7225948811296386551">"İzin Ver"</string> <string name="deny" msgid="2081879885755434506">"Reddet"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> dosya silinsin mi?</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> dosya silinsin mi?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> öğe seçildi</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> öğe seçildi</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" silinsin mi?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" adlı klasör ve içindekiler silinsin mi?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-uk/strings.xml b/packages/DocumentsUI/res/values-uk/strings.xml index 9c4b054406be..79b6fbfc04ac 100644 --- a/packages/DocumentsUI/res/values-uk/strings.xml +++ b/packages/DocumentsUI/res/values-uk/strings.xml @@ -124,22 +124,19 @@ <string name="menu_rename" msgid="7678802479104285353">"Перейменувати"</string> <string name="rename_error" msgid="4203041674883412606">"Не вдалося перейменувати документ"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Деякі файли конвертовано"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Надати додатку <xliff:g id="APPNAME"><b>^1</b></xliff:g> доступ до каталогу <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> на пристрої пам’яті <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Не запитувати знову"</string> <string name="allow" msgid="7225948811296386551">"Дозвол."</string> <string name="deny" msgid="2081879885755434506">"Забор."</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файл?</item> - <item quantity="few">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файли?</item> - <item quantity="many">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлів?</item> - <item quantity="other">Видалити <xliff:g id="COUNT_1">%1$d</xliff:g> файлу?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="few">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="many">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="other">Вибрано <xliff:g id="COUNT_1">%1$d</xliff:g></item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Видалити файл <xliff:g id="NAME">%1$s</xliff:g>?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Видалити папку \"<xliff:g id="NAME">%1$s</xliff:g>\" та її вміст?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-ur-rPK/strings.xml b/packages/DocumentsUI/res/values-ur-rPK/strings.xml index 2d4804c4b14c..4498f8744156 100644 --- a/packages/DocumentsUI/res/values-ur-rPK/strings.xml +++ b/packages/DocumentsUI/res/values-ur-rPK/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"نام تبدیل کریں"</string> <string name="rename_error" msgid="4203041674883412606">"دستاویز کا نام تبدیل کرنے میں ناکام"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"کچھ فائلوں کو تبدیل کیا گیا تھا"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> کو <xliff:g id="STORAGE"><i>^3</i></xliff:g> پر <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ڈائرکٹری تک رسائی عطا کریں؟"</string> + <string name="never_ask_again" msgid="4295278542972859268">"دوبارہ نہ پوچھیں"</string> <string name="allow" msgid="7225948811296386551">"اجازت دیں"</string> <string name="deny" msgid="2081879885755434506">"مسترد کریں"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> فائلیں حذف کریں؟</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> فائل حذف کریں؟</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> منتخب کردہ</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> منتخب کردہ</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"\"<xliff:g id="NAME">%1$s</xliff:g>\" حذف کریں؟"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"\"<xliff:g id="NAME">%1$s</xliff:g>\" فولڈر اور اس کی مشمولات حذف کریں؟"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml index 0a0992176461..b4f435ba6a59 100644 --- a/packages/DocumentsUI/res/values-uz-rUZ/strings.xml +++ b/packages/DocumentsUI/res/values-uz-rUZ/strings.xml @@ -110,18 +110,19 @@ <string name="menu_rename" msgid="7678802479104285353">"Qayta nomlash"</string> <string name="rename_error" msgid="4203041674883412606">"Hujjatni qayta nomlab bo‘lmadi"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Bir nechta fayllar o‘girildi"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"<xliff:g id="APPNAME"><b>^1</b></xliff:g> ilovasining <xliff:g id="STORAGE"><i>^3</i></xliff:g> xotirasidagi “<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>” jildiga kirishiga ruxsat berilsinmi?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Boshqa so‘ralmasin"</string> <string name="allow" msgid="7225948811296386551">"Ruxsat berish"</string> <string name="deny" msgid="2081879885755434506">"Rad qilish"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta fayl o‘chirilsinmi?</item> - <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta fayl o‘chirilsinmi?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> ta belgilandi</item> <item quantity="one"><xliff:g id="COUNT_0">%1$d</xliff:g> ta belgilandi</item> </plurals> + <!-- no translation found for delete_filename_confirmation_message (5312817725577537488) --> + <skip /> + <!-- no translation found for delete_foldername_confirmation_message (5885501832257285329) --> + <skip /> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-vi/strings.xml b/packages/DocumentsUI/res/values-vi/strings.xml index 9aca29f27acc..b64026aacff1 100644 --- a/packages/DocumentsUI/res/values-vi/strings.xml +++ b/packages/DocumentsUI/res/values-vi/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Đổi tên"</string> <string name="rename_error" msgid="4203041674883412606">"Không đổi được tên tài liệu"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Đã chuyển đổi một số tệp"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Cấp cho <xliff:g id="APPNAME"><b>^1</b></xliff:g> quyền truy cập vào thư mục <xliff:g id="DIRECTORY"><i>^2</i></xliff:g> trong <xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Không hỏi lại"</string> <string name="allow" msgid="7225948811296386551">"Cho phép"</string> <string name="deny" msgid="2081879885755434506">"Từ chối"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">Xóa <xliff:g id="COUNT_1">%1$d</xliff:g> tệp?</item> - <item quantity="one">Xóa <xliff:g id="COUNT_0">%1$d</xliff:g> tệp?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other">Đã chọn <xliff:g id="COUNT_1">%1$d</xliff:g></item> <item quantity="one">Đã chọn <xliff:g id="COUNT_0">%1$d</xliff:g></item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Xóa \"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Xóa thư mục \"<xliff:g id="NAME">%1$s</xliff:g>\" và nội dung của thư mục?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-zh-rCN/strings.xml b/packages/DocumentsUI/res/values-zh-rCN/strings.xml index 75dcfbc0aa10..90d16198cf4b 100644 --- a/packages/DocumentsUI/res/values-zh-rCN/strings.xml +++ b/packages/DocumentsUI/res/values-zh-rCN/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"重命名"</string> <string name="rename_error" msgid="4203041674883412606">"无法重命名文档"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"部分文件已转换成其他格式"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"要授权<xliff:g id="APPNAME"><b>^1</b></xliff:g>访问 <xliff:g id="STORAGE"><i>^3</i></xliff:g>上的“<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>”目录吗？"</string> + <string name="never_ask_again" msgid="4295278542972859268">"不再询问"</string> <string name="allow" msgid="7225948811296386551">"允许"</string> <string name="deny" msgid="2081879885755434506">"拒绝"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">删除 <xliff:g id="COUNT_1">%1$d</xliff:g> 个文件？</item> - <item quantity="one">删除 <xliff:g id="COUNT_0">%1$d</xliff:g> 个文件？</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other">已选择 <xliff:g id="COUNT_1">%1$d</xliff:g> 项</item> <item quantity="one">已选择 <xliff:g id="COUNT_0">%1$d</xliff:g> 项</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"要删除“<xliff:g id="NAME">%1$s</xliff:g>”吗？"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"要删除文件夹“<xliff:g id="NAME">%1$s</xliff:g>”及其中的内容吗？"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-zh-rHK/strings.xml b/packages/DocumentsUI/res/values-zh-rHK/strings.xml index b834a11e5c4d..aeda260e1728 100644 --- a/packages/DocumentsUI/res/values-zh-rHK/strings.xml +++ b/packages/DocumentsUI/res/values-zh-rHK/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"重新命名"</string> <string name="rename_error" msgid="4203041674883412606">"無法重新命名文件"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"部分檔案已轉換成其他格式"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"要為「<xliff:g id="APPNAME"><b>^1</b></xliff:g>」開放 <xliff:g id="STORAGE"><i>^3</i></xliff:g>上的「<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>」目錄存取權嗎？"</string> + <string name="never_ask_again" msgid="4295278542972859268">"不要再詢問"</string> <string name="allow" msgid="7225948811296386551">"允許"</string> <string name="deny" msgid="2081879885755434506">"拒絕"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">要刪除 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案嗎？</item> - <item quantity="one">要刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案嗎？</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other">已選取 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item> <item quantity="one">已選取 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"要刪除「<xliff:g id="NAME">%1$s</xliff:g>」嗎？"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"要刪除「<xliff:g id="NAME">%1$s</xliff:g>」資料夾及其內容嗎？"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-zh-rTW/strings.xml b/packages/DocumentsUI/res/values-zh-rTW/strings.xml index d6e270afb3b0..dc7641149e8a 100644 --- a/packages/DocumentsUI/res/values-zh-rTW/strings.xml +++ b/packages/DocumentsUI/res/values-zh-rTW/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"重新命名"</string> <string name="rename_error" msgid="4203041674883412606">"無法重新命名文件"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"部分檔案已轉換成其他格式"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"要允許<xliff:g id="APPNAME"><b>^1</b></xliff:g>存取 <xliff:g id="STORAGE"><i>^3</i></xliff:g>上的「<xliff:g id="DIRECTORY"><i>^2</i></xliff:g>」目錄嗎？"</string> + <string name="never_ask_again" msgid="4295278542972859268">"不要再詢問"</string> <string name="allow" msgid="7225948811296386551">"允許"</string> <string name="deny" msgid="2081879885755434506">"拒絕"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="other">要刪除 <xliff:g id="COUNT_1">%1$d</xliff:g> 個檔案嗎？</item> - <item quantity="one">要刪除 <xliff:g id="COUNT_0">%1$d</xliff:g> 個檔案嗎？</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="other">已選取 <xliff:g id="COUNT_1">%1$d</xliff:g> 個項目</item> <item quantity="one">已選取 <xliff:g id="COUNT_0">%1$d</xliff:g> 個項目</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"要刪除「<xliff:g id="NAME">%1$s</xliff:g>」嗎？"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"要刪除「<xliff:g id="NAME">%1$s</xliff:g>」資料夾和當中的內容嗎？"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values-zu/strings.xml b/packages/DocumentsUI/res/values-zu/strings.xml index 35864a7cb4e4..c53031b09c3e 100644 --- a/packages/DocumentsUI/res/values-zu/strings.xml +++ b/packages/DocumentsUI/res/values-zu/strings.xml @@ -110,18 +110,17 @@ <string name="menu_rename" msgid="7678802479104285353">"Qamba kabusha"</string> <string name="rename_error" msgid="4203041674883412606">"Yehlulekile ukuqamba kabusha idokhumenti"</string> <string name="notification_copy_files_converted_title" msgid="3153573223054275181">"Amanye amafayela aguqulelwe"</string> - <!-- no translation found for open_external_dialog_request (5789329484285817629) --> - <skip /> - <!-- no translation found for never_ask_again (4295278542972859268) --> - <skip /> + <string name="open_external_dialog_request" msgid="5789329484285817629">"Nika i-<xliff:g id="APPNAME"><b>^1</b></xliff:g> ukufinyelela ekuqondiseni kwe-<xliff:g id="DIRECTORY"><i>^2</i></xliff:g> ku-<xliff:g id="STORAGE"><i>^3</i></xliff:g>?"</string> + <string name="never_ask_again" msgid="4295278542972859268">"Ungaphindi ubuze"</string> <string name="allow" msgid="7225948811296386551">"Vumela"</string> <string name="deny" msgid="2081879885755434506">"Yala"</string> - <plurals name="delete_confirmation_message" formatted="false" msgid="3519107568984207772"> - <item quantity="one">Sula amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g>?</item> - <item quantity="other">Sula amafayela angu-<xliff:g id="COUNT_1">%1$d</xliff:g>?</item> - </plurals> <plurals name="elements_selected" formatted="false" msgid="1376955402452875047"> <item quantity="one"><xliff:g id="COUNT_1">%1$d</xliff:g> okukhethiwe</item> <item quantity="other"><xliff:g id="COUNT_1">%1$d</xliff:g> okukhethiwe</item> </plurals> + <string name="delete_filename_confirmation_message" msgid="5312817725577537488">"Susa i-\"<xliff:g id="NAME">%1$s</xliff:g>\"?"</string> + <string name="delete_foldername_confirmation_message" msgid="5885501832257285329">"Susa ifolda engu-\"<xliff:g id="NAME">%1$s</xliff:g>\" nokuqukethwe kwalo?"</string> + <!-- no translation found for delete_files_confirmation_message (8417505791395471802) --> + <!-- no translation found for delete_folders_confirmation_message (9185648028213507769) --> + <!-- no translation found for delete_items_confirmation_message (5376214433530243459) --> </resources> diff --git a/packages/DocumentsUI/res/values/config.xml b/packages/DocumentsUI/res/values/config.xml index ebb3969b7819..408603e85f7e 100644 --- a/packages/DocumentsUI/res/values/config.xml +++ b/packages/DocumentsUI/res/values/config.xml @@ -24,5 +24,6 @@ <!-- Indicates if the home directory should be hidden in the roots list, that is presented in the drawer/left side panel ) --> <bool name="home_root_hidden">true</bool> - + <!-- Indicates if the advanced roots like internal storage should be hidden in the roots list) --> + <bool name="advanced_roots_hidden">true</bool> </resources> diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java index fe61094e56d4..29110275716e 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java @@ -437,6 +437,17 @@ public abstract class BaseActivity extends Activity return mState; } + /* + * Get the default directory to be presented after starting the activity. + * Method can be overridden if the change of the behavior of the the child activity is needed. + */ + public Uri getDefaultRoot() { + return Shared.isHomeRootHidden(this) + ? DocumentsContract.buildRootUri("com.android.providers.downloads.documents", + "downloads") + : DocumentsContract.buildHomeUri(); + } + void setDisplayFileSize(boolean display) { LocalPreferences.setDisplayFileSize(this, display); mState.showSize = display; diff --git a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java index ba593dc370bc..5788420a053c 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/DocumentsActivity.java @@ -108,7 +108,7 @@ public class DocumentsActivity extends BaseActivity { // we restore the stack as last used from that app. if (mState.action == ACTION_PICK_COPY_DESTINATION) { if (DEBUG) Log.d(TAG, "Launching directly into Home directory."); - loadRoot(DocumentsContract.buildHomeUri()); + loadRoot(getDefaultRoot()); } else { if (DEBUG) Log.d(TAG, "Attempting to load last used stack for calling package."); new LoadLastUsedStackTask(this).execute(); @@ -164,7 +164,7 @@ public class DocumentsActivity extends BaseActivity { @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - Log.d(TAG, "onActivityResult() code=" + resultCode); + if (DEBUG) Log.d(TAG, "onActivityResult() code=" + resultCode); // Only relay back results when not canceled; otherwise stick around to // let the user pick another app/backend. @@ -203,8 +203,8 @@ public class DocumentsActivity extends BaseActivity { mState.action == ACTION_PICK_COPY_DESTINATION) { title = getResources().getString(R.string.title_save); } else { - // If all else fails, just call it "Files". - title = getResources().getString(R.string.files_label); + // If all else fails, just call it "Downloads". + title = getResources().getString(R.string.downloads_label); } } @@ -388,7 +388,7 @@ public class DocumentsActivity extends BaseActivity { @Override void onTaskFinished(Uri... uris) { - Log.d(TAG, "onFinished() " + Arrays.toString(uris)); + if (DEBUG) Log.d(TAG, "onFinished() " + Arrays.toString(uris)); final Intent intent = new Intent(); if (uris.length == 1) { diff --git a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java index 99f306a44020..2af6c461f2f6 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/FilesActivity.java @@ -109,9 +109,7 @@ public class FilesActivity extends BaseActivity { loadRoot(uri); } else { if (DEBUG) Log.d(TAG, "All other means skipped. Launching into default directory."); - Uri defaultUri = DocumentsContract.buildRootUri( - "com.android.providers.downloads.documents", "downloads"); - loadRoot(defaultUri); + loadRoot(getDefaultRoot()); } final @DialogType int dialogType = intent.getIntExtra( @@ -182,7 +180,7 @@ public class FilesActivity extends BaseActivity { @Override public String getDrawerTitle() { - return getResources().getString(R.string.files_label); + return getResources().getString(R.string.downloads_label); } @Override @@ -414,7 +412,7 @@ public class FilesActivity extends BaseActivity { @Override void onTaskFinished(Uri... uris) { - Log.d(TAG, "onFinished() " + Arrays.toString(uris)); + if (DEBUG) Log.d(TAG, "onFinished() " + Arrays.toString(uris)); final Intent intent = new Intent(); if (uris.length == 1) { diff --git a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java index 2b6f3968e203..ab45af148de8 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/OpenExternalDirectoryActivity.java @@ -282,7 +282,7 @@ public class OpenExternalDirectoryActivity extends Activity { logInvalidScopedAccessRequest(context, SCOPED_DIRECTORY_ACCESS_ERROR); return null; } - Log.d(TAG, "doc id for " + file + ": " + docId); + if (DEBUG) Log.d(TAG, "doc id for " + file + ": " + docId); final Uri uri = DocumentsContract.buildTreeDocumentUri(EXTERNAL_STORAGE_AUTH, docId); if (uri == null) { diff --git a/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java b/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java index e1b1c09be364..6ef9154451a2 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RecentsProvider.java @@ -16,6 +16,7 @@ package com.android.documentsui; +import static com.android.documentsui.Shared.DEBUG; import static com.android.documentsui.model.DocumentInfo.getCursorString; import android.content.ContentProvider; @@ -338,7 +339,7 @@ public class RecentsProvider extends ContentProvider { if (predicate.apply(authority)) { db.delete(TABLE_STATE, StateColumns.AUTHORITY + "=?", new String[] { authority }); - Log.d(TAG, "Purged state for " + authority); + if (DEBUG) Log.d(TAG, "Purged state for " + authority); } } } finally { diff --git a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java index 54e628732a60..35da8cc6357b 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/RootsFragment.java @@ -318,7 +318,9 @@ public class RootsFragment extends Fragment { for (final RootInfo root : roots) { final RootItem item = new RootItem(root); - if (root.isHome() && isHomeRootHidden(context)) { + if (root.isHome() && Shared.isHomeRootHidden(context)) { + continue; + } else if (root.isAdvanced() && Shared.areAdvancedRootsHidden(context)) { continue; } else if (root.isLibrary()) { if (DEBUG) Log.d(TAG, "Adding " + root + " as library."); @@ -370,13 +372,6 @@ public class RootsFragment extends Fragment { } } - /* - * Indicates if the home directory should be hidden in the roots list. - */ - private boolean isHomeRootHidden(Context context) { - return context.getResources().getBoolean(R.bool.home_root_hidden); - } - @Override public View getView(int position, View convertView, ViewGroup parent) { final Item item = getItem(position); diff --git a/packages/DocumentsUI/src/com/android/documentsui/SearchViewManager.java b/packages/DocumentsUI/src/com/android/documentsui/SearchViewManager.java index 63dc2ee3796e..4d0ba4b79346 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/SearchViewManager.java +++ b/packages/DocumentsUI/src/com/android/documentsui/SearchViewManager.java @@ -16,6 +16,8 @@ package com.android.documentsui; +import static com.android.documentsui.Shared.DEBUG; + import android.annotation.Nullable; import android.os.Bundle; import android.provider.DocumentsContract.Root; @@ -80,7 +82,7 @@ final class SearchViewManager implements */ void update(RootInfo root) { if (mMenu == null) { - Log.d(TAG, "update called before Search MenuItem installed."); + if (DEBUG) Log.d(TAG, "update called before Search MenuItem installed."); return; } @@ -108,7 +110,7 @@ final class SearchViewManager implements void showMenu(boolean visible) { if (mMenu == null) { - Log.d(TAG, "showMenu called before Search MenuItem installed."); + if (DEBUG) Log.d(TAG, "showMenu called before Search MenuItem installed."); return; } diff --git a/packages/DocumentsUI/src/com/android/documentsui/Shared.java b/packages/DocumentsUI/src/com/android/documentsui/Shared.java index 6f1863e313c5..d21afee93434 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/Shared.java +++ b/packages/DocumentsUI/src/com/android/documentsui/Shared.java @@ -33,7 +33,7 @@ public final class Shared { public static final String TAG = "Documents"; - public static final boolean DEBUG = true; + public static final boolean DEBUG = false; /** Intent action name to pick a copy destination. */ public static final String ACTION_PICK_COPY_DESTINATION = @@ -169,4 +169,18 @@ public final class Shared { } } + /* + * Indicates if the home directory should be hidden in the roots list. + */ + public static boolean isHomeRootHidden(Context context) { + return context.getResources().getBoolean(R.bool.home_root_hidden); + } + + /* + * Indicates if the advanced roots should be hidden. + */ + public static boolean areAdvancedRootsHidden(Context context) { + return context.getResources().getBoolean(R.bool.advanced_roots_hidden); + } + } diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java index 60e4b9abd4fe..b2fd9c490297 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/DirectoryFragment.java @@ -72,6 +72,7 @@ import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; +import android.widget.Toolbar; import android.widget.TextView; import com.android.documentsui.BaseActivity; @@ -506,8 +507,10 @@ public class DirectoryFragment extends Fragment getActivity().getWindow().setStatusBarColor(color.data); if (mActionMode != null) { - mActionMode.setTitle(Shared.getQuantityString(getActivity(), - R.plurals.elements_selected, mSelected.size())); + final String title = Shared.getQuantityString(getActivity(), + R.plurals.elements_selected, mSelected.size()); + mActionMode.setTitle(title); + mRecView.announceForAccessibility(title); } } @@ -521,6 +524,12 @@ public class DirectoryFragment extends Fragment mSelected.clear(); mNoDeleteCount = 0; mNoRenameCount = -1; + + // Re-enable TalkBack for the toolbars, as they are no longer covered by action mode. + final Toolbar toolbar = (Toolbar) getActivity().findViewById(R.id.toolbar); + final Toolbar rootsToolbar = (Toolbar) getActivity().findViewById(R.id.roots_toolbar); + toolbar.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO); + rootsToolbar.setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_AUTO); } @Override @@ -530,7 +539,22 @@ public class DirectoryFragment extends Fragment int size = mSelectionManager.getSelection().size(); mode.getMenuInflater().inflate(R.menu.mode_directory, menu); mode.setTitle(TextUtils.formatSelectedCount(size)); - return (size > 0); + + if (size > 0) { + // Hide the toolbars if action mode is enabled, so TalkBack doesn't navigate to + // these controls when using linear navigation. + final Toolbar toolbar = (Toolbar) getActivity().findViewById(R.id.toolbar); + final Toolbar rootsToolbar = (Toolbar) getActivity().findViewById( + R.id.roots_toolbar); + toolbar.setImportantForAccessibility( + View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS); + rootsToolbar.setImportantForAccessibility( + View.IMPORTANT_FOR_ACCESSIBILITY_NO_HIDE_DESCENDANTS); + + return true; + } + + return false; } @Override diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java index ea1deb4cdcdb..faa8e3892f61 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java +++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/FragmentTuner.java @@ -159,9 +159,6 @@ public abstract class FragmentTuner { void onModelLoaded(Model model, @ResultType int resultType, boolean isSearch) { boolean showDrawer = false; - if (mState.restored) { - showDrawer = true; - } if (MimePredicate.mimeMatches(MimePredicate.VISUAL_MIMES, mState.acceptMimes)) { showDrawer = false; } diff --git a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java index 3960475f5ecd..0709652ec0dc 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java +++ b/packages/DocumentsUI/src/com/android/documentsui/model/RootInfo.java @@ -298,6 +298,10 @@ public class RootInfo implements Durable, Parcelable, Comparable<RootInfo> { return (flags & Root.FLAG_SUPPORTS_SEARCH) != 0; } + public boolean isAdvanced() { + return (flags & Root.FLAG_ADVANCED) != 0; + } + public boolean isLocalOnly() { return (flags & Root.FLAG_LOCAL_ONLY) != 0; } diff --git a/packages/ExternalStorageProvider/res/values-be-rBY/strings.xml b/packages/ExternalStorageProvider/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..526bc39aa4cb --- /dev/null +++ b/packages/ExternalStorageProvider/res/values-be-rBY/strings.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_label" msgid="7123375275748530234">"Вонкавае сховішча"</string> + <string name="root_internal_storage" msgid="827844243068584127">"Унутранае сховішча"</string> + <string name="root_documents" msgid="4051252304075469250">"Дакументы"</string> +</resources> diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java index 9a51b057d135..62f33bf490a8 100644 --- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java +++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java @@ -196,6 +196,7 @@ public class ExternalStorageProvider extends DocumentsProvider { if (volume.isPrimary()) { // save off the primary volume for subsequent "Home" dir initialization. primaryVolume = volume; + root.flags |= Root.FLAG_ADVANCED; } // Dunno when this would NOT be the case, but never hurts to be correct. if (volume.isMountedWritable()) { diff --git a/packages/FusedLocation/res/values-be-rBY/strings.xml b/packages/FusedLocation/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..0d2cccc66dc0 --- /dev/null +++ b/packages/FusedLocation/res/values-be-rBY/strings.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_label" msgid="5379477904423203699">"Fused Location"</string> +</resources> diff --git a/packages/FusedLocation/res/values-bs-rBA/strings.xml b/packages/FusedLocation/res/values-bs-rBA/strings.xml new file mode 100644 index 000000000000..f21c87b32595 --- /dev/null +++ b/packages/FusedLocation/res/values-bs-rBA/strings.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_label" msgid="5379477904423203699">"Kombinirana lokacija."</string> +</resources> diff --git a/packages/InputDevices/res/values-be-rBY/strings.xml b/packages/InputDevices/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..7d7683c8ec81 --- /dev/null +++ b/packages/InputDevices/res/values-be-rBY/strings.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_label" msgid="8016145283189546017">"Input Devices"</string> + <string name="keyboard_layouts_label" msgid="6688773268302087545">"Клавіятура Android"</string> + <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"Англійская (Злучанае Каралеўства)"</string> + <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"Англійская (ЗША)"</string> + <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"Англійская (ЗША), міжнар. раскладка"</string> + <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"Англійская (ЗША), раскладка Colemak"</string> + <string name="keyboard_layout_english_us_dvorak_label" msgid="793528923171145202">"Англійская (ЗША), раскладка Дворака"</string> + <string name="keyboard_layout_english_us_workman_label" msgid="2944541595262173111">"Англійская (ЗША), раскладка Workman"</string> + <string name="keyboard_layout_german_label" msgid="8451565865467909999">"Нямецкая"</string> + <string name="keyboard_layout_french_label" msgid="813450119589383723">"Французская"</string> + <string name="keyboard_layout_french_ca_label" msgid="365352601060604832">"Французская (Канада)"</string> + <string name="keyboard_layout_russian_label" msgid="8724879775815042968">"Руская"</string> + <string name="keyboard_layout_russian_mac_label" msgid="3795866869038264796">"Руская, раскладка Mac"</string> + <string name="keyboard_layout_spanish_label" msgid="7091555148131908240">"Іспанская"</string> + <string name="keyboard_layout_swiss_french_label" msgid="4659191025396371684">"Французская (Швейцарыя)"</string> + <string name="keyboard_layout_swiss_german_label" msgid="2305520941993314258">"Нямецкая (Швейцарыя)"</string> + <string name="keyboard_layout_belgian" msgid="2011984572838651558">"Бельгійская"</string> + <string name="keyboard_layout_bulgarian" msgid="8951224309972028398">"Балгарская"</string> + <string name="keyboard_layout_italian" msgid="6497079660449781213">"Італьянская"</string> + <string name="keyboard_layout_danish" msgid="8036432066627127851">"Дацкая"</string> + <string name="keyboard_layout_norwegian" msgid="9090097917011040937">"Нарвежская"</string> + <string name="keyboard_layout_swedish" msgid="732959109088479351">"Шведская"</string> + <string name="keyboard_layout_finnish" msgid="5585659438924315466">"Фінская"</string> + <string name="keyboard_layout_croatian" msgid="4172229471079281138">"Харвацкая"</string> + <string name="keyboard_layout_czech" msgid="1349256901452975343">"Чэшская"</string> + <string name="keyboard_layout_estonian" msgid="8775830985185665274">"Эстонская"</string> + <string name="keyboard_layout_hungarian" msgid="4154963661406035109">"Венгерская"</string> + <string name="keyboard_layout_icelandic" msgid="5836645650912489642">"Ісландская"</string> + <string name="keyboard_layout_brazilian" msgid="5117896443147781939">"Бразільская"</string> + <string name="keyboard_layout_portuguese" msgid="2888198587329660305">"Партугальская"</string> + <string name="keyboard_layout_slovak" msgid="2469379934672837296">"Славацкая"</string> + <string name="keyboard_layout_slovenian" msgid="1735933028924982368">"Славенская"</string> + <string name="keyboard_layout_turkish" msgid="7736163250907964898">"Турэцкая"</string> + <string name="keyboard_layout_ukrainian" msgid="8176637744389480417">"Украінская"</string> + <string name="keyboard_layout_arabic" msgid="5671970465174968712">"Арабская"</string> + <string name="keyboard_layout_greek" msgid="7289253560162386040">"Грэчаская"</string> + <string name="keyboard_layout_hebrew" msgid="7241473985890173812">"Іўрыт"</string> + <string name="keyboard_layout_lithuanian" msgid="6943110873053106534">"Літоўская"</string> + <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Іспанская (Лацінская Амерыка)"</string> + <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Латышская"</string> +</resources> diff --git a/packages/InputDevices/res/values-bs-rBA/strings.xml b/packages/InputDevices/res/values-bs-rBA/strings.xml new file mode 100644 index 000000000000..9672ae84a0a7 --- /dev/null +++ b/packages/InputDevices/res/values-bs-rBA/strings.xml @@ -0,0 +1,44 @@ +<?xml version="1.0" encoding="UTF-8"?> +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_label" msgid="8016145283189546017">"Ulazni uređaji"</string> + <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android tastatura"</string> + <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"engleski (UK)"</string> + <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"engleski (SAD)"</string> + <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"engleski (SAD), međunarodni stil"</string> + <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"engleski (SAD), Colemak stil"</string> + <string name="keyboard_layout_english_us_dvorak_label" msgid="793528923171145202">"engleski (SAD), Dvorak stil"</string> + <string name="keyboard_layout_english_us_workman_label" msgid="2944541595262173111">"Engleski (SAD), Workman"</string> + <string name="keyboard_layout_german_label" msgid="8451565865467909999">"njemački"</string> + <string name="keyboard_layout_french_label" msgid="813450119589383723">"francuski"</string> + <string name="keyboard_layout_french_ca_label" msgid="365352601060604832">"francuski (Kanada)"</string> + <string name="keyboard_layout_russian_label" msgid="8724879775815042968">"ruski"</string> + <string name="keyboard_layout_russian_mac_label" msgid="3795866869038264796">"ruski, Mac stil"</string> + <string name="keyboard_layout_spanish_label" msgid="7091555148131908240">"španski"</string> + <string name="keyboard_layout_swiss_french_label" msgid="4659191025396371684">"švicarski francuski"</string> + <string name="keyboard_layout_swiss_german_label" msgid="2305520941993314258">"švicarski njemački"</string> + <string name="keyboard_layout_belgian" msgid="2011984572838651558">"belgijski"</string> + <string name="keyboard_layout_bulgarian" msgid="8951224309972028398">"bugarski"</string> + <string name="keyboard_layout_italian" msgid="6497079660449781213">"italijanski"</string> + <string name="keyboard_layout_danish" msgid="8036432066627127851">"danski"</string> + <string name="keyboard_layout_norwegian" msgid="9090097917011040937">"norveški"</string> + <string name="keyboard_layout_swedish" msgid="732959109088479351">"švedski"</string> + <string name="keyboard_layout_finnish" msgid="5585659438924315466">"finski"</string> + <string name="keyboard_layout_croatian" msgid="4172229471079281138">"hrvatski"</string> + <string name="keyboard_layout_czech" msgid="1349256901452975343">"češki"</string> + <string name="keyboard_layout_estonian" msgid="8775830985185665274">"estonski"</string> + <string name="keyboard_layout_hungarian" msgid="4154963661406035109">"mađarski"</string> + <string name="keyboard_layout_icelandic" msgid="5836645650912489642">"islandski"</string> + <string name="keyboard_layout_brazilian" msgid="5117896443147781939">"brazilski"</string> + <string name="keyboard_layout_portuguese" msgid="2888198587329660305">"portugalski"</string> + <string name="keyboard_layout_slovak" msgid="2469379934672837296">"slovački"</string> + <string name="keyboard_layout_slovenian" msgid="1735933028924982368">"slovenački"</string> + <string name="keyboard_layout_turkish" msgid="7736163250907964898">"turski"</string> + <string name="keyboard_layout_ukrainian" msgid="8176637744389480417">"ukrajinski"</string> + <string name="keyboard_layout_arabic" msgid="5671970465174968712">"arapski"</string> + <string name="keyboard_layout_greek" msgid="7289253560162386040">"grčki"</string> + <string name="keyboard_layout_hebrew" msgid="7241473985890173812">"hebrejski"</string> + <string name="keyboard_layout_lithuanian" msgid="6943110873053106534">"litvanski"</string> + <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"španski (Latinska Amerika)"</string> + <string name="keyboard_layout_latvian" msgid="4405417142306250595">"latvijski"</string> +</resources> diff --git a/packages/Keyguard/res/values-af/strings.xml b/packages/Keyguard/res/values-af/strings.xml index 1db5f618f4c4..8ad4c5e5ac19 100644 --- a/packages/Keyguard/res/values-af/strings.xml +++ b/packages/Keyguard/res/values-af/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK-bewerking het misluk!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kode is aanvaar!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Geen diens nie."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Knoppie vir wissel van invoermetode."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Wissel invoermetode"</string> <string name="airplane_mode" msgid="3122107900897202805">"Vliegtuigmodus"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Patroon word vereis nadat toestel herbegin het"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"PIN word vereis nadat toestel herbegin het"</string> diff --git a/packages/Keyguard/res/values-am/strings.xml b/packages/Keyguard/res/values-am/strings.xml index 2b19d7a3be59..042562213db8 100644 --- a/packages/Keyguard/res/values-am/strings.xml +++ b/packages/Keyguard/res/values-am/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"የሲም PUK ክወና አልተሳካም!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"ኮዱ ተቀባይነት አግኝቷል!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"ከአገልግሎት መስጫ ክልል ውጪ።"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"የግቤት ስልት አዝራር ቀይር"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"የግቤት ስልት ቀይር"</string> <string name="airplane_mode" msgid="3122107900897202805">"የአውሮፕላን ሁነታ"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"መሣሪያ ዳግም ከጀመረ በኋላ ሥርዓተ ጥለት ያስፈልጋል"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"መሣሪያ ዳግም ከጀመረ በኋላ ፒን ያስፈልጋል"</string> diff --git a/packages/Keyguard/res/values-ar/strings.xml b/packages/Keyguard/res/values-ar/strings.xml index efaad1f8370a..442f29e44263 100644 --- a/packages/Keyguard/res/values-ar/strings.xml +++ b/packages/Keyguard/res/values-ar/strings.xml @@ -116,7 +116,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"أخفقت عملية PUK لبطاقة SIM!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"تم قبول الرمز!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"لا تتوفر خدمة"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"زر تبديل طريقة الإدخال."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"تبديل أسلوب الإدخال"</string> <string name="airplane_mode" msgid="3122107900897202805">"وضع الطائرة"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"يجب رسم النقش بعد إعادة تشغيل الجهاز."</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"يجب إدخال رقم التعريف الشخصي بعد إعادة تشغيل الجهاز."</string> diff --git a/packages/Keyguard/res/values-az-rAZ/strings.xml b/packages/Keyguard/res/values-az-rAZ/strings.xml index 4450c0120f11..686024b32fea 100644 --- a/packages/Keyguard/res/values-az-rAZ/strings.xml +++ b/packages/Keyguard/res/values-az-rAZ/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK əməliyyatı alınmadı!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kod Qəbul Edildi!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Xidmət yoxdur."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Daxiletmə metodu düyməsinə keç"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Daxiletmə metoduna keçin"</string> <string name="airplane_mode" msgid="3122107900897202805">"Təyyarə rejimi"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Cihaz yeniden başladıqdan sonra qəlib kod tələb olunur"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Cihaz yeniden başladıqdan sonra PIN tələb olunur"</string> diff --git a/packages/Keyguard/res/values-b+sr+Latn/strings.xml b/packages/Keyguard/res/values-b+sr+Latn/strings.xml index 0eb4210a49c3..a0af2895948a 100644 --- a/packages/Keyguard/res/values-b+sr+Latn/strings.xml +++ b/packages/Keyguard/res/values-b+sr+Latn/strings.xml @@ -110,7 +110,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Radnja sa SIM PUK kodom nije uspela!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kôd je prihvaćen!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Oflajn ste."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Dugme Promeni metod unosa."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Promeni metod unosa"</string> <string name="airplane_mode" msgid="3122107900897202805">"Režim rada u avionu"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Treba da unesete šablon kada se uređaj ponovo pokrene"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Treba da unesete PIN kada se uređaj ponovo pokrene"</string> diff --git a/packages/Keyguard/res/values-be-rBY/strings.xml b/packages/Keyguard/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..59464bd1c035 --- /dev/null +++ b/packages/Keyguard/res/values-be-rBY/strings.xml @@ -0,0 +1,145 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* //device/apps/common/assets/res/any/strings.xml +** +** Copyright 2006, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="719438068451601849">"Keyguard"</string> + <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"Увядзіце PIN-код"</string> + <string name="keyguard_password_enter_puk_code" msgid="3035856550289724338">"Увядзіце PUK-код і новы PIN-код SIM-карты"</string> + <string name="keyguard_password_enter_puk_prompt" msgid="1801941051094974609">"PUK-код SIM-карты"</string> + <string name="keyguard_password_enter_pin_prompt" msgid="3201151840570492538">"Новы PIN-код SIM-карты"</string> + <string name="keyguard_password_entry_touch_hint" msgid="7858547464982981384"><font size="17">"Дакраніцеся, каб увесці пароль"</font></string> + <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"Увядзіце пароль для разблакавання"</string> + <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"Каб разблакаваць, увядзіце PIN-код"</string> + <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"Няправільны PIN-код."</string> + <string name="keyguard_charged" msgid="3272223906073492454">"Зараджаны"</string> + <string name="keyguard_plugged_in" msgid="9087497435553252863">"Зарадка"</string> + <string name="keyguard_plugged_in_charging_fast" msgid="6671162730167305479">"Зараджаецца хутка"</string> + <string name="keyguard_plugged_in_charging_slowly" msgid="1964714661071163229">"Зараджаецца павольна"</string> + <string name="keyguard_low_battery" msgid="8143808018719173859">"Падключыце зарадную прыладу."</string> + <string name="keyguard_instructions_when_pattern_disabled" msgid="1332288268600329841">"Націсніце кнопку \"Меню\", каб разблакіраваць."</string> + <string name="keyguard_network_locked_message" msgid="9169717779058037168">"Сетка заблакiраваная"</string> + <string name="keyguard_missing_sim_message_short" msgid="494980561304211931">"Няма SIM-карты"</string> + <string name="keyguard_missing_sim_message" product="tablet" msgid="1445849005909260039">"У планшэце няма SIM-карты."</string> + <string name="keyguard_missing_sim_message" product="default" msgid="3481110395508637643">"У тэлефоне няма SIM-карты."</string> + <string name="keyguard_missing_sim_instructions" msgid="5210891509995942250">"Устаўце SIM-карту."</string> + <string name="keyguard_missing_sim_instructions_long" msgid="5968985489463870358">"SIM-карта адсутнічае ці не чытаецца. Устаўце SIM-карту."</string> + <string name="keyguard_permanent_disabled_sim_message_short" msgid="8340813989586622356">"SIM-карту немагчыма выкарыстоўваць."</string> + <string name="keyguard_permanent_disabled_sim_instructions" msgid="5892940909699723544">"Ваша SIM-карта была адключана назаўсёды.\n Звяжыцеся з аператарам бесправадной сувязі, каб атрымаць іншую SIM-карту."</string> + <string name="keyguard_sim_locked_message" msgid="6875773413306380902">"SIM-карта заблакiраваная."</string> + <string name="keyguard_sim_puk_locked_message" msgid="3747232467471801633">"SIM-карта заблакiравана PUK-кодам."</string> + <string name="keyguard_sim_unlock_progress_dialog_message" msgid="7975221805033614426">"Разблакiраванне SIM-карты..."</string> + <string name="keyguard_accessibility_pattern_unlock" msgid="1490840706075246612">"Узор разблакiроўкі."</string> + <string name="keyguard_accessibility_pin_unlock" msgid="2469687111784035046">"PIN-код разблакiроўкі."</string> + <string name="keyguard_accessibility_password_unlock" msgid="7675777623912155089">"Пароль разблакiроўкі."</string> + <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">"Вобласць узора."</string> + <string name="keyguard_accessibility_slide_area" msgid="6736064494019979544">"Вобласць слайда."</string> + <string name="keyguard_accessibility_pin_area" msgid="7903959476607833485">"Поле для PIN-кода"</string> + <string name="keyguard_accessibility_sim_pin_area" msgid="3887780775111719336">"Поле для PIN-кода SIM-карты"</string> + <string name="keyguard_accessibility_sim_puk_area" msgid="1880823406954996207">"Поле для PUK-кода SIM-карты"</string> + <string name="keyguard_accessibility_next_alarm" msgid="7269583073750518672">"Наступны будзільнік пастаўлены на <xliff:g id="ALARM">%1$s</xliff:g>"</string> + <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"Выдаліць"</string> + <string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enter"</string> + <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"Забылі ключ"</string> + <string name="kg_wrong_pattern" msgid="1850806070801358830">"Няправільна ключ"</string> + <string name="kg_wrong_password" msgid="2333281762128113157">"Няправiльны пароль"</string> + <string name="kg_wrong_pin" msgid="1131306510833563801">"Няправільны PIN-код"</string> + <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Паўтарыце спробу праз <xliff:g id="NUMBER">%d</xliff:g> с."</string> + <string name="kg_pattern_instructions" msgid="398978611683075868">"Намалюйце ключ"</string> + <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Увядзіце PIN-код SIM-карты"</string> + <string name="kg_sim_pin_instructions_multi" msgid="7818515973197201434">"Увядзіце PIN-код SIM-карты «<xliff:g id="CARRIER">%1$s</xliff:g>»"</string> + <string name="kg_pin_instructions" msgid="2377242233495111557">"Увядзіце PIN-код"</string> + <string name="kg_password_instructions" msgid="5753646556186936819">"Увядзіце пароль"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM-карта зараз адключана. Увядзіце PUK-код, каб працягнуць. Звяжыцеся са сваiм аператарам, каб атрымаць дадатковую iнфармацыю."</string> + <string name="kg_puk_enter_puk_hint_multi" msgid="363822494559783025">"SIM-карта «<xliff:g id="CARRIER">%1$s</xliff:g>» зараз адключана. Увядзіце PUK-код, каб працягнуць. Каб атрымаць дадатковую iнфармацыю, звяжыцеся з аператарам."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Увядзіце жаданы PIN-код"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Пацвердзіце жадан PIN-код"</string> + <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Разблакiроўка SIM-карты..."</string> + <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Увядзіце PIN-код, які змяшчае ад 4 да 8 лічбаў."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK-код павінен утрымлiваць 8 лiчбаў і больш."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Паўторна увядзіце правільны PUK-код. Неаднаразовыя спробы назаўжды адключаць SIM-карту."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN-коды не супадаюць"</string> + <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Занадта шмат спроб паўтарыць шаблон!"</string> + <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Вы няправільна ўвялі PIN-код пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. \n\nПаўтарыце спробу праз <xliff:g id="NUMBER_1">%2$d</xliff:g> с."</string> + <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Вы няправільна ўвялі пароль пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. \n\nПаўтарыце спробу праз <xliff:g id="NUMBER_1">%2$d</xliff:g> с."</string> + <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Вы няправільна ўвялі графічны ключ разблакiроўкi пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. \n\nПаўтарыце спробу праз <xliff:g id="NUMBER_1">%2$d</xliff:g> с."</string> + <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="8774056606869646621">"Вы не змаглі разблакіраваць планшэт столькі разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькіх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) ён будзе скінуты да заводскіх налад, гэта прывядзе да выдалення ўсіх даных."</string> + <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="1843331751334128428">"Вы не змаглі разблакіраваць тэлефон столькі разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькіх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) ён будзе скінуты да заводскіх налад, гэта прывядзе да выдалення ўсіх даных."</string> + <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="258925501999698032">"Вы не змаглі разблакіраваць планшэт столькі разоў: <xliff:g id="NUMBER">%d</xliff:g>. Цяпер ён будзе скінуты да заводскіх налад, гэты прывядзе да выдалення ўсіх даных."</string> + <string name="kg_failed_attempts_now_wiping" product="default" msgid="7154028908459817066">"Вы не змаглі разблакіраваць тэлефон столькі разоў: <xliff:g id="NUMBER">%d</xliff:g>. Цяпер ён будзе скінуты да заводскіх налад, гэты прывядзе да выдалення ўсіх даных."</string> + <string name="kg_failed_attempts_almost_at_erase_user" product="tablet" msgid="6159955099372112688">"Вы не змаглі разблакіраваць планшэт столькі разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькіх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) гэты карыстальнік будзе выдалены, гэта прывядзе да выдалення ўсіх карыстальніцкіх даных."</string> + <string name="kg_failed_attempts_almost_at_erase_user" product="default" msgid="6945823186629369880">"Вы не змаглі разблакіраваць тэлефон столькі разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькіх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) гэты карыстальнік будзе выдалены, гэта прывядзе да выдалення ўсіх карыстальніцкіх даных."</string> + <string name="kg_failed_attempts_now_erasing_user" product="tablet" msgid="3963486905355778734">"Вы не змаглі разблакіраваць планшэт столькі разоў: <xliff:g id="NUMBER">%d</xliff:g>. Гэты карыстальнік будзе выдалены, гэта прывядзе да выдалення ўсіх карыстальніцкіх даных."</string> + <string name="kg_failed_attempts_now_erasing_user" product="default" msgid="7729009752252111673">"Вы не змаглі разблакіраваць тэлефон столькі разоў: <xliff:g id="NUMBER">%d</xliff:g>. Гэты карыстальнік будзе выдалены, гэта прывядзе да выдалення ўсіх карыстальніцкіх даных."</string> + <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet" msgid="4621778507387853694">"Вы не змаглі разблакіраваць планшэт столькі разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькіх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) працоўны профіль будзе выдалены, гэта прывядзе да выдалення ўсіх даных у профілі."</string> + <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"Вы не змаглі разблакіраваць тэлефон столькі разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькіх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) працоўны профіль будзе выдалены, гэта прывядзе да выдалення ўсіх даных у профілі."</string> + <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4686386497449912146">"Вы не змаглі разблакіраваць планшэт столькі разоў: <xliff:g id="NUMBER">%d</xliff:g>. Працоўны профіль будзе выдалены, гэта прывядзе да выдалення ўсіх даных у профілі."</string> + <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"Вы не змаглі разблакіраваць тэлефон столькі разоў: <xliff:g id="NUMBER">%d</xliff:g>. Працоўны профіль будзе выдалены, гэта прывядзе да выдалення ўсіх даных у профілі."</string> + <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Вы няправільна ўвялі графічны ключ разблакiроўкi пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) вам будзе прапанавана разблакiраваць тэлефон, увайшоўшы ў Google.\n\n Паўтарыце спробу праз <xliff:g id="NUMBER_2">%3$d</xliff:g> с."</string> + <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Вы няправільна ўвялі графічны ключ разблакiроўкi пэўную колькасць разоў: <xliff:g id="NUMBER_0">%1$d</xliff:g>. Пасля яшчэ некалькiх няўдалых спроб (<xliff:g id="NUMBER_1">%2$d</xliff:g>) вам будзе прапанавана разблакiраваць тэлефон, увайшоўшы ў Google.\n\n Паўтарыце спробу праз <xliff:g id="NUMBER_2">%3$d</xliff:g> с."</string> + <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"Няправільны PIN-код SIM-карты, цяпер вы павінны звязацца з аператарам для разблакіроўкі прылады."</string> + <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249"> + <item quantity="one">Няправільны PIN-код SIM-карты, у вас засталася <xliff:g id="NUMBER_1">%d</xliff:g> спроба.</item> + <item quantity="few">Няправільны PIN-код SIM-карты, у вас засталося <xliff:g id="NUMBER_1">%d</xliff:g> спробы.</item> + <item quantity="many">Няправільны PIN-код SIM-карты, у вас засталося <xliff:g id="NUMBER_1">%d</xliff:g> спроб.</item> + <item quantity="other">Няправільны PIN-код SIM-карты, у вас засталося <xliff:g id="NUMBER_1">%d</xliff:g> спробы.</item> + </plurals> + <string name="kg_password_wrong_puk_code_dead" msgid="7077536808291316208">"SIM-карта не прыдатная для выкарыстання. Звяжыцеся з аператарам."</string> + <plurals name="kg_password_wrong_puk_code" formatted="false" msgid="7576227366999858780"> + <item quantity="one">Няправільны PUK-код SIM-карты, у вас засталася <xliff:g id="NUMBER_1">%d</xliff:g> спроба перад тым, як SIM-карта перастане працаваць назаўжды.</item> + <item quantity="few">Няправільны PUK-код SIM-карты, у вас засталося <xliff:g id="NUMBER_1">%d</xliff:g> спробы перад тым, як SIM-карта перастане працаваць назаўжды.</item> + <item quantity="many">Няправільны PUK-код SIM-карты, у вас засталося <xliff:g id="NUMBER_1">%d</xliff:g> спроб перад тым, як SIM-карта перастане працаваць назаўжды.</item> + <item quantity="other">Няправільны PUK-код SIM-карты, у вас засталося <xliff:g id="NUMBER_1">%d</xliff:g> спробы перад тым, як SIM-карта перастане працаваць назаўжды.</item> + </plurals> + <string name="kg_password_pin_failed" msgid="6268288093558031564">"Разблакіраваць SIM-карту PIN-кодам не атрымалася!"</string> + <string name="kg_password_puk_failed" msgid="2838824369502455984">"Разблакіраваць SIM-карту PUK-кодам не атрымалася!"</string> + <string name="kg_pin_accepted" msgid="1448241673570020097">"Код прыняты!"</string> + <string name="keyguard_carrier_default" msgid="8700650403054042153">"Не абслугоўваецца."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Пераключэнне рэжыму ўводу"</string> + <string name="airplane_mode" msgid="3122107900897202805">"Рэжым палёту"</string> + <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Пасля перазапуску прылады патрабуецца ўзор"</string> + <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Пасля перазапуску прылады патрабуецца PIN-код"</string> + <string name="kg_prompt_reason_restart_password" msgid="6504585392626524695">"Пасля перазапуску прылады патрабуецца пароль"</string> + <string name="kg_prompt_reason_timeout_pattern" msgid="3717506169674397620">"Для забеспячэння дадатковай бяспекі патрабуецца ўзор"</string> + <string name="kg_prompt_reason_timeout_pin" msgid="6951483704195396341">"Для забеспячэння дадатковай бяспекі патрабуецца PIN-код"</string> + <string name="kg_prompt_reason_timeout_password" msgid="7306667546971345027">"Для забеспячэння дадатковай бяспекі патрабуецца пароль"</string> + <string name="kg_prompt_reason_switch_profiles_pattern" msgid="8476293962695171574">"Пры пераключэнні профіляў патрабуецца ўзор"</string> + <string name="kg_prompt_reason_switch_profiles_pin" msgid="2343607138520460043">"Пры пераключэнні профіляў патрабуецца PIN-код"</string> + <string name="kg_prompt_reason_switch_profiles_password" msgid="1295960907951965927">"Пры пераключэнні профіляў патрабуецца пароль"</string> + <plurals name="kg_prompt_reason_time_pattern" formatted="false" msgid="2697444392228541853"> + <item quantity="one">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзіны. Увядзіце ўзор.</item> + <item quantity="few">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзін. Увядзіце ўзор.</item> + <item quantity="many">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзін. Увядзіце ўзор.</item> + <item quantity="other">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзіны. Увядзіце ўзор.</item> + </plurals> + <plurals name="kg_prompt_reason_time_pin" formatted="false" msgid="2118758475374354849"> + <item quantity="one">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзіны. Увядзіце PIN-код.</item> + <item quantity="few">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзін. Увядзіце PIN-код.</item> + <item quantity="many">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзін. Увядзіце PIN-код.</item> + <item quantity="other">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзіны. Увядзіце PIN-код.</item> + </plurals> + <plurals name="kg_prompt_reason_time_password" formatted="false" msgid="5132693663364913675"> + <item quantity="one">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзіны. Увядзіце пароль.</item> + <item quantity="few">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзін. Увядзіце пароль.</item> + <item quantity="many">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзін. Увядзіце пароль.</item> + <item quantity="other">Прылада не была разблакіравана на працягу <xliff:g id="NUMBER_1">%d</xliff:g> гадзіны. Увядзіце пароль.</item> + </plurals> + <string name="fingerprint_not_recognized" msgid="2690661881608146617">"Не распазнаны"</string> +</resources> diff --git a/packages/Keyguard/res/values-bg/strings.xml b/packages/Keyguard/res/values-bg/strings.xml index ae95c49b0113..9d4047ae9a07 100644 --- a/packages/Keyguard/res/values-bg/strings.xml +++ b/packages/Keyguard/res/values-bg/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Операцията с PUK кода за SIM картата не бе успешна!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Кодът е приет!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Няма покритие."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Бутон за превключване на метода на въвеждане."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Превключване на метода на въвеждане"</string> <string name="airplane_mode" msgid="3122107900897202805">"Самолетен режим"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"След рестартиране на устройството се изисква фигура"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"След рестартиране на устройството се изисква ПИН код"</string> diff --git a/packages/Keyguard/res/values-bn-rBD/strings.xml b/packages/Keyguard/res/values-bn-rBD/strings.xml index 1dd8af8cffd7..8b626876af3a 100644 --- a/packages/Keyguard/res/values-bn-rBD/strings.xml +++ b/packages/Keyguard/res/values-bn-rBD/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"সিম PUK ক্রিয়াকলাপটি ব্যর্থ হয়েছে!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"কোড স্বীকৃত হয়েছে!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"কোনো পরিষেবা নেই৷"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ইনপুট পদ্ধতির বোতাম পরিবর্তন করুন৷"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"ইনপুট পদ্ধতি পাল্টান"</string> <string name="airplane_mode" msgid="3122107900897202805">"বিমান মোড"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"ডিভাইস পুনরায় আরম্ভ করার পর প্যাটার্নের প্রয়োজন হবে"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"ডিভাইস পুনরায় আরম্ভ করার পর PIN এর প্রয়োজন হবে"</string> diff --git a/packages/Keyguard/res/values-bs-rBA/strings.xml b/packages/Keyguard/res/values-bs-rBA/strings.xml new file mode 100644 index 000000000000..fdf795c5d65a --- /dev/null +++ b/packages/Keyguard/res/values-bs-rBA/strings.xml @@ -0,0 +1,140 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* //device/apps/common/assets/res/any/strings.xml +** +** Copyright 2006, The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_name" msgid="719438068451601849">"Čuvar tastature"</string> + <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"Unesite PIN"</string> + <string name="keyguard_password_enter_puk_code" msgid="3035856550289724338">"Unesite SIM PUK i novi PIN kôd"</string> + <string name="keyguard_password_enter_puk_prompt" msgid="1801941051094974609">"SIM PUK kôd"</string> + <string name="keyguard_password_enter_pin_prompt" msgid="3201151840570492538">"Novi SIM PIN kôd"</string> + <string name="keyguard_password_entry_touch_hint" msgid="7858547464982981384"><font size="17">"Dodirnite za unos lozinke"</font></string> + <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"Unesite lozinku za otključavanje tipkovnice"</string> + <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"Unesite PIN za otključavanje tipkovnice"</string> + <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"Pogrešan PIN."</string> + <string name="keyguard_charged" msgid="3272223906073492454">"Napunjeno"</string> + <string name="keyguard_plugged_in" msgid="9087497435553252863">"Punjenje"</string> + <string name="keyguard_plugged_in_charging_fast" msgid="6671162730167305479">"Brzo punjenje"</string> + <string name="keyguard_plugged_in_charging_slowly" msgid="1964714661071163229">"Sporo punjenje"</string> + <string name="keyguard_low_battery" msgid="8143808018719173859">"Povežite na punjač."</string> + <string name="keyguard_instructions_when_pattern_disabled" msgid="1332288268600329841">"Pritisnite meni da otključate."</string> + <string name="keyguard_network_locked_message" msgid="9169717779058037168">"Mreža je zaključana"</string> + <string name="keyguard_missing_sim_message_short" msgid="494980561304211931">"Nema SIM kartice"</string> + <string name="keyguard_missing_sim_message" product="tablet" msgid="1445849005909260039">"Nema SIM kartice u tabletu."</string> + <string name="keyguard_missing_sim_message" product="default" msgid="3481110395508637643">"Nema SIM kartice u telefonu."</string> + <string name="keyguard_missing_sim_instructions" msgid="5210891509995942250">"Umetnite SIM karticu."</string> + <string name="keyguard_missing_sim_instructions_long" msgid="5968985489463870358">"SIM kartica nedostaje ili se ne može pročitati. Umetnite SIM karticu."</string> + <string name="keyguard_permanent_disabled_sim_message_short" msgid="8340813989586622356">"Neupotrebljiva SIM kartica."</string> + <string name="keyguard_permanent_disabled_sim_instructions" msgid="5892940909699723544">"Vaša SIM kartica je trajno onemogućena. \n Obratite se svom pružaocu bežičnih usluga za drugu SIM karticu."</string> + <string name="keyguard_sim_locked_message" msgid="6875773413306380902">"SIM kartica je zaključana."</string> + <string name="keyguard_sim_puk_locked_message" msgid="3747232467471801633">"SIM kartica je zaključana PUK kodom."</string> + <string name="keyguard_sim_unlock_progress_dialog_message" msgid="7975221805033614426">"Otključavanje SIM kartice…"</string> + <string name="keyguard_accessibility_pattern_unlock" msgid="1490840706075246612">"Otključavanje uzorkom."</string> + <string name="keyguard_accessibility_pin_unlock" msgid="2469687111784035046">"Otključavanje pinom."</string> + <string name="keyguard_accessibility_password_unlock" msgid="7675777623912155089">"Otključavanje lozinkom."</string> + <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">"Uzorak oblasti."</string> + <string name="keyguard_accessibility_slide_area" msgid="6736064494019979544">"Oblast za pomjeranje klizača."</string> + <string name="keyguard_accessibility_pin_area" msgid="7903959476607833485">"Prostor za PIN"</string> + <string name="keyguard_accessibility_sim_pin_area" msgid="3887780775111719336">"Prostor za SIM PIN"</string> + <string name="keyguard_accessibility_sim_puk_area" msgid="1880823406954996207">"Prostor za SIM PUK"</string> + <string name="keyguard_accessibility_next_alarm" msgid="7269583073750518672">"Naredni alarm je podešen za <xliff:g id="ALARM">%1$s</xliff:g>"</string> + <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"Izbriši"</string> + <string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Potvrdi"</string> + <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"Zaboravili ste uzorak?"</string> + <string name="kg_wrong_pattern" msgid="1850806070801358830">"Pogrešan uzorak"</string> + <string name="kg_wrong_password" msgid="2333281762128113157">"Pogrešna lozinka"</string> + <string name="kg_wrong_pin" msgid="1131306510833563801">"Pogrešan PIN"</string> + <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Broj sekundi do sljedećeg pokušaja: <xliff:g id="NUMBER">%d</xliff:g>."</string> + <string name="kg_pattern_instructions" msgid="398978611683075868">"Nacrtajte obrazac"</string> + <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Unesite PIN za SIM"</string> + <string name="kg_sim_pin_instructions_multi" msgid="7818515973197201434">"Unesite SIM PIN za \"<xliff:g id="CARRIER">%1$s</xliff:g>\""</string> + <string name="kg_pin_instructions" msgid="2377242233495111557">"Unesite PIN"</string> + <string name="kg_password_instructions" msgid="5753646556186936819">"Unesite lozinku"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM je sada onemogućen. Unesite PUK kôd da nastavite. Obratite se operateru za detalje."</string> + <string name="kg_puk_enter_puk_hint_multi" msgid="363822494559783025">"SIM operator \"<xliff:g id="CARRIER">%1$s</xliff:g>\" je sada isključen. Unesite PUK kôd da nastavite. Za više detalja obratite se operateru."</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Unesite željeni PIN kôd"</string> + <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Potvrdi željeni PIN kôd"</string> + <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Otključavanje SIM kartice…"</string> + <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Unesite PIN koji sadrži od 4 do 8 brojeva."</string> + <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"PUK kôd treba da sadrži 8 brojeva ili više."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Ponovo unesite ispravan PUK kôd. Ponovljeni pokušaji će trajno onemogućiti SIM."</string> + <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN kodovi se ne poklapaju"</string> + <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Previše pokušaja otključavanja pomoću uzorka"</string> + <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Pogrešno ste unijeli PIN <xliff:g id="NUMBER_0">%1$d</xliff:g> puta. \n\nBroj sekundi do sljedećeg pokušaja: <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> + <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Pogrešno ste unijeli lozinku <xliff:g id="NUMBER_0">%1$d</xliff:g> puta. \n\nBroj sekundi do sljedećeg pokušaja: <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> + <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Pogrešno ste nacrtali uzorak <xliff:g id="NUMBER_0">%1$d</xliff:g> puta. \n\nBroj sekundi do sljedećeg pokušaja: <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string> + <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="8774056606869646621">"Pokušali ste <xliff:g id="NUMBER_0">%1$d</xliff:g> puta neispravno otključati tablet. U slučaju još <xliff:g id="NUMBER_1">%2$d</xliff:g> pokušaja bez uspjeha, tablet će biti vraćen na fabričke postavke a svi podaci će biti izbrisani."</string> + <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="1843331751334128428">"Pokušali ste <xliff:g id="NUMBER_0">%1$d</xliff:g> puta neispravno otključati telefon. U slučaju još <xliff:g id="NUMBER_1">%2$d</xliff:g> pokušaja bez uspjeha, telefon će biti vraćen na fabričke postavke a svi podaci će biti izbrisani."</string> + <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="258925501999698032">"Pokušali ste <xliff:g id="NUMBER">%d</xliff:g> puta neispravno otključati tablet. Tablet će sada biti vraćen na fabričke postavke a svi podaci će biti izbrisani."</string> + <string name="kg_failed_attempts_now_wiping" product="default" msgid="7154028908459817066">"Pokušali ste <xliff:g id="NUMBER">%d</xliff:g> puta neispravno otključati telefon. Telefon će sada biti vraćen na fabričke postavke a svi podaci će biti izbrisani."</string> + <string name="kg_failed_attempts_almost_at_erase_user" product="tablet" msgid="6159955099372112688">"Pokušali ste <xliff:g id="NUMBER_0">%1$d</xliff:g> puta neispravno otključati tablet. U slučaju još <xliff:g id="NUMBER_1">%2$d</xliff:g> pokušaja bez uspjeha, ovaj korisnik će biti uklonjen a svi podaci korisnika bit će izbrisani."</string> + <string name="kg_failed_attempts_almost_at_erase_user" product="default" msgid="6945823186629369880">"Pokušali ste <xliff:g id="NUMBER_0">%1$d</xliff:g> puta neispravno otključati telefon. U slučaju još <xliff:g id="NUMBER_1">%2$d</xliff:g> pokušaja bez uspjeha, ovaj korisnik će biti uklonjen a svi podaci korisnika bit će izbrisani."</string> + <string name="kg_failed_attempts_now_erasing_user" product="tablet" msgid="3963486905355778734">"Pokušali ste <xliff:g id="NUMBER">%d</xliff:g> puta neispravno otključati tablet. Korisnik će biti uklonjen a svi podaci korisnika bit će izbrisani."</string> + <string name="kg_failed_attempts_now_erasing_user" product="default" msgid="7729009752252111673">"Pokušali ste <xliff:g id="NUMBER">%d</xliff:g> puta neispravno otključati telefon. Korisnik će biti uklonjen a svi podaci korisnika bit će izbrisani."</string> + <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet" msgid="4621778507387853694">"Pokušali ste <xliff:g id="NUMBER_0">%1$d</xliff:g> puta neispravno otključati tablet. U slučaju još <xliff:g id="NUMBER_1">%2$d</xliff:g> pokušaja bez uspjeha, poslovni profil će biti uklonjen a svi podaci s profila bit će izbrisani."</string> + <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"Pokušali ste <xliff:g id="NUMBER_0">%1$d</xliff:g> puta neispravno otključati telefon. U slučaju još <xliff:g id="NUMBER_1">%2$d</xliff:g> pokušaja bez uspjeha, poslovni profil će biti uklonjen a svi podaci s profila bit će izbrisani."</string> + <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4686386497449912146">"Pokušali ste <xliff:g id="NUMBER">%d</xliff:g> puta neispravno otključati tablet. Poslovni profil će biti uklonjen a svi podaci s profila bit će izbrisani."</string> + <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"Pokušali ste <xliff:g id="NUMBER">%d</xliff:g> puta neispravno otključati telefon. Poslovni profil će biti uklonjen a svi podaci s profila bit će izbrisani."</string> + <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Pogrešno ste nacrtali uzorak za otključavanje <xliff:g id="NUMBER_0">%1$d</xliff:g> puta. Ako napravite još <xliff:g id="NUMBER_1">%2$d</xliff:g> pokušaja bez uspjeha, od vas će se tražiti da otključate tablet pomoću e-pošte. \n\n Pokušajte ponovo za <xliff:g id="NUMBER_2">%3$d</xliff:g> sek."</string> + <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Pogrešno ste nacrtali uzorak za otključavanje <xliff:g id="NUMBER_0">%1$d</xliff:g> puta. Ako napravite još <xliff:g id="NUMBER_1">%2$d</xliff:g> pokušaja bez uspjeha, od vas će se tražiti da otključate telefon pomoću e-pošte. \n\n Pokušajte ponovo za <xliff:g id="NUMBER_2">%3$d</xliff:g> sek."</string> + <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"Pogrešan PIN kôd za SIM. Morate obratiti svom operateru za otključavanje uređaja."</string> + <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249"> + <item quantity="one">PIN kôd za SIM karticu je netačan. Imate još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaj.</item> + <item quantity="few">PIN kôd za SIM karticu je netačan. Imate još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item> + <item quantity="other">PIN kôd za SIM karticu je netačan. Imate još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja.</item> + </plurals> + <string name="kg_password_wrong_puk_code_dead" msgid="7077536808291316208">"SIM je neupotrebljiv. Obratite se svom operateru."</string> + <plurals name="kg_password_wrong_puk_code" formatted="false" msgid="7576227366999858780"> + <item quantity="one">PUK kôd za SIM karticu je netačan. Imate još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaj prije nego SIM kartica postane trajno neupotrebljiva.</item> + <item quantity="few">PUK kôd za SIM karticu je netačan. Imate još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja prije nego SIM kartica postane trajno neupotrebljiva.</item> + <item quantity="other">PUK kôd za SIM karticu je netačan. Imate još <xliff:g id="NUMBER_1">%d</xliff:g> pokušaja prije nego SIM kartica postane trajno neupotrebljiva.</item> + </plurals> + <string name="kg_password_pin_failed" msgid="6268288093558031564">"Korištenje PIN-a za SIM nije uspjelo!"</string> + <string name="kg_password_puk_failed" msgid="2838824369502455984">"Korištenje PUK-a za SIM nije uspjelo!"</string> + <string name="kg_pin_accepted" msgid="1448241673570020097">"Kôd je prihvaćen"</string> + <string name="keyguard_carrier_default" msgid="8700650403054042153">"Nema usluge."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Promijeni način unosa"</string> + <string name="airplane_mode" msgid="3122107900897202805">"Način rada u avionu"</string> + <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Potreban je uzorak nakon ponovnog pokretanja uređaja"</string> + <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Potreban je PIN nakon ponovnog pokretanja uređaja"</string> + <string name="kg_prompt_reason_restart_password" msgid="6504585392626524695">"Potrebna je lozinka nakon ponovnog pokretanja uređaja"</string> + <string name="kg_prompt_reason_timeout_pattern" msgid="3717506169674397620">"Uzorak je potreban radi dodatne sigurnosti"</string> + <string name="kg_prompt_reason_timeout_pin" msgid="6951483704195396341">"PIN je potreban radi dodatne sigurnosti"</string> + <string name="kg_prompt_reason_timeout_password" msgid="7306667546971345027">"Lozinka je potrebna radi dodatne sigurnosti"</string> + <string name="kg_prompt_reason_switch_profiles_pattern" msgid="8476293962695171574">"Potreban je uzorak nakon prelaska na drugi profil"</string> + <string name="kg_prompt_reason_switch_profiles_pin" msgid="2343607138520460043">"Potreban je PIN nakon prelaska na drugi profil"</string> + <string name="kg_prompt_reason_switch_profiles_password" msgid="1295960907951965927">"Potrebna je lozinka nakon prelaska na drugi profil"</string> + <plurals name="kg_prompt_reason_time_pattern" formatted="false" msgid="2697444392228541853"> + <item quantity="one">Uređaj nije bio otključan <xliff:g id="NUMBER_1">%d</xliff:g> sat. Potvrdite obrazac.</item> + <item quantity="few">Uređaj nije bio otključan <xliff:g id="NUMBER_1">%d</xliff:g> sata. Potvrdite obrazac.</item> + <item quantity="other">Uređaj nije bio otključan <xliff:g id="NUMBER_1">%d</xliff:g> sati. Potvrdite obrazac.</item> + </plurals> + <plurals name="kg_prompt_reason_time_pin" formatted="false" msgid="2118758475374354849"> + <item quantity="one">Uređaj nije bio otključan <xliff:g id="NUMBER_1">%d</xliff:g> sat. Potvrdite PIN.</item> + <item quantity="few">Uređaj nije bio otključan <xliff:g id="NUMBER_1">%d</xliff:g> sata. Potvrdite PIN.</item> + <item quantity="other">Uređaj nije bio otključan <xliff:g id="NUMBER_1">%d</xliff:g> sati. Potvrdite PIN.</item> + </plurals> + <plurals name="kg_prompt_reason_time_password" formatted="false" msgid="5132693663364913675"> + <item quantity="one">Uređaj nije bio otključan <xliff:g id="NUMBER_1">%d</xliff:g> sat. Potvrdite lozinku.</item> + <item quantity="few">Uređaj nije bio otključan <xliff:g id="NUMBER_1">%d</xliff:g> sata. Potvrdite lozinku.</item> + <item quantity="other">Uređaj nije bio otključan <xliff:g id="NUMBER_1">%d</xliff:g> sati. Potvrdite lozinku.</item> + </plurals> + <string name="fingerprint_not_recognized" msgid="2690661881608146617">"Nije prepoznat"</string> +</resources> diff --git a/packages/Keyguard/res/values-ca/strings.xml b/packages/Keyguard/res/values-ca/strings.xml index 70e9fd1e5b12..dc8b17891e9d 100644 --- a/packages/Keyguard/res/values-ca/strings.xml +++ b/packages/Keyguard/res/values-ca/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Hi ha hagut un problema en l\'operació del PUK de la SIM."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"S\'ha acceptat el codi."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Sense servei."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Botó de canvi del mètode d\'entrada."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Canvia el mètode d\'introducció"</string> <string name="airplane_mode" msgid="3122107900897202805">"Mode d\'avió"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Cal introduir el patró quan es reinicia el dispositiu"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Cal introduir el PIN quan es reinicia el dispositiu"</string> diff --git a/packages/Keyguard/res/values-cs/strings.xml b/packages/Keyguard/res/values-cs/strings.xml index 96944cf3d33c..cf1dd34e78b1 100644 --- a/packages/Keyguard/res/values-cs/strings.xml +++ b/packages/Keyguard/res/values-cs/strings.xml @@ -112,7 +112,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Operace pomocí kódu PUK SIM karty se nezdařila!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kód byl přijat."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Žádný signál."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Tlačítko přepnutí metody zadávání"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Přepnout metodu zadávání"</string> <string name="airplane_mode" msgid="3122107900897202805">"Režim Letadlo"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Po restartování zařízení je vyžadováno gesto"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Po restartování zařízení je vyžadován kód PIN"</string> diff --git a/packages/Keyguard/res/values-da/strings.xml b/packages/Keyguard/res/values-da/strings.xml index 5ce1ef0f6033..0af41f526f2f 100644 --- a/packages/Keyguard/res/values-da/strings.xml +++ b/packages/Keyguard/res/values-da/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"PUK-koden til SIM-kortet blev afvist."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Koden blev accepteret."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Ingen dækning."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Skift indtastningsmetode-knappen."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Skift indtastningsmetode"</string> <string name="airplane_mode" msgid="3122107900897202805">"Flytilstand"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Du skal indtaste et mønster efter genstart af enheden"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Der skal indtaste en pinkode efter genstart af enheden"</string> diff --git a/packages/Keyguard/res/values-de/strings.xml b/packages/Keyguard/res/values-de/strings.xml index f1fc198dfd45..269c5c0e1f40 100644 --- a/packages/Keyguard/res/values-de/strings.xml +++ b/packages/Keyguard/res/values-de/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Fehler beim Entsperren mithilfe des PUK-Codes der SIM-Karte"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Code akzeptiert"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Kein Dienst"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Schaltfläche zum Ändern der Eingabemethode"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Eingabemethode wechseln"</string> <string name="airplane_mode" msgid="3122107900897202805">"Flugmodus"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Nach dem Neustart des Geräts ist die Eingabe des Musters erforderlich."</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Nach dem Neustart des Geräts ist die Eingabe der PIN erforderlich."</string> diff --git a/packages/Keyguard/res/values-el/strings.xml b/packages/Keyguard/res/values-el/strings.xml index 535bee868468..be3b3491cf9b 100644 --- a/packages/Keyguard/res/values-el/strings.xml +++ b/packages/Keyguard/res/values-el/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Αποτυχία λειτουργίας κωδικού PUK κάρτας SIM!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Αποδεκτός κωδικός!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Καμία υπηρεσία."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Κουμπί εναλλαγής μεθόδου εισόδου"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Εναλλαγή μεθόδου εισαγωγής"</string> <string name="airplane_mode" msgid="3122107900897202805">"Λειτουργία πτήσης"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Απαιτείται μοτίβο μετά την επανεκκίνηση της συσκευής"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Απαιτείται PIN μετά την επανεκκίνηση της συσκευής"</string> diff --git a/packages/Keyguard/res/values-en-rAU/strings.xml b/packages/Keyguard/res/values-en-rAU/strings.xml index 63b2137e83a5..e2af2d6268ad 100644 --- a/packages/Keyguard/res/values-en-rAU/strings.xml +++ b/packages/Keyguard/res/values-en-rAU/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK operation failed!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Code accepted"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"No service."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Switch input method button."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Switch input method"</string> <string name="airplane_mode" msgid="3122107900897202805">"Aeroplane mode"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Pattern required after device restarts"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"PIN required after device restarts"</string> diff --git a/packages/Keyguard/res/values-en-rGB/strings.xml b/packages/Keyguard/res/values-en-rGB/strings.xml index 63b2137e83a5..e2af2d6268ad 100644 --- a/packages/Keyguard/res/values-en-rGB/strings.xml +++ b/packages/Keyguard/res/values-en-rGB/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK operation failed!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Code accepted"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"No service."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Switch input method button."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Switch input method"</string> <string name="airplane_mode" msgid="3122107900897202805">"Aeroplane mode"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Pattern required after device restarts"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"PIN required after device restarts"</string> diff --git a/packages/Keyguard/res/values-en-rIN/strings.xml b/packages/Keyguard/res/values-en-rIN/strings.xml index 63b2137e83a5..e2af2d6268ad 100644 --- a/packages/Keyguard/res/values-en-rIN/strings.xml +++ b/packages/Keyguard/res/values-en-rIN/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK operation failed!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Code accepted"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"No service."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Switch input method button."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Switch input method"</string> <string name="airplane_mode" msgid="3122107900897202805">"Aeroplane mode"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Pattern required after device restarts"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"PIN required after device restarts"</string> diff --git a/packages/Keyguard/res/values-es-rUS/strings.xml b/packages/Keyguard/res/values-es-rUS/strings.xml index cf903eb87a43..6a9b824606ad 100644 --- a/packages/Keyguard/res/values-es-rUS/strings.xml +++ b/packages/Keyguard/res/values-es-rUS/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Error al desbloquear la tarjeta SIM con el PUK"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Código aceptado"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Sin servicio"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Botón Cambiar método de entrada"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Cambiar método de entrada"</string> <string name="airplane_mode" msgid="3122107900897202805">"Modo de avión"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Se requiere el patrón después de reiniciar el dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Se requiere el PIN después de reiniciar el dispositivo"</string> diff --git a/packages/Keyguard/res/values-es/strings.xml b/packages/Keyguard/res/values-es/strings.xml index a131cc1b8a9a..9861d2668c38 100644 --- a/packages/Keyguard/res/values-es/strings.xml +++ b/packages/Keyguard/res/values-es/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Error al intentar desbloquear la tarjeta SIM con el código PUK"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Código aceptado"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Sin servicio"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Botón Cambiar método de entrada"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Cambiar método de introducción"</string> <string name="airplane_mode" msgid="3122107900897202805">"Modo avión"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Debes introducir el patrón después de reiniciar el dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Debes introducir el PIN después de reiniciar el dispositivo"</string> diff --git a/packages/Keyguard/res/values-et-rEE/strings.xml b/packages/Keyguard/res/values-et-rEE/strings.xml index 47aadf093135..0a62009469e8 100644 --- a/packages/Keyguard/res/values-et-rEE/strings.xml +++ b/packages/Keyguard/res/values-et-rEE/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM-i PUK-koodi toiming ebaõnnestus."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kood on õige."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Teenus puudub."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Sisestusmeetodi vahetamise nupp."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Vaheta sisestusmeetodit"</string> <string name="airplane_mode" msgid="3122107900897202805">"Lennukirežiim"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Pärast seadme taaskäivitamist tuleb sisestada muster"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Pärast seadme taaskäivitamist tuleb sisestada PIN-kood"</string> diff --git a/packages/Keyguard/res/values-eu-rES/strings.xml b/packages/Keyguard/res/values-eu-rES/strings.xml index 1c834e99e4e5..351c05a6e38f 100644 --- a/packages/Keyguard/res/values-eu-rES/strings.xml +++ b/packages/Keyguard/res/values-eu-rES/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM txartelaren PUK eragiketak huts egin du!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kodea onartu da!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Zerbitzurik gabe."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Idazketa-metodoa aldatzeko botoia."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Aldatu idazketa-metodoa"</string> <string name="airplane_mode" msgid="3122107900897202805">"Hegaldi modua"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Eredua marraztu beharko duzu gailua berrabiarazten denean"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"PIN kodea idatzi beharko duzu gailua berrabiarazten denean"</string> diff --git a/packages/Keyguard/res/values-fa/strings.xml b/packages/Keyguard/res/values-fa/strings.xml index 166e0d92f8fb..b8a87a29c8ba 100644 --- a/packages/Keyguard/res/values-fa/strings.xml +++ b/packages/Keyguard/res/values-fa/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"عملیات PUK سیم کارت ناموفق بود!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"کد پذیرفته شد!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"خدماتی وجود ندارد."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"کلید تغییر روش ورود متن."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"تغییر روش ورودی"</string> <string name="airplane_mode" msgid="3122107900897202805">"حالت هواپیما"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"بعد از بازنشانی دستگاه باید الگو وارد شود"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"بعد از بازنشانی دستگاه باید پین وارد شود"</string> diff --git a/packages/Keyguard/res/values-fi/strings.xml b/packages/Keyguard/res/values-fi/strings.xml index bba241e340a3..a876351e1691 100644 --- a/packages/Keyguard/res/values-fi/strings.xml +++ b/packages/Keyguard/res/values-fi/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM-kortin PUK-toiminto epäonnistui!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Koodi hyväksytty!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Ei yhteyttä."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Syöttötavan vaihtopainike."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Vaihda syöttötapaa."</string> <string name="airplane_mode" msgid="3122107900897202805">"Lentokonetila"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Kuvio vaaditaan laitteen uudelleenkäynnistyksen jälkeen."</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"PIN-koodi vaaditaan laitteen uudelleenkäynnistyksen jälkeen."</string> diff --git a/packages/Keyguard/res/values-fr-rCA/strings.xml b/packages/Keyguard/res/values-fr-rCA/strings.xml index 6b63e04fbbb2..e0e06cf1b728 100644 --- a/packages/Keyguard/res/values-fr-rCA/strings.xml +++ b/packages/Keyguard/res/values-fr-rCA/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Le déverrouillage de la carte SIM par code PUK a échoué."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Code accepté"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Aucun service"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Bouton \"Changer le mode de saisie\""</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Changer de méthode d\'entrée"</string> <string name="airplane_mode" msgid="3122107900897202805">"Mode Avion"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Le motif est exigé après le redémarrage de l\'appareil"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Le NIP est exigé après le redémarrage de l\'appareil"</string> diff --git a/packages/Keyguard/res/values-fr/strings.xml b/packages/Keyguard/res/values-fr/strings.xml index 73b9552020e5..eff9e917b08b 100644 --- a/packages/Keyguard/res/values-fr/strings.xml +++ b/packages/Keyguard/res/values-fr/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Échec du déverrouillage à l\'aide de la clé PUK de la carte SIM."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Code accepté."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Aucun service"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Bouton \"Changer le mode de saisie\""</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Changer le mode de saisie"</string> <string name="airplane_mode" msgid="3122107900897202805">"Mode Avion"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Veuillez saisir le schéma après le redémarrage de l\'appareil."</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Veuillez saisir le code d\'accès après le redémarrage de l\'appareil."</string> diff --git a/packages/Keyguard/res/values-gl-rES/strings.xml b/packages/Keyguard/res/values-gl-rES/strings.xml index 05767c9d675e..b27cdad428c3 100644 --- a/packages/Keyguard/res/values-gl-rES/strings.xml +++ b/packages/Keyguard/res/values-gl-rES/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Erro ao tentar desbloquar a tarxeta SIM co código PUK."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Código aceptado"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Non hai servizo."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Cambiar o botón do método de entrada."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Cambiar de método de entrada"</string> <string name="airplane_mode" msgid="3122107900897202805">"Modo avión"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"É necesario o padrón despois do reinicio do dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"É necesario o PIN despois do reinicio do dispositivo"</string> diff --git a/packages/Keyguard/res/values-gu-rIN/strings.xml b/packages/Keyguard/res/values-gu-rIN/strings.xml index 1b346a286f73..169bf6e18c16 100644 --- a/packages/Keyguard/res/values-gu-rIN/strings.xml +++ b/packages/Keyguard/res/values-gu-rIN/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK ઓપરેશન નિષ્ફળ થયું!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"કોડ સ્વીકાર્યો!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"કોઈ સેવા ."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ઇનપુટ પદ્ધતિ બટન સ્વિચ કરો."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"ઇનપુટ પદ્ધતિ સ્વિચ કરો"</string> <string name="airplane_mode" msgid="3122107900897202805">"એરપ્લેન મોડ"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"ઉપકરણ પુનઃપ્રારંભ થાય તે પછી પેટર્ન જરૂરી છે"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"ઉપકરણ પુનઃપ્રારંભ થાય તે પછી PIN જરૂરી છે"</string> diff --git a/packages/Keyguard/res/values-hi/strings.xml b/packages/Keyguard/res/values-hi/strings.xml index 47aefab1dd80..dd9123b9d3dd 100644 --- a/packages/Keyguard/res/values-hi/strings.xml +++ b/packages/Keyguard/res/values-hi/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"सिम PUK की कार्यवाही विफल रही!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"कोड स्वीकार किया गया!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"कोई सेवा नहीं."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"इनपुट पद्धति बटन स्विच करें."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"इनपुट पद्धति बदलें"</string> <string name="airplane_mode" msgid="3122107900897202805">"हवाई जहाज़ मोड"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"डिवाइस के पुनः प्रारंभ होने पर पैटर्न की आवश्यकता होती है"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"डिवाइस के पुनः प्रारंभ होने पर पिन की आवश्यकता होती है"</string> diff --git a/packages/Keyguard/res/values-hr/strings.xml b/packages/Keyguard/res/values-hr/strings.xml index c65db7f660e1..0f3b1ca885fa 100644 --- a/packages/Keyguard/res/values-hr/strings.xml +++ b/packages/Keyguard/res/values-hr/strings.xml @@ -110,7 +110,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Operacija PUK-a SIM kartice nije uspjela!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kôd je prihvaćen!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Nema usluge."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Gumb za promjenu načina unosa."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Promjena načina unosa"</string> <string name="airplane_mode" msgid="3122107900897202805">"Način rada u zrakoplovu"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Nakon ponovnog pokretanja uređaja morate unijeti uzorak"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Nakon ponovnog pokretanja uređaja morate unijeti PIN"</string> diff --git a/packages/Keyguard/res/values-hu/strings.xml b/packages/Keyguard/res/values-hu/strings.xml index 104735d82b6e..7901698e8270 100644 --- a/packages/Keyguard/res/values-hu/strings.xml +++ b/packages/Keyguard/res/values-hu/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"A SIM kártya PUK-művelete sikertelen!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kód elfogadva."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Nincs szolgáltatás."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Beviteli mód váltása gomb."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Beviteli mód váltása"</string> <string name="airplane_mode" msgid="3122107900897202805">"Repülős üzemmód"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Az eszköz újraindítását követően meg kell adni a mintát"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Az eszköz újraindítását követően meg kell adni a PIN-kódot"</string> diff --git a/packages/Keyguard/res/values-hy-rAM/strings.xml b/packages/Keyguard/res/values-hy-rAM/strings.xml index 0c7050891279..e223cb92605f 100644 --- a/packages/Keyguard/res/values-hy-rAM/strings.xml +++ b/packages/Keyguard/res/values-hy-rAM/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK գործողությունը ձախողվեց:"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Կոդն ընդունվեց:"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Ծառայություն չկա:"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Միացնել մուտքագրման եղանակի կոճակը:"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Փոխարկել մուտքագրման եղանակը"</string> <string name="airplane_mode" msgid="3122107900897202805">"Ինքնաթիռային ռեժիմ"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Սարքը վերագործարկելուց հետո անհրաժեշտ է մուտքագրել նախշը"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Սարքը վերագործարկելուց հետո անհրաժեշտ է մուտքագրել PIN կոդը"</string> diff --git a/packages/Keyguard/res/values-in/strings.xml b/packages/Keyguard/res/values-in/strings.xml index b4096465b12f..7a5642ef0590 100644 --- a/packages/Keyguard/res/values-in/strings.xml +++ b/packages/Keyguard/res/values-in/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Operasi PUK SIM gagal!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kode Diterima!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Tidak ada layanan."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Tombol beralih metode masukan."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Beralih metode masukan"</string> <string name="airplane_mode" msgid="3122107900897202805">"Mode pesawat"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Pola diperlukan setelah perangkat dimulai ulang"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"PIN diperlukan setelah perangkat dimulai ulang"</string> diff --git a/packages/Keyguard/res/values-is-rIS/strings.xml b/packages/Keyguard/res/values-is-rIS/strings.xml index 53c33f09e455..cece780330a7 100644 --- a/packages/Keyguard/res/values-is-rIS/strings.xml +++ b/packages/Keyguard/res/values-is-rIS/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"PUK-aðgerð SIM-korts mistókst!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Númer samþykkt!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Ekkert símasamband."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Hnappur til að skipta um innsláttaraðferð."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Skipta um innsláttaraðferð"</string> <string name="airplane_mode" msgid="3122107900897202805">"Flugstilling"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Mynsturs er krafist þegar tækið er endurræst"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"PIN-númers er krafist þegar tækið er endurræst"</string> diff --git a/packages/Keyguard/res/values-it/strings.xml b/packages/Keyguard/res/values-it/strings.xml index 6ede2f961ffc..3473863f20be 100644 --- a/packages/Keyguard/res/values-it/strings.xml +++ b/packages/Keyguard/res/values-it/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Operazione con PUK della SIM non riuscita."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Codice accettato."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Nessun servizio."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Pulsante per cambiare metodo di immissione."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Cambia metodo di immissione"</string> <string name="airplane_mode" msgid="3122107900897202805">"Modalità aereo"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Sequenza obbligatoria dopo il riavvio del dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"PIN obbligatorio dopo il riavvio del dispositivo"</string> diff --git a/packages/Keyguard/res/values-iw/strings.xml b/packages/Keyguard/res/values-iw/strings.xml index 43ff724c1ee2..316fce7db3a8 100644 --- a/packages/Keyguard/res/values-iw/strings.xml +++ b/packages/Keyguard/res/values-iw/strings.xml @@ -112,7 +112,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"פעולת קוד ה-PUK של כרטיס ה-SIM נכשלה!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"הקוד התקבל!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"אין קליטה."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"לחצן החלפת שיטת קלט."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"החלפת שיטת קלט"</string> <string name="airplane_mode" msgid="3122107900897202805">"מצב טיסה"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"יש להזין את קו ביטול הנעילה לאחר הפעלה מחדש של המכשיר"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"יש להזין PIN לאחר הפעלה מחדש של המכשיר"</string> diff --git a/packages/Keyguard/res/values-ja/strings.xml b/packages/Keyguard/res/values-ja/strings.xml index 503e18e88b8e..c44f2e1fd85e 100644 --- a/packages/Keyguard/res/values-ja/strings.xml +++ b/packages/Keyguard/res/values-ja/strings.xml @@ -32,7 +32,7 @@ <string name="keyguard_charged" msgid="3272223906073492454">"充電完了"</string> <string name="keyguard_plugged_in" msgid="9087497435553252863">"充電中"</string> <string name="keyguard_plugged_in_charging_fast" msgid="6671162730167305479">"急速充電中"</string> - <string name="keyguard_plugged_in_charging_slowly" msgid="1964714661071163229">"緩速充電中"</string> + <string name="keyguard_plugged_in_charging_slowly" msgid="1964714661071163229">"低速充電中"</string> <string name="keyguard_low_battery" msgid="8143808018719173859">"充電してください。"</string> <string name="keyguard_instructions_when_pattern_disabled" msgid="1332288268600329841">"メニューからロックを解除できます。"</string> <string name="keyguard_network_locked_message" msgid="9169717779058037168">"ネットワークがロックされました"</string> @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK操作に失敗しました。"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"コードが承認されました。"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"通信サービスはありません。"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"入力方法の切り替えボタン。"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"入力方法の切り替え"</string> <string name="airplane_mode" msgid="3122107900897202805">"機内モード"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"端末の再起動後にパターンの入力が必要となります"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"端末の再起動後に PIN の入力が必要となります"</string> diff --git a/packages/Keyguard/res/values-ka-rGE/strings.xml b/packages/Keyguard/res/values-ka-rGE/strings.xml index 2fdd6686f504..3ceb80a57b10 100644 --- a/packages/Keyguard/res/values-ka-rGE/strings.xml +++ b/packages/Keyguard/res/values-ka-rGE/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK ოპერაცია ჩაიშალა!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"კოდი მიღებულია!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"არ არის სერვისი."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"შეყვანის მეთოდის გადართვის ღილაკი."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"შეყვანის მეთოდის გადართვა"</string> <string name="airplane_mode" msgid="3122107900897202805">"თვითმფრინავის რეჟიმი"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"მოწყობილობის გადატვირთვის შემდეგ საჭიროა ნიმუშის შეყვანა"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"მოწყობილობის გადატვირთვის შემდეგ საჭიროა PIN-კოდის შეყვანა"</string> diff --git a/packages/Keyguard/res/values-kk-rKZ/strings.xml b/packages/Keyguard/res/values-kk-rKZ/strings.xml index fd5cf930eb6f..517f4e9f75e8 100644 --- a/packages/Keyguard/res/values-kk-rKZ/strings.xml +++ b/packages/Keyguard/res/values-kk-rKZ/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK жұмысы орындалмады!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Код қабылданды!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Қызмет көрсетілмейді."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Енгізу әдісі түймесін ауыстыру."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Енгізу әдісін ауыстыру"</string> <string name="airplane_mode" msgid="3122107900897202805">"Ұшақ режимі"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Құрылғы қайта іске қосылғаннан кейін өрнекті енгізу қажет"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Құрылғы қайта іске қосылғаннан кейін PIN кодты енгізу қажет"</string> diff --git a/packages/Keyguard/res/values-km-rKH/strings.xml b/packages/Keyguard/res/values-km-rKH/strings.xml index 2da83707579d..6afeadff8528 100644 --- a/packages/Keyguard/res/values-km-rKH/strings.xml +++ b/packages/Keyguard/res/values-km-rKH/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"បានបរាជ័យក្នុងការប្រតិបត្តិលេខកូដ PUK ស៊ីម!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"បានទទួលយកលេខកូដ!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"គ្មានសេវា"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ប្ដូរប៊ូតុងវិធីសាស្ត្របញ្ចូល។"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"ប្ដូរវិធីសាស្ត្របញ្ចូល"</string> <string name="airplane_mode" msgid="3122107900897202805">"របៀបក្នុងយន្តហោះ"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"តម្រូវឲ្យប្រើលំនាំបន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"តម្រូវឲ្យបញ្ចូលកូដ PIN បន្ទាប់ពីឧបករណ៍ចាប់ផ្តើមឡើងវិញ"</string> diff --git a/packages/Keyguard/res/values-kn-rIN/strings.xml b/packages/Keyguard/res/values-kn-rIN/strings.xml index 31deb66e2745..7724ef740319 100644 --- a/packages/Keyguard/res/values-kn-rIN/strings.xml +++ b/packages/Keyguard/res/values-kn-rIN/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"ಸಿಮ್ PUK ಕಾರ್ಯಾಚರಣೆ ವಿಫಲಗೊಂಡಿದೆ!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"ಕೋಡ್ ಅಂಗೀಕೃತವಾಗಿದೆ!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"ಯಾವುದೇ ಸೇವೆಯಿಲ್ಲ."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ಇನ್ಪುಟ್ ವಿಧಾನ ಬದಲಿಸು ಬಟನ್."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"ಇನ್ಪುಟ್ ವಿಧಾನ ಬದಲಿಸಿ"</string> <string name="airplane_mode" msgid="3122107900897202805">"ಏರ್ಪ್ಲೇನ್ ಮೋಡ್"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಪ್ಯಾಟರ್ನ್ ಅಗತ್ಯವಿರುತ್ತದೆ"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"ಸಾಧನ ಮರುಪ್ರಾರಂಭಗೊಂಡ ನಂತರ ಪಿನ್ ಅಗತ್ಯವಿರುತ್ತದೆ"</string> diff --git a/packages/Keyguard/res/values-ko/strings.xml b/packages/Keyguard/res/values-ko/strings.xml index 67d6acba7e34..a4860ce27827 100644 --- a/packages/Keyguard/res/values-ko/strings.xml +++ b/packages/Keyguard/res/values-ko/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK 작업이 실패했습니다."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"코드 승인 완료"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"서비스 불가"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"입력 방법 버튼을 전환합니다."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"입력 방법 전환"</string> <string name="airplane_mode" msgid="3122107900897202805">"비행기 모드"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"기기가 다시 시작되면 패턴이 필요합니다."</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"기기가 다시 시작되면 PIN이 필요합니다."</string> diff --git a/packages/Keyguard/res/values-ky-rKG/strings.xml b/packages/Keyguard/res/values-ky-rKG/strings.xml index 5403c710891a..5089512261ac 100644 --- a/packages/Keyguard/res/values-ky-rKG/strings.xml +++ b/packages/Keyguard/res/values-ky-rKG/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM-картанын PUK-кодун ачуу кыйрады!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Код кабыл алынды!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Байланыш жок."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Киргизүү ыкмасын которуу баскычы."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Киргизүү ыкмасын которуу"</string> <string name="airplane_mode" msgid="3122107900897202805">"Учак режими"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Түзмөк кайра күйгүзүлгөндөн кийин графикалык ачкыч талап кылынат"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Түзмөк кайра күйгүзүлгөндөн кийин PIN код талап кылынат"</string> diff --git a/packages/Keyguard/res/values-lo-rLA/strings.xml b/packages/Keyguard/res/values-lo-rLA/strings.xml index e99b22d859c0..0c590087f5fc 100644 --- a/packages/Keyguard/res/values-lo-rLA/strings.xml +++ b/packages/Keyguard/res/values-lo-rLA/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"PUK ຂອງ SIM ເຮັດວຽກລົ້ມເຫຼວ!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"ລະຫັດຖືກຕອບຮັບແລ້ວ!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"ບໍ່ມີບໍລິການ"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ປຸ່ມສະລັບຮູບແບບການປ້ອນຂໍ້ມູນ."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"ສະລັບຮູບແບບການປ້ອນຂໍ້ມູນ"</string> <string name="airplane_mode" msgid="3122107900897202805">"ໂໝດໃນຍົນ"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"ຈຳເປັນຕ້ອງມີແບບຮູບ ຫຼັງຈາກອຸປະກອນເລີ່ມລະບົບໃໝ່"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"ຈຳເປັນຕ້ອງມີ PIN ຫຼັງຈາກອຸປະກອນເລີ່ມລະບົບໃໝ່"</string> diff --git a/packages/Keyguard/res/values-lt/strings.xml b/packages/Keyguard/res/values-lt/strings.xml index fd83ece8330b..109adfbc2da0 100644 --- a/packages/Keyguard/res/values-lt/strings.xml +++ b/packages/Keyguard/res/values-lt/strings.xml @@ -112,7 +112,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Nepavyko atlikti SIM kortelės PUK kodo operacijos."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kodas priimtas."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Nėra paslaugos."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Perjungti įvesties metodo mygtuką."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Perjungti įvesties metodą"</string> <string name="airplane_mode" msgid="3122107900897202805">"Lėktuvo režimas"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Iš naujo paleidus įrenginį būtinas atrakinimo piešinys"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Iš naujo paleidus įrenginį būtinas PIN kodas"</string> diff --git a/packages/Keyguard/res/values-lv/strings.xml b/packages/Keyguard/res/values-lv/strings.xml index 5a35912aff7c..bd349d7297d4 100644 --- a/packages/Keyguard/res/values-lv/strings.xml +++ b/packages/Keyguard/res/values-lv/strings.xml @@ -110,7 +110,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM kartes PUK koda ievadīšana neizdevās."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kods ir pieņemts!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Nav pakalpojuma."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Ievades metodes maiņas poga."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Pārslēgt ievades metodi"</string> <string name="airplane_mode" msgid="3122107900897202805">"Lidojuma režīms"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Pēc ierīces restartēšanas ir jāievada atbloķēšanas kombinācija."</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Pēc ierīces restartēšanas ir jāievada PIN kods."</string> diff --git a/packages/Keyguard/res/values-mk-rMK/strings.xml b/packages/Keyguard/res/values-mk-rMK/strings.xml index a1e224d7cdb3..8d110eeb3b08 100644 --- a/packages/Keyguard/res/values-mk-rMK/strings.xml +++ b/packages/Keyguard/res/values-mk-rMK/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"СИМ картичката не се отклучи со ПУК кодот!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Кодот е прифатен!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Нема услуга."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Копче за префрање метод на внес."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Префрли метод на внесување"</string> <string name="airplane_mode" msgid="3122107900897202805">"Режим на работа во авион"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Потребна е шема по рестартирање на уредот"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Потребен е ПИН-код по рестартирање на уредот"</string> diff --git a/packages/Keyguard/res/values-ml-rIN/strings.xml b/packages/Keyguard/res/values-ml-rIN/strings.xml index 3a898d82d2f6..3a0a1a9dd028 100644 --- a/packages/Keyguard/res/values-ml-rIN/strings.xml +++ b/packages/Keyguard/res/values-ml-rIN/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"സിം PUK പ്രവർത്തനം പരാജയപ്പെട്ടു!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"കോഡ് അംഗികരിച്ചു!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"സേവനമൊന്നുമില്ല."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ടൈപ്പുചെയ്യൽ രീതി ബട്ടൺ മാറുക."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"ഇൻപുട്ട് രീതി മാറുക"</string> <string name="airplane_mode" msgid="3122107900897202805">"ഫ്ലൈറ്റ് മോഡ്"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"ഉപകരണം പുനരാരംഭിച്ചതിന് ശേഷം പാറ്റേൺ ആവശ്യമാണ്"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"ഉപകരണം പുനരാരംഭിച്ചതിന് ശേഷം പിൻ ആവശ്യമാണ്"</string> diff --git a/packages/Keyguard/res/values-mn-rMN/strings.xml b/packages/Keyguard/res/values-mn-rMN/strings.xml index 410ec4b3be87..a93164a55d36 100644 --- a/packages/Keyguard/res/values-mn-rMN/strings.xml +++ b/packages/Keyguard/res/values-mn-rMN/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"СИМ ПҮК ажиллуулах амжилтгүй боллоо!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Код зөвшөөрөгдлөө!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Үйлчилгээ байхгүй."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Оруулах аргыг сэлгэх товч."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Оролтын аргыг солих"</string> <string name="airplane_mode" msgid="3122107900897202805">"Нислэгийн горим"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Төхөөрөмжийг дахин эхлүүлсний дараа зурган түгжээ оруулах шаардлагатай"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Төхөөрөмжийг дахин эхлүүлсний дараа PIN оруулах шаардлагатай"</string> diff --git a/packages/Keyguard/res/values-mr-rIN/strings.xml b/packages/Keyguard/res/values-mr-rIN/strings.xml index 0418a7b9ea32..e15c4b90341d 100644 --- a/packages/Keyguard/res/values-mr-rIN/strings.xml +++ b/packages/Keyguard/res/values-mr-rIN/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"सिम PUK कार्य अयशस्वी झाले!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"कोड स्वीकारला!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"सेवा नाही."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"इनपुट पद्धत स्विच करा बटण."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"इनपुट पद्धत स्विच करा"</string> <string name="airplane_mode" msgid="3122107900897202805">"विमान मोड"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"डिव्हाइस रीस्टार्ट झाल्यावर नमुना आवश्यक आहे"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"डिव्हाइस रीस्टार्ट झाल्यावर पिन आवश्यक आहे"</string> diff --git a/packages/Keyguard/res/values-ms-rMY/strings.xml b/packages/Keyguard/res/values-ms-rMY/strings.xml index e8c0bab80ac2..42a11ff4d3a4 100644 --- a/packages/Keyguard/res/values-ms-rMY/strings.xml +++ b/packages/Keyguard/res/values-ms-rMY/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Operasi PUK SIM gagal!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kod Diterima!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Tiada perkhidmatan."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Butang tukar kaedah input."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Tukar kaedah masukan"</string> <string name="airplane_mode" msgid="3122107900897202805">"Mod Pesawat"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Corak diperlukan setelah peranti dimulakan semula"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"PIN diperlukan setelah peranti dimulakan semula"</string> diff --git a/packages/Keyguard/res/values-my-rMM/strings.xml b/packages/Keyguard/res/values-my-rMM/strings.xml index 86c6e78c76bb..f384079f47d5 100644 --- a/packages/Keyguard/res/values-my-rMM/strings.xml +++ b/packages/Keyguard/res/values-my-rMM/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"ပင်နံပါတ် ပြန်ဖွင့်သည့် ကုဒ် လုပ်ဆောင်မှု မအောင်မြင်ပါ"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"ကုဒ်နံပါတ်ကို လက်ခံလိုက်ပါသည်"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"ဆားဗစ် မရှိပါ"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ထည့်သွင်းခြင်းခလုတ်အား ပြောင်းခြင်း"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"ထည့်သွင်းမှုနည်းလမ်းကို ပြောင်းလဲပါ"</string> <string name="airplane_mode" msgid="3122107900897202805">"လေယာဉ်ပေါ်သုံးစနစ်"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"ကိရိယာကို ပြန်ဖွင့်လျှင် ပုံစံ လိုအပ်ပါသည်"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"ကိရိယာကို ပြန်ဖွင့်လျှင် PIN လိုအပ်ပါသည်"</string> diff --git a/packages/Keyguard/res/values-nb/strings.xml b/packages/Keyguard/res/values-nb/strings.xml index a31c52cecb47..210ad18738fc 100644 --- a/packages/Keyguard/res/values-nb/strings.xml +++ b/packages/Keyguard/res/values-nb/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"PUK-koden for SIM-kortet ble avvist."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Koden er godkjent."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Ingen tjeneste."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Bytt knapp for inndatametode."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Bytt inndatametode"</string> <string name="airplane_mode" msgid="3122107900897202805">"Flymodus"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Du må tegne mønsteret etter at enheten har startet på nytt"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Du må skrive inn PIN-koden etter at enheten har startet på nytt"</string> diff --git a/packages/Keyguard/res/values-ne-rNP/strings.xml b/packages/Keyguard/res/values-ne-rNP/strings.xml index 5a3b7ec2f2b0..99d4ff0aa854 100644 --- a/packages/Keyguard/res/values-ne-rNP/strings.xml +++ b/packages/Keyguard/res/values-ne-rNP/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK राख्ने कार्य बिफल भयो!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"कोड स्वीकृत!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"कुनै सेवा छैन।"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"इनपुट विधि बटन स्विच गर्नुहोस्।"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"इनपुट विधिलाई स्विच गर्नुहोस्"</string> <string name="airplane_mode" msgid="3122107900897202805">"हवाइजहाज मोड"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"यन्त्र पुनः सुरू भएपछि ढाँचा आवश्यक"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"यन्त्र पुनः सुरू भएपछि PIN आवश्यक"</string> diff --git a/packages/Keyguard/res/values-nl/strings.xml b/packages/Keyguard/res/values-nl/strings.xml index 8ded2e8ac788..873a5235088c 100644 --- a/packages/Keyguard/res/values-nl/strings.xml +++ b/packages/Keyguard/res/values-nl/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Bewerking met pukcode voor simkaart is mislukt."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Code geaccepteerd."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Geen service"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Knop voor wijzigen invoermethode."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Invoermethode schakelen"</string> <string name="airplane_mode" msgid="3122107900897202805">"Vliegtuigmodus"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Patroon vereist nadat het apparaat opnieuw is opgestart"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Pincode vereist nadat het apparaat opnieuw is opgestart"</string> diff --git a/packages/Keyguard/res/values-pa-rIN/strings.xml b/packages/Keyguard/res/values-pa-rIN/strings.xml index e867df28df2f..54d10406fadc 100644 --- a/packages/Keyguard/res/values-pa-rIN/strings.xml +++ b/packages/Keyguard/res/values-pa-rIN/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK ਓਪਰੇਸ਼ਨ ਅਸਫਲ!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"ਕੋਡ ਸਵੀਕਾਰ ਕੀਤਾ ਗਿਆ!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"ਕੋਈ ਸੇਵਾ ਨਹੀਂ।"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ਇਨਪੁਟ ਵਿਧੀ ਬਟਨ ਸਵਿਚ ਕਰੋ।"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"ਇਨਪੁੱਟ ਵਿਧੀ ਸਵਿੱਚ ਕਰੋ"</string> <string name="airplane_mode" msgid="3122107900897202805">"ਏਅਰਪਲੇਨ ਮੋਡ"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਹੋਣ ਤੋਂ ਬਾਅਦ ਪੈਟਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"ਡੀਵਾਈਸ ਨੂੰ ਮੁੜ-ਚਾਲੂ ਹੋਣ ਤੋਂ ਬਾਅਦ PIN ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ"</string> diff --git a/packages/Keyguard/res/values-pl/strings.xml b/packages/Keyguard/res/values-pl/strings.xml index 3bd9caf08ce1..6a2e81aa95e0 100644 --- a/packages/Keyguard/res/values-pl/strings.xml +++ b/packages/Keyguard/res/values-pl/strings.xml @@ -112,7 +112,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Operacja z kodem PUK karty SIM nie udała się."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kod został zaakceptowany."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Brak usługi."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Przycisk przełączania metody wprowadzania."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Przełącz metodę wprowadzania"</string> <string name="airplane_mode" msgid="3122107900897202805">"Tryb samolotowy"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Po ponownym uruchomieniu urządzenia wymagany jest wzór"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Po ponownym uruchomieniu urządzenia wymagany jest kod PIN"</string> diff --git a/packages/Keyguard/res/values-pt-rBR/strings.xml b/packages/Keyguard/res/values-pt-rBR/strings.xml index 4f1afabc1fae..2d1a7036847e 100644 --- a/packages/Keyguard/res/values-pt-rBR/strings.xml +++ b/packages/Keyguard/res/values-pt-rBR/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Falha na operação de PUK do SIM."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Código aceito."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Sem serviço."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Alterar botão do método de entrada."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Alterar o método de entrada"</string> <string name="airplane_mode" msgid="3122107900897202805">"Modo avião"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"O padrão é exigido após a reinicialização do dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"O PIN é exigido após a reinicialização do dispositivo"</string> diff --git a/packages/Keyguard/res/values-pt-rPT/strings.xml b/packages/Keyguard/res/values-pt-rPT/strings.xml index 49c2f16d05fc..5a4973bfa95e 100644 --- a/packages/Keyguard/res/values-pt-rPT/strings.xml +++ b/packages/Keyguard/res/values-pt-rPT/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Falha ao introduzir o PUK do cartão SIM!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Código aceite!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Sem serviço."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Alternar botão de método de introdução."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Alternar o método de introdução."</string> <string name="airplane_mode" msgid="3122107900897202805">"Modo de avião"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"É necessário um padrão após reiniciar o dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"É necessário um PIN após reiniciar o dispositivo"</string> diff --git a/packages/Keyguard/res/values-pt/strings.xml b/packages/Keyguard/res/values-pt/strings.xml index 4f1afabc1fae..2d1a7036847e 100644 --- a/packages/Keyguard/res/values-pt/strings.xml +++ b/packages/Keyguard/res/values-pt/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Falha na operação de PUK do SIM."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Código aceito."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Sem serviço."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Alterar botão do método de entrada."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Alterar o método de entrada"</string> <string name="airplane_mode" msgid="3122107900897202805">"Modo avião"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"O padrão é exigido após a reinicialização do dispositivo"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"O PIN é exigido após a reinicialização do dispositivo"</string> diff --git a/packages/Keyguard/res/values-ro/strings.xml b/packages/Keyguard/res/values-ro/strings.xml index 439de3de733e..0a5d4fe68ba1 100644 --- a/packages/Keyguard/res/values-ro/strings.xml +++ b/packages/Keyguard/res/values-ro/strings.xml @@ -21,13 +21,13 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="app_name" msgid="719438068451601849">"Blocarea tastaturii"</string> - <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"Introduceţi codul PIN"</string> + <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"Introduceți codul PIN"</string> <string name="keyguard_password_enter_puk_code" msgid="3035856550289724338">"Introduceți codul PUK pentru cardul SIM și codul PIN nou"</string> <string name="keyguard_password_enter_puk_prompt" msgid="1801941051094974609">"Codul PUK pentru cardul SIM"</string> <string name="keyguard_password_enter_pin_prompt" msgid="3201151840570492538">"Codul PIN nou pentru cardul SIM"</string> - <string name="keyguard_password_entry_touch_hint" msgid="7858547464982981384"><font size="17">"Atingeți și introduceţi parola"</font></string> - <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"Introduceţi parola pentru a debloca"</string> - <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"Introduceţi codul PIN pentru a debloca"</string> + <string name="keyguard_password_entry_touch_hint" msgid="7858547464982981384"><font size="17">"Atingeți și introduceți parola"</font></string> + <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"Introduceți parola pentru a debloca"</string> + <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"Introduceți codul PIN pentru a debloca"</string> <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"Cod PIN incorect."</string> <string name="keyguard_charged" msgid="3272223906073492454">"Încărcată"</string> <string name="keyguard_plugged_in" msgid="9087497435553252863">"Se încarcă"</string> @@ -58,28 +58,28 @@ <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"Ștergeți"</string> <string name="keyboardview_keycode_enter" msgid="2985864015076059467">"Enter"</string> <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"Model uitat"</string> - <string name="kg_wrong_pattern" msgid="1850806070801358830">"Model greşit"</string> + <string name="kg_wrong_pattern" msgid="1850806070801358830">"Model greșit"</string> <string name="kg_wrong_password" msgid="2333281762128113157">"Parolă greșită"</string> - <string name="kg_wrong_pin" msgid="1131306510833563801">"Cod PIN greşit"</string> + <string name="kg_wrong_pin" msgid="1131306510833563801">"Cod PIN greșit"</string> <string name="kg_too_many_failed_attempts_countdown" msgid="6358110221603297548">"Încercați din nou peste <xliff:g id="NUMBER">%d</xliff:g> (de) secunde."</string> - <string name="kg_pattern_instructions" msgid="398978611683075868">"Desenaţi modelul"</string> - <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Introduceţi codul PIN al cardului SIM"</string> + <string name="kg_pattern_instructions" msgid="398978611683075868">"Desenați modelul"</string> + <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Introduceți codul PIN al cardului SIM"</string> <string name="kg_sim_pin_instructions_multi" msgid="7818515973197201434">"Introduceți codul PIN al cardului SIM pentru „<xliff:g id="CARRIER">%1$s</xliff:g>”"</string> - <string name="kg_pin_instructions" msgid="2377242233495111557">"Introduceţi codul PIN"</string> - <string name="kg_password_instructions" msgid="5753646556186936819">"Introduceţi parola"</string> - <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"Cardul SIM este acum dezactivat. Introduceţi codul PUK pentru a continua. Contactaţi operatorul pentru mai multe detalii."</string> + <string name="kg_pin_instructions" msgid="2377242233495111557">"Introduceți codul PIN"</string> + <string name="kg_password_instructions" msgid="5753646556186936819">"Introduceți parola"</string> + <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"Cardul SIM este acum dezactivat. Introduceți codul PUK pentru a continua. Contactați operatorul pentru mai multe detalii."</string> <string name="kg_puk_enter_puk_hint_multi" msgid="363822494559783025">"Cardul SIM „<xliff:g id="CARRIER">%1$s</xliff:g>” este acum dezactivat. Pentru a continua, introduceți codul PUK. Pentru detalii, contactați operatorul."</string> - <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Introduceţi codul PIN dorit"</string> + <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Introduceți codul PIN dorit"</string> <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Confirmați codul PIN dorit"</string> <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Se deblochează cardul SIM..."</string> - <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Introduceţi un cod PIN format din 4 până la 8 cifre."</string> + <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Introduceți un cod PIN format din 4 până la 8 cifre."</string> <string name="kg_invalid_sim_puk_hint" msgid="7553388325654369575">"Codul PUK trebuie să aibă minimum 8 cifre."</string> - <string name="kg_invalid_puk" msgid="3638289409676051243">"Reintroduceţi codul PUK corect. Încercările repetate vor dezactiva definitiv cardul SIM."</string> + <string name="kg_invalid_puk" msgid="3638289409676051243">"Reintroduceți codul PUK corect. Încercările repetate vor dezactiva definitiv cardul SIM."</string> <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"Codurile PIN nu coincid"</string> <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Prea multe încercări de desenare a modelului"</string> - <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Aţi introdus incorect codul PIN de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori.\n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> - <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Aţi introdus incorect parola de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> - <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> + <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"Ați introdus incorect codul PIN de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori.\n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> + <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"Ați introdus incorect parola de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> + <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. \n\nÎncercați din nou peste <xliff:g id="NUMBER_1">%2$d</xliff:g> (de) secunde."</string> <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="8774056606869646621">"Ați efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a tabletei. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, această tabletă va fi resetată, iar toate datele acesteia vor fi șterse."</string> <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="1843331751334128428">"Ați efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a telefonului. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, acest telefon va fi resetat, iar toate datele acestuia vor fi șterse."</string> <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="258925501999698032">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a tabletei. Această tabletă va fi resetată, iar toate datele acesteia vor fi șterse."</string> @@ -92,8 +92,8 @@ <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="6853071165802933545">"Ați efectuat <xliff:g id="NUMBER_0">%1$d</xliff:g> încercări incorecte de deblocare a telefonului. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, profilul de serviciu va fi eliminat, iar toate datele profilului vor fi șterse."</string> <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="4686386497449912146">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a tabletei. Profilul de serviciu va fi eliminat, iar toate datele profilului vor fi șterse."</string> <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="4951507352869831265">"Ați efectuat <xliff:g id="NUMBER">%d</xliff:g> încercări incorecte de deblocare a telefonului. Profilul de serviciu va fi eliminat, iar toate datele profilului vor fi șterse."</string> - <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocați tableta cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> - <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Aţi desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereuşite, vi se va solicita să deblocați telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> + <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați tableta cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> + <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"Ați desenat incorect modelul pentru deblocare de <xliff:g id="NUMBER_0">%1$d</xliff:g> ori. După încă <xliff:g id="NUMBER_1">%2$d</xliff:g> încercări nereușite, vi se va solicita să deblocați telefonul cu ajutorul unui cont de e-mail.\n\n Încercați din nou peste <xliff:g id="NUMBER_2">%3$d</xliff:g> (de) secunde."</string> <string name="kg_password_wrong_pin_code_pukked" msgid="30531039455764924">"Codul PIN pentru cardul SIM este incorect. Contactați operatorul pentru a vă debloca dispozitivul."</string> <plurals name="kg_password_wrong_pin_code" formatted="false" msgid="6721575017538162249"> <item quantity="few">Codul PIN pentru cardul SIM este incorect. V-au mai rămas <xliff:g id="NUMBER_1">%d</xliff:g> încercări.</item> @@ -110,7 +110,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Deblocarea cu ajutorul codului PUK pentru cardul SIM nu a reușit!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Cod acceptat!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Fără serviciu."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Buton pentru comutarea metodei de introducere."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Comutați metoda de introducere a textului"</string> <string name="airplane_mode" msgid="3122107900897202805">"Mod Avion"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Modelul este necesar după repornirea dispozitivului"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Codul PIN este necesar după repornirea dispozitivului"</string> diff --git a/packages/Keyguard/res/values-ru/strings.xml b/packages/Keyguard/res/values-ru/strings.xml index 2f0316606b47..d56263a189a3 100644 --- a/packages/Keyguard/res/values-ru/strings.xml +++ b/packages/Keyguard/res/values-ru/strings.xml @@ -112,7 +112,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Не удалось разблокировать SIM-карту"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Код принят"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Нет сигнала."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Кнопка переключения способа ввода."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Сменить способ ввода"</string> <string name="airplane_mode" msgid="3122107900897202805">"Режим полета"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"После перезагрузки устройства необходимо ввести графический ключ"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"После перезагрузки устройства необходимо ввести PIN-код"</string> diff --git a/packages/Keyguard/res/values-si-rLK/strings.xml b/packages/Keyguard/res/values-si-rLK/strings.xml index 82ef9148ac87..a0170fb5546c 100644 --- a/packages/Keyguard/res/values-si-rLK/strings.xml +++ b/packages/Keyguard/res/values-si-rLK/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK ක්රියාවලිය අපොහොසත් විය!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"කේතය පිළිගැණුනි!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"සේවාව නැත."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ආදාන ක්රමය මාරු කිරීමේ බොත්තම."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"ආදාන ක්රමය මාරු කිරීම"</string> <string name="airplane_mode" msgid="3122107900897202805">"ගුවන්යානා ප්රකාරය"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"උපාංගය නැවත ආරම්භ වූ පසු රටාව අවශ්යයි"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"උපාංගය නැවත ආරම්භ වූ පසු PIN අංකය අවශ්යයි"</string> diff --git a/packages/Keyguard/res/values-sk/strings.xml b/packages/Keyguard/res/values-sk/strings.xml index 72958ce68594..008a7b0d4d12 100644 --- a/packages/Keyguard/res/values-sk/strings.xml +++ b/packages/Keyguard/res/values-sk/strings.xml @@ -112,7 +112,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Operácia kódu PUK SIM karty zlyhala!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kód bol prijatý!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Žiadny signál"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Tlačidlo prepnutia metódy vstupu."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Prepnúť metódu vstupu"</string> <string name="airplane_mode" msgid="3122107900897202805">"Režim v lietadle"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Po reštartovaní zariadenia musíte zadať bezpečnostný vzor"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Po reštartovaní zariadenia musíte zadať kód PIN"</string> diff --git a/packages/Keyguard/res/values-sl/strings.xml b/packages/Keyguard/res/values-sl/strings.xml index 83a6e4911226..a7cd7ab429ce 100644 --- a/packages/Keyguard/res/values-sl/strings.xml +++ b/packages/Keyguard/res/values-sl/strings.xml @@ -112,7 +112,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Postopek za odklepanje s kodo PUK kartice SIM ni uspel."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Koda je sprejeta."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Ni storitve."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Gumb za preklop načina vnosa."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Preklop načina vnosa"</string> <string name="airplane_mode" msgid="3122107900897202805">"Način za letalo"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Po vnovičnem zagonu naprave je treba vnesti vzorec"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Po vnovičnem zagonu naprave je treba vnesti kodo PIN"</string> diff --git a/packages/Keyguard/res/values-sq-rAL/strings.xml b/packages/Keyguard/res/values-sq-rAL/strings.xml index 4cd269250d98..870f3bf30a2f 100644 --- a/packages/Keyguard/res/values-sq-rAL/strings.xml +++ b/packages/Keyguard/res/values-sq-rAL/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Operacioni i PUK-ut të kartës SIM dështoi!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kodi u pranua!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Nuk ka shërbim."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Butoni i metodës së ndërrimit të hyrjeve."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Ndërro metodën e hyrjes"</string> <string name="airplane_mode" msgid="3122107900897202805">"Modaliteti i aeroplanit"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Kërkohet motivi pas rinisjes së pajisjes"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Kërkohet kodi PIN pas rinisjes së pajisjes"</string> diff --git a/packages/Keyguard/res/values-sr/strings.xml b/packages/Keyguard/res/values-sr/strings.xml index fa6bc096ecf5..20f098eb1948 100644 --- a/packages/Keyguard/res/values-sr/strings.xml +++ b/packages/Keyguard/res/values-sr/strings.xml @@ -110,7 +110,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Радња са SIM PUK кодом није успела!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Кôд је прихваћен!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Офлајн сте."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Дугме Промени метод уноса."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Промени метод уноса"</string> <string name="airplane_mode" msgid="3122107900897202805">"Режим рада у авиону"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Треба да унесете шаблон када се уређај поново покрене"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Треба да унесете PIN када се уређај поново покрене"</string> diff --git a/packages/Keyguard/res/values-sv/strings.xml b/packages/Keyguard/res/values-sv/strings.xml index 10b599129998..a77d79ef0e87 100644 --- a/packages/Keyguard/res/values-sv/strings.xml +++ b/packages/Keyguard/res/values-sv/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Det gick inte att låsa upp med PUK-koden för SIM-kortet."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Koden godkändes!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Ingen tjänst."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Knapp för byte av inmatningsmetod."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Byt inmatningsmetod"</string> <string name="airplane_mode" msgid="3122107900897202805">"Flygplansläge"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Du måste ange grafiskt lösenord när du startat om enheten"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Du måste ange pinkod när du startat om enheten"</string> diff --git a/packages/Keyguard/res/values-sw/strings.xml b/packages/Keyguard/res/values-sw/strings.xml index 77eaf2a2aaed..8413dad26880 100644 --- a/packages/Keyguard/res/values-sw/strings.xml +++ b/packages/Keyguard/res/values-sw/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Utendakazi wa PUK ya SIM umeshindwa!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Msimbo Umekubaliwa!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Hakuna huduma."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Swichi kitufe cha mbinu ingizi."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Badilisha mbinu ya kuingiza data"</string> <string name="airplane_mode" msgid="3122107900897202805">"Hali ya ndegeni"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Mchoro unahitajika baada ya kuanzisha kifaa upya"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"PIN inahitajika baada ya kifaa kuanzishwa upya"</string> diff --git a/packages/Keyguard/res/values-ta-rIN/strings.xml b/packages/Keyguard/res/values-ta-rIN/strings.xml index 5ddad8cc9eb4..e43238f5eeda 100644 --- a/packages/Keyguard/res/values-ta-rIN/strings.xml +++ b/packages/Keyguard/res/values-ta-rIN/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"சிம் PUK செயல்பாடு தோல்வி!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"குறியீடு ஏற்கப்பட்டது!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"சேவை இல்லை."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"உள்ளீட்டு முறையை மாற்றும் பொத்தான்."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"உள்ளீட்டு முறையை மாற்று"</string> <string name="airplane_mode" msgid="3122107900897202805">"விமானப் பயன்முறை"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"சாதனத்தை மீண்டும் தொடங்கியதும் வடிவத்தை வரைய வேண்டும்"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"சாதனத்தை மீண்டும் தொடங்கியதும் பின்னை உள்ளிட வேண்டும்"</string> diff --git a/packages/Keyguard/res/values-te-rIN/strings.xml b/packages/Keyguard/res/values-te-rIN/strings.xml index e10490c46994..7c9b37dd3131 100644 --- a/packages/Keyguard/res/values-te-rIN/strings.xml +++ b/packages/Keyguard/res/values-te-rIN/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"సిమ్ PUK చర్య విఫలమైంది!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"కోడ్ ఆమోదించబడింది!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"సేవ లేదు."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ఇన్పుట్ పద్ధతి మార్చే బటన్."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"ఇన్పుట్ పద్ధతిని మారుస్తుంది"</string> <string name="airplane_mode" msgid="3122107900897202805">"ఎయిర్ప్లైన్ మోడ్"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"పరికరాన్ని పునఃప్రారంభించిన తర్వాత నమూనా నమోదు చేయడం ఆవశ్యకం"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"పరికరాన్ని పునఃప్రారంభించిన తర్వాత PIN నమోదు చేయడం ఆవశ్యకం"</string> diff --git a/packages/Keyguard/res/values-th/strings.xml b/packages/Keyguard/res/values-th/strings.xml index d3fe71e245a8..00c920c12fc3 100644 --- a/packages/Keyguard/res/values-th/strings.xml +++ b/packages/Keyguard/res/values-th/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"การปลดล็อกด้วย PUK ของซิมล้มเหลว!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"รหัสได้รับการยอมรับ!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"ไม่มีบริการ"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"ปุ่มสลับวิธีการป้อนข้อมูล"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"สลับวิธีการป้อนข้อมูล"</string> <string name="airplane_mode" msgid="3122107900897202805">"โหมดบนเครื่องบิน"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"ต้องใช้รูปแบบหลังจากอุปกรณ์รีสตาร์ท"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"ต้องระบุ PIN หลังจากอุปกรณ์รีสตาร์ท"</string> diff --git a/packages/Keyguard/res/values-tl/strings.xml b/packages/Keyguard/res/values-tl/strings.xml index 6e6adeced86d..2e428530b4fb 100644 --- a/packages/Keyguard/res/values-tl/strings.xml +++ b/packages/Keyguard/res/values-tl/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Nabigo ang operasyon ng SIM PUK!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Tinanggap ang Code!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Walang serbisyo."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Ilipat ang button na pamamaraan ng pag-input."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Magpalit ng pamamaraan ng pag-input"</string> <string name="airplane_mode" msgid="3122107900897202805">"Airplane mode"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Kinakailangan ang pattern pagkatapos mag-restart ng device"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Kinakailangan ang PIN pagkatapos mag-restart ng device"</string> diff --git a/packages/Keyguard/res/values-tr/strings.xml b/packages/Keyguard/res/values-tr/strings.xml index 46c3d008b5a1..484505ac5588 100644 --- a/packages/Keyguard/res/values-tr/strings.xml +++ b/packages/Keyguard/res/values-tr/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK işlemi başarısız oldu!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kod Kabul Edildi!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Hizmet yok."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Giriş yöntemini değiştirme düğmesi."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Giriş yöntemini değiştir"</string> <string name="airplane_mode" msgid="3122107900897202805">"Uçak modu"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Cihaz yeniden başladıktan sonra desen gerekir"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Cihaz yeniden başladıktan sonra PIN gerekir"</string> diff --git a/packages/Keyguard/res/values-uk/strings.xml b/packages/Keyguard/res/values-uk/strings.xml index c1b742e7f689..c137bf09227c 100644 --- a/packages/Keyguard/res/values-uk/strings.xml +++ b/packages/Keyguard/res/values-uk/strings.xml @@ -112,7 +112,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Помилка введення PUK-коду SIM-карти."</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Код прийнято."</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Зв’язку немає."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Кнопка перемикання методу введення."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Змінити метод введення"</string> <string name="airplane_mode" msgid="3122107900897202805">"Режим польоту"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Після перезавантаження пристрою потрібно ввести ключ"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Після перезавантаження пристрою потрібно ввести PIN-код"</string> diff --git a/packages/Keyguard/res/values-ur-rPK/strings.xml b/packages/Keyguard/res/values-ur-rPK/strings.xml index 48986e6f2bf5..d131c34dff02 100644 --- a/packages/Keyguard/res/values-ur-rPK/strings.xml +++ b/packages/Keyguard/res/values-ur-rPK/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK کارروائی ناکام ہو گئی!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"کوڈ قبول کر لیا گیا!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"کوئی سروس نہیں ہے۔"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"اندراج کا طریقہ سوئچ کرنے کا بٹن۔"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"اندراج کا طریقہ سوئچ کریں"</string> <string name="airplane_mode" msgid="3122107900897202805">"ہوائی جہاز وضع"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"آلہ دوبارہ چالو ہونے کے بعد پیٹرن درکار ہوتا ہے"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"آلہ دوبارہ چالو ہونے کے بعد PIN درکار ہوتا ہے"</string> diff --git a/packages/Keyguard/res/values-uz-rUZ/strings.xml b/packages/Keyguard/res/values-uz-rUZ/strings.xml index 7e9f50468158..d1e29411b62b 100644 --- a/packages/Keyguard/res/values-uz-rUZ/strings.xml +++ b/packages/Keyguard/res/values-uz-rUZ/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM karta PUK jarayoni amalga oshmadi!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Kod qabul qilindi!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Aloqa yo‘q."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Kiritish uslubi tugmasini almashtirish."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Matn kiritish usulini o‘zgartirish"</string> <string name="airplane_mode" msgid="3122107900897202805">"Parvoz rejimi"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Qurilma o‘chirib yoqilgandan so‘ng chizmali kalit talab qilinadi"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Qurilma o‘chirib yoqilgandan so‘ng PIN kod talab qilinadi"</string> diff --git a/packages/Keyguard/res/values-vi/strings.xml b/packages/Keyguard/res/values-vi/strings.xml index 6f8110165ae2..4203c946215a 100644 --- a/packages/Keyguard/res/values-vi/strings.xml +++ b/packages/Keyguard/res/values-vi/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Thao tác mã PUK của SIM không thành công!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Mã được chấp nhận!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Không có dịch vụ."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Nút chuyển phương thức nhập."</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Chuyển phương thức nhập"</string> <string name="airplane_mode" msgid="3122107900897202805">"Chế độ trên máy bay"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Yêu cầu hình mở khóa sau khi thiết bị khởi động lại"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Yêu cầu mã PIN sau khi thiết bị khởi động lại"</string> diff --git a/packages/Keyguard/res/values-zh-rCN/strings.xml b/packages/Keyguard/res/values-zh-rCN/strings.xml index 2c86a7ab0cd3..81666fe76214 100644 --- a/packages/Keyguard/res/values-zh-rCN/strings.xml +++ b/packages/Keyguard/res/values-zh-rCN/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM卡PUK码操作失败！"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"代码正确！"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"无服务。"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"输入法切换按钮。"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"输入法切换按钮。"</string> <string name="airplane_mode" msgid="3122107900897202805">"飞行模式"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"重启设备后需要绘制解锁图案"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"重启设备后需要输入 PIN 码"</string> diff --git a/packages/Keyguard/res/values-zh-rHK/strings.xml b/packages/Keyguard/res/values-zh-rHK/strings.xml index f21dbca6c7f9..e9d120879d31 100644 --- a/packages/Keyguard/res/values-zh-rHK/strings.xml +++ b/packages/Keyguard/res/values-zh-rHK/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM PUK 碼操作失敗！"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"密碼正確！"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"沒有服務。"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"切換輸入法按鈕。"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"切換輸入法"</string> <string name="airplane_mode" msgid="3122107900897202805">"飛航模式"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"裝置重新啟動後，需要解除上鎖圖案才能使用"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"裝置重新啟動後，需要輸入 PIN 才能使用"</string> diff --git a/packages/Keyguard/res/values-zh-rTW/strings.xml b/packages/Keyguard/res/values-zh-rTW/strings.xml index 0cb4b16b08fc..36cf9dea161a 100644 --- a/packages/Keyguard/res/values-zh-rTW/strings.xml +++ b/packages/Keyguard/res/values-zh-rTW/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"SIM 卡 PUK 碼操作失敗！"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"密碼正確！"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"沒有服務。"</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"切換輸入法按鈕。"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"切換輸入法"</string> <string name="airplane_mode" msgid="3122107900897202805">"飛航模式"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"裝置重新啟動後需要畫出解鎖圖案"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"裝置重新啟動後需要輸入 PIN 碼"</string> diff --git a/packages/Keyguard/res/values-zu/strings.xml b/packages/Keyguard/res/values-zu/strings.xml index 9e17dba5dfed..68086b2b9706 100644 --- a/packages/Keyguard/res/values-zu/strings.xml +++ b/packages/Keyguard/res/values-zu/strings.xml @@ -108,7 +108,7 @@ <string name="kg_password_puk_failed" msgid="2838824369502455984">"Umsebenzi we-PUK ye-SIM wehlulekile!"</string> <string name="kg_pin_accepted" msgid="1448241673570020097">"Ikhodi yamukelwe!"</string> <string name="keyguard_carrier_default" msgid="8700650403054042153">"Ayikho isevisi."</string> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">"Vula indlela yokungena yenkinobho"</string> + <string name="accessibility_ime_switch_button" msgid="2829803408288433429">"Shintsha indlela yokufaka"</string> <string name="airplane_mode" msgid="3122107900897202805">"Isimo sendiza"</string> <string name="kg_prompt_reason_restart_pattern" msgid="5519822969283306009">"Iphethini iyadingeka ngemuva kokuqala kabusha kwedivayisi"</string> <string name="kg_prompt_reason_restart_pin" msgid="4411398237158448198">"Iphinikhodi iyadingeka ngemuva kokuqala kabusha kwedivayisi"</string> diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml index 746457fa4e7b..61966b2ee1a4 100644 --- a/packages/Keyguard/res/values/strings.xml +++ b/packages/Keyguard/res/values/strings.xml @@ -302,7 +302,7 @@ <string name="keyguard_carrier_default">No service.</string> <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> - <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Switch input method button.</string> + <string name="accessibility_ime_switch_button" msgid="5032926134740456424">Switch input method</string> <!-- Description of airplane mode --> <string name="airplane_mode">Airplane mode</string> diff --git a/packages/MtpDocumentsProvider/Android.mk b/packages/MtpDocumentsProvider/Android.mk index b31b0b13ec07..0f945ee8a5e1 100644 --- a/packages/MtpDocumentsProvider/Android.mk +++ b/packages/MtpDocumentsProvider/Android.mk @@ -9,5 +9,10 @@ LOCAL_PRIVILEGED_MODULE := true LOCAL_JNI_SHARED_LIBRARIES := libappfuse_jni LOCAL_PROGUARD_FLAG_FILES := proguard.flags +# Only enable asserts on userdebug/eng builds +ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) +LOCAL_JACK_FLAGS += -D jack.assert.policy=enable +endif + include $(BUILD_PACKAGE) include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/packages/MtpDocumentsProvider/AndroidManifest.xml b/packages/MtpDocumentsProvider/AndroidManifest.xml index 2dd49ab0782f..843b313db6b1 100644 --- a/packages/MtpDocumentsProvider/AndroidManifest.xml +++ b/packages/MtpDocumentsProvider/AndroidManifest.xml @@ -15,10 +15,12 @@ <action android:name="android.content.action.DOCUMENTS_PROVIDER" /> </intent-filter> </provider> - + <service android:name=".MtpDocumentsService" /> <activity android:name=".ReceiverActivity" + android:label="@string/downloads_app_label" + android:icon="@mipmap/ic_launcher_download" android:theme="@android:style/Theme.NoDisplay" android:screenOrientation="locked" android:excludeFromRecents="true"> diff --git a/packages/MtpDocumentsProvider/res/mipmap-hdpi/ic_launcher_download.png b/packages/MtpDocumentsProvider/res/mipmap-hdpi/ic_launcher_download.png Binary files differnew file mode 100644 index 000000000000..f958bbd3c255 --- /dev/null +++ b/packages/MtpDocumentsProvider/res/mipmap-hdpi/ic_launcher_download.png diff --git a/packages/MtpDocumentsProvider/res/mipmap-mdpi/ic_launcher_download.png b/packages/MtpDocumentsProvider/res/mipmap-mdpi/ic_launcher_download.png Binary files differnew file mode 100644 index 000000000000..f2e937663c2c --- /dev/null +++ b/packages/MtpDocumentsProvider/res/mipmap-mdpi/ic_launcher_download.png diff --git a/packages/MtpDocumentsProvider/res/mipmap-xhdpi/ic_launcher_download.png b/packages/MtpDocumentsProvider/res/mipmap-xhdpi/ic_launcher_download.png Binary files differnew file mode 100644 index 000000000000..4dc533638757 --- /dev/null +++ b/packages/MtpDocumentsProvider/res/mipmap-xhdpi/ic_launcher_download.png diff --git a/packages/MtpDocumentsProvider/res/mipmap-xxhdpi/ic_launcher_download.png b/packages/MtpDocumentsProvider/res/mipmap-xxhdpi/ic_launcher_download.png Binary files differnew file mode 100644 index 000000000000..8716290969da --- /dev/null +++ b/packages/MtpDocumentsProvider/res/mipmap-xxhdpi/ic_launcher_download.png diff --git a/packages/MtpDocumentsProvider/res/mipmap-xxxhdpi/ic_launcher_download.png b/packages/MtpDocumentsProvider/res/mipmap-xxxhdpi/ic_launcher_download.png Binary files differnew file mode 100644 index 000000000000..f5be21991761 --- /dev/null +++ b/packages/MtpDocumentsProvider/res/mipmap-xxxhdpi/ic_launcher_download.png diff --git a/packages/MtpDocumentsProvider/res/values/strings.xml b/packages/MtpDocumentsProvider/res/values/strings.xml index f3a3fcf0563c..0c1ec509688f 100644 --- a/packages/MtpDocumentsProvider/res/values/strings.xml +++ b/packages/MtpDocumentsProvider/res/values/strings.xml @@ -15,8 +15,10 @@ --> <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- Title of the external storage application [CHAR LIMIT=32] --> - <string name="app_label">Files</string> + <!-- App title of MtpDocumentsProvider [CHAR LIMIT=32] --> + <string name="app_label">MTP Host</string> + <!-- App title of DocumentsUI [CHAR LIMIT=32] --> + <string name="downloads_app_label">Downloads</string> <!-- Name of MTP root shown in UI. Please align the two strings (device model and storage name) in proper order in the language. [CHAR LIMIT=32] --> diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/DocumentLoader.java b/packages/MtpDocumentsProvider/src/com/android/mtp/DocumentLoader.java index 0705214b6abd..68f426fa6176 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/DocumentLoader.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/DocumentLoader.java @@ -69,7 +69,8 @@ class DocumentLoader implements AutoCloseable { */ synchronized Cursor queryChildDocuments(String[] columnNames, Identifier parent) throws IOException { - Preconditions.checkArgument(parent.mDeviceId == mDevice.deviceId); + assert parent.mDeviceId == mDevice.deviceId; + LoaderTask task = mTaskList.findTask(parent); if (task == null) { if (parent.mDocumentId == null) { @@ -81,11 +82,9 @@ class DocumentLoader implements AutoCloseable { // 3. startAddingChildDocuemnts. // 4. stopAddingChildDocuments - It removes the new document added at the step 2, // because it is not updated between start/stopAddingChildDocuments. - task = LoaderTask.create(mDatabase, mMtpManager, mDevice.operationsSupported, parent); - task.fillDocuments(loadDocuments( - mMtpManager, - parent.mDeviceId, - task.getUnloadedObjectHandles(NUM_INITIAL_ENTRIES))); + task = new LoaderTask(mMtpManager, mDatabase, mDevice.operationsSupported, parent); + task.loadObjectHandles(); + task.loadObjectInfoList(NUM_INITIAL_ENTRIES); } else { // Once remove the existing task in order to add it to the head of the list. mTaskList.remove(task); @@ -130,15 +129,11 @@ class DocumentLoader implements AutoCloseable { Preconditions.checkState(existingTask.getState() != LoaderTask.STATE_LOADING); mTaskList.remove(existingTask); } - try { - final LoaderTask newTask = LoaderTask.create( - mDatabase, mMtpManager, mDevice.operationsSupported, identifier); - mTaskList.addFirst(newTask); - return newTask; - } catch (IOException exception) { - Log.e(MtpDocumentsProvider.TAG, "Failed to create a task for mapping", exception); - // Continue to release the background thread. - } + final LoaderTask newTask = new LoaderTask( + mMtpManager, mDatabase, mDevice.operationsSupported, identifier); + newTask.loadObjectHandles(); + mTaskList.addFirst(newTask); + return newTask; } mBackgroundThread = null; @@ -170,24 +165,6 @@ class DocumentLoader implements AutoCloseable { } /** - * Helper method to loads multiple object info. - */ - private static MtpObjectInfo[] loadDocuments(MtpManager manager, int deviceId, int[] handles) - throws IOException { - final ArrayList<MtpObjectInfo> objects = new ArrayList<>(); - for (int i = 0; i < handles.length; i++) { - final MtpObjectInfo info = manager.getObjectInfo(deviceId, handles[i]); - if (info == null) { - Log.e(MtpDocumentsProvider.TAG, - "Failed to obtain object info handle=" + handles[i]); - continue; - } - objects.add(info); - } - return objects.toArray(new MtpObjectInfo[objects.size()]); - } - - /** * Background thread to fetch object info. */ private class BackgroundLoaderThread extends Thread { @@ -203,21 +180,13 @@ class DocumentLoader implements AutoCloseable { if (task == null) { return; } - try { - final MtpObjectInfo[] objectInfos = loadDocuments( - mMtpManager, - task.mIdentifier.mDeviceId, - task.getUnloadedObjectHandles(NUM_LOADING_ENTRIES)); - task.fillDocuments(objectInfos); - final boolean shouldNotify = - task.mLastNotified.getTime() < - new Date().getTime() - NOTIFY_PERIOD_MS || - task.getState() != LoaderTask.STATE_LOADING; - if (shouldNotify) { - task.notify(mResolver); - } - } catch (IOException exception) { - task.setError(exception); + task.loadObjectInfoList(NUM_LOADING_ENTRIES); + final boolean shouldNotify = + task.mLastNotified.getTime() < + new Date().getTime() - NOTIFY_PERIOD_MS || + task.getState() != LoaderTask.STATE_LOADING; + if (shouldNotify) { + task.notify(mResolver); } } } @@ -271,43 +240,67 @@ class DocumentLoader implements AutoCloseable { * Each task is responsible for fetching child documents for the given parent document. */ private static class LoaderTask { - static final int STATE_LOADING = 0; - static final int STATE_COMPLETED = 1; - static final int STATE_ERROR = 2; + static final int STATE_START = 0; + static final int STATE_LOADING = 1; + static final int STATE_COMPLETED = 2; + static final int STATE_ERROR = 3; + final MtpManager mManager; final MtpDatabase mDatabase; final int[] mOperationsSupported; final Identifier mIdentifier; - final int[] mObjectHandles; + int[] mObjectHandles; + int mState; Date mLastNotified; - int mNumLoaded; - Exception mError; - - LoaderTask(MtpDatabase database, int[] operationsSupported, Identifier identifier, - int[] objectHandles) { - Preconditions.checkNotNull(operationsSupported); - Preconditions.checkNotNull(objectHandles); + int mPosition; + IOException mError; + + LoaderTask(MtpManager manager, MtpDatabase database, int[] operationsSupported, + Identifier identifier) { + assert operationsSupported != null; + assert identifier.mDocumentType != MtpDatabaseConstants.DOCUMENT_TYPE_DEVICE; + mManager = manager; mDatabase = database; mOperationsSupported = operationsSupported; mIdentifier = identifier; - mObjectHandles = objectHandles; - mNumLoaded = 0; + mObjectHandles = null; + mState = STATE_START; + mPosition = 0; mLastNotified = new Date(); } + synchronized void loadObjectHandles() { + assert mState == STATE_START; + int parentHandle = mIdentifier.mObjectHandle; + // Need to pass the special value MtpManager.OBJECT_HANDLE_ROOT_CHILDREN to + // getObjectHandles if we would like to obtain children under the root. + if (mIdentifier.mDocumentType == MtpDatabaseConstants.DOCUMENT_TYPE_STORAGE) { + parentHandle = MtpManager.OBJECT_HANDLE_ROOT_CHILDREN; + } + try { + mObjectHandles = mManager.getObjectHandles( + mIdentifier.mDeviceId, mIdentifier.mStorageId, parentHandle); + mState = STATE_LOADING; + } catch (IOException error) { + mError = error; + mState = STATE_ERROR; + } + } + /** * Returns a cursor that traverses the child document of the parent document handled by the * task. * The returned task may have a EXTRA_LOADING flag. */ - Cursor createCursor(ContentResolver resolver, String[] columnNames) throws IOException { + synchronized Cursor createCursor(ContentResolver resolver, String[] columnNames) + throws IOException { final Bundle extras = new Bundle(); switch (getState()) { case STATE_LOADING: extras.putBoolean(DocumentsContract.EXTRA_LOADING, true); break; case STATE_ERROR: - throw new IOException(mError); + throw mError; } final Cursor cursor = @@ -319,26 +312,67 @@ class DocumentLoader implements AutoCloseable { } /** - * Returns a state of the task. + * Stores object information into database. */ - int getState() { - if (mError != null) { - return STATE_ERROR; - } else if (mNumLoaded == mObjectHandles.length) { - return STATE_COMPLETED; - } else { - return STATE_LOADING; + void loadObjectInfoList(int count) { + synchronized (this) { + if (mState != STATE_LOADING) { + return; + } + if (mPosition == 0) { + try{ + mDatabase.getMapper().startAddingDocuments(mIdentifier.mDocumentId); + } catch (FileNotFoundException error) { + mError = error; + mState = STATE_ERROR; + return; + } + } + } + final ArrayList<MtpObjectInfo> infoList = new ArrayList<>(); + for (int chunkEnd = mPosition + count; + mPosition < mObjectHandles.length && mPosition < chunkEnd; + mPosition++) { + try { + infoList.add(mManager.getObjectInfo( + mIdentifier.mDeviceId, mObjectHandles[mPosition])); + } catch (IOException error) { + Log.e(MtpDocumentsProvider.TAG, "Failed to load object info", error); + } + } + synchronized (this) { + try { + mDatabase.getMapper().putChildDocuments( + mIdentifier.mDeviceId, + mIdentifier.mDocumentId, + mOperationsSupported, + infoList.toArray(new MtpObjectInfo[infoList.size()])); + } catch (FileNotFoundException error) { + // Looks like the parent document information is removed. + // Adding documents has already cancelled in Mapper so we don't need to invoke + // stopAddingDocuments. + mError = error; + mState = STATE_ERROR; + return; + } + if (mPosition >= mObjectHandles.length) { + try{ + mDatabase.getMapper().stopAddingDocuments(mIdentifier.mDocumentId); + mState = STATE_COMPLETED; + } catch (FileNotFoundException error) { + mError = error; + mState = STATE_ERROR; + return; + } + } } } /** - * Obtains object handles that have not been loaded yet. + * Returns a state of the task. */ - int[] getUnloadedObjectHandles(int count) { - return Arrays.copyOfRange( - mObjectHandles, - mNumLoaded, - Math.min(mNumLoaded + count, mObjectHandles.length)); + int getState() { + return mState; } /** @@ -349,69 +383,9 @@ class DocumentLoader implements AutoCloseable { mLastNotified = new Date(); } - /** - * Stores object information into database. - */ - void fillDocuments(MtpObjectInfo[] objectInfoList) { - if (objectInfoList.length == 0 || getState() != STATE_LOADING) { - return; - } - try{ - if (mNumLoaded == 0) { - mDatabase.getMapper().startAddingDocuments(mIdentifier.mDocumentId); - } - mDatabase.getMapper().putChildDocuments( - mIdentifier.mDeviceId, mIdentifier.mDocumentId, mOperationsSupported, - objectInfoList); - mNumLoaded += objectInfoList.length; - if (getState() != STATE_LOADING) { - mDatabase.getMapper().stopAddingDocuments(mIdentifier.mDocumentId); - } - } catch (FileNotFoundException exception) { - setErrorInternal(exception); - } - } - - /** - * Marks the loading task as error. - */ - void setError(Exception error) { - final int lastState = getState(); - setErrorInternal(error); - if (lastState == STATE_LOADING) { - try { - mDatabase.getMapper().stopAddingDocuments(mIdentifier.mDocumentId); - } catch (FileNotFoundException exception) { - setErrorInternal(exception); - } - } - } - - private void setErrorInternal(Exception error) { - Log.e(MtpDocumentsProvider.TAG, "Error in DocumentLoader thread", error); - mError = error; - mNumLoaded = 0; - } - private Uri createUri() { return DocumentsContract.buildChildDocumentsUri( MtpDocumentsProvider.AUTHORITY, mIdentifier.mDocumentId); } - - /** - * Creates a LoaderTask that loads children of the given document. - */ - static LoaderTask create(MtpDatabase database, MtpManager manager, - int[] operationsSupported, Identifier parent) - throws IOException { - int parentHandle = parent.mObjectHandle; - // Need to pass the special value MtpManager.OBJECT_HANDLE_ROOT_CHILDREN to - // getObjectHandles if we would like to obtain children under the root. - if (parent.mDocumentType == MtpDatabaseConstants.DOCUMENT_TYPE_STORAGE) { - parentHandle = MtpManager.OBJECT_HANDLE_ROOT_CHILDREN; - } - return new LoaderTask(database, operationsSupported, parent, manager.getObjectHandles( - parent.mDeviceId, parent.mStorageId, parentHandle)); - } } } diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java index 8c73211cccf1..4564018f5760 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDatabase.java @@ -617,6 +617,7 @@ class MtpDatabase { final String whereClosure = "parent." + COLUMN_DEVICE_ID + " = ? AND " + "parent." + COLUMN_ROW_STATE + " IN (?, ?) AND " + + "parent." + COLUMN_DOCUMENT_TYPE + " != ? AND " + "child." + COLUMN_ROW_STATE + " = ?"; try (final Cursor cursor = mDatabase.query( fromClosure, @@ -626,7 +627,7 @@ class MtpDatabase { "parent." + Document.COLUMN_DOCUMENT_ID, "parent." + COLUMN_DOCUMENT_TYPE), whereClosure, - strings(deviceId, ROW_STATE_VALID, ROW_STATE_INVALIDATED, + strings(deviceId, ROW_STATE_VALID, ROW_STATE_INVALIDATED, DOCUMENT_TYPE_DEVICE, ROW_STATE_DISCONNECTED), null, null, @@ -750,7 +751,12 @@ class MtpDatabase { values.putNull(Document.COLUMN_SUMMARY); values.putNull(Document.COLUMN_LAST_MODIFIED); values.put(Document.COLUMN_ICON, R.drawable.ic_root_mtp); - values.put(Document.COLUMN_FLAGS, 0); + values.put(Document.COLUMN_FLAGS, getDocumentFlags( + device.operationsSupported, + Document.MIME_TYPE_DIR, + 0, + MtpConstants.PROTECTION_STATUS_NONE, + DOCUMENT_TYPE_DEVICE)); values.putNull(Document.COLUMN_SIZE); extraValues.clear(); @@ -765,7 +771,7 @@ class MtpDatabase { * @param values {@link ContentValues} that receives values. * @param extraValues {@link ContentValues} that receives extra values for roots. * @param parentDocumentId Parent document ID. - * @param supportedOperations Array of Operation code supported by the device. + * @param operationsSupported Array of Operation code supported by the device. * @param root Root to be converted {@link ContentValues}. */ static void getStorageDocumentValues( @@ -786,7 +792,12 @@ class MtpDatabase { values.putNull(Document.COLUMN_SUMMARY); values.putNull(Document.COLUMN_LAST_MODIFIED); values.put(Document.COLUMN_ICON, R.drawable.ic_root_mtp); - values.put(Document.COLUMN_FLAGS, 0); + values.put(Document.COLUMN_FLAGS, getDocumentFlags( + operationsSupported, + Document.MIME_TYPE_DIR, + 0, + MtpConstants.PROTECTION_STATUS_NONE, + DOCUMENT_TYPE_STORAGE)); values.put(Document.COLUMN_SIZE, root.mMaxCapacity - root.mFreeSpace); extraValues.put(Root.COLUMN_FLAGS, getRootFlags(operationsSupported)); @@ -803,8 +814,8 @@ class MtpDatabase { * @param info MTP object info. */ static void getObjectDocumentValues( - ContentValues values, int deviceId, String parentId, int[] operationsSupported, - MtpObjectInfo info) { + ContentValues values, int deviceId, String parentId, + int[] operationsSupported, MtpObjectInfo info) { values.clear(); final String mimeType = getMimeType(info); values.put(COLUMN_DEVICE_ID, deviceId); @@ -822,7 +833,7 @@ class MtpDatabase { values.putNull(Document.COLUMN_ICON); values.put(Document.COLUMN_FLAGS, getDocumentFlags( operationsSupported, mimeType, info.getThumbCompressedSizeLong(), - info.getProtectionStatus())); + info.getProtectionStatus(), DOCUMENT_TYPE_OBJECT)); values.put(Document.COLUMN_SIZE, info.getCompressedSizeLong()); } @@ -861,16 +872,19 @@ class MtpDatabase { } private static int getDocumentFlags( - int[] operationsSupported, String mimeType, long thumbnailSize, int protectionState) { + @Nullable int[] operationsSupported, String mimeType, long thumbnailSize, + int protectionState, @DocumentType int documentType) { int flag = 0; - if (MtpDeviceRecord.isWritingSupported(operationsSupported) && + if (!mimeType.equals(Document.MIME_TYPE_DIR) && + MtpDeviceRecord.isWritingSupported(operationsSupported) && protectionState == MtpConstants.PROTECTION_STATUS_NONE) { flag |= Document.FLAG_SUPPORTS_WRITE; } if (MtpDeviceRecord.isSupported( operationsSupported, MtpConstants.OPERATION_DELETE_OBJECT) && (protectionState == MtpConstants.PROTECTION_STATUS_NONE || - protectionState == MtpConstants.PROTECTION_STATUS_NON_TRANSFERABLE_DATA)) { + protectionState == MtpConstants.PROTECTION_STATUS_NON_TRANSFERABLE_DATA) && + documentType == DOCUMENT_TYPE_OBJECT) { flag |= Document.FLAG_SUPPORTS_DELETE; } if (mimeType.equals(Document.MIME_TYPE_DIR) && diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java index 68c19923ccb5..cf5bee5d727d 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpDocumentsProvider.java @@ -360,8 +360,12 @@ public class MtpDocumentsProvider extends DocumentsProvider { if (i == 0) { infoUniqueName = info; } else { - infoUniqueName = new MtpObjectInfo.Builder(info).setName( - baseName + " (" + i + ")." + extension).build(); + String suffixedName = baseName + " (" + i + " )"; + if (!extension.isEmpty()) { + suffixedName += "." + extension; + } + infoUniqueName = + new MtpObjectInfo.Builder(info).setName(suffixedName).build(); } try { objectHandle = mMtpManager.createDocument( diff --git a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java index 6fb2a786be80..0599b701a3b6 100644 --- a/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java +++ b/packages/MtpDocumentsProvider/src/com/android/mtp/MtpManager.java @@ -130,11 +130,14 @@ class MtpManager { return devices.toArray(new MtpDeviceRecord[devices.size()]); } - MtpObjectInfo getObjectInfo(int deviceId, int objectHandle) - throws IOException { + MtpObjectInfo getObjectInfo(int deviceId, int objectHandle) throws IOException { final MtpDevice device = getDevice(deviceId); synchronized (device) { - return device.getObjectInfo(objectHandle); + final MtpObjectInfo info = device.getObjectInfo(objectHandle); + if (info == null) { + throw new IOException("Failed to get object info: " + objectHandle); + } + return info; } } @@ -291,7 +294,7 @@ class MtpManager { if (usbInterface.getInterfaceClass() == UsbConstants.USB_SUBCLASS_VENDOR_SPEC && usbInterface.getInterfaceSubclass() == SUBCLASS_MTP && usbInterface.getInterfaceProtocol() == PROTOCOL_MTP && - usbInterface.getName().equals("MTP")) { + "MTP".equals(usbInterface.getName())) { return true; } } diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java index db25421afab0..45f89e4e1ffd 100644 --- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java +++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/DocumentLoaderTest.java @@ -55,13 +55,6 @@ public class DocumentLoaderTest extends AndroidTestCase { mManager = new BlockableTestMtpManager(getContext()); mResolver = new TestContentResolver(); - mLoader = new DocumentLoader( - new MtpDeviceRecord( - 0, "Device", "Key", true, new MtpRoot[0], - TestUtil.OPERATIONS_SUPPORTED, new int[0]), - mManager, - mResolver, - mDatabase); } @Override @@ -71,6 +64,8 @@ public class DocumentLoaderTest extends AndroidTestCase { } public void testBasic() throws Exception { + setUpLoader(); + final Uri uri = DocumentsContract.buildChildDocumentsUri( MtpDocumentsProvider.AUTHORITY, mParentIdentifier.mDocumentId); setUpDocument(mManager, 40); @@ -107,6 +102,55 @@ public class DocumentLoaderTest extends AndroidTestCase { assertEquals(2, mResolver.getChangeCount(uri)); } + public void testError_GetObjectHandles() throws Exception { + mManager = new BlockableTestMtpManager(getContext()) { + @Override + int[] getObjectHandles(int deviceId, int storageId, int parentObjectHandle) + throws IOException { + throw new IOException(); + } + }; + setUpLoader(); + mManager.setObjectHandles(0, 0, MtpManager.OBJECT_HANDLE_ROOT_CHILDREN, null); + try { + try (final Cursor cursor = mLoader.queryChildDocuments( + MtpDocumentsProvider.DEFAULT_DOCUMENT_PROJECTION, mParentIdentifier)) {} + fail(); + } catch (IOException exception) { + // Expect exception. + } + } + + public void testError_GetObjectInfo() throws Exception { + mManager = new BlockableTestMtpManager(getContext()) { + @Override + MtpObjectInfo getObjectInfo(int deviceId, int objectHandle) throws IOException { + if (objectHandle == DocumentLoader.NUM_INITIAL_ENTRIES) { + throw new IOException(); + } else { + return super.getObjectInfo(deviceId, objectHandle); + } + } + }; + setUpLoader(); + setUpDocument(mManager, DocumentLoader.NUM_INITIAL_ENTRIES); + try (final Cursor cursor = mLoader.queryChildDocuments( + MtpDocumentsProvider.DEFAULT_DOCUMENT_PROJECTION, mParentIdentifier)) { + // Even if MtpManager returns an error for a document, loading must complete. + assertFalse(cursor.getExtras().getBoolean(DocumentsContract.EXTRA_LOADING)); + } + } + + private void setUpLoader() { + mLoader = new DocumentLoader( + new MtpDeviceRecord( + 0, "Device", "Key", true, new MtpRoot[0], + TestUtil.OPERATIONS_SUPPORTED, new int[0]), + mManager, + mResolver, + mDatabase); + } + private void setUpDocument(TestMtpManager manager, int count) { int[] childDocuments = new int[count]; for (int i = 0; i < childDocuments.length; i++) { diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java index b74069ae36bb..284223ba9397 100644 --- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java +++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDatabaseTest.java @@ -103,7 +103,7 @@ public class MtpDatabaseTest extends AndroidTestCase { assertTrue(isNull(cursor, COLUMN_SUMMARY)); assertTrue(isNull(cursor, COLUMN_LAST_MODIFIED)); assertEquals(R.drawable.ic_root_mtp, getInt(cursor, COLUMN_ICON)); - assertEquals(0, getInt(cursor, COLUMN_FLAGS)); + assertEquals(Document.FLAG_DIR_SUPPORTS_CREATE, getInt(cursor, COLUMN_FLAGS)); assertEquals(1000, getInt(cursor, COLUMN_SIZE)); assertEquals( MtpDatabaseConstants.DOCUMENT_TYPE_STORAGE, @@ -165,7 +165,7 @@ public class MtpDatabaseTest extends AndroidTestCase { assertTrue(isNull(cursor, COLUMN_SUMMARY)); assertTrue(isNull(cursor, COLUMN_LAST_MODIFIED)); assertEquals(R.drawable.ic_root_mtp, getInt(cursor, COLUMN_ICON)); - assertEquals(0, getInt(cursor, COLUMN_FLAGS)); + assertEquals(Document.FLAG_DIR_SUPPORTS_CREATE, getInt(cursor, COLUMN_FLAGS)); assertEquals(1000, getInt(cursor, COLUMN_SIZE)); assertEquals( MtpDatabaseConstants.DOCUMENT_TYPE_STORAGE, getInt(cursor, COLUMN_DOCUMENT_TYPE)); diff --git a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java index 9c1880a246a4..da6af37af075 100644 --- a/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java +++ b/packages/MtpDocumentsProvider/tests/src/com/android/mtp/MtpDocumentsProviderTest.java @@ -351,7 +351,6 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { assertEquals(1422716400000L, cursor.getLong(3)); assertEquals( DocumentsContract.Document.FLAG_SUPPORTS_DELETE | - DocumentsContract.Document.FLAG_SUPPORTS_WRITE | DocumentsContract.Document.FLAG_DIR_SUPPORTS_CREATE, cursor.getInt(4)); assertEquals(0, cursor.getInt(5)); @@ -419,20 +418,16 @@ public class MtpDocumentsProviderTest extends AndroidTestCase { try { mProvider.queryChildDocuments("1", null, null); fail(); - } catch (Throwable error) { - assertTrue(error instanceof FileNotFoundException); - } + } catch (FileNotFoundException error) {} } public void testQueryChildDocuments_documentError() throws Exception { setupProvider(MtpDatabaseConstants.FLAG_DATABASE_IN_MEMORY); setupRoots(0, new MtpRoot[] { new MtpRoot(0, 0, "Storage", 1000, 1000, "") }); mMtpManager.setObjectHandles(0, 0, -1, new int[] { 1 }); - try { - mProvider.queryChildDocuments("1", null, null); - fail(); - } catch (Throwable error) { - assertTrue(error instanceof FileNotFoundException); + try (final Cursor cursor = mProvider.queryChildDocuments("1", null, null)) { + assertEquals(0, cursor.getCount()); + assertFalse(cursor.getExtras().getBoolean(DocumentsContract.EXTRA_LOADING)); } } diff --git a/packages/PrintSpooler/res/values-be-rBY/strings.xml b/packages/PrintSpooler/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..b5810454c428 --- /dev/null +++ b/packages/PrintSpooler/res/values-be-rBY/strings.xml @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_label" msgid="4469836075319831821">"Менеджар чаргі друку"</string> + <string name="more_options_button" msgid="2243228396432556771">"Дадатковыя параметры"</string> + <string name="label_destination" msgid="9132510997381599275">"Мэта"</string> + <string name="label_copies" msgid="3634531042822968308">"Копіі"</string> + <string name="label_copies_summary" msgid="3861966063536529540">"Копіі:"</string> + <string name="label_paper_size" msgid="908654383827777759">"Памер паперы"</string> + <string name="label_paper_size_summary" msgid="5668204981332138168">"Памер паперы:"</string> + <string name="label_color" msgid="1108690305218188969">"Колер"</string> + <string name="label_duplex" msgid="5370037254347072243">"Двухбаковы"</string> + <string name="label_orientation" msgid="2853142581990496477">"Арыентацыя"</string> + <string name="label_pages" msgid="7768589729282182230">"Старонкі"</string> + <string name="destination_default_text" msgid="5422708056807065710">"Выбар прынтара"</string> + <string name="template_all_pages" msgid="3322235982020148762">"Усе <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string> + <string name="template_page_range" msgid="428638530038286328">"У дыяпазоне <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string> + <string name="pages_range_example" msgid="8558694453556945172">"напр., 1—5,8,11—13"</string> + <string name="print_preview" msgid="8010217796057763343">"Папярэдні прагляд"</string> + <string name="install_for_print_preview" msgid="6366303997385509332">"Устал. праграму прагляду PDF для папярэд. прагляду"</string> + <string name="printing_app_crashed" msgid="854477616686566398">"Збой праграмы друку"</string> + <string name="generating_print_job" msgid="3119608742651698916">"Стварэнне задання друку"</string> + <string name="save_as_pdf" msgid="5718454119847596853">"Захаваць як PDF"</string> + <string name="all_printers" msgid="5018829726861876202">"Усе прынтары..."</string> + <string name="print_dialog" msgid="32628687461331979">"Дыялог друку"</string> + <string name="current_page_template" msgid="1386638343571771292">"<xliff:g id="CURRENT_PAGE">%1$d</xliff:g>/<xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string> + <string name="page_description_template" msgid="6831239682256197161">"Старонка <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> з <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string> + <string name="summary_template" msgid="8899734908625669193">"Зводка, копіі <xliff:g id="COPIES">%1$s</xliff:g>, памер паперы <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string> + <string name="expand_handle" msgid="7282974448109280522">"Маркер разгортвання"</string> + <string name="collapse_handle" msgid="6886637989442507451">"Маркер згортвання"</string> + <string name="print_button" msgid="645164566271246268">"Друкаваць"</string> + <string name="savetopdf_button" msgid="2976186791686924743">"Захаваць у PDF"</string> + <string name="print_options_expanded" msgid="6944679157471691859">"Параметры друку разгорнуты"</string> + <string name="print_options_collapsed" msgid="7455930445670414332">"Параметры друку згорнуты"</string> + <string name="search" msgid="5421724265322228497">"Пошук"</string> + <string name="all_printers_label" msgid="3178848870161526399">"Усе прынтары"</string> + <string name="add_print_service_label" msgid="5356702546188981940">"Дадаць службу"</string> + <string name="print_search_box_shown_utterance" msgid="7967404953901376090">"Паказваецца поле пошуку"</string> + <string name="print_search_box_hidden_utterance" msgid="5727755169343113351">"Поле пошуку схавана"</string> + <string name="print_add_printer" msgid="1088656468360653455">"Дадаць прынтар"</string> + <string name="print_select_printer" msgid="7388760939873368698">"Выбар прынтара"</string> + <string name="print_forget_printer" msgid="5035287497291910766">"Не запамінаць прынтар"</string> + <plurals name="print_search_result_count_utterance" formatted="false" msgid="6997663738361080868"> + <item quantity="one"><xliff:g id="COUNT_1">%1$s</xliff:g> прынтар знойдзены</item> + <item quantity="few"><xliff:g id="COUNT_1">%1$s</xliff:g> прынтары знойдзены</item> + <item quantity="many"><xliff:g id="COUNT_1">%1$s</xliff:g> прынтараў знойдзена</item> + <item quantity="other"><xliff:g id="COUNT_1">%1$s</xliff:g> прынтара знойдзена</item> + </plurals> + <string name="printer_extended_description_template" msgid="1366699227703381874">"<xliff:g id="PRINT_SERVICE_LABEL">%1$s</xliff:g> – <xliff:g id="PRINTER_DESCRIPTION">%2$s</xliff:g>"</string> + <string name="printer_info_desc" msgid="7181988788991581654">"Больш падрабязная інфармацыя пра гэты прынтар"</string> + <string name="print_services_disabled_toast" msgid="9089060734685174685">"Некаторыя службы друку адключаны"</string> + <string name="print_searching_for_printers" msgid="6550424555079932867">"Пошук прынтараў"</string> + <string name="print_no_print_services" msgid="8561247706423327966">"Службы друку не ўключаны"</string> + <string name="print_no_printers" msgid="4869403323900054866">"Прынтараў не знойдзена"</string> + <string name="cannot_add_printer" msgid="7840348733668023106">"Немагчыма дадаць прынтары"</string> + <string name="select_to_add_printers" msgid="3800709038689830974">"Выберыце, каб дадаць прынтар"</string> + <string name="enable_print_service" msgid="3482815747043533842">"Выберыце, каб уключыць"</string> + <string name="enabled_services_title" msgid="7036986099096582296">"Уключаныя службы"</string> + <string name="recommended_services_title" msgid="3799434882937956924">"Рэкамендаваныя службы"</string> + <string name="disabled_services_title" msgid="7313253167968363211">"Адключаныя службы"</string> + <string name="all_services_title" msgid="5578662754874906455">"Усе службы"</string> + <string name="printing_notification_title_template" msgid="295903957762447362">"Друк <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string> + <string name="cancelling_notification_title_template" msgid="1821759594704703197">"Скасоўваецца <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string> + <string name="failed_notification_title_template" msgid="2256217208186530973">"Памылка друку <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string> + <string name="blocked_notification_title_template" msgid="1175435827331588646">"Прынтар заблакіраваў <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string> + <string name="cancel" msgid="4373674107267141885">"Скасаваць"</string> + <string name="restart" msgid="2472034227037808749">"Перазапусціць"</string> + <string name="no_connection_to_printer" msgid="2159246915977282728">"Няма падлучэння да прынтара"</string> + <string name="reason_unknown" msgid="5507940196503246139">"невядома"</string> + <string name="printer_unavailable" msgid="2434170617003315690">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> – недаступна"</string> + <string name="print_service_security_warning_title" msgid="2160752291246775320">"Выкарыстоўваць службу <xliff:g id="SERVICE">%1$s</xliff:g>?"</string> + <string name="print_service_security_warning_summary" msgid="1427434625361692006">"Ваш дакумент можа прайсці праз адзін ці больш сервераў перад тым, як будзе надрукаваны."</string> + <string-array name="color_mode_labels"> + <item msgid="7602948745415174937">"Чорна-белая схема"</item> + <item msgid="2762241247228983754">"Колер"</item> + </string-array> + <string-array name="duplex_mode_labels"> + <item msgid="3882302912790928315">"Недаступна"</item> + <item msgid="7296563835355641719">"Па доўгім краі"</item> + <item msgid="79513688117503758">"Па кароткім краі"</item> + </string-array> + <string-array name="orientation_labels"> + <item msgid="4061931020926489228">"Кніжная арыентацыя"</item> + <item msgid="3199660090246166812">"Альбомная арыентацыя"</item> + </string-array> + <string name="print_write_error_message" msgid="5787642615179572543">"Не атрымалася запісаць у файл"</string> + <string name="print_error_default_message" msgid="8602678405502922346">"На жаль, не атрымалася. Паспрабуйце яшчэ раз."</string> + <string name="print_error_retry" msgid="1426421728784259538">"Паўтарыць спробу"</string> + <string name="print_error_printer_unavailable" msgid="8985614415253203381">"Гэты прынтар зараз недаступны."</string> + <string name="print_preparing_preview" msgid="3939930735671364712">"Падрыхтоўка папярэдняга прагляду..."</string> +</resources> diff --git a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java index 4e1180d051bf..bb34fcfdd96b 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java @@ -159,7 +159,6 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat private static final int STATE_PRINTER_UNAVAILABLE = 6; private static final int STATE_UPDATE_SLOW = 7; private static final int STATE_PRINT_COMPLETED = 8; - private static final int STATE_FINISHING = 9; private static final int UI_STATE_PREVIEW = 0; private static final int UI_STATE_ERROR = 1; @@ -255,6 +254,9 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat /** Whether at least one print services is enabled or not */ private boolean mArePrintServicesEnabled; + /** Is doFinish() already in progress */ + private boolean mIsFinishing; + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -2035,11 +2037,11 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat return; } - if (mState == STATE_FINISHING) { + if (mIsFinishing) { return; } - mState = STATE_FINISHING; + mIsFinishing = true; if (mPrinterRegistry != null) { mPrinterRegistry.setTrackedPrinter(null); diff --git a/packages/SettingsLib/res/values-af/strings.xml b/packages/SettingsLib/res/values-af/strings.xml index 92374cbedec2..406c9b77c924 100644 --- a/packages/SettingsLib/res/values-af/strings.xml +++ b/packages/SettingsLib/res/values-af/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Laat loop WebView-leweraars in \'n geïsoleerde proses."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView-implementering"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Stel WebView-implementering"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Die gekose WebView-toepassing is ongeldig want die lys toepassingskeuses het verouderd geraak. Die lys moet nou opgedateer word."</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Skakel om na lêerenkripsie"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Skakel om …"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Lêerenkripsie is reeds uitgevoer"</string> diff --git a/packages/SettingsLib/res/values-am/strings.xml b/packages/SettingsLib/res/values-am/strings.xml index 386d697e0dbf..e4cd8b936dd2 100644 --- a/packages/SettingsLib/res/values-am/strings.xml +++ b/packages/SettingsLib/res/values-am/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"የ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="8168796505966635684">"የትግበራ ምርጫዎች ዝርዝር እድገት ስላላሳየ የተመረጠው የWebView ትግበራ አይሠራም። ዝርዝሩ አሁን መዘመን አለበት።"</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-ar/strings.xml b/packages/SettingsLib/res/values-ar/strings.xml index 2c8eda0e74e7..ad87a895e6fe 100644 --- a/packages/SettingsLib/res/values-ar/strings.xml +++ b/packages/SettingsLib/res/values-ar/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"تشغيل أجهزة عرض الويب في عملية منفصلة."</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="8168796505966635684">"التنفيذ الذي تم اختياره لطريقة 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> diff --git a/packages/SettingsLib/res/values-az-rAZ/strings.xml b/packages/SettingsLib/res/values-az-rAZ/strings.xml index d62f472d7eef..c141445ea66d 100644 --- a/packages/SettingsLib/res/values-az-rAZ/strings.xml +++ b/packages/SettingsLib/res/values-az-rAZ/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"WebView rendererləri təcrid olunmuş prosesdə işlədin."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView icrası"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"WebView icrasını ayarlayın"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Seçilmiş WebView icrası yararsızdır cünki, icra seçimlərinin siyahısı köhnədir. Bu siyahı güncəllənməlidir."</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Fayl şifrələnməsinə çevirin"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Çevirin..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Fayl artıq şifrələnib"</string> diff --git a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml index eb050de44dfa..3e3cce09c008 100644 --- a/packages/SettingsLib/res/values-b+sr+Latn/strings.xml +++ b/packages/SettingsLib/res/values-b+sr+Latn/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Pokrećite WebView prikazivače u okviru izolovanog procesa."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Primena WebView-a"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Podesite primenu WebView-a"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Izabrana primena WebView-a je nevažeća zato što je lista mogućnosti za primenu zastarela. Sada bi trebalo da ažurirate listu."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Ovaj izbor više nije važeći. Pokušajte ponovo."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertuj u šifrovanje datoteka"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertuj..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Već se koristi šifrovanje datoteka"</string> diff --git a/packages/SettingsLib/res/values-be-rBY/arrays.xml b/packages/SettingsLib/res/values-be-rBY/arrays.xml new file mode 100644 index 000000000000..63b8b9bf6f4e --- /dev/null +++ b/packages/SettingsLib/res/values-be-rBY/arrays.xml @@ -0,0 +1,161 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** +** Copyright 2015 The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string-array name="wifi_status"> + <item msgid="1922181315419294640"></item> + <item msgid="8934131797783724664">"Сканаванне..."</item> + <item msgid="8513729475867537913">"Падлучэнне..."</item> + <item msgid="515055375277271756">"Аўтэнтыфікацыя..."</item> + <item msgid="1943354004029184381">"Атрыманне IP-адраса..."</item> + <item msgid="4221763391123233270">"Падлучана"</item> + <item msgid="624838831631122137">"Прыпынена"</item> + <item msgid="7979680559596111948">"Адлучэнне..."</item> + <item msgid="1634960474403853625">"Адключана"</item> + <item msgid="746097431216080650">"Няўдала"</item> + <item msgid="6367044185730295334">"Заблакiравана"</item> + <item msgid="503942654197908005">"Дрэнная сувязь часова пазбегнута"</item> + </string-array> + <string-array name="wifi_status_with_ssid"> + <item msgid="7714855332363650812"></item> + <item msgid="8878186979715711006">"Сканаванне..."</item> + <item msgid="355508996603873860">"Падключэнне да сеткі <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item> + <item msgid="554971459996405634">"Аўтэнтыфікацыя ў сетцы <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item> + <item msgid="7928343808033020343">"Атрыманне IP-адраса ў сетцы <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item> + <item msgid="8937994881315223448">"Падключаны да сеткi <xliff:g id="NETWORK_NAME">%1$s</xliff:g>"</item> + <item msgid="1330262655415760617">"Прыпынена"</item> + <item msgid="7698638434317271902">"Адключэнне ад сеткі <xliff:g id="NETWORK_NAME">%1$s</xliff:g>..."</item> + <item msgid="197508606402264311">"Адключана"</item> + <item msgid="8578370891960825148">"Няўдала"</item> + <item msgid="5660739516542454527">"Заблакiравана"</item> + <item msgid="1805837518286731242">"Дрэнная сувязь часова пазбегнута"</item> + </string-array> + <string-array name="hdcp_checking_titles"> + <item msgid="441827799230089869">"Ніколі не правяраць"</item> + <item msgid="6042769699089883931">"Праверка толькi для змесціва, абароненага DRM"</item> + <item msgid="9174900380056846820">"Заўсёды правяраць"</item> + </string-array> + <string-array name="hdcp_checking_summaries"> + <item msgid="505558545611516707">"Ніколі не выкарыстоўваць праверку HDCP"</item> + <item msgid="3878793616631049349">"Выкарыстанне праверкі HDCP только для змесціва, абароненага DRM"</item> + <item msgid="45075631231212732">"Заўсёды выкарыстоўваць праверку HDCP"</item> + </string-array> + <string-array name="select_logd_size_titles"> + <item msgid="8665206199209698501">"Выкл."</item> + <item msgid="1593289376502312923">"64K"</item> + <item msgid="487545340236145324">"256K"</item> + <item msgid="2423528675294333831">"1M"</item> + <item msgid="180883774509476541">"4M"</item> + <item msgid="2803199102589126938">"16M"</item> + </string-array> + <string-array name="select_logd_size_lowram_titles"> + <item msgid="6089470720451068364">"Выкл."</item> + <item msgid="4622460333038586791">"64K"</item> + <item msgid="2212125625169582330">"256K"</item> + <item msgid="1704946766699242653">"1M"</item> + </string-array> + <string-array name="select_logd_size_summaries"> + <item msgid="6921048829791179331">"Выкл."</item> + <item msgid="2969458029344750262">"64K на буфер журнала"</item> + <item msgid="1342285115665698168">"256K на буфер журнала"</item> + <item msgid="1314234299552254621">"1M на буфер журнала"</item> + <item msgid="3606047780792894151">"4M на буфер журнала"</item> + <item msgid="5431354956856655120">"16M на буфер журнала"</item> + </string-array> + <string-array name="window_animation_scale_entries"> + <item msgid="8134156599370824081">"Анімацыя выключаная"</item> + <item msgid="6624864048416710414">"Маштаб анімацыі 0.5x"</item> + <item msgid="2219332261255416635">"Маштаб анімацыі 1x"</item> + <item msgid="3544428804137048509">"Маштаб анімацыі 1,5x"</item> + <item msgid="3110710404225974514">"Маштаб анімацыі 2x"</item> + <item msgid="4402738611528318731">"Маштаб анімацыі 5x"</item> + <item msgid="6189539267968330656">"Маштаб анімацыі 10x"</item> + </string-array> + <string-array name="transition_animation_scale_entries"> + <item msgid="8464255836173039442">"Анімацыя выключана"</item> + <item msgid="3375781541913316411">"Маштаб анімацыі 0.5x"</item> + <item msgid="1991041427801869945">"Маштаб анімацыі 1x"</item> + <item msgid="4012689927622382874">"Маштаб анімацыі 1,5x"</item> + <item msgid="3289156759925947169">"Маштаб анімацыі 2x"</item> + <item msgid="7705857441213621835">"Маштаб анімацыі 5x"</item> + <item msgid="6660750935954853365">"Маштаб анімацыі 10x"</item> + </string-array> + <string-array name="animator_duration_scale_entries"> + <item msgid="6039901060648228241">"Анімацыя выключана"</item> + <item msgid="1138649021950863198">"Маштаб анімацыі 0.5x"</item> + <item msgid="4394388961370833040">"Маштаб анімацыі 1x"</item> + <item msgid="8125427921655194973">"Маштаб анімацыі 1.5x"</item> + <item msgid="3334024790739189573">"Маштаб анімацыі 2x"</item> + <item msgid="3170120558236848008">"Маштаб анімацыі 5x"</item> + <item msgid="1069584980746680398">"Маштаб анімацыі 10x"</item> + </string-array> + <string-array name="overlay_display_devices_entries"> + <item msgid="1606809880904982133">"Няма"</item> + <item msgid="9033194758688161545">"480p"</item> + <item msgid="1025306206556583600">"480p (бяспечны)"</item> + <item msgid="1853913333042744661">"720p"</item> + <item msgid="3414540279805870511">"720p (бяспечны)"</item> + <item msgid="9039818062847141551">"1080p"</item> + <item msgid="4939496949750174834">"1080p (бяспечны)"</item> + <item msgid="1833612718524903568">"4K"</item> + <item msgid="238303513127879234">"4K (бяспечны)"</item> + <item msgid="3547211260846843098">"4K (шырокамаштабны)"</item> + <item msgid="5411365648951414254">"4K (шырокамаштабны, бяспечны)"</item> + <item msgid="1311305077526792901">"720p, 1080p (два экраны)"</item> + </string-array> + <string-array name="enable_opengl_traces_entries"> + <item msgid="3191973083884253830">"Няма"</item> + <item msgid="9089630089455370183">"Logcat"</item> + <item msgid="5397807424362304288">"Systrace (Graphics)"</item> + <item msgid="1340692776955662664">"Выклікаць стэк на glGetError"</item> + </string-array> + <string-array name="show_non_rect_clip_entries"> + <item msgid="993742912147090253">"Адключана"</item> + <item msgid="675719912558941285">"Намаляваць непрамавугольную вобласць кліпа сінім колерам"</item> + <item msgid="1064373276095698656">"Вылучыце выпрабаваныя каманды малявання зялёным колерам"</item> + </string-array> + <string-array name="track_frame_time_entries"> + <item msgid="2193584639058893150">"Адключана"</item> + <item msgid="2751513398307949636">"На экране ў выглядзе слупкоў"</item> + <item msgid="1851438178120770973">"У абалонцы adb dumpsys gfxinfo"</item> + </string-array> + <string-array name="debug_hw_overdraw_entries"> + <item msgid="8190572633763871652">"Адключаны"</item> + <item msgid="7688197031296835369">"Паказаць вобласці з перабольшваннем"</item> + <item msgid="2290859360633824369">"Паказаць вобласці для дэйтэранамаліі"</item> + </string-array> + <string-array name="app_process_limit_entries"> + <item msgid="3401625457385943795">"Стандартны ліміт"</item> + <item msgid="4071574792028999443">"Няма фонавых працэсаў"</item> + <item msgid="4810006996171705398">"Не больш за 1 працэс"</item> + <item msgid="8586370216857360863">"Не больш за 2 працэсы"</item> + <item msgid="836593137872605381">"Не больш за 3 працэсы"</item> + <item msgid="7899496259191969307">"Не больш за 4 працэсы"</item> + </string-array> + <string-array name="usb_configuration_titles"> + <item msgid="488237561639712799">"Зарадка"</item> + <item msgid="5220695614993094977">"MTP (пратакол перадачы медыя)"</item> + <item msgid="2086000968159047375">"PTP (пратакол перадачы відарысаў)"</item> + <item msgid="7398830860950841822">"RNDIS (USB-Ethernet)"</item> + <item msgid="1718924214939774352">"Крыніца аўдыя"</item> + <item msgid="8126315616613006284">"MIDI"</item> + </string-array> +</resources> diff --git a/packages/SettingsLib/res/values-be-rBY/strings.xml b/packages/SettingsLib/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..08aa3a026123 --- /dev/null +++ b/packages/SettingsLib/res/values-be-rBY/strings.xml @@ -0,0 +1,320 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/* +** +** Copyright 2015 The Android Open Source Project +** +** Licensed under the Apache License, Version 2.0 (the "License"); +** you may not use this file except in compliance with the License. +** You may obtain a copy of the License at +** +** http://www.apache.org/licenses/LICENSE-2.0 +** +** Unless required by applicable law or agreed to in writing, software +** distributed under the License is distributed on an "AS IS" BASIS, +** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +** See the License for the specific language governing permissions and +** limitations under the License. +*/ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="wifi_fail_to_scan" msgid="1265540342578081461">"Не атрымлiваецца выканаць сканаванне для сетак"</string> + <string name="wifi_security_none" msgid="7985461072596594400">"Няма"</string> + <string name="wifi_remembered" msgid="4955746899347821096">"Захавана"</string> + <string name="wifi_disabled_generic" msgid="4259794910584943386">"Адключаная"</string> + <string name="wifi_disabled_network_failure" msgid="2364951338436007124">"Збой канфігурацыі IP"</string> + <string name="wifi_disabled_wifi_failure" msgid="3081668066612876581">"Збой падлучэння Wi-Fi"</string> + <string name="wifi_disabled_password_failure" msgid="8659805351763133575">"Праблема аўтэнтыфікацыі"</string> + <string name="wifi_not_in_range" msgid="1136191511238508967">"Не ў зоне дасягальнасці"</string> + <string name="wifi_no_internet" msgid="9151470775868728896">"Доступ да інтэрнэту не выяўлены, аўтаматычнае перападлучэнне не адбудзецца."</string> + <string name="saved_network" msgid="4352716707126620811">"Хто захаваў: <xliff:g id="NAME">%1$s</xliff:g>"</string> + <string name="connected_via_wfa" msgid="3805736726317410714">"Падлучана праз памочніка Wi‑Fi"</string> + <string name="connected_via_passpoint" msgid="2826205693803088747">"Падлучана праз %1$s"</string> + <string name="available_via_passpoint" msgid="1617440946846329613">"Даступна праз %1$s"</string> + <string name="wifi_connected_no_internet" msgid="3149853966840874992">"Падлучана, няма інтэрнэту"</string> + <string name="bluetooth_disconnected" msgid="6557104142667339895">"Адключана"</string> + <string name="bluetooth_disconnecting" msgid="8913264760027764974">"Адключэнне..."</string> + <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_a2dp" msgid="4576188601581440337">"Падключэнне (без носьбіта)"</string> + <string name="bluetooth_connected_no_map" msgid="6504436917057479986">"Падлучана (без доступу да паведамленняў)"</string> + <string name="bluetooth_connected_no_headset_no_a2dp" msgid="9195757766755553810">"Падключаны (без тэлефона або носьбіта)"</string> + <string name="bluetooth_profile_a2dp" msgid="2031475486179830674">"Аўдыё медыяпрылады"</string> + <string name="bluetooth_profile_headset" msgid="8658779596261212609">"Аудыё тэлефона"</string> + <string name="bluetooth_profile_opp" msgid="9168139293654233697">"Перадача файлаў"</string> + <string name="bluetooth_profile_hid" msgid="3680729023366986480">"Прылада ўводу"</string> + <string name="bluetooth_profile_pan" msgid="3391606497945147673">"Доступ у інтэрнэт"</string> + <string name="bluetooth_profile_pbap" msgid="5372051906968576809">"Абагуленне кантактаў"</string> + <string name="bluetooth_profile_pbap_summary" msgid="6605229608108852198">"Выкарыстоўваць для абагулення кантактаў"</string> + <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> + <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> + <string name="bluetooth_map_profile_summary_connected" msgid="8191407438851351713">"Падлучана да карты"</string> + <string name="bluetooth_sap_profile_summary_connected" msgid="8561765057453083838">"Падключана да SAP"</string> + <string name="bluetooth_opp_profile_summary_not_connected" msgid="1267091356089086285">"Няма падключэння да серверу перадачы файлаў"</string> + <string name="bluetooth_hid_profile_summary_connected" msgid="3381760054215168689">"Падключана да прылады ўводу"</string> + <string name="bluetooth_pan_user_profile_summary_connected" msgid="4602294638909590612">"Прылада для дост. ў Iнт."</string> + <string name="bluetooth_pan_nap_profile_summary_connected" msgid="1561383706411975199">"Сумеснае выкарыстанне лакальнага падключэння да інтэрнэту з прыладай"</string> + <string name="bluetooth_pan_profile_summary_use_for" msgid="5664884523822068653">"Выкарыстоўвайце для доступу ў Інтэрнэт"</string> + <string name="bluetooth_map_profile_summary_use_for" msgid="5154200119919927434">"Выкарыстоўваць для карты"</string> + <string name="bluetooth_sap_profile_summary_use_for" msgid="7085362712786907993">"Выкарыстоўваць для доступу да SIM-карты"</string> + <string name="bluetooth_a2dp_profile_summary_use_for" msgid="4630849022250168427">"Выкарыстоўваць для аўдыё-медыя"</string> + <string name="bluetooth_headset_profile_summary_use_for" msgid="8705753622443862627">"Выкарыстоўваць для аўдыё тэлефона"</string> + <string name="bluetooth_opp_profile_summary_use_for" msgid="1255674547144769756">"Выкарыстоўваць для перадачы файлаў"</string> + <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_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-код або пароль няправiльныя."</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> + <string name="accessibility_no_wifi" msgid="8834610636137374508">"Wi-Fi адлучаны."</string> + <string name="accessibility_wifi_one_bar" msgid="4869376278894301820">"Адзiн слупок Wi-Fi."</string> + <string name="accessibility_wifi_two_bars" msgid="3569851234710034416">"Два слупкi Wi-Fi."</string> + <string name="accessibility_wifi_three_bars" msgid="8134185644861380311">"Тры слупкi Wi-Fi."</string> + <string name="accessibility_wifi_signal_full" msgid="7061045677694702">"Поўны сігнал Wi-Fi."</string> + <string name="process_kernel_label" msgid="3916858646836739323">"АС Android"</string> + <string name="data_usage_uninstalled_apps" msgid="614263770923231598">"Выдаленыя прыкладанні"</string> + <string name="data_usage_uninstalled_apps_users" msgid="7986294489899813194">"Выдаленыя прыкладанні і карыстальнiкi"</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_usb_bluetooth" msgid="5355828977109785001">"Мадэм"</string> + <string name="tether_settings_title_all" msgid="8356136101061143841">"Мадэм і партатыўны хотспот"</string> + <string name="managed_user_title" msgid="8101244883654409696">"Рабочы профіль"</string> + <string name="user_guest" msgid="8475274842845401871">"Госць"</string> + <string name="unknown" msgid="1592123443519355854">"Невядома"</string> + <string name="running_process_item_user_label" msgid="3129887865552025943">"Карыстальнiк: <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">"Налады Text-to-speech"</string> + <string name="tts_settings_title" msgid="1237820681016639683">"Выводзіць праз Text-to-speech"</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> + <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_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_network_required" msgid="1190837151485314743">"Гэта мова патрабуе актыўнага падключэння да сеткі, каб выконваць функцыю прамаўлення тэксту."</string> + <string name="tts_default_sample_string" msgid="4040835213373086322">"Гэта прыклад сінтэзу гаворкі"</string> + <string name="tts_status_title" msgid="7268566550242584413">"Статус мовы па змаўчанні"</string> + <string name="tts_status_ok" msgid="1309762510278029765">"<xliff:g id="LOCALE">%1$s</xliff:g> цалкам падтрымліваецца"</string> + <string name="tts_status_requires_network" msgid="6042500821503226892">"Для <xliff:g id="LOCALE">%1$s</xliff:g> патрабуецца падлучэнне да сеткі"</string> + <string name="tts_status_not_supported" msgid="4491154212762472495">"<xliff:g id="LOCALE">%1$s</xliff:g> не падтрымліваецца"</string> + <string name="tts_status_checking" msgid="5339150797940483592">"Праверка..."</string> + <string name="tts_engine_settings_title" msgid="3499112142425680334">"Налады <xliff:g id="TTS_ENGINE_NAME">%s</xliff:g>"</string> + <string name="tts_engine_settings_button" msgid="1030512042040722285">"Запуск налад модулю"</string> + <string name="tts_engine_preference_section_title" msgid="448294500990971413">"Выбраны модуль"</string> + <string name="tts_general_section_title" msgid="4402572014604490502">"Агульныя"</string> + <string-array name="tts_rate_entries"> + <item msgid="6695494874362656215">"Вельмі павольна"</item> + <item msgid="4795095314303559268">"Павольна"</item> + <item msgid="8903157781070679765">"Звычайна"</item> + <item msgid="164347302621392996">"Хутка"</item> + <item msgid="5794028588101562009">"Хутчэй"</item> + <item msgid="7163942783888652942">"Вельмі хутка"</item> + <item msgid="7831712693748700507">"Шпарка"</item> + <item msgid="5194774745031751806">"Вельмі шпарка"</item> + <item msgid="9085102246155045744">"Максімальна хутка"</item> + </string-array> + <string name="choose_profile" msgid="8229363046053568878">"Выбраць профіль"</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_enable" msgid="542530994778109538">"Уключыць параметры распрацоўшчыка"</string> + <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="apn_settings_not_available" msgid="7873729032165324000">"Налады Імя пункту доступу недаступныя для гэтага карыстальніка"</string> + <string name="enable_adb" msgid="7982306934419797485">"Адладка USB"</string> + <string name="enable_adb_summary" msgid="4881186971746056635">"Рэжым адладкі, калі USB падключаны"</string> + <string name="clear_adb_keys" msgid="4038889221503122743">"Адклікаць дазвол USB-адладкі"</string> + <string name="bugreport_in_power" msgid="7923901846375587241">"Ярлык для справаздачы пра памылкі"</string> + <string name="bugreport_in_power_summary" msgid="1778455732762984579">"Паказаць кнопку для прыняцця справаздачы пра памылку ў меню сілкавання"</string> + <string name="keep_screen_on" msgid="1146389631208760344">"Прадухіляць ад пераходу ў рэжым сну"</string> + <string name="keep_screen_on_summary" msgid="2173114350754293009">"Экран ніколі не ўвайдзе ў рэжым сну падчас зарадкі"</string> + <string name="bt_hci_snoop_log" msgid="3340699311158865670">"Уключыць журнал адсочвання Bluetooth HCI"</string> + <string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Захаваць усе пакеты bluetooth HCI у адным файле"</string> + <string name="oem_unlock_enable" msgid="6040763321967327691">"Разблакіроўка OEM"</string> + <string name="oem_unlock_enable_summary" msgid="4720281828891618376">"Дазволіць разблакіроўку загрузчыка"</string> + <string name="confirm_enable_oem_unlock_title" msgid="4802157344812385674">"Дазволіць разблакіроўку OEM?"</string> + <string name="confirm_enable_oem_unlock_text" msgid="5517144575601647022">"ПАПЯРЭДЖАННЕ: Пакуль гэты параметр уключаны, абарона прылады не функцыянуе."</string> + <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="wifi_display_certification" msgid="8611569543791307533">"Сертыфікацыя бесправаднога дысплея"</string> + <string name="wifi_verbose_logging" msgid="4203729756047242344">"Уключыць падрабязны журнал Wi‑Fi"</string> + <string name="wifi_aggressive_handover" msgid="9194078645887480917">"Агрэсіўны пераход з Wi‑Fi на маб. сетку"</string> + <string name="wifi_allow_scan_with_traffic" msgid="3601853081178265786">"Заўсёды дазваляць роўмінгавае сканіраванне Wi‑Fi"</string> + <string name="legacy_dhcp_client" msgid="694426978909127287">"Выкарыстоўваць кліент DHCP ранейшых версій"</string> + <string name="mobile_data_always_on" msgid="7745605759775320362">"Перадача даных мабільнай сувязі заўсёды актыўна"</string> + <string name="bluetooth_disable_absolute_volume" msgid="2660673801947898809">"Адключыць абсалютны гук"</string> + <string name="wifi_display_certification_summary" msgid="1155182309166746973">"Паказаць опцыі сертыфікацыі бесправаднога дысплея"</string> + <string name="wifi_verbose_logging_summary" msgid="6615071616111731958">"Падвыс. узровень дэтал-цыі журнала Wi‑Fi у залежн. ад SSID RSSI у Wi‑Fi Picker"</string> + <string name="wifi_aggressive_handover_summary" msgid="6328455667642570371">"Калі ўкл., прылада будзе больш інтэнсіўна імкнуцца перайсці з падлуч. да Wi-Fi на падлуч. да маб. сеткі, калі сігнал Wi‑Fi слабы"</string> + <string name="wifi_allow_scan_with_traffic_summary" msgid="2575101424972686310">"Дазволіць/забараніць роўмінгавае сканіраванне Wi‑Fi ў залежнасці ад аб\'ёму трафіку даных у інтэрфейсе"</string> + <string name="select_logd_size_title" msgid="7433137108348553508">"Памеры буфера для сродку вядзення журнала"</string> + <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Выберыце памеры сродку вядзення журнала для буфераў журнала"</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="debug_view_attributes" msgid="6485448367803310384">"Уключыць прагляд атрыбутаў"</string> + <string name="legacy_dhcp_client_summary" msgid="163383566317652040">"Выкарыстоўвайце кліент DHCP ад Lollipop замест новага кліента Android DHCP."</string> + <string name="mobile_data_always_on_summary" msgid="8149773901431697910">"Перадача даных мабільнай сувязі заўсёды актыўна, нават калі актыўна сетка Wi‑Fi (для хуткага пераключэння паміж сеткамі)."</string> + <string name="adb_warning_title" msgid="6234463310896563253">"Дазволіць адладку USB?"</string> + <string name="adb_warning_message" msgid="7316799925425402244">"Адладка USB прызначана толькі для мэтаў распрацоўкі. Яна можа выкарыстоўвацца, каб капіяваць дадзеныя паміж кампутарам і прыладай, усталёўваць прыкладанні на прыладзе без папярэдняга апавяшчэння і чытаць дадзеныя дзённiка."</string> + <string name="adb_keys_warning_message" msgid="5659849457135841625">"Адклікаць доступ да адладкі USB з усіх камп\'ютараў, на якiх вы уваходзiлi ў сiстэму?"</string> + <string name="dev_settings_warning_title" msgid="7244607768088540165">"Дазволiць налады распрацоўшчыка?"</string> + <string name="dev_settings_warning_message" msgid="2298337781139097964">"Гэтыя налады прызначаны толькi для распрацоўшыкаў. Яны могуць выклікаць збоi прылад i ўсталяваных на iх прыкладанняў, а таксама перашкаджаць iх працы."</string> + <string name="verify_apps_over_usb_title" msgid="4177086489869041953">"Праверце прыкладаннi па USB"</string> + <string name="verify_apps_over_usb_summary" msgid="9164096969924529200">"Праверце прыкладаннi, усталяваныя з дапамогай ADB/ADT, на нестабiльныя паводзiны."</string> + <string name="bluetooth_disable_absolute_volume_summary" msgid="6031284410786545957">"Адключыць функцыю абсалютнага гуку Bluetooth у выпадку праблем з гукам на аддаленых прыладах, напр., пры непрымальна высокай гучнасці або адсутнасці кіравання."</string> + <string name="enable_terminal_title" msgid="95572094356054120">"Лакальны тэрмінал"</string> + <string name="enable_terminal_summary" msgid="67667852659359206">"Уключэнне прыкладання тэрмінала, якое прапануе доступ да лакальнай абалонкі"</string> + <string name="hdcp_checking_title" msgid="8605478913544273282">"Праверка 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">"Выберыце прыкладанне для адладкi"</string> + <string name="debug_app_not_set" msgid="718752499586403499">"Няма прыкладанняў для адладкi"</string> + <string name="debug_app_set" msgid="2063077997870280017">"Адладка прыкладання: <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> + <string name="select_application" msgid="5156029161289091703">"Выберыце прыкладанне"</string> + <string name="no_application" msgid="2813387563129153880">"Нічога"</string> + <string name="wait_for_debugger" msgid="1202370874528893091">"Пачакайце адладчык"</string> + <string name="wait_for_debugger_summary" msgid="1766918303462746804">"Адладжанае прыкладанне чакае далучэння да iнструмента для адладкi перад працай"</string> + <string name="debug_input_category" msgid="1811069939601180246">"Увод"</string> + <string name="debug_drawing_category" msgid="6755716469267367852">"Чарцёж"</string> + <string name="debug_hw_drawing_category" msgid="6220174216912308658">"Апаратнае паскарэнне рэндэрынгу"</string> + <string name="media_category" msgid="4388305075496848353">"Медыя"</string> + <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_summary" msgid="840819275172753713">"Наклад на экран з бягучым выкар. сэнсар. дадзеных"</string> + <string name="show_touches" msgid="2642976305235070316">"Паказваць дотыкі"</string> + <string name="show_touches_summary" msgid="6101183132903926324">"Паказваць візуалізацыю дотыкаў"</string> + <string name="show_screen_updates" msgid="5470814345876056420">"Паказ. абнаўл. паверхні"</string> + <string name="show_screen_updates_summary" msgid="2569622766672785529">"Мігаць ўсёй паверхней акна пры абнаўленні"</string> + <string name="show_hw_screen_updates" msgid="5036904558145941590">"Паказ. абн. выгляду GPU"</string> + <string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Мігнуць вакном пры чарчэнні з дапамогай GPU"</string> + <string name="show_hw_layers_updates" msgid="5645728765605699821">"Паказаць абнаўленнi апаратнага пласта"</string> + <string name="show_hw_layers_updates_summary" msgid="5296917233236661465">"Апаратныя пласты набываюць зялёны колер, калi абнаўляюцца"</string> + <string name="debug_hw_overdraw" msgid="2968692419951565417">"Адладка перамалёўкі GPU"</string> + <string name="disable_overlays" msgid="2074488440505934665">"Адкл. апаратн. накладання"</string> + <string name="disable_overlays_summary" msgid="3578941133710758592">"Заўсёды выкарыстоўваць GPU для экраннай кампаноўкі"</string> + <string name="simulate_color_space" msgid="6745847141353345872">"Сімуляцыя каляр. прасторы"</string> + <string name="enable_opengl_traces_title" msgid="6790444011053219871">"Уключэнне слядоў OpenGL"</string> + <string name="usb_audio_disable_routing" msgid="8114498436003102671">"Адключыць аўдыёмаршрутызацыю USB"</string> + <string name="usb_audio_disable_routing_summary" msgid="980282760277312264">"Адкл. аўт. перанакір. на перыфер. USB-прыл. аўдыё"</string> + <string name="debug_layout" msgid="5981361776594526155">"Паказаць межы размяшчэння"</string> + <string name="debug_layout_summary" msgid="2001775315258637682">"Паказаць межы кліпу, палі і г. д."</string> + <string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Прымусовая раскладка справа налева"</string> + <string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Прымусовая раскладка экрана справа налева для ўсіх рэгіянальных налад"</string> + <string name="show_cpu_usage" msgid="2389212910758076024">"Паказаць выкарыстанне ЦП"</string> + <string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наклад на экран з бягучым выкарыстаннем працэсара"</string> + <string name="force_hw_ui" msgid="6426383462520888732">"Прымусовае адлюстраванне GPU"</string> + <string name="force_hw_ui_summary" msgid="5535991166074861515">"Прымусовае выкарыстанне GPU для 2-мерных чарцяжоў"</string> + <string name="force_msaa" msgid="7920323238677284387">"Прымусовае выкананне 4x MSAA"</string> + <string name="force_msaa_summary" msgid="9123553203895817537">"Уключыць 4x MSAA у прыкладаннях з OpenGL ES 2.0"</string> + <string name="show_non_rect_clip" msgid="505954950474595172">"Адладка аперацый непрамавугольнага кліпа"</string> + <string name="track_frame_time" msgid="6146354853663863443">"Апрацоўка профілю GPU"</string> + <string name="window_animation_scale_title" msgid="6162587588166114700">"Маштаб анімацыі акна"</string> + <string name="transition_animation_scale_title" msgid="387527540523595875">"Маштаб перадачы анімацыі"</string> + <string name="animator_duration_scale_title" msgid="3406722410819934083">"Шкала працягласці анiматара"</string> + <string name="overlay_display_devices_title" msgid="5364176287998398539">"Мадэляванне другасных дысплеяў"</string> + <string name="debug_applications_category" msgid="4206913653849771549">"Прыкладаннi"</string> + <string name="immediately_destroy_activities" msgid="1579659389568133959">"Не захоўваць дзеянні"</string> + <string name="immediately_destroy_activities_summary" msgid="3592221124808773368">"Знішч. кож.дзеянне, як толькі карыст.пакідае яго"</string> + <string name="app_process_limit_title" msgid="4280600650253107163">"Ліміт фонавага працэсу"</string> + <string name="show_all_anrs" msgid="28462979638729082">"Паказаць усе ANRS"</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_summary" msgid="3640752408258034689">"Робіць любую праграму даступнай для запісу на вонкавае сховішча, незалежна ад значэнняў маніфеста"</string> + <string name="force_resizable_activities" msgid="8615764378147824985">"Зрабіць вокны дзеянняў даступнымі для змены памеру"</string> + <string name="force_resizable_activities_summary" msgid="6667493494706124459">"Робіць усе віды дзейнасці даступнымі для змены памеру ў рэжыме некалькіх вокнаў, незалежна ад значэнняў маніфеста."</string> + <string name="enable_freeform_support" msgid="1461893351278940416">"Уключыць адвольную форму вокнаў"</string> + <string name="enable_freeform_support_summary" msgid="8247310463288834487">"Уключыць падтрымку для эксперыментальнай адвольнай формы акна."</string> + <string name="local_backup_password_title" msgid="3860471654439418822">"Пароль для рэз. копіі ПК"</string> + <string name="local_backup_password_summary_none" msgid="6951095485537767956">"Поўнае рэзервовае капіраванне працоўнага стала зараз не абаронена"</string> + <string name="local_backup_password_summary_change" msgid="5376206246809190364">"Краніце, каб змяніць або выдаліць пароль для поўнага рэзервовага капіравання працоўнага стала"</string> + <string name="local_backup_password_toast_success" msgid="582016086228434290">"Усталяваны новы пароль для рэзервовага капіявання"</string> + <string name="local_backup_password_toast_confirmation_mismatch" msgid="7805892532752708288">"Новы пароль і яго пацвярджэнне не супадаюць"</string> + <string name="local_backup_password_toast_validation_failure" msgid="5646377234895626531">"Збой пры ўсталёўцы паролю для рэзервовага капіявання"</string> + <string-array name="color_mode_names"> + <item msgid="2425514299220523812">"Сочны (па змаўчанні)"</item> + <item msgid="8446070607501413455">"Натуральны"</item> + <item msgid="6553408765810699025">"Стандартны"</item> + </string-array> + <string-array name="color_mode_descriptions"> + <item msgid="4979629397075120893">"Палепшаныя колеры"</item> + <item msgid="8280754435979370728">"Натуральныя колеры (такія, як яны ўспрымаюцца вокам)"</item> + <item msgid="5363960654009010371">"Колеры, аптымізаваныя для лічбавага змесціва"</item> + </string-array> + <string name="inactive_apps_title" msgid="1317817863508274533">"Неактыўныя дадаткі"</string> + <string name="inactive_app_inactive_summary" msgid="5091363706699855725">"Неактыўная. Краніце, каб пераключыць."</string> + <string name="inactive_app_active_summary" msgid="4174921824958516106">"Актыўная. Краніце, каб пераключыць."</string> + <string name="runningservices_settings_title" msgid="8097287939865165213">"Запушчаныя службы"</string> + <string name="runningservices_settings_summary" msgid="854608995821032748">"Прагляд запушчаных службаў i кіраванне iмi"</string> + <string name="enable_webview_multiprocess" msgid="3405948012467585908">"Уключыць шматпрацэсны WebView"</string> + <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Запусціць апрацоўшчыкі WebView у ізаляваным працэсе."</string> + <string name="select_webview_provider_title" msgid="4628592979751918907">"Рэалізацыя WebView"</string> + <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Наладзіць рэалізацыю WebView"</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> + <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="picture_color_mode" msgid="4560755008730283695">"Каляровы рэжым выявы"</string> + <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_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="daltonizer_type_overridden" msgid="3116947244410245916">"Перавызначаны <xliff:g id="TITLE">%1$s</xliff:g>"</string> + <string name="power_remaining_duration_only" msgid="4400068916452346544">"Засталося прыблізна <xliff:g id="TIME">%1$s</xliff:g>"</string> + <string name="power_discharging_duration" msgid="1605929174734600590">"<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="2853265177761520490">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> да поўнай зарадкі"</string> + <string name="power_charging_duration_ac" msgid="3969186192576594254">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> да поўнай зарадкі ад сеткі пер. току"</string> + <string name="power_charging_duration_usb" msgid="182405645340976546">"<xliff:g id="LEVEL">%1$s</xliff:g> – <xliff:g id="TIME">%2$s</xliff:g> да поўнай зарадкі па USB"</string> + <string name="power_charging_duration_wireless" msgid="1829295708243159464">"<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_ac" msgid="2909861890674399949">"Зар. ад сеткі пер. току"</string> + <string name="battery_info_status_charging_usb" msgid="2207489369680923929">"Зарадка па USB"</string> + <string name="battery_info_status_charging_wireless" msgid="3574032603735446573">"Бесправадная зарадка"</string> + <string name="battery_info_status_discharging" msgid="310932812698268588">"Не зараджаецца"</string> + <string name="battery_info_status_not_charging" msgid="2820070506621483576">"Не зараджаецца"</string> + <string name="battery_info_status_full" msgid="2824614753861462808">"Поўная"</string> + <string name="disabled_by_admin_summary_text" msgid="6750513964908334617">"Кантралюецца адміністратарам"</string> + <string name="enabled_by_admin" msgid="2386503803463071894">"Уключана адміністратарам"</string> + <string name="disabled_by_admin" msgid="3669999613095206948">"Адключана адміністратарам"</string> + <string name="home" msgid="8263346537524314127">"Галоўная"</string> + <string name="charge_length_format" msgid="8978516217024434156">"<xliff:g id="ID_1">%1$s</xliff:g> таму назад"</string> + <string name="remaining_length_format" msgid="7886337596669190587">"Засталося <xliff:g id="ID_1">%1$s</xliff:g>"</string> +</resources> diff --git a/packages/SettingsLib/res/values-bg/strings.xml b/packages/SettingsLib/res/values-bg/strings.xml index 7640ffd0c0b5..2dbeeacc6893 100644 --- a/packages/SettingsLib/res/values-bg/strings.xml +++ b/packages/SettingsLib/res/values-bg/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Програми за визуализация на 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="8168796505966635684">"Избраната реализация на 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> diff --git a/packages/SettingsLib/res/values-bn-rBD/strings.xml b/packages/SettingsLib/res/values-bn-rBD/strings.xml index a1063b96df07..eea4f0652edb 100644 --- a/packages/SettingsLib/res/values-bn-rBD/strings.xml +++ b/packages/SettingsLib/res/values-bn-rBD/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"একটি বিচ্ছিন্ন প্রক্রিয়ায় ওয়েবভিউ রেন্ডারারগুলি চালান৷"</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"ওয়েবভিউ প্রয়োগ"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"ওয়েবভিউ প্রয়োগ সেট করুন"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"প্রয়োগ করার জন্য বেছে নেওয়া ওয়েবভিউটি অবৈধ, কারণ প্রয়োগের চয়নগুলি পুরানো হয়ে গেছে৷ এই তালিকাটিকে এখনই আপডেট করা উচিৎ৷"</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> diff --git a/packages/SettingsLib/res/values-bs-rBA/strings.xml b/packages/SettingsLib/res/values-bs-rBA/strings.xml index 7a87fda24395..cf9e4a41ba91 100644 --- a/packages/SettingsLib/res/values-bs-rBA/strings.xml +++ b/packages/SettingsLib/res/values-bs-rBA/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Pokrenite WebView operatera u izolovanom procesu."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Postavljanje WebViewa"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Podesi WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Primjena izabranog prikaza weba ne važi jer je spisak izbora primjene zastario. Spisak se sada treba ažurirati."</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Pretvori u šifrirani fajl"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Pretvaranje…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Fajl je već šifriran"</string> diff --git a/packages/SettingsLib/res/values-ca/strings.xml b/packages/SettingsLib/res/values-ca/strings.xml index 0249282a4223..8d158ac8e0b5 100644 --- a/packages/SettingsLib/res/values-ca/strings.xml +++ b/packages/SettingsLib/res/values-ca/strings.xml @@ -248,7 +248,7 @@ <string name="show_all_anrs" msgid="28462979638729082">"Tots els errors sense resposta"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"Informa que una aplicació en segon pla no respon"</string> <string name="force_allow_on_external" msgid="3215759785081916381">"Força permís d\'aplicacions a l\'emmagatzem. extern"</string> - <string name="force_allow_on_external_summary" msgid="3640752408258034689">"Permet que les aplicacions es puguin escriure en un dispositiu d’emmagatzematge extern, independentment dels valors definits"</string> + <string name="force_allow_on_external_summary" msgid="3640752408258034689">"Permet que qualsevol aplicació es pugui escriure en un dispositiu d’emmagatzematge extern, independentment dels valors definits"</string> <string name="force_resizable_activities" msgid="8615764378147824985">"Força l\'ajust de la mida de les activitats"</string> <string name="force_resizable_activities_summary" msgid="6667493494706124459">"Permet ajustar la mida de totes les activitats per al mode multifinestra, independentment dels valors definits."</string> <string name="enable_freeform_support" msgid="1461893351278940416">"Activa les finestres de format lliure"</string> @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Executa els renderitzadors de WebView en un procés aïllat."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementació de WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Configura la implementació de WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"La implementació de WebView que s\'ha triat no és vàlida perquè la llista d\'opcions d\'implementació ha quedat inactiva. Ara la llista ja hauria d\'estar actualitzada."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Aquesta opció ja no és vàlida. Torna-ho a provar."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converteix en l\'encriptació de fitxers"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converteix…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"El fitxer ja està encriptat"</string> diff --git a/packages/SettingsLib/res/values-cs/strings.xml b/packages/SettingsLib/res/values-cs/strings.xml index 86f269d73a08..9e9abadbe0a4 100644 --- a/packages/SettingsLib/res/values-cs/strings.xml +++ b/packages/SettingsLib/res/values-cs/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Spouštět moduly vykreslení WebView jako samostatné procesy."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementace WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Nastavte implementaci WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Vybraná implementace WebView není platná, protože seznam možností implementace je zastaralý. Seznam je potřeba aktualizovat."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Tato volba již není platná. Zkuste to znovu."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Převést na šifrování souborů"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Převést…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Obsah je již na úrovni souborů zašifrován"</string> diff --git a/packages/SettingsLib/res/values-da/strings.xml b/packages/SettingsLib/res/values-da/strings.xml index 720aeba6d93a..659bd325457c 100644 --- a/packages/SettingsLib/res/values-da/strings.xml +++ b/packages/SettingsLib/res/values-da/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Kør WebView-gengivelse i en isoleret proces."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView-implementering"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Konfigurer WebView-implementering"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Den valgte WebView-implementering er ugyldig, da listen over implementeringsvalg var forældet. Listen bør nu være opdateret."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Dette valg er ikke længere gyldigt. Prøv igen."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertér til filkryptering"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertér…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Allerede filkrypteret"</string> diff --git a/packages/SettingsLib/res/values-de/strings.xml b/packages/SettingsLib/res/values-de/strings.xml index ec8407bb3f30..67d0198ccd8a 100644 --- a/packages/SettingsLib/res/values-de/strings.xml +++ b/packages/SettingsLib/res/values-de/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"WebView-Renderer isoliert ausführen."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView-Implementierung"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"WebView-Implementierung festlegen"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Die ausgewählte WebView-Implementierung ist ungültig, weil die Liste der Implementierungsmöglichkeiten veraltet war. Die Liste sollte jetzt aktualisiert sein."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Diese Auswahl ist nicht mehr gültig. Versuche es erneut."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Zu Dateiverschlüsselung wechseln"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Wechseln…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Dateiverschlüsselung wird bereits verwendet."</string> diff --git a/packages/SettingsLib/res/values-el/strings.xml b/packages/SettingsLib/res/values-el/strings.xml index 7db585374fb5..263703cdec86 100644 --- a/packages/SettingsLib/res/values-el/strings.xml +++ b/packages/SettingsLib/res/values-el/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Εκτέλεση λειτ.απόδοσης 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="8168796505966635684">"Η επιλεγμένη υλοποίηση 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> diff --git a/packages/SettingsLib/res/values-en-rAU/strings.xml b/packages/SettingsLib/res/values-en-rAU/strings.xml index 28340313da16..7a00eb7bc158 100644 --- a/packages/SettingsLib/res/values-en-rAU/strings.xml +++ b/packages/SettingsLib/res/values-en-rAU/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Run WebView renderers in an isolated process."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView implementation"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Set WebView implementation"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"The chosen WebView implementation is invalid because the list of implementation choices grew stale. The list should now be updated."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"This choice is no longer valid. Try again."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convert to file encryption"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convert…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Already file encrypted"</string> diff --git a/packages/SettingsLib/res/values-en-rGB/strings.xml b/packages/SettingsLib/res/values-en-rGB/strings.xml index 28340313da16..7a00eb7bc158 100644 --- a/packages/SettingsLib/res/values-en-rGB/strings.xml +++ b/packages/SettingsLib/res/values-en-rGB/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Run WebView renderers in an isolated process."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView implementation"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Set WebView implementation"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"The chosen WebView implementation is invalid because the list of implementation choices grew stale. The list should now be updated."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"This choice is no longer valid. Try again."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convert to file encryption"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convert…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Already file encrypted"</string> diff --git a/packages/SettingsLib/res/values-en-rIN/strings.xml b/packages/SettingsLib/res/values-en-rIN/strings.xml index 28340313da16..7a00eb7bc158 100644 --- a/packages/SettingsLib/res/values-en-rIN/strings.xml +++ b/packages/SettingsLib/res/values-en-rIN/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Run WebView renderers in an isolated process."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView implementation"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Set WebView implementation"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"The chosen WebView implementation is invalid because the list of implementation choices grew stale. The list should now be updated."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"This choice is no longer valid. Try again."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convert to file encryption"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convert…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Already file encrypted"</string> diff --git a/packages/SettingsLib/res/values-es-rUS/strings.xml b/packages/SettingsLib/res/values-es-rUS/strings.xml index 5f7a4478af72..b45753d73a0d 100644 --- a/packages/SettingsLib/res/values-es-rUS/strings.xml +++ b/packages/SettingsLib/res/values-es-rUS/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Ejecutar procesadores de WebView en un proceso aislado."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementación de WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Configurar la implementación de WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"La implementación de WebView elegida no es válida debido a que las opciones de la lista de implementación están inactivas. Debes actualizar la lista."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Esta opción ya no es válida. Vuelve a intentarlo."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convertir a encriptación de archivo"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convertir…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Ya está encriptado"</string> diff --git a/packages/SettingsLib/res/values-es/strings.xml b/packages/SettingsLib/res/values-es/strings.xml index 0314f2ef88eb..1e360882dcdf 100644 --- a/packages/SettingsLib/res/values-es/strings.xml +++ b/packages/SettingsLib/res/values-es/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Ejecuta procesadores de WebView en un proceso aislado."</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="8168796505966635684">"La implementación de WebView seleccionada no es válida porque la lista de opciones de implementación estaba inactiva. Esta ya debería estar actualizada."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Esta opción ya no está disponible. Vuelve a intentarlo."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Convertir a cifrado de archivo"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Convertir…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Ya está cifrado"</string> diff --git a/packages/SettingsLib/res/values-et-rEE/strings.xml b/packages/SettingsLib/res/values-et-rEE/strings.xml index 6420ccc6fe60..cb0e7f26cbf7 100644 --- a/packages/SettingsLib/res/values-et-rEE/strings.xml +++ b/packages/SettingsLib/res/values-et-rEE/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"WebView\' renderdajad käitatakse eraldi protsessis."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView\' rakendamine"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"WebView\' rakendamise seadistamine"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Valitud WebView\' rakendamine on sobimatu, kuna rakendamisvalikute loend aegus. Loendit tuleb nüüd värskendada."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"See valik ei kehti enam. Proovige uuesti."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Teisendamine failikrüpteeringuga andmeteks"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Teisenda …"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Juba failikrüpteeringuga"</string> diff --git a/packages/SettingsLib/res/values-eu-rES/strings.xml b/packages/SettingsLib/res/values-eu-rES/strings.xml index 30bab3c05fe4..f09949f2d45e 100644 --- a/packages/SettingsLib/res/values-eu-rES/strings.xml +++ b/packages/SettingsLib/res/values-eu-rES/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Exekutatu WebView errendatzaileak prozesu isolatu batean."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView implementation"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Set WebView implementation"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Aukeratutako WebView inplementazioak ez du balio inplementazioen aukeren zerrenda zaharkituta gelditu delako. Zerrenda eguneratu behar da."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Jada ez dago erabilgarri aukera hori. Saiatu berriro."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Eman fitxategietan oinarritutako enkriptatzea"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Enkriptatu…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Fitxategietan oinarritutako enkriptatzea dauka dagoeneko"</string> diff --git a/packages/SettingsLib/res/values-fa/strings.xml b/packages/SettingsLib/res/values-fa/strings.xml index f1437d75ff8f..c621be36f918 100644 --- a/packages/SettingsLib/res/values-fa/strings.xml +++ b/packages/SettingsLib/res/values-fa/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"اجرای تولیدکننده تصویر وبنما در یک پردازش مجزا."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"اجرای وبنما"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"تنظیم اجرای وبنما"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"اجرای وبنمای انتخابی نامعتبر است چون فهرست گزینههای اجرای انتخابی قدیمی شده است. این فهرست اکنون باید بهروزرسانی شود."</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-fi/strings.xml b/packages/SettingsLib/res/values-fi/strings.xml index 9717a7853dfb..8ec2f6e42ab8 100644 --- a/packages/SettingsLib/res/values-fi/strings.xml +++ b/packages/SettingsLib/res/values-fi/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Suorita WebView\'n hahmontajat erillisinä prosesseina."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView-käyttöönotto"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Määritä WebView-käyttöönotto"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Valittu WebView-toteutus ei kelpaa, sillä toteutusvaihtoehtojen lista vanhentui. Listan pitäisi nyt olla ajan tasalla."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Tämä valinta ei ole enää saatavilla. Yritä uudestaan."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Muunna tiedostojen salaukseksi"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Muunna…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Tiedostot on jo salattu."</string> diff --git a/packages/SettingsLib/res/values-fr-rCA/strings.xml b/packages/SettingsLib/res/values-fr-rCA/strings.xml index 80181f0d6001..e2de25345b87 100644 --- a/packages/SettingsLib/res/values-fr-rCA/strings.xml +++ b/packages/SettingsLib/res/values-fr-rCA/strings.xml @@ -248,8 +248,7 @@ <string name="show_all_anrs" msgid="28462979638729082">"Afficher tous les messages «L\'application ne répond pas»"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"Afficher « L\'application ne répond plus » pour applis en arrière-plan"</string> <string name="force_allow_on_external" msgid="3215759785081916381">"Forcer l\'autor. d\'applis sur stockage externe"</string> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <string name="force_allow_on_external_summary" msgid="3640752408258034689">"Rend possible l\'enregistrement de toute application sur un espace de stockage externe, indépendamment des valeurs du fichier manifeste"</string> <string name="force_resizable_activities" msgid="8615764378147824985">"Forcer les activités à être redimensionnables"</string> <string name="force_resizable_activities_summary" msgid="6667493494706124459">"Permet de redimensionner toutes les activités pour le mode multifenêtre, indépendamment des valeurs du fichier manifeste."</string> <string name="enable_freeform_support" msgid="1461893351278940416">"Activer les fenêtres de forme libre"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Exécuter moteurs de rendu WebView dans un processus isolé."</string> <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="8168796505966635684">"La mise en œuvre WebView sélectionnée n\'est pas valide, car la liste de sélections de mises en œuvre est désormais obsolète. Cette liste devrait être mise à jour."</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_enabled" msgid="2861258671151428346">"Convertir..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Déjà chiffré par un fichier"</string> diff --git a/packages/SettingsLib/res/values-fr/strings.xml b/packages/SettingsLib/res/values-fr/strings.xml index b8ff857bb333..e3dd87a9b007 100644 --- a/packages/SettingsLib/res/values-fr/strings.xml +++ b/packages/SettingsLib/res/values-fr/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Exécuter moteurs de rendu WebView dans un processus isolé."</string> <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="8168796505966635684">"La mise en œuvre WebView sélectionnée n\'est pas valide, car la liste de sélections de mises en œuvre est désormais obsolète. Cette liste ne doit pas être mise à jour."</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_enabled" msgid="2861258671151428346">"Convertir…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Déjà chiffré via un fichier"</string> diff --git a/packages/SettingsLib/res/values-gl-rES/strings.xml b/packages/SettingsLib/res/values-gl-rES/strings.xml index 2cde75237c25..e75fee619c4e 100644 --- a/packages/SettingsLib/res/values-gl-rES/strings.xml +++ b/packages/SettingsLib/res/values-gl-rES/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Executa os procesadores de WebView nun proceso illado."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementación de WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Definir implementación de WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"A implementación de WebView seleccionada non é válida porque a lista de opcións de implementación estaba inactiva. A lista xa debería estar actualizada."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Esta opción xa non é válida. Téntao de novo."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter no encriptado baseado en ficheiros"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converter..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Xa se encriptou o ficheiro"</string> diff --git a/packages/SettingsLib/res/values-gu-rIN/strings.xml b/packages/SettingsLib/res/values-gu-rIN/strings.xml index 9c25a0feab67..38b6089fd228 100644 --- a/packages/SettingsLib/res/values-gu-rIN/strings.xml +++ b/packages/SettingsLib/res/values-gu-rIN/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"પૃથક પ્રક્રિયામાં 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="8168796505966635684">"પસંદ કરેલ 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> diff --git a/packages/SettingsLib/res/values-hi/strings.xml b/packages/SettingsLib/res/values-hi/strings.xml index 2e1b337ed37c..dce538b64e81 100644 --- a/packages/SettingsLib/res/values-hi/strings.xml +++ b/packages/SettingsLib/res/values-hi/strings.xml @@ -248,7 +248,7 @@ <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_summary" msgid="3640752408258034689">"इससे कोई भी ऐप्लिकेशन, मेनिफेस्ट मानों को अनदेखा करके बाहरी मेमोरी पर लिखने योग्य बन जाता है"</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> <string name="enable_freeform_support" msgid="1461893351278940416">"फ़्रीफ़ॉर्म विंडो सक्षम करें"</string> @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"किसी अलग प्रक्रिया में 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="8168796505966635684">"चुना गया 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> diff --git a/packages/SettingsLib/res/values-hr/strings.xml b/packages/SettingsLib/res/values-hr/strings.xml index f9dd6b731a78..7a2acd8fe762 100644 --- a/packages/SettingsLib/res/values-hr/strings.xml +++ b/packages/SettingsLib/res/values-hr/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Pokreni ispunjivače WebViewa u izoliranim procesima."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementacija WebViewa"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Postavi implementaciju WebViewa"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Odabrana implementacija WebViewa nije važeća jer je popis odabira za implementaciju zastario. Popis se treba ažurirati."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Taj izbor više nije važeći. Pokušajte ponovo."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Pretvori u enkripciju datoteka"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Pretvori…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Enkripcija datoteka već je izvršena"</string> diff --git a/packages/SettingsLib/res/values-hu/strings.xml b/packages/SettingsLib/res/values-hu/strings.xml index 94fa1bdd2ccc..426cff47832b 100644 --- a/packages/SettingsLib/res/values-hu/strings.xml +++ b/packages/SettingsLib/res/values-hu/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"WebView-megjelenítők futtatása külön folyamatként."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView-megvalósítás"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"WebView-megvalósítás beállítása"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"A kiválasztott WebView-megvalósítás érvénytelen, mert a megvalósítási lehetőségeket tartalmazó lista elévült. A listát elvileg már frissítették."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Ez a választás már nem érvényes. Próbálkozzon újra."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertálás fájlalapú titkosításra"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertálás…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Már fájlalapú titkosítást használ"</string> diff --git a/packages/SettingsLib/res/values-hy-rAM/strings.xml b/packages/SettingsLib/res/values-hy-rAM/strings.xml index e9232f52a9a3..8c62221ed97c 100644 --- a/packages/SettingsLib/res/values-hy-rAM/strings.xml +++ b/packages/SettingsLib/res/values-hy-rAM/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Գործարկել 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="8168796505966635684">"WebView-ի իրագործման ընտրված եղանակն անվավեր է, քանի որ իրագործման ընտրանքների ցանկը արդի չէ: Այն այժմ կթարմացվի:"</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-in/strings.xml b/packages/SettingsLib/res/values-in/strings.xml index 397139845e33..662bb229f1e3 100644 --- a/packages/SettingsLib/res/values-in/strings.xml +++ b/packages/SettingsLib/res/values-in/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Jalankan perender WebView dalam proses yang terisolasi."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Penerapan WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Setel penerapan WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Implementasi WebView yang dipilih tidak valid karena daftar pilihan implementasi sudah usang. Daftar tersebut sekarang harus diperbarui."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Pilihan ini tidak valid lagi. Coba lagi."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konversi ke enkripsi file"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konversi..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Sudah dienkripsi berbasis file"</string> diff --git a/packages/SettingsLib/res/values-is-rIS/strings.xml b/packages/SettingsLib/res/values-is-rIS/strings.xml index 7f9e7681a005..30440da9b94f 100644 --- a/packages/SettingsLib/res/values-is-rIS/strings.xml +++ b/packages/SettingsLib/res/values-is-rIS/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Keyra WebView teiknun í lokuðu ferli."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Innleiðing WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Stilla innleiðingu WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Sú innleiðing WebView sem hér var valin er ógild vegna þess að innleiðingalistinn rann út. Uppfæra þarf listann."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Þetta val er ekki lengur gilt. Reyndu aftur."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Umbreyta í dulkóðun skráa"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Umbreyta…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Þegar dulkóðað á grundvelli skráa"</string> diff --git a/packages/SettingsLib/res/values-it/strings.xml b/packages/SettingsLib/res/values-it/strings.xml index 147ad4da75fa..40802bca25b9 100644 --- a/packages/SettingsLib/res/values-it/strings.xml +++ b/packages/SettingsLib/res/values-it/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Esegui renderer WebView in un processo isolato."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementazione di WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Imposta l\'implementazione di WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"L\'implementazione WebView selezionata non è valida perché l\'elenco di opzioni di implementazione è obsoleto. Aggiorna l\'elenco."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"La selezione non è più valida. Riprova."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converti in crittografia basata su file"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converti..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Crittografia su base file già eseguita"</string> diff --git a/packages/SettingsLib/res/values-iw/strings.xml b/packages/SettingsLib/res/values-iw/strings.xml index 4fce9b8e0a96..a651a3ae87e3 100644 --- a/packages/SettingsLib/res/values-iw/strings.xml +++ b/packages/SettingsLib/res/values-iw/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"הרץ מעבדי תצוגת אתר בהליך מבודד"</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="8168796505966635684">"יישום WebView שנבחר אינו חוקי שכן רשימת מבחר היישומים אינה פעילה יותר. יש צורך לעדכן את הרשימה."</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-ja/strings.xml b/packages/SettingsLib/res/values-ja/strings.xml index b2b36124d1ff..e17db519ab29 100644 --- a/packages/SettingsLib/res/values-ja/strings.xml +++ b/packages/SettingsLib/res/values-ja/strings.xml @@ -248,8 +248,7 @@ <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> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <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> <string name="enable_freeform_support" msgid="1461893351278940416">"フリーフォーム ウィンドウの有効化"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"別個のプロセスで 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="8168796505966635684">"選択した 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> diff --git a/packages/SettingsLib/res/values-ka-rGE/strings.xml b/packages/SettingsLib/res/values-ka-rGE/strings.xml index 8c34c6384910..11fa8a66d783 100644 --- a/packages/SettingsLib/res/values-ka-rGE/strings.xml +++ b/packages/SettingsLib/res/values-ka-rGE/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"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="8168796505966635684">"არჩეული WebView რეალიზაცია არასწორია. რეალიზაციების სია მოძველდა და ახლა განახლდება."</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-kk-rKZ/strings.xml b/packages/SettingsLib/res/values-kk-rKZ/strings.xml index 47d3458b6450..aae7449f50b9 100644 --- a/packages/SettingsLib/res/values-kk-rKZ/strings.xml +++ b/packages/SettingsLib/res/values-kk-rKZ/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Веб-көрініс бейнелеушілерін оқшауланған процесте іске қосу."</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="8168796505966635684">"Таңдалған 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> diff --git a/packages/SettingsLib/res/values-km-rKH/strings.xml b/packages/SettingsLib/res/values-km-rKH/strings.xml index 3f2c6c308581..4373c43d71a4 100644 --- a/packages/SettingsLib/res/values-km-rKH/strings.xml +++ b/packages/SettingsLib/res/values-km-rKH/strings.xml @@ -248,8 +248,7 @@ <string name="show_all_anrs" msgid="28462979638729082">"បង្ហាញ ANRs ទាំងអស់"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"បង្ហាញប្រអប់កម្មវិធីមិនឆ្លើយតបសម្រាប់កម្មវិធីផ្ទៃខាងក្រោយ"</string> <string name="force_allow_on_external" msgid="3215759785081916381">"បង្ខំឲ្យអនុញ្ញាតកម្មវិធីលើឧបករណ៍ផ្ទុកខាងក្រៅ"</string> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <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> <string name="enable_freeform_support" msgid="1461893351278940416">"បើកដំណើរការផ្ទាំងវិនដូទម្រង់សេរី"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"ដំណើរការកម្មវិធីបំលែង 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="8168796505966635684">"ការអនុវត្ត 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> diff --git a/packages/SettingsLib/res/values-kn-rIN/strings.xml b/packages/SettingsLib/res/values-kn-rIN/strings.xml index 009b9f770076..f0d63fba14f0 100644 --- a/packages/SettingsLib/res/values-kn-rIN/strings.xml +++ b/packages/SettingsLib/res/values-kn-rIN/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"ಪ್ರತ್ಯೇಕಗೊಳಿಸಿದ ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿ 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="8168796505966635684">"ಅನುಷ್ಠಾನ ಆಯ್ಕೆಗಳ ಪಟ್ಟಿ ಸ್ಥಬ್ದವಾಗಿರುವ ಕಾರಣ ಆಯ್ಕೆಮಾಡಿದ WebView ಅನುಷ್ಠಾನಗೊಳಿಸುವಿಕೆಯು ಅಮಾನ್ಯವಾಗಿದೆ. ಈಗ ಪಟ್ಟಿಯನ್ನು ಅಪ್ಡೇಟ್ ಮಾಡಬೇಕಾಗಿದೆ."</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-ko/strings.xml b/packages/SettingsLib/res/values-ko/strings.xml index 4bfdbfd14416..a8b6c3645bca 100644 --- a/packages/SettingsLib/res/values-ko/strings.xml +++ b/packages/SettingsLib/res/values-ko/strings.xml @@ -248,8 +248,7 @@ <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> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <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> <string name="enable_freeform_support" msgid="1461893351278940416">"자유 형식 창 사용"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"단독 프로세스 내에서 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="8168796505966635684">"구현 선택 목록이 비활성화되어 선택한 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> diff --git a/packages/SettingsLib/res/values-ky-rKG/strings.xml b/packages/SettingsLib/res/values-ky-rKG/strings.xml index d06aec5c446b..6491d3c1df45 100644 --- a/packages/SettingsLib/res/values-ky-rKG/strings.xml +++ b/packages/SettingsLib/res/values-ky-rKG/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"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="8168796505966635684">"Тандалган WebView кызматы колдоого алынбайт. Кызматтардын тизмеси эскирип калгандыктан ал азыр жаңыртылат."</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-lo-rLA/strings.xml b/packages/SettingsLib/res/values-lo-rLA/strings.xml index c5121a532a2e..cf90c4b43976 100644 --- a/packages/SettingsLib/res/values-lo-rLA/strings.xml +++ b/packages/SettingsLib/res/values-lo-rLA/strings.xml @@ -248,8 +248,7 @@ <string name="show_all_anrs" msgid="28462979638729082">"ສະແດງ ANRs ທັງຫມົດ"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"ສະແດງໜ້າຈໍແອັບຯທີ່ບໍ່ຕອບສະໜອງສຳລັບແອັບຯພື້ນຫຼັງ"</string> <string name="force_allow_on_external" msgid="3215759785081916381">"ບັງຄັບອະນຸຍາດແອັບຢູ່ພາຍນອກ"</string> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <string name="force_allow_on_external_summary" msgid="3640752408258034689">"ເຮັດໃຫ້ທຸກແອັບມີສິດໄດ້ຮັບການຂຽນໃສ່ພື້ນທີ່ຈັດເກັບຂໍ້ມູນພາຍນອກ, ໂດຍບໍ່ຄຳນຶງເຖິງຄ່າ manifest"</string> <string name="force_resizable_activities" msgid="8615764378147824985">"ບັງຄັງໃຫ້ກິດຈະກຳປ່ຽນຂະໜາດໄດ້"</string> <string name="force_resizable_activities_summary" msgid="6667493494706124459">"ເຮັດໃຫ້ທຸກກິດຈະກຳສາມາດປັບຂະໜາດໄດ້ສຳລັບຫຼາຍໜ້າຈໍ, ໂດຍບໍ່ຄຳນຶງເຖິງຄ່າ manifest."</string> <string name="enable_freeform_support" msgid="1461893351278940416">"ເປີດໃຊ້ໜ້າຕ່າງຮູບແບບອິດສະຫຼະ"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"ເປີດໃຊ້ຕົວປະມວນ 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="8168796505966635684">"ການນຳໃຊ້ 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> diff --git a/packages/SettingsLib/res/values-lt/strings.xml b/packages/SettingsLib/res/values-lt/strings.xml index dd1ccc84d9c8..fd245f3b1bdb 100644 --- a/packages/SettingsLib/res/values-lt/strings.xml +++ b/packages/SettingsLib/res/values-lt/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Paleisti „WebView“ pateikimo priemones vienam procesui."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"„WebView“ diegimas"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"„WebView“ diegimo nustatymas"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Pasirinktas „WebView“ diegimas netinkamas, nes diegimo pasirinkimų sąrašas tapo neaktyvus. Sąrašas dabar turėtų būti atnaujintas."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Šios parinkties nebegalima pasirinkti. Bandykite dar kartą."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertuoti į failų šifruotę"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertuoti…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Jau konvertuota į failų šifruotę"</string> diff --git a/packages/SettingsLib/res/values-lv/strings.xml b/packages/SettingsLib/res/values-lv/strings.xml index 009ccf6b113d..b470fb540194 100644 --- a/packages/SettingsLib/res/values-lv/strings.xml +++ b/packages/SettingsLib/res/values-lv/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Atsevišķā procesā tiek palaisti WebView renderētāji."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView ieviešana"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Iestatīt WebView ieviešanu"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Izvēlētā WebView ieviešana nav derīga, jo ieviešanas iespēju saraksts ir novecojis. Saraksts ir jāatjaunina."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Šī iespēja vairs nav derīga. Mēģiniet vēlreiz."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Pārvērst par failu šifrējumu"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Pārvērst…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Jau šifrēts failu līmenī"</string> diff --git a/packages/SettingsLib/res/values-mk-rMK/strings.xml b/packages/SettingsLib/res/values-mk-rMK/strings.xml index 0c2ddf4cafdb..7592cd32e020 100644 --- a/packages/SettingsLib/res/values-mk-rMK/strings.xml +++ b/packages/SettingsLib/res/values-mk-rMK/strings.xml @@ -248,8 +248,7 @@ <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> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <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> <string name="enable_freeform_support" msgid="1461893351278940416">"Овозможи прозорци со слободна форма"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Активирајте ги 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="8168796505966635684">"Избраната 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> diff --git a/packages/SettingsLib/res/values-ml-rIN/strings.xml b/packages/SettingsLib/res/values-ml-rIN/strings.xml index 3b4acd2656b0..13a701356edb 100644 --- a/packages/SettingsLib/res/values-ml-rIN/strings.xml +++ b/packages/SettingsLib/res/values-ml-rIN/strings.xml @@ -248,8 +248,7 @@ <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> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <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> <string name="enable_freeform_support" msgid="1461893351278940416">"ഫ്രീഫോം വിൻഡോകൾ പ്രവർത്തനക്ഷമമാക്കുക"</string> @@ -279,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"ഒറ്റപ്പെട്ടൊരു പ്രോസസ്സിൽ 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="8168796505966635684">"തിരഞ്ഞെടുത്ത WebView നടപ്പാക്കൽ അസാധുവാണ്, കാരണം നടപ്പാക്കൽ തിരഞ്ഞെടുപ്പുകളുടെ ലിസ്റ്റ് പഴകിപ്പോയി. ഈ ലിസ്റ്റിപ്പോൾ അപ്ഡേറ്റ് ചെയ്യേണ്ടതുണ്ട്."</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-mn-rMN/strings.xml b/packages/SettingsLib/res/values-mn-rMN/strings.xml index 4473f7f18158..a77e32eb30bf 100644 --- a/packages/SettingsLib/res/values-mn-rMN/strings.xml +++ b/packages/SettingsLib/res/values-mn-rMN/strings.xml @@ -248,8 +248,7 @@ <string name="show_all_anrs" msgid="28462979638729082">"Бүх ANRs харуулах"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"Далд апп-уудад Апп Хариу Өгөхгүй байна гэснийг харуулах"</string> <string name="force_allow_on_external" msgid="3215759785081916381">"Апп-ыг гадаад санах ойд хадгалахыг зөвшөөрөх"</string> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <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> <string name="enable_freeform_support" msgid="1461893351278940416">"Чөлөөт хэлбэрийн цонхыг идэвхжүүлэх"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"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="8168796505966635684">"Хэрэгжүүлэлтийн сонголтын жагсаалт хуучирсан тул сонгосон 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> diff --git a/packages/SettingsLib/res/values-mr-rIN/strings.xml b/packages/SettingsLib/res/values-mr-rIN/strings.xml index d8075aa22380..4f12e4601604 100644 --- a/packages/SettingsLib/res/values-mr-rIN/strings.xml +++ b/packages/SettingsLib/res/values-mr-rIN/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"एक वेगळ्या प्रक्रियेत WebView प्रस्तुतकर्ते चालवा."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"वेबदृश्य अंमलबजावणी"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"वेबदृश्य अंमलबजावणी सेट करा"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"अंमलबजावणीची निवडींची सूची जुनी झाली असल्याने निवडलेली WebView अंमलबजावणी अवैध आहे."</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-ms-rMY/strings.xml b/packages/SettingsLib/res/values-ms-rMY/strings.xml index 44ed1f6a068f..6ba7d201df2a 100644 --- a/packages/SettingsLib/res/values-ms-rMY/strings.xml +++ b/packages/SettingsLib/res/values-ms-rMY/strings.xml @@ -248,8 +248,7 @@ <string name="show_all_anrs" msgid="28462979638729082">"Tunjukkan semua ANR"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"Tunjukkan dialog Aplikasi Tidak Memberi Maklum Balas untuk aplikasi latar belakang"</string> <string name="force_allow_on_external" msgid="3215759785081916381">"Benarkan apl secara paksa pada storan luaran"</string> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <string name="force_allow_on_external_summary" msgid="3640752408258034689">"Menjadikan sebarang apl layak ditulis ke storan luaran, tanpa mengambil kira nilai manifes"</string> <string name="force_resizable_activities" msgid="8615764378147824985">"Paksa aktiviti supaya boleh diubah saiz"</string> <string name="force_resizable_activities_summary" msgid="6667493494706124459">"Bolehkan semua saiz aktiviti diubah untuk berbilang tetingkap, tanpa mengambil kira nilai manifes."</string> <string name="enable_freeform_support" msgid="1461893351278940416">"Dayakan tetingkap bentuk bebas"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Jalankan pemapar WebView dalam proses terpencil."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Pelaksanaan WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Tetapkan pelaksanaan WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Pelaksanaan WebView yang dipilih tidak sah kerana senarai pilihan pelaksanaan telah lapuk. Senarai itu seharusnya dikemas kini sekarang."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Pilihan ini tidak lagi sah. Cuba lagi."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Tukar kepada penyulitan fail"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Tukar..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Sudah disulitkan fail"</string> diff --git a/packages/SettingsLib/res/values-my-rMM/strings.xml b/packages/SettingsLib/res/values-my-rMM/strings.xml index bf2ea80f4d01..5c1a5ee2d6b9 100644 --- a/packages/SettingsLib/res/values-my-rMM/strings.xml +++ b/packages/SettingsLib/res/values-my-rMM/strings.xml @@ -248,7 +248,7 @@ <string name="show_all_anrs" msgid="28462979638729082">"ANRsအားလုံးအား ပြသရန်"</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_summary" msgid="3640752408258034689">"တိကျစွာ သတ်မှတ်ထားသည့်တန်ဖိုးများရှိသော်လည်း၊ ပြင်ပသိုလှောင်ခန်းများသို့ မည်သည့်အက်ပ်ကိုမဆို သိမ်းဆည်းခွင့်ပြုပါ"</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> <string name="enable_freeform_support" msgid="1461893351278940416">"အခမဲ့ပုံစံ ဝင်းဒိုးကို ဖွင့်ပါ"</string> @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"လုပ်ငန်းဖြစ်စဉ်တစ်ခုတည်းအတွက် ဝဘ်မြင်ကွင်း အဖြစ်ပြုလုပ်ခြင်းကို ဖွင့်ပါ။"</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="8168796505966635684">"ရွေးချယ်ထားသည့် ဝဘ်မြင်ကွင်းထည့်သွင်းမှု မမှန်ကန်ပါ၊ အဘယ့်ကြောင့်ဆိုသော် ရွေးချယ်ရန် ထည့်သွင်းမှုစာရင်းသည် အသစ်မဖြစ်တော့သောကြောင့်ဖြစ်သည်။ စာရင်းကို ယခုအပ်ဒိတ် ဖြစ်နေလောက်ပါပြီ။"</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> diff --git a/packages/SettingsLib/res/values-nb/strings.xml b/packages/SettingsLib/res/values-nb/strings.xml index 94993d4bb14a..de6faf46cdc6 100644 --- a/packages/SettingsLib/res/values-nb/strings.xml +++ b/packages/SettingsLib/res/values-nb/strings.xml @@ -248,7 +248,7 @@ <string name="show_all_anrs" msgid="28462979638729082">"Vis alle ANR-er"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"Vis Appen svarer ikke-dialog for bakgrunnsapper"</string> <string name="force_allow_on_external" msgid="3215759785081916381">"Tving frem tillatelse for ekstern lagring av apper"</string> - <string name="force_allow_on_external_summary" msgid="3640752408258034689">"Dette gjør at alle apper kan lagres på ekstern lagring – uavhengig av manifestverdier"</string> + <string name="force_allow_on_external_summary" msgid="3640752408258034689">"Dette gjør at alle apper kan lagres på eksterne lagringsmedier – uavhengig av manifestverdier"</string> <string name="force_resizable_activities" msgid="8615764378147824985">"Tving aktiviteter til å kunne endre størrelse"</string> <string name="force_resizable_activities_summary" msgid="6667493494706124459">"Gjør at alle aktivitetene kan endre størrelse for flervindusmodus, uavhengig av manifestverdier."</string> <string name="enable_freeform_support" msgid="1461893351278940416">"Slå på vinduer i fritt format"</string> @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Kjør WebView-gjengivelser i en isolert prosess."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView-implementering"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Angi WebView-implementering"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Den valgte WebView-implementeringen er ugyldig fordi listen over implementeringsvalg er foreldet. Listen er nå oppdatert."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Dette valget er ikke gyldig lenger. Prøv på nytt."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertér til kryptert fil"</string> <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> diff --git a/packages/SettingsLib/res/values-ne-rNP/strings.xml b/packages/SettingsLib/res/values-ne-rNP/strings.xml index 8d253154ec3b..47ec137fd838 100644 --- a/packages/SettingsLib/res/values-ne-rNP/strings.xml +++ b/packages/SettingsLib/res/values-ne-rNP/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"एउटा पृथक प्रक्रियामा वेबभ्यु रेन्डररहरू चलाउनुहोस्।"</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="8168796505966635684">"कार्यान्वयनको सूची पुरानो भइसकेको हुनाले छनोट गरिएको WebView को कार्यान्वयन अमान्य छ। सूची अब अद्यावधिक हुनुपर्छ।"</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-nl/strings.xml b/packages/SettingsLib/res/values-nl/strings.xml index c60e9df610b5..9f72db546fec 100644 --- a/packages/SettingsLib/res/values-nl/strings.xml +++ b/packages/SettingsLib/res/values-nl/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"WebView-weergaveprogramma\'s uitvoeren in geïsoleerd proces."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView-implementatie"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"WebView-implementatie instellen"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"De geselecteerde WebView-implementatie is ongeldig omdat de lijst met implementatiekeuzes was verouderd. De lijst is nu geüpdatet."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Deze keuze is niet meer geldig. Probeer het opnieuw."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converteren naar versleuteling op basis van bestanden"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converteren…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Al versleuteld op basis van bestanden"</string> diff --git a/packages/SettingsLib/res/values-pa-rIN/strings.xml b/packages/SettingsLib/res/values-pa-rIN/strings.xml index 3771536bc887..8625b9068054 100644 --- a/packages/SettingsLib/res/values-pa-rIN/strings.xml +++ b/packages/SettingsLib/res/values-pa-rIN/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"ਕਿਸੇ ਵੱਖ ਕੀਤੀ ਗਈ ਪ੍ਰਕਿਰਿਆ ਵਿੱਚ 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="8168796505966635684">"ਚੁਣਿਆ ਗਿਆ WebView ਅਮਲ ਅਵੈਧ ਹੈ ਕਿਉਂਕਿ ਅਮਲ ਚੋਣਾਂ ਦੀ ਸੂਚੀ ਪੁਰਾਣੀ ਹੋ ਗਈ ਹੈ। ਸੂਚੀ ਨੂੰ ਹੁਣ ਅੱਪਡੇਟ ਕੀਤਾ ਜਾਣਾ ਚਾਹੀਦਾ ਹੈ।"</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-pl/strings.xml b/packages/SettingsLib/res/values-pl/strings.xml index cd4cc83bec89..b4c030dc6d8f 100644 --- a/packages/SettingsLib/res/values-pl/strings.xml +++ b/packages/SettingsLib/res/values-pl/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Uruchom WebView jako izolowany proces."</string> <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="8168796505966635684">"Wybrana implementacja WebView jest nieprawidłowa – lista implementacji do wyboru straciła ważność. Musisz zaktualizować listę."</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_enabled" msgid="2861258671151428346">"Przekształć…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Pliki są już zaszyfrowane"</string> diff --git a/packages/SettingsLib/res/values-pt-rBR/strings.xml b/packages/SettingsLib/res/values-pt-rBR/strings.xml index 64a97b9f0072..e76535a1f315 100644 --- a/packages/SettingsLib/res/values-pt-rBR/strings.xml +++ b/packages/SettingsLib/res/values-pt-rBR/strings.xml @@ -147,7 +147,7 @@ <string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string> <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuração quando o USB estiver conectado"</string> <string name="clear_adb_keys" msgid="4038889221503122743">"Revogar autorizações de depuração USB"</string> - <string name="bugreport_in_power" msgid="7923901846375587241">"Atalho para relatório de bugs"</string> + <string name="bugreport_in_power" msgid="7923901846375587241">"Atalho para relatório do bug"</string> <string name="bugreport_in_power_summary" msgid="1778455732762984579">"Mostrar um botão para gerar relatórios de bugs no menu do botão liga/desliga"</string> <string name="keep_screen_on" msgid="1146389631208760344">"Permanecer ativo"</string> <string name="keep_screen_on_summary" msgid="2173114350754293009">"A tela nunca entrará em inatividade enquanto estiver carregando."</string> @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Executar renderizadores de WebView em um processo isolado."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementação do WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Configurar implementação do WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"A implementação de WebView escolhida é inválida, porque a lista de opções de implementação estava desatualizada. A lista deve estar atualizada agora."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Esta opção não é mais válida. Tente novamente."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter para criptografia de arquivos"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converter..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Já criptografado com base em arquivos"</string> diff --git a/packages/SettingsLib/res/values-pt-rPT/strings.xml b/packages/SettingsLib/res/values-pt-rPT/strings.xml index b648589f8b4a..7e4744c996ea 100644 --- a/packages/SettingsLib/res/values-pt-rPT/strings.xml +++ b/packages/SettingsLib/res/values-pt-rPT/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Executar renderizadores WebView num processo isolado."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementação WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Definir implementação WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"A implementação WebView escolhida é inválida porque a lista de opções de implementação encontra-se desatualizada. A lista deve ser atualizada agora."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Esta opção já não é válida. Tente novamente."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter para a encriptação de ficheiros"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converter..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Os ficheiros já estão encriptados"</string> diff --git a/packages/SettingsLib/res/values-pt/strings.xml b/packages/SettingsLib/res/values-pt/strings.xml index 64a97b9f0072..e76535a1f315 100644 --- a/packages/SettingsLib/res/values-pt/strings.xml +++ b/packages/SettingsLib/res/values-pt/strings.xml @@ -147,7 +147,7 @@ <string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string> <string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuração quando o USB estiver conectado"</string> <string name="clear_adb_keys" msgid="4038889221503122743">"Revogar autorizações de depuração USB"</string> - <string name="bugreport_in_power" msgid="7923901846375587241">"Atalho para relatório de bugs"</string> + <string name="bugreport_in_power" msgid="7923901846375587241">"Atalho para relatório do bug"</string> <string name="bugreport_in_power_summary" msgid="1778455732762984579">"Mostrar um botão para gerar relatórios de bugs no menu do botão liga/desliga"</string> <string name="keep_screen_on" msgid="1146389631208760344">"Permanecer ativo"</string> <string name="keep_screen_on_summary" msgid="2173114350754293009">"A tela nunca entrará em inatividade enquanto estiver carregando."</string> @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Executar renderizadores de WebView em um processo isolado."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementação do WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Configurar implementação do WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"A implementação de WebView escolhida é inválida, porque a lista de opções de implementação estava desatualizada. A lista deve estar atualizada agora."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Esta opção não é mais válida. Tente novamente."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Converter para criptografia de arquivos"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Converter..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Já criptografado com base em arquivos"</string> diff --git a/packages/SettingsLib/res/values-ro/strings.xml b/packages/SettingsLib/res/values-ro/strings.xml index b0c50649573a..5b712d03033d 100644 --- a/packages/SettingsLib/res/values-ro/strings.xml +++ b/packages/SettingsLib/res/values-ro/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Rulați programele de redare WebView într-un proces izolat."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Implementare WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Setați implementarea WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Implementarea WebView aleasă nu este validă, deoarece lista cu alegerile pentru implementare s-a învechit. Lista ar trebui să fie actualizată acum."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Această opțiune nu mai este validă. Încercați din nou."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Faceți conversia la criptarea bazată pe sistemul de fișiere"</string> <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> diff --git a/packages/SettingsLib/res/values-ru/strings.xml b/packages/SettingsLib/res/values-ru/strings.xml index 4aa4c1006c64..b233c4cb7193 100644 --- a/packages/SettingsLib/res/values-ru/strings.xml +++ b/packages/SettingsLib/res/values-ru/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Выполнять обработчики 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="8168796505966635684">"Выбранный сервис 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> diff --git a/packages/SettingsLib/res/values-si-rLK/strings.xml b/packages/SettingsLib/res/values-si-rLK/strings.xml index b5053ddce0cf..c8af1443f661 100644 --- a/packages/SettingsLib/res/values-si-rLK/strings.xml +++ b/packages/SettingsLib/res/values-si-rLK/strings.xml @@ -248,8 +248,7 @@ <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> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <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> <string name="enable_freeform_support" msgid="1461893351278940416">"අනියම් හැඩැති කවුළු සබල කරන්න"</string> @@ -279,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"හුදකලා වූ ක්රියාවලියක 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="8168796505966635684">"තෝරන ලද WebView ක්රියාත්මක කිරීම ක්රියාත්මක කිරීම් තේරීම් ලැයිස්තු යල් පැන ඇති නිසා වලංගු නැත. ලැයිස්තුව දැන් යාවත්කාලීන කළ යුතුය."</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-sk/strings.xml b/packages/SettingsLib/res/values-sk/strings.xml index 852bd9e34dba..2c7a3b7d89f8 100644 --- a/packages/SettingsLib/res/values-sk/strings.xml +++ b/packages/SettingsLib/res/values-sk/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Spúšťať vykresľovacie moduly WebView v izolovanom procese."</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_toast_text" msgid="8168796505966635684">"Zvolená implementácia komponenta WebView nie je platná, pretože zoznam volieb implementácie nie je aktuálny. Zoznam by už mal byť aktualizovaný."</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_enabled" msgid="2861258671151428346">"Konvertovať…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Súbory sú už šifrované"</string> diff --git a/packages/SettingsLib/res/values-sl/strings.xml b/packages/SettingsLib/res/values-sl/strings.xml index 830399f48fb6..62797c39e29a 100644 --- a/packages/SettingsLib/res/values-sl/strings.xml +++ b/packages/SettingsLib/res/values-sl/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Izvajanje upodabljalnikov za WebView v ločenem procesu."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Izvedba spletnega pogleda"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Nastavitev izvedbe spletnega pogleda"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Izbrana izvedba komponente WebView je neveljavna zaradi zastaranja seznama izbir za izvedbo. Seznam bi zdaj moral biti posodobljen."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Ta izbira ni več veljavna. Poskusite znova."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Preklop na šifriranje podatkov"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Preklop …"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Šifriranje podatkov je že uveljavljeno"</string> diff --git a/packages/SettingsLib/res/values-sq-rAL/strings.xml b/packages/SettingsLib/res/values-sq-rAL/strings.xml index 10b91346968c..0a069de0c521 100644 --- a/packages/SettingsLib/res/values-sq-rAL/strings.xml +++ b/packages/SettingsLib/res/values-sq-rAL/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Ekzekuto renderizuesit e WebView në një proces të izoluar."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Zbatimi i WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Cakto zbatimin e WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Zbatimi i WebView të zgjedhur është i pavlefshëm sepse lista e zgjedhjeve të zbatimit është bërë e pavlefshme. Lista duhet të përditësohet tani."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Kjo zgjedhje nuk është më e vlefshme. Provo përsëri."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konverto në enkriptimin e skedarit"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konverto..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Enkriptimi i skedarit është kryer tashmë"</string> diff --git a/packages/SettingsLib/res/values-sr/strings.xml b/packages/SettingsLib/res/values-sr/strings.xml index 51b2b10ebf3c..61a87b51115a 100644 --- a/packages/SettingsLib/res/values-sr/strings.xml +++ b/packages/SettingsLib/res/values-sr/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Покрећите 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="8168796505966635684">"Изабрана примена 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> diff --git a/packages/SettingsLib/res/values-sv/strings.xml b/packages/SettingsLib/res/values-sv/strings.xml index c19f7f46209f..1de73175f4a0 100644 --- a/packages/SettingsLib/res/values-sv/strings.xml +++ b/packages/SettingsLib/res/values-sv/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Kör WebView-renderare i en isolerad bearbetning."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView-implementering"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Ange WebView-implementering"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Den valda WebView-implementeringen är ogiltig eftersom listan med implementeringsalternativ blev inaktuell. Listan ska nu ha uppdaterats."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Det här alternativet är inte längre giltigt. Försök igen."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Konvertera till filkryptering"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Konvertera …"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Filkryptering används redan"</string> diff --git a/packages/SettingsLib/res/values-sw/strings.xml b/packages/SettingsLib/res/values-sw/strings.xml index 091a447f05d0..c02c256195de 100644 --- a/packages/SettingsLib/res/values-sw/strings.xml +++ b/packages/SettingsLib/res/values-sw/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Tekeleza vitoaji huduma vya WebView katika mchakato mahususi."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Utekelezaji wa WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Weka utekelezaji wa WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Utekelezaji wa WebView uliochaguliwa si sahihi kwa sababu orodha ya chaguo za utekelezaji imepitwa na muda. Ni sharti usasishe orodha sasa."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Chaguo hili halipo tena. Jaribu tena."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Badilisha kuwa usimbaji fiche wa faili"</string> <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> diff --git a/packages/SettingsLib/res/values-ta-rIN/strings.xml b/packages/SettingsLib/res/values-ta-rIN/strings.xml index 105b98003e38..d28fe75c9b91 100644 --- a/packages/SettingsLib/res/values-ta-rIN/strings.xml +++ b/packages/SettingsLib/res/values-ta-rIN/strings.xml @@ -248,8 +248,7 @@ <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> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <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> <string name="enable_freeform_support" msgid="1461893351278940416">"குறிப்பிட்ட வடிவமில்லாத சாளரங்களை இயக்கு"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"தனிப்படுத்தப்பட்ட செயல்முறையில் 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="8168796505966635684">"தேர்வுசெய்த 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> diff --git a/packages/SettingsLib/res/values-te-rIN/strings.xml b/packages/SettingsLib/res/values-te-rIN/strings.xml index 91ee5fa9d2ca..9b6694cb2398 100644 --- a/packages/SettingsLib/res/values-te-rIN/strings.xml +++ b/packages/SettingsLib/res/values-te-rIN/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"ప్రత్యేకప్రాసెస్లో వెబ్ వీక్షణ రెండెరెర్లను అమలుచేస్తుంది."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"వెబ్ వీక్షణ అమలు"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"వెబ్ వీక్షణ అమలుని సెట్ చేయండి"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"అమలు ఎంపికల జాబితా కాలం చెల్లినది అయినందున ఎంచుకున్న వెబ్ వీక్షణ అమలు చెల్లదు. జాబితా ఇప్పుడు నవీకరించబడుతుంది."</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> diff --git a/packages/SettingsLib/res/values-th/strings.xml b/packages/SettingsLib/res/values-th/strings.xml index b5ec3d9ea381..5880b98071b6 100644 --- a/packages/SettingsLib/res/values-th/strings.xml +++ b/packages/SettingsLib/res/values-th/strings.xml @@ -248,8 +248,7 @@ <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> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <string name="force_allow_on_external_summary" msgid="3640752408258034689">"ทำให้สามารถเขียนแอปใดๆ ก็ตามไปยังพื้นที่เก็บข้อมูลภายนอกได้ โดยไม่คำนึงถึงค่าในไฟล์ Manifest"</string> <string name="force_resizable_activities" msgid="8615764378147824985">"บังคับให้กิจกรรมปรับขนาดได้"</string> <string name="force_resizable_activities_summary" msgid="6667493494706124459">"ทำให้กิจกรรมทั้งหมดปรับขนาดได้สำหรับหน้าต่างหลายบาน โดยไม่คำนึงถึงค่าในไฟล์ Manifest"</string> <string name="enable_freeform_support" msgid="1461893351278940416">"เปิดใช้หน้าต่างรูปแบบอิสระ"</string> @@ -279,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"เรียกใช้โหมดแสดงภาพ 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="8168796505966635684">"การใช้งาน WebView ที่เลือกไม่สามารถใช้ได้เนื่องจากรายการตัวเลือกการนำไปใช้ล้าสมัยแล้ว ควรอัปเดตรายการนี้ได้แล้ว"</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <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> diff --git a/packages/SettingsLib/res/values-tl/strings.xml b/packages/SettingsLib/res/values-tl/strings.xml index d3bcc5fde9b0..3764d229f697 100644 --- a/packages/SettingsLib/res/values-tl/strings.xml +++ b/packages/SettingsLib/res/values-tl/strings.xml @@ -248,8 +248,7 @@ <string name="show_all_anrs" msgid="28462979638729082">"Ipakita ang lahat ng ANR"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"App Not Responding dialog para sa background apps"</string> <string name="force_allow_on_external" msgid="3215759785081916381">"Pwersahang payagan ang mga app sa external"</string> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <string name="force_allow_on_external_summary" msgid="3640752408258034689">"Ginagawang kwalipikado ang anumang app na mailagay sa external na storage, anuman ang mga value ng manifest"</string> <string name="force_resizable_activities" msgid="8615764378147824985">"Sapilitang gawing resizable ang mga aktibidad"</string> <string name="force_resizable_activities_summary" msgid="6667493494706124459">"Gawing nare-resize ang lahat ng aktibidad para sa multi-window, anuman ang mga value ng manifest."</string> <string name="enable_freeform_support" msgid="1461893351278940416">"I-enable ang mga freeform window"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Tagapag-render ng WebView, patakbuhin sa hiwalay na proseso."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Pagpapatupad sa WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Itakda ang pagpapatupad sa WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Di-wasto ang piniling pag-implement ng WebView dahil luma na ang mga pagpipian ng pag-implement. Dapat na na-update na ngayon ang listahan."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Wala nang bisa ang napiling ito. Subukang muli."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"I-convert at gawing pag-encrypt ng file"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"I-convert..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Na-encrypt na ang file"</string> diff --git a/packages/SettingsLib/res/values-tr/strings.xml b/packages/SettingsLib/res/values-tr/strings.xml index a8f26202d7d3..0a2c654982c7 100644 --- a/packages/SettingsLib/res/values-tr/strings.xml +++ b/packages/SettingsLib/res/values-tr/strings.xml @@ -248,8 +248,7 @@ <string name="show_all_anrs" msgid="28462979638729082">"Tüm ANR\'leri göster"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"Arka plan uygulamalar için Uygulama Yanıt Vermiyor mesajını göster"</string> <string name="force_allow_on_external" msgid="3215759785081916381">"Harici birimdeki uygulamalara izin vermeye zorla"</string> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <string name="force_allow_on_external_summary" msgid="3640752408258034689">"Manifest değerlerinden bağımsız olarak uygulamaları harici depolamaya yazmak için uygun hale getirir"</string> <string name="force_resizable_activities" msgid="8615764378147824985">"Etkinlikleri yeniden boyutlandırılabilmeye zorla"</string> <string name="force_resizable_activities_summary" msgid="6667493494706124459">"Manifest değerlerinden bağımsız olarak, tüm etkinlikleri birden fazla pencerede yeniden boyutlandırılabilir yap."</string> <string name="enable_freeform_support" msgid="1461893351278940416">"Serbest biçimli pencereleri etkinleştir"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"WebView oluşturucuları yalıtılmış bir işlemde çalıştırın."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView kullanımı"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"WebView kullanımını ayarla"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Seçilen WebView uygulaması, uygulama seçenekleri listesi eskidiği için geçersiz. Listenin şimdi güncellenmesi gerekiyor."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Bu seçenek artık geçerli değil. Tekrar deneyin."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Dosya şifrelemeye dönüştür"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Dönüştür…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Dosya şifreleme zaten uygulandı"</string> diff --git a/packages/SettingsLib/res/values-uk/strings.xml b/packages/SettingsLib/res/values-uk/strings.xml index d094ef7f5617..5b88647cbead 100644 --- a/packages/SettingsLib/res/values-uk/strings.xml +++ b/packages/SettingsLib/res/values-uk/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Запустити засоби обробки відео 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="8168796505966635684">"Недійсне застосування 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> diff --git a/packages/SettingsLib/res/values-ur-rPK/strings.xml b/packages/SettingsLib/res/values-ur-rPK/strings.xml index 27046dc6c60e..e0667360d3f6 100644 --- a/packages/SettingsLib/res/values-ur-rPK/strings.xml +++ b/packages/SettingsLib/res/values-ur-rPK/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"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="8168796505966635684">"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> diff --git a/packages/SettingsLib/res/values-uz-rUZ/strings.xml b/packages/SettingsLib/res/values-uz-rUZ/strings.xml index 031f8f7ce864..23e8b0f4d3d9 100644 --- a/packages/SettingsLib/res/values-uz-rUZ/strings.xml +++ b/packages/SettingsLib/res/values-uz-rUZ/strings.xml @@ -278,7 +278,8 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"WebView renderlovchilarini alohida jarayonda ishga tushirish."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"WebView ta’minotchisi"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"WebView ta’minotchisini sozlash"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Tanlangan WebView xizmati qo‘llab-quvvatlanmaydi. Xizmatlar ro‘yxati eskirgan va hozir ular yangilanadi."</string> + <!-- no translation found for select_webview_provider_toast_text (5466970498308266359) --> + <skip /> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Faylli shifrga o‘girish"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"O‘girish…"</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Fayl allaqachon shifrlangan"</string> diff --git a/packages/SettingsLib/res/values-vi/strings.xml b/packages/SettingsLib/res/values-vi/strings.xml index f3fb96a353a8..27dd482812f6 100644 --- a/packages/SettingsLib/res/values-vi/strings.xml +++ b/packages/SettingsLib/res/values-vi/strings.xml @@ -248,8 +248,7 @@ <string name="show_all_anrs" msgid="28462979638729082">"Hiển thị tất cả ANR"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"Hiện hộp thoại Ứng dụng ko đáp ứng cho ứng dụng nền"</string> <string name="force_allow_on_external" msgid="3215759785081916381">"Buộc cho phép các ứng dụng trên bộ nhớ ngoài"</string> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <string name="force_allow_on_external_summary" msgid="3640752408258034689">"Giúp mọi ứng dụng đủ điều kiện để được ghi vào bộ nhớ ngoài, bất kể giá trị tệp kê khai là gì"</string> <string name="force_resizable_activities" msgid="8615764378147824985">"Buộc các hoạt động có thể thay đổi kích thước"</string> <string name="force_resizable_activities_summary" msgid="6667493494706124459">"Giúp tất cả hoạt động có thể thay đổi kích thước cho nhiều cửa sổ bất kể giá trị tệp kê khai là gì."</string> <string name="enable_freeform_support" msgid="1461893351278940416">"Bật cửa sổ dạng tự do"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Chạy kết xuất đồ họa WebView trong quy trình tách biệt."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Triển khai WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Đặt triển khai WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Triển khai WebView đã chọn không hợp lệ vì danh sách lựa chọn triển khai đã cũ. Phải cập nhật danh sách ngay bây giờ."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Lựa chọn này không còn hợp lệ nữa. Hãy thử lại."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Chuyển đổi sang mã hóa tệp"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Chuyển đổi..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Đã mã hóa tệp"</string> diff --git a/packages/SettingsLib/res/values-zh-rCN/strings.xml b/packages/SettingsLib/res/values-zh-rCN/strings.xml index 348a319ebec6..73cd252cd09a 100644 --- a/packages/SettingsLib/res/values-zh-rCN/strings.xml +++ b/packages/SettingsLib/res/values-zh-rCN/strings.xml @@ -248,8 +248,7 @@ <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> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <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">"将所有 Activity 设为可配合多窗口环境调整大小（忽略清单值）。"</string> <string name="enable_freeform_support" msgid="1461893351278940416">"启用可自由调整的窗口"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"在独立进程中运行 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="8168796505966635684">"所选的 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> diff --git a/packages/SettingsLib/res/values-zh-rHK/strings.xml b/packages/SettingsLib/res/values-zh-rHK/strings.xml index 6adabc986f37..944082f0ed1f 100644 --- a/packages/SettingsLib/res/values-zh-rHK/strings.xml +++ b/packages/SettingsLib/res/values-zh-rHK/strings.xml @@ -248,8 +248,7 @@ <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> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <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> <string name="enable_freeform_support" msgid="1461893351278940416">"啟用自由形態視窗"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"在獨立的處理程序中執行 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="8168796505966635684">"WebView 的設定選項清單已過時，因此您所選的 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> diff --git a/packages/SettingsLib/res/values-zh-rTW/strings.xml b/packages/SettingsLib/res/values-zh-rTW/strings.xml index f4aade029aa7..dc029d91fbec 100644 --- a/packages/SettingsLib/res/values-zh-rTW/strings.xml +++ b/packages/SettingsLib/res/values-zh-rTW/strings.xml @@ -248,8 +248,7 @@ <string name="show_all_anrs" msgid="28462979638729082">"顯示所有無回應程式"</string> <string name="show_all_anrs_summary" msgid="641908614413544127">"為背景應用程式顯示「應用程式無回應」對話方塊"</string> <string name="force_allow_on_external" msgid="3215759785081916381">"強制允許將應用程式寫入外部儲存空間"</string> - <!-- no translation found for force_allow_on_external_summary (3640752408258034689) --> - <skip /> + <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> <string name="enable_freeform_support" msgid="1461893351278940416">"啟用自由形式視窗"</string> @@ -279,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"在獨立的處理程序中執行 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="8168796505966635684">"您所選的 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> diff --git a/packages/SettingsLib/res/values-zu/strings.xml b/packages/SettingsLib/res/values-zu/strings.xml index 268cdb2b809e..9ba957aa5ac0 100644 --- a/packages/SettingsLib/res/values-zu/strings.xml +++ b/packages/SettingsLib/res/values-zu/strings.xml @@ -278,7 +278,7 @@ <string name="enable_webview_multiprocess_desc" msgid="852226124223847283">"Sebenzisa abasebenzeli be-WebView kwinqubo ekhethiwe."</string> <string name="select_webview_provider_title" msgid="4628592979751918907">"Ukufakwa ke-WebView"</string> <string name="select_webview_provider_dialog_title" msgid="4370551378720004872">"Sesba ukufakwa kwe-WebView"</string> - <string name="select_webview_provider_toast_text" msgid="8168796505966635684">"Ukusetshenziswa okukhethiwe kwe-WebView akuvumelekile ngoba uhlu lokukhetha ukusetshenziswa lukhule lwaba ludala. Uhlu kumele manje libuyekezwe."</string> + <string name="select_webview_provider_toast_text" msgid="5466970498308266359">"Lokhu kukhetha akusavumelekile. Zama futhi."</string> <string name="convert_to_file_encryption" msgid="3060156730651061223">"Phendulisela ekubethelweni kwefayela"</string> <string name="convert_to_file_encryption_enabled" msgid="2861258671151428346">"Iyaphendulela..."</string> <string name="convert_to_file_encryption_done" msgid="7859766358000523953">"Sekuvele kubethelwe ngefayela"</string> diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index 1aee490593e6..a2a3fd39128b 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -793,4 +793,23 @@ <!-- Label for length of time until battery is charged [CHAR LIMIT=20] --> <string name="remaining_length_format"><xliff:g name="time" example="3 hours">%1$s</xliff:g> left</string> + <!-- Hint text for the IP address --> + <string name="wifi_ip_address_hint" translatable="false">192.168.1.128</string> + <!-- Hint text for DNS --> + <string name="wifi_dns1_hint" translatable="false">8.8.8.8</string> + <!-- Hint text for DNS --> + <string name="wifi_dns2_hint" translatable="false">8.8.4.4</string> + <!-- Hint text for the gateway --> + <string name="wifi_gateway_hint" translatable="false">192.168.1.1</string> + <!-- Hint text for network prefix length --> + <string name="wifi_network_prefix_length_hint" translatable="false">24</string> + <!-- HTTP proxy settings. The hint text field for port. --> + <string name="proxy_port_hint" translatable="false">8080</string> + <!-- HTTP proxy settings. Hint for Proxy-Auto Config URL. --> + <string name="proxy_url_hint" translatable="false">https://www.example.com/proxy.pac</string> + <!-- HTTP proxy settings. The hint text for proxy exclusion list. --> + <string name="proxy_exclusionlist_hint" translatable="false">example.com,mycomp.test.com,localhost</string> + <!-- HTTP proxy settings. The hint text field for the hostname. --> + <string name="proxy_hostname_hint" translatable="false">proxy.example.com</string> + </resources> diff --git a/packages/SettingsProvider/res/values-be-rBY/defaults.xml b/packages/SettingsProvider/res/values-be-rBY/defaults.xml new file mode 100644 index 000000000000..4a87a1250404 --- /dev/null +++ b/packages/SettingsProvider/res/values-be-rBY/defaults.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="def_device_name" msgid="6309317409634339402">"%1$s %2$s"</string> + <string name="def_device_name_simple" msgid="9037785625140748221">"%1$s"</string> + <string name="def_nfc_payment_component" msgid="5861297439873026958"></string> +</resources> diff --git a/packages/SettingsProvider/res/values-be-rBY/strings.xml b/packages/SettingsProvider/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..c164ac7b22d8 --- /dev/null +++ b/packages/SettingsProvider/res/values-be-rBY/strings.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2007, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_label" msgid="4567566098528588863">"Захоўванне налад"</string> +</resources> diff --git a/packages/SettingsProvider/res/values-bs-rBA/strings.xml b/packages/SettingsProvider/res/values-bs-rBA/strings.xml new file mode 100644 index 000000000000..464a29f17ad2 --- /dev/null +++ b/packages/SettingsProvider/res/values-bs-rBA/strings.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2007, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_label" msgid="4567566098528588863">"Postavke za pohranu podataka"</string> +</resources> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 743912a12935..987b5ea2db09 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -207,10 +207,6 @@ public class SettingsProvider extends ContentProvider { @Override public Bundle call(String method, String name, Bundle args) { - // If the remote side sent us bad parcelables, they won't get the - // results they want, which is their loss. - if (args != null) args.setDefusable(true); - final int requestingUserId = getRequestingUserId(args); switch (method) { case Settings.CALL_METHOD_GET_GLOBAL: { diff --git a/packages/Shell/res/values-be-rBY/strings.xml b/packages/Shell/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..5aaa80a1aa6e --- /dev/null +++ b/packages/Shell/res/values-be-rBY/strings.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2013 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_label" msgid="3701846017049540910">"Абалонка"</string> + <string name="bugreport_in_progress_title" msgid="4311705936714972757">"Справаздача <xliff:g id="ID">#%d</xliff:g> пра памылку генерыруецца"</string> + <string name="bugreport_finished_title" msgid="4429132808670114081">"Справаздача <xliff:g id="ID">#%d</xliff:g> пра памылку зафіксавана"</string> + <string name="bugreport_finished_pending_screenshot_title" msgid="5460883450679439591">"Справ. пра памылку <xliff:g id="ID">#%d</xliff:g> зафікс., але скрыншот чакаецца"</string> + <string name="bugreport_updating_title" msgid="4423539949559634214">"Дадаванне падрабязнасцей да справаздачы пра памылкі"</string> + <string name="bugreport_updating_wait" msgid="3322151947853929470">"Калі ласка, пачакайце..."</string> + <string name="bugreport_finished_text" product="watch" msgid="8389172248433597683">"Правядзіце пальцам налева, каб абагуліць сваю справаздачу пра памылку"</string> + <string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Дакраніцеся, каб абагуліць сваю справаздачу пра памылку"</string> + <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Краніце, каб абагуліць справаздачу пра памылку без здымка экрана, або чакайце атрымання здымка."</string> + <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Краніце, каб абагуліць справаздачу пра памылку без здымка экрана, або чакайце атрымання здымка."</string> + <string name="bugreport_confirm" msgid="5130698467795669780">"Справаздача пра памылку ўтрымлівае дадзеныя з гiсторыi сістэмных файлаў, у тым ліку персанальную і прыватную інфармацыю. Дзялiцеся справаздачамi пра збоi толькi з праверанымi карыстальнiкамi i прыкладаннямi."</string> + <string name="bugreport_confirm_repeat" msgid="4926842460688645058">"У наступны раз паказваць гэта паведамленне"</string> + <string name="bugreport_storage_title" msgid="5332488144740527109">"Справадзачы пра памылкі"</string> + <string name="bugreport_unreadable_text" msgid="586517851044535486">"Немагчыма прачытаць файл справаздачы пра памылкі"</string> + <string name="bugreport_unnamed" msgid="2800582406842092709">"без назвы"</string> + <string name="bugreport_info_action" msgid="2158204228510576227">"Падрабязнасці"</string> + <string name="bugreport_screenshot_action" msgid="8677781721940614995">"Здымак экрана"</string> + <string name="bugreport_screenshot_taken" msgid="5684211273096253120">"Здымак экрана зроблены паспяхова."</string> + <string name="bugreport_screenshot_failed" msgid="5853049140806834601">"Немагчыма зрабіць здымак экрана."</string> + <string name="bugreport_info_dialog_title" msgid="1355948594292983332">"Падрабязныя звесткі аб справаздачы <xliff:g id="ID">#%d</xliff:g> пра памылку"</string> + <string name="bugreport_info_name" msgid="4414036021935139527">"Назва файла"</string> + <string name="bugreport_info_title" msgid="2306030793918239804">"Назва справаздачы пра памылкі"</string> + <string name="bugreport_info_description" msgid="5072835127481627722">"Зводка справаздачы пра памылкі"</string> + <string name="save" msgid="4781509040564835759">"Захаваць"</string> +</resources> diff --git a/packages/Shell/src/com/android/shell/BugreportProgressService.java b/packages/Shell/src/com/android/shell/BugreportProgressService.java index 7fae0ee6b660..c9582ea1aa51 100644 --- a/packages/Shell/src/com/android/shell/BugreportProgressService.java +++ b/packages/Shell/src/com/android/shell/BugreportProgressService.java @@ -149,6 +149,10 @@ public class BugreportProgressService extends Service { // Passed to Message.obtain() when msg.arg2 is not used. private static final int UNUSED_ARG2 = -2; + // Maximum progress displayed (like 99.00%). + private static final int CAPPED_PROGRESS = 9900; + private static final int CAPPED_MAX = 10000; + /** * Delay before a screenshot is taken. * <p> @@ -427,7 +431,7 @@ public class BugreportProgressService extends Service { final NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMinimumFractionDigits(2); nf.setMaximumFractionDigits(2); - final String percentText = nf.format((double) info.progress / info.max); + final String percentageText = nf.format((double) info.progress / info.max); final Action cancelAction = new Action.Builder(null, mContext.getString( com.android.internal.R.string.cancel), newCancelIntent(mContext, info)).build(); final Intent infoIntent = new Intent(mContext, BugreportProgressService.class); @@ -458,7 +462,7 @@ public class BugreportProgressService extends Service { .setContentTitle(title) .setTicker(title) .setContentText(name) - .setContentInfo(percentText) + .setContentInfo(percentageText) .setProgress(info.max, info.progress, false) .setOngoing(true) .setContentIntent(infoPendingIntent) @@ -472,7 +476,7 @@ public class BugreportProgressService extends Service { } if (DEBUG) { Log.d(TAG, "Sending 'Progress' notification for id " + info.id + "(pid " + info.pid - + "): " + percentText); + + "): " + percentageText); } NotificationManager.from(mContext).notify(TAG, info.id, notification); } @@ -545,25 +549,47 @@ public class BugreportProgressService extends Service { } activeProcesses++; final String progressKey = DUMPSTATE_PREFIX + pid + PROGRESS_SUFFIX; - final int progress = SystemProperties.getInt(progressKey, 0); - if (progress == 0) { + info.realProgress = SystemProperties.getInt(progressKey, 0); + if (info.realProgress == 0) { Log.v(TAG, "System property " + progressKey + " is not set yet"); } - final int max = SystemProperties.getInt(DUMPSTATE_PREFIX + pid + MAX_SUFFIX, 0); - final boolean maxChanged = max > 0 && max != info.max; - final boolean progressChanged = progress > 0 && progress != info.progress; - - if (progressChanged || maxChanged) { - if (progressChanged) { - if (DEBUG) Log.v(TAG, "Updating progress for PID " + pid + "(id: " + id - + ") from " + info.progress + " to " + progress); - info.progress = progress; - } - if (maxChanged) { - Log.i(TAG, "Updating max progress for PID " + pid + "(id: " + id - + ") from " + info.max + " to " + max); - info.max = max; + final String maxKey = DUMPSTATE_PREFIX + pid + MAX_SUFFIX; + info.realMax = SystemProperties.getInt(maxKey, info.max); + if (info.realMax <= 0 ) { + Log.w(TAG, "Property " + maxKey + " is not positive: " + info.max); + continue; + } + /* + * Checks whether the progress changed in a way that should be displayed to the user: + * - info.progress / info.max represents the displayed progress + * - info.realProgress / info.realMax represents the real progress + * - since the real progress can decrease, the displayed progress is only updated if it + * increases + * - the displayed progress is capped at a maximum (like 99%) + */ + final int oldPercentage = (CAPPED_MAX * info.progress) / info.max; + int newPercentage = (CAPPED_MAX * info.realProgress) / info.realMax; + int max = info.realMax; + int progress = info.realProgress; + + if (newPercentage > CAPPED_PROGRESS) { + progress = newPercentage = CAPPED_PROGRESS; + max = CAPPED_MAX; + } + + if (newPercentage > oldPercentage) { + if (DEBUG) { + if (progress != info.progress) { + Log.v(TAG, "Updating progress for PID " + pid + "(id: " + id + ") from " + + info.progress + " to " + progress); + } + if (max != info.max) { + Log.v(TAG, "Updating max progress for PID " + pid + "(id: " + id + ") from " + + info.max + " to " + max); + } } + info.progress = progress; + info.max = max; info.lastUpdate = System.currentTimeMillis(); updateProgress(info); } else { @@ -1450,16 +1476,26 @@ public class BugreportProgressService extends Service { String description; /** - * Maximum progress of the bugreport generation. + * Maximum progress of the bugreport generation as displayed by the UI. */ int max; /** - * Current progress of the bugreport generation. + * Current progress of the bugreport generation as displayed by the UI. */ int progress; /** + * Maximum progress of the bugreport generation as reported by dumpstate. + */ + int realMax; + + /** + * Current progress of the bugreport generation as reported by dumpstate. + */ + int realProgress; + + /** * Time of the last progress update. */ long lastUpdate = System.currentTimeMillis(); @@ -1568,10 +1604,12 @@ public class BugreportProgressService extends Service { @Override public String toString() { final float percent = ((float) progress * 100 / max); + final float realPercent = ((float) realProgress * 100 / realMax); return "id: " + id + ", pid: " + pid + ", name: " + name + ", finished: " + finished + "\n\ttitle: " + title + "\n\tdescription: " + description + "\n\tfile: " + bugreportFile + "\n\tscreenshots: " + screenshotFiles + "\n\tprogress: " + progress + "/" + max + " (" + percent + ")" + + "\n\treal progress: " + realProgress + "/" + realMax + " (" + realPercent + ")" + "\n\tlast_update: " + getFormattedLastUpdate() + "\naddingDetailsToZip: " + addingDetailsToZip + " addedDetailsToZip: " + addedDetailsToZip; @@ -1587,6 +1625,8 @@ public class BugreportProgressService extends Service { description = in.readString(); max = in.readInt(); progress = in.readInt(); + realMax = in.readInt(); + realProgress = in.readInt(); lastUpdate = in.readLong(); formattedLastUpdate = in.readString(); bugreportFile = readFile(in); @@ -1609,6 +1649,8 @@ public class BugreportProgressService extends Service { dest.writeString(description); dest.writeInt(max); dest.writeInt(progress); + dest.writeInt(realMax); + dest.writeInt(realProgress); dest.writeLong(lastUpdate); dest.writeString(getFormattedLastUpdate()); writeFile(dest, bugreportFile); diff --git a/packages/Shell/src/com/android/shell/BugreportStorageProvider.java b/packages/Shell/src/com/android/shell/BugreportStorageProvider.java index 49759c5f6ee1..814aa8cb8c06 100644 --- a/packages/Shell/src/com/android/shell/BugreportStorageProvider.java +++ b/packages/Shell/src/com/android/shell/BugreportStorageProvider.java @@ -56,7 +56,7 @@ public class BugreportStorageProvider extends DocumentsProvider { final MatrixCursor result = new MatrixCursor(resolveRootProjection(projection)); final RowBuilder row = result.newRow(); row.add(Root.COLUMN_ROOT_ID, DOC_ID_ROOT); - row.add(Root.COLUMN_FLAGS, Root.FLAG_LOCAL_ONLY); + row.add(Root.COLUMN_FLAGS, Root.FLAG_LOCAL_ONLY | Root.FLAG_ADVANCED); row.add(Root.COLUMN_ICON, android.R.mipmap.sym_def_app_icon); row.add(Root.COLUMN_TITLE, getContext().getString(R.string.bugreport_storage_title)); row.add(Root.COLUMN_DOCUMENT_ID, DOC_ID_ROOT); diff --git a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java index 17f6f6b5ac89..e1e0c3b448b7 100644 --- a/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java +++ b/packages/Shell/tests/src/com/android/shell/BugreportReceiverTest.java @@ -26,6 +26,7 @@ import static com.android.shell.BugreportProgressService.EXTRA_PID; import static com.android.shell.BugreportProgressService.EXTRA_SCREENSHOT; import static com.android.shell.BugreportProgressService.INTENT_BUGREPORT_FINISHED; import static com.android.shell.BugreportProgressService.INTENT_BUGREPORT_STARTED; +import static com.android.shell.BugreportProgressService.POLLING_FREQUENCY; import static com.android.shell.BugreportProgressService.SCREENSHOT_DELAY_SECONDS; import java.io.BufferedOutputStream; @@ -92,7 +93,7 @@ public class BugreportReceiverTest extends InstrumentationTestCase { private static final String TAG = "BugreportReceiverTest"; // Timeout for UI operations, in milliseconds. - private static final int TIMEOUT = (int) BugreportProgressService.POLLING_FREQUENCY * 4; + private static final int TIMEOUT = (int) POLLING_FREQUENCY * 4; // Timeout for when waiting for a screenshot to finish. private static final int SAFE_SCREENSHOT_DELAY = SCREENSHOT_DELAY_SECONDS + 10; @@ -190,8 +191,30 @@ public class BugreportReceiverTest extends InstrumentationTestCase { SystemProperties.set(PROGRESS_PROPERTY, "500"); assertProgressNotification(NAME, nf.format(0.50)); + SystemProperties.set(PROGRESS_PROPERTY, "950"); + assertProgressNotification(NAME, nf.format(0.95)); + + // Make sure progress never goes back... SystemProperties.set(MAX_PROPERTY, "2000"); - assertProgressNotification(NAME, nf.format(0.25)); + Thread.sleep(POLLING_FREQUENCY + DateUtils.SECOND_IN_MILLIS); + assertProgressNotification(NAME, nf.format(0.95)); + + SystemProperties.set(PROGRESS_PROPERTY, "1000"); + assertProgressNotification(NAME, nf.format(0.95)); + + // ...only forward... + SystemProperties.set(PROGRESS_PROPERTY, "1902"); + assertProgressNotification(NAME, nf.format(0.9510)); + + SystemProperties.set(PROGRESS_PROPERTY, "1960"); + assertProgressNotification(NAME, nf.format(0.98)); + + // ...but never more than the capped value. + SystemProperties.set(PROGRESS_PROPERTY, "2000"); + assertProgressNotification(NAME, nf.format(0.99)); + + SystemProperties.set(PROGRESS_PROPERTY, "3000"); + assertProgressNotification(NAME, nf.format(0.99)); Bundle extras = sendBugreportFinishedAndGetSharedIntent(ID, mPlainTextPath, mScreenshotPath); diff --git a/packages/Shell/tests/src/com/android/shell/UiBot.java b/packages/Shell/tests/src/com/android/shell/UiBot.java index 384c3daa51c9..5bfe1a084bc4 100644 --- a/packages/Shell/tests/src/com/android/shell/UiBot.java +++ b/packages/Shell/tests/src/com/android/shell/UiBot.java @@ -32,7 +32,7 @@ import static junit.framework.Assert.assertTrue; final class UiBot { private static final String TAG = "UiBot"; - private static final String SYSTEMUI_PACKAGED = "com.android.systemui"; + private static final String SYSTEMUI_PACKAGE = "com.android.systemui"; private final UiDevice mDevice; private final int mTimeout; @@ -51,8 +51,8 @@ final class UiBot { public UiObject getNotification(String text) { boolean opened = mDevice.openNotification(); Log.v(TAG, "openNotification(): " + opened); - boolean gotIt = mDevice.wait(Until.hasObject(By.pkg(SYSTEMUI_PACKAGED)), mTimeout); - assertTrue("could not get system ui (" + SYSTEMUI_PACKAGED + ")", gotIt); + boolean gotIt = mDevice.wait(Until.hasObject(By.pkg(SYSTEMUI_PACKAGE)), mTimeout); + assertTrue("could not get system ui (" + SYSTEMUI_PACKAGE + ")", gotIt); return getObject(text); } diff --git a/packages/SystemUI/AndroidManifest.xml b/packages/SystemUI/AndroidManifest.xml index 073cf14d8b59..589eac65350b 100644 --- a/packages/SystemUI/AndroidManifest.xml +++ b/packages/SystemUI/AndroidManifest.xml @@ -156,6 +156,9 @@ <!-- TV picture-in-picture --> <uses-permission android:name="android.permission.RECEIVE_MEDIA_RESOURCE_USAGE" /> + <!-- DND access --> + <uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS" /> + <application android:name=".SystemUIApplication" android:persistent="true" diff --git a/packages/SystemUI/res/drawable-hdpi/ic_cancel_white_24dp.png b/packages/SystemUI/res/drawable-hdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 000000000000..73f5116bd71f --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_cancel_white_24dp.png diff --git a/packages/SystemUI/res/drawable-hdpi/ic_sysbar_docked.png b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_docked.png Binary files differnew file mode 100755 index 000000000000..0622ddc420e3 --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/ic_sysbar_docked.png diff --git a/packages/SystemUI/res/drawable-land-hdpi/ic_sysbar_docked.png b/packages/SystemUI/res/drawable-land-hdpi/ic_sysbar_docked.png Binary files differnew file mode 100755 index 000000000000..c03ad203f47b --- /dev/null +++ b/packages/SystemUI/res/drawable-land-hdpi/ic_sysbar_docked.png diff --git a/packages/SystemUI/res/drawable-land-xhdpi/ic_sysbar_docked.png b/packages/SystemUI/res/drawable-land-xhdpi/ic_sysbar_docked.png Binary files differnew file mode 100755 index 000000000000..bfe2b4a973c6 --- /dev/null +++ b/packages/SystemUI/res/drawable-land-xhdpi/ic_sysbar_docked.png diff --git a/packages/SystemUI/res/drawable-land-xxhdpi/ic_sysbar_docked.png b/packages/SystemUI/res/drawable-land-xxhdpi/ic_sysbar_docked.png Binary files differnew file mode 100755 index 000000000000..5ed0ee8c74f7 --- /dev/null +++ b/packages/SystemUI/res/drawable-land-xxhdpi/ic_sysbar_docked.png diff --git a/packages/SystemUI/res/drawable-land-xxxhdpi/ic_sysbar_docked.png b/packages/SystemUI/res/drawable-land-xxxhdpi/ic_sysbar_docked.png Binary files differnew file mode 100755 index 000000000000..d1811629f417 --- /dev/null +++ b/packages/SystemUI/res/drawable-land-xxxhdpi/ic_sysbar_docked.png diff --git a/packages/SystemUI/res/drawable-land/ic_sysbar_docked.png b/packages/SystemUI/res/drawable-land/ic_sysbar_docked.png Binary files differnew file mode 100755 index 000000000000..236b70afffef --- /dev/null +++ b/packages/SystemUI/res/drawable-land/ic_sysbar_docked.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_cancel_white_24dp.png b/packages/SystemUI/res/drawable-mdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 000000000000..787e2593789b --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_cancel_white_24dp.png diff --git a/packages/SystemUI/res/drawable-mdpi/ic_sysbar_docked.png b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_docked.png Binary files differnew file mode 100755 index 000000000000..93d1905d8c48 --- /dev/null +++ b/packages/SystemUI/res/drawable-mdpi/ic_sysbar_docked.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_cancel_white_24dp.png b/packages/SystemUI/res/drawable-xhdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 000000000000..6ebbc831605f --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_cancel_white_24dp.png diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_docked.png b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_docked.png Binary files differnew file mode 100755 index 000000000000..73ddde86cda4 --- /dev/null +++ b/packages/SystemUI/res/drawable-xhdpi/ic_sysbar_docked.png diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_docked.png b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_docked.png Binary files differnew file mode 100755 index 000000000000..1e84732f755a --- /dev/null +++ b/packages/SystemUI/res/drawable-xxhdpi/ic_sysbar_docked.png diff --git a/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_docked.png b/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_docked.png Binary files differindex f3be2ee1ecb0..ee3ffde568bc 100644..100755 --- a/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_docked.png +++ b/packages/SystemUI/res/drawable-xxxhdpi/ic_sysbar_docked.png diff --git a/packages/SystemUI/res/drawable/ic_send.xml b/packages/SystemUI/res/drawable/ic_send.xml index b1c791449e73..6ce3672e89ca 100644 --- a/packages/SystemUI/res/drawable/ic_send.xml +++ b/packages/SystemUI/res/drawable/ic_send.xml @@ -14,6 +14,7 @@ Copyright (C) 2014 The Android Open Source Project limitations under the License. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" + android:autoMirrored="true" android:width="24.0dp" android:height="24.0dp" android:viewportWidth="48.0" diff --git a/packages/SystemUI/res/layout/hybrid_notification.xml b/packages/SystemUI/res/layout/hybrid_notification.xml index f6678593084c..476f52b11c0f 100644 --- a/packages/SystemUI/res/layout/hybrid_notification.xml +++ b/packages/SystemUI/res/layout/hybrid_notification.xml @@ -21,7 +21,7 @@ android:layout_height="wrap_content" android:paddingStart="@*android:dimen/notification_content_margin_start" android:paddingEnd="12dp" - android:gravity="bottom"> + android:gravity="bottom|start"> <TextView android:id="@+id/notification_title" android:layout_width="wrap_content" diff --git a/packages/SystemUI/res/layout/hybrid_overflow_number.xml b/packages/SystemUI/res/layout/hybrid_overflow_number.xml new file mode 100644 index 000000000000..f3dde8dcd455 --- /dev/null +++ b/packages/SystemUI/res/layout/hybrid_overflow_number.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2016 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<TextView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/notification_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@*android:style/TextAppearance.Material.Notification" + android:paddingEnd="@*android:dimen/notification_content_margin_end" + android:gravity="end" + android:singleLine="true" + />
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/notification_guts.xml b/packages/SystemUI/res/layout/notification_guts.xml index 1ab6bf9f22ce..062ae35d2750 100644 --- a/packages/SystemUI/res/layout/notification_guts.xml +++ b/packages/SystemUI/res/layout/notification_guts.xml @@ -31,12 +31,12 @@ <!-- header --> <LinearLayout android:layout_width="match_parent" - android:layout_height="30dp" - android:paddingTop="9dp" + android:layout_height="wrap_content" + android:paddingTop="14dp" android:paddingEnd="8dp" android:id="@+id/notification_guts_header" android:orientation="horizontal" - android:layout_gravity="center_vertical|start"> + android:layout_gravity="start"> <ImageView android:id="@+id/app_icon" @@ -64,7 +64,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:paddingTop="4dp" - android:paddingBottom="16dip" android:paddingEnd="8dp" > <RadioButton android:id="@+id/silent_importance" @@ -99,7 +98,6 @@ android:orientation="vertical" android:clickable="false" android:focusable="false" - android:paddingBottom="8dip" android:paddingEnd="8dp" android:visibility="gone"> <TextView @@ -166,13 +164,14 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="end" + android:paddingTop="16dp" android:paddingBottom="8dp" > <TextView android:id="@+id/more_settings" android:text="@string/notification_more_settings" android:layout_width="wrap_content" - android:layout_height="48dp" + android:layout_height="36dp" style="@style/TextAppearance.NotificationGuts.Button" android:background="@drawable/btn_borderless_rect" android:gravity="center" @@ -184,7 +183,7 @@ android:id="@+id/done" android:text="@string/notification_done" android:layout_width="wrap_content" - android:layout_height="48dp" + android:layout_height="36dp" style="@style/TextAppearance.NotificationGuts.Button" android:background="@drawable/btn_borderless_rect" android:gravity="center" diff --git a/packages/SystemUI/res/layout/qs_detail.xml b/packages/SystemUI/res/layout/qs_detail.xml index 858f48737544..3358a1869bdf 100644 --- a/packages/SystemUI/res/layout/qs_detail.xml +++ b/packages/SystemUI/res/layout/qs_detail.xml @@ -17,7 +17,6 @@ <!-- Extends LinearLayout --> <com.android.systemui.qs.QSDetail xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:background="@drawable/qs_detail_background" @@ -41,7 +40,6 @@ android:background="@color/qs_detail_progress_track" android:layout_width="match_parent" android:layout_height="wrap_content" - systemui:hasOverlappingRendering="false" /> <FrameLayout diff --git a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml index 0a9baa0aac09..cb861ec0a6e2 100644 --- a/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml @@ -184,7 +184,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - systemui:hasOverlappingRendering="false" /> <TextView diff --git a/packages/SystemUI/res/layout/recents_on_tv.xml b/packages/SystemUI/res/layout/recents_on_tv.xml index 567e009d07ee..f0bfebe7ef7c 100644 --- a/packages/SystemUI/res/layout/recents_on_tv.xml +++ b/packages/SystemUI/res/layout/recents_on_tv.xml @@ -28,26 +28,21 @@ android:clipChildren="false" android:clipToPadding="false" android:descendantFocusability="beforeDescendants" - android:layout_gravity="center" - android:gravity="center" - android:paddingStart="@dimen/recents_tv_grid_row_padding" - android:paddingEnd="@dimen/recents_tv_grid_row_padding" + android:layout_marginTop="@dimen/recents_tv_gird_row_top_margin" android:focusable="true" /> - <View android:id="@+id/pip_shade" android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="invisible" + android:visibility="gone" android:background="#76000000"/> <!-- Placeholder view to handle key events for PIP when it's focused. - Size and positions will be adjusted to comply with - config_pictureInPictureBoundsInRecents --> + Size and positions will be adjusted to comply with the PIP bounds --> <View android:id="@+id/pip" android:layout_width="0dp" android:layout_height="0dp" - android:visibility="invisible" + android:visibility="gone" android:focusable="true" /> </com.android.systemui.recents.tv.views.RecentsTvView> diff --git a/packages/SystemUI/res/layout/recents_tv_task_card_view.xml b/packages/SystemUI/res/layout/recents_tv_task_card_view.xml index 54e97da1471e..766ef602293a 100644 --- a/packages/SystemUI/res/layout/recents_tv_task_card_view.xml +++ b/packages/SystemUI/res/layout/recents_tv_task_card_view.xml @@ -21,9 +21,11 @@ android:focusableInTouchMode="true" android:layout_gravity="center" android:layout_centerInParent="true" + android:orientation="vertical" android:layoutDirection="ltr"> <LinearLayout + android:id="@+id/recents_tv_card" android:layout_width="@dimen/recents_tv_card_width" android:layout_height="wrap_content" android:layout_centerInParent="true" @@ -66,4 +68,30 @@ android:layout_centerHorizontal="true" android:layout_below="@id/card_title_text" /> </LinearLayout> + <LinearLayout + android:id="@+id/card_dismiss" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:layout_gravity="center_horizontal" + android:layout_below="@id/recents_tv_card" + android:alpha="0.0"> + <ImageView + android:id="@+id/card_dismiss_icon" + android:layout_width="@dimen/recents_tv_dismiss_icon_size" + android:layout_height="@dimen/recents_tv_dismiss_icon_size" + android:layout_gravity="center_horizontal" + android:layout_marginTop="@dimen/recents_tv_dismiss_icon_top_margin" + android:layout_marginBottom="@dimen/recents_tv_dismiss_icon_bottom_margin" + android:src="@drawable/ic_cancel_white_24dp" /> + <TextView + android:id="@+id/card_dismiss_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="@dimen/recents_tv_dismiss_text_size" + android:fontFamily="@string/font_roboto_light" + android:textColor="@color/recents_tv_dismiss_text_color" + android:text="@string/recents_tv_dismiss" + android:layout_gravity="center_horizontal" /> + </LinearLayout> </com.android.systemui.recents.tv.views.TaskCardView>
\ No newline at end of file diff --git a/packages/SystemUI/res/layout/signal_cluster_view.xml b/packages/SystemUI/res/layout/signal_cluster_view.xml index c634cd61afe1..9df5dbf74609 100644 --- a/packages/SystemUI/res/layout/signal_cluster_view.xml +++ b/packages/SystemUI/res/layout/signal_cluster_view.xml @@ -19,7 +19,6 @@ <!-- extends LinearLayout --> <com.android.systemui.statusbar.SignalClusterView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:systemui="http://schemas.android.com/apk/res-auto" android:layout_height="match_parent" android:layout_width="wrap_content" android:gravity="center_vertical" @@ -43,7 +42,6 @@ android:id="@+id/ethernet" android:layout_height="wrap_content" android:layout_width="wrap_content" - systemui:hasOverlappingRendering="false" /> <com.android.systemui.statusbar.AlphaOptimizedImageView android:theme="@style/DualToneDarkTheme" @@ -51,7 +49,6 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:alpha="0.0" - systemui:hasOverlappingRendering="false" /> </FrameLayout> <FrameLayout @@ -64,7 +61,6 @@ android:id="@+id/wifi_signal" android:layout_height="wrap_content" android:layout_width="wrap_content" - systemui:hasOverlappingRendering="false" /> <com.android.systemui.statusbar.AlphaOptimizedImageView android:theme="@style/DualToneDarkTheme" @@ -72,7 +68,6 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:alpha="0.0" - systemui:hasOverlappingRendering="false" /> </FrameLayout> <View @@ -98,7 +93,6 @@ android:layout_height="wrap_content" android:layout_width="wrap_content" android:src="@drawable/stat_sys_no_sims" - systemui:hasOverlappingRendering="false" /> <com.android.systemui.statusbar.AlphaOptimizedImageView android:theme="@style/DualToneDarkTheme" @@ -107,7 +101,6 @@ android:layout_width="wrap_content" android:src="@drawable/stat_sys_no_sims" android:alpha="0.0" - systemui:hasOverlappingRendering="false" /> </FrameLayout> <View diff --git a/packages/SystemUI/res/layout/status_bar_expanded_header.xml b/packages/SystemUI/res/layout/status_bar_expanded_header.xml index dd75dbfd47dc..c5cd65ea3cf9 100644 --- a/packages/SystemUI/res/layout/status_bar_expanded_header.xml +++ b/packages/SystemUI/res/layout/status_bar_expanded_header.xml @@ -177,7 +177,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - systemui:hasOverlappingRendering="false" /> <TextView diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml index 090b8e6fcb3f..d89795617b3a 100644 --- a/packages/SystemUI/res/values-af/strings.xml +++ b/packages/SystemUI/res/values-af/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Ligging deur GPS gestel"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Liggingversoeke aktief"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Verwyder alle kennisgewings."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Kennisgewingsinstellings"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>-instellings"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Die skerm sal outomaties draai."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g>-limiet"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> waarskuwing"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Werkmodus"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Jou onlangse skerms verskyn hier"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Geen onlangse items nie"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Jy het alles toegemaak"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Programinligting"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"skermvaspen"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"soek"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Wys boaan die kennisgewingslys, verskyn vlugtig op die skerm en laat klank toe"</string> <string name="notification_more_settings" msgid="816306283396553571">"Meer instellings"</string> <string name="notification_done" msgid="5279426047273930175">"Klaar"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Kleur en voorkoms"</string> <string name="night_mode" msgid="3540405868248625488">"Nagmodus"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibreer skerm"</string> @@ -535,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"Kies Sleutelbordknoppie"</string> <string name="preview" msgid="9077832302472282938">"Voorskou"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Sleep om teëls by te voeg"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"Wysig"</string> <string name="tuner_time" msgid="6572217313285536011">"Tyd"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-af/strings_tv.xml b/packages/SystemUI/res/values-af/strings_tv.xml index f595479c6059..391bf7d11378 100644 --- a/packages/SystemUI/res/values-af/strings_tv.xml +++ b/packages/SystemUI/res/values-af/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Hou "<b>"TUIS"</b>" om PIP te beheer"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Druk en hou die TUIS-knoppie om PIP te beheer"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Het dit"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml index e870ea7315c0..4286af0e32f9 100644 --- a/packages/SystemUI/res/values-am/strings.xml +++ b/packages/SystemUI/res/values-am/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"የሥራ ሁነታ በርቷል።"</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"የሥራ ሁነታ ጠፍቷል።"</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"የሥራ ሁነታ በርቷል።"</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"ውሂብ ቆጣቢ ጠፍቷል።"</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"ውሂብ ቆጣቢ በርቷል።"</string> <string name="accessibility_brightness" msgid="8003681285547803095">"ብሩህነት ያሳዩ"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2ጂ-3ጂ ውሂብ ላፍታ ቆሟል"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4ጂ ውሂብ ላፍታ ቆሟል"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"በ GPS የተዘጋጀ ሥፍራ"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"የአካባቢ ጥያቄዎች ነቅተዋል"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ሁሉንም ማሳወቂያዎች አጽዳ"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"የማሳወቂያ ቅንብሮች"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"የ<xliff:g id="APP_NAME">%s</xliff:g> ቅንብሮች"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"ማያ ገጽ በራስ ሰር ይዞራል።"</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ገደብ"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"የ<xliff:g id="DATA_LIMIT">%s</xliff:g> ማስጠንቀቂያ"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"የሥራ ሁነታ"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"የቅርብ ጊዜ ማያ ገጾችዎ እዚህ ይታያሉ"</string> + <string name="recents_empty_message" msgid="808480104164008572">"ምንም የቅርብ ጊዜ ንጥሎች የሉም"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"ሁሉንም ነገር አጽድተዋል"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"የመተግበሪያ መረጃ"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ማያ ገጽ መሰካት"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ፈልግ"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"በማሳወቂያዎች ዝርዝር አናት ላይ አሳይ፣ ወደ ማያ ገጹ አሳይና ድምፅ ፍቀድ"</string> <string name="notification_more_settings" msgid="816306283396553571">"ተጨማሪ ቅንብሮች"</string> <string name="notification_done" msgid="5279426047273930175">"ተከናውኗል"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"ቀለም እና መልክ"</string> <string name="night_mode" msgid="3540405868248625488">"የሌሊት ሁነታ"</string> <string name="calibrate_display" msgid="5974642573432039217">"ማሳያን ይለኩ"</string> @@ -537,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"የቁልፍ ሰሌዳ አዝራር ይምረጡ"</string> <string name="preview" msgid="9077832302472282938">"ቅድመ-እይታ"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"ሰቆችን ለማከል ይጎትቱ"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"አርትዕ"</string> <string name="tuner_time" msgid="6572217313285536011">"ሰዓት"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-am/strings_tv.xml b/packages/SystemUI/res/values-am/strings_tv.xml index 95e480c3301a..19e27ca31d00 100644 --- a/packages/SystemUI/res/values-am/strings_tv.xml +++ b/packages/SystemUI/res/values-am/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIPን ለመቆጣጠር "<b>"መነሻ"</b>"ን ይያዙ"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIPን ለመቆጣጠር የመነሻ አዝራሩን ተጭነው ይያዙ"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"ገባኝ"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml index 4a4e004fa3cc..5d859ac341c0 100644 --- a/packages/SystemUI/res/values-ar/strings.xml +++ b/packages/SystemUI/res/values-ar/strings.xml @@ -240,6 +240,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"تم تعيين الموقع بواسطة GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"طلبات الموقع نشطة"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"محو جميع الإشعارات."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"إعدادات الإشعارات"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"إعدادات <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"سيتم تدوير الشاشة تلقائيًا."</string> @@ -305,7 +307,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"قيد <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"تحذير <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"وضع العمل"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"تظهر شاشاتك المعروضة مؤخرًا هنا"</string> + <string name="recents_empty_message" msgid="808480104164008572">"ليست هناك عناصر تم استخدامها مؤخرًا"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"لقد محوتَ كل شيء"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"معلومات التطبيق"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"تثبيت الشاشة"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"بحث"</string> @@ -481,6 +484,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"عرض هذا الإشعار بأعلى قائمة الإشعارات وعرضه بسرعة على الشاشة مع السماح بإصدار تنبيه صوتي"</string> <string name="notification_more_settings" msgid="816306283396553571">"المزيد من الإعدادات"</string> <string name="notification_done" msgid="5279426047273930175">"تم"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"اللون والمظهر"</string> <string name="night_mode" msgid="3540405868248625488">"الوضع الليلي"</string> <string name="calibrate_display" msgid="5974642573432039217">"معايرة الشاشة"</string> @@ -539,6 +544,7 @@ <string name="select_keycode" msgid="7413765103381924584">"تحديد زر لوحة المفاتيح"</string> <string name="preview" msgid="9077832302472282938">"معاينة"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"اسحب لإضافة مربعات"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"اسحب هنا للإزالة"</string> <string name="qs_edit" msgid="2232596095725105230">"تعديل"</string> <string name="tuner_time" msgid="6572217313285536011">"الوقت"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ar/strings_tv.xml b/packages/SystemUI/res/values-ar/strings_tv.xml index a54e0ab86aa3..db91b69dc23e 100644 --- a/packages/SystemUI/res/values-ar/strings_tv.xml +++ b/packages/SystemUI/res/values-ar/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"اضغط "<b>"الرئيسية"</b>" للتحكم في PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"اضغط مع الاستمرار على زر الشاشة الرئيسية للتحكم في PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"حسنًا"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-az-rAZ/strings.xml b/packages/SystemUI/res/values-az-rAZ/strings.xml index 7763cb3588c6..ad106f4816c7 100644 --- a/packages/SystemUI/res/values-az-rAZ/strings.xml +++ b/packages/SystemUI/res/values-az-rAZ/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"İş rejimi aktivdir."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"İş rejimi sönülüdür."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"İş rejimi yanılıdır."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Data Qənaəti deaktiv edildi."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Data Qənaəti aktiv edildi."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Display brightness"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G məlumatlarına fasilə verildi"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G məlumatlarına fasilə verildi"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Yer GPS tərəfindən müəyyən edildi"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Məkan sorğuları arxivi"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Bütün bildirişləri sil."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Bildiriş ayarları"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ayarları"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran avtomatik döndəriləcək."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> limit"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> xəbərdarlığı"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"İş rejimi"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Your recent screens appear here"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Son elementlər yoxdur"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Hərşeyi təmizlədiniz"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Tətbiq haqqında"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekran sancağı"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"axtarış"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Bildirişlər siyahısında yuxarıda göstərin, ekrana nəzər salın və səsə icazə verin"</string> <string name="notification_more_settings" msgid="816306283396553571">"Daha çox ayar"</string> <string name="notification_done" msgid="5279426047273930175">"Hazırdır"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Rəng və görünüş"</string> <string name="night_mode" msgid="3540405868248625488">"Gecə rejimi"</string> <string name="calibrate_display" msgid="5974642573432039217">"Ekranı kalibrləyin"</string> @@ -537,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"Klaviatura Düyməsi Seçin"</string> <string name="preview" msgid="9077832302472282938">"Önizləmə"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Xanalar əlavə etmək üçün sürüşdürün"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"Redaktə edin"</string> <string name="tuner_time" msgid="6572217313285536011">"Vaxt"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-az-rAZ/strings_tv.xml b/packages/SystemUI/res/values-az-rAZ/strings_tv.xml index b3ac6d403ea0..a7a6c5d9f6ec 100644 --- a/packages/SystemUI/res/values-az-rAZ/strings_tv.xml +++ b/packages/SystemUI/res/values-az-rAZ/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP idarı etmək üçün "<b>"Əsas səhifəni"</b>" tutub saxlayın"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PİP nəzarət etmək üçün ƏSAS EKRAN düyməni basıb saxlayın"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Anladım"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings.xml b/packages/SystemUI/res/values-b+sr+Latn/strings.xml index fff464df8a03..edec332199bb 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml @@ -222,10 +222,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Režim rada je uključen."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Režim rada je isključen."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Režim rada je uključen."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Ušteda podataka je isključena."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Ušteda podataka je uključena."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Osvetljenost ekrana"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G–3G podaci su pauzirani"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G podaci su pauzirani"</string> @@ -239,6 +237,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokaciju je podesio GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Ima aktivnih zahteva za lokaciju"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Obriši sva obaveštenja."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Podešavanja obaveštenja"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Podešavanja za <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran će se automatski rotirati."</string> @@ -304,7 +304,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ograničenje od <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozorenje za <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Režim rada"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Nedavni ekrani se pojavljuju ovde"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Nema nedavnih stavki"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Obrisali ste sve"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacije o aplikaciji"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"kačenje ekrana"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"pretraži"</string> @@ -480,6 +481,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Prikazuju se u vrhu liste obaveštenja, nakratko se prikazuju na ekranu i emituju zvuk"</string> <string name="notification_more_settings" msgid="816306283396553571">"Još podešavanja"</string> <string name="notification_done" msgid="5279426047273930175">"Gotovo"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Boja i izgled"</string> <string name="night_mode" msgid="3540405868248625488">"Noćni režim"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibrišite ekran"</string> @@ -538,6 +541,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Izaberite dugme za tastaturu"</string> <string name="preview" msgid="9077832302472282938">"Pregled"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Prevucite da biste dodali pločice"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Prevucite ovde da biste uklonili"</string> <string name="qs_edit" msgid="2232596095725105230">"Izmeni"</string> <string name="tuner_time" msgid="6572217313285536011">"Vreme"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml b/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml index d78f8d33ea30..a28562716b88 100644 --- a/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml +++ b/packages/SystemUI/res/values-b+sr+Latn/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109"><b>"POČETNI EKRAN"</b>" kont. PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Pritisnite i zadržite dugme POČETNI EKRAN da biste kontrolisali PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Važi"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-be-rBY-land/strings.xml b/packages/SystemUI/res/values-be-rBY-land/strings.xml new file mode 100644 index 000000000000..9b0cf06befc5 --- /dev/null +++ b/packages/SystemUI/res/values-be-rBY-land/strings.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2010, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="toast_rotation_locked" msgid="7609673011431556092">"Цяпер экран заблакаваны ў альбомнай арыентацыі."</string> +</resources> diff --git a/packages/SystemUI/res/values-be-rBY/strings.xml b/packages/SystemUI/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..e5771d70b343 --- /dev/null +++ b/packages/SystemUI/res/values-be-rBY/strings.xml @@ -0,0 +1,567 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2009, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="app_label" msgid="7164937344850004466">"Інтэрфейс карыстальніка сістэмы"</string> + <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Ачысціць"</string> + <string name="status_bar_recent_remove_item_title" msgid="6026395868129852968">"Выдаліць са спісу"</string> + <string name="status_bar_recent_inspect_item_title" msgid="7793624864528818569">"Звесткі аб прыкладанні"</string> + <string name="status_bar_no_recent_apps" msgid="7374907845131203189">"Вашы апошнія экраны з\'яўляюцца тут"</string> + <string name="status_bar_accessibility_dismiss_recents" msgid="4576076075226540105">"Закрыць нядаўнія прыкладаннi"</string> + <plurals name="status_bar_accessibility_recent_apps" formatted="false" msgid="9138535907802238759"> + <item quantity="one">%d экран у Аглядзе</item> + <item quantity="few">%d экраны ў Аглядзе</item> + <item quantity="many">%d экранаў у Аглядзе</item> + <item quantity="other">%d экрана ў Аглядзе</item> + </plurals> + <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"Без апавяшчэнняў"</string> + <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"Пастаянныя"</string> + <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Апавяшчэнні"</string> + <string name="battery_low_title" msgid="6456385927409742437">"Нізкі ўзровень зараду акумулятара"</string> + <string name="battery_low_percent_format" msgid="2900940511201380775">"Засталося <xliff:g id="PERCENTAGE">%s</xliff:g>"</string> + <string name="battery_low_percent_format_saver_started" msgid="6859235584035338833">"Засталося <xliff:g id="PERCENTAGE">%s</xliff:g>. Уключана эканомія зараду."</string> + <string name="invalid_charger" msgid="4549105996740522523">"USB-зарадка не падтрымліваецца.\nКарыстайцеся толькі зарадкай для прылады."</string> + <string name="invalid_charger_title" msgid="3515740382572798460">"Зарадка па USB не падтрымліваецца."</string> + <string name="invalid_charger_text" msgid="5474997287953892710">"Выкарыстоўвайце толькі зарадную прыладу ў камплекце."</string> + <string name="battery_low_why" msgid="4553600287639198111">"Налады"</string> + <string name="battery_saver_confirmation_title" msgid="5299585433050361634">"Уключыць эканомію зараду?"</string> + <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"Уключыць"</string> + <string name="battery_saver_start_action" msgid="5576697451677486320">"Уключыць рэжым эканоміі зараду"</string> + <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Налады"</string> + <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string> + <string name="status_bar_settings_auto_rotation" msgid="3790482541357798421">"Аўтаматычны паварот экрана"</string> + <string name="status_bar_settings_mute_label" msgid="554682549917429396">"БЯЗГУЧНА"</string> + <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"АЎТА"</string> + <string name="status_bar_settings_notifications" msgid="397146176280905137">"Паведамленні"</string> + <string name="bluetooth_tethered" msgid="7094101612161133267">"Прывязаныя праз Bluetooth"</string> + <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Налада метадаў уводу"</string> + <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Фізічная клавіятура"</string> + <string name="usb_device_permission_prompt" msgid="834698001271562057">"Дазволіць праыкладанню <xliff:g id="APPLICATION">%1$s</xliff:g> атрымлiваць доступ да прылады USB?"</string> + <string name="usb_accessory_permission_prompt" msgid="5171775411178865750">"Дазволіць прыкладанню <xliff:g id="APPLICATION">%1$s</xliff:g> доступ да прылады USB?"</string> + <string name="usb_device_confirm_prompt" msgid="5161205258635253206">"Адкрыць <xliff:g id="ACTIVITY">%1$s</xliff:g>, калі гэтая USB-прылада падлучаная?"</string> + <string name="usb_accessory_confirm_prompt" msgid="3808984931830229888">"Адкрыць <xliff:g id="ACTIVITY">%1$s</xliff:g>, калі гэтая USB-прылада падлучаная?"</string> + <string name="usb_accessory_uri_prompt" msgid="513450621413733343">"Няма ўсталяв. прыкл. для працы з гэтай прыл. USB. Больш падраб. пра гэтую прыл.: <xliff:g id="URL">%1$s</xliff:g>"</string> + <string name="title_usb_accessory" msgid="4966265263465181372">"USB-прылада"</string> + <string name="label_view" msgid="6304565553218192990">"Прагляд"</string> + <string name="always_use_device" msgid="1450287437017315906">"Выкарыстоўваць налады па змаўчанні для дадзенай USB-прылады"</string> + <string name="always_use_accessory" msgid="1210954576979621596">"Выкарыстоўваць налады па змаўчанні для дадзенай USB-прылады"</string> + <string name="usb_debugging_title" msgid="4513918393387141949">"Дазволіць адладку USB?"</string> + <string name="usb_debugging_message" msgid="2220143855912376496">"Адбiтак ключа RSA на гэтым камп\'ютары:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string> + <string name="usb_debugging_always" msgid="303335496705863070">"Заўсёды дазваляць з гэтага камп\'ютара"</string> + <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Адладка USB не дапускаецца"</string> + <string name="usb_debugging_secondary_user_message" msgid="8572228137833020196">"Карыстальнік, які зараз увайшоў на гэту прыладу, не можа ўключыць адладку USB. Каб выкарыстоўваць гэту функцыю, пераключыцеся на карыстальніка-адміністратара."</string> + <string name="compat_mode_on" msgid="6623839244840638213">"Павял. на ўвесь экран"</string> + <string name="compat_mode_off" msgid="4434467572461327898">"Расцягн. на ўвесь экран"</string> + <string name="screenshot_saving_ticker" msgid="7403652894056693515">"Захаванне скрыншота..."</string> + <string name="screenshot_saving_title" msgid="8242282144535555697">"Захаванне скрыншота..."</string> + <string name="screenshot_saving_text" msgid="2419718443411738818">"Скрыншот захаваны."</string> + <string name="screenshot_saved_title" msgid="6461865960961414961">"Скрыншот зроблены"</string> + <string name="screenshot_saved_text" msgid="1152839647677558815">"Націсніце, каб прагледзець скрыншот"</string> + <string name="screenshot_failed_title" msgid="705781116746922771">"Не атрымалася зрабiць скрыншот."</string> + <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"Падчас захавання скрыншота адбылася памылка."</string> + <string name="screenshot_failed_to_save_text" msgid="2592658083866306296">"Немагчыма захаваць здымак экрана, бо мала месца ў памяці."</string> + <string name="screenshot_failed_to_capture_text" msgid="7602391003979898374">"Рабіць здымкі экрана не дазваляе праграма ці ваша арганізацыя."</string> + <string name="usb_preference_title" msgid="6551050377388882787">"Парам. перадачы файлаў па USB"</string> + <string name="use_mtp_button_title" msgid="4333504413563023626">"Падлучыць як медыяпрайгравальнік (ССП)"</string> + <string name="use_ptp_button_title" msgid="7517127540301625751">"Падлучыць як камеру (PTP)"</string> + <string name="installer_cd_button_title" msgid="2312667578562201583">"Усталяваць прыклад. Android File Transfer для Mac"</string> + <string name="accessibility_back" msgid="567011538994429120">"Назад"</string> + <string name="accessibility_home" msgid="8217216074895377641">"На Галоўную старонку"</string> + <string name="accessibility_menu" msgid="316839303324695949">"Меню"</string> + <string name="accessibility_recent" msgid="5208608566793607626">"Агляд"</string> + <string name="accessibility_search_light" msgid="1103867596330271848">"Пошук"</string> + <string name="accessibility_camera_button" msgid="8064671582820358152">"Камера"</string> + <string name="accessibility_phone_button" msgid="6738112589538563574">"Тэлефон"</string> + <string name="accessibility_voice_assist_button" msgid="487611083884852965">"Галасавая дапамога"</string> + <string name="accessibility_unlock_button" msgid="128158454631118828">"Разблакiраваць"</string> + <string name="accessibility_unlock_button_fingerprint" msgid="8214125623493923751">"Кнопка разблакіроўкі, чаканне адбітка пальца"</string> + <string name="accessibility_unlock_without_fingerprint" msgid="7541705575183694446">"Разблакіроўка без выкарыстання адбітка пальца"</string> + <string name="unlock_label" msgid="8779712358041029439">"разблакiраваць"</string> + <string name="phone_label" msgid="2320074140205331708">"адкрыць тэлефон"</string> + <string name="voice_assist_label" msgid="3956854378310019854">"адкрыць галасавую дапамогу"</string> + <string name="camera_label" msgid="7261107956054836961">"адкрыць камеру"</string> + <string name="recents_caption_resize" msgid="3517056471774958200">"Выберыце новы макет заданняў"</string> + <string name="cancel" msgid="6442560571259935130">"Адмяніць"</string> + <string name="accessibility_compatibility_zoom_button" msgid="8461115318742350699">"Кнопка сумяшчальнасці маштаба."</string> + <string name="accessibility_compatibility_zoom_example" msgid="4220687294564945780">"Маштабаванне малых элементаў для большага экрана."</string> + <string name="accessibility_bluetooth_connected" msgid="2707027633242983370">"Bluetooth-сувязь."</string> + <string name="accessibility_bluetooth_disconnected" msgid="7416648669976870175">"Bluetooth адключаны."</string> + <string name="accessibility_no_battery" msgid="358343022352820946">"Без акумулятара."</string> + <string name="accessibility_battery_one_bar" msgid="7774887721891057523">"Адна планка акумулятара."</string> + <string name="accessibility_battery_two_bars" msgid="8500650438735009973">"2 планкі акумулятара."</string> + <string name="accessibility_battery_three_bars" msgid="2302983330865040446">"Тры планкі акумулятара."</string> + <string name="accessibility_battery_full" msgid="8909122401720158582">"Акумулятар поўны."</string> + <string name="accessibility_no_phone" msgid="4894708937052611281">"Няма тэлефона."</string> + <string name="accessibility_phone_one_bar" msgid="687699278132664115">"Адна планка на тэлефоне."</string> + <string name="accessibility_phone_two_bars" msgid="8384905382804815201">"2 планкі тэлефона."</string> + <string name="accessibility_phone_three_bars" msgid="8521904843919971885">"3 планкі тэлефона."</string> + <string name="accessibility_phone_signal_full" msgid="6471834868580757898">"Поўны сігнал тэлефона."</string> + <string name="accessibility_no_data" msgid="4791966295096867555">"Няма дадзеных."</string> + <string name="accessibility_data_one_bar" msgid="1415625833238273628">"Адна планка дадзеных."</string> + <string name="accessibility_data_two_bars" msgid="6166018492360432091">"2 планкі дадзеных."</string> + <string name="accessibility_data_three_bars" msgid="9167670452395038520">"3 планкі дадзеных."</string> + <string name="accessibility_data_signal_full" msgid="2708384608124519369">"Поўны сігнал перадачы дадзеных."</string> + <string name="accessibility_wifi_name" msgid="7202151365171148501">"Падключаны да <xliff:g id="WIFI">%s</xliff:g>."</string> + <string name="accessibility_bluetooth_name" msgid="8441517146585531676">"Падлучаны да <xliff:g id="BLUETOOTH">%s</xliff:g>."</string> + <string name="accessibility_no_wimax" msgid="4329180129727630368">"Няма сiгналу WiMAX."</string> + <string name="accessibility_wimax_one_bar" msgid="4170994299011863648">"Адзiн слупок сiгналу WiMAX."</string> + <string name="accessibility_wimax_two_bars" msgid="9176236858336502288">"Два слупкi сiгналу WiMAX."</string> + <string name="accessibility_wimax_three_bars" msgid="6116551636752103927">"Тры слупкi сiгналу WiMAX."</string> + <string name="accessibility_wimax_signal_full" msgid="2768089986795579558">"Моцны сiгнал WiMAX."</string> + <string name="accessibility_ethernet_disconnected" msgid="5896059303377589469">"Ethernet адлучаны."</string> + <string name="accessibility_ethernet_connected" msgid="2692130313069182636">"Ethernet падлучаны."</string> + <string name="accessibility_no_signal" msgid="7064645320782585167">"Няма сігналу."</string> + <string name="accessibility_not_connected" msgid="6395326276213402883">"Няма падключэння."</string> + <string name="accessibility_zero_bars" msgid="3806060224467027887">"Няма."</string> + <string name="accessibility_one_bar" msgid="1685730113192081895">"Адзiн слупок."</string> + <string name="accessibility_two_bars" msgid="6437363648385206679">"Два слупкi."</string> + <string name="accessibility_three_bars" msgid="2648241415119396648">"Тры слупкi."</string> + <string name="accessibility_signal_full" msgid="9122922886519676839">"Сігнал поўны."</string> + <string name="accessibility_desc_on" msgid="2385254693624345265">"Уключана."</string> + <string name="accessibility_desc_off" msgid="6475508157786853157">"Адключана."</string> + <string name="accessibility_desc_connected" msgid="8366256693719499665">"Падключана."</string> + <string name="accessibility_desc_connecting" msgid="3812924520316280149">"Падлучэнне."</string> + <string name="accessibility_data_connection_gprs" msgid="1606477224486747751">"GPRS"</string> + <string name="accessibility_data_connection_1x" msgid="994133468120244018">"1 X"</string> + <string name="accessibility_data_connection_hspa" msgid="2032328855462645198">"HSPA"</string> + <string name="accessibility_data_connection_3g" msgid="8628562305003568260">"3G"</string> + <string name="accessibility_data_connection_3.5g" msgid="8664845609981692001">"3.5G"</string> + <string name="accessibility_data_connection_4g" msgid="7741000750630089612">"4G"</string> + <string name="accessibility_data_connection_lte" msgid="5413468808637540658">"LTE"</string> + <string name="accessibility_data_connection_cdma" msgid="6132648193978823023">"CDMA"</string> + <string name="accessibility_data_connection_roaming" msgid="5977362333466556094">"Роўмінг"</string> + <string name="accessibility_data_connection_edge" msgid="4477457051631979278">"Edge"</string> + <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string> + <string name="accessibility_no_sim" msgid="8274017118472455155">"Няма SIM-карты."</string> + <string name="accessibility_cell_data_off" msgid="8000803571751407635">"Мабільная перадача даных адключана"</string> + <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Сувязь па Bluetooth."</string> + <string name="accessibility_airplane_mode" msgid="834748999790763092">"Рэжым палёту."</string> + <string name="accessibility_no_sims" msgid="3957997018324995781">"Няма SIM-карты."</string> + <string name="accessibility_carrier_network_change_mode" msgid="4017301580441304305">"Змяненне аператара сеткі."</string> + <!-- String.format failed for translation --> + <!-- no translation found for accessibility_battery_level (7451474187113371965) --> + <skip /> + <string name="accessibility_settings_button" msgid="799583911231893380">"Сістэмныя налады."</string> + <string name="accessibility_notifications_button" msgid="4498000369779421892">"Апавяшчэнні."</string> + <string name="accessibility_remove_notification" msgid="3603099514902182350">"Выдаліць апавяшчэнне."</string> + <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS уключаны."</string> + <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"Атрыманне GPS."</string> + <string name="accessibility_tty_enabled" msgid="4613200365379426561">"TeleTypewriter уключаны."</string> + <string name="accessibility_ringer_vibrate" msgid="666585363364155055">"Выклік з вібрацыяй."</string> + <string name="accessibility_ringer_silent" msgid="9061243307939135383">"Маўклівы выклік."</string> + <!-- no translation found for accessibility_casting (6887382141726543668) --> + <skip /> + <string name="accessibility_work_mode" msgid="2478631941714607225">"Рэжым працы"</string> + <string name="accessibility_recents_item_will_be_dismissed" msgid="395770242498031481">"Выдаліць <xliff:g id="APP">%s</xliff:g> са спіса апошніх."</string> + <string name="accessibility_recents_item_dismissed" msgid="6803574935084867070">"<xliff:g id="APP">%s</xliff:g> выдалены."</string> + <string name="accessibility_recents_all_items_dismissed" msgid="4464697366179168836">"Усе апошнія праграмы адхілены."</string> + <string name="accessibility_recents_item_launched" msgid="7616039892382525203">"Запускаецца <xliff:g id="APP">%s</xliff:g>."</string> + <string name="accessibility_recents_task_header" msgid="1437183540924535457">"<xliff:g id="APP">%1$s</xliff:g> <xliff:g id="ACTIVITY_LABEL">%2$s</xliff:g>"</string> + <string name="accessibility_notification_dismissed" msgid="854211387186306927">"Апавяшчэнне прапушчана."</string> + <string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Цень апавяшчэння.."</string> + <string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Хуткія налады."</string> + <string name="accessibility_desc_lock_screen" msgid="5625143713611759164">"Экран блакіроўкі."</string> + <string name="accessibility_desc_settings" msgid="3417884241751434521">"Налады"</string> + <string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Агляд."</string> + <string name="accessibility_desc_close" msgid="7479755364962766729">"Закрыць"</string> + <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Карыстальнік: <xliff:g id="USER">%s</xliff:g>."</string> + <string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string> + <string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi выключаны."</string> + <string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi уключаны."</string> + <string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Мабiльны сiгнал: <xliff:g id="SIGNAL">%1$s</xliff:g>. <xliff:g id="TYPE">%2$s</xliff:g>. <xliff:g id="NETWORK">%3$s</xliff:g>."</string> + <string name="accessibility_quick_settings_battery" msgid="1480931583381408972">"Акумулятар: <xliff:g id="STATE">%s</xliff:g>."</string> + <string name="accessibility_quick_settings_airplane_off" msgid="7786329360056634412">"Рэжым палёту выключаны."</string> + <string name="accessibility_quick_settings_airplane_on" msgid="6406141469157599296">"Рэжым палёту ўключаны."</string> + <string name="accessibility_quick_settings_airplane_changed_off" msgid="66846307818850664">"Рэжым палёту выключаецца."</string> + <string name="accessibility_quick_settings_airplane_changed_on" msgid="8983005603505087728">"Рэжым палёту ўключаецца."</string> + <string name="accessibility_quick_settings_dnd_priority_on" msgid="1448402297221249355">"Рэжым «Не турбаваць» укл., толькі прыярытэтныя."</string> + <string name="accessibility_quick_settings_dnd_none_on" msgid="6882582132662613537">"Рэжым «Не турбаваць» укл., поўная цішыня."</string> + <string name="accessibility_quick_settings_dnd_alarms_on" msgid="9152834845587554157">"Рэжым «Не турбаваць» укл., толькі будзільнікі."</string> + <string name="accessibility_quick_settings_dnd_off" msgid="2371832603753738581">"Рэжым «Не турбаваць» выкл."</string> + <string name="accessibility_quick_settings_dnd_changed_off" msgid="898107593453022935">"Рэжым «Не турбаваць» выкл."</string> + <string name="accessibility_quick_settings_dnd_changed_on" msgid="4483780856613561039">"Рэжым «Не турбаваць» укл."</string> + <string name="accessibility_quick_settings_bluetooth_off" msgid="2133631372372064339">"Bluetooth выключаны."</string> + <string name="accessibility_quick_settings_bluetooth_on" msgid="7681999166216621838">"Bluetooth уключаны."</string> + <string name="accessibility_quick_settings_bluetooth_connecting" msgid="6953242966685343855">"Bluetooth падлучаецца."</string> + <string name="accessibility_quick_settings_bluetooth_connected" msgid="4306637793614573659">"Bluetooth падлучаны."</string> + <string name="accessibility_quick_settings_bluetooth_changed_off" msgid="2730003763480934529">"Bluetooth выключаны."</string> + <string name="accessibility_quick_settings_bluetooth_changed_on" msgid="8722351798763206577">"Bluetooth уключаны."</string> + <string name="accessibility_quick_settings_location_off" msgid="5119080556976115520">"Адпраўка даных аб месцазнаходжанні выключана."</string> + <string name="accessibility_quick_settings_location_on" msgid="5809937096590102036">"Адпраўка даных аб месцазнаходжанні ўключана."</string> + <string name="accessibility_quick_settings_location_changed_off" msgid="8526845571503387376">"Адпраўка даных аб месцазнаходжанні выключаецца."</string> + <string name="accessibility_quick_settings_location_changed_on" msgid="339403053079338468">"Адпраўка даных аб месцазнаходжанні ўключаецца."</string> + <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Наладжаны будзiльнiк: <xliff:g id="TIME">%s</xliff:g>."</string> + <string name="accessibility_quick_settings_close" msgid="3115847794692516306">"Закрыць панэль."</string> + <string name="accessibility_quick_settings_more_time" msgid="3659274935356197708">"Больш часу."</string> + <string name="accessibility_quick_settings_less_time" msgid="2404728746293515623">"Менш часу."</string> + <string name="accessibility_quick_settings_flashlight_off" msgid="4936432000069786988">"Ліхтарык выключаны."</string> + <string name="accessibility_quick_settings_flashlight_unavailable" msgid="8012811023312280810">"Ліхтарык недаступны."</string> + <string name="accessibility_quick_settings_flashlight_on" msgid="2003479320007841077">"Ліхтарык уключаны."</string> + <string name="accessibility_quick_settings_flashlight_changed_off" msgid="3303701786768224304">"Ліхтарык выключаецца."</string> + <string name="accessibility_quick_settings_flashlight_changed_on" msgid="6531793301533894686">"Ліхтарык уключаецца."</string> + <string name="accessibility_quick_settings_color_inversion_changed_off" msgid="4406577213290173911">"Інверсія колеру адключаецца."</string> + <string name="accessibility_quick_settings_color_inversion_changed_on" msgid="6897462320184911126">"Інверсія колеру ўключаецца."</string> + <string name="accessibility_quick_settings_hotspot_changed_off" msgid="5004708003447561394">"Мабільны хот-спот выключаецца."</string> + <string name="accessibility_quick_settings_hotspot_changed_on" msgid="2890951609226476206">"Мабільны хот-спот ўключаецца."</string> + <string name="accessibility_casting_turned_off" msgid="1430668982271976172">"Трансляцыя экрана спынена."</string> + <string name="accessibility_quick_settings_work_mode_off" msgid="7045417396436552890">"Рэжым працы выкл."</string> + <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Рэжым працы ўкл."</string> + <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Рэжым працы выключаны."</string> + <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Рэжым працы ўключаны."</string> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Эканомія трафіку адключана."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Эканомія трафіку ўключана."</string> + <string name="accessibility_brightness" msgid="8003681285547803095">"Яркасць дысплэя"</string> + <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Перадача даных 2G-3G прыпынена"</string> + <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Перадача даных 4G прыпынена"</string> + <string name="data_usage_disabled_dialog_mobile_title" msgid="4651001290947318931">"Мабільная перадача даных прыпынена"</string> + <string name="data_usage_disabled_dialog_title" msgid="3932437232199671967">"Перадача даных прыпынена"</string> + <string name="data_usage_disabled_dialog" msgid="8453242888903772524">"Быў дасягнуты ліміт перадачы даных, таму прылада прыпыніла перадачу даных на астатнюю частку гэтага цыкла.\n\nУзнаўленне перадачы можа прывесці да спагнання платы вашым аператарам."</string> + <string name="data_usage_disabled_dialog_enable" msgid="1412395410306390593">"Узнавіць"</string> + <string name="status_bar_settings_signal_meter_disconnected" msgid="1940231521274147771">"Няма падключэння да Iнтэрнэту"</string> + <string name="status_bar_settings_signal_meter_wifi_nossid" msgid="6557486452774597820">"Wi-Fi падключаны"</string> + <string name="gps_notification_searching_text" msgid="8574247005642736060">"Пошук GPS"</string> + <string name="gps_notification_found_text" msgid="4619274244146446464">"Месца задана праз GPS"</string> + <string name="accessibility_location_active" msgid="2427290146138169014">"Ёсць актыўныя запыты пра месцазнаходжанне"</string> + <string name="accessibility_clear_all" msgid="5235938559247164925">"Выдалiць усе апавяшчэннi."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> + <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Налады апавяшчэнняў"</string> + <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Налады <xliff:g id="APP_NAME">%s</xliff:g>"</string> + <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Экран паварочваецца аўтаматычна."</string> + <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Экран заблакiраваны ў альбомнай арыентацыі."</string> + <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Экран заблакiраваны ў партрэтнай арыентацыі."</string> + <string name="accessibility_rotation_lock_off_changed" msgid="8134601071026305153">"Цяпер экран будзе паварочвацца аўтаматычна."</string> + <string name="accessibility_rotation_lock_on_landscape_changed" msgid="3135965553707519743">"Цяпер экран заблакіраваны ў альбомнай арыентацыі."</string> + <string name="accessibility_rotation_lock_on_portrait_changed" msgid="8922481981834012126">"Цяпер экран заблакiраваны ў кніжнай арыентацыі."</string> + <string name="dessert_case" msgid="1295161776223959221">"Вітрына з дэсертамі"</string> + <string name="start_dreams" msgid="7219575858348719790">"Мроi"</string> + <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string> + <string name="quick_settings_dnd_label" msgid="8735855737575028208">"Не турбаваць"</string> + <string name="quick_settings_dnd_priority_label" msgid="483232950670692036">"Толькі прыярытэтныя"</string> + <string name="quick_settings_dnd_alarms_label" msgid="2559229444312445858">"Толькі будзільнікі"</string> + <string name="quick_settings_dnd_none_label" msgid="5025477807123029478">"Поўная цішыня"</string> + <string name="quick_settings_bluetooth_label" msgid="6304190285170721401">"Bluetooth"</string> + <string name="quick_settings_bluetooth_multiple_devices_label" msgid="3912245565613684735">"Bluetooth (прылады: <xliff:g id="NUMBER">%d</xliff:g>)"</string> + <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"Bluetooth выключаны"</string> + <string name="quick_settings_bluetooth_detail_empty_text" msgid="4910015762433302860">"Няма даступных спалучаных прылад"</string> + <string name="quick_settings_brightness_label" msgid="6968372297018755815">"Яркасць"</string> + <string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Аўтапаварот"</string> + <string name="quick_settings_rotation_locked_label" msgid="6359205706154282377">"Паварот заблакіраваны"</string> + <string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"Кніжная арыентацыя"</string> + <string name="quick_settings_rotation_locked_landscape_label" msgid="8553157770061178719">"Альбомная арыентацыя"</string> + <string name="quick_settings_ime_label" msgid="7073463064369468429">"Метад уводу"</string> + <string name="quick_settings_location_label" msgid="5011327048748762257">"Месцазнаходжанне"</string> + <string name="quick_settings_location_off_label" msgid="7464544086507331459">"Вызначэнне месцазнаходжання адключана"</string> + <string name="quick_settings_media_device_label" msgid="1302906836372603762">"Мультымедыйная прылада"</string> + <string name="quick_settings_rssi_label" msgid="7725671335550695589">"RSSI"</string> + <string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"Толькі экстраныя выклікі"</string> + <string name="quick_settings_settings_label" msgid="5326556592578065401">"Налады"</string> + <string name="quick_settings_time_label" msgid="4635969182239736408">"Час"</string> + <string name="quick_settings_user_label" msgid="5238995632130897840">"Я"</string> + <string name="quick_settings_user_title" msgid="4467690427642392403">"Карыстальнік"</string> + <string name="quick_settings_user_new_user" msgid="9030521362023479778">"Новы карыстальнік"</string> + <string name="quick_settings_wifi_label" msgid="9135344704899546041">"Wi-Fi"</string> + <string name="quick_settings_wifi_not_connected" msgid="7171904845345573431">"Няма падключэння"</string> + <string name="quick_settings_wifi_no_network" msgid="2221993077220856376">"Няма сеткi"</string> + <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Wi-Fi адключаны"</string> + <string name="quick_settings_wifi_detail_empty_text" msgid="269990350383909226">"Няма даступнай сеткі Wi-Fi"</string> + <string name="quick_settings_cast_title" msgid="7709016546426454729">"Трансляцыя"</string> + <string name="quick_settings_casting" msgid="6601710681033353316">"Ідзе перадача"</string> + <string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"Прылада без назвы"</string> + <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"Гатова для трансляцыі"</string> + <string name="quick_settings_cast_detail_empty_text" msgid="311785821261640623">"Няма даступных прылад"</string> + <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Яркасць"</string> + <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"АЎТА"</string> + <string name="quick_settings_inversion_label" msgid="8790919884718619648">"Інвертаваць колеры"</string> + <string name="quick_settings_color_space_label" msgid="853443689745584770">"Рэжым карэкцыі колеру"</string> + <string name="quick_settings_more_settings" msgid="326112621462813682">"Дадатковыя налады"</string> + <string name="quick_settings_done" msgid="3402999958839153376">"Гатова"</string> + <string name="quick_settings_connected" msgid="1722253542984847487">"Падлучана"</string> + <string name="quick_settings_connecting" msgid="47623027419264404">"Падлучэнне..."</string> + <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Мадэм"</string> + <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Хот-спот"</string> + <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Апавяшчэнні"</string> + <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Ліхтарык"</string> + <string name="quick_settings_cellular_detail_title" msgid="8575062783675171695">"Мабільная перадача даных"</string> + <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Выкарыстанне трафіку"</string> + <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Засталося трафіку"</string> + <string name="quick_settings_cellular_detail_over_limit" msgid="967669665390990427">"Ліміт перавышаны"</string> + <string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"Выкарыстана <xliff:g id="DATA_USED">%s</xliff:g>"</string> + <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ліміт <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> + <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Папярэджанне: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> + <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Рэжым працы"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Няма апошніх элементаў"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Вы ачысцілі усё"</string> + <string name="recents_app_info_button_label" msgid="2890317189376000030">"Звесткі аб праграме"</string> + <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"замацаванне экрана"</string> + <string name="recents_search_bar_label" msgid="8074997400187836677">"пошук"</string> + <string name="recents_launch_error_message" msgid="2969287838120550506">"Не атрымалася запусціць <xliff:g id="APP">%s</xliff:g>."</string> + <string name="recents_launch_disabled_message" msgid="1624523193008871793">"<xliff:g id="APP">%s</xliff:g> адключана ў бяспечным рэжыме."</string> + <string name="recents_history_button_label" msgid="5153358867807604821">"Гісторыя"</string> + <string name="recents_history_clear_all_button_label" msgid="5905258334958006953">"Ачысціць"</string> + <string name="recents_drag_non_dockable_task_message" msgid="2935843902795166158">"Гэта праграма не падтрымлівае функцыю некалькіх вокнаў"</string> + <string name="recents_launch_non_dockable_task_label" msgid="7862379814938391888">"Праграма не падтрымлівае функцыю некалькіх вокнаў"</string> + <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="8848514474543427332">"Падзяліць гарызантальна"</string> + <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="9075292233696180813">"Падзяліць вертыкальна"</string> + <string name="recents_multistack_add_stack_dialog_split_custom" msgid="4177837597513701943">"Падзяліць іншым чынам"</string> + <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Зараджаны"</string> + <string name="expanded_header_battery_charging" msgid="205623198487189724">"Зарадка"</string> + <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> да поўнай зарадкі"</string> + <string name="expanded_header_battery_not_charging" msgid="4798147152367049732">"Не зараджаецца"</string> + <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"За сеткай\nможа назіраць"</string> + <string name="description_target_search" msgid="3091587249776033139">"Пошук"</string> + <string name="description_direction_up" msgid="7169032478259485180">"Правядзіце пальцам уверх, каб атрымаць <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <string name="description_direction_left" msgid="7207478719805562165">"Правядзіце пальцам улева, каб атрымаць <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string> + <string name="zen_priority_introduction" msgid="3070506961866919502">"Вас не будуць турбаваць гукі і вібрацыя, за выключэннем будзільнікаў, мерапрыемстваў, падзей і выбраных вамі абанентаў."</string> + <string name="zen_priority_customize_button" msgid="7948043278226955063">"Дапасаваць"</string> + <string name="zen_silence_introduction_voice" msgid="2284540992298200729">"Гэта заблакіруе ЎСЕ гукі і вібрацыі, у тым ліку ад будзільнікаў, музыкі, відэа і гульняў. Вы па-ранейшаму зможаце тэлефанаваць."</string> + <string name="zen_silence_introduction" msgid="3137882381093271568">"Гэта заблакіруе ЎСЕ гукі і вібрацыі, у тым ліку ад будзільнікаў, музыкі, відэа і гульняў."</string> + <string name="keyguard_more_overflow_text" msgid="9195222469041601365">"+<xliff:g id="NUMBER_OF_NOTIFICATIONS">%d</xliff:g>"</string> + <string name="speed_bump_explanation" msgid="1288875699658819755">"Менш тэрміновыя апавяшчэнні ніжэй"</string> + <string name="notification_tap_again" msgid="8524949573675922138">"Краніце яшчэ раз, каб адкрыць"</string> + <string name="keyguard_unlock" msgid="8043466894212841998">"Правядзіце пальцам уверх, каб разблакіраваць"</string> + <string name="phone_hint" msgid="4872890986869209950">"Тэлефон: правядзіце пальцам ад значка"</string> + <string name="voice_hint" msgid="8939888732119726665">"Галасавая дапамога: правядзіце пальцам ад значка"</string> + <string name="camera_hint" msgid="7939688436797157483">"Камера: правядзіце пальцам ад значка"</string> + <string name="interruption_level_none_with_warning" msgid="5114872171614161084">"Поўная цішыня. Гэта таксама адключыць гук чытання з экрана."</string> + <string name="interruption_level_none" msgid="6000083681244492992">"Поўная цішыня"</string> + <string name="interruption_level_priority" msgid="6426766465363855505">"Толькі прыярытэтныя"</string> + <string name="interruption_level_alarms" msgid="5226306993448328896">"Толькі будзільнікі"</string> + <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Поўная\nцішыня"</string> + <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Толькі\nпрыярытэтныя"</string> + <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Толькі\nбудзільнікі"</string> + <string name="keyguard_indication_charging_time" msgid="1757251776872835768">"Зарадка (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> да поўнай зарадкі)"</string> + <string name="keyguard_indication_charging_time_fast" msgid="9018981952053914986">"Зараджаецца хутка (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> да канца)"</string> + <string name="keyguard_indication_charging_time_slowly" msgid="955252797961724952">"Зараджаецца павольна (<xliff:g id="CHARGING_TIME_LEFT">%s</xliff:g> да канца)"</string> + <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Перайсці да іншага карыстальніка"</string> + <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Перайсці да іншага карыстальніка, бягучы карыстальнік <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string> + <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Бягучы карыстальнік <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string> + <string name="accessibility_multi_user_switch_quick_contact" msgid="3020367729287990475">"Паказаць профіль"</string> + <string name="user_add_user" msgid="5110251524486079492">"Дадаць карыстальніка"</string> + <string name="user_new_user_name" msgid="426540612051178753">"Новы карыстальнік"</string> + <string name="guest_nickname" msgid="8059989128963789678">"Госць"</string> + <string name="guest_new_guest" msgid="600537543078847803">"Дадаць госця"</string> + <string name="guest_exit_guest" msgid="7187359342030096885">"Выдаліць госця"</string> + <string name="guest_exit_guest_dialog_title" msgid="8480693520521766688">"Выдаліць госця?"</string> + <string name="guest_exit_guest_dialog_message" msgid="4155503224769676625">"Усе праграмы і даныя гэтага сеанса будуць выдалены."</string> + <string name="guest_exit_guest_dialog_remove" msgid="7402231963862520531">"Выдаліць"</string> + <string name="guest_wipe_session_title" msgid="6419439912885956132">"З вяртаннем, госць!"</string> + <string name="guest_wipe_session_message" msgid="8476238178270112811">"Хочаце працягнуць сеанс?"</string> + <string name="guest_wipe_session_wipe" msgid="5065558566939858884">"Пачаць зноў"</string> + <string name="guest_wipe_session_dontwipe" msgid="1401113462524894716">"Так, працягнуць"</string> + <string name="guest_notification_title" msgid="1585278533840603063">"Гасцявы карыстальнік"</string> + <string name="guest_notification_text" msgid="335747957734796689">"Каб выдаліць праграмы і даныя, выдаліце гасцявога карыстальніка"</string> + <string name="guest_notification_remove_action" msgid="8820670703892101990">"ВЫДАЛІЦЬ ГОСЦЯ"</string> + <string name="user_logout_notification_title" msgid="1453960926437240727">"Выканаць выхад карыстальніка"</string> + <string name="user_logout_notification_text" msgid="3350262809611876284">"Выканаць выхад бягучага карыстальніка"</string> + <string name="user_logout_notification_action" msgid="1195428991423425062">"ВЫКАНАЦЬ ВЫХАД КАРЫСТАЛЬНІКА"</string> + <string name="user_add_user_title" msgid="4553596395824132638">"Дадаць новага карыстальніка?"</string> + <string name="user_add_user_message_short" msgid="2161624834066214559">"Калі вы дадаяце новага карыстальніка, ён павінен наладзіць свой раздзел.\n\nЛюбы карыстальнік можа абнаўляць праграмы для ўсіх астатніх карыстальнікаў."</string> + <string name="user_remove_user_title" msgid="4681256956076895559">"Выдаліць карыстальніка?"</string> + <string name="user_remove_user_message" msgid="1453218013959498039">"Усе праграмы і даныя гэтага карыстальніка будуць выдалены."</string> + <string name="user_remove_user_remove" msgid="7479275741742178297">"Выдаліць"</string> + <string name="battery_saver_notification_title" msgid="237918726750955859">"Рэжым эканоміі зараду ўключаны"</string> + <string name="battery_saver_notification_text" msgid="820318788126672692">"Памяншае прадукцыйнасць і фонавую перадачу даных"</string> + <string name="battery_saver_notification_action_text" msgid="109158658238110382">"Адключыць рэжым эканоміі зараду"</string> + <string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> атрымае доступ да ўсяго, што адлюстроўваецца на вашым экране."</string> + <string name="media_projection_remember_text" msgid="3103510882172746752">"Не паказваць зноў"</string> + <string name="clear_all_notifications_text" msgid="814192889771462828">"Ачысціць усё"</string> + <string name="media_projection_action_text" msgid="8470872969457985954">"Пачаць зараз"</string> + <string name="empty_shade_text" msgid="708135716272867002">"Апавяшчэнняў няма"</string> + <string name="device_owned_footer" msgid="3802752663326030053">"За прыладай могуць назіраць"</string> + <string name="profile_owned_footer" msgid="8021888108553696069">"За профілем могуць назіраць"</string> + <string name="vpn_footer" msgid="2388611096129106812">"За сеткай могуць назіраць"</string> + <string name="monitoring_title_device_owned" msgid="7121079311903859610">"Маніторынг прылад"</string> + <string name="monitoring_title_profile_owned" msgid="6790109874733501487">"Маніторынг профіляў"</string> + <string name="monitoring_title" msgid="169206259253048106">"Маніторынг сеткі"</string> + <string name="disable_vpn" msgid="4435534311510272506">"Адключыць VPN"</string> + <string name="disconnect_vpn" msgid="1324915059568548655">"Адлучыць VPN"</string> + <string name="monitoring_description_device_owned" msgid="5780988291898461883">"Ваша прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION">%1$s</xliff:g>.\n\nВаш адміністратар можа сачыць і кіраваць наладамі, карпаратыўным доступам, праграмамі, данымі, звязанымі з вашай прыладай, і звесткамі пра месцазнаходжанне вашай прылады. Для атрымання дадатковай інфармацыі звярніцеся да адміністратара."</string> + <string name="monitoring_description_vpn" msgid="4445150119515393526">"Вы далі праграме дазвол на наладжванне злучэння VPN.\n\nГэта праграма можа сачыць за актыўнасцю вашай прылады і вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> + <string name="monitoring_description_vpn_device_owned" msgid="3090670777499161246">"Ваша прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION">%1$s</xliff:g>.\n\nВаш адміністратар можа сачыць і кіраваць наладамі, доступам да карпаратыўных рэсурсаў, праграмамі, данымі, звязанымі з вашай прыладай, і звесткамі пра месцазнаходжанне прылады.\n\nВы падлучаны да VPN, які можа сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты.\n\nДля атрымання дадатковай інфармацыі звярніцеся да адміністратара."</string> + <string name="monitoring_description_vpn_profile_owned" msgid="2054949132145039290">"Ваш працоўны профіль знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION">%1$s</xliff:g>.\n\nВаш адміністратар можа сачыць і кіраваць наладамі, доступам да карпаратыўных рэсурсаў, праграмамі, данымі, звязанымі з вашай прыладай, і звесткамі пра месцазнаходжанне прылады.\n\nДля атрымання дадатковай інфармацыі звярніцеся да адміністратара.\n\nВы таксама падключаны да VPN, які можа сачыць за вашай сеткавай актыўнасцю."</string> + <string name="legacy_vpn_name" msgid="6604123105765737830">"VPN"</string> + <string name="monitoring_description_app" msgid="6259179342284742878">"Вы падлучаны да праграмы <xliff:g id="APPLICATION">%1$s</xliff:g>, якая можа сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> + <string name="monitoring_description_app_personal" msgid="484599052118316268">"Вы падлучаны да праграмы <xliff:g id="APPLICATION">%1$s</xliff:g>, якая сачыць за вашай асабістай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты."</string> + <string name="monitoring_description_app_work" msgid="1754325860918060897">"Ваш працоўны профіль знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION">%1$s</xliff:g>. Ён падлучаны да праграмы <xliff:g id="APPLICATION">%2$s</xliff:g>, якая можа сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты.\n\nДля атрымання дадатковай інфармацыі звярніцеся да адміністратара."</string> + <string name="monitoring_description_app_personal_work" msgid="4946600443852045903">"Ваш працоўны профіль знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION">%1$s</xliff:g>. Ён падлучаны да праграмы <xliff:g id="APPLICATION_WORK">%2$s</xliff:g>, якая можа сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты.\n\nВы таксама падлучаны да праграмы <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g>, якая можа сачыць за вашай асабістай сеткавай актыўнасцю."</string> + <string name="monitoring_description_vpn_app_device_owned" msgid="4970443827043261703">"Ваша прылада знаходзіцца пад кіраваннем <xliff:g id="ORGANIZATION">%1$s</xliff:g>.\n\nВаш адміністратар можа сачыць і кіраваць наладамі, доступам да карпаратыўных рэсурсаў, праграмамі, данымі, звязанымі з вашай прыладай, і звесткамі пра месцазнаходжанне прылады.\n\nВы падлучаны да праграмы <xliff:g id="APPLICATION">%2$s</xliff:g>, якая можа сачыць за вашай сеткавай актыўнасцю, уключаючы электронную пошту, праграмы і вэб-сайты.\n\nДля атрымання дадатковай інфармацыі звярніцеся да адміністратара."</string> + <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"Прылада будзе заставацца заблакіраванай, пакуль вы не разблакіруеце яе ўручную"</string> + <string name="hidden_notifications_title" msgid="7139628534207443290">"Атрымлівайце апавяшчэнні хутчэй"</string> + <string name="hidden_notifications_text" msgid="2326409389088668981">"Праглядайце іх перад разблакіроўкай"</string> + <string name="hidden_notifications_cancel" msgid="3690709735122344913">"Не, дзякуй"</string> + <string name="hidden_notifications_setup" msgid="41079514801976810">"Наладзіць"</string> + <string name="zen_mode_and_condition" msgid="4462471036429759903">"<xliff:g id="ZEN_MODE">%1$s</xliff:g>. <xliff:g id="EXIT_CONDITION">%2$s</xliff:g>"</string> + <string name="volume_zen_end_now" msgid="3179845345429841822">"Завяршыць зараз"</string> + <string name="accessibility_volume_expand" msgid="5946812790999244205">"Разгарнуць"</string> + <string name="accessibility_volume_collapse" msgid="3609549593031810875">"Згарнуць"</string> + <string name="screen_pinning_title" msgid="3273740381976175811">"Экран замацаваны"</string> + <string name="screen_pinning_description" msgid="3577937698406151604">"Будзе паказвацца, пакуль не адмацуеце. Дакраніцеся і ўтрымлівайце кнопку «Назад», каб адмацаваць."</string> + <string name="screen_pinning_positive" msgid="3783985798366751226">"Зразумела"</string> + <string name="screen_pinning_negative" msgid="3741602308343880268">"Не, дзякуй"</string> + <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Схаваць <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string> + <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"Гэта паведамленне з\'явіцца зноў у наступны раз, калі вы ўключыце яго ў наладах."</string> + <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Схаваць"</string> + <string name="volumeui_prompt_message" msgid="918680947433389110">"<xliff:g id="APP_NAME">%1$s</xliff:g> хоча быць дыялогам гучнасці."</string> + <string name="volumeui_prompt_allow" msgid="7954396902482228786">"Дазволіць"</string> + <string name="volumeui_prompt_deny" msgid="5720663643411696731">"Адхiлiць"</string> + <string name="volumeui_notification_title" msgid="4906770126345910955">"<xliff:g id="APP_NAME">%1$s</xliff:g> з\'яўляецца дыялогам гучнасці"</string> + <string name="volumeui_notification_text" msgid="1826889705095768656">"Націсніце, каб аднавіць арыгінал."</string> + <string name="managed_profile_foreground_toast" msgid="5421487114739245972">"Вы выкарыстоўваеце свой працоўны профіль"</string> + <string name="system_ui_tuner" msgid="708224127392452018">"Наладка сістэмнага інтэрфейсу карыстальніка"</string> + <string name="show_battery_percentage" msgid="5444136600512968798">"Паказваць працэнт зараду акумулятара"</string> + <string name="show_battery_percentage_summary" msgid="3215025775576786037">"Паказваць працэнт узроўню акумулятара ўнутры значка панэлі стану, калі ён не зараджаецца"</string> + <string name="quick_settings" msgid="10042998191725428">"Хуткія налады"</string> + <string name="status_bar" msgid="4877645476959324760">"Панэль стану"</string> + <string name="overview" msgid="4018602013895926956">"Агляд"</string> + <string name="demo_mode" msgid="2389163018533514619">"Дэманстрацыйны рэжым"</string> + <string name="enable_demo_mode" msgid="4844205668718636518">"Уключыць дэманстрацыйны рэжым"</string> + <string name="show_demo_mode" msgid="2018336697782464029">"Паказваць дэманстрацыйны рэжым"</string> + <string name="status_bar_ethernet" msgid="5044290963549500128">"Ethernet"</string> + <string name="status_bar_alarm" msgid="8536256753575881818">"Будзільнік"</string> + <string name="status_bar_work" msgid="6022553324802866373">"Працоўны профіль"</string> + <string name="status_bar_airplane" msgid="7057575501472249002">"Рэжым палёту"</string> + <string name="add_tile" msgid="2995389510240786221">"Дадаць плітку"</string> + <string name="broadcast_tile" msgid="3894036511763289383">"Плітка трансляцыі"</string> + <string name="zen_alarm_warning_indef" msgid="3482966345578319605">"Вы не пачуеце наступны будзільнік <xliff:g id="WHEN">%1$s</xliff:g>, пакуль папярэдне не выключыце гэты"</string> + <string name="zen_alarm_warning" msgid="444533119582244293">"Вы не пачуеце наступны будзільнік <xliff:g id="WHEN">%1$s</xliff:g>"</string> + <string name="alarm_template" msgid="3980063409350522735">"у <xliff:g id="WHEN">%1$s</xliff:g>"</string> + <string name="alarm_template_far" msgid="4242179982586714810">"у <xliff:g id="WHEN">%1$s</xliff:g>"</string> + <string name="accessibility_quick_settings_detail" msgid="2579369091672902101">"Хуткія налады, <xliff:g id="TITLE">%s</xliff:g>."</string> + <string name="accessibility_status_bar_hotspot" msgid="4099381329956402865">"Хот-спот"</string> + <string name="accessibility_managed_profile" msgid="6613641363112584120">"Працоўны профіль"</string> + <string name="tuner_warning_title" msgid="7094689930793031682">"Цікава для некаторых, але не для ўсіх"</string> + <string name="tuner_warning" msgid="8730648121973575701">"Наладка сістэмнага інтэрфейсу карыстальніка дае вам дадатковыя спосабы наладжвання і дапасоўвання карыстальніцкага інтэрфейсу Android. Гэтыя эксперыментальныя функцыі могуць змяніцца, перастаць працаваць або знікнуць у будучых версіях. Карыстайцеся з асцярожнасцю."</string> + <string name="tuner_persistent_warning" msgid="8597333795565621795">"Гэтыя эксперыментальныя функцыі могуць змяніцца, перастаць працаваць або знікнуць у будучых версіях. Карыстайцеся з асцярожнасцю."</string> + <string name="got_it" msgid="2239653834387972602">"Зразумела"</string> + <string name="tuner_toast" msgid="603429811084428439">"Віншуем! Наладка сістэмнага інтэрфейсу карыстальніка была дададзена ў Налады"</string> + <string name="remove_from_settings" msgid="8389591916603406378">"Выдаліць з налад"</string> + <string name="remove_from_settings_prompt" msgid="6069085993355887748">"Выдаліць Наладку сістэмнага інтэрфейсу карыстальніка з Налад і спыніць выкарыстанне ўсіх яе функцый?"</string> + <string name="activity_not_found" msgid="348423244327799974">"Праграма не ўсталявана на вашым тэлефоне"</string> + <string name="clock_seconds" msgid="7689554147579179507">"Паказваць секунды гадзінніка"</string> + <string name="clock_seconds_desc" msgid="6282693067130470675">"Паказваць секунды гадзінніка на панэлі стану. Можа паўплываць на рэсурс акумулятара."</string> + <string name="qs_rearrange" msgid="8060918697551068765">"Змяніць парадак Хуткіх налад"</string> + <string name="show_brightness" msgid="6613930842805942519">"Паказваць яркасць у Хуткіх наладах"</string> + <string name="overview_nav_bar_gesture" msgid="8579814204727917764">"Уключ. пераход да рэжыму дзялення экрана правядзеннем уверх"</string> + <string name="overview_nav_bar_gesture_desc" msgid="6329167382305102615">"Уключыць пераход да рэжыму дзялення экрана правядзеннем пальцам уверх ад кнопкі «Агляд»"</string> + <string name="experimental" msgid="6198182315536726162">"Эксперыментальныя"</string> + <string name="enable_bluetooth_title" msgid="5027037706500635269">"Уключыць Bluetooth?"</string> + <string name="enable_bluetooth_message" msgid="9106595990708985385">"Для падлучэння клавіятуры да планшэта трэба спачатку ўключыць Bluetooth."</string> + <string name="enable_bluetooth_confirmation_ok" msgid="6258074250948309715">"Уключыць"</string> + <string name="show_silently" msgid="6841966539811264192">"Паказваць апавяшчэнні бязгучна"</string> + <string name="block" msgid="2734508760962682611">"Блакіраваць усе апавяшчэнні"</string> + <string name="do_not_silence" msgid="6878060322594892441">"Не адключаць гук"</string> + <string name="do_not_silence_block" msgid="4070647971382232311">"Не адключаць гук і не блакіраваць"</string> + <string name="tuner_full_importance_settings" msgid="8103289238676424226">"Паказаць поўны спіс налад важнасці"</string> + <string name="blocked_importance" msgid="5198578988978234161">"Заблакiравана"</string> + <string name="min_importance" msgid="1901894910809414782">"Мінімальная важнасць"</string> + <string name="low_importance" msgid="4109929986107147930">"Нізкая важнасць"</string> + <string name="default_importance" msgid="8192107689995742653">"Звычайная важнасць"</string> + <string name="high_importance" msgid="1527066195614050263">"Высокая важнасць"</string> + <string name="max_importance" msgid="5089005872719563894">"Пільная важнасць"</string> + <string name="notification_importance_blocked" msgid="2397192642657872872">"Ніколі не паказваць гэтыя апавяшчэнні"</string> + <string name="notification_importance_min" msgid="1938190340516905748">"Бязгучна паказваць унізе спіса апавяшчэнняў"</string> + <string name="notification_importance_low" msgid="3657252049508213048">"Паказваць гэтыя апавяшчэнні бязгучна"</string> + <string name="notification_importance_default" msgid="4466466472622442175">"Дазволіць гэтым апавяшчэнням прайграваць гукі"</string> + <string name="notification_importance_high" msgid="2135428926525093825">"Хутка паказаць на экране і дазволіць прайграванне гуку"</string> + <string name="notification_importance_max" msgid="5806278962376556491">"Паказваць уверсе спіса апавяшчэнняў, хутка паказаць на экране і дазволіць прайграванне гуку"</string> + <string name="notification_more_settings" msgid="816306283396553571">"Дадатковыя налады"</string> + <string name="notification_done" msgid="5279426047273930175">"Гатова"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> + <string name="color_and_appearance" msgid="1254323855964993144">"Колер і выгляд"</string> + <string name="night_mode" msgid="3540405868248625488">"Начны рэжым"</string> + <string name="calibrate_display" msgid="5974642573432039217">"Каліброўка дысплэя"</string> + <string name="night_mode_on" msgid="5597545513026541108">"Уключана"</string> + <string name="night_mode_off" msgid="8035605276956057508">"Адключана"</string> + <string name="turn_on_automatically" msgid="4167565356762016083">"Уключаць аўтаматычна"</string> + <string name="turn_on_auto_summary" msgid="2190994512406701520">"Пераключэнне ў начны рэжым у залежнасці ад канкрэтнай мясцовасці і часу сутак"</string> + <string name="when_night_mode_on" msgid="2969436026899172821">"Калі ўключаны Начны рэжым"</string> + <string name="use_dark_theme" msgid="2900938704964299312">"Выкарыстоўваць цёмную тэму для АС Android"</string> + <string name="adjust_tint" msgid="3398569573231409878">"Рэгуляванне адценняў"</string> + <string name="adjust_brightness" msgid="980039329808178246">"Рэгуляванне яркасці"</string> + <string name="night_mode_disclaimer" msgid="598914896926759578">"Цёмная тэма ўжываецца да асноўных вобласцяў АС Android, да якіх звычайна шжываецца светлая тэма, напрыклад, Налады."</string> + <string name="color_apply" msgid="9212602012641034283">"Ужыць"</string> + <string name="color_revert_title" msgid="4746666545480534663">"Пацвердзіце налады"</string> + <string name="color_revert_message" msgid="9116001069397996691">"Некаторыя налады колеру могуць зрабіць гэту прыладу непрыдатнай для выкарыстання. Націсніце кнопку «ОК», каб пацвердзіць гэтыя налады колеру, у адваротным выпадку гэтыя налады будуць скінуты праз 10 секунд."</string> + <string name="battery_panel_title" msgid="7944156115535366613">"Выкарыстанне зараду"</string> + <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Эканомія зараду акумулятара недаступная падчас зарадкі"</string> + <string name="battery_detail_switch_title" msgid="6285872470260795421">"Эканомія зараду"</string> + <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Памяншае прадукцыйнасць і фонавую перадачу даных"</string> + <string name="keyboard_shortcut_group_system" msgid="6472647649616541064">"Сістэмныя"</string> + <string name="keyboard_shortcut_group_system_home" msgid="3054369431319891965">"Галоўная"</string> + <string name="keyboard_shortcut_group_system_recents" msgid="3154851905021926744">"Апошнія"</string> + <string name="keyboard_shortcut_group_system_back" msgid="2207004531216446378">"Назад"</string> + <string name="tuner_full_zen_title" msgid="4540823317772234308">"Паказаць з рэгулятарамі гучнасці"</string> + <string name="volume_and_do_not_disturb" msgid="3373784330208603030">"Не турбаваць"</string> + <string name="volume_dnd_silent" msgid="4363882330723050727">"Доступ праз кнопкі рэгулявання гучнасці"</string> + <string name="volume_up_silent" msgid="7141255269783588286">"Выхад з рэжыму «Не турбав.» пры націску кнопкі павел. гучн."</string> + <string name="battery" msgid="7498329822413202973">"Акумулятар"</string> + <string name="clock" msgid="7416090374234785905">"Гадзіннік"</string> + <string name="headset" msgid="4534219457597457353">"Гарнітура"</string> + <string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Навушнікі падключаны"</string> + <string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Гарнітура падлучана"</string> + <string name="data_saver" msgid="5037565123367048522">"Эканомія трафіку"</string> + <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Эканомія трафіку ўключана"</string> + <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Эканомія трафіку адключана"</string> + <string name="switch_bar_on" msgid="1142437840752794229">"Уключана"</string> + <string name="switch_bar_off" msgid="8803270596930432874">"Адключана"</string> + <string name="nav_bar" msgid="1993221402773877607">"Панэль навігацыі"</string> + <string name="start" msgid="6873794757232879664">"Пачатак"</string> + <string name="center" msgid="4327473927066010960">"Цэнтр"</string> + <string name="end" msgid="125797972524818282">"Завяршыць"</string> + <string name="space" msgid="804232271282109749">"Падзяляльнік"</string> + <string name="menu_ime" msgid="4943221416525250684">"Пераключальнік Меню/Клавіятура"</string> + <string name="select_button" msgid="1597989540662710653">"Выберыце, якую кнопку дадаць"</string> + <string name="add_button" msgid="4134946063432258161">"Дадаць кнопку"</string> + <string name="save" msgid="2311877285724540644">"Захаваць"</string> + <string name="reset" msgid="2448168080964209908">"Скінуць"</string> + <string name="no_home_title" msgid="1563808595146071549">"Кнопка гал. экр. не знойдзена"</string> + <string name="no_home_message" msgid="5408485011659260911">"Для навігацыі па гэтай прыладзе патрабуецца кнопка галоўнага экрана. Калі ласка, дадайце кнопку галоўнага экрана перад захаваннем."</string> + <string name="adjust_button_width" msgid="6138616087197632947">"Адрэгуляваць шырыню кнопкі"</string> + <string name="clipboard" msgid="1313879395099896312">"Буфер абмену"</string> + <string name="clipboard_description" msgid="3819919243940546364">"З дапамогай кнопкі Буфер абмену можна перацягваць элементы непасрэдна ў буфер абмену. Элементы можна таксама перацягваць непасрэдна з буфера абмену, калі яны там ёсць."</string> + <string name="accessibility_key" msgid="5701989859305675896">"Кнопка карыстальніцкай навігацыі"</string> + <string name="keycode" msgid="7335281375728356499">"Код клавішы"</string> + <string name="keycode_description" msgid="1403795192716828949">"Кнопка Код клавішы дазваляе дадаваць клавішы ў Панэль навігацыі. Пры націску гэтай кнопкі эмулюецца выбраная клавіша. Спачатку трэба выбраць клавішу для кнопкі, а потым відарыс, які будзе паказвацца на кнопцы."</string> + <string name="select_keycode" msgid="7413765103381924584">"Выберыце клавішу клавіятуры"</string> + <string name="preview" msgid="9077832302472282938">"Папярэдні прагляд"</string> + <string name="drag_to_add_tiles" msgid="7058945779098711293">"Перацягніце, каб дадаць пліткі"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> + <string name="qs_edit" msgid="2232596095725105230">"Рэдагаваць"</string> + <string name="tuner_time" msgid="6572217313285536011">"Час"</string> + <string-array name="clock_options"> + <item msgid="5965318737560463480">"Паказваць гадзіны, хвіліны і секунды"</item> + <item msgid="1427801730816895300">"Паказваць гадзіны і хвіліны (стандартна)"</item> + <item msgid="3830170141562534721">"Не паказваць гэты значок"</item> + </string-array> + <string-array name="battery_options"> + <item msgid="3160236755818672034">"Заўсёды паказваць у працэнтах"</item> + <item msgid="2139628951880142927">"Паказваць працэнты падчас зарадкі (стандартна)"</item> + <item msgid="3327323682209964956">"Не паказваць гэты значок"</item> + </string-array> + <string name="other" msgid="4060683095962566764">"Іншае"</string> + <string name="accessibility_divider" msgid="5903423481953635044">"Раздзяляльнік падзеленага экрана"</string> + <string name="accessibility_action_divider_move_down" msgid="704893304141890042">"Перамясціць уніз"</string> + <string name="accessibility_action_divider_move_up" msgid="4580103171609248006">"Перамясціць уверх"</string> + <string name="accessibility_action_divider_move_left" msgid="9218189832115847253">"Перамясціць улева"</string> + <string name="accessibility_action_divider_move_right" msgid="4671522715182567972">"Перамясціць управа"</string> +</resources> diff --git a/packages/SystemUI/res/values-be-rBY/strings_car.xml b/packages/SystemUI/res/values-be-rBY/strings_car.xml new file mode 100644 index 000000000000..e3ef7c6d5918 --- /dev/null +++ b/packages/SystemUI/res/values-be-rBY/strings_car.xml @@ -0,0 +1,24 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2016, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="car_lockscreen_disclaimer_title" msgid="7997539137376896441">"Кіруйце аўтамабілем бяспечна"</string> + <string name="car_lockscreen_disclaimer_text" msgid="3061224684092952864">"Будзьце заўсёды ў курсе дарожных умоў і заўсёды прытрымлівайцеся дзеючага заканадаўства. Указанні могуць быць недакладнымі, няпоўнымі, небяспечнымі, непадыходзячымі, забароненымі ці прадугледжваць уезд на адміністрацыйныя тэрыторыі. Інфармацыя пра кампаніі таксама можа быць недакладнай ці няпоўнай. Даныя не прадстаўляюцца ў рэжыме рэальнага часу, і дакладнасць вызначэння месцазнаходжання не можа быць гарантавана. Не выкарыстоўвайце сваю мабільную прыладу або праграмы, не прызначаныя для Android Auto, падчас кіравання."</string> +</resources> diff --git a/packages/SystemUI/res/values-be-rBY/strings_tv.xml b/packages/SystemUI/res/values-be-rBY/strings_tv.xml new file mode 100644 index 000000000000..1c93d249300f --- /dev/null +++ b/packages/SystemUI/res/values-be-rBY/strings_tv.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2016, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="pip_close" msgid="3480680679023423574">"Закрыць PIP"</string> + <!-- no translation found for pip_fullscreen (8604643018538487816) --> + <skip /> + <!-- no translation found for pip_play (674145557658227044) --> + <skip /> + <!-- no translation found for pip_pause (8412075640017218862) --> + <skip /> + <string name="pip_hold_home" msgid="340086535668778109">"Утрым. "<b>"HOME"</b>" для кір. PIP"</string> + <string name="pip_onboarding_description" msgid="2882896641362814195">"Націсніце і ўтрымлівайце кнопку HOME для кіравання PIP"</string> + <string name="pip_onboarding_button" msgid="3957426748484904611">"Зразумела"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> +</resources> diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml index 876af0af7d23..6c65f9f1cc3c 100644 --- a/packages/SystemUI/res/values-bg/strings.xml +++ b/packages/SystemUI/res/values-bg/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Работният режим е включен."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Работният режим е изключен."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Работният режим е включен."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Функцията „Икономия на данни“ е изключена."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Функцията „Икономия на данни“ е включена."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Яркост на екрана"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Данните от 2G – 3G са поставени на пауза"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Данните от 4G са поставени на пауза"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Местоположението е зададено от GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Активни заявки за местоположение"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Изчистване на всички известия."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Настройки за известия"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Настройки за <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Екранът ще се завърта автоматично."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ограничение от <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Предупреждение: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Работен режим"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Скорошните ви екрани се показват тук"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Няма скорошни елементи"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Изчистихте всичко"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Информация за приложението"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"фиксиране на екрана"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"търсене"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Показване най-горе в списъка с известия, както и на екрана и разрешаване на звуков сигнал"</string> <string name="notification_more_settings" msgid="816306283396553571">"Още настройки"</string> <string name="notification_done" msgid="5279426047273930175">"Готово"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Цвят и облик"</string> <string name="night_mode" msgid="3540405868248625488">"Нощен режим"</string> <string name="calibrate_display" msgid="5974642573432039217">"Калибриране на дисплея"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Избиране на клавиш от клавиатурата"</string> <string name="preview" msgid="9077832302472282938">"Визуализация"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Преместете с плъзгане, за да добавите плочки"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Преместете тук с плъзгане за премахване"</string> <string name="qs_edit" msgid="2232596095725105230">"Редактиране"</string> <string name="tuner_time" msgid="6572217313285536011">"Час"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-bg/strings_tv.xml b/packages/SystemUI/res/values-bg/strings_tv.xml index c5230a48749a..9926ef8e6954 100644 --- a/packages/SystemUI/res/values-bg/strings_tv.xml +++ b/packages/SystemUI/res/values-bg/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Контр. на PIP: Задр. "<b>"HOME"</b></string> <string name="pip_onboarding_description" msgid="2882896641362814195">"За контролиране на PIP натиснете и задръжте бутона „HOME“"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Разбрах"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-bn-rBD/strings.xml b/packages/SystemUI/res/values-bn-rBD/strings.xml index eaf450fa3d8d..446d4afa88fd 100644 --- a/packages/SystemUI/res/values-bn-rBD/strings.xml +++ b/packages/SystemUI/res/values-bn-rBD/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"কাজের মোড চালু আছে"</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"কাজের মোড বন্ধ আছে।"</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"কাজের মোড চালু আছে"</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"ডেটা সেভার বন্ধ আছে।"</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"ডেটা সেভার চালু আছে।"</string> <string name="accessibility_brightness" msgid="8003681285547803095">"প্রদর্শনের উজ্জ্বলতা"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G ডেটা বিরতি দেওয়া হয়েছে"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G ডেটা বিরতি দেওয়া হয়েছে"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS এর দ্বারা সেট করা অবস্থান"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"অবস্থান অনুরোধ সক্রিয় রয়েছে"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"সমস্ত বিজ্ঞপ্তি সাফ করুন৷"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"বিজ্ঞপ্তির সেটিংস"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> সেটিংস"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"স্ক্রীন স্বয়ংক্রিয়ভাবে ঘুরে যাবে৷"</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"সীমা <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> সতর্কতা"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"কাজের মোড"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"আপনার সাম্প্রতিক স্ক্রীনগুলো এখানে দেখা যাবে"</string> + <string name="recents_empty_message" msgid="808480104164008572">"কোনো সাম্প্রতিক আইটেম নেই"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"আপনি সবকিছু সাফ করেছেন"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"অ্যাপ্লিকেশানের তথ্য"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"স্ক্রীন পিন করা"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"অনুসন্ধান"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"বিজ্ঞপ্তি তালিকার শীর্ষে দেখানো হয় এবং স্ক্রীনের উপরে প্রদর্শিত এবং শব্দ করার মঞ্জুরি দেয়"</string> <string name="notification_more_settings" msgid="816306283396553571">"আরো সেটিংস"</string> <string name="notification_done" msgid="5279426047273930175">"সম্পন্ন"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"রঙ এবং চেহারা"</string> <string name="night_mode" msgid="3540405868248625488">"রাতের মোড"</string> <string name="calibrate_display" msgid="5974642573432039217">"প্রদর্শন ক্যালিব্রেট করুন"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"কীবোর্ডের বোতাম নির্বাচন করুন"</string> <string name="preview" msgid="9077832302472282938">"পূর্বরূপ দেখুন"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"টাইলগুলি যোগ করার জন্য টেনে আনুন"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"সরানোর জন্য এখানে টেনে আনুন"</string> <string name="qs_edit" msgid="2232596095725105230">"সম্পাদনা করুন"</string> <string name="tuner_time" msgid="6572217313285536011">"সময়"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-bn-rBD/strings_tv.xml b/packages/SystemUI/res/values-bn-rBD/strings_tv.xml index 6bb19f5a87b1..cbed4a184e36 100644 --- a/packages/SystemUI/res/values-bn-rBD/strings_tv.xml +++ b/packages/SystemUI/res/values-bn-rBD/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP নিয়ন্ত্রণ করতে "<b>"হোম"</b>" কী ধরে রাখুন"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP নিয়ন্ত্রণ করতে HOME বোতামটিকে টিপুন ও ধরে থাকুন"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"বুঝেছি"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-bs-rBA-land/strings.xml b/packages/SystemUI/res/values-bs-rBA-land/strings.xml new file mode 100644 index 000000000000..bdc652af8f1a --- /dev/null +++ b/packages/SystemUI/res/values-bs-rBA-land/strings.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +/** + * Copyright (c) 2010, The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="toast_rotation_locked" msgid="7609673011431556092">"Ekran je sada zaključan u pejzažnom prikazu."</string> +</resources> diff --git a/packages/SystemUI/res/values-bs-rBA/strings.xml b/packages/SystemUI/res/values-bs-rBA/strings.xml index 0b72a066812f..024bf707f547 100644 --- a/packages/SystemUI/res/values-bs-rBA/strings.xml +++ b/packages/SystemUI/res/values-bs-rBA/strings.xml @@ -222,10 +222,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Poslovni režim uključen."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Poslovni režim je isključen."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Poslovni režim je uključen."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Ušteda podataka je isključena."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Ušteda podataka je uključena."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Osvjetljenje ekrana"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G–3G prijenos podataka je pauzirano"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G prijenos podataka je pauzirano"</string> @@ -239,6 +237,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokacija utvrđena GPS signalom"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Aktiviran je zahtjev za lokaciju"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Uklanjanje svih obavještenja."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Postavke obavještenja"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Postavke aplikacije <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran će se automatski rotirati."</string> @@ -304,7 +304,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ograničenje <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozorenje <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Poslovni režim"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Ovdje se pojavljuju nedavno korišteni ekrani"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Nema nedavnih stavki"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Sve ste obrisali"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacije o aplikaciji"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"kačenje ekrana"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"pretraga"</string> @@ -480,6 +481,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Prikaži na vrhu liste obavještenja, kratko prikaži na ekranu i dozvoli zvuk"</string> <string name="notification_more_settings" msgid="816306283396553571">"Više postavki"</string> <string name="notification_done" msgid="5279426047273930175">"Gotovo"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Boja i izgled"</string> <string name="night_mode" msgid="3540405868248625488">"Noćni način rada"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibracija zaslona"</string> @@ -538,6 +541,8 @@ <string name="select_keycode" msgid="7413765103381924584">"Odaberite dugme na tastaturi"</string> <string name="preview" msgid="9077832302472282938">"Pregledaj"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Povucite da biste dodali polja"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"Uredi"</string> <string name="tuner_time" msgid="6572217313285536011">"Vrijeme"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-bs-rBA/strings_tv.xml b/packages/SystemUI/res/values-bs-rBA/strings_tv.xml index dd4a518f6db3..5d20c8c3a15a 100644 --- a/packages/SystemUI/res/values-bs-rBA/strings_tv.xml +++ b/packages/SystemUI/res/values-bs-rBA/strings_tv.xml @@ -29,4 +29,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Za kontr. PIP držite "<b>"HOME"</b></string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Za kontrolu PIP, pritisnite i držite dugme POČETAK"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Jasno mi je"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml index 6ddec67e88d8..645c84f83ece 100644 --- a/packages/SystemUI/res/values-ca/strings.xml +++ b/packages/SystemUI/res/values-ca/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"El mode de feina està activat."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"S\'ha desactivat el mode de feina."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"S\'ha activat el mode de feina."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"S\'ha desactivat l\'Economitzador de dades."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"S\'ha activat l\'Economitzador de dades."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Brillantor de la pantalla"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Les dades 2G-3G estan aturades"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Les dades 4G estan aturades"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"S\'ha establert la ubicació per GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Sol·licituds d\'ubicació actives"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Esborra totes les notificacions."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Configuració de les notificacions"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Configuració de l\'aplicació <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"La pantalla girarà automàticament."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Límit: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advertiment: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Mode de feina"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Aquí es mostren les teves pantalles recents."</string> + <string name="recents_empty_message" msgid="808480104164008572">"No hi ha cap element recent"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Ho has esborrat tot"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informació de l\'aplicació"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixació de pantalla"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"cerca"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Les notificacions es mostren al capdamunt de la llista, apareixen a la pantalla i poden emetre sons"</string> <string name="notification_more_settings" msgid="816306283396553571">"Més opcions"</string> <string name="notification_done" msgid="5279426047273930175">"Fet"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Color i aparença"</string> <string name="night_mode" msgid="3540405868248625488">"Mode nocturn"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibra la pantalla"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Selecciona un botó de teclat"</string> <string name="preview" msgid="9077832302472282938">"Previsualització"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Arrossega per afegir camps"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arrossega\'ls aquí per suprimir-los"</string> <string name="qs_edit" msgid="2232596095725105230">"Edita"</string> <string name="tuner_time" msgid="6572217313285536011">"Hora"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ca/strings_tv.xml b/packages/SystemUI/res/values-ca/strings_tv.xml index 3634b994c105..35482d4c800b 100644 --- a/packages/SystemUI/res/values-ca/strings_tv.xml +++ b/packages/SystemUI/res/values-ca/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Prem "<b>"INICI"</b>" per controlar PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Mantén premut el botó INICI per controlar PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"D\'acord"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml index e23f53fa39d7..5ce6bd94592c 100644 --- a/packages/SystemUI/res/values-cs/strings.xml +++ b/packages/SystemUI/res/values-cs/strings.xml @@ -238,6 +238,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Poloha nastavena pomocí systému GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Aktivní žádosti o polohu"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Vymazat všechna oznámení."</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"a ještě <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Nastavení oznámení"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Nastavení aplikace <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Obrazovka se automaticky otočí."</string> @@ -303,7 +304,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limit: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozornění při <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Pracovní režim"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Zde budou zobrazeny vaše poslední obrazovky"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Žádné nedávné položky"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Vše je vymazáno"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informace o aplikaci"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"připnutí obrazovky"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"vyhledat"</string> @@ -479,6 +481,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Tato oznámení zobrazovat na začátku seznamu, zobrazit přímo na obrazovce a upozornit na ně zvukem"</string> <string name="notification_more_settings" msgid="816306283396553571">"Další nastavení"</string> <string name="notification_done" msgid="5279426047273930175">"Hotovo"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"Nastavení oznámení aplikace <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Barva a vzhled"</string> <string name="night_mode" msgid="3540405868248625488">"Noční režim"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibrovat displej"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Vyberte klávesu na klávesnici"</string> <string name="preview" msgid="9077832302472282938">"Náhled"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Dlaždice přidáte přetažením"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Přetažením sem tituly odstraníte"</string> <string name="qs_edit" msgid="2232596095725105230">"Upravit"</string> <string name="tuner_time" msgid="6572217313285536011">"Čas"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-cs/strings_tv.xml b/packages/SystemUI/res/values-cs/strings_tv.xml index b65b08e2254f..3ee822ad324c 100644 --- a/packages/SystemUI/res/values-cs/strings_tv.xml +++ b/packages/SystemUI/res/values-cs/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"Funkci PIP lze ovládat podržením tlačítka "<b>"PLOCHA"</b></string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Funkci PIP lze ovládat podržením tlačítka PLOCHA"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Rozumím"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"Zavřít"</string> </resources> diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml index ba8898e5c64b..0538bdbf1370 100644 --- a/packages/SystemUI/res/values-da/strings.xml +++ b/packages/SystemUI/res/values-da/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Arbejdstilstand er slået til."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Arbejdstilstand er slået fra."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Arbejdstilstand er slået til."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Datasparefunktionen er slået fra."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Datasparefunktionen er slået til."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Skærmens lysstyrke"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G-data er sat på pause"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G-data er sat på pause"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Placeringen er angivet ved hjælp af GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Aktive placeringsanmodninger"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Ryd alle underretninger."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Underretningsindstillinger"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Indstillinger for <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Skærmen roterer automatisk."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Grænse: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advarsel ved <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Arbejdstilstand"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Dine seneste skærme vises her"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Ingen nye elementer"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Du har ryddet alt"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Oplysninger om applikationen"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"bliv i app"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"søg"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Vis øverst på listen over underretninger, vis på skærmen, og tillad lyd"</string> <string name="notification_more_settings" msgid="816306283396553571">"Flere indstillinger"</string> <string name="notification_done" msgid="5279426047273930175">"Færdig"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Farve og udseende"</string> <string name="night_mode" msgid="3540405868248625488">"Nattilstand"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibrer skærmen"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Vælg tastaturknap"</string> <string name="preview" msgid="9077832302472282938">"Eksempelvisning"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Træk for at tilføje felter"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Træk herhen for at fjerne"</string> <string name="qs_edit" msgid="2232596095725105230">"Rediger"</string> <string name="tuner_time" msgid="6572217313285536011">"Tid"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-da/strings_tv.xml b/packages/SystemUI/res/values-da/strings_tv.xml index b51c5df95375..51b85820f18f 100644 --- a/packages/SystemUI/res/values-da/strings_tv.xml +++ b/packages/SystemUI/res/values-da/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Hold "<b>"HOME"</b>" nede for at styre PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Tryk på HOME-knappen, og hold den nede for at styre PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml index 345dbeddf95f..4cd031662647 100644 --- a/packages/SystemUI/res/values-de/strings.xml +++ b/packages/SystemUI/res/values-de/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Arbeitsmodus an."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Arbeitsmodus deaktiviert."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Arbeitsmodus aktiviert."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Datenkomprimierung ist deaktiviert."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Datenkomprimierung ist aktiviert."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Helligkeit des Displays"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-/3G-Daten pausiert"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G-Daten pausiert"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Standort durch GPS festgelegt"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Standortanfragen aktiv"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Alle Benachrichtigungen löschen"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Benachrichtigungseinstellungen"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Einstellungen von <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Bildschirm wird automatisch gedreht."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> Datenlimit"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Warnung für <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Arbeitsmodus"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Hier siehst du deine zuletzt geöffneten Apps."</string> + <string name="recents_empty_message" msgid="808480104164008572">"Keine kürzlich verwendeten Elemente"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Du hast alles gelöscht"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"App-Info"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"Bildschirmfixierung"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"Suche"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Ganz oben in der Benachrichtigungsliste anzeigen, auf dem Display einblenden und Ton zulassen"</string> <string name="notification_more_settings" msgid="816306283396553571">"Weitere Einstellungen"</string> <string name="notification_done" msgid="5279426047273930175">"Fertig"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Farbe und Darstellung"</string> <string name="night_mode" msgid="3540405868248625488">"Nachtmodus"</string> <string name="calibrate_display" msgid="5974642573432039217">"Bildschirm kalibrieren"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Taste auswählen"</string> <string name="preview" msgid="9077832302472282938">"Vorschau"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Zum Hinzufügen von Kacheln ziehen"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Zum Entfernen hierher ziehen"</string> <string name="qs_edit" msgid="2232596095725105230">"Bearbeiten"</string> <string name="tuner_time" msgid="6572217313285536011">"Uhrzeit"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-de/strings_tv.xml b/packages/SystemUI/res/values-de/strings_tv.xml index b96669b1c7c0..f4487373b97e 100644 --- a/packages/SystemUI/res/values-de/strings_tv.xml +++ b/packages/SystemUI/res/values-de/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109"><b>"STARTBILDSCHIRMTASTE"</b>" drücken, um PIP zu steuern"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Halte die Taste für die Startseite gedrückt, um das Bild-in-Bild zu steuern"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml index 78cbb20dc113..59810c27ca3b 100644 --- a/packages/SystemUI/res/values-el/strings.xml +++ b/packages/SystemUI/res/values-el/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Ρύθμιση τοποθεσίας με GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Τα αιτήματα τοποθεσίας έχουν ενεργοποιηθεί"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Εκκαθάριση όλων των ειδοποιήσεων."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Ρυθμίσεις ειδοποιήσεων"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Ρυθμίσεις <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Θα γίνεται αυτόματη περιστροφή της οθόνης."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Όριο <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Προειδοποίηση για <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Λειτουργία εργασίας"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Οι πρόσφατες οθόνες σας εμφανίζονται εδώ"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Δεν υπάρχουν πρόσφατα στοιχεία"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Έχει γίνει εκκαθάριση όλων των στοιχείων"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Πληροφορίες εφαρμογής"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"καρφίτσωμα οθόνης"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"αναζήτηση"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Να εμφανίζονται στην κορυφή της λίστας ειδοποιήσεων, να προβάλλονται στην οθόνη και να επιτρέπεται ο ήχος"</string> <string name="notification_more_settings" msgid="816306283396553571">"Περισσότερες ρυθμίσεις"</string> <string name="notification_done" msgid="5279426047273930175">"Τέλος"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Χρώμα και εμφάνιση"</string> <string name="night_mode" msgid="3540405868248625488">"Νυχτερινή λειτουργία"</string> <string name="calibrate_display" msgid="5974642573432039217">"Βαθμονόμηση οθόνης"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Επιλογή κουμπιού πληκτρολογίου"</string> <string name="preview" msgid="9077832302472282938">"Προεπισκόπηση"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Σύρετε για να προσθέσετε πλακίδια"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Σύρετε εδώ για κατάργηση"</string> <string name="qs_edit" msgid="2232596095725105230">"Επεξεργασία"</string> <string name="tuner_time" msgid="6572217313285536011">"Ώρα"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-el/strings_tv.xml b/packages/SystemUI/res/values-el/strings_tv.xml index e72d579acdc8..355c9b0ff7ac 100644 --- a/packages/SystemUI/res/values-el/strings_tv.xml +++ b/packages/SystemUI/res/values-el/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Κρατήστε το πλήκτρο "<b>"HOME"</b>" πατημένο για έλεγχο του PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Πιέστε παρατεταμένα το κουμπί HOME, για να ελέγξετε τη λειτουργία PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Κατάλαβα"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml index 6367ed9900d7..93461884ada3 100644 --- a/packages/SystemUI/res/values-en-rAU/strings.xml +++ b/packages/SystemUI/res/values-en-rAU/strings.xml @@ -236,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Location set by GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Location requests active"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Clear all notifications."</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+<xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Notification settings"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> settings"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Screen will rotate automatically."</string> @@ -301,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> limit"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> warning"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Work mode"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Your recent screens appear here"</string> + <string name="recents_empty_message" msgid="808480104164008572">"No recent items"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"You\'ve cleared everything"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string> @@ -477,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Show at the top of the notifications list, peek on to the screen and allow sound"</string> <string name="notification_more_settings" msgid="816306283396553571">"More settings"</string> <string name="notification_done" msgid="5279426047273930175">"Finished"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> notification controls"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Colour and appearance"</string> <string name="night_mode" msgid="3540405868248625488">"Night mode"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibrate display"</string> @@ -535,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Select Keyboard Button"</string> <string name="preview" msgid="9077832302472282938">"Preview"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Drag to add tiles"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Drag here to remove"</string> <string name="qs_edit" msgid="2232596095725105230">"(edit)"</string> <string name="tuner_time" msgid="6572217313285536011">"Time"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-en-rAU/strings_tv.xml b/packages/SystemUI/res/values-en-rAU/strings_tv.xml index 5711c352aa1a..87255aeb0628 100644 --- a/packages/SystemUI/res/values-en-rAU/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rAU/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"Hold "<b>"HOME"</b>" to control PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Press and hold the HOME button to control PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Understood"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"Dismiss"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml index 6367ed9900d7..93461884ada3 100644 --- a/packages/SystemUI/res/values-en-rGB/strings.xml +++ b/packages/SystemUI/res/values-en-rGB/strings.xml @@ -236,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Location set by GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Location requests active"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Clear all notifications."</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+<xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Notification settings"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> settings"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Screen will rotate automatically."</string> @@ -301,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> limit"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> warning"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Work mode"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Your recent screens appear here"</string> + <string name="recents_empty_message" msgid="808480104164008572">"No recent items"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"You\'ve cleared everything"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string> @@ -477,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Show at the top of the notifications list, peek on to the screen and allow sound"</string> <string name="notification_more_settings" msgid="816306283396553571">"More settings"</string> <string name="notification_done" msgid="5279426047273930175">"Finished"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> notification controls"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Colour and appearance"</string> <string name="night_mode" msgid="3540405868248625488">"Night mode"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibrate display"</string> @@ -535,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Select Keyboard Button"</string> <string name="preview" msgid="9077832302472282938">"Preview"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Drag to add tiles"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Drag here to remove"</string> <string name="qs_edit" msgid="2232596095725105230">"(edit)"</string> <string name="tuner_time" msgid="6572217313285536011">"Time"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-en-rGB/strings_tv.xml b/packages/SystemUI/res/values-en-rGB/strings_tv.xml index 5711c352aa1a..87255aeb0628 100644 --- a/packages/SystemUI/res/values-en-rGB/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rGB/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"Hold "<b>"HOME"</b>" to control PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Press and hold the HOME button to control PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Understood"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"Dismiss"</string> </resources> diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml index 6367ed9900d7..93461884ada3 100644 --- a/packages/SystemUI/res/values-en-rIN/strings.xml +++ b/packages/SystemUI/res/values-en-rIN/strings.xml @@ -236,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Location set by GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Location requests active"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Clear all notifications."</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+<xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Notification settings"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> settings"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Screen will rotate automatically."</string> @@ -301,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> limit"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> warning"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Work mode"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Your recent screens appear here"</string> + <string name="recents_empty_message" msgid="808480104164008572">"No recent items"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"You\'ve cleared everything"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Application Info"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"screen pinning"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"search"</string> @@ -477,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Show at the top of the notifications list, peek on to the screen and allow sound"</string> <string name="notification_more_settings" msgid="816306283396553571">"More settings"</string> <string name="notification_done" msgid="5279426047273930175">"Finished"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> notification controls"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Colour and appearance"</string> <string name="night_mode" msgid="3540405868248625488">"Night mode"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibrate display"</string> @@ -535,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Select Keyboard Button"</string> <string name="preview" msgid="9077832302472282938">"Preview"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Drag to add tiles"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Drag here to remove"</string> <string name="qs_edit" msgid="2232596095725105230">"(edit)"</string> <string name="tuner_time" msgid="6572217313285536011">"Time"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-en-rIN/strings_tv.xml b/packages/SystemUI/res/values-en-rIN/strings_tv.xml index 5711c352aa1a..87255aeb0628 100644 --- a/packages/SystemUI/res/values-en-rIN/strings_tv.xml +++ b/packages/SystemUI/res/values-en-rIN/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"Hold "<b>"HOME"</b>" to control PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Press and hold the HOME button to control PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Understood"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"Dismiss"</string> </resources> diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 4769e20df73e..45b40203f9f8 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Modo de trabajo activado"</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Se desactivó el modo de trabajo."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Se activó el modo de trabajo."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Se desactivó Reducir datos."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Se activó Reducir datos."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Brillo de pantalla"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Datos 2G-3G pausados"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Datos 4G pausados"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"La ubicación se estableció por GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitudes de ubicación activas"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Eliminar todas las notificaciones"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Configuración de notificaciones"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Configuración de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"La pantalla girará automáticamente."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Límite de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advertencia de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modo de trabajo"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Las pantallas recientes aparecen aquí."</string> + <string name="recents_empty_message" msgid="808480104164008572">"No hay elementos recientes"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Borraste todo"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Información de la aplicación"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"Fijar pantalla"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Mostrar en la parte superior de la lista de notificaciones, ver en la pantalla y permitir sonidos"</string> <string name="notification_more_settings" msgid="816306283396553571">"Más opciones de configuración"</string> <string name="notification_done" msgid="5279426047273930175">"Listo"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Color y apariencia"</string> <string name="night_mode" msgid="3540405868248625488">"Modo nocturno"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibrar pantalla"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Selecciona un botón del teclado"</string> <string name="preview" msgid="9077832302472282938">"Vista previa"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Arrastra los mosaicos para agregarlos"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arrastra aquí para quitar"</string> <string name="qs_edit" msgid="2232596095725105230">"Editar"</string> <string name="tuner_time" msgid="6572217313285536011">"Hora"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-es-rUS/strings_tv.xml b/packages/SystemUI/res/values-es-rUS/strings_tv.xml index 99913e644cf8..98ad35bd9fe7 100644 --- a/packages/SystemUI/res/values-es-rUS/strings_tv.xml +++ b/packages/SystemUI/res/values-es-rUS/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Mantén presionado "<b>"INICIO"</b>" para controlar PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Mantén presionado el botón INICIO para controlar PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Entendido"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml index e89125e2a21a..5c84999dfebc 100644 --- a/packages/SystemUI/res/values-es/strings.xml +++ b/packages/SystemUI/res/values-es/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Modo de trabajo activado."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Modo de trabajo desactivado."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Modo de trabajo activado."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Economizador de Datos desactivado."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Economizador de Datos activado."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Brillo de la pantalla"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Datos 2G-3G pausados"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Datos 4G pausados"</string> @@ -238,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Ubicación definida por GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitudes de ubicación activas"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Borrar todas las notificaciones"</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ de <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Ajustes de notificaciones"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Ajustes de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"La pantalla girará automáticamente."</string> @@ -303,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Límite de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advertencia de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modo de trabajo"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Aquí aparecerán tus pantallas recientes"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Ningún elemento reciente"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Has rechazado todo"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Información de la aplicación"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fijación de pantalla"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string> @@ -479,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Mostrar en la parte superior de la lista de notificaciones, mostrar en la pantalla y permitir sonido"</string> <string name="notification_more_settings" msgid="816306283396553571">"Más ajustes"</string> <string name="notification_done" msgid="5279426047273930175">"Listo"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"Controles de notificaciones de <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Color y aspecto"</string> <string name="night_mode" msgid="3540405868248625488">"Modo nocturno"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibrar pantalla"</string> @@ -537,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Selecciona un botón de teclado"</string> <string name="preview" msgid="9077832302472282938">"Vista previa"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Arrastrar para añadir mosaicos"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arrastrar aquí para eliminar"</string> <string name="qs_edit" msgid="2232596095725105230">"Cambiar"</string> <string name="tuner_time" msgid="6572217313285536011">"Hora"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-es/strings_tv.xml b/packages/SystemUI/res/values-es/strings_tv.xml index 200410cee2c8..c0b0afe9789a 100644 --- a/packages/SystemUI/res/values-es/strings_tv.xml +++ b/packages/SystemUI/res/values-es/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"Mantén el botón "<b>"INICIO"</b>" pulsado para control de PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Mantén el botón de INICIO pulsado para controlar el modo PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Entendido"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"Ignorar"</string> </resources> diff --git a/packages/SystemUI/res/values-et-rEE/strings.xml b/packages/SystemUI/res/values-et-rEE/strings.xml index cad44d9b6d90..423166fd0d7f 100644 --- a/packages/SystemUI/res/values-et-rEE/strings.xml +++ b/packages/SystemUI/res/values-et-rEE/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Töörežiim on sees."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Töörežiim on välja lülitatud."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Töörežiim on sisse lülitatud."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Andmemahu säästja on välja lülitatud."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Andmemahu säästja on sisse lülitatud."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Ekraani heledus"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G–3G andmekasutus on peatatud"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G andmekasutus on peatatud"</string> @@ -238,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS-i määratud asukoht"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Asukoha taotlused on aktiivsed"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Kustuta kõik teatised."</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Märguandeseaded"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Rakenduse <xliff:g id="APP_NAME">%s</xliff:g> seaded"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekraani pööramine toimub automaatselt."</string> @@ -303,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limiit: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> hoiatus"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Töörežiim"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Teie viimane ekraanikuva ilmub siia"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Hiljutisi üksusi pole"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Olete kõik ära kustutanud"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Rakenduste teave"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekraanikuva kinnitamine"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"otsing"</string> @@ -479,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Kuva märguannete loendi ülaservas, kuva ekraani servas ja luba heli"</string> <string name="notification_more_settings" msgid="816306283396553571">"Rohkem seadeid"</string> <string name="notification_done" msgid="5279426047273930175">"Valmis"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"Rakenduse <xliff:g id="APP_NAME">%1$s</xliff:g> märguannete juhtnupud"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Värv ja ilme"</string> <string name="night_mode" msgid="3540405868248625488">"Öörežiim"</string> <string name="calibrate_display" msgid="5974642573432039217">"Ekraani kalibreerimine"</string> @@ -537,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Klaviatuuri nupu valimine"</string> <string name="preview" msgid="9077832302472282938">"Eelvaade"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Lohistage paanide lisamiseks"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Lohistage eemaldamiseks siia"</string> <string name="qs_edit" msgid="2232596095725105230">"Muuda"</string> <string name="tuner_time" msgid="6572217313285536011">"Kellaaeg"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-et-rEE/strings_tv.xml b/packages/SystemUI/res/values-et-rEE/strings_tv.xml index 972083b4a100..f427b80f7bcb 100644 --- a/packages/SystemUI/res/values-et-rEE/strings_tv.xml +++ b/packages/SystemUI/res/values-et-rEE/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP juht. hoidke all nuppu "<b>"AVAEKRAAN"</b></string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP juhtimiseks vajutage pikalt nuppu AVAEKRAAN"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Selge"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"Loobu"</string> </resources> diff --git a/packages/SystemUI/res/values-eu-rES/strings.xml b/packages/SystemUI/res/values-eu-rES/strings.xml index 1dc6d687de4d..435e8213fdb2 100644 --- a/packages/SystemUI/res/values-eu-rES/strings.xml +++ b/packages/SystemUI/res/values-eu-rES/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Aktibatuta dago lan modua."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Desaktibatuta dago lan modua."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Aktibatuta dago lan modua."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Desaktibatuta dago datu-aurrezlea."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Aktibatuta dago datu-aurrezlea."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Bistaratu distira"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G datuen erabilera eten da"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G datuen erabilera eten da"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Kokapena GPS bidez ezarri da"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Aplikazioen kokapen-eskaerak aktibo daude"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Garbitu jakinarazpen guztiak."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Jakinarazpen-ezarpenak"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ezarpenak"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Pantaila automatikoki biratuko da."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Muga: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Abisua: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Lan modua"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Ikusitako azken pantailak erakusten dira hemen"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Ez dago azkenaldi honetako ezer"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Dena garbitu duzu"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Aplikazioaren informazioa"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pantaila-ainguratzea"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"bilatu"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Erakutsi jakinarazpen hauek zerrendaren goialdean, agerrarazi pantailan eta egin soinua"</string> <string name="notification_more_settings" msgid="816306283396553571">"Ezarpen gehiago"</string> <string name="notification_done" msgid="5279426047273930175">"Eginda"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Kolorea eta itxura"</string> <string name="night_mode" msgid="3540405868248625488">"Gau modua"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibratu pantaila"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Hautatu teklatuko botoia"</string> <string name="preview" msgid="9077832302472282938">"Aurrebista"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Arrastatu lauzak hemen gehitzeko"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Kentzeko, arrastatu hona"</string> <string name="qs_edit" msgid="2232596095725105230">"Editatu"</string> <string name="tuner_time" msgid="6572217313285536011">"Ordua"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-eu-rES/strings_tv.xml b/packages/SystemUI/res/values-eu-rES/strings_tv.xml index a312ea48bd4a..f28ec5e73ce4 100644 --- a/packages/SystemUI/res/values-eu-rES/strings_tv.xml +++ b/packages/SystemUI/res/values-eu-rES/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109"><b>"HASIERA"</b>" PIP kontrolatzeko"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Eduki sakatuta hasierako botoia pantaila txikia kontrolatzeko"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Ados"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml index dfe1d544f9b5..f2e977c55819 100644 --- a/packages/SystemUI/res/values-fa/strings.xml +++ b/packages/SystemUI/res/values-fa/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"مکان تنظیم شده توسط GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"درخواستهای موقعیت مکانی فعال است"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"پاک کردن تمام اعلانها"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"تنظیمات اعلان"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"تنظیمات <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"صفحه به صورت خودکار میچرخد."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> محدودیت"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"هشدار <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"حالت کار"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"صفحههای اخیر شما اینجا نمایان میشوند"</string> + <string name="recents_empty_message" msgid="808480104164008572">"بدون موارد اخیر"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"همهچیز را پاک کردهاید"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"اطلاعات برنامه"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"پین کردن صفحه"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"جستجو"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"در بالای فهرست اعلان نشان داده شوند، در صفحه نشان داده شوند و صدادار باشند"</string> <string name="notification_more_settings" msgid="816306283396553571">"تنظیمات بیشتر"</string> <string name="notification_done" msgid="5279426047273930175">"تمام"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"رنگ و ظاهر"</string> <string name="night_mode" msgid="3540405868248625488">"حالت شب"</string> <string name="calibrate_display" msgid="5974642573432039217">"درجهبندی نمایشگر"</string> @@ -535,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"کلید صفحهکلید را انتخاب کنید"</string> <string name="preview" msgid="9077832302472282938">"پیشنمایش"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"کشیدن برای افزودن کاشیها"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"ویرایش"</string> <string name="tuner_time" msgid="6572217313285536011">"زمان"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-fa/strings_tv.xml b/packages/SystemUI/res/values-fa/strings_tv.xml index cf37db108277..51777243d19b 100644 --- a/packages/SystemUI/res/values-fa/strings_tv.xml +++ b/packages/SystemUI/res/values-fa/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"کنترل PIP با نگهداشتن "<b>"HOME"</b></string> <string name="pip_onboarding_description" msgid="2882896641362814195">"برای کنترل PIP دکمه صفحه اصلی را فشار داده و نگهدارید"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"متوجه شدم"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml index e5d513fabae5..11cb91ef4e62 100644 --- a/packages/SystemUI/res/values-fi/strings.xml +++ b/packages/SystemUI/res/values-fi/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Sijainti määritetty GPS:n avulla"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Sijaintipyynnöt aktiiviset"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Tyhjennä kaikki ilmoitukset."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Ilmoitusasetukset"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Asetukset – <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ruutu kääntyy automaattisesti."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"kiintiö <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> – varoitus"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Työtila"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Äskettäin käytetyt ruudut näkyvät tässä"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Ei viimeaikaisia kohteita"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Kaikki on hoidettu."</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Sovellustiedot"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"näytön kiinnitys"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"haku"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Näytä ilmoitukset näytöllä ja ilmoitusluettelon yläosassa ja salli niiden äänet."</string> <string name="notification_more_settings" msgid="816306283396553571">"Lisäasetukset"</string> <string name="notification_done" msgid="5279426047273930175">"Valmis"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Väri ja ulkoasu"</string> <string name="night_mode" msgid="3540405868248625488">"Yötila"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibroi näyttö"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Valitse näppäimistön näppäin"</string> <string name="preview" msgid="9077832302472282938">"Esikatselu"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Lisää osioita vetämällä."</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Poista vetämällä tähän."</string> <string name="qs_edit" msgid="2232596095725105230">"Muokkaa"</string> <string name="tuner_time" msgid="6572217313285536011">"Aika"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-fi/strings_tv.xml b/packages/SystemUI/res/values-fi/strings_tv.xml index 94c780628ad9..642ed208df48 100644 --- a/packages/SystemUI/res/values-fi/strings_tv.xml +++ b/packages/SystemUI/res/values-fi/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP: paina pitkään "<b>"aloituspain"</b>"."</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Hallinnoi PIP-tilaa painamalla ALOITUSNÄYTTÖ-painiketta pitkään."</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Selvä"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml index 223274f555c1..c647cc965537 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Mode Travail activé."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Le mode Travail est désactivé."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Le mode Travail est activé."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Mode Économiseur de données désactivé."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Mode Économiseur de données activé."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Luminosité de l\'écran"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Données 2G/3G désactivées"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Données 4G désactivées"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Position définie par GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Demandes de localisation actives"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Supprimer toutes les notifications"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Paramètres de notification"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Paramètres de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"L\'écran pivote automatiquement."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite : <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avertissement : <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Mode Travail"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Vos écrans récents s\'affichent ici"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Aucun élément récent"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Vous avez tout effacé"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Détails de l\'application"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"épinglage d\'écran"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"rechercher"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Afficher en haut de la liste des notifications, afficher sur l\'écran et émettre un son"</string> <string name="notification_more_settings" msgid="816306283396553571">"Plus de paramètres"</string> <string name="notification_done" msgid="5279426047273930175">"Terminé"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Couleur et apparence"</string> <string name="night_mode" msgid="3540405868248625488">"Mode Nuit"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibrer l\'affichage"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Sélectionnez la touche du clavier"</string> <string name="preview" msgid="9077832302472282938">"Aperçu"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Faites glisser des tuiles ici pour les ajouter"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Faites glisser les tuiles ici pour les supprimer"</string> <string name="qs_edit" msgid="2232596095725105230">"Modifier"</string> <string name="tuner_time" msgid="6572217313285536011">"Heure"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-fr-rCA/strings_tv.xml b/packages/SystemUI/res/values-fr-rCA/strings_tv.xml index 48bbb269b3ba..1ae3c5c16e43 100644 --- a/packages/SystemUI/res/values-fr-rCA/strings_tv.xml +++ b/packages/SystemUI/res/values-fr-rCA/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"Lecture"</string> <string name="pip_pause" msgid="8412075640017218862">"Interrompre"</string> <string name="pip_hold_home" msgid="340086535668778109">"Maint. enf. "<b>"ACC."</b>" pr gér. mode IDI"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"Maintenez enfoncé le bouton ACCUEIL pour gérer le mode IDI."</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml index 474a24055ace..7d91f6f108ab 100644 --- a/packages/SystemUI/res/values-fr/strings.xml +++ b/packages/SystemUI/res/values-fr/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Mode Travail activé"</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Le mode Travail est désactivé."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Le mode Travail est activé."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"L\'économiseur de données est désactivé."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"L\'économiseur de données est activé."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Luminosité de l\'affichage"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Données 2G-3G désactivées"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Données 4G désactivées"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Position définie par GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Demandes de localisation actives"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Supprimer toutes les notifications"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Paramètres de notification"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Paramètres de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"L\'écran pivote automatiquement."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> au maximum"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avertissement : <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Mode Travail"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Vos écrans récents s\'affichent ici"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Aucun élément récent"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Vous avez tout effacé."</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Infos application"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"épinglage d\'écran"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"rechercher"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Afficher en haut de la liste des notifications, afficher sur l\'écran et émettre un son"</string> <string name="notification_more_settings" msgid="816306283396553571">"Plus de paramètres"</string> <string name="notification_done" msgid="5279426047273930175">"Terminé"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Couleur et apparence"</string> <string name="night_mode" msgid="3540405868248625488">"Mode Nuit"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibrer l\'affichage"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Sélectionner la touche du clavier"</string> <string name="preview" msgid="9077832302472282938">"Aperçu"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Faites glisser des tuiles ici pour les ajouter"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Faites glisser les tuiles ici pour les supprimer."</string> <string name="qs_edit" msgid="2232596095725105230">"Modifier"</string> <string name="tuner_time" msgid="6572217313285536011">"Heure"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-fr/strings_tv.xml b/packages/SystemUI/res/values-fr/strings_tv.xml index 27c62fb50c41..68c4dcb56cce 100644 --- a/packages/SystemUI/res/values-fr/strings_tv.xml +++ b/packages/SystemUI/res/values-fr/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Appui long "<b>"ACCUEIL"</b>" pour contrôler PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Appuyez de manière prolongée sur le bouton ACCUEIL pour contrôler le mode PIP."</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-gl-rES/strings.xml b/packages/SystemUI/res/values-gl-rES/strings.xml index a675c217166d..1474acff91a6 100644 --- a/packages/SystemUI/res/values-gl-rES/strings.xml +++ b/packages/SystemUI/res/values-gl-rES/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Modo de traballo activado."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Desactivouse o modo de traballo."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Activouse o modo de traballo."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Desactivouse o Economizador de datos."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Activouse o Economizador de datos."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Brillo de pantalla"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Os datos 2G-3G están en pausa"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Os datos 4G están en pausa"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Localización establecida polo GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitudes de localización activas"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Eliminar todas as notificacións."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Configuración das notificacións"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Configuración de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"A pantalla xirará automaticamente."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Límite de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advertencia <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modo de traballo"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"As túas pantallas recentes aparecen aquí"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Non hai elementos recentes"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Borraches todo"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Información da aplicación"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixación de pantalla"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"buscar"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Mostrar na parte superior da lista de notificacións, amosar na pantalla e permitir que emita son"</string> <string name="notification_more_settings" msgid="816306283396553571">"Máis opcións"</string> <string name="notification_done" msgid="5279426047273930175">"Feito"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Cor e aspecto"</string> <string name="night_mode" msgid="3540405868248625488">"Modo nocturno"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibrar pantalla"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Selecciona o botón do teclado"</string> <string name="preview" msgid="9077832302472282938">"Vista previa"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Arrastrar para engadir mosaicos"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arrastra o elemento ata aquí para eliminalo"</string> <string name="qs_edit" msgid="2232596095725105230">"Editar"</string> <string name="tuner_time" msgid="6572217313285536011">"Hora"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-gl-rES/strings_tv.xml b/packages/SystemUI/res/values-gl-rES/strings_tv.xml index b0343e16ebdb..11d2d4c844dc 100644 --- a/packages/SystemUI/res/values-gl-rES/strings_tv.xml +++ b/packages/SystemUI/res/values-gl-rES/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Manter premido "<b>"INICIO"</b>" para controlar PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Mantén premido o botón de INICIO para controlar PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"De acordo"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-gu-rIN/strings.xml b/packages/SystemUI/res/values-gu-rIN/strings.xml index a8394a2e25ee..7b6421462341 100644 --- a/packages/SystemUI/res/values-gu-rIN/strings.xml +++ b/packages/SystemUI/res/values-gu-rIN/strings.xml @@ -73,7 +73,7 @@ <string name="screenshot_saved_title" msgid="6461865960961414961">"સ્ક્રીનશોટ કેપ્ચર કર્યો."</string> <string name="screenshot_saved_text" msgid="1152839647677558815">"તમારો સ્ક્રીનશોટ જોવા માટે ટચ કરો."</string> <string name="screenshot_failed_title" msgid="705781116746922771">"સ્ક્રીનશોટ કેપ્ચર કરી શકાયો નથી."</string> - <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"સ્ક્રીનશૉટ સાચવવામાં સમયા આવી."</string> + <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"સ્ક્રીનશૉટ સાચવવામાં સમસ્યા આવી."</string> <string name="screenshot_failed_to_save_text" msgid="2592658083866306296">"મર્યાદિત સંગ્રહ સ્થાનને કારણે સ્ક્રીનશોટ સાચવી શકાતો નથી."</string> <string name="screenshot_failed_to_capture_text" msgid="7602391003979898374">"ઍપ્લિકેશન કે તમારી સંસ્થા દ્વારા સ્ક્રીનશોટ્સ લેવાની મંજૂરી નથી."</string> <string name="usb_preference_title" msgid="6551050377388882787">"USB ફાઇલ ટ્રાન્સફર વિકલ્પો"</string> @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"કાર્ય મોડ ચાલુ."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"કાર્ય મોડ બંધ કર્યો."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"કાર્ય મોડ ચાલુ કર્યો."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"ડેટા સેવર બંધ કર્યું."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"ડેટા સેવર ચાલુ કર્યું."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"પ્રદર્શન તેજ"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G ડેટા થોભાવ્યો છે"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G ડેટા થોભાવ્યો છે"</string> @@ -238,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS દ્વારા સ્થાન સેટ કરાયું"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"સ્થાન વિનંતીઓ સક્રિય"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"બધા સૂચનો સાફ કરો."</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"સૂચનાઓની સેટિંગ્સ"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> સેટિંગ્સ"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"સ્ક્રીન આપમેળે ફરશે."</string> @@ -303,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> મર્યાદા"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ચેતવણી"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"કાર્ય મોડ"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"તમારી તાજેતરની સ્ક્રીન્સ અહીં દેખાય છે"</string> + <string name="recents_empty_message" msgid="808480104164008572">"કોઇ તાજેતરની આઇટમ્સ નથી"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"તમે બધું સાફ કર્યું"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"એપ્લિકેશન માહિતી"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"સ્ક્રીન પિનિંગ"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"શોધ"</string> @@ -479,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"સૂચનાઓની સૂચિની ટોચ પર બતાવો, સ્ક્રીન પર ત્વરિત દ્રષ્ટિ કરો અને અવાજને મંજૂરી આપો"</string> <string name="notification_more_settings" msgid="816306283396553571">"વધુ સેટિંગ્સ"</string> <string name="notification_done" msgid="5279426047273930175">"થઈ ગયું"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> સૂચના નિયંત્રણો"</string> <string name="color_and_appearance" msgid="1254323855964993144">"રંગ અને દેખાવ"</string> <string name="night_mode" msgid="3540405868248625488">"રાત્રિ મોડ"</string> <string name="calibrate_display" msgid="5974642573432039217">"પ્રદર્શન કૅલિબ્રેટ કરો"</string> @@ -537,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"કીબોર્ડ બટન પસંદ કરો"</string> <string name="preview" msgid="9077832302472282938">"પૂર્વાવલોકન કરો"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"ટાઇલ્સ ઉમેરવા માટે ખેંચો"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"દૂર કરવા માટે અહીં ખેંચો"</string> <string name="qs_edit" msgid="2232596095725105230">"સંપાદિત કરો"</string> <string name="tuner_time" msgid="6572217313285536011">"સમય"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-gu-rIN/strings_tv.xml b/packages/SystemUI/res/values-gu-rIN/strings_tv.xml index 3f2f68a93520..878e91fd393b 100644 --- a/packages/SystemUI/res/values-gu-rIN/strings_tv.xml +++ b/packages/SystemUI/res/values-gu-rIN/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP નિયંત્રિત કરવા માટે "<b>"હોમ"</b>" પકડી રાખો"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP નિયંત્રિત કરવા માટે હોમ બટન દબાવો અને પકડી રાખો"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"સમજાઈ ગયું"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"છોડી દો"</string> </resources> diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml index 43331fd09160..84c073d81f1b 100644 --- a/packages/SystemUI/res/values-hi/strings.xml +++ b/packages/SystemUI/res/values-hi/strings.xml @@ -73,7 +73,7 @@ <string name="screenshot_saved_title" msgid="6461865960961414961">"स्क्रीनशॉट कैप्चर किया गया."</string> <string name="screenshot_saved_text" msgid="1152839647677558815">"अपना स्क्रीनशॉट देखने के लिए स्पर्श करें."</string> <string name="screenshot_failed_title" msgid="705781116746922771">"स्क्रीनशॉट को कैप्चर नहीं किया जा सका."</string> - <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"स्क्रीनशॉट सहेजते समय समस्या आई"</string> + <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"स्क्रीनशॉट सहेजने में समस्या आई"</string> <string name="screenshot_failed_to_save_text" msgid="2592658083866306296">"सीमित मेमोरी स्थान के कारण स्क्रीनशॉट सहेजा नहीं जा सकता."</string> <string name="screenshot_failed_to_capture_text" msgid="7602391003979898374">"आपके ऐप्लिकेशन या आपके संगठन द्वारा स्क्रीनशॉट लेने की अनुमति नहीं है."</string> <string name="usb_preference_title" msgid="6551050377388882787">"USB फ़ाइल स्थानांतरण विकल्प"</string> @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"कार्य मोड चालू है."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"कार्य मोड बंद कर दिया गया."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"कार्य मोड चालू किया गया."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"डेटा बचतकर्ता बंद किया गया."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"डेटा बचतकर्ता चालू किया गया."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"स्क्रीन की स्क्रीन की रोशनी"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G डेटा रोक दिया गया है"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G डेटा रोक दिया गया है"</string> @@ -238,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS द्वारा सेट किया गया स्थान"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"स्थान अनुरोध सक्रिय"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"सभी सूचनाएं साफ़ करें."</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"नोटिफिकेशन सेटिंग"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> सेटिंग"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"स्क्रीन स्वचालित रूप से घूमेगी."</string> @@ -303,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> सीमा"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> चेतावनी"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"कार्य मोड"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"आपकी हाल की स्क्रीन यहां दिखाई देती हैं"</string> + <string name="recents_empty_message" msgid="808480104164008572">"हाल ही का कोई आइटम नहीं"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"आपने सब कुछ साफ़ कर दिया है"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"एप्लिकेशन जानकारी"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"स्क्रीन पिन करना"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"खोज"</string> @@ -479,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"नोटिफिकेशन सूची के शीर्ष पर दिखाएं, स्क्रीन पर झलक दिखाएं और ध्वनि करें"</string> <string name="notification_more_settings" msgid="816306283396553571">"और सेटिंग"</string> <string name="notification_done" msgid="5279426047273930175">"हो गया"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> नोटिफ़िकेशन नियंत्रण"</string> <string name="color_and_appearance" msgid="1254323855964993144">"रंग और दिखावट"</string> <string name="night_mode" msgid="3540405868248625488">"रात्रि मोड"</string> <string name="calibrate_display" msgid="5974642573432039217">"स्क्रीन को कैलिब्रेट करें"</string> @@ -537,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"कीबोर्ड बटन चुनें"</string> <string name="preview" msgid="9077832302472282938">"पूर्वावलोकन"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"टाइलों को जोड़ने के लिए खींचें"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"निकालने के लिए यहां खींचें"</string> <string name="qs_edit" msgid="2232596095725105230">"संपादित करें"</string> <string name="tuner_time" msgid="6572217313285536011">"समय"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-hi/strings_tv.xml b/packages/SystemUI/res/values-hi/strings_tv.xml index cf259ddc9012..0b4f3e58fedf 100644 --- a/packages/SystemUI/res/values-hi/strings_tv.xml +++ b/packages/SystemUI/res/values-hi/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP नियंत्रण हेतु "<b>"HOME"</b>" होल्ड करें"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP नियंत्रण के लिए HOME बटन को दबाए रखें"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"समझ लिया"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"ख़ारिज करें"</string> </resources> diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml index 715f667ecd83..e69ad3188cf4 100644 --- a/packages/SystemUI/res/values-hr/strings.xml +++ b/packages/SystemUI/res/values-hr/strings.xml @@ -222,10 +222,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Način rada uključen."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Način rada isključen."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Način rada uključen."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Ušteda podataka isključena."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Ušteda podataka uključena."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Svjetlina zaslona"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G – 3G podaci pauzirani"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G podaci pauzirani"</string> @@ -239,6 +237,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokaciju utvrdio GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Zahtjevi za lokaciju aktivni su"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Brisanje svih obavijesti."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Postavke obavijesti"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Postavke aplikacije <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Zaslon će se automatski zakrenuti."</string> @@ -304,7 +304,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ograničenje od <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozorenje <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Način rada"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Ovdje se pojavljuju vaši nedavni zasloni"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Nema nedavnih stavki"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Izbrisali ste sve"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacije o aplikaciji"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"prikvačivanje zaslona"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"pretraži"</string> @@ -480,6 +481,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Prikaži pri vrhu popisa obavijesti, prikaži na zaslonu i dopusti zvuk"</string> <string name="notification_more_settings" msgid="816306283396553571">"Više postavki"</string> <string name="notification_done" msgid="5279426047273930175">"Gotovo"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Boja i izgled"</string> <string name="night_mode" msgid="3540405868248625488">"Noćni način rada"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibriranje zaslona"</string> @@ -538,6 +541,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Odaberite gumb tipkovnice"</string> <string name="preview" msgid="9077832302472282938">"Pregled"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Povucite da biste dodali pločice"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Povucite ovdje za uklanjanje"</string> <string name="qs_edit" msgid="2232596095725105230">"Uredi"</string> <string name="tuner_time" msgid="6572217313285536011">"Vrijeme"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-hr/strings_tv.xml b/packages/SystemUI/res/values-hr/strings_tv.xml index 424c68b06ce5..3d5c8f818773 100644 --- a/packages/SystemUI/res/values-hr/strings_tv.xml +++ b/packages/SystemUI/res/values-hr/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Držite "<b>"POČETNI"</b>" za PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Pritisnite i zadržite tipku POČETNI ZASLON da biste upravljali slikom u slici"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Shvaćam"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml index 280cdb6248f6..a7d62c3675a3 100644 --- a/packages/SystemUI/res/values-hu/strings.xml +++ b/packages/SystemUI/res/values-hu/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Munka mód be."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Munka mód kikapcsolva."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Munka mód bekapcsolva."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Adatforgalom-csökkentő kikapcsolva."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Adatforgalom-csökkentő bekapcsolva."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"A kijelző fényereje"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"A 2G és 3G adatforgalom szünetel."</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"A 4G adatforgalom szünetel"</string> @@ -238,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"A GPS beállította a helyet"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Aktív helylekérések"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Minden értesítés törlése"</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Értesítési beállítások"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> beállításai"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"A képernyő automatikusan forogni fog."</string> @@ -303,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> korlát"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Figyelem! <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Munka mód"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"A legutóbbi képernyők itt jelennek meg"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Nincsenek mostanában használt elemek"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Mindent törölt"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Az alkalmazás adatai"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"képernyő rögzítése"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"keresés"</string> @@ -479,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Az értesítési lista tetején jelennek meg, illetve felugranak a képernyőn hangjelzéssel"</string> <string name="notification_more_settings" msgid="816306283396553571">"További beállítások"</string> <string name="notification_done" msgid="5279426047273930175">"Kész"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g>-értesítések vezérlői"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Szín és megjelenés"</string> <string name="night_mode" msgid="3540405868248625488">"Éjszakai mód"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kijelző kalibrálása"</string> @@ -537,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Billentyűgomb kiválasztása"</string> <string name="preview" msgid="9077832302472282938">"Előnézet"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Húzza csempe hozzáadásához"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Húzza ide az eltávolításhoz"</string> <string name="qs_edit" msgid="2232596095725105230">"Szerkesztés"</string> <string name="tuner_time" msgid="6572217313285536011">"Idő"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-hu/strings_tv.xml b/packages/SystemUI/res/values-hu/strings_tv.xml index 5271a4a24102..97d6cdd0ac70 100644 --- a/packages/SystemUI/res/values-hu/strings_tv.xml +++ b/packages/SystemUI/res/values-hu/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP vezérlése a "<b>"HOME"</b>"-mal"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"A PIP vezérléséhez tartsa nyomva a HOME gombot"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Rendben"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"Elvetés"</string> </resources> diff --git a/packages/SystemUI/res/values-hy-rAM/strings.xml b/packages/SystemUI/res/values-hy-rAM/strings.xml index 6338d8e5abf8..79e5268c904a 100644 --- a/packages/SystemUI/res/values-hy-rAM/strings.xml +++ b/packages/SystemUI/res/values-hy-rAM/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Աշխատանքային ռեժիմը միացված է:"</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Աշխատանքային ռեժիմն անջատվեց:"</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Աշխատանքային ռեժիմը միացվեց:"</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Տվյալների խնայումն անջատվեց:"</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Տվյալների խնայումը միացվեց:"</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Ցուցադրել պայծառությունը"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2Գ-3Գ տվյալների օգտագործումը դադարեցված է"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4Գ տվյալների օգտագործումը դադարեցված է"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Տեղադրությունը կարգավորվել է GPS-ի կողմից"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Տեղադրության հարցումներն ակտիվ են"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Մաքրել բոլոր ծանուցումները:"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Ծանուցման կարգավորումներ"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>-ի կարգավորումներ"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Էկրանը ինքնաշխատ կպտտվի:"</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Սահմանաչափ՝ <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> զգուշացում"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Աշխատանքային ռեժիմ"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Ձեր վերջին էկրանները տեսանելի են այստեղ"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Վերջին տարրեր չկան"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Դուք ջնջել եք ամենը"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Հավելվածի մասին"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"էկրանի ամրակցում"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"որոնել"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Ցույց տալ ծանուցումների ցանկի վերևում, թռուցիկ ցուցադրել էկրանին և թույլատրել ձայնային ազդանշանը"</string> <string name="notification_more_settings" msgid="816306283396553571">"Այլ կարգավորումներ"</string> <string name="notification_done" msgid="5279426047273930175">"Պատրաստ է"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Գույնը և արտաքին տեսքը"</string> <string name="night_mode" msgid="3540405868248625488">"Գիշերային ռեժիմ"</string> <string name="calibrate_display" msgid="5974642573432039217">"Չափաբերել էկրանը"</string> @@ -537,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"Ընտրեք ստեղնաշարի կոճակը"</string> <string name="preview" msgid="9077832302472282938">"Նախադիտում"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Քաշեք՝ սալիկներ ավելացնելու համար"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"Փոփոխել"</string> <string name="tuner_time" msgid="6572217313285536011">"Ժամ"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-hy-rAM/strings_tv.xml b/packages/SystemUI/res/values-hy-rAM/strings_tv.xml index 280d733afd80..dc4c312cc13d 100644 --- a/packages/SystemUI/res/values-hy-rAM/strings_tv.xml +++ b/packages/SystemUI/res/values-hy-rAM/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP-ն կառավարելու համար սեղմած պահեք "<b>"HOME"</b>" կոճակը"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP-ն կառավարելու համար սեղմեք և պահեք HOME կոճակը"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Պարզ է"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml index 77236634c139..3ac5904baa84 100644 --- a/packages/SystemUI/res/values-in/strings.xml +++ b/packages/SystemUI/res/values-in/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokasi yang disetel oleh GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Permintaan lokasi aktif"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Menghapus semua pemberitahuan."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Setelan pemberitahuan"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> setelan"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Layar akan diputar secara otomatis."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Batas <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Peringatan <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Mode kerja"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Layar terkini Anda muncul di sini"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Tidak ada item baru-baru ini"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Anda sudah menghapus semua"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Info Aplikasi"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pin ke layar"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"telusuri"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Tampilkan di bagian atas daftar notifikasi, muncul di layar, dan izinkan suara"</string> <string name="notification_more_settings" msgid="816306283396553571">"Setelan lainnya"</string> <string name="notification_done" msgid="5279426047273930175">"Selesai"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Warna dan tampilan"</string> <string name="night_mode" msgid="3540405868248625488">"Mode malam"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibrasi layar"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Pilih Tombol Keyboard"</string> <string name="preview" msgid="9077832302472282938">"Pratinjau"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Seret untuk menambahkan ubin"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Seret ke sini untuk menghapus"</string> <string name="qs_edit" msgid="2232596095725105230">"Edit"</string> <string name="tuner_time" msgid="6572217313285536011">"Waktu"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-in/strings_tv.xml b/packages/SystemUI/res/values-in/strings_tv.xml index c12fa9c92a76..8e3a5e0638da 100644 --- a/packages/SystemUI/res/values-in/strings_tv.xml +++ b/packages/SystemUI/res/values-in/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Tahan "<b>"LAYAR UTAMA"</b>" untuk mengontrol PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Tekan dan tahan tombol LAYAR UTAMA untuk mengontrol PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Mengerti"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-is-rIS/strings.xml b/packages/SystemUI/res/values-is-rIS/strings.xml index 57756e086329..c063c73a0bbd 100644 --- a/packages/SystemUI/res/values-is-rIS/strings.xml +++ b/packages/SystemUI/res/values-is-rIS/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Staðsetning valin með GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Staðsetningarbeiðnir virkar"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Hreinsa allar tilkynningar."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Tilkynningastillingar"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Stillingar fyrir <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Skjárinn snýst sjálfkrafa."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> hámark"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> viðvörun"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Vinnustilling"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Nýlegar skjámyndir birtast hér"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Engin nýleg atriði"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Þú hefur hreinsað allt"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Forritsupplýsingar"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"skjáfesting"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"leita"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Sýna efst á tilkynningalistanum, birta á skjánum og leyfa hljóð"</string> <string name="notification_more_settings" msgid="816306283396553571">"Fleiri stillingar"</string> <string name="notification_done" msgid="5279426047273930175">"Lokið"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Litur og útlit"</string> <string name="night_mode" msgid="3540405868248625488">"Næturstilling"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kvarða skjáinn"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Veldu lyklaborðshnapp"</string> <string name="preview" msgid="9077832302472282938">"Forskoðun"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Dragðu til að bæta við reitum"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Dragðu hingað til að fjarlægja"</string> <string name="qs_edit" msgid="2232596095725105230">"Breyta"</string> <string name="tuner_time" msgid="6572217313285536011">"Tími"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-is-rIS/strings_tv.xml b/packages/SystemUI/res/values-is-rIS/strings_tv.xml index 9c3db2f9ea9c..053beaffa763 100644 --- a/packages/SystemUI/res/values-is-rIS/strings_tv.xml +++ b/packages/SystemUI/res/values-is-rIS/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Haltu "<b>"HOME"</b>"-hnappinum inni til að stjórna innfelldri mynd"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Haltu „Home“-hnappinum inni til að stjórna innfelldri mynd"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Ég skil"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml index b4f473a4bbde..5ccc39cea60d 100644 --- a/packages/SystemUI/res/values-it/strings.xml +++ b/packages/SystemUI/res/values-it/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Modalità Lavoro attiva."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Modalità Lavoro disattivata."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Modalità Lavoro attivata."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Funzione Risparmio dati disattivata."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Funzione Risparmio dati attivata."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Luminosità dello schermo"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Dati 2G-3G sospesi"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Dati 4G sospesi"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Posizione stabilita dal GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Richieste di accesso alla posizione attive"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Cancella tutte le notifiche."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Impostazioni di notifica"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Impostazioni di <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Lo schermo ruoterà automaticamente."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite di <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avviso <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modalità Lavoro"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Le tue schermate recenti vengono visualizzate in questa sezione"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Nessun elemento recente"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Hai cancellato tutto"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informazioni sull\'applicazione"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"blocco su schermo"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"cerca"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Mostra in cima all\'elenco delle notifiche, visualizza sullo schermo e attiva l\'audio"</string> <string name="notification_more_settings" msgid="816306283396553571">"Altre impostazioni"</string> <string name="notification_done" msgid="5279426047273930175">"Fine"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Colore e aspetto"</string> <string name="night_mode" msgid="3540405868248625488">"Modalità notturna"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibra display"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Seleziona il tasto della tastiera"</string> <string name="preview" msgid="9077832302472282938">"Anteprima"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Trascina per aggiungere i riquadri"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Trascinali qui per rimuoverli"</string> <string name="qs_edit" msgid="2232596095725105230">"Modifica"</string> <string name="tuner_time" msgid="6572217313285536011">"Ora"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-it/strings_tv.xml b/packages/SystemUI/res/values-it/strings_tv.xml index dc79802aeb45..5001b959bf1a 100644 --- a/packages/SystemUI/res/values-it/strings_tv.xml +++ b/packages/SystemUI/res/values-it/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Tieni premuto "<b>"HOME"</b>" per controllare PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Tieni premuto il pulsante HOME per controllare PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml index 2ace8e887bef..52c83ba9b0d9 100644 --- a/packages/SystemUI/res/values-iw/strings.xml +++ b/packages/SystemUI/res/values-iw/strings.xml @@ -223,10 +223,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"מצב עבודה מופעל."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"מצב עבודה הושבת."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"מצב עבודה הופעל."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"חוסך הנתונים (Data Saver) כובה."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"חוסך הנתונים (Data Saver) הופעל."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"בהירות תצוגה"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"השימוש בנתוני 2G-3G מושהה"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"השימוש בנתוני 4G מושהה"</string> @@ -240,6 +238,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"מיקום מוגדר על ידי GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"בקשות מיקום פעילות"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"נקה את כל ההתראות."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"הגדרות עבור הודעות"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"הגדרות <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"המסך יסתובב באופן אוטומטי."</string> @@ -305,7 +305,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"הגבלה של <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"אזהרה - <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"מצב עבודה"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"המסכים האחרונים מופיעים כאן"</string> + <string name="recents_empty_message" msgid="808480104164008572">"אין פריטים אחרונים"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"מחקת הכול"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"מידע על האפליקציה"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"הצמדת מסך"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"חפש"</string> @@ -481,6 +482,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"הצג בראש רשימת ההודעות, הצג לרגע על גבי המסך ואשר השמעת צליל"</string> <string name="notification_more_settings" msgid="816306283396553571">"הגדרות נוספות"</string> <string name="notification_done" msgid="5279426047273930175">"סיום"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"צבע ומראה"</string> <string name="night_mode" msgid="3540405868248625488">"מצב לילה"</string> <string name="calibrate_display" msgid="5974642573432039217">"כיול תצוגה"</string> @@ -539,6 +542,8 @@ <string name="select_keycode" msgid="7413765103381924584">"בחירת לחצן מקלדת"</string> <string name="preview" msgid="9077832302472282938">"תצוגה מקדימה"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"גרור כדי להוסיף משבצות"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"ערוך"</string> <string name="tuner_time" msgid="6572217313285536011">"שעה"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-iw/strings_tv.xml b/packages/SystemUI/res/values-iw/strings_tv.xml index 77deaf613e6c..f4d4094e4cc3 100644 --- a/packages/SystemUI/res/values-iw/strings_tv.xml +++ b/packages/SystemUI/res/values-iw/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"לחץ לחיצה ארוכה על "<b>"דף הבית"</b>" כדי לשלוט ב-PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"לחץ לחיצה ממושכת על לחצן דף הבית כדי לשלוט ב-PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"הבנתי"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml index 27bb23224011..f7aaceebf83f 100644 --- a/packages/SystemUI/res/values-ja/strings.xml +++ b/packages/SystemUI/res/values-ja/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Work モードがオンです。"</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Work モードをオフにしました。"</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Work モードをオンにしました。"</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"データセーバーが OFF になりました。"</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"データセーバーが ON になりました。"</string> <string name="accessibility_brightness" msgid="8003681285547803095">"ディスプレイの明るさ"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G～3Gデータは一時停止中です"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4Gデータは一時停止中です"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPSにより現在地が設定されました"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"現在地リクエストがアクティブ"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"通知をすべて消去。"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"通知設定"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>の設定"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"画面は自動的に回転します。"</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"上限: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"警告: 上限は<xliff:g id="DATA_LIMIT">%s</xliff:g>です"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Work モード"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"ここに最近の画面が表示されます"</string> + <string name="recents_empty_message" msgid="808480104164008572">"最近のタスクはありません"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"すべてのタスクを消去しました"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"アプリ情報"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"画面固定"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"検索"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"通知リストの先頭に表示し、画面に数秒間表示し、音声でも知らせる"</string> <string name="notification_more_settings" msgid="816306283396553571">"詳細設定"</string> <string name="notification_done" msgid="5279426047273930175">"完了"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"色と表示"</string> <string name="night_mode" msgid="3540405868248625488">"夜間モード"</string> <string name="calibrate_display" msgid="5974642573432039217">"表示の調整"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"キーボードのボタンの選択"</string> <string name="preview" msgid="9077832302472282938">"プレビュー"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"タイルを追加するにはドラッグしてください"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"削除するにはここにドラッグ"</string> <string name="qs_edit" msgid="2232596095725105230">"編集"</string> <string name="tuner_time" msgid="6572217313285536011">"時間"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ja/strings_tv.xml b/packages/SystemUI/res/values-ja/strings_tv.xml index e045fd6d0917..a4c49b3dd8a6 100644 --- a/packages/SystemUI/res/values-ja/strings_tv.xml +++ b/packages/SystemUI/res/values-ja/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"再生"</string> <string name="pip_pause" msgid="8412075640017218862">"一時停止"</string> <string name="pip_hold_home" msgid="340086535668778109">"PIP を管理するには ["<b>"ホーム"</b>"] を押し続けます"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP を管理するには [ホーム] ボタンを押し続けます"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"閉じる"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ka-rGE/strings.xml b/packages/SystemUI/res/values-ka-rGE/strings.xml index 14f9406e1adb..9730323e2de0 100644 --- a/packages/SystemUI/res/values-ka-rGE/strings.xml +++ b/packages/SystemUI/res/values-ka-rGE/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS-ით დადგენილი მდებარეობა"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"მდებარეობის მოთხოვნები აქტიურია"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ყველა შეტყობინების წაშლა"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"შეტყობინების პარამეტრები"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> პარამეტრები"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"ეკრანი შეტრიალდება ავტომატურად."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"ლიმიტი: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> გაფრთხილება"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"სამსახურის რეჟიმი"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"თქვენი ბოლო ეკრანები აქ გამოჩნდება"</string> + <string name="recents_empty_message" msgid="808480104164008572">"ბოლოს გამოყენებული ერთეულები არ არის"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"ყველაფერი გასუფთავდა"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"აპლიკაციის შესახებ"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ეკრანზე ჩამაგრება"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ძიება"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"შეტყობინებების სიის თავში ჩვენება, პირდაპირ ეკრანზე გამოჩენა და ხმის დაშვება"</string> <string name="notification_more_settings" msgid="816306283396553571">"დამატებითი პარამეტრები"</string> <string name="notification_done" msgid="5279426047273930175">"მზადაა"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"ფერი და იერსახე"</string> <string name="night_mode" msgid="3540405868248625488">"ღამის რეჟიმი"</string> <string name="calibrate_display" msgid="5974642573432039217">"ეკრანის კალიბრაცია"</string> @@ -535,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"აირჩიეთ კლავიატურის ღილაკი"</string> <string name="preview" msgid="9077832302472282938">"გადახედვა"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"ფილების დასამატებლად, გადაიტანეთ ჩავლებით"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"რედაქტირება"</string> <string name="tuner_time" msgid="6572217313285536011">"დრო"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ka-rGE/strings_tv.xml b/packages/SystemUI/res/values-ka-rGE/strings_tv.xml index e525eba29588..3a556ae2815a 100644 --- a/packages/SystemUI/res/values-ka-rGE/strings_tv.xml +++ b/packages/SystemUI/res/values-ka-rGE/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP-ის სამართავად, გეჭიროთ "<b>"მთავარ ღილაკზე"</b></string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP-ის სამართავად, ხანგრძლივად დააჭირეთ მთავარ ღილაკს"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"გასაგებია"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-kk-rKZ/strings.xml b/packages/SystemUI/res/values-kk-rKZ/strings.xml index 07c95c82ecc8..f6c11520663f 100644 --- a/packages/SystemUI/res/values-kk-rKZ/strings.xml +++ b/packages/SystemUI/res/values-kk-rKZ/strings.xml @@ -73,7 +73,7 @@ <string name="screenshot_saved_title" msgid="6461865960961414961">"Скриншот сақталды."</string> <string name="screenshot_saved_text" msgid="1152839647677558815">"Скриншотты көру үшін түрту."</string> <string name="screenshot_failed_title" msgid="705781116746922771">"Скриншот жасалмады."</string> - <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"Скриншотты сақтау кезінде мәселе орын алды."</string> + <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"Скриншотты сақтау кезінде мәселе туындады."</string> <string name="screenshot_failed_to_save_text" msgid="2592658083866306296">"Жадтағы шектеулі бос орынға байланысты скриншотты сақтау мүмкін емес."</string> <string name="screenshot_failed_to_capture_text" msgid="7602391003979898374">"Қолданба немесе ұйым скриншоттар түсіруге рұқсат етпейді."</string> <string name="usb_preference_title" msgid="6551050377388882787">"USB файлын жіберу опциялары"</string> @@ -221,8 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Жұмыс режимі қосулы."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Жұмыс режимі өшірілді."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Жұмыс режимі қосылды."</string> - <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Дерек сақтағыш өшірілді."</string> - <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Дерек сақтағыш қосылды."</string> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Трафикті үнемдеу функциясы өшірілді."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Трафикті үнемдеу функциясы қосылды."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Дисплей жарықтығы"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G деректері кідіртілді"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G деректері кідіртілді"</string> @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Орын GPS арқылы орнатылған"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Орын өтініштері қосылған"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Барлық хабарларды жойыңыз."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Хабарландыру параметрлері"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> параметрлері"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Экран автоматты түрде бұрылады."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> шегі"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> туралы ескерту"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Жұмыс режимі"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Мұнда жақындағы экрандар көрсетіледі"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Жақындағы элементтер жоқ"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Сіз барлығын өшірдіңіз"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Қолданба туралы ақпарат"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"экранды бекіту"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"іздеу"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Хабарландырулар тізімінің жоғарғы жағында көрсету, экранда көрсету және дыбысқа рұқсат ету"</string> <string name="notification_more_settings" msgid="816306283396553571">"Қосымша параметрлер"</string> <string name="notification_done" msgid="5279426047273930175">"Дайын"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Түс және сыртқы түрі"</string> <string name="night_mode" msgid="3540405868248625488">"Түнгі режим"</string> <string name="calibrate_display" msgid="5974642573432039217">"Дисплейді калибрлеу"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Пернетақта түймесін таңдау"</string> <string name="preview" msgid="9077832302472282938">"Алдын ала қарау"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Торлар қосу үшін сүйреңіз"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Жою үшін осы жерге сүйреңіз"</string> <string name="qs_edit" msgid="2232596095725105230">"Өңдеу"</string> <string name="tuner_time" msgid="6572217313285536011">"Уақыт"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-kk-rKZ/strings_tv.xml b/packages/SystemUI/res/values-kk-rKZ/strings_tv.xml index e7e7bfd96bf8..ef930b0a723f 100644 --- a/packages/SystemUI/res/values-kk-rKZ/strings_tv.xml +++ b/packages/SystemUI/res/values-kk-rKZ/strings_tv.xml @@ -24,6 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"Ойнату"</string> <string name="pip_pause" msgid="8412075640017218862">"Кідірту"</string> <string name="pip_hold_home" msgid="340086535668778109">"PIP басқару үшін "<b>"HOME"</b>" басып тұрыңыз"</string> - <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP функциясын басқару үшін НЕГІЗГІ БЕТ түймесін басып тұрыңыз"</string> + <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP функциясын басқару үшін HOME түймесін басып тұрыңыз"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Түсіндім"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-km-rKH/strings.xml b/packages/SystemUI/res/values-km-rKH/strings.xml index cafa32902e5d..4a306daf268e 100644 --- a/packages/SystemUI/res/values-km-rKH/strings.xml +++ b/packages/SystemUI/res/values-km-rKH/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"បើករបៀបការងារ"</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"បានបិទរបៀបការងារ"</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"បានបើករបៀបការងារ"</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"បានបិទកម្មវិធីសន្សំសំចៃទិន្នន័យ"</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"បានបើកកម្មវិធីសន្សំសំចៃទិន្នន័យ"</string> <string name="accessibility_brightness" msgid="8003681285547803095">"ពន្លឺការបង្ហាញ"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"ទិន្នន័យ 2G-3G ត្រូវបានផ្អាក"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"ទិន្នន័យ 4G ត្រូវបានផ្អាក"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"ទីតាំងកំណត់ដោយ GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"សំណើទីតាំងសកម្ម"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"សម្អាតការជូនដំណឹងទាំងអស់។"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"កំណត់ការជូនដំណឹង"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"ការកំណត់ <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"នឹងបង្វិលអេក្រង់ស្វ័យប្រវត្តិ។"</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"ដែនកំណត់ <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ការព្រមាន"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"របៀបការងារ"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"អេក្រង់បច្ចុប្បន្នរបស់អ្នកបង្ហាញនៅទីនេះ"</string> + <string name="recents_empty_message" msgid="808480104164008572">"មិនមានធាតុថ្មីៗទេ"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"អ្នកបានជម្រះអ្វីៗទាំងអស់"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"ព័ត៌មានកម្មវិធី"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ការភ្ជាប់អេក្រង់"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ស្វែងរក"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"បង្ហាញនៅផ្នែកខាងលើបញ្ជីនៃការជូនដំណឹង លោតបង្ហាញនៅលើអេក្រង់ និងអនុញ្ញាតឲ្យបន្លឺសំឡេង"</string> <string name="notification_more_settings" msgid="816306283396553571">"ការកំណត់ច្រើនទៀត"</string> <string name="notification_done" msgid="5279426047273930175">"រួចរាល់"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"ពណ៌ និងរូបរាង"</string> <string name="night_mode" msgid="3540405868248625488">"របៀបពេលយប់"</string> <string name="calibrate_display" msgid="5974642573432039217">"ការបង្ហាញក្រិត"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"ជ្រើសប៊ូតុងក្តារចុច"</string> <string name="preview" msgid="9077832302472282938">"មើលជាមុន"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"អូសដើម្បីបន្ថែមចំណងជើង"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"អូសទីនេះដើម្បីយកចេញ"</string> <string name="qs_edit" msgid="2232596095725105230">"កែសម្រួល"</string> <string name="tuner_time" msgid="6572217313285536011">"ម៉ោង"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-km-rKH/strings_tv.xml b/packages/SystemUI/res/values-km-rKH/strings_tv.xml index 2d40468d7100..8076010571ab 100644 --- a/packages/SystemUI/res/values-km-rKH/strings_tv.xml +++ b/packages/SystemUI/res/values-km-rKH/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"ចាក់"</string> <string name="pip_pause" msgid="8412075640017218862">"ផ្អាក"</string> <string name="pip_hold_home" msgid="340086535668778109">"សង្កត់ប៊ូតុង "<b>"ដើម"</b>" ដើម្បីគ្រប់គ្រង PIP"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"ចុច និងសង្កត់ប៊ូតុង ដើម ដើម្បីគ្រប់គ្រង PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"យល់ហើយ"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-kn-rIN/strings.xml b/packages/SystemUI/res/values-kn-rIN/strings.xml index 11d239ca8d5a..046d5d8eba87 100644 --- a/packages/SystemUI/res/values-kn-rIN/strings.xml +++ b/packages/SystemUI/res/values-kn-rIN/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"ಕೆಲಸದ ಮೋಡ್ ಆನ್ ಆಗಿದೆ."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"ಕೆಲಸದ ಮೋಡ್ ಆಫ್ ಮಾಡಲಾಗಿದೆ."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"ಕೆಲಸದ ಮೋಡ್ ಆನ್ ಮಾಡಲಾಗಿದೆ."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"ಡೇಟಾ ಸೇವರ್ ಆಫ್ ಮಾಡಲಾಗಿದೆ."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"ಡೇಟಾ ಸೇವರ್ ಆನ್ ಮಾಡಲಾಗಿದೆ."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"ಹೊಳಪನ್ನು ಪ್ರದರ್ಶಿಸಿ"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G ಡೇಟಾವನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G ಡೇಟಾ ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"ಸ್ಥಾನವನ್ನು GPS ಮೂಲಕ ಹೊಂದಿಸಲಾಗಿದೆ"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"ಸ್ಥಾನ ವಿನಂತಿಗಳು ಸಕ್ರಿಯವಾಗಿವೆ"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ಎಲ್ಲಾ ಅಧಿಸೂಚನೆಗಳನ್ನು ತೆರವುಗೊಳಿಸು."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"ಅಧಿಸೂಚನೆ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"ಪರದೆಯು ಸ್ವಯಂಚಾಲಿತವಾಗಿ ತಿರುಗುತ್ತದೆ."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ಮಿತಿ"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ಎಚ್ಚರಿಕೆ"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"ಕೆಲಸದ ಮೋಡ್"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"ನಿಮ್ಮ ಇತ್ತೀಚಿನ ಪರದೆಗಳು ಇಲ್ಲಿ ಕಾಣಿಸಿಕೊಳ್ಳುತ್ತವೆ"</string> + <string name="recents_empty_message" msgid="808480104164008572">"ಯಾವುದೇ ಇತ್ತೀಚಿನ ಐಟಂಗಳಿಲ್ಲ"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"ನೀವು ಎಲ್ಲವನ್ನೂ ತೆರವುಗೊಳಿಸಿರುವಿರಿ"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"ಅಪ್ಲಿಕೇಶನ್ ಮಾಹಿತಿ"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ಸ್ಕ್ರೀನ್ ಪಿನ್ನಿಂಗ್"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ಹುಡುಕಾಟ"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"ಅಧಿಸೂಚನೆಗಳ ಪಟ್ಟಿಯ ಮೇಲ್ಭಾಗದಲ್ಲಿ ತೋರಿಸು, ಪರದೆಯನ್ನು ವೀಕ್ಷಿಸಿ ಮತ್ತು ಧ್ವನಿ ಅನುಮತಿಸಿ"</string> <string name="notification_more_settings" msgid="816306283396553571">"ಹೆಚ್ಚಿನ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string> <string name="notification_done" msgid="5279426047273930175">"ಮುಗಿದಿದೆ"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"ಬಣ್ಣ ಮತ್ತು ಗೋಚರತೆ"</string> <string name="night_mode" msgid="3540405868248625488">"ರಾತ್ರಿ ಮೋಡ್"</string> <string name="calibrate_display" msgid="5974642573432039217">"ಅಣಿಗೊಳಿಸುವ ಪ್ರದರ್ಶನ"</string> @@ -537,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"ಕೀಬೋರ್ಡ್ ಬಟನ್ ಆಯ್ಕೆಮಾಡಿ"</string> <string name="preview" msgid="9077832302472282938">"ಪೂರ್ವವೀಕ್ಷಣೆ"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"ಟೈಲ್ಗಳನ್ನು ಸೇರಿಸಲು ಡ್ರ್ಯಾಗ್ ಮಾಡಿ"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"ಸಂಪಾದಿಸು"</string> <string name="tuner_time" msgid="6572217313285536011">"ಸಮಯ"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-kn-rIN/strings_tv.xml b/packages/SystemUI/res/values-kn-rIN/strings_tv.xml index 5ed77050ae29..d275de61d16b 100644 --- a/packages/SystemUI/res/values-kn-rIN/strings_tv.xml +++ b/packages/SystemUI/res/values-kn-rIN/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP ನಿಯಂತ್ರಿಸಲು "<b>"HOME"</b>" ಕೀಯನ್ನು ಹಿಡಿದುಕೊಳ್ಳಿ"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP ನಿಯಂತ್ರಿಸಲು HOME ಬಟನ್ ಒತ್ತಿರಿ ಮತ್ತು ಹಿಡಿದುಕೊಳ್ಳಿ"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"ಅರ್ಥವಾಯಿತು"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml index 30d421643381..5e16258652e3 100644 --- a/packages/SystemUI/res/values-ko/strings.xml +++ b/packages/SystemUI/res/values-ko/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"작업 모드가 사용 설정되었습니다."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"작업 모드가 사용 중지되었습니다."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"작업 모드가 사용 설정되었습니다."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"데이터 세이버를 사용 중지했습니다."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"데이터 세이버를 사용 설정했습니다."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"디스플레이 밝기"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G 데이터 사용 중지됨"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G 데이터 사용 중지됨"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS에서 위치 설정"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"위치 요청 있음"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"모든 알림 지우기"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"알림 설정"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> 설정"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"화면이 자동으로 회전됩니다."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"한도: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> 경고"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"작업 모드"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"여기에 최근 화면이 표시됩니다."</string> + <string name="recents_empty_message" msgid="808480104164008572">"최근 항목이 없습니다."</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"모든 항목을 삭제했습니다."</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"애플리케이션 정보"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"화면 고정"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"검색"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"알림 목록 맨 위에 표시, 화면에 표시하고 소리로 알림"</string> <string name="notification_more_settings" msgid="816306283396553571">"설정 더보기"</string> <string name="notification_done" msgid="5279426047273930175">"완료"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"색상 및 모양"</string> <string name="night_mode" msgid="3540405868248625488">"야간 모드"</string> <string name="calibrate_display" msgid="5974642573432039217">"디스플레이 보정"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"키보드 버튼 선택"</string> <string name="preview" msgid="9077832302472282938">"미리보기"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"드래그하여 타일 추가"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"삭제하려면 여기를 드래그"</string> <string name="qs_edit" msgid="2232596095725105230">"수정"</string> <string name="tuner_time" msgid="6572217313285536011">"시간"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ko/strings_tv.xml b/packages/SystemUI/res/values-ko/strings_tv.xml index 2846e55c0375..52747b4feb32 100644 --- a/packages/SystemUI/res/values-ko/strings_tv.xml +++ b/packages/SystemUI/res/values-ko/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"재생"</string> <string name="pip_pause" msgid="8412075640017218862">"일시중지"</string> <string name="pip_hold_home" msgid="340086535668778109"><b>"HOME"</b>"을 눌러 PIP 제어"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"홈 버튼을 길게 눌러 PIP 제어"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"확인"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ky-rKG/strings.xml b/packages/SystemUI/res/values-ky-rKG/strings.xml index 653dded1a4e3..60db439c34f0 100644 --- a/packages/SystemUI/res/values-ky-rKG/strings.xml +++ b/packages/SystemUI/res/values-ky-rKG/strings.xml @@ -73,7 +73,7 @@ <string name="screenshot_saved_title" msgid="6461865960961414961">"Скриншот тартылды."</string> <string name="screenshot_saved_text" msgid="1152839647677558815">"Тийип, скриншотту көрүңүз."</string> <string name="screenshot_failed_title" msgid="705781116746922771">"Скриншот кылынбай жатат."</string> - <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"Скриншотту сактоо учурунда көйгөй чыкты."</string> + <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"Скриншотту сактоо учурунда көйгөй пайда болду."</string> <string name="screenshot_failed_to_save_text" msgid="2592658083866306296">"Сактагычта бош орун аз болгондуктан скриншот сакталбай жатат."</string> <string name="screenshot_failed_to_capture_text" msgid="7602391003979898374">"Скриншот тартууга колдонмо же ишканаңыз уруксат бербейт."</string> <string name="usb_preference_title" msgid="6551050377388882787">"USB менен файл өткөрүү мүмкүнчүлүктөрү"</string> @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS боюнча аныкталган жайгашуу"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Жайгаштыруу талаптары иштелүүдө"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Бардык эскертмелерди тазалоо."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Эскертме жөндөөлөрү"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> жөндөөлөрү"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Экран автоматтык түрдө бурулат."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> чектөө"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> эскертүү"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Иштөө режими"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Акыркы экрандарыңыз бул жерден көрүнөт"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Акыркы нерселер жок"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Баарын тазаладыңыз"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Колдонмо жөнүндө маалымат"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"экран кадоо"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"издөө"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Эскертмелер тизмесинин эң башында көрсөтүлүп, үн менен коштолуп, экранга чыгарылсын"</string> <string name="notification_more_settings" msgid="816306283396553571">"Дагы жөндөөлөр"</string> <string name="notification_done" msgid="5279426047273930175">"Аткарылды"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Түсү жана көрүнүшү"</string> <string name="night_mode" msgid="3540405868248625488">"Түнкү режим"</string> <string name="calibrate_display" msgid="5974642573432039217">"Дисплейди калибрлөө"</string> @@ -535,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"Баскычтоптогу баскычты тандоо"</string> <string name="preview" msgid="9077832302472282938">"Алдын ала көрүү"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Керектүү нерселерди сүйрөп кошуңуз"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"Түзөтүү"</string> <string name="tuner_time" msgid="6572217313285536011">"Убакыт"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ky-rKG/strings_tv.xml b/packages/SystemUI/res/values-ky-rKG/strings_tv.xml index 2da47ea689c9..e54aae2e7dbd 100644 --- a/packages/SystemUI/res/values-ky-rKG/strings_tv.xml +++ b/packages/SystemUI/res/values-ky-rKG/strings_tv.xml @@ -24,6 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"Ойнотуу"</string> <string name="pip_pause" msgid="8412075640017218862">"Тындыруу"</string> <string name="pip_hold_home" msgid="340086535668778109"><b>"БАШКЫ БЕТ"</b>" басып туруп PIP\'ти башкарыңыз"</string> - <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP көзөмөлдөө үчүн БАШКЫ БЕТ баскычын басып, кармап туруңуз"</string> + <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP башкаруу үчүн БАШКЫ БЕТ баскычын басып, кармап туруңуз"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Түшүндүм"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lo-rLA/strings.xml b/packages/SystemUI/res/values-lo-rLA/strings.xml index 80c1e01d7137..ecb1eb339b0c 100644 --- a/packages/SystemUI/res/values-lo-rLA/strings.xml +++ b/packages/SystemUI/res/values-lo-rLA/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"ໂໝດການເຮັດວຽກເປີດຢູ່."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"ໂໝດການເຮັດວຽກປິດຢູ່."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"ໂໝດການເຮັດວຽກເປີດຢູ່."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"ປິດຕົວປະຢັດຂໍ້ມູນແລ້ວ."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"ເປີດຕົວປະຢັດຂໍ້ມູນແລ້ວ."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"ຄວາມແຈ້ງຂອງຈໍ"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"ຂໍ້ມູນ 2G-3G ຢຸດຊົ່ວຄາວແລ້ວ"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"ຂໍ້ມູນ 4G ຢຸດຊົ່ວຄາວແລ້ວ"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"ສະຖານທີ່ກຳນົດໂດຍ GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"ການຮ້ອງຂໍສະຖານທີ່ທີ່ເຮັດວຽກຢູ່"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ລຶບການແຈ້ງເຕືອນທັງໝົດ."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"ການຕັ້ງຄ່າການແຈ້ງເຕືອນ"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"ການຕັ້ງຄ່າ <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"ໜ້າຈໍຈະໝຸນໂດຍອັດຕະໂນມັດ."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"ຈຳກັດ <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"ຄຳເຕືອນ <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"ໂໝດການເຮັດວຽກ"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Your recent screens appear here"</string> + <string name="recents_empty_message" msgid="808480104164008572">"ບໍ່ມີລາຍການຫຼ້າສຸດ"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"ທ່ານລຶບລ້າງທຸກຢ່າງແລ້ວ"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"ຂໍ້ມູນແອັບພລິເຄຊັນ"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ການປັກໝຸດໜ້າຈໍ"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ຊອກຫາ"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"ສະແດງຢູ່ເທິງສຸດຂອງລາຍການແຈ້ງເຕືອນ, ແຈ້ງໄປໜ້າຈໍ ແລະ ອະນຸຍາດໃຫ້ໃຊ້ສຽງໄດ້"</string> <string name="notification_more_settings" msgid="816306283396553571">"ການຕັ້ງຄ່າເພີ່ມເຕີມ"</string> <string name="notification_done" msgid="5279426047273930175">"ສຳເລັດແລ້ວ"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"ສີ ແລະ ລັກສະນະ"</string> <string name="night_mode" msgid="3540405868248625488">"ໂໝດກາງຄືນ"</string> <string name="calibrate_display" msgid="5974642573432039217">"ປັບໜ້າຈໍ"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"ເລືອກປຸ່ມແປ້ນພິມ"</string> <string name="preview" msgid="9077832302472282938">"ສະແດງຕົວຢ່າງ"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"ລາກເພື່ອເພີ່ມໄທລ໌"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ລາກມາບ່ອນນີ້ເພື່ອລຶບອອກ"</string> <string name="qs_edit" msgid="2232596095725105230">"ແກ້ໄຂ"</string> <string name="tuner_time" msgid="6572217313285536011">"ເວລາ"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-lo-rLA/strings_tv.xml b/packages/SystemUI/res/values-lo-rLA/strings_tv.xml index e4116f855a50..911dcf9fc623 100644 --- a/packages/SystemUI/res/values-lo-rLA/strings_tv.xml +++ b/packages/SystemUI/res/values-lo-rLA/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"ຫຼິ້ນ"</string> <string name="pip_pause" msgid="8412075640017218862">"ຢຸດຊົ່ວຄາວ"</string> <string name="pip_hold_home" msgid="340086535668778109">"ກົດ "<b>"HOME"</b>" ຄ້າງໄວ້ເພື່ອຄວບຄຸມ PIP"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"ແຕະປຸ່ມ HOME ຄ້າງໄວ້ເພື່ອຄວບຄຸມຮູບນ້ອຍ"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"ເຂົ້າໃຈແລ້ວ"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml index 3c7af5c63721..4de42c0f8c84 100644 --- a/packages/SystemUI/res/values-lt/strings.xml +++ b/packages/SystemUI/res/values-lt/strings.xml @@ -223,10 +223,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Darbo režimas įjungtas."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Darbo režimas išjungtas."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Darbo režimas įjungtas."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Duomenų taupymo priemonė išjungta."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Duomenų taupymo priemonė įjungta."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Ekrano šviesumas"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G–3G duomenys pristabdyti"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G duomenys pristabdyti"</string> @@ -240,6 +238,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS nustatyta vieta"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Vietovės užklausos aktyvios"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Išvalyti visus pranešimus."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Pranešimų nustatymai"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"„<xliff:g id="APP_NAME">%s</xliff:g>“ nustatymai"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekranas bus sukamas automatiškai."</string> @@ -305,7 +305,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limitas: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> įspėjimas"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Darbo režimas"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Čia rodomi naujausi ekranai"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Nėra jokių naujausių elementų"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Viską išvalėte"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Programos informacija"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekrano prisegimas"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"paieška"</string> @@ -481,6 +482,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Rodyti pranešimų sąrašo viršuje, rodyti ekrane ir leisti skambėti"</string> <string name="notification_more_settings" msgid="816306283396553571">"Daugiau nustatymų"</string> <string name="notification_done" msgid="5279426047273930175">"Atlikta"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Spalva ir išvaizda"</string> <string name="night_mode" msgid="3540405868248625488">"Naktinis režimas"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibruoti ekraną"</string> @@ -539,6 +542,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Klaviatūros mygtuko pasirinkimas"</string> <string name="preview" msgid="9077832302472282938">"Peržiūrėti"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Nuvilkite, kad pridėtumėte išklotinės elementų"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Vilkite čia, jei norite pašalinti"</string> <string name="qs_edit" msgid="2232596095725105230">"Redaguoti"</string> <string name="tuner_time" msgid="6572217313285536011">"Laikas"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-lt/strings_tv.xml b/packages/SystemUI/res/values-lt/strings_tv.xml index 8c60970b8c78..928b4c7b4d26 100644 --- a/packages/SystemUI/res/values-lt/strings_tv.xml +++ b/packages/SystemUI/res/values-lt/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Kad vald. PIP, pal. pasp. m. "<b>"PAGRINDINIS"</b></string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Jei norite valdyti PIP, paspauskite ir palaikykite pagrindinio puslapio mygtuką"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Supratau"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml index bafad80fb99d..f47397146635 100644 --- a/packages/SystemUI/res/values-lv/strings.xml +++ b/packages/SystemUI/res/values-lv/strings.xml @@ -222,10 +222,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Darba režīms ir ieslēgts."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Darba režīms ir izslēgts."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Darba režīms ir ieslēgts."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Datu lietojuma samazinātājs ir izslēgts."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Datu lietojuma samazinātājs ir ieslēgts."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Ekrāna spilgtums"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G–3G datu lietojums ir apturēts"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G datu lietojums ir apturēts"</string> @@ -239,6 +237,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS iestatītā atrašanās vieta"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Aktīvi atrašanās vietu pieprasījumi"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Notīrīt visus paziņojumus"</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"vēl <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Paziņojumu iestatījumi"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> iestatījumi"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekrāns tiks pagriezts automātiski."</string> @@ -304,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ierobežojums: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> brīdinājums"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Darba režīms"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Jūsu pēdējie ekrāni tiek rādīti šeit."</string> + <string name="recents_empty_message" msgid="808480104164008572">"Nav nesenu vienumu"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Visi uzdevumi ir notīrīti"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informācija par lietojumprogrammu"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"Piespraust ekrānu"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"Meklēt"</string> @@ -480,6 +480,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Rādīt paziņojumu saraksta augšdaļā, rādīt ekrānā ar skaņas signālu"</string> <string name="notification_more_settings" msgid="816306283396553571">"Citi iestatījumi"</string> <string name="notification_done" msgid="5279426047273930175">"Gatavs"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> paziņojumu vadīklas"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Krāsas un izskats"</string> <string name="night_mode" msgid="3540405868248625488">"Nakts režīms"</string> <string name="calibrate_display" msgid="5974642573432039217">"Ekrāna kalibrēšana"</string> @@ -538,6 +539,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Tastatūras pogas atlase"</string> <string name="preview" msgid="9077832302472282938">"Priekšskatījums"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Velciet elementus, lai tos pievienotu"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Lai noņemtu vienumus, velciet tos šeit."</string> <string name="qs_edit" msgid="2232596095725105230">"Rediģēt"</string> <string name="tuner_time" msgid="6572217313285536011">"Laiks"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-lv/strings_tv.xml b/packages/SystemUI/res/values-lv/strings_tv.xml index 397376a2700a..9e4b236ccfec 100644 --- a/packages/SystemUI/res/values-lv/strings_tv.xml +++ b/packages/SystemUI/res/values-lv/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"Turiet taustiņu "<b>"SĀKUMS"</b>", lai kontrolētu PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Nospiediet un turiet pogu SĀKUMS, lai kontrolētu PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Labi"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"Nerādīt"</string> </resources> diff --git a/packages/SystemUI/res/values-mk-rMK/strings.xml b/packages/SystemUI/res/values-mk-rMK/strings.xml index 490200618b63..1666273976df 100644 --- a/packages/SystemUI/res/values-mk-rMK/strings.xml +++ b/packages/SystemUI/res/values-mk-rMK/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Режимот на работа е вклучен."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Режимот на работа е исклучен."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Режимот на работа е вклучен."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Штедачот на интернет е исклучен."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Штедачот на интернет е вклучен."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Осветленост на екранот"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Податоците 2G-3G се паузирани"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Податоците 4G се паузирани"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Локацијата е поставена со ГПС"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Активни барања за локација"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Исчисти ги сите известувања."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Поставки на известувања"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Поставки на <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Екранот ќе ротира автоматски."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Лимит: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Предупредување за <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Режим на работа"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Вашите неодамнешни екрани се појавуваат тука"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Нема неодамнешни ставки"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Исчистивте сѐ"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Информации за апликацијата"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"прикачување екран"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"пребарај"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Прикажувај ги на врвот на списокот со известувања, ѕиркање на екранот и овозможи звук"</string> <string name="notification_more_settings" msgid="816306283396553571">"Повеќе поставки"</string> <string name="notification_done" msgid="5279426047273930175">"Готово"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Боја и изглед"</string> <string name="night_mode" msgid="3540405868248625488">"Ноќен режим"</string> <string name="calibrate_display" msgid="5974642573432039217">"Калибрирај го екранот"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Изберете копче за тастатура"</string> <string name="preview" msgid="9077832302472282938">"Преглед"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Повлечете за додавање плочки"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Повлечете тука за да се отстрани"</string> <string name="qs_edit" msgid="2232596095725105230">"Уреди"</string> <string name="tuner_time" msgid="6572217313285536011">"Време"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-mk-rMK/strings_tv.xml b/packages/SystemUI/res/values-mk-rMK/strings_tv.xml index acb04be8fbb9..10bf41f3e924 100644 --- a/packages/SystemUI/res/values-mk-rMK/strings_tv.xml +++ b/packages/SystemUI/res/values-mk-rMK/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"Пушти"</string> <string name="pip_pause" msgid="8412075640017218862">"Пауза"</string> <string name="pip_hold_home" msgid="340086535668778109">"Задржете "<b>"ДОМА"</b>" за кон. PIP"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"Притиснете и задржете го копчето ДОМА за контролирање PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Разбрав"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ml-rIN/strings.xml b/packages/SystemUI/res/values-ml-rIN/strings.xml index 9bbc3ad8e810..882f1897a1b9 100644 --- a/packages/SystemUI/res/values-ml-rIN/strings.xml +++ b/packages/SystemUI/res/values-ml-rIN/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"പ്രവർത്തന മോഡ് ഓണാണ്."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"പ്രവർത്തന മോഡ് ഓഫാക്കി."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"പ്രവർത്തന മോഡ് ഓണാക്കി."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"ഡാറ്റ സേവർ ഓഫാക്കി."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"ഡാറ്റ സേവർ ഓണാക്കി."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"ഡിസ്പ്ലേ തെളിച്ചം"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G ഡാറ്റ താൽക്കാലികമായി നിർത്തി"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G ഡാറ്റ താൽക്കാലികമായി നിർത്തി"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"ലൊക്കേഷൻ സജ്ജീകരിച്ചത് GPS ആണ്"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"ലൊക്കേഷൻ അഭ്യർത്ഥനകൾ സജീവമാണ്"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"എല്ലാ വിവരങ്ങളും മായ്ക്കുക."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"അറിയിപ്പ് ക്രമീകരണങ്ങൾ"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ക്രമീകരണങ്ങൾ"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"സ്ക്രീൻ യാന്ത്രികമായി തിരിയും."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> പരിധി"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> മുന്നറിയിപ്പ്"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"പ്രവർത്തന മോഡ്"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"നിങ്ങളുടെ പുതിയ സ്ക്രീനുകൾ ഇവിടെ ദൃശ്യമാകുന്നു"</string> + <string name="recents_empty_message" msgid="808480104164008572">"സമീപകാല ഇനങ്ങൾ ഒന്നുമില്ല"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"നിങ്ങൾ എല്ലാം മായ്ച്ചിരിക്കുന്നു"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"ആപ്പ് വിവരം"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"സ്ക്രീൻ പിൻ ചെയ്യൽ"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"തിരയുക"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"അറിയിപ്പ് ലിസ്റ്റിന്റെ ഏറ്റവും മുകളിൽ കാണിക്കുക, ശബ്ദമുണ്ടാക്കുക"</string> <string name="notification_more_settings" msgid="816306283396553571">"കൂടുതൽ ക്രമീകരണം"</string> <string name="notification_done" msgid="5279426047273930175">"പൂർത്തിയായി"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"വർണ്ണവും രൂപഭാവവും"</string> <string name="night_mode" msgid="3540405868248625488">"നൈറ്റ് മോഡ്"</string> <string name="calibrate_display" msgid="5974642573432039217">"ഡിസ്പ്ലേ കാലിബ്രേറ്റുചെയ്യുക"</string> @@ -537,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"കീബോർഡ് ബട്ടൺ തിരഞ്ഞെടുക്കൂ"</string> <string name="preview" msgid="9077832302472282938">"പ്രിവ്യു നടത്തുക"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"ടൈലുകൾ ചേർക്കുന്നതിന് വലിച്ചിടുക"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"എഡിറ്റുചെയ്യുക"</string> <string name="tuner_time" msgid="6572217313285536011">"സമയം"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ml-rIN/strings_tv.xml b/packages/SystemUI/res/values-ml-rIN/strings_tv.xml index 3d6250d3ec59..c054eedef6f8 100644 --- a/packages/SystemUI/res/values-ml-rIN/strings_tv.xml +++ b/packages/SystemUI/res/values-ml-rIN/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"പ്ലേ ചെയ്യുക"</string> <string name="pip_pause" msgid="8412075640017218862">"തൽക്കാലം നിർത്തൂ"</string> <string name="pip_hold_home" msgid="340086535668778109">"PIP നിയന്ത്രിക്കാൻ "<b>"ഹോം"</b>" പിടിക്കുക"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP നിയന്ത്രിക്കാൻ ഹോം ബട്ടൺ അമർത്തിപ്പിടിക്കുക"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"മനസ്സിലായി"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-mn-rMN/strings.xml b/packages/SystemUI/res/values-mn-rMN/strings.xml index 73df53559da6..b9ddad7f4016 100644 --- a/packages/SystemUI/res/values-mn-rMN/strings.xml +++ b/packages/SystemUI/res/values-mn-rMN/strings.xml @@ -219,10 +219,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Ажлын горимыг асаасан."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Ажлын горимыг унтраасан."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Ажлын горимыг асаасан."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Өгөгдөл хамгаалагчийг унтраасан."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Өгөгдөл хамгаалагчийг асаасан."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Дэлгэцийн гэрэлтэлт"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G дата-г түр зогсоосон байна"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G дата-г түр зогсоосон байна"</string> @@ -236,6 +234,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS байршил"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Байршлын хүсэлтүүд идэвхтэй"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Бүх мэдэгдлийг цэвэрлэх."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Мэдэгдлийн тохиргоо"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> тохиргоо"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Дэлгэц автоматаар эргэнэ."</string> @@ -301,7 +301,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> хязгаар"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> анхааруулга"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Ажлын горим"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Таны саяхны дэлгэц энд харагдах болно"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Сүүлийн үеийн зүйл байхгүй"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Та бүгдийг нь устгасан"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Аппликешны мэдээлэл"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"дэлгэц тогтоох"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"хайх"</string> @@ -477,6 +478,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Мэдэгдлийг жагсаалтын эхэнд яаралтай дуутай харуулах"</string> <string name="notification_more_settings" msgid="816306283396553571">"Бусад тохиргоо"</string> <string name="notification_done" msgid="5279426047273930175">"Дууссан"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Өнгө, харагдах байдал"</string> <string name="night_mode" msgid="3540405868248625488">"Шөнийн горим"</string> <string name="calibrate_display" msgid="5974642573432039217">"Дэлгэцийг тохируулах"</string> @@ -535,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Гарын товчлуур сонгох"</string> <string name="preview" msgid="9077832302472282938">"Урьдчилж харах"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Дөрвөлж нэмэхийн тулд чирнэ үү"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Устгахын тулд энд зөөнө үү"</string> <string name="qs_edit" msgid="2232596095725105230">"Засах"</string> <string name="tuner_time" msgid="6572217313285536011">"Цаг"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-mn-rMN/strings_tv.xml b/packages/SystemUI/res/values-mn-rMN/strings_tv.xml index 334a9f115c56..54f2282677a6 100644 --- a/packages/SystemUI/res/values-mn-rMN/strings_tv.xml +++ b/packages/SystemUI/res/values-mn-rMN/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"Тоглуулах"</string> <string name="pip_pause" msgid="8412075640017218862">"Түр зогсоох"</string> <string name="pip_hold_home" msgid="340086535668778109">"PIP-г удирдахын тулд "<b>"HOME"</b>" товчлуурыг дарна уу"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP-г удирдахын тулд НҮҮР ХУУДАС товчлуурыг дараад хүлээнэ үү"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Ойлголоо"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-mr-rIN/strings.xml b/packages/SystemUI/res/values-mr-rIN/strings.xml index a37365c94c7f..e65897cfc4b5 100644 --- a/packages/SystemUI/res/values-mr-rIN/strings.xml +++ b/packages/SystemUI/res/values-mr-rIN/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"कार्य मोड चालू."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"कार्य मोड बंद केला."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"कार्य मोड चालू केला."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"डेटा सर्व्हर बंद केला."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"डेटा सर्व्हर चालू केला."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"प्रदर्शन चमक"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G डेटास विराम दिला आहे"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G डेटास विराम दिला आहे"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS द्वारे स्थान सेट केले"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"स्थान विनंत्या सक्रिय"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"सर्व सूचना साफ करा."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"सूचना सेटिंग्ज"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> सेटिंग्ज"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"स्क्रीन स्वयंचलितपणे फिरेल."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> मर्यादा"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> चेतावणी"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"कार्य मोड"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"आपल्या अलीकडील स्क्रीन येथे दिसतात"</string> + <string name="recents_empty_message" msgid="808480104164008572">"अलीकडील कोणतेही आयटम नाहीत"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"आपण सर्वकाही साफ केले"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"अनुप्रयोग माहिती"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"स्क्रीन पिन करणे"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"शोधा"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"सूचनांच्या शीर्षस्थानी दर्शवा, स्क्रीनवर पहा आणि ध्वनीस अनुमती द्या"</string> <string name="notification_more_settings" msgid="816306283396553571">"अधिक सेटिंग्ज"</string> <string name="notification_done" msgid="5279426047273930175">"पूर्ण झाले"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"रंग आणि स्वरूप"</string> <string name="night_mode" msgid="3540405868248625488">"रात्र मोड"</string> <string name="calibrate_display" msgid="5974642573432039217">"प्रदर्शनाचे मापन करा"</string> @@ -537,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"कीबोर्ड बटण निवडा"</string> <string name="preview" msgid="9077832302472282938">"पूर्वावलोकन"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"टाइल जोडण्यासाठी ड्रॅग करा"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"संपादित करा"</string> <string name="tuner_time" msgid="6572217313285536011">"वेळ"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-mr-rIN/strings_tv.xml b/packages/SystemUI/res/values-mr-rIN/strings_tv.xml index 2f56b0aa0178..6a298679fddc 100644 --- a/packages/SystemUI/res/values-mr-rIN/strings_tv.xml +++ b/packages/SystemUI/res/values-mr-rIN/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP नियंत्रित करण्यासाठी "<b>"मुख्यपृष्ठ"</b>" धरून ठेवा"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP नियंत्रित करण्यासाठी मुख्यपृष्ठ बटण दाबा आणि धरून ठेवा"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"समजले"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ms-rMY/strings.xml b/packages/SystemUI/res/values-ms-rMY/strings.xml index e2175e53399c..432110ce53a6 100644 --- a/packages/SystemUI/res/values-ms-rMY/strings.xml +++ b/packages/SystemUI/res/values-ms-rMY/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Mod kerja hidup."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Mod kerja dimatikan."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Mod kerja dihidupkan."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Penjimat Data dimatikan."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Penjimat Data dihidupkan."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Kecerahan paparan"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Data 2G-3G dijeda"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Data 4G dijeda"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokasi ditetapkan oleh GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Permintaan lokasi aktif"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Padamkan semua pemberitahuan."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Tetapan pemberitahuan"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> tetapan"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Skrin akan berputar secara automatik."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> had"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Amaran <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Mod kerja"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Skrin terbaru anda terpapar di sini"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Tiada item terbaharu"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Anda telah mengetepikan semua item"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Maklumat Aplikasi"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"penyematan skrin"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"cari"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Tunjukkan pada bahagian atas senarai pemberitahuan, intai pada skrin dan benarkan bunyi"</string> <string name="notification_more_settings" msgid="816306283396553571">"Lagi tetapan"</string> <string name="notification_done" msgid="5279426047273930175">"Selesai"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Warna dan penampilan"</string> <string name="night_mode" msgid="3540405868248625488">"Mod malam"</string> <string name="calibrate_display" msgid="5974642573432039217">"Tentukur paparan"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Pilih Butang Papan Kekunci"</string> <string name="preview" msgid="9077832302472282938">"Pratonton"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Seret untuk menambahkan jubin"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Seret ke sini untuk mengalih keluar"</string> <string name="qs_edit" msgid="2232596095725105230">"Edit"</string> <string name="tuner_time" msgid="6572217313285536011">"Masa"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ms-rMY/strings_tv.xml b/packages/SystemUI/res/values-ms-rMY/strings_tv.xml index 83dee5ae9a37..d358cc0d6d3d 100644 --- a/packages/SystemUI/res/values-ms-rMY/strings_tv.xml +++ b/packages/SystemUI/res/values-ms-rMY/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"Main"</string> <string name="pip_pause" msgid="8412075640017218862">"Jeda"</string> <string name="pip_hold_home" msgid="340086535668778109">"Thn "<b>"SKRN UTMA"</b>" utk kwl PIP"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"Tekan dan tahan butang SKRIN UTAMA untuk mengawal PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-my-rMM/strings.xml b/packages/SystemUI/res/values-my-rMM/strings.xml index d6362f332ab5..8994499569e8 100644 --- a/packages/SystemUI/res/values-my-rMM/strings.xml +++ b/packages/SystemUI/res/values-my-rMM/strings.xml @@ -236,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPSမှတည်နေရာကိုအတည်ပြုသည်"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"တည်နေရာပြ တောင်းဆိုချက်များ အသက်ဝင်ရန်"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"သတိပေးချက်အားလုံးအား ဖယ်ရှားခြင်း။"</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"အကြောင်းကြားချက် ဆက်တင်များ"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ဆက်တင်များ"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"ဖန်သားပြင်ပေါ်မှာ ပြသမှုက အလိုအလျောက် လှည့်သွားပါမည်"</string> @@ -301,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ကန့်သတ်ချက်"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> သတိပေးချက်"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"အလုပ် မုဒ်"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"သင်၏ မကြာမီက မျက်နှာပြင်များ ဒီမှာ ပေါ်လာကြမည်"</string> + <string name="recents_empty_message" msgid="808480104164008572">"မကြာမီကဖွင့်ထားသည်များ မရှိပါ"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"သင်အားလုံးကို ရှင်းလင်းပြီးပါပြီ"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"အပလီကေးရှင်း အင်ဖို"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"မျက်နှာပြင် ပင်ထိုးမှု"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ရှာဖွေရန်"</string> @@ -477,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"သတိပေးချက်စာရင်း၏ ထိပ်ဆုံးတွင်ပြပြီး ဖန်သားပြင်ပေါ်တွင် ပေါ်စေကာ အသံထွက်ခွင့်ပြုပါ"</string> <string name="notification_more_settings" msgid="816306283396553571">"နောက်ထပ် ဆက်တင်များ"</string> <string name="notification_done" msgid="5279426047273930175">"ပြီးပါပြီ"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> အကြောင်းကြားချက် ထိန်းချုပ်မှုများ"</string> <string name="color_and_appearance" msgid="1254323855964993144">"အရောင်နှင့် အပြင်အဆင်"</string> <string name="night_mode" msgid="3540405868248625488">"ညသုံးမုဒ်"</string> <string name="calibrate_display" msgid="5974642573432039217">"ပြသမှုအချိန်အဆကို ညှိပါ"</string> @@ -535,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"ကီးဘုတ်ခလုတ်ကို ရွေးချယ်ပါ"</string> <string name="preview" msgid="9077832302472282938">"အစမ်းကြည့်ပါ"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"အချပ်များကိုထည့်ရန် ဖိဆွဲပါ"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ဖယ်ရှားရန် ဤနေရာသို့ဖိဆွဲပါ"</string> <string name="qs_edit" msgid="2232596095725105230">"တည်းဖြတ်ပါ"</string> <string name="tuner_time" msgid="6572217313285536011">"အချိန်"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-my-rMM/strings_tv.xml b/packages/SystemUI/res/values-my-rMM/strings_tv.xml index 616acda0b567..ffb0d90e6a0e 100644 --- a/packages/SystemUI/res/values-my-rMM/strings_tv.xml +++ b/packages/SystemUI/res/values-my-rMM/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP ကိုထိန်းချုပ်ရန် "<b>"ပင်မ"</b>" ခလုတ်ကို ဖိထားပါ"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP ကိုထိန်းချုပ်ရန် ပင်မခလုတ်ကို နှိပ်ပြီးဖိထားပါ"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"ရပါပြီ"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"ပယ်ပါ"</string> </resources> diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml index a2b09c556d54..9ee29ab5908f 100644 --- a/packages/SystemUI/res/values-nb/strings.xml +++ b/packages/SystemUI/res/values-nb/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Arbeidsmodusen er på."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Arbeidsmodusen er slått av."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Arbeidsmodusen er slått på."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Datasparing er slått av."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Datasparing er slått på."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Lysstyrken på skjermen"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G- og 3G-data er satt på pause"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G-data er satt på pause"</string> @@ -238,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Posisjon angitt av GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Aktive stedsforespørsler"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Fjern alle varslinger."</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Varselinnstillinger"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>-innstillinger"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Skjermen roterer automatisk."</string> @@ -303,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Grense på <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Advarsel for <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Arbeidsmodus"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"De sist brukte skjermene dine vises her"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Ingen nylige elementer"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Du har fjernet alt"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Appinformasjon"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"én-appsmodus"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"Søk"</string> @@ -479,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Vis øverst på varsellisten, vis fort på skjermen og tillat lyd"</string> <string name="notification_more_settings" msgid="816306283396553571">"Flere innstillinger"</string> <string name="notification_done" msgid="5279426047273930175">"Ferdig"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"Varselinnstillinger for <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Farge og utseende"</string> <string name="night_mode" msgid="3540405868248625488">"Nattmodus"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibrer skjermen"</string> @@ -537,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Velg tastaturtast"</string> <string name="preview" msgid="9077832302472282938">"Forhåndsvisning"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Dra for å legge til fliser"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Dra hit for å fjerne"</string> <string name="qs_edit" msgid="2232596095725105230">"Endre"</string> <string name="tuner_time" msgid="6572217313285536011">"Tid"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-nb/strings_tv.xml b/packages/SystemUI/res/values-nb/strings_tv.xml index 921744e575cf..33bd1aa44be8 100644 --- a/packages/SystemUI/res/values-nb/strings_tv.xml +++ b/packages/SystemUI/res/values-nb/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"Hold inne "<b>"STARTSIDE"</b>" for å kontrollere PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Trykk og hold inne STARTSIDE-knappen for å kontrollere PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Greit"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"Avvis"</string> </resources> diff --git a/packages/SystemUI/res/values-ne-rNP/strings.xml b/packages/SystemUI/res/values-ne-rNP/strings.xml index 42067abd9cf4..5b139d1d1e9b 100644 --- a/packages/SystemUI/res/values-ne-rNP/strings.xml +++ b/packages/SystemUI/res/values-ne-rNP/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS द्वारा स्थान सेट गरिएको"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"स्थान अनुरोधहरू सक्रिय"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"सबै सूचनाहरू हटाउनुहोस्।"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"अधिसूचना सेटिङ्हरू"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> सेटिङ्हरू"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"स्क्रिन स्वतः घुम्ने छ।"</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> सीमा"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> चेतावनी दिँदै"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"कार्य मोड"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"तपाईँको हालको स्क्रिन यहाँ प्रकट हुन्छ"</string> + <string name="recents_empty_message" msgid="808480104164008572">"हालका कुनै पनि वस्तुहरू छैनन्"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"तपाईँले सबै कुरा खाली गर्नुभएको छ"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"अनुप्रयोग जानकारी"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"स्क्रिन पिन गर्दै"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"खोजी गर्नुहोस्"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"सूचना सूचीको शीर्षमा देखाउने, स्क्रिनमा चियाउने र ध्वनि निकाल्न अनुमति दिने"</string> <string name="notification_more_settings" msgid="816306283396553571">"थप सेटिङहरू"</string> <string name="notification_done" msgid="5279426047273930175">"सम्पन्न भयो"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"रंग र रूप"</string> <string name="night_mode" msgid="3540405868248625488">"रात्री मोड"</string> <string name="calibrate_display" msgid="5974642573432039217">"प्रदर्शनको स्तर मिलाउनुहोस्"</string> @@ -535,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"किबोर्ड बटन चयन गर्नुहोस्"</string> <string name="preview" msgid="9077832302472282938">"पूर्वावलोकन"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"टाइलहरू थप्न तान्नुहोस्"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"सम्पादन गर्नुहोस्"</string> <string name="tuner_time" msgid="6572217313285536011">"समय"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ne-rNP/strings_tv.xml b/packages/SystemUI/res/values-ne-rNP/strings_tv.xml index adfb4433d361..7234d3b5fbda 100644 --- a/packages/SystemUI/res/values-ne-rNP/strings_tv.xml +++ b/packages/SystemUI/res/values-ne-rNP/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP लाई नियन्त्रण गर्न "<b>"गृह"</b>" कुञ्जीलाई थिचिरहनुहोस्"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"IP लाई नियन्त्रण गर्न गृह बटनलाई थिची होल्ड गर्नुहोस्"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"बुझेँ"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml index 6f15bafee917..b49cf66150ed 100644 --- a/packages/SystemUI/res/values-nl/strings.xml +++ b/packages/SystemUI/res/values-nl/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Werkmodus aan."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Werkmodus uitgeschakeld."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Werkmodus ingeschakeld."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Databesparing is uitgeschakeld."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Databesparing is ingeschakeld."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Helderheid van het scherm"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G/3G-data zijn onderbroken"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G-data zijn onderbroken"</string> @@ -238,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Locatie bepaald met GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Locatieverzoeken actief"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Alle meldingen wissen."</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Instellingen voor meldingen"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>-instellingen"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Scherm wordt automatisch geroteerd."</string> @@ -303,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limiet van <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Waarschuwing voor <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Werkmodus"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Je recente schermen worden hier weergegeven"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Geen recente items"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Je hebt alles gewist"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"App-informatie"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"scherm vastzetten"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"zoeken"</string> @@ -479,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Boven aan de lijst met meldingen weergeven, op het scherm weergeven en geluid toestaan"</string> <string name="notification_more_settings" msgid="816306283396553571">"Meer instellingen"</string> <string name="notification_done" msgid="5279426047273930175">"Gereed"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"Beheeropties voor <xliff:g id="APP_NAME">%1$s</xliff:g>-meldingen"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Kleur en uiterlijk"</string> <string name="night_mode" msgid="3540405868248625488">"Nachtmodus"</string> <string name="calibrate_display" msgid="5974642573432039217">"Display kalibreren"</string> @@ -537,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Toetsenbordknop selecteren"</string> <string name="preview" msgid="9077832302472282938">"Voorbeeld"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Sleep om tegels toe te voegen"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Sleep hier naartoe om te verwijderen"</string> <string name="qs_edit" msgid="2232596095725105230">"Bewerken"</string> <string name="tuner_time" msgid="6572217313285536011">"Tijd"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-nl/strings_tv.xml b/packages/SystemUI/res/values-nl/strings_tv.xml index 8ccf464e5b04..62c364ec2d5c 100644 --- a/packages/SystemUI/res/values-nl/strings_tv.xml +++ b/packages/SystemUI/res/values-nl/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"Bedien PIP met "<b>"HOME"</b></string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Houd HOME ingedrukt om PIP te bedienen"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"Sluiten"</string> </resources> diff --git a/packages/SystemUI/res/values-pa-rIN/strings.xml b/packages/SystemUI/res/values-pa-rIN/strings.xml index d07c4d2a864f..f67c51a589a2 100644 --- a/packages/SystemUI/res/values-pa-rIN/strings.xml +++ b/packages/SystemUI/res/values-pa-rIN/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"ਕੰਮ ਮੋਡ ਚਾਲੂ ਹੈ।"</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"ਕੰਮ ਮੋਡ ਬੰਦ ਕੀਤਾ ਗਿਆ।"</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"ਕੰਮ ਮੋਡ ਚਾਲੂ ਕੀਤਾ ਗਿਆ।"</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"ਡੈਟਾ ਸੇਵਰ ਬੰਦ ਕੀਤਾ ਗਿਆ।"</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"ਡੈਟਾ ਸੇਵਰ ਚਾਲੂ ਕੀਤਾ ਗਿਆ।"</string> <string name="accessibility_brightness" msgid="8003681285547803095">"ਡਿਸਪਲੇ ਚਮਕ"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G ਡਾਟਾ ਰੁਕ ਗਿਆ ਹੈ"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G ਡਾਟਾ ਰੁਕ ਗਿਆ ਹੈ"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS ਵੱਲੋਂ ਸੈਟ ਕੀਤਾ ਨਿਰਧਾਰਿਤ ਸਥਾਨ"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"ਨਿਰਧਾਰਿਤ ਸਥਾਨ ਸੇਵਾ ਬੇਨਤੀਆਂ ਸਕਿਰਿਆ"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ਸਾਰੀਆਂ ਸੂਚਨਾਵਾਂ ਹਟਾਓ।"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"ਸੂਚਨਾ ਸੈਟਿੰਗਾਂ"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ਸੈਟਿੰਗਾਂ"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"ਸਕ੍ਰੀਨ ਆਟੋਮੈਟਿਕਲੀ ਰੋਟੇਟ ਕਰੇਗੀ।"</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ਸੀਮਾ"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ਚਿਤਾਵਨੀ"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"ਕੰਮ ਮੋਡ"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"ਤੁਹਾਡੀਆਂ ਹਾਲੀਆ ਸਕ੍ਰੀਨਾਂ ਇੱਥੇ ਪ੍ਰਗਟ ਹੋਣਗੀਆਂ"</string> + <string name="recents_empty_message" msgid="808480104164008572">"ਕੋਈ ਹਾਲੀਆ ਆਈਟਮਾਂ ਨਹੀਂ"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"ਤੁਸੀਂ ਸਭ ਕੁਝ ਸਾਫ਼ ਕਰ ਦਿੱਤਾ ਹੈ"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"ਐਪਲੀਕੇਸ਼ਨ ਜਾਣਕਾਰੀ"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ਸਕ੍ਰੀਨ ਪਿਨਿੰਗ"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ਖੋਜੋ"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"ਸੂਚਨਾਵਾਂ ਸੂਚੀ ਦੇ ਸਿਖਰ \'ਤੇ ਵਿਖਾਓ, ਸਕ੍ਰੀਨ \'ਤੇ ਝਲਕ ਵਿਖਾਉਣ ਅਤੇ ਧੁਨੀ ਦੀ ਮਨਜ਼ੂਰੀ ਦਿਓ"</string> <string name="notification_more_settings" msgid="816306283396553571">"ਹੋਰ ਸੈਟਿੰਗਾਂ"</string> <string name="notification_done" msgid="5279426047273930175">"ਹੋ ਗਿਆ"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"ਰੰਗ ਅਤੇ ਵਿਖਾਲਾ"</string> <string name="night_mode" msgid="3540405868248625488">"ਰਾਤ ਮੋਡ"</string> <string name="calibrate_display" msgid="5974642573432039217">"ਡਿਸਪਲੇ ਨੂੰ ਕੈਲੀਬ੍ਰੇਟ ਕਰੋ"</string> @@ -537,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"ਕੀ-ਬੋਰਡ ਬਟਨ ਚੁਣੋ"</string> <string name="preview" msgid="9077832302472282938">"ਝਲਕ"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"ਟਾਇਲਾਂ ਨੂੰ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਘਸੀਟੋ"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"ਸੰਪਾਦਨ ਕਰੋ"</string> <string name="tuner_time" msgid="6572217313285536011">"ਸਮਾਂ"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-pa-rIN/strings_tv.xml b/packages/SystemUI/res/values-pa-rIN/strings_tv.xml index fafcd622c545..78a532268a10 100644 --- a/packages/SystemUI/res/values-pa-rIN/strings_tv.xml +++ b/packages/SystemUI/res/values-pa-rIN/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP ਕੰਟਰੋਲ ਕਰਨ ਲਈ "<b>"ਹੋਮ"</b>" ਦਬਾਈ ਰੱਖੋ"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ ਹੋਮ ਬਟਨ ਨੂੰ ਦੱਬੋ ਅਤੇ ਦਬਾਈ ਰੱਖੋ"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"ਸਮਝ ਲਿਆ"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml index 5a4a320e0dc5..12452f62fa19 100644 --- a/packages/SystemUI/res/values-pl/strings.xml +++ b/packages/SystemUI/res/values-pl/strings.xml @@ -223,10 +223,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Tryb pracy włączony."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Tryb pracy wyłączony."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Tryb pracy włączony."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Oszczędzanie danych jest wyłączone."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Oszczędzanie danych jest włączone."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Jasność wyświetlacza"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Transmisja danych 2G-3G została wstrzymana"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Transmisja danych 4G została wstrzymana"</string> @@ -240,6 +238,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokalizacja z GPSa"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Prośby o lokalizację są aktywne"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Usuń wszystkie powiadomienia."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Ustawienia powiadomień"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Ustawienia aplikacji <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran zostanie obrócony automatycznie."</string> @@ -305,7 +305,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limit <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Ostrzeżenie: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Tryb pracy"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Tutaj pojawią się ostatnie ekrany"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Brak ostatnich elementów"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Wszystko zostało wyczyszczone"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacje o aplikacji"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"przypinanie ekranu"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"szukaj"</string> @@ -481,6 +482,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Pokazuj na początku listy powiadomień, wyświetlaj na ekranie i sygnalizuj dźwiękiem"</string> <string name="notification_more_settings" msgid="816306283396553571">"Więcej ustawień"</string> <string name="notification_done" msgid="5279426047273930175">"Gotowe"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Kolor i wygląd"</string> <string name="night_mode" msgid="3540405868248625488">"Tryb nocny"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibracja wyświetlacza"</string> @@ -539,6 +542,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Wybierz przycisk klawiatury"</string> <string name="preview" msgid="9077832302472282938">"Podgląd"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Przeciągnij, aby dodać kafelki"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Przeciągnij tutaj, by usunąć"</string> <string name="qs_edit" msgid="2232596095725105230">"Edytuj"</string> <string name="tuner_time" msgid="6572217313285536011">"Godzina"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-pl/strings_tv.xml b/packages/SystemUI/res/values-pl/strings_tv.xml index d0371b05725a..78bb18e1c09e 100644 --- a/packages/SystemUI/res/values-pl/strings_tv.xml +++ b/packages/SystemUI/res/values-pl/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Przytrzymaj "<b>"EKRAN GŁÓWNY"</b>", by sterować PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Przytrzymaj przycisk EKRAN GŁÓWNY, by sterować PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml index 089fa7527d44..10d3181a354f 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Local definido por GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitações de localização ativas"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Configurações de notificação"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Configurações de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"A tela girará automaticamente."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Aviso de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modo de trabalho"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Suas telas recentes aparecem aqui"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Nenhum item recente"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Você limpou tudo"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informações do app"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixação de tela"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Mostrar na parte superior da lista de notificações, mostrar parcialmente na tela e permitir sons"</string> <string name="notification_more_settings" msgid="816306283396553571">"Mais configurações"</string> <string name="notification_done" msgid="5279426047273930175">"Concluído"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Cor e aparência"</string> <string name="night_mode" msgid="3540405868248625488">"Modo noturno"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibrar tela"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Escolha um botão do teclado"</string> <string name="preview" msgid="9077832302472282938">"Visualização"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Arraste para adicionar blocos"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arraste aqui para remover"</string> <string name="qs_edit" msgid="2232596095725105230">"Editar"</string> <string name="tuner_time" msgid="6572217313285536011">"Horas"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-pt-rBR/strings_tv.xml b/packages/SystemUI/res/values-pt-rBR/strings_tv.xml index 36ba02db88ba..6061af3e1d24 100644 --- a/packages/SystemUI/res/values-pt-rBR/strings_tv.xml +++ b/packages/SystemUI/res/values-pt-rBR/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Mantenha "<b>"INÍCIO"</b>" pressionado para controlar o PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Mantenha a tecla \"HOME\" pressionada para controlar o PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Entendi"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml index 166067020253..7a2866d8452f 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Localização definida por GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Pedidos de localização ativos"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Definições de notificação"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Definições do <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"O ecrã será rodado automaticamente."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Aviso de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modo de trabalho"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Os ecrãs recentes aparecem aqui"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Nenhum item recente"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Limpou tudo"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informações da aplicação"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixação no ecrã"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Mostrar na parte superior da lista de notificações, mostrar no ecrã e permitir som"</string> <string name="notification_more_settings" msgid="816306283396553571">"Mais definições"</string> <string name="notification_done" msgid="5279426047273930175">"Concluído"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Cor e aspeto"</string> <string name="night_mode" msgid="3540405868248625488">"Modo noturno"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibrar ecrã"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Selecionar o botão do teclado"</string> <string name="preview" msgid="9077832302472282938">"Pré-visualizar"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Arraste para adicionar mosaicos"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arrastar para aqui para remover"</string> <string name="qs_edit" msgid="2232596095725105230">"Editar"</string> <string name="tuner_time" msgid="6572217313285536011">"Hora"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-pt-rPT/strings_tv.xml b/packages/SystemUI/res/values-pt-rPT/strings_tv.xml index b588c7bf7691..78d135234e54 100644 --- a/packages/SystemUI/res/values-pt-rPT/strings_tv.xml +++ b/packages/SystemUI/res/values-pt-rPT/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Prima sem soltar o botão "<b>"HOME"</b>" para controlar o PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Prima sem soltar o botão HOME para controlar o PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Compreendi"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml index 089fa7527d44..10d3181a354f 100644 --- a/packages/SystemUI/res/values-pt/strings.xml +++ b/packages/SystemUI/res/values-pt/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Local definido por GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitações de localização ativas"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Limpar todas as notificações."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Configurações de notificação"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Configurações de <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"A tela girará automaticamente."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limite: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Aviso de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modo de trabalho"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Suas telas recentes aparecem aqui"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Nenhum item recente"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Você limpou tudo"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informações do app"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixação de tela"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"pesquisar"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Mostrar na parte superior da lista de notificações, mostrar parcialmente na tela e permitir sons"</string> <string name="notification_more_settings" msgid="816306283396553571">"Mais configurações"</string> <string name="notification_done" msgid="5279426047273930175">"Concluído"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Cor e aparência"</string> <string name="night_mode" msgid="3540405868248625488">"Modo noturno"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibrar tela"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Escolha um botão do teclado"</string> <string name="preview" msgid="9077832302472282938">"Visualização"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Arraste para adicionar blocos"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Arraste aqui para remover"</string> <string name="qs_edit" msgid="2232596095725105230">"Editar"</string> <string name="tuner_time" msgid="6572217313285536011">"Horas"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-pt/strings_tv.xml b/packages/SystemUI/res/values-pt/strings_tv.xml index 36ba02db88ba..6061af3e1d24 100644 --- a/packages/SystemUI/res/values-pt/strings_tv.xml +++ b/packages/SystemUI/res/values-pt/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Mantenha "<b>"INÍCIO"</b>" pressionado para controlar o PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Mantenha a tecla \"HOME\" pressionada para controlar o PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Entendi"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml index b7e0834c5dbc..5f71c41ec761 100644 --- a/packages/SystemUI/res/values-ro/strings.xml +++ b/packages/SystemUI/res/values-ro/strings.xml @@ -222,10 +222,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Modul de lucru este activat."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Modul de lucru a fost dezactivat."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Modul de lucru a fost activat."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Economizorul de date a fost dezactivat."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Economizorul de date a fost activat."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Luminozitatea ecranului"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Conexiunea de date 2G – 3G este întreruptă"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Conexiunea de date 4G este întreruptă"</string> @@ -239,6 +237,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Locație setată prin GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Solicitări locație active"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Ștergeți toate notificările."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Setări pentru notificări"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Setări <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ecranul se va roti în mod automat."</string> @@ -304,7 +304,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limită de <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Avertizare: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modul de lucru"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Ecranele dvs. recente apar aici"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Niciun element recent"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Ați șters tot"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informații despre aplicație"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fixare pe ecran"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"căutare"</string> @@ -480,6 +481,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Apar în partea de sus a listei cu notificări, se afișează pentru scurt timp pe ecran și se permite un sunet"</string> <string name="notification_more_settings" msgid="816306283396553571">"Mai multe setări"</string> <string name="notification_done" msgid="5279426047273930175">"Terminat"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Culoare și aspect"</string> <string name="night_mode" msgid="3540405868248625488">"Modul Noapte"</string> <string name="calibrate_display" msgid="5974642573432039217">"Calibrați afișarea"</string> @@ -538,6 +541,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Selectați butonul de la tastatură"</string> <string name="preview" msgid="9077832302472282938">"Previzualizare"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Trageți pentru a adăuga sectoare"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Trageți aici pentru a elimina"</string> <string name="qs_edit" msgid="2232596095725105230">"Editați"</string> <string name="tuner_time" msgid="6572217313285536011">"Oră"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ro/strings_tv.xml b/packages/SystemUI/res/values-ro/strings_tv.xml index 0af2b39599d5..fcbfd0776cbb 100644 --- a/packages/SystemUI/res/values-ro/strings_tv.xml +++ b/packages/SystemUI/res/values-ro/strings_tv.xml @@ -24,6 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"Redați"</string> <string name="pip_pause" msgid="8412075640017218862">"Întrerupeți"</string> <string name="pip_hold_home" msgid="340086535668778109">"Apăsați lung "<b>"ACASĂ"</b>" pentru a controla PIP"</string> - <string name="pip_onboarding_description" msgid="2882896641362814195">"Apăsați lung butonul ACASĂ pentru a controla PIP"</string> + <string name="pip_onboarding_description" msgid="2882896641362814195">"Apăsați lung butonul ECRAN DE PORNIRE pentru a controla PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Am înțeles"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml index f73ebf4397d2..ffb0a7329de3 100644 --- a/packages/SystemUI/res/values-ru/strings.xml +++ b/packages/SystemUI/res/values-ru/strings.xml @@ -223,10 +223,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Рабочий режим включен."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Рабочий режим отключен."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Рабочий режим включен."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Режим экономии трафика отключен."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Режим экономии трафика включен."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Яркость экрана"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Передача данных 2G и 3G приостановлена"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Передача данных 4G приостановлена"</string> @@ -240,6 +238,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Координаты по GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Есть активные запросы на определение местоположения"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Удалить все уведомления"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Настройки уведомлений"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Настройки приложения \"<xliff:g id="APP_NAME">%s</xliff:g>\""</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Экран будет поворачиваться автоматически."</string> @@ -305,7 +305,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ограничение: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Предупреждение: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Рабочий режим"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Здесь будут показаны недавние приложения"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Недавних приложений нет"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Вы очистили всё"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Сведения о приложении"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"Заблокировать в приложении"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"поиск"</string> @@ -481,6 +482,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Показывать со звуком в начале списка уведомлений и поверх всех окон"</string> <string name="notification_more_settings" msgid="816306283396553571">"Другие настройки"</string> <string name="notification_done" msgid="5279426047273930175">"Готово"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Цвета и стиль"</string> <string name="night_mode" msgid="3540405868248625488">"Ночной режим"</string> <string name="calibrate_display" msgid="5974642573432039217">"Калибровка дисплея"</string> @@ -539,6 +542,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Выберите клавишу"</string> <string name="preview" msgid="9077832302472282938">"Просмотр"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Перетащите нужные элементы"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Чтобы удалить, перетащите сюда"</string> <string name="qs_edit" msgid="2232596095725105230">"Изменить"</string> <string name="tuner_time" msgid="6572217313285536011">"Время"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ru/strings_tv.xml b/packages/SystemUI/res/values-ru/strings_tv.xml index 30f55cbca9c9..309ce7387a11 100644 --- a/packages/SystemUI/res/values-ru/strings_tv.xml +++ b/packages/SystemUI/res/values-ru/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Управляйте кадром в кадре, удерживая кнопку "<b>"ГЛАВНАЯ"</b></string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Управляйте режимом \"Кадр в кадре\", удерживая кнопку ГЛАВНАЯ"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"ОК"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-si-rLK/strings.xml b/packages/SystemUI/res/values-si-rLK/strings.xml index 5a09d3e4785f..84c2f1b91259 100644 --- a/packages/SystemUI/res/values-si-rLK/strings.xml +++ b/packages/SystemUI/res/values-si-rLK/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"වැඩ ප්රකාරය ක්රියාත්මකයි."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"වැඩ ප්රකාරය ක්රියාවිරහිත කරන ලදී."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"වැඩ ප්රකාරය ක්රියාත්මක කරන ලදී."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"දත්ත සුරැකුම ක්රියාවිරහිත කරන ලදී."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"දත්ත සුරැකුම ක්රියාත්මක කරන ලදී."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"දීප්තිය දර්ශනය කරන්න"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G දත්ත විරාම කර ඇත"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G දත්ත විරාම කර ඇත"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS මඟින් ස්ථානය සකසා ඇත"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"පිහිටීම් ඉල්ලීම් සක්රියයි"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"සියලු දැනුම්දීම් හිස් කරන්න."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"දැනුම්දීම් සැකසීම්"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> සැකසීම්"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"තිරය ස්වයංක්රීයව කරකැවේ."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> සීමිත"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> අවවාද කිරීම"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"වැඩ ප්රකාරය"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"මෙහි ඔබගේ මෑතක තිර පෙන්නුම් කරයි"</string> + <string name="recents_empty_message" msgid="808480104164008572">"මෑත අයිතම නැත"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"ඔබ සියලු දේ හිස් කර ඇත"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"යෙදුම් තොරතුරු"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"තිර ඇමිණීම"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"සෙවීම"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"දැනුම්දීම් ලැයිස්තුවෙහි ඉහළින්ම පෙන්වන්න, තිරයට එබිකම් කර ශබ්දයට ඉඩ දෙන්න"</string> <string name="notification_more_settings" msgid="816306283396553571">"තව සැකසීම්"</string> <string name="notification_done" msgid="5279426047273930175">"නිමයි"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"වර්ණය සහ පෙනුම"</string> <string name="night_mode" msgid="3540405868248625488">"රාත්රී ප්රකාරය"</string> <string name="calibrate_display" msgid="5974642573432039217">"සංදර්ශකය ක්රමාංකනය කරන්න"</string> @@ -537,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"යතුරු පුවරු බොත්තම තෝරන්න"</string> <string name="preview" msgid="9077832302472282938">"පෙරදසුන"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"ටයිල් එක් කිරීමට අදින්න"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"සංස්කරණය කරන්න"</string> <string name="tuner_time" msgid="6572217313285536011">"වේලාව"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-si-rLK/strings_tv.xml b/packages/SystemUI/res/values-si-rLK/strings_tv.xml index 70884b032c02..f3e95a160a4f 100644 --- a/packages/SystemUI/res/values-si-rLK/strings_tv.xml +++ b/packages/SystemUI/res/values-si-rLK/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"ධාවනය කරන්න"</string> <string name="pip_pause" msgid="8412075640017218862">"විරාමය"</string> <string name="pip_hold_home" msgid="340086535668778109">"PIP පාලනයට "<b>"HOME"</b>" අල්ලාගන්න"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP පාලනය කිරීමට HOME බොත්තම ඔබා අල්ලාගෙන සිටින්න"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"හරි, තේරුණා"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml index edae154a8474..e53b037e9c18 100644 --- a/packages/SystemUI/res/values-sk/strings.xml +++ b/packages/SystemUI/res/values-sk/strings.xml @@ -238,6 +238,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Poloha nastavená pomocou GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Žiadosti o polohu sú aktívne"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Vymazať všetky upozornenia."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Nastavenia upozornení"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Nastavenia aplikácie <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Obrazovka sa automaticky otočí."</string> @@ -303,7 +305,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Limit: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Upozornenie pri <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Pracovný režim"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Vaše nedávne obrazovky sa zobrazia tu."</string> + <string name="recents_empty_message" msgid="808480104164008572">"Žiadne nedávne položky"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Vymazali ste všetko"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informácie o aplikácii"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pripnutie k obrazovke"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"hľadať"</string> @@ -479,6 +482,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Zobrazovať v hornej časti zoznamu upozornení, zobrazovať cez obrazovku a povoliť zvukový signál"</string> <string name="notification_more_settings" msgid="816306283396553571">"Ďalšie nastavenia"</string> <string name="notification_done" msgid="5279426047273930175">"Hotovo"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Farba a vzhľad"</string> <string name="night_mode" msgid="3540405868248625488">"Nočný režim"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibrovať obrazovku"</string> @@ -537,6 +542,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Výber tlačidla klávesnice"</string> <string name="preview" msgid="9077832302472282938">"Ukážka"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Dlaždice pridáte presunutím"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Presunutím sem odstránite"</string> <string name="qs_edit" msgid="2232596095725105230">"Upraviť"</string> <string name="tuner_time" msgid="6572217313285536011">"Čas"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-sk/strings_tv.xml b/packages/SystemUI/res/values-sk/strings_tv.xml index 98a67f877d5c..64fa0e8f3d49 100644 --- a/packages/SystemUI/res/values-sk/strings_tv.xml +++ b/packages/SystemUI/res/values-sk/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Režim PIP ovládajte pomocou tlačidla "<b>"PLOCHA"</b></string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Režim PIP ovládajte stlačením a podržaním tlačidla PLOCHA"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Dobre"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml index b268f183ff6a..8cff73b1f837 100644 --- a/packages/SystemUI/res/values-sl/strings.xml +++ b/packages/SystemUI/res/values-sl/strings.xml @@ -223,10 +223,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Način za delo vklopljen."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Način za delo je izklopljen."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Način za delo je vklopljen."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Varčevanje s podatki je izklopljeno."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Varčevanje s podatki je vklopljeno."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Svetlost zaslona"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Prenos podatkov v omrežju 2G/3G je zaustavljen"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Prenos podatkov v omrežju 4G je zaustavljen"</string> @@ -240,6 +238,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokacija nastavljena z GPS-om"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Aktivne zahteve za lokacijo"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Izbriši vsa obvestila."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Nastavitve obvestil"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Nastavitve aplikacije <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Zaslon se bo samodejno zasukal."</string> @@ -305,7 +305,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Omejitev: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Opozorilo – <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Način za delo"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Vaši nedavni zasloni so prikazani tu"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Ni nedavnih elementov"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Vse te počistili"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Podatki o aplikaciji"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pripenjanje zaslona"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"iskanje"</string> @@ -481,6 +482,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Prikaži na vrhu seznama obvestil, za hip pokaži predogled na zaslonu in dovoli zvok"</string> <string name="notification_more_settings" msgid="816306283396553571">"Več nastavitev"</string> <string name="notification_done" msgid="5279426047273930175">"Dokončano"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Barva in videz"</string> <string name="night_mode" msgid="3540405868248625488">"Nočni način"</string> <string name="calibrate_display" msgid="5974642573432039217">"Umerjanje zaslona"</string> @@ -539,6 +542,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Izbira gumba tipkovnice"</string> <string name="preview" msgid="9077832302472282938">"Predogled"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Povlecite, če želite dodati ploščice"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Če želite odstraniti, povlecite sem"</string> <string name="qs_edit" msgid="2232596095725105230">"Uredi"</string> <string name="tuner_time" msgid="6572217313285536011">"Ura"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-sl/strings_tv.xml b/packages/SystemUI/res/values-sl/strings_tv.xml index 20de9c5fb30c..4d0576b2dc85 100644 --- a/packages/SystemUI/res/values-sl/strings_tv.xml +++ b/packages/SystemUI/res/values-sl/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Pridr. "<b>"HOME"</b>" za up. n. PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Pridržite gumb HOME za upravljanje načina PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Razumem"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sq-rAL/strings.xml b/packages/SystemUI/res/values-sq-rAL/strings.xml index f657fb495976..35b4dc73a1a9 100644 --- a/packages/SystemUI/res/values-sq-rAL/strings.xml +++ b/packages/SystemUI/res/values-sq-rAL/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Modaliteti i punës është i aktivizuar."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Modaliteti i punës është i çaktivizuar."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Modaliteti i punës është i aktivizuar."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Kursyesi i të dhënave është çaktivizuar."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Kursyesi i të dhënave është aktivizuar."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Ndriçimi i ekranit"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Të dhënat 2G-3G janë ndërprerë"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Të dhënat 4G janë ndërprerë"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Vendndodhja është caktuar nga GPS-ja"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Kërkesat për vendodhje janë aktive"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Pastro të gjitha njoftimet."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Cilësimet e njoftimeve"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Cilësimet e <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekrani do të rrotullohet automatikisht."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Kufiri: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Paralajmërim për kufirin prej <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Modaliteti i punës"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Ekranet e tua të fundit shfaqen këtu"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Nuk ka asnjë artikull të fundit"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"I ke pastruar të gjitha"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Informacioni i aplikacionit"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"gozhdimi i ekranit"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"kërko"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Shfaqi në krye të listës së njoftimeve, shfaq vështrim të shpejtë në ekran dhe lësho një tingull"</string> <string name="notification_more_settings" msgid="816306283396553571">"Cilësime të tjera"</string> <string name="notification_done" msgid="5279426047273930175">"U krye"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Ngjyra dhe pamja"</string> <string name="night_mode" msgid="3540405868248625488">"Modaliteti i natës"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibro ekranin"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Zgjidh butonin e tastierës"</string> <string name="preview" msgid="9077832302472282938">"Pamja paraprake"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Zvarrit për të shtuar pllakëzat"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Zvarrit këtu për ta hequr"</string> <string name="qs_edit" msgid="2232596095725105230">"Redakto"</string> <string name="tuner_time" msgid="6572217313285536011">"Ora"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-sq-rAL/strings_tv.xml b/packages/SystemUI/res/values-sq-rAL/strings_tv.xml index 481662ffabd4..bcb53fc6b759 100644 --- a/packages/SystemUI/res/values-sq-rAL/strings_tv.xml +++ b/packages/SystemUI/res/values-sq-rAL/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Mbaj shtypur "<b>"HOME"</b>" për të kontrolluar PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Shtyp dhe mbaj shtypur butonin HOME për të kontrolluar PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"E kuptova"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml index 52d52e023211..5bc07fa1fb8f 100644 --- a/packages/SystemUI/res/values-sr/strings.xml +++ b/packages/SystemUI/res/values-sr/strings.xml @@ -222,10 +222,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Режим рада је укључен."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Режим рада је искључен."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Режим рада је укључен."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Уштеда података је искључена."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Уштеда података је укључена."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Осветљеност екрана"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G–3G подаци су паузирани"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G подаци су паузирани"</string> @@ -239,6 +237,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Локацију је подесио GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Има активних захтева за локацију"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Обриши сва обавештења."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Подешавања обавештења"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Подешавања за <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Екран ће се аутоматски ротирати."</string> @@ -304,7 +304,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Ограничење од <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Упозорење за <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Режим рада"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Недавни екрани се појављују овде"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Нема недавних ставки"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Обрисали сте све"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Информације о апликацији"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"качење екрана"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"претражи"</string> @@ -480,6 +481,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Приказују се у врху листе обавештења, накратко се приказују на екрану и емитују звук"</string> <string name="notification_more_settings" msgid="816306283396553571">"Још подешавања"</string> <string name="notification_done" msgid="5279426047273930175">"Готово"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Боја и изглед"</string> <string name="night_mode" msgid="3540405868248625488">"Ноћни режим"</string> <string name="calibrate_display" msgid="5974642573432039217">"Калибришите екран"</string> @@ -538,6 +541,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Изаберите дугме за тастатуру"</string> <string name="preview" msgid="9077832302472282938">"Преглед"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Превуците да бисте додали плочице"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Превуците овде да бисте уклонили"</string> <string name="qs_edit" msgid="2232596095725105230">"Измени"</string> <string name="tuner_time" msgid="6572217313285536011">"Време"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-sr/strings_tv.xml b/packages/SystemUI/res/values-sr/strings_tv.xml index eed8f51c6d80..a92374f44f43 100644 --- a/packages/SystemUI/res/values-sr/strings_tv.xml +++ b/packages/SystemUI/res/values-sr/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109"><b>"ПОЧЕТНИ ЕКРАН"</b>" конт. PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Притисните и задржите дугме ПОЧЕТНИ ЕКРАН да бисте контролисали PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Важи"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml index 1c72fa96b220..7e40ce03521f 100644 --- a/packages/SystemUI/res/values-sv/strings.xml +++ b/packages/SystemUI/res/values-sv/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Platsen har identifierats av GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Det finns aktiva platsbegäranden"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Ta bort alla meddelanden."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Aviseringsinställningar"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Inställningar för <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Skärmen roteras automatiskt."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Gräns: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Varning <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Arbetsläge"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Dina senaste skärmar visas här"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Listan med de senaste åtgärderna är tom"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Du har tömt listan"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Appinformation"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"fästa skärmen"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"sök"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Visa högst upp i aviseringslistan och med snabbtitt på skärmen samt tillåt ljud"</string> <string name="notification_more_settings" msgid="816306283396553571">"Fler inställningar"</string> <string name="notification_done" msgid="5279426047273930175">"Klar"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Färg och utseende"</string> <string name="night_mode" msgid="3540405868248625488">"Nattläge"</string> <string name="calibrate_display" msgid="5974642573432039217">"Kalibrera skärmen"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Välj tangentbordsknapp"</string> <string name="preview" msgid="9077832302472282938">"Förhandsgranskning"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Lägg till rutor genom att dra"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Ta bort genom att dra här"</string> <string name="qs_edit" msgid="2232596095725105230">"Redigera"</string> <string name="tuner_time" msgid="6572217313285536011">"Tid"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-sv/strings_tv.xml b/packages/SystemUI/res/values-sv/strings_tv.xml index 2b2c5c282a4e..790ef76507c6 100644 --- a/packages/SystemUI/res/values-sv/strings_tv.xml +++ b/packages/SystemUI/res/values-sv/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Styr PIP med "<b>"startknappen"</b></string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Styr bild-i-bild genom att hålla ned startsideknappen"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml index 5fe6375771e4..aa9ed8a903c4 100644 --- a/packages/SystemUI/res/values-sw/strings.xml +++ b/packages/SystemUI/res/values-sw/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Mahali pamewekwa na GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Maombi ya eneo yanatumika"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Futa arifa zote."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Mipangilio ya arifa"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Mipangilio ya <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Skrini itazunguka kiotomatiki."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"kikomo <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Onyo <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Hali ya kazi"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Skrini zako za hivi majuzi huonekana hapa"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Hakuna vipengee vya hivi karibuni"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Umeondoa vipengee vyote"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Maelezo ya Programu"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"kudumisha programu moja"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"tafuta"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Onyesha katika sehemu ya juu ya orodha ya arifa, chungulia kwenye skrini na uruhusu sauti"</string> <string name="notification_more_settings" msgid="816306283396553571">"Mipangilio zaidi"</string> <string name="notification_done" msgid="5279426047273930175">"Nimemaliza"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Rangi na mwonekano"</string> <string name="night_mode" msgid="3540405868248625488">"Hali ya usiku"</string> <string name="calibrate_display" msgid="5974642573432039217">"Rekebisha onyesho"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Chagua Kitufe cha Kibodi"</string> <string name="preview" msgid="9077832302472282938">"Onyesho la kuchungulia"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Buruta ili uongeze vigae"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Buruta hapa ili uondoe"</string> <string name="qs_edit" msgid="2232596095725105230">"Badilisha"</string> <string name="tuner_time" msgid="6572217313285536011">"Wakati"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-sw/strings_tv.xml b/packages/SystemUI/res/values-sw/strings_tv.xml index 337c1360f3cf..bd297054895d 100644 --- a/packages/SystemUI/res/values-sw/strings_tv.xml +++ b/packages/SystemUI/res/values-sw/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Shikilia kitufe cha "<b>"HOME"</b>" ili udhibiti PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Bonyeza na ushikilie kitufe cha HOME ili kudhibiti PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Nimeelewa"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-ta-rIN/strings.xml b/packages/SystemUI/res/values-ta-rIN/strings.xml index 570aeae47e1a..3eb7565308c8 100644 --- a/packages/SystemUI/res/values-ta-rIN/strings.xml +++ b/packages/SystemUI/res/values-ta-rIN/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"பணிப் பயன்முறை இயக்கப்பட்டுள்ளது."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"பணிப் பயன்முறை முடக்கப்பட்டது."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"பணிப் பயன்முறை இயக்கப்பட்டது."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"தரவுச் சேமிப்பான் முடக்கப்பட்டது."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"தரவுச் சேமிப்பான் இயக்கப்பட்டது."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"திரை பிரகாசம்"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G டேட்டா இடைநிறுத்தப்பட்டது"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G டேட்டா இடைநிறுத்தப்பட்டது"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS அமைத்த இருப்பிடம்"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"இருப்பிடக் கோரிக்கைகள் இயக்கப்பட்டன"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"எல்லா அறிவிப்புகளையும் அழி."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"அறிவிப்பு அமைப்புகள்"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> அமைப்புகள்"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"திரை தானாகச் சுழலும்."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> வரம்பு"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> எச்சரிக்கை"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"பணிப் பயன்முறை"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"சமீபத்திய திரைகள் இங்கு தோன்றும்"</string> + <string name="recents_empty_message" msgid="808480104164008572">"சமீபத்திய பணிகள் இல்லை"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"எல்லாவற்றையும் அழித்துவிட்டீர்கள்"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"பயன்பாட்டு தகவல்"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"திரையை பின் செய்தல்"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"தேடு"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"அறிவிப்புகள் பட்டியலின் மேற்பகுதியில், சில வினாடிகளுக்கு ஒலியுடன் திரையில் காட்டு"</string> <string name="notification_more_settings" msgid="816306283396553571">"மேலும் அமைப்புகள்"</string> <string name="notification_done" msgid="5279426047273930175">"முடிந்தது"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"வண்ணமும் தோற்றமும்"</string> <string name="night_mode" msgid="3540405868248625488">"இரவுப் பயன்முறை"</string> <string name="calibrate_display" msgid="5974642573432039217">"திரையை அளவுத்திருத்தம் செய்"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"விசைப்பலகைப் பொத்தானைத் தேர்ந்தெடுக்கவும்"</string> <string name="preview" msgid="9077832302472282938">"மாதிரிக்காட்சி"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"கட்டங்களைச் சேர்க்க, இழுக்கவும்"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"அகற்ற, இங்கே இழுக்கவும்"</string> <string name="qs_edit" msgid="2232596095725105230">"மாற்று"</string> <string name="tuner_time" msgid="6572217313285536011">"நேரம்"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ta-rIN/strings_tv.xml b/packages/SystemUI/res/values-ta-rIN/strings_tv.xml index b92af22109b6..e75d86aa5638 100644 --- a/packages/SystemUI/res/values-ta-rIN/strings_tv.xml +++ b/packages/SystemUI/res/values-ta-rIN/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"இயக்கு"</string> <string name="pip_pause" msgid="8412075640017218862">"இடைநிறுத்து"</string> <string name="pip_hold_home" msgid="340086535668778109">"PIPஐக் கட்டுப்படுத்த, "<b>"முகப்பைப்"</b>" பிடித்திருக்கவும்"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"PIPஐக் கட்டுப்படுத்த, முகப்புப் பொத்தானை அழுத்திப் பிடிக்கவும்"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"சரி"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-te-rIN/strings.xml b/packages/SystemUI/res/values-te-rIN/strings.xml index f0e5c60146c5..4a6e2d787683 100644 --- a/packages/SystemUI/res/values-te-rIN/strings.xml +++ b/packages/SystemUI/res/values-te-rIN/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"పని మోడ్ ఆన్లో ఉంది."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"పని మోడ్ ఆఫ్ చేయబడింది."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"పని మోడ్ ఆన్ చేయబడింది."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"డేటా సేవర్ ఆఫ్ చేయబడింది."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"డేటా సేవర్ ఆన్ చేయబడింది."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"ప్రదర్శన ప్రకాశం"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G డేటా పాజ్ చేయబడింది"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G డేటా పాజ్ చేయబడింది"</string> @@ -238,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"స్థానం GPS ద్వారా సెట్ చేయబడింది"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"స్థాన అభ్యర్థనలు సక్రియంగా ఉన్నాయి"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"అన్ని నోటిఫికేషన్లను క్లియర్ చేయండి."</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"నోటిఫికేషన్ సెట్టింగ్లు"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> సెట్టింగ్లు"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"స్క్రీన్ స్వయంచాలకంగా తిప్పబడుతుంది."</string> @@ -303,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> పరిమితి"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> హెచ్చరిక"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"పని మోడ్"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"మీ ఇటీవలి స్క్రీన్లు ఇక్కడ కనిపిస్తాయి"</string> + <string name="recents_empty_message" msgid="808480104164008572">"ఇటీవలి అంశాలు ఏవీ లేవు"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"మీరు అన్నింటినీ తీసివేసారు"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"అనువర్తన సమాచారం"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"స్క్రీన్ పిన్నింగ్"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"శోధించు"</string> @@ -479,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"నోటిఫికేషన్ల జాబితా అగ్ర భాగాన, స్క్రీన్పై శీఘ్రంగా శబ్దంతో చూపుతుంది"</string> <string name="notification_more_settings" msgid="816306283396553571">"మరిన్ని సెట్టింగ్లు"</string> <string name="notification_done" msgid="5279426047273930175">"పూర్తయింది"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"<xliff:g id="APP_NAME">%1$s</xliff:g> నోటిఫికేషన్ నియంత్రణలు"</string> <string name="color_and_appearance" msgid="1254323855964993144">"రంగు మరియు కనిపించే తీరు"</string> <string name="night_mode" msgid="3540405868248625488">"రాత్రి మోడ్"</string> <string name="calibrate_display" msgid="5974642573432039217">"డిస్ప్లేని క్రమాంకనం చేయండి"</string> @@ -537,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"కీబోర్డ్ బటన్ను ఎంచుకోండి"</string> <string name="preview" msgid="9077832302472282938">"పరిదృశ్యం"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"టైల్లను జోడించడానికి లాగండి"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"తీసివేయడానికి ఇక్కడికి లాగండి"</string> <string name="qs_edit" msgid="2232596095725105230">"సవరించు"</string> <string name="tuner_time" msgid="6572217313285536011">"సమయం"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-te-rIN/strings_tv.xml b/packages/SystemUI/res/values-te-rIN/strings_tv.xml index 7ce24cb4fdc1..32820c3aba13 100644 --- a/packages/SystemUI/res/values-te-rIN/strings_tv.xml +++ b/packages/SystemUI/res/values-te-rIN/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP నియం. "<b>"HOME"</b>"నొక్కిఉంచండి"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIPని నియంత్రించడానికి హోమ్ బటన్ను నొక్కి పట్టుకోండి"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"అర్థమైంది"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"తీసివేస్తుంది"</string> </resources> diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml index 98029ed9c785..33e4346f3b9f 100644 --- a/packages/SystemUI/res/values-th/strings.xml +++ b/packages/SystemUI/res/values-th/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"โหมดการทำงานเปิดอยู่"</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"ปิดโหมดการทำงานแล้ว"</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"เปิดโหมดการทำงานแล้ว"</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"ปิดโปรแกรมประหยัดอินเทอร์เน็ตแล้ว"</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"เปิดโปรแกรมประหยัดอินเทอร์เน็ตแล้ว"</string> <string name="accessibility_brightness" msgid="8003681285547803095">"ความสว่างของหน้าจอ"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"หยุดการใช้ข้อมูล 2G-3G ชั่วคราวแล้ว"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"หยุดการใช้ข้อมูล 4G ชั่วคราวแล้ว"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"ตำแหน่งที่กำหนดโดย GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"คำขอตำแหน่งที่มีการใช้งาน"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"ล้างการแจ้งเตือนทั้งหมด"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"การตั้งค่าการแจ้งเตือน"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"การตั้งค่า <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"หน้าจอจะหมุนโดยอัตโนมัติ"</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"ขีดจำกัด <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"คำเตือน <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"โหมดการทำงาน"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"หน้าจอล่าสุดของคุณแสดงที่นี่"</string> + <string name="recents_empty_message" msgid="808480104164008572">"ไม่มีรายการล่าสุด"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"คุณได้ล้างทุกอย่างแล้ว"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"ข้อมูลแอปพลิเคชัน"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"การตรึงหน้าจอ"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ค้นหา"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"แสดงที่ด้านบนของรายการการแจ้งเตือน แสดงบนหน้าจอและให้ส่งเสียงได้"</string> <string name="notification_more_settings" msgid="816306283396553571">"การตั้งค่าเพิ่มเติม"</string> <string name="notification_done" msgid="5279426047273930175">"เสร็จสิ้น"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"สีและลักษณะที่ปรากฏ"</string> <string name="night_mode" msgid="3540405868248625488">"โหมดกลางคืน"</string> <string name="calibrate_display" msgid="5974642573432039217">"ปรับเทียบการแสดงผล"</string> @@ -537,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"เลือกปุ่มแป้นพิมพ์"</string> <string name="preview" msgid="9077832302472282938">"ดูตัวอย่าง"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"ลากเพื่อเพิ่มชิ้นส่วน"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"แก้ไข"</string> <string name="tuner_time" msgid="6572217313285536011">"เวลา"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-th/strings_tv.xml b/packages/SystemUI/res/values-th/strings_tv.xml index abc1a87c57b1..b43078d89d59 100644 --- a/packages/SystemUI/res/values-th/strings_tv.xml +++ b/packages/SystemUI/res/values-th/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"เล่น"</string> <string name="pip_pause" msgid="8412075640017218862">"หยุดชั่วคราว"</string> <string name="pip_hold_home" msgid="340086535668778109">"กด "<b>"HOME"</b>" ค้างไว้เพื่อควบคุม PIP"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"กดปุ่ม HOME ค้างไว้เพื่อควบคุม PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"รับทราบ"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml index d93fd96362f6..61eaa9d05df4 100644 --- a/packages/SystemUI/res/values-tl/strings.xml +++ b/packages/SystemUI/res/values-tl/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Naka-on ang work mode."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Na-off ang work mode."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Na-on ang work mode."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Na-off ang Data Saver."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Na-on ang Data Saver."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Liwanag ng display"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Naka-pause ang 2G-3G data"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Naka-pause ang 4G data"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Lokasyong itinatakda ng GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Aktibo ang mga kahilingan ng lokasyon"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"I-clear ang lahat ng notification."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Mga setting ng notification"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Mg setting ng <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Awtomatikong iikot ang screen."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> ang limitasyon"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Babala sa <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Work mode"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Lumalabas dito ang iyong mga kamakailang screen"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Walang mga kamakailang item"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Na-clear mo ang lahat"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Impormasyon ng Application"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"pagpi-pin sa screen"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"maghanap"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Ipakita sa itaas ng listahan ng mga notification, palitawin sa screen at payagang tumunog"</string> <string name="notification_more_settings" msgid="816306283396553571">"Higit pang mga setting"</string> <string name="notification_done" msgid="5279426047273930175">"Tapos Na"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Kulay at hitsura"</string> <string name="night_mode" msgid="3540405868248625488">"Night mode"</string> <string name="calibrate_display" msgid="5974642573432039217">"I-calibrate ang display"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Pumili ng Button na Keyboard"</string> <string name="preview" msgid="9077832302472282938">"I-preview"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Mag-drag upang magdagdag ng mga tile"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"I-drag dito upang alisin"</string> <string name="qs_edit" msgid="2232596095725105230">"I-edit"</string> <string name="tuner_time" msgid="6572217313285536011">"Oras"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-tl/strings_tv.xml b/packages/SystemUI/res/values-tl/strings_tv.xml index e6aad6045f7f..8d4b1b0ff013 100644 --- a/packages/SystemUI/res/values-tl/strings_tv.xml +++ b/packages/SystemUI/res/values-tl/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"I-play"</string> <string name="pip_pause" msgid="8412075640017218862">"I-pause"</string> <string name="pip_hold_home" msgid="340086535668778109">"I-hold ang "<b>"HOME"</b>" para makontrol ang PIP"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"Pindutin nang matagal ang button ng HOME upang makontrol ang PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml index 039a63f5e84d..d5a8b9b52107 100644 --- a/packages/SystemUI/res/values-tr/strings.xml +++ b/packages/SystemUI/res/values-tr/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Çalışma modu açık."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Çalışma modu kapatıldı."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Çalışma modu açıldı."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Veri Tasarrufu kapatıldı."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Veri Tasarrufu açıldı."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Ekran parlaklığı"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G veri kullanımı duraklatıldı"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G veri kullanımı duraklatıldı"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Konum GPS ile belirlendi"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Konum bilgisi istekleri etkin"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Tüm bildirimleri temizle"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Bildirim ayarları"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ayarları"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran otomatik olarak dönecektir."</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Sınır: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> uyarısı"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Çalışma modu"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Son ekranlarınız burada görünür"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Yeni öğe yok"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Her şeyi sildiniz"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Uygulama Bilgileri"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ekran sabitleme"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"ara"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Bildirim listesinin üstünde göster, ekrana getir ve sesli bildirime izin ver"</string> <string name="notification_more_settings" msgid="816306283396553571">"Diğer ayarlar"</string> <string name="notification_done" msgid="5279426047273930175">"Bitti"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Renk ve görünüm"</string> <string name="night_mode" msgid="3540405868248625488">"Gece modu"</string> <string name="calibrate_display" msgid="5974642573432039217">"Ekranı kalibre et"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Klavye Düğmesini Seçin"</string> <string name="preview" msgid="9077832302472282938">"Önizle"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Blok eklemek için sürükleyin"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Kaldırmak için buraya sürükleyin"</string> <string name="qs_edit" msgid="2232596095725105230">"Düzenle"</string> <string name="tuner_time" msgid="6572217313285536011">"Saat"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-tr/strings_tv.xml b/packages/SystemUI/res/values-tr/strings_tv.xml index c6da011442d3..a5be6a2f0e09 100644 --- a/packages/SystemUI/res/values-tr/strings_tv.xml +++ b/packages/SystemUI/res/values-tr/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"Oynat"</string> <string name="pip_pause" msgid="8412075640017218862">"Duraklat"</string> <string name="pip_hold_home" msgid="340086535668778109">"PIP\'yi kontrol etmek için "<b>"ANA EKRAN"</b>"\'ı basılı tutun"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP\'yi kontrol etmek için ANA EKRAN düğmesini basılı tutun"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Anladım"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml index e2ca5c57d956..398dea1194e2 100644 --- a/packages/SystemUI/res/values-uk/strings.xml +++ b/packages/SystemUI/res/values-uk/strings.xml @@ -223,10 +223,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Робочий режим увімкнено."</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Робочий режим вимкнено."</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Робочий режим увімкнено."</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Заощадження трафіку вимкнено."</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Заощадження трафіку ввімкнено."</string> <string name="accessibility_brightness" msgid="8003681285547803095">"Яскравість дисплея"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"Передавання даних 2G–3G призупинено"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"Передавання даних 4G призупинено"</string> @@ -240,6 +238,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Місцезнаходження встановлено за допомогою GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Запити про місцезнаходження активні"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Очистити всі сповіщення."</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Налаштування сповіщень"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Налаштування додатка <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Екран обертатиметься автоматично."</string> @@ -305,7 +304,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Обмеження: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Застереження: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Робочий режим"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Ваші останні екрани відображаються тут"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Немає нещодавніх завдань"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Ви очистили все"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Інформація про додаток"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"закріпити екран"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"пошук"</string> @@ -481,6 +481,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Показувати сповіщення вгорі списку, на екрані та зі звуковим сигналом"</string> <string name="notification_more_settings" msgid="816306283396553571">"Більше налаштувань"</string> <string name="notification_done" msgid="5279426047273930175">"Готово"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"Елементи керування сповіщеннями додатка <xliff:g id="APP_NAME">%1$s</xliff:g>"</string> <string name="color_and_appearance" msgid="1254323855964993144">"Колір і вигляд"</string> <string name="night_mode" msgid="3540405868248625488">"Нічний режим"</string> <string name="calibrate_display" msgid="5974642573432039217">"Калібрувати дисплей"</string> @@ -539,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Вибрати кнопку клавіатури"</string> <string name="preview" msgid="9077832302472282938">"Переглянути"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Перетягуйте фрагменти, щоб додавати їх"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Перетягніть сюди, щоб видалити"</string> <string name="qs_edit" msgid="2232596095725105230">"Редагувати"</string> <string name="tuner_time" msgid="6572217313285536011">"Час"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-uk/strings_tv.xml b/packages/SystemUI/res/values-uk/strings_tv.xml index dcb7a52ccbad..1091547b917e 100644 --- a/packages/SystemUI/res/values-uk/strings_tv.xml +++ b/packages/SystemUI/res/values-uk/strings_tv.xml @@ -26,4 +26,5 @@ <string name="pip_hold_home" msgid="340086535668778109">"Щоб керувати PIP, утримуйте кнопку "<b>"ГОЛОВНИЙ ЕКРАН"</b></string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Щоб керувати PIP, утримуйте кнопку \"ГОЛОВНИЙ ЕКРАН\""</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"Закрити"</string> </resources> diff --git a/packages/SystemUI/res/values-ur-rPK/strings.xml b/packages/SystemUI/res/values-ur-rPK/strings.xml index 866350c4a17f..7b5013fe4f7e 100644 --- a/packages/SystemUI/res/values-ur-rPK/strings.xml +++ b/packages/SystemUI/res/values-ur-rPK/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"مقام متعین کیا گیا بذریعہ GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"مقام کی درخواستیں فعال ہیں"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"سبھی اطلاعات صاف کریں۔"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"اطلاع کی ترتیبات"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> ترتیبات"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"اسکرین خود بخود گردش کرے گی۔"</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> حد"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> وارننگ"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"کام موڈ"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"آپ کی حالیہ اسکرینز یہاں ظاہر ہوتی ہیں"</string> + <string name="recents_empty_message" msgid="808480104164008572">"کوئی حالیہ آئٹم نہیں"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"آپ نے سب کچھ صاف کر دیا ہے"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"ایپلیکیشن کی معلومات"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"اسکرین کو پن کرنا"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"تلاش کریں"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"اطلاعات کی فہرست پر سب سے اوپر دکھائیں، اسکرین پر دکھائیں اور آواز کی اجازت دیں"</string> <string name="notification_more_settings" msgid="816306283396553571">"مزید ترتیبات"</string> <string name="notification_done" msgid="5279426047273930175">"ہوگیا"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"رنگ اور ظہور"</string> <string name="night_mode" msgid="3540405868248625488">"رات موڈ"</string> <string name="calibrate_display" msgid="5974642573432039217">"نشان زد ڈسپلے"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"کی بورڈ بٹن منتخب کریں"</string> <string name="preview" msgid="9077832302472282938">"پیش منظر"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"ٹائٹلز شامل کرنے کیلئے گھسیٹیں"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"ہٹانے کیلئے یہاں گھسیٹیں؟"</string> <string name="qs_edit" msgid="2232596095725105230">"ترمیم کریں"</string> <string name="tuner_time" msgid="6572217313285536011">"وقت"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-ur-rPK/strings_tv.xml b/packages/SystemUI/res/values-ur-rPK/strings_tv.xml index 4216e9e85d5e..aff14b29f10b 100644 --- a/packages/SystemUI/res/values-ur-rPK/strings_tv.xml +++ b/packages/SystemUI/res/values-ur-rPK/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"PIP کنٹرول کرنے کیلئے "<b>"ہوم"</b>" پکڑے رکھیں"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"PIP کنٹرول کرنے کیلئے ہوم بٹن دبائیں اور پکڑے رکھیں"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"سمجھ آ گئی"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-uz-rUZ/strings.xml b/packages/SystemUI/res/values-uz-rUZ/strings.xml index fb9a9e2856db..bd606c210c32 100644 --- a/packages/SystemUI/res/values-uz-rUZ/strings.xml +++ b/packages/SystemUI/res/values-uz-rUZ/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS yordamida manzilni o‘rnatish"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Joylashuv so‘rovlari yoniq"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Barcha eslatmalarni tozalash."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Bildirishnoma sozlamalari"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> sozlamalari"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Ekran avtomatik buriladi."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Cheklov: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Ogohlantirish: <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Ish rejimi"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Bu yerda yaqinda ishlatilgan ilovalar ko‘rsatiladi"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Hozircha hech narsa yo‘q"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Hammasi o‘chirildi"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Ilova haqida ma’lumot"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"o‘zgarmas ekran"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"qidirish"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Bildirishnomalar ro‘yxatining boshida va barcha oynalar ustida ovoz bilan ko‘rsatilsin"</string> <string name="notification_more_settings" msgid="816306283396553571">"Boshqa sozlamalar"</string> <string name="notification_done" msgid="5279426047273930175">"Tayyor"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Rang va ko‘rinishi"</string> <string name="night_mode" msgid="3540405868248625488">"Tungi rejim"</string> <string name="calibrate_display" msgid="5974642573432039217">"Ekranni kalibrlash"</string> @@ -535,6 +540,8 @@ <string name="select_keycode" msgid="7413765103381924584">"Klaviatura tugmasini tanlang"</string> <string name="preview" msgid="9077832302472282938">"Oldindan ko‘rish"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Fragmentlar qo‘shish uchun torting"</string> + <!-- no translation found for drag_to_remove_tiles (3361212377437088062) --> + <skip /> <string name="qs_edit" msgid="2232596095725105230">"Tahrirlash"</string> <string name="tuner_time" msgid="6572217313285536011">"Vaqt"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-uz-rUZ/strings_tv.xml b/packages/SystemUI/res/values-uz-rUZ/strings_tv.xml index d9db7d233b3d..3a4d17625459 100644 --- a/packages/SystemUI/res/values-uz-rUZ/strings_tv.xml +++ b/packages/SystemUI/res/values-uz-rUZ/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"“Kadr ichida kadr” rejimini boshqarish uchun "<b>"BOSHI"</b>" tugmasini bosib turing"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"“Kadr ichida kadr” rejimini boshqarish uchun BOSHIGA tugmasini bosib turing"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml index 7427bda4a5f4..edd0a8bec156 100644 --- a/packages/SystemUI/res/values-vi/strings.xml +++ b/packages/SystemUI/res/values-vi/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Vị trí đặt bởi GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Yêu cầu về thông tin vị trí đang hoạt động"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Xóa tất cả thông báo."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Cài đặt thông báo"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"Cài đặt <xliff:g id="APP_NAME">%s</xliff:g>"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Màn hình sẽ xoay tự động."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"Giới hạn <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"Cảnh báo <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Chế độ làm việc"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Màn hình gần đây của bạn sẽ xuất hiện tại đây"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Không có mục gần đây nào"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Bạn đã xóa mọi nội dung"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Thông tin ứng dụng"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"khóa màn hình"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"tìm kiếm"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Hiển thị ở đầu danh sách thông báo, hiển thị trên màn hình và phát ra âm thanh"</string> <string name="notification_more_settings" msgid="816306283396553571">"Cài đặt khác"</string> <string name="notification_done" msgid="5279426047273930175">"Xong"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Màu sắc và giao diện"</string> <string name="night_mode" msgid="3540405868248625488">"Chế độ ban đêm"</string> <string name="calibrate_display" msgid="5974642573432039217">"Hiệu chỉnh hiển thị"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Chọn nút trên bàn phím"</string> <string name="preview" msgid="9077832302472282938">"Xem trước"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Kéo để thêm ô"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Kéo vào đây để xóa"</string> <string name="qs_edit" msgid="2232596095725105230">"Chỉnh sửa"</string> <string name="tuner_time" msgid="6572217313285536011">"Thời gian"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-vi/strings_tv.xml b/packages/SystemUI/res/values-vi/strings_tv.xml index 727dcb89fae6..7a5e34ad5c8d 100644 --- a/packages/SystemUI/res/values-vi/strings_tv.xml +++ b/packages/SystemUI/res/values-vi/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"Phát"</string> <string name="pip_pause" msgid="8412075640017218862">"Tạm dừng"</string> <string name="pip_hold_home" msgid="340086535668778109">"Giữ "<b>"HOME"</b>" để đ.khiển PIP"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"Bấm và giữ nút HOME để điều khiển PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"OK"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml index 74d787f58c7c..23fb020400c1 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings.xml @@ -73,8 +73,7 @@ <string name="screenshot_saved_title" msgid="6461865960961414961">"已抓取屏幕截图。"</string> <string name="screenshot_saved_text" msgid="1152839647677558815">"触摸可查看您的屏幕截图。"</string> <string name="screenshot_failed_title" msgid="705781116746922771">"无法抓取屏幕截图。"</string> - <!-- no translation found for screenshot_failed_to_save_unknown_text (7887826345701753830) --> - <skip /> + <string name="screenshot_failed_to_save_unknown_text" msgid="7887826345701753830">"保存屏幕截图时出现问题。"</string> <string name="screenshot_failed_to_save_text" msgid="2592658083866306296">"由于存储空间有限，无法保存屏幕截图。"</string> <string name="screenshot_failed_to_capture_text" msgid="7602391003979898374">"此应用或贵单位不允许进行屏幕截图。"</string> <string name="usb_preference_title" msgid="6551050377388882787">"USB文件传输选项"</string> @@ -222,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"工作模式开启。"</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"工作模式已关闭。"</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"工作模式已开启。"</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"流量节省程序已关闭。"</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"流量节省程序已开启。"</string> <string name="accessibility_brightness" msgid="8003681285547803095">"屏幕亮度"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G 数据网络已暂停使用"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G 数据网络已暂停使用"</string> @@ -239,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"已通过GPS确定位置"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"应用发出了有效位置信息请求"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"通知设置"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>设置"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"屏幕会自动旋转。"</string> @@ -304,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"上限为<xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g>警告"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"工作模式"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"您最近浏览过的屏幕会显示在此处"</string> + <string name="recents_empty_message" msgid="808480104164008572">"近期没有任何内容"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"您已清除所有内容"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"应用信息"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"固定屏幕"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"搜索"</string> @@ -480,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"在通知列表顶部显示，同时在屏幕上短暂显示，并允许发出提示音"</string> <string name="notification_more_settings" msgid="816306283396553571">"更多设置"</string> <string name="notification_done" msgid="5279426047273930175">"完成"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"颜色和外观"</string> <string name="night_mode" msgid="3540405868248625488">"夜间模式"</string> <string name="calibrate_display" msgid="5974642573432039217">"校准显示画面"</string> @@ -538,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"选择键盘按钮"</string> <string name="preview" msgid="9077832302472282938">"预览"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"拖动即可添加图块"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"拖动到此处即可移除"</string> <string name="qs_edit" msgid="2232596095725105230">"修改"</string> <string name="tuner_time" msgid="6572217313285536011">"时间"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-zh-rCN/strings_tv.xml b/packages/SystemUI/res/values-zh-rCN/strings_tv.xml index 87b62a03b1ea..2bfe478e799b 100644 --- a/packages/SystemUI/res/values-zh-rCN/strings_tv.xml +++ b/packages/SystemUI/res/values-zh-rCN/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"播放"</string> <string name="pip_pause" msgid="8412075640017218862">"暂停"</string> <string name="pip_hold_home" msgid="340086535668778109">"按住"<b>"主屏幕"</b>"按钮即可控制画中画功能"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"按住主屏幕按钮即可控制画中画功能"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"知道了"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml index 602089e68e4c..902cf714c99d 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings.xml @@ -236,6 +236,7 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS 已定位"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"位置要求啟動中"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string> + <string name="notification_group_overflow_indicator" msgid="1863231301642314183">"+ <xliff:g id="NUMBER">%s</xliff:g>"</string> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"通知設定"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>設定"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"螢幕會自動旋轉。"</string> @@ -301,7 +302,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"上限為 <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> 警告"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"工作模式"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"您最近的螢幕顯示在這裡"</string> + <string name="recents_empty_message" msgid="808480104164008572">"沒有最近項目"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"您已清除所有項目"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"應用程式資料"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"螢幕固定"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"搜尋"</string> @@ -477,6 +479,7 @@ <string name="notification_importance_max" msgid="5806278962376556491">"在通知清單頂部顯示，並不時於螢幕出現及發出音效"</string> <string name="notification_more_settings" msgid="816306283396553571">"更多設定"</string> <string name="notification_done" msgid="5279426047273930175">"完成"</string> + <string name="notification_gear_accessibility" msgid="94429150213089611">"「<xliff:g id="APP_NAME">%1$s</xliff:g>」通知控制項"</string> <string name="color_and_appearance" msgid="1254323855964993144">"顏色和外觀"</string> <string name="night_mode" msgid="3540405868248625488">"夜間模式"</string> <string name="calibrate_display" msgid="5974642573432039217">"校準螢幕"</string> @@ -535,6 +538,7 @@ <string name="select_keycode" msgid="7413765103381924584">"選取鍵盤按鈕"</string> <string name="preview" msgid="9077832302472282938">"預覽"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"拖曳即可新增圖塊"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"拖曳這裡即可移除"</string> <string name="qs_edit" msgid="2232596095725105230">"編輯"</string> <string name="tuner_time" msgid="6572217313285536011">"時間"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-zh-rHK/strings_tv.xml b/packages/SystemUI/res/values-zh-rHK/strings_tv.xml index e419aa190da4..10c3141c4696 100644 --- a/packages/SystemUI/res/values-zh-rHK/strings_tv.xml +++ b/packages/SystemUI/res/values-zh-rHK/strings_tv.xml @@ -24,7 +24,7 @@ <string name="pip_play" msgid="674145557658227044">"播放"</string> <string name="pip_pause" msgid="8412075640017218862">"暫停"</string> <string name="pip_hold_home" msgid="340086535668778109">"按住"<b>"主按鈕"</b>"即可控制 PIP"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"按住主按鈕即可控制 PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"知道了"</string> + <string name="recents_tv_dismiss" msgid="3555093879593377731">"關閉"</string> </resources> diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml index 189f404d3ed8..ea3293078763 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings.xml @@ -221,10 +221,8 @@ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"工作模式已開啟。"</string> <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"工作模式已關閉。"</string> <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"工作模式已開啟。"</string> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_off (650231949881093289) --> - <skip /> - <!-- no translation found for accessibility_quick_settings_data_saver_changed_on (4218725402373934151) --> - <skip /> + <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Data Saver 已關閉。"</string> + <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Data Saver 已開啟。"</string> <string name="accessibility_brightness" msgid="8003681285547803095">"螢幕亮度"</string> <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"已暫停 2G-3G 數據連線"</string> <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"已暫停 4G 數據連線"</string> @@ -238,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"GPS 已定位"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"有位置資訊要求"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"清除所有通知。"</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"通知設定"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g>設定"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"螢幕會自動旋轉。"</string> @@ -303,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"上限為 <xliff:g id="DATA_LIMIT">%s</xliff:g>"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> 警告"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"工作模式"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"您最近的螢幕會顯示在這裡"</string> + <string name="recents_empty_message" msgid="808480104164008572">"最近沒有任何項目"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"您已清除所有工作"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"應用程式資訊"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"螢幕固定"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"搜尋"</string> @@ -479,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"顯示在通知清單頂端，同時短暫顯示在畫面上並發出音效"</string> <string name="notification_more_settings" msgid="816306283396553571">"更多設定"</string> <string name="notification_done" msgid="5279426047273930175">"完成"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"顏色和外觀"</string> <string name="night_mode" msgid="3540405868248625488">"夜間模式"</string> <string name="calibrate_display" msgid="5974642573432039217">"校正顯示畫面"</string> @@ -537,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"選取鍵盤按鍵"</string> <string name="preview" msgid="9077832302472282938">"預覽"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"拖曳即可新增圖塊"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"拖曳到這裡即可移除"</string> <string name="qs_edit" msgid="2232596095725105230">"編輯"</string> <string name="tuner_time" msgid="6572217313285536011">"時間"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-zh-rTW/strings_tv.xml b/packages/SystemUI/res/values-zh-rTW/strings_tv.xml index 94a83b939121..a6744e7e31f2 100644 --- a/packages/SystemUI/res/values-zh-rTW/strings_tv.xml +++ b/packages/SystemUI/res/values-zh-rTW/strings_tv.xml @@ -24,7 +24,8 @@ <string name="pip_play" msgid="674145557658227044">"播放"</string> <string name="pip_pause" msgid="8412075640017218862">"暫停"</string> <string name="pip_hold_home" msgid="340086535668778109">"按住「主畫面」"<b></b>"按鈕即可控制子母畫面"</string> - <!-- no translation found for pip_onboarding_description (2882896641362814195) --> - <skip /> + <string name="pip_onboarding_description" msgid="2882896641362814195">"按住「主畫面」按鈕即可控制子母畫面"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"我知道了"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml index 60c4479bfb4c..9f8f29801408 100644 --- a/packages/SystemUI/res/values-zu/strings.xml +++ b/packages/SystemUI/res/values-zu/strings.xml @@ -236,6 +236,8 @@ <string name="gps_notification_found_text" msgid="4619274244146446464">"Indawo ihlelwe i-GPS"</string> <string name="accessibility_location_active" msgid="2427290146138169014">"Izicelo zendawo ziyasebenza"</string> <string name="accessibility_clear_all" msgid="5235938559247164925">"Susa zonke izaziso."</string> + <!-- no translation found for notification_group_overflow_indicator (1863231301642314183) --> + <skip /> <string name="status_bar_notification_inspect_item_title" msgid="5668348142410115323">"Izilungiselelo zesaziso"</string> <string name="status_bar_notification_app_settings_title" msgid="5525260160341558869">"<xliff:g id="APP_NAME">%s</xliff:g> izilungiselelo"</string> <string name="accessibility_rotation_lock_off" msgid="4062780228931590069">"Isikrini sizophenduka ngokuzenzakalela."</string> @@ -301,7 +303,8 @@ <string name="quick_settings_cellular_detail_data_limit" msgid="56011158504994128">"<xliff:g id="DATA_LIMIT">%s</xliff:g> umkhawulo"</string> <string name="quick_settings_cellular_detail_data_warning" msgid="2440098045692399009">"<xliff:g id="DATA_LIMIT">%s</xliff:g> isexwayiso"</string> <string name="quick_settings_work_mode_label" msgid="6244915274350490429">"Imodi yomsebenzi"</string> - <string name="recents_empty_message" msgid="8682129509540827999">"Izikrini zakho zakamuva zivela lapha"</string> + <string name="recents_empty_message" msgid="808480104164008572">"Azikho izinto zakamuva"</string> + <string name="recents_empty_message_dismissed_all" msgid="2791312568666558651">"Usule yonke into"</string> <string name="recents_app_info_button_label" msgid="2890317189376000030">"Ulwazi lohlelo lokusebenza"</string> <string name="recents_lock_to_app_button_label" msgid="6942899049072506044">"ukuphina isikrini"</string> <string name="recents_search_bar_label" msgid="8074997400187836677">"sesha"</string> @@ -477,6 +480,8 @@ <string name="notification_importance_max" msgid="5806278962376556491">"Bonisa phezulu kohlu lwezaziso, beka phezu kwesikrini futhi uvumele umsindo"</string> <string name="notification_more_settings" msgid="816306283396553571">"Izilungiselelo eziningi"</string> <string name="notification_done" msgid="5279426047273930175">"Kwenziwe"</string> + <!-- no translation found for notification_gear_accessibility (94429150213089611) --> + <skip /> <string name="color_and_appearance" msgid="1254323855964993144">"Umbala nokubonakala"</string> <string name="night_mode" msgid="3540405868248625488">"Imodi yasebusuku"</string> <string name="calibrate_display" msgid="5974642573432039217">"Sika isibonisi"</string> @@ -535,6 +540,7 @@ <string name="select_keycode" msgid="7413765103381924584">"Khetha inkinobho yekhibhodi"</string> <string name="preview" msgid="9077832302472282938">"Hlola kuqala"</string> <string name="drag_to_add_tiles" msgid="7058945779098711293">"Hudula ukuze ungeze amathayili"</string> + <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Hudulela lapha ukuze ususe"</string> <string name="qs_edit" msgid="2232596095725105230">"Hlela"</string> <string name="tuner_time" msgid="6572217313285536011">"Isikhathi"</string> <string-array name="clock_options"> diff --git a/packages/SystemUI/res/values-zu/strings_tv.xml b/packages/SystemUI/res/values-zu/strings_tv.xml index b0105560d877..5fb063d75a27 100644 --- a/packages/SystemUI/res/values-zu/strings_tv.xml +++ b/packages/SystemUI/res/values-zu/strings_tv.xml @@ -26,4 +26,6 @@ <string name="pip_hold_home" msgid="340086535668778109">"Bamba "<b>"IKHAYA"</b>" ukuze ulawule i-PIP"</string> <string name="pip_onboarding_description" msgid="2882896641362814195">"Cindezela futhi ubambe inkinobho EKHAYA ukuze ulawule i-PIP"</string> <string name="pip_onboarding_button" msgid="3957426748484904611">"Ngiyezwa"</string> + <!-- no translation found for recents_tv_dismiss (3555093879593377731) --> + <skip /> </resources> diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml index e040ab26f97a..1e979fda17bd 100644 --- a/packages/SystemUI/res/values/attrs.xml +++ b/packages/SystemUI/res/values/attrs.xml @@ -85,7 +85,7 @@ <attr name="ignoreRightInset" format="boolean" /> </declare-styleable> - <declare-styleable name="AlphaOptimizedImageView"> + <declare-styleable name="AnimatedImageView"> <attr name="hasOverlappingRendering" format="boolean" /> </declare-styleable> diff --git a/packages/SystemUI/res/values/colors_tv.xml b/packages/SystemUI/res/values/colors_tv.xml index af99aaecf62a..4126d3cdad68 100644 --- a/packages/SystemUI/res/values/colors_tv.xml +++ b/packages/SystemUI/res/values/colors_tv.xml @@ -19,4 +19,5 @@ <resources> <color name="recents_tv_card_background_color">#FF37474F</color> <color name="recents_tv_card_title_text_color">#CCEEEEEE</color> + <color name="recents_tv_dismiss_text_color">#7FEEEEEE</color> </resources>
\ No newline at end of file diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index 8b433f984d65..8cd21670f986 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -397,9 +397,6 @@ <!-- The padding on top of the first notification to the children container --> <dimen name="notification_children_container_top_padding">8dp</dimen> - <!-- The vertical distance from which the notification appear when children are expanded --> - <dimen name="notification_appear_distance">140dp</dimen> - <!-- end margin for multi user switch in expanded quick settings --> <dimen name="multi_user_switch_expanded_margin">8dp</dimen> diff --git a/packages/SystemUI/res/values/dimens_tv.xml b/packages/SystemUI/res/values/dimens_tv.xml index 6b153d1117ea..953dd650b2aa 100644 --- a/packages/SystemUI/res/values/dimens_tv.xml +++ b/packages/SystemUI/res/values/dimens_tv.xml @@ -18,8 +18,8 @@ --> <resources> <!-- Dimens for recents card in the recents view on tv --> - <dimen name="recents_tv_card_width">268dip</dimen> - <dimen name="recents_tv_screenshot_height">151dip</dimen> + <dimen name="recents_tv_card_width">240dip</dimen> + <dimen name="recents_tv_screenshot_height">135dip</dimen> <dimen name="recents_tv_card_extra_badge_size">20dip</dimen> <dimen name="recents_tv_banner_width">114dip</dimen> <dimen name="recents_tv_banner_height">64dip</dimen> @@ -29,10 +29,10 @@ <dimen name="recents_tv_text_padding_bottom">12dip</dimen> <!-- Padding for grid view in recents view on tv --> - <dimen name="recents_tv_grid_row_padding">56dip</dimen> - <dimen name="recents_tv_gird_row_top_padding">57dip</dimen> + <dimen name="recents_tv_gird_row_top_margin">215dip</dimen> <dimen name="recents_tv_grid_max_row_height">268dip</dimen> - <dimen name="recents_tv_gird_card_spacing">20dip</dimen> + <dimen name="recents_tv_gird_card_spacing">8dip</dimen> + <dimen name="recents_tv_gird_focused_card_delta">44dip</dimen> <!-- Values for focus animation --> <dimen name="recents_tv_unselected_item_z">6dp</dimen> @@ -43,4 +43,13 @@ <!-- Values for text on recents cards on tv --> <dimen name="recents_tv_title_text_size">12sp</dimen> + + <!-- Values for card dismiss state --> + <dimen name="recents_tv_dismiss_shift_down">48dip</dimen> + <dimen name="recents_tv_dismiss_top_margin">356dip</dimen> + <dimen name="recents_tv_dismiss_icon_size">24dip</dimen> + <dimen name="recents_tv_dismiss_icon_top_margin">38dip</dimen> + <dimen name="recents_tv_dismiss_icon_bottom_margin">1dip</dimen> + <dimen name="recents_tv_dismiss_text_size">12sp</dimen> + </resources> diff --git a/packages/SystemUI/res/values/integers_tv.xml b/packages/SystemUI/res/values/integers_tv.xml index bfd8f8beb958..c60c24556ca6 100644 --- a/packages/SystemUI/res/values/integers_tv.xml +++ b/packages/SystemUI/res/values/integers_tv.xml @@ -15,4 +15,6 @@ --> <resources> <integer name="item_scale_anim_duration">150</integer> + <integer name="dismiss_short_duration">200</integer> + <integer name="dismiss_long_duration">400</integer> </resources>
\ No newline at end of file diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 5295ccb77012..091ba51ed7ee 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -570,6 +570,9 @@ <!-- Content description of the clear button in the notification panel for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_clear_all">Clear all notifications.</string> + <!-- The overflow indicator shown when a group has more notification inside the group than the visible ones. An example is "+ 3" [CHAR LIMIT=5] --> + <string name="notification_group_overflow_indicator">+ <xliff:g id="number" example="3">%s</xliff:g></string> + <!-- Content description of button in notification inspector for system settings relating to notifications from this application [CHAR LIMIT=NONE] --> <string name="status_bar_notification_inspect_item_title">Notification settings</string> @@ -1258,6 +1261,9 @@ <!-- Notification: Control panel: Label for button that dismisses control panel. [CHAR LIMIT=NONE] --> <string name="notification_done">Done</string> + <!-- Notification: Gear: Content description for the gear. [CHAR LIMIT=NONE] --> + <string name="notification_gear_accessibility"><xliff:g id="app_name" example="YouTube">%1$s</xliff:g> notification controls</string> + <!-- SysUI Tuner: Color and appearance screen title [CHAR LIMIT=50] --> <string name="color_and_appearance">Color and appearance</string> diff --git a/packages/SystemUI/res/values/strings_tv.xml b/packages/SystemUI/res/values/strings_tv.xml index 0e1fe8fa3384..52aba0d92883 100644 --- a/packages/SystemUI/res/values/strings_tv.xml +++ b/packages/SystemUI/res/values/strings_tv.xml @@ -19,13 +19,13 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <!-- Picture-in-Picture (PIP) menu --> <eat-comment /> - <!-- Button to close picture-in-picture (PIP) in PIP menu [CHAR LIMIT=16] --> + <!-- Button to close picture-in-picture (PIP) in PIP menu [CHAR LIMIT=30] --> <string name="pip_close">Close PIP</string> - <!-- Button to move picture-in-picture (PIP) screen to the fullscreen in PIP menu [CHAR LIMIT=16] --> + <!-- Button to move picture-in-picture (PIP) screen to the fullscreen in PIP menu [CHAR LIMIT=30] --> <string name="pip_fullscreen">Full screen</string> - <!-- Button to play the current media on picture-in-picture (PIP) [CHAR LIMIT=16] --> + <!-- Button to play the current media on picture-in-picture (PIP) [CHAR LIMIT=30] --> <string name="pip_play">Play</string> - <!-- Button to pause the current media on picture-in-picture (PIP) [CHAR LIMIT=16] --> + <!-- Button to pause the current media on picture-in-picture (PIP) [CHAR LIMIT=30] --> <string name="pip_pause">Pause</string> <!-- Overlay text on picture-in-picture (PIP) to indicate that longpress HOME key to control PIP [CHAR LIMIT=52] --> <string name="pip_hold_home">Hold <b>HOME</b> to control PIP</string> @@ -35,7 +35,11 @@ <string name="pip_onboarding_description">Press and hold the HOME button to control PIP</string> <!-- Button to close picture-in-picture (PIP) onboarding screen. --> <string name="pip_onboarding_button">Got it</string> + <!-- Dismiss icon description --> + <string name="recents_tv_dismiss">Dismiss</string> <!-- Font for Recents --> <!-- DO NOT TRANSLATE --> <string name="font_roboto_regular" translatable="false">sans-serif</string> + <!-- DO NOT TRANSLATE --> + <string name="font_roboto_light" translatable="false">sans-serif-light</string> </resources> diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml index b0c1e951f7db..21ad21695d22 100644 --- a/packages/SystemUI/res/values/styles.xml +++ b/packages/SystemUI/res/values/styles.xml @@ -305,7 +305,7 @@ <style name="TextAppearance.NotificationGuts"> <item name="android:textSize">14sp</item> - <item name="android:fontFamily">sans-serif-medium</item> + <item name="android:fontFamily">roboto-regular</item> <item name="android:textColor">@android:color/black</item> </style> diff --git a/packages/SystemUI/res/values/values_tv.xml b/packages/SystemUI/res/values/values_tv.xml index 6a72e542482b..bd72c5115566 100644 --- a/packages/SystemUI/res/values/values_tv.xml +++ b/packages/SystemUI/res/values/values_tv.xml @@ -15,5 +15,5 @@ limitations under the License. --> <resources xmlns:android="http://schemas.android.com/apk/res/android"> <item format="float" type="integer" name="unselected_scale">1.0</item> - <item format="float" type="integer" name="selected_scale">1.1</item> + <item format="float" type="integer" name="selected_scale">1.259</item> </resources> diff --git a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java index 81ba23f27f23..a08b2c1198d8 100644 --- a/packages/SystemUI/src/com/android/systemui/SwipeHelper.java +++ b/packages/SystemUI/src/com/android/systemui/SwipeHelper.java @@ -34,6 +34,8 @@ import android.view.accessibility.AccessibilityEvent; import com.android.systemui.classifier.FalsingManager; import com.android.systemui.statusbar.FlingAnimationUtils; +import java.util.HashMap; + public class SwipeHelper implements Gefingerpoken { static final String TAG = "com.android.systemui.SwipeHelper"; private static final boolean DEBUG = false; @@ -70,6 +72,7 @@ public class SwipeHelper implements Gefingerpoken { private float mInitialTouchPos; private float mPerpendicularInitialTouchPos; private boolean mDragging; + private boolean mSnappingChild; private View mCurrView; private boolean mCanCurrViewBeDimissed; private float mDensityScale; @@ -85,6 +88,8 @@ public class SwipeHelper implements Gefingerpoken { private boolean mTouchAboveFalsingThreshold; private boolean mDisableHwLayers; + private HashMap<View, Animator> mDismissPendingMap = new HashMap<>(); + public SwipeHelper(int swipeDirection, Callback callback, Context context) { mCallback = callback; mHandler = new Handler(); @@ -252,6 +257,7 @@ public class SwipeHelper implements Gefingerpoken { case MotionEvent.ACTION_DOWN: mTouchAboveFalsingThreshold = false; mDragging = false; + mSnappingChild = false; mLongPressSent = false; mVelocityTracker.clear(); mCurrView = mCallback.getChildAtPosition(ev); @@ -391,9 +397,18 @@ public class SwipeHelper implements Gefingerpoken { anim.setStartDelay(delay); } anim.addListener(new AnimatorListenerAdapter() { + private boolean mCancelled; + + public void onAnimationCancel(Animator animation) { + mCancelled = true; + } + public void onAnimationEnd(Animator animation) { updateSwipeProgressFromOffset(animView, canBeDismissed); - mCallback.onChildDismissed(animView); + mDismissPendingMap.remove(animView); + if (!mCancelled) { + mCallback.onChildDismissed(animView); + } if (endAction != null) { endAction.run(); } @@ -402,7 +417,9 @@ public class SwipeHelper implements Gefingerpoken { } } }); + prepareDismissAnimation(animView, anim); + mDismissPendingMap.put(animView, anim); anim.start(); } @@ -429,11 +446,13 @@ public class SwipeHelper implements Gefingerpoken { anim.setDuration(duration); anim.addListener(new AnimatorListenerAdapter() { public void onAnimationEnd(Animator animator) { + mSnappingChild = false; updateSwipeProgressFromOffset(animView, canBeDismissed); mCallback.onChildSnappedBack(animView, targetLeft); } }); prepareSnapBackAnimation(animView, anim); + mSnappingChild = true; anim.start(); } @@ -466,6 +485,33 @@ public class SwipeHelper implements Gefingerpoken { updateSwipeProgressFromOffset(animView, canBeDismissed); } + private void snapChildInstantly(final View view) { + final boolean canAnimViewBeDismissed = mCallback.canChildBeDismissed(view); + setTranslation(view, 0); + updateSwipeProgressFromOffset(view, canAnimViewBeDismissed); + } + + public void snapChildIfNeeded(final View view, boolean animate) { + if ((mDragging && mCurrView == view) || mSnappingChild) { + return; + } + boolean needToSnap = false; + Animator dismissPendingAnim = mDismissPendingMap.get(view); + if (dismissPendingAnim != null) { + needToSnap = true; + dismissPendingAnim.cancel(); + } else if (getTranslation(view) != 0) { + needToSnap = true; + } + if (needToSnap) { + if (animate) { + snapChild(view, 0 /* targetLeft */, 0.0f /* velocity */); + } else { + snapChildInstantly(view); + } + } + } + public boolean onTouchEvent(MotionEvent ev) { if (mLongPressSent) { return true; @@ -532,7 +578,9 @@ public class SwipeHelper implements Gefingerpoken { mCallback.onDragCancelled(mCurrView); snapChild(mCurrView, 0 /* leftTarget */, velocity); } + mCurrView = null; } + mDragging = false; break; } return true; diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 02b860c493cd..a5dfc4b2ad85 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -16,6 +16,7 @@ package com.android.systemui.keyguard; +import android.annotation.UserIdInt; import android.app.Activity; import android.app.ActivityManager; import android.app.ActivityManagerNative; @@ -253,6 +254,11 @@ public class KeyguardViewMediator extends SystemUI { private int mDelayedShowingSequence; /** + * Simiar to {@link #mDelayedProfileShowingSequence}, but it is for profile case. + */ + private int mDelayedProfileShowingSequence; + + /** * If the user has disabled the keyguard, then requests to exit, this is * how we'll ultimately let them know whether it was successful. We use this * var being non-null as an indicator that there is an in progress request. @@ -327,6 +333,8 @@ public class KeyguardViewMediator extends SystemUI { */ private boolean mPendingLock; + private boolean mLockLater; + private boolean mWakeAndUnlocking; private IKeyguardDrawnCallback mDrawnCallback; @@ -709,7 +717,7 @@ public class KeyguardViewMediator extends SystemUI { mLockPatternUtils.getPowerButtonInstantlyLocks(currentUser) || !mLockPatternUtils.isSecure(currentUser); long timeout = getLockTimeout(KeyguardUpdateMonitor.getCurrentUser()); - + mLockLater = false; if (mExitSecureCallback != null) { if (DEBUG) Log.d(TAG, "pending exit secure callback cancelled"); try { @@ -726,6 +734,7 @@ public class KeyguardViewMediator extends SystemUI { } else if ((why == WindowManagerPolicy.OFF_BECAUSE_OF_TIMEOUT && timeout > 0) || (why == WindowManagerPolicy.OFF_BECAUSE_OF_USER && !lockImmediately)) { doKeyguardLaterLocked(timeout); + mLockLater = true; } else if (!mLockPatternUtils.isLockScreenDisabled(currentUser)) { mPendingLock = true; } @@ -753,12 +762,20 @@ public class KeyguardViewMediator extends SystemUI { resetStateLocked(); mPendingReset = false; } + if (mPendingLock) { doKeyguardLocked(null); mPendingLock = false; } + + // We do not have timeout and power button instant lock setting for profile lock. + // So we use the personal setting if there is any. But if there is no device + // we need to make sure we lock it immediately when the screen is off. + if (!mLockLater) { + doKeyguardForChildProfilesLocked(); + } + } - doKeyguardForChildProfilesLocked(); KeyguardUpdateMonitor.getInstance(mContext).dispatchFinishedGoingToSleep(why); } @@ -791,6 +808,7 @@ public class KeyguardViewMediator extends SystemUI { // policy in effect. Make sure we don't go beyond policy limit. displayTimeout = Math.max(displayTimeout, 0); // ignore negative values timeout = Math.min(policyTimeout - displayTimeout, lockAfterTimeout); + timeout = Math.max(timeout, 0); } return timeout; } @@ -823,13 +841,18 @@ public class KeyguardViewMediator extends SystemUI { for (UserInfo info : profiles) { if (mLockPatternUtils.isSeparateProfileChallengeEnabled(info.id)) { long userTimeout = getLockTimeout(info.id); - long userWhen = SystemClock.elapsedRealtime() + userTimeout; - Intent lockIntent = new Intent(DELAYED_LOCK_PROFILE_ACTION); - lockIntent.putExtra(Intent.EXTRA_USER_ID, info.id); - PendingIntent lockSender = PendingIntent.getBroadcast( - mContext, 0, lockIntent, PendingIntent.FLAG_CANCEL_CURRENT); - mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, - userWhen, lockSender); + if (userTimeout == 0) { + doKeyguardForChildProfilesLocked(); + } else { + long userWhen = SystemClock.elapsedRealtime() + userTimeout; + Intent lockIntent = new Intent(DELAYED_LOCK_PROFILE_ACTION); + lockIntent.putExtra("seq", mDelayedProfileShowingSequence); + lockIntent.putExtra(Intent.EXTRA_USER_ID, info.id); + PendingIntent lockSender = PendingIntent.getBroadcast( + mContext, 0, lockIntent, PendingIntent.FLAG_CANCEL_CURRENT); + mAlarmManager.setExactAndAllowWhileIdle(AlarmManager.ELAPSED_REALTIME_WAKEUP, + userWhen, lockSender); + } } } } @@ -848,6 +871,10 @@ public class KeyguardViewMediator extends SystemUI { mDelayedShowingSequence++; } + private void cancelDoKeyguardForChildProfilesLocked() { + mDelayedProfileShowingSequence++; + } + /** * Let's us know when the device is waking up. */ @@ -857,6 +884,7 @@ public class KeyguardViewMediator extends SystemUI { synchronized (this) { mDeviceInteractive = true; cancelDoKeyguardLaterLocked(); + cancelDoKeyguardForChildProfilesLocked(); if (DEBUG) Log.d(TAG, "onStartedWakingUp, seq = " + mDelayedShowingSequence); notifyStartedWakingUp(); } @@ -1179,6 +1207,7 @@ public class KeyguardViewMediator extends SystemUI { private void lockProfile(int userId) { mTrustManager.setDeviceLockedForUser(userId, true); + notifyLockedProfile(userId); } private boolean shouldWaitForProvisioning() { @@ -1300,10 +1329,13 @@ public class KeyguardViewMediator extends SystemUI { } } } else if (DELAYED_LOCK_PROFILE_ACTION.equals(intent.getAction())) { + final int sequence = intent.getIntExtra("seq", 0); int userId = intent.getIntExtra(Intent.EXTRA_USER_ID, 0); if (userId != 0) { synchronized (KeyguardViewMediator.this) { - lockProfile(userId); + if (mDelayedProfileShowingSequence == sequence) { + lockProfile(userId); + } } } } @@ -1505,6 +1537,13 @@ public class KeyguardViewMediator extends SystemUI { } } + private void notifyLockedProfile(@UserIdInt int userId) { + try { + ActivityManagerNative.getDefault().notifyLockedProfile(userId); + } catch (RemoteException e) { + } + } + /** * Handle message sent by {@link #showLocked}. * @see #SHOW diff --git a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java index 57db3a6acba2..03c2a0bc505a 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/qs/customize/TileAdapter.java @@ -17,6 +17,7 @@ package com.android.systemui.qs.customize; import android.content.Context; import android.graphics.Canvas; import android.graphics.drawable.ColorDrawable; +import android.os.Handler; import android.support.v4.view.ViewCompat; import android.support.v7.widget.GridLayoutManager.SpanSizeLookup; import android.support.v7.widget.RecyclerView; @@ -51,6 +52,7 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta private final Context mContext; + private final Handler mHandler = new Handler(); private final List<TileInfo> mTiles = new ArrayList<>(); private final ItemTouchHelper mItemTouchHelper; private int mDividerIndex; @@ -262,7 +264,12 @@ public class TileAdapter extends RecyclerView.Adapter<Holder> implements TileSta mCurrentDrag = (Holder) viewHolder; mCurrentDrag.startDrag(); } - notifyItemChanged(mDividerIndex); + mHandler.post(new Runnable() { + @Override + public void run() { + notifyItemChanged(mDividerIndex); + } + }); } @Override diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java index db686a83f5e5..9156f3a6f726 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java @@ -75,7 +75,8 @@ public class CustomTile extends QSTile<QSTile.State> { mUser = ActivityManager.getCurrentUser(); try { PackageManager pm = mContext.getPackageManager(); - ServiceInfo info = pm.getServiceInfo(mComponent, 0); + ServiceInfo info = pm.getServiceInfo(mComponent, + PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE); mTile.setIcon(android.graphics.drawable.Icon .createWithResource(mComponent.getPackageName(), info.icon)); mTile.setLabel(info.loadLabel(pm)); @@ -88,6 +89,17 @@ public class CustomTile extends QSTile<QSTile.State> { } } + @Override + public boolean isAvailable() { + try { + ServiceInfo info = mContext.getPackageManager().getServiceInfo(mComponent, + PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE); + return true; + } catch (Exception e) { + return false; + } + } + public int getUser() { return mUser; } @@ -211,11 +223,15 @@ public class CustomTile extends QSTile<QSTile.State> { @Override protected void handleUpdateState(State state, Object arg) { Drawable drawable = mTile.getIcon().loadDrawable(mContext); - int color = mContext.getColor(getColor(mTile.getState())); + int tileState = mTile.getState(); + if (mServiceManager.hasPendingBind()) { + tileState = Tile.STATE_UNAVAILABLE; + } + int color = mContext.getColor(getColor(tileState)); drawable.setTint(color); state.icon = new DrawableIcon(drawable); state.label = mTile.getLabel(); - if (mTile.getState() == Tile.STATE_UNAVAILABLE) { + if (tileState == Tile.STATE_UNAVAILABLE) { state.label = new SpannableStringBuilder().append(state.label, new ForegroundColorSpan(color), SpannableStringBuilder.SPAN_INCLUSIVE_INCLUSIVE); diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java index 2aad16108f50..8910d44e6488 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileLifecycleManager.java @@ -249,6 +249,8 @@ public class TileLifecycleManager extends BroadcastReceiver implements filter.addAction(Intent.ACTION_PACKAGE_CHANGED); filter.addDataScheme("package"); mContext.registerReceiverAsUser(this, mUser, filter, null, mHandler); + filter = new IntentFilter(Intent.ACTION_USER_UNLOCKED); + mContext.registerReceiverAsUser(this, mUser, filter, null, mHandler); mReceiverRegistered = true; } @@ -261,10 +263,12 @@ public class TileLifecycleManager extends BroadcastReceiver implements @Override public void onReceive(Context context, Intent intent) { if (DEBUG) Log.d(TAG, "onReceive: " + intent); - Uri data = intent.getData(); - String pkgName = data.getEncodedSchemeSpecificPart(); - if (!Objects.equal(pkgName, mIntent.getComponent().getPackageName())) { - return; + if (!Intent.ACTION_USER_UNLOCKED.equals(intent.getAction())) { + Uri data = intent.getData(); + String pkgName = data.getEncodedSchemeSpecificPart(); + if (!Objects.equal(pkgName, mIntent.getComponent().getPackageName())) { + return; + } } stopPackageListening(); if (mBound) { diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java index 5cf1e215c871..664ddd6f00a0 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServiceManager.java @@ -53,6 +53,9 @@ public class TileServiceManager { private long mLastUpdate; private int mType; private boolean mShowingDialog; + // Whether we have a pending bind going out to the service without a response yet. + // This defaults to true to ensure tiles start out unavailable. + private boolean mPendingBind = true; TileServiceManager(TileServices tileServices, Handler handler, ComponentName component) { this(tileServices, handler, new TileLifecycleManager(handler, @@ -132,11 +135,20 @@ public class TileServiceManager { } } + public boolean hasPendingBind() { + return mPendingBind; + } + + public void clearPendingBind() { + mPendingBind = false; + } + private void bindService() { if (mBound) { Log.e(TAG, "Service already bound"); return; } + mPendingBind = true; mBound = true; mJustBound = true; mHandler.postDelayed(mJustBoundOver, MIN_BIND_TIME); diff --git a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java index bfa4a32119c8..5bb2a3588acf 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java +++ b/packages/SystemUI/src/com/android/systemui/qs/external/TileServices.java @@ -182,7 +182,9 @@ public class TileServices extends IQSService.Stub { CustomTile customTile = getTileForComponent(componentName); if (customTile != null) { synchronized (mServices) { - mServices.get(customTile).setLastUpdate(System.currentTimeMillis()); + final TileServiceManager tileServiceManager = mServices.get(customTile); + tileServiceManager.clearPendingBind(); + tileServiceManager.setLastUpdate(System.currentTimeMillis()); } customTile.updateState(tile); customTile.refreshState(); @@ -190,6 +192,20 @@ public class TileServices extends IQSService.Stub { } @Override + public void onStartSuccessful(Tile tile) { + ComponentName componentName = tile.getComponentName(); + verifyCaller(componentName.getPackageName()); + CustomTile customTile = getTileForComponent(componentName); + if (customTile != null) { + synchronized (mServices) { + final TileServiceManager tileServiceManager = mServices.get(customTile); + tileServiceManager.clearPendingBind(); + } + customTile.refreshState(); + } + } + + @Override public void onShowDialog(Tile tile) { ComponentName componentName = tile.getComponentName(); verifyCaller(componentName.getPackageName()); diff --git a/packages/SystemUI/src/com/android/systemui/recents/Recents.java b/packages/SystemUI/src/com/android/systemui/recents/Recents.java index 2b6ed445a810..da07aecd2c0b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/Recents.java +++ b/packages/SystemUI/src/com/android/systemui/recents/Recents.java @@ -17,6 +17,7 @@ package com.android.systemui.recents; import android.app.ActivityManager; +import android.app.UiModeManager; import android.content.ComponentName; import android.content.ContentResolver; import android.content.Context; @@ -53,6 +54,7 @@ import com.android.systemui.recents.events.component.ScreenPinningRequestEvent; import com.android.systemui.recents.events.ui.RecentsDrawnEvent; import com.android.systemui.recents.misc.SystemServicesProxy; import com.android.systemui.recents.model.RecentsTaskLoader; +import com.android.systemui.recents.tv.RecentsTvImpl; import java.util.ArrayList; @@ -182,7 +184,13 @@ public class Recents extends SystemUI sTaskLoader = new RecentsTaskLoader(mContext); sConfiguration = new RecentsConfiguration(mContext); mHandler = new Handler(); - mImpl = new RecentsImpl(mContext); + UiModeManager uiModeManager = (UiModeManager) mContext. + getSystemService(Context.UI_MODE_SERVICE); + if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) { + mImpl = new RecentsTvImpl(mContext); + } else { + mImpl = new RecentsImpl(mContext); + } // Check if there is a recents override package if ("userdebug".equals(Build.TYPE) || "eng".equals(Build.TYPE)) { diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java index f33ef654eaf7..aab45b5d02f6 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsActivity.java @@ -749,7 +749,7 @@ public class RecentsActivity extends Activity implements ViewTreeObserver.OnPreD public final void onBusEvent(AllTaskViewsDismissedEvent event) { SystemServicesProxy ssp = Recents.getSystemServices(); if (ssp.hasDockedTask()) { - mRecentsView.showEmptyView(R.string.recents_empty_message_dismissed_all); + mRecentsView.showEmptyView(event.msgResId); } else { // Just go straight home (no animation necessary because there are no more task views) dismissRecentsToHome(false /* animateTaskViews */); diff --git a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java index 9be24def0da4..880fe10e2b79 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java +++ b/packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java @@ -21,12 +21,10 @@ import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID; import android.app.ActivityManager; import android.app.ActivityOptions; import android.app.ITaskStackListener; -import android.app.UiModeManager; import android.appwidget.AppWidgetProviderInfo; import android.content.ActivityNotFoundException; import android.content.Context; import android.content.Intent; -import android.content.res.Configuration; import android.content.res.Resources; import android.graphics.Bitmap; import android.graphics.Canvas; @@ -66,7 +64,6 @@ import com.android.systemui.recents.model.RecentsTaskLoader; import com.android.systemui.recents.model.Task; import com.android.systemui.recents.model.TaskGrouping; import com.android.systemui.recents.model.TaskStack; -import com.android.systemui.recents.tv.views.TaskCardView; import com.android.systemui.recents.views.TaskStackLayoutAlgorithm; import com.android.systemui.recents.views.TaskStackView; import com.android.systemui.recents.views.TaskStackViewScroller; @@ -96,10 +93,6 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener public final static String RECENTS_PACKAGE = "com.android.systemui"; public final static String RECENTS_ACTIVITY = "com.android.systemui.recents.RecentsActivity"; - public final static String RECENTS_TV_ACTIVITY = "com.android.systemui.recents.tv.RecentsTvActivity"; - - //Used to store tv or non-tv activty for use in creating intents. - private final String mRecentsIntentActivityName; /** * An implementation of ITaskStackListener, that allows us to listen for changes to the system @@ -158,16 +151,15 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener } } - private static RecentsTaskLoadPlan sInstanceLoadPlan; + protected static RecentsTaskLoadPlan sInstanceLoadPlan; - Context mContext; - Handler mHandler; + protected Context mContext; + protected Handler mHandler; TaskStackListenerImpl mTaskStackListener; RecentsAppWidgetHost mAppWidgetHost; - boolean mCanReuseTaskStackViews = true; + protected boolean mCanReuseTaskStackViews = true; boolean mDraggingInRecents; boolean mLaunchedWhileDocking; - private boolean mIsRunningOnTv; // Task launching Rect mSearchBarBounds = new Rect(); @@ -182,11 +174,11 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener // Header (for transition) TaskViewHeader mHeaderBar; final Object mHeaderBarLock = new Object(); - TaskStackView mDummyStackView; + protected TaskStackView mDummyStackView; // Variables to keep track of if we need to start recents after binding - boolean mTriggeredFromAltTab; - long mLastToggleTime; + protected boolean mTriggeredFromAltTab; + protected long mLastToggleTime; DozeTrigger mFastAltTabTrigger = new DozeTrigger(FAST_ALT_TAB_DELAY_MS, new Runnable() { @Override public void run() { @@ -197,7 +189,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener } }); - Bitmap mThumbnailTransitionBitmapCache; + protected Bitmap mThumbnailTransitionBitmapCache; Task mThumbnailTransitionBitmapCacheKey; public RecentsImpl(Context context) { @@ -227,16 +219,6 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener launchOpts.numVisibleTaskThumbnails = loader.getThumbnailCacheSize(); launchOpts.onlyLoadForCache = true; loader.loadTasks(mContext, plan, launchOpts); - - //Manager used to determine if we are running on tv or not - UiModeManager uiModeManager = (UiModeManager) mContext.getSystemService(Context.UI_MODE_SERVICE); - if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) { - mRecentsIntentActivityName = RECENTS_TV_ACTIVITY; - mIsRunningOnTv = true; - } else { - mRecentsIntentActivityName = RECENTS_ACTIVITY; - mIsRunningOnTv = false; - } } public void onBootCompleted() { @@ -729,7 +711,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener /** * Creates the activity options for a unknown state->recents transition. */ - private ActivityOptions getUnknownTransitionActivityOptions() { + protected ActivityOptions getUnknownTransitionActivityOptions() { return ActivityOptions.makeCustomAnimation(mContext, R.anim.recents_from_unknown_enter, R.anim.recents_from_unknown_exit, @@ -739,7 +721,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener /** * Creates the activity options for a home->recents transition. */ - private ActivityOptions getHomeTransitionActivityOptions(boolean fromSearchHome) { + protected ActivityOptions getHomeTransitionActivityOptions(boolean fromSearchHome) { if (fromSearchHome) { return ActivityOptions.makeCustomAnimation(mContext, R.anim.recents_from_search_launcher_enter, @@ -797,22 +779,6 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener } } - /** - * Creates the activity options for an app->recents transition on TV. - */ - private ActivityOptions getThumbnailTransitionActivityOptionsForTV( - ActivityManager.RunningTaskInfo topTask) { - Bitmap thumbnail = mThumbnailTransitionBitmapCache; - Rect rect = TaskCardView.getStartingCardThumbnailRect(mContext); - if (thumbnail != null) { - return ActivityOptions.makeThumbnailAspectScaleDownAnimation(mDummyStackView, - null, (int) rect.left, (int) rect.top, - (int) rect.width(), (int) rect.height(), mHandler, null); - } - // If both the screenshot and thumbnail fails, then just fall back to the default transition - return getUnknownTransitionActivityOptions(); - } - private Bitmap getThumbnailBitmap(ActivityManager.RunningTaskInfo topTask, Task toTask, TaskViewTransform toTransform) { Bitmap thumbnail; @@ -888,15 +854,10 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener /** * Shows the recents activity */ - private void startRecentsActivity(ActivityManager.RunningTaskInfo topTask, + protected void startRecentsActivity(ActivityManager.RunningTaskInfo topTask, boolean isTopTaskHome, boolean animate) { RecentsTaskLoader loader = Recents.getTaskLoader(); - // If we are on TV, divert to a different helper method - if (mIsRunningOnTv) { - setUpAndStartTvRecents(topTask, isTopTaskHome, animate); - return; - } // In the case where alt-tab is triggered, we never get a preloadRecents() call, so we // should always preload the tasks now. If we are dragging in recents, reload them as // the stacks might have changed. @@ -972,90 +933,6 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener } /** - * Used to set up the animations of Tv Recents, then start the Recents Activity. - * TODO: Add the Transitions for Home -> Recents TV - * TODO: Shift Transition code to separate class under /tv directory and access - * from here - */ - private void setUpAndStartTvRecents(ActivityManager.RunningTaskInfo topTask, - boolean isTopTaskHome, boolean animate) { - RecentsTaskLoader loader = Recents.getTaskLoader(); - - // In the case where alt-tab is triggered, we never get a preloadRecents() call, so we - // should always preload the tasks now. If we are dragging in recents, reload them as - // the stacks might have changed. - if (mLaunchedWhileDocking || mTriggeredFromAltTab || sInstanceLoadPlan == null) { - // Create a new load plan if preloadRecents() was never triggered - sInstanceLoadPlan = loader.createLoadPlan(mContext); - } - if (mLaunchedWhileDocking || mTriggeredFromAltTab || !sInstanceLoadPlan.hasTasks()) { - loader.preloadTasks(sInstanceLoadPlan, topTask.id, isTopTaskHome); - } - TaskStack stack = sInstanceLoadPlan.getTaskStack(); - - // Update the header bar if necessary - updateHeaderBarLayout(false /* tryAndBindSearchWidget */, stack); - - // Prepare the dummy stack for the transition - TaskStackLayoutAlgorithm.VisibilityReport stackVr = - mDummyStackView.computeStackVisibilityReport(); - - if (!animate) { - ActivityOptions opts = ActivityOptions.makeCustomAnimation(mContext, -1, -1); - startRecentsActivity(topTask, opts, false /* fromHome */, - false /* fromSearchHome */, false /* fromThumbnail*/, stackVr); - return; - } - - boolean hasRecentTasks = stack.getTaskCount() > 0; - boolean useThumbnailTransition = (topTask != null) && !isTopTaskHome && hasRecentTasks; - - if (useThumbnailTransition) { - // Try starting with a thumbnail transition - ActivityOptions opts = getThumbnailTransitionActivityOptionsForTV(topTask); - if (opts != null) { - startRecentsActivity(topTask, opts, false /* fromHome */, - false /* fromSearchHome */, true /* fromThumbnail */, stackVr); - } else { - // Fall through below to the non-thumbnail transition - useThumbnailTransition = false; - } - } - - if (!useThumbnailTransition) { - // If there is no thumbnail transition, but is launching from home into recents, then - // use a quick home transition and do the animation from home - if (hasRecentTasks) { - SystemServicesProxy ssp = Recents.getSystemServices(); - String homeActivityPackage = ssp.getHomeActivityPackageName(); - String searchWidgetPackage = null; - if (RecentsDebugFlags.Static.EnableSearchBar) { - searchWidgetPackage = Prefs.getString(mContext, - Prefs.Key.OVERVIEW_SEARCH_APP_WIDGET_PACKAGE, null); - } else { - AppWidgetProviderInfo searchWidgetInfo = ssp.resolveSearchAppWidget(); - if (searchWidgetInfo != null) { - searchWidgetPackage = searchWidgetInfo.provider.getPackageName(); - } - } - - // Determine whether we are coming from a search owned home activity - boolean fromSearchHome = (homeActivityPackage != null) && - homeActivityPackage.equals(searchWidgetPackage); - ActivityOptions opts = getHomeTransitionActivityOptions(fromSearchHome); - startRecentsActivity(topTask, opts, true /* fromHome */, fromSearchHome, - false /* fromThumbnail */, stackVr); - } else { - // Otherwise we do the normal fade from an unknown source - ActivityOptions opts = getUnknownTransitionActivityOptions(); - startRecentsActivity(topTask, opts, true /* fromHome */, - false /* fromSearchHome */, false /* fromThumbnail */, stackVr); - } - } - mLastToggleTime = SystemClock.elapsedRealtime(); - } - - /** * Starts the recents activity. */ private void startRecentsActivity(ActivityManager.RunningTaskInfo topTask, @@ -1078,7 +955,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener launchState.launchedWhileDocking = mLaunchedWhileDocking; Intent intent = new Intent(); - intent.setClassName(RECENTS_PACKAGE, mRecentsIntentActivityName); + intent.setClassName(RECENTS_PACKAGE, RECENTS_ACTIVITY); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS | Intent.FLAG_ACTIVITY_TASK_ON_HOME); diff --git a/packages/SystemUI/src/com/android/systemui/recents/events/ui/AllTaskViewsDismissedEvent.java b/packages/SystemUI/src/com/android/systemui/recents/events/ui/AllTaskViewsDismissedEvent.java index cf74519624ea..0352161be570 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/events/ui/AllTaskViewsDismissedEvent.java +++ b/packages/SystemUI/src/com/android/systemui/recents/events/ui/AllTaskViewsDismissedEvent.java @@ -22,5 +22,10 @@ import com.android.systemui.recents.events.EventBus; * This is sent whenever all the task views in a stack have been dismissed. */ public class AllTaskViewsDismissedEvent extends EventBus.Event { - // Simple event + + public final int msgResId; + + public AllTaskViewsDismissedEvent(int msgResId) { + this.msgResId = msgResId; + } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java index 5eeda72637ea..16385c9ab358 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/recents/history/RecentsHistoryAdapter.java @@ -245,7 +245,7 @@ public class RecentsHistoryAdapter extends RecyclerView.Adapter<RecentsHistoryAd if (row.getViewType() == TASK_ROW_VIEW_TYPE) { TaskRow taskRow = (TaskRow) row; Task task = taskRow.task; - mStack.removeTask(task, AnimationProps.IMMEDIATE); + mStack.removeTask(task, AnimationProps.IMMEDIATE, false /* fromDockGesture */); EventBus.getDefault().send(new DeleteTaskDataEvent(task)); i = removeTaskRow(i); } @@ -326,7 +326,7 @@ public class RecentsHistoryAdapter extends RecyclerView.Adapter<RecentsHistoryAd public void onTaskRemoved(Task task, int position) { // Since this is removed from the history, we need to update the stack as well to ensure // that the model is correct. Since the stack is hidden, we can update it immediately. - mStack.removeTask(task, AnimationProps.IMMEDIATE); + mStack.removeTask(task, AnimationProps.IMMEDIATE, false /* fromDockGesture */); removeTaskRow(position); if (mRows.isEmpty()) { dismissHistory(); diff --git a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java index 532e79661c6a..330d138ccedb 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java +++ b/packages/SystemUI/src/com/android/systemui/recents/misc/SystemServicesProxy.java @@ -47,7 +47,6 @@ import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.hardware.display.DisplayManager; import android.os.Bundle; import android.os.ParcelFileDescriptor; import android.os.RemoteException; @@ -73,6 +72,7 @@ import com.android.systemui.Prefs; import com.android.systemui.R; import com.android.systemui.recents.RecentsDebugFlags; import com.android.systemui.recents.RecentsImpl; +import com.android.systemui.recents.tv.RecentsTvImpl; import java.io.IOException; import java.util.ArrayList; @@ -94,12 +94,18 @@ public class SystemServicesProxy { final static String TAG = "SystemServicesProxy"; final static BitmapFactory.Options sBitmapOptions; - static { sBitmapOptions = new BitmapFactory.Options(); sBitmapOptions.inMutable = true; } + final static List<String> sRecentsBlacklist; + static { + sRecentsBlacklist = new ArrayList<>(); + sRecentsBlacklist.add("com.android.systemui.tv.pip.PipOnboardingActivity"); + sRecentsBlacklist.add("com.android.systemui.tv.pip.PipMenuActivity"); + } + AccessibilityManager mAccm; ActivityManager mAm; IActivityManager mIam; @@ -227,12 +233,13 @@ public class SystemServicesProxy { // Check the first non-recents task, include this task even if it is marked as excluded // from recents if we are currently in the app. In other words, only remove excluded - // tasks if it is not the first active task. + // tasks if it is not the first active task, and not in the blacklist. boolean isExcluded = (t.baseIntent.getFlags() & Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) == Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS; + boolean isBlackListed = sRecentsBlacklist.contains(t.realActivity.getClassName()); // Filter out recent tasks from managed profiles which are in quiet mode. isExcluded |= quietProfileIds.contains(t.userId); - if (isExcluded && (isTopTaskHome || !isFirstValidTask)) { + if (isBlackListed || (isExcluded && (isTopTaskHome || !isFirstValidTask))) { iter.remove(); continue; } @@ -280,7 +287,7 @@ public class SystemServicesProxy { // Check if the front most activity is recents if ((topActivity.getPackageName().equals(RecentsImpl.RECENTS_PACKAGE) && (topActivity.getClassName().equals(RecentsImpl.RECENTS_ACTIVITY) || - topActivity.getClassName().equals(RecentsImpl.RECENTS_TV_ACTIVITY)))) { + topActivity.getClassName().equals(RecentsTvImpl.RECENTS_TV_ACTIVITY)))) { if (isHomeTopMost != null) { isHomeTopMost.value = false; } diff --git a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java index 4d1c552f2687..193bfffffd9f 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java +++ b/packages/SystemUI/src/com/android/systemui/recents/model/TaskStack.java @@ -219,7 +219,7 @@ public class TaskStack { * Notifies when a task has been removed from the stack. */ void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask, - Task newFrontMostTask, AnimationProps animation); + Task newFrontMostTask, AnimationProps animation, boolean fromDockGesture); /** * Notifies when a task has been removed from the history. @@ -513,14 +513,15 @@ public class TaskStack { * Removes a task from the stack, with an additional {@param animation} hint to the callbacks on * how they should update themselves. */ - public void removeTask(Task t, AnimationProps animation) { + public void removeTask(Task t, AnimationProps animation, boolean fromDockGesture) { if (mStackTaskList.contains(t)) { boolean wasFrontMostTask = (getStackFrontMostTask(false /* includeFreeform */) == t); removeTaskImpl(mStackTaskList, t); Task newFrontMostTask = getStackFrontMostTask(false /* includeFreeform */); if (mCb != null) { // Notify that a task has been removed - mCb.onStackTaskRemoved(this, t, wasFrontMostTask, newFrontMostTask, animation); + mCb.onStackTaskRemoved(this, t, wasFrontMostTask, newFrontMostTask, animation, + fromDockGesture); } } else if (mHistoryTaskList.contains(t)) { removeTaskImpl(mHistoryTaskList, t); @@ -558,9 +559,9 @@ public class TaskStack { if (notifyStackChanges) { // If we are notifying, then remove the task now, otherwise the raw task list // will be reset at the end of this method - removeTask(task, AnimationProps.IMMEDIATE); + removeTask(task, AnimationProps.IMMEDIATE, false /* fromDockGesture */); mCb.onStackTaskRemoved(this, task, i == (taskCount - 1), null, - AnimationProps.IMMEDIATE); + AnimationProps.IMMEDIATE, false /* fromDockGesture */); } } task.setGroup(null); diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java b/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java index dae522f2c072..960bd8c4af85 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvActivity.java @@ -85,9 +85,13 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { private PipManager mPipManager; private PipManager.Listener mPipListener = new PipManager.Listener() { @Override + public void onPipEntered() { + updatePipUI(); + } + + @Override public void onPipActivityClosed() { - mPipView.setVisibility(View.GONE); - mPipShadeView.setVisibility(View.GONE); + updatePipUI(); } @Override @@ -102,6 +106,7 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { @Override public void onMediaControllerChanged() { } }; + private boolean mHasPip; /** * A common Runnable to finish Recents by launching Home with an animation depending on the @@ -266,6 +271,10 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { homeIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED); mFinishLaunchHomeRunnable = new FinishRecentsRunnable(homeIntent); + + mHasPip = false; + updatePipUI(); + mPipManager.addListener(mPipListener); } @Override @@ -296,34 +305,6 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { SystemServicesProxy ssp = Recents.getSystemServices(); EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, true)); - if (mPipManager.isPipShown()) { - // Place mPipView at the PIP bounds for fine tuned focus handling. - Rect pipBounds = mPipManager.getPipBounds(); - LayoutParams lp = (LayoutParams) mPipView.getLayoutParams(); - lp.width = pipBounds.width(); - lp.height = pipBounds.height(); - lp.leftMargin = pipBounds.left; - lp.topMargin = pipBounds.top; - mPipView.setLayoutParams(lp); - - mPipView.setVisibility(View.VISIBLE); - mPipView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - mPipManager.resizePinnedStack(PipManager.STATE_PIP_MENU); - } - }); - mPipView.setOnFocusChangeListener(new View.OnFocusChangeListener() { - @Override - public void onFocusChange(View v, boolean hasFocus) { - mPipManager.onPipViewFocusChangedInRecents(hasFocus); - mPipShadeView.setVisibility(hasFocus ? View.VISIBLE : View.INVISIBLE); - } - }); - mPipManager.addListener(mPipListener); - } else { - mPipView.setVisibility(View.GONE); - } mPipManager.onRecentsStarted(); // Give focus to the recents row whenever its visible to an user. mRecentsView.requestFocus(); @@ -340,7 +321,6 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { super.onStop(); mPipManager.onRecentsStopped(); - mPipManager.removeListener(mPipListener); mIgnoreAltTabRelease = false; // Notify that recents is now hidden EventBus.getDefault().send(new RecentsVisibilityChangedEvent(this, false)); @@ -357,6 +337,7 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { protected void onDestroy() { super.onDestroy(); + mPipManager.removeListener(mPipListener); // In the case that the activity finished on startup, just skip the unregistration below if (mFinishedOnStartup) { return; @@ -480,4 +461,40 @@ public class RecentsTvActivity extends Activity implements OnPreDrawListener { }); return true; } + + private void updatePipUI() { + if (mHasPip == mPipManager.isPipShown()) { + return; + } + mHasPip = mPipManager.isPipShown(); + if (mHasPip) { + // Place mPipView at the PIP bounds for fine tuned focus handling. + Rect pipBounds = mPipManager.getPipBounds(); + LayoutParams lp = (LayoutParams) mPipView.getLayoutParams(); + lp.width = pipBounds.width(); + lp.height = pipBounds.height(); + lp.leftMargin = pipBounds.left; + lp.topMargin = pipBounds.top; + mPipView.setLayoutParams(lp); + + mPipView.setVisibility(View.VISIBLE); + mPipView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + mPipManager.resizePinnedStack(PipManager.STATE_PIP_MENU); + } + }); + mPipView.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + mPipManager.onPipViewFocusChangedInRecents(hasFocus); + mPipShadeView.setVisibility(hasFocus ? View.VISIBLE : View.INVISIBLE); + } + }); + mPipShadeView.setVisibility(View.GONE); + } else { + mPipView.setVisibility(View.GONE); + mPipShadeView.setVisibility(View.GONE); + } + } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvImpl.java b/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvImpl.java new file mode 100644 index 000000000000..9fd5d55ed722 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/RecentsTvImpl.java @@ -0,0 +1,139 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.systemui.recents.tv; + +import android.app.ActivityManager; +import android.app.ActivityOptions; +import android.content.Context; +import android.content.Intent; +import android.graphics.Bitmap; +import android.graphics.Rect; +import android.os.SystemClock; +import android.os.UserHandle; +import com.android.systemui.recents.*; +import com.android.systemui.recents.events.EventBus; +import com.android.systemui.recents.events.activity.RecentsActivityStartingEvent; +import com.android.systemui.recents.misc.SystemServicesProxy; +import com.android.systemui.recents.model.RecentsTaskLoader; +import com.android.systemui.recents.model.TaskStack; +import com.android.systemui.recents.tv.views.TaskCardView; + +public class RecentsTvImpl extends RecentsImpl{ + public final static String RECENTS_TV_ACTIVITY = + "com.android.systemui.recents.tv.RecentsTvActivity"; + + public RecentsTvImpl(Context context) { + super(context); + } + + @Override + protected void startRecentsActivity(ActivityManager.RunningTaskInfo topTask, + boolean isTopTaskHome, boolean animate) { + RecentsTaskLoader loader = Recents.getTaskLoader(); + + // In the case where alt-tab is triggered, we never get a preloadRecents() call, so we + // should always preload the tasks now. If we are dragging in recents, reload them as + // the stacks might have changed. + if (mTriggeredFromAltTab || sInstanceLoadPlan == null) { + // Create a new load plan if preloadRecents() was never triggered + sInstanceLoadPlan = loader.createLoadPlan(mContext); + } + if (mTriggeredFromAltTab || !sInstanceLoadPlan.hasTasks()) { + loader.preloadTasks(sInstanceLoadPlan, topTask.id, isTopTaskHome); + } + TaskStack stack = sInstanceLoadPlan.getTaskStack(); + + if (!animate) { + ActivityOptions opts = ActivityOptions.makeCustomAnimation(mContext, -1, -1); + startRecentsActivity(topTask, opts, false /* fromHome */, false /* fromThumbnail*/); + return; + } + + boolean hasRecentTasks = stack.getTaskCount() > 0; + boolean useThumbnailTransition = (topTask != null) && !isTopTaskHome && hasRecentTasks; + + if (useThumbnailTransition) { + // Try starting with a thumbnail transition + ActivityOptions opts = getThumbnailTransitionActivityOptionsForTV(topTask); + if (opts != null) { + startRecentsActivity(topTask, opts, false /* fromHome */, true /* fromThumbnail */); + } else { + // Fall through below to the non-thumbnail transition + useThumbnailTransition = false; + } + } + + if (!useThumbnailTransition) { + // If there is no thumbnail transition, but is launching from home into recents, then + // use a quick home transition and do the animation from home + if (hasRecentTasks) { + SystemServicesProxy ssp = Recents.getSystemServices(); + ActivityOptions opts = getHomeTransitionActivityOptions(false); + startRecentsActivity(topTask, opts, true /* fromHome */, false /* fromThumbnail */); + } else { + // Otherwise we do the normal fade from an unknown source + ActivityOptions opts = getUnknownTransitionActivityOptions(); + startRecentsActivity(topTask, opts, true /* fromHome */, false /* fromThumbnail */); + } + } + mLastToggleTime = SystemClock.elapsedRealtime(); + } + + protected void startRecentsActivity(ActivityManager.RunningTaskInfo topTask, + ActivityOptions opts, boolean fromHome, boolean fromThumbnail) { + // Update the configuration based on the launch options + RecentsConfiguration config = Recents.getConfiguration(); + RecentsActivityLaunchState launchState = config.getLaunchState(); + launchState.launchedFromHome = fromHome; + launchState.launchedFromSearchHome = false; + launchState.launchedFromApp = fromThumbnail; + launchState.launchedToTaskId = (topTask != null) ? topTask.id : -1; + launchState.launchedWithAltTab = mTriggeredFromAltTab; + launchState.launchedReuseTaskStackViews = mCanReuseTaskStackViews; + launchState.launchedHasConfigurationChanged = false; + + Intent intent = new Intent(); + intent.setClassName(RECENTS_PACKAGE, RECENTS_TV_ACTIVITY); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK + | Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS + | Intent.FLAG_ACTIVITY_TASK_ON_HOME); + + if (opts != null) { + mContext.startActivityAsUser(intent, opts.toBundle(), UserHandle.CURRENT); + } else { + mContext.startActivityAsUser(intent, UserHandle.CURRENT); + } + mCanReuseTaskStackViews = true; + EventBus.getDefault().send(new RecentsActivityStartingEvent()); + } + + /** + * Creates the activity options for an app->recents transition on TV. + */ + private ActivityOptions getThumbnailTransitionActivityOptionsForTV( + ActivityManager.RunningTaskInfo topTask) { + Bitmap thumbnail = mThumbnailTransitionBitmapCache; + Rect rect = TaskCardView.getStartingCardThumbnailRect(mContext); + if (thumbnail != null) { + return ActivityOptions.makeThumbnailAspectScaleDownAnimation(mDummyStackView, + null, (int) rect.left, (int) rect.top, + (int) rect.width(), (int) rect.height(), mHandler, null); + } + // If both the screenshot and thumbnail fails, then just fall back to the default transition + return getUnknownTransitionActivityOptions(); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/DismissAnimationsHolder.java b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/DismissAnimationsHolder.java new file mode 100644 index 000000000000..8996d0b2e8c2 --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/DismissAnimationsHolder.java @@ -0,0 +1,80 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.systemui.recents.tv.animations; + + +import android.animation.Animator; +import android.content.res.Resources; +import android.support.v4.view.animation.FastOutSlowInInterpolator; +import android.view.View; +import android.widget.LinearLayout; +import com.android.systemui.recents.tv.views.TaskCardView; + +import com.android.systemui.R; + +public class DismissAnimationsHolder { + private LinearLayout mDismissArea; + private LinearLayout mTaskCardView; + private FastOutSlowInInterpolator mFastOutSlowIn; + private int mCardYDelta; + private long mShortDuration; + private long mLongDuration; + + public DismissAnimationsHolder(TaskCardView taskCardView) { + mTaskCardView = (LinearLayout) taskCardView.findViewById(R.id.recents_tv_card); + mDismissArea = (LinearLayout) taskCardView.findViewById(R.id.card_dismiss); + mFastOutSlowIn = new FastOutSlowInInterpolator(); + + Resources res = taskCardView.getResources(); + mCardYDelta = res.getDimensionPixelOffset(R.dimen.recents_tv_dismiss_shift_down); + mShortDuration = res.getInteger(R.integer.dismiss_short_duration); + mLongDuration = res.getInteger(R.integer.dismiss_long_duration); + } + + public void startEnterAnimation() { + mDismissArea.animate().setDuration(mShortDuration); + mDismissArea.animate().setInterpolator(mFastOutSlowIn); + mDismissArea.animate().alpha(1.0f); + + mTaskCardView.animate().setDuration(mShortDuration); + mTaskCardView.animate().setInterpolator(mFastOutSlowIn); + mTaskCardView.animate().translationYBy(mCardYDelta); + mTaskCardView.animate().alpha(0.5f); + } + + public void startExitAnimation() { + mDismissArea.animate().setDuration(mShortDuration); + mDismissArea.animate().setInterpolator(mFastOutSlowIn); + mDismissArea.animate().alpha(0.0f); + + mTaskCardView.animate().setDuration(mShortDuration); + mTaskCardView.animate().setInterpolator(mFastOutSlowIn); + mTaskCardView.animate().translationYBy(-mCardYDelta); + mTaskCardView.animate().alpha(1.0f); + } + + public void startDismissAnimation(Animator.AnimatorListener listener) { + mDismissArea.animate().setDuration(mShortDuration); + mDismissArea.animate().setInterpolator(mFastOutSlowIn); + mDismissArea.animate().alpha(0.0f); + + mTaskCardView.animate().setDuration(mLongDuration); + mTaskCardView.animate().setInterpolator(mFastOutSlowIn); + mTaskCardView.animate().translationYBy(mCardYDelta); + mTaskCardView.animate().alpha(0.0f); + mTaskCardView.animate().setListener(listener); + } +} diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java index 365b29d67676..888561c2172b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/animations/ViewFocusAnimator.java @@ -33,6 +33,8 @@ public class ViewFocusAnimator implements View.OnFocusChangeListener { private final float mSelectedScaleDelta; private final float mUnselectedZ; private final float mSelectedZDelta; + private final float mUnselectedSpacing; + private final float mSelectedSpacingDelta; private final int mAnimDuration; private final Interpolator mFocusInterpolator; @@ -57,6 +59,9 @@ public class ViewFocusAnimator implements View.OnFocusChangeListener { mUnselectedZ = res.getDimensionPixelOffset(R.dimen.recents_tv_unselected_item_z); mSelectedZDelta = res.getDimensionPixelOffset(R.dimen.recents_tv_selected_item_z_delta); + mUnselectedSpacing = res.getDimensionPixelOffset(R.dimen.recents_tv_gird_card_spacing); + mSelectedSpacingDelta = res.getDimensionPixelOffset(R.dimen.recents_tv_gird_focused_card_delta); + mAnimDuration = res.getInteger(R.integer.item_scale_anim_duration); mFocusInterpolator = new AccelerateDecelerateInterpolator(); @@ -85,10 +90,14 @@ public class ViewFocusAnimator implements View.OnFocusChangeListener { float scale = mUnselectedScale + (level * mSelectedScaleDelta); float z = mUnselectedZ + (level * mSelectedZDelta); + float spacing = mUnselectedSpacing + (level * mSelectedSpacingDelta); mTargetView.setScaleX(scale); mTargetView.setScaleY(scale); mTargetView.setZ(z); + + mTargetView.setPadding((int) spacing, mTargetView.getPaddingTop(), + (int) spacing, mTargetView.getPaddingBottom()); } public float getFocusProgress() { diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java index 5775b60ab308..3343aec8891b 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskCardView.java @@ -15,6 +15,7 @@ */ package com.android.systemui.recents.tv.views; +import android.animation.Animator; import android.content.Context; import android.content.res.Resources; import android.graphics.Point; @@ -22,12 +23,14 @@ import android.graphics.Rect; import android.util.AttributeSet; import android.util.TypedValue; import android.view.Display; +import android.view.KeyEvent; import android.view.WindowManager; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; import com.android.systemui.R; +import com.android.systemui.recents.tv.animations.DismissAnimationsHolder; import com.android.systemui.recents.tv.animations.ViewFocusAnimator; import com.android.systemui.recents.model.Task; @@ -37,8 +40,10 @@ public class TaskCardView extends LinearLayout { private TextView mTitleTextView; private ImageView mBadgeView; private Task mTask; + private boolean mDismissState; private ViewFocusAnimator mViewFocusAnimator; + private DismissAnimationsHolder mDismissAnimationsHolder; public TaskCardView(Context context) { this(context, null); @@ -51,6 +56,7 @@ public class TaskCardView extends LinearLayout { public TaskCardView(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); mViewFocusAnimator = new ViewFocusAnimator(this); + mDismissState = false; } @Override @@ -58,6 +64,7 @@ public class TaskCardView extends LinearLayout { mThumbnailView = (ImageView) findViewById(R.id.card_view_thumbnail); mTitleTextView = (TextView) findViewById(R.id.card_title_text); mBadgeView = (ImageView) findViewById(R.id.card_extra_badge); + mDismissAnimationsHolder = new DismissAnimationsHolder(this); } public void init(Task task) { @@ -98,13 +105,23 @@ public class TaskCardView extends LinearLayout { int width = res.getDimensionPixelOffset(R.dimen.recents_tv_card_width); int widthDelta = (int) (width * scale - width); - int height = (int) (res.getDimensionPixelOffset( - R.dimen.recents_tv_screenshot_height) * scale); - int padding = res.getDimensionPixelOffset(R.dimen.recents_tv_grid_row_padding); + int height = res.getDimensionPixelOffset(R.dimen.recents_tv_screenshot_height); + int heightDelta = (int) (height * scale - height); + int topMargin = res.getDimensionPixelOffset(R.dimen.recents_tv_gird_row_top_margin); - int headerHeight = (int) ((res.getDimensionPixelOffset( - R.dimen.recents_tv_card_extra_badge_size) + - res.getDimensionPixelOffset(R.dimen.recents_tv_icon_padding_bottom)) * scale); + int headerHeight = res.getDimensionPixelOffset(R.dimen.recents_tv_card_extra_badge_size) + + res.getDimensionPixelOffset(R.dimen.recents_tv_icon_padding_bottom); + int headerHeightDelta = (int) (headerHeight * scale - headerHeight); + + int dismissAreaHeight = + res.getDimensionPixelOffset(R.dimen.recents_tv_dismiss_icon_top_margin) + + res.getDimensionPixelOffset(R.dimen.recents_tv_dismiss_icon_bottom_margin) + + res.getDimensionPixelOffset(R.dimen.recents_tv_dismiss_icon_size) + + res.getDimensionPixelOffset(R.dimen.recents_tv_dismiss_text_size); + + int dismissAreaHeightDelta = (int) (dismissAreaHeight * scale - dismissAreaHeight); + + int totalHeightDelta = heightDelta + headerHeightDelta + dismissAreaHeightDelta; WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE); Display display = wm.getDefaultDisplay(); @@ -113,9 +130,72 @@ public class TaskCardView extends LinearLayout { int screenWidth = size.x; int screenHeight = size.y; - return new Rect(screenWidth - width - padding - widthDelta / 2, - screenHeight / 2 - height / 2 + headerHeight / 2, - screenWidth - padding + widthDelta / 2, - screenHeight / 2 + height / 2 + headerHeight / 2); + return new Rect(screenWidth / 2 - width / 2 - widthDelta / 2, + topMargin - totalHeightDelta / 2 + (int) (headerHeight * scale), + screenWidth / 2 + width / 2 + widthDelta / 2, + topMargin - totalHeightDelta / 2 + (int) (headerHeight * scale) + + (int) (height * scale)); + } + + @Override + public boolean onKeyDown(int keyCode, KeyEvent event) { + switch (keyCode) { + case KeyEvent.KEYCODE_DPAD_DOWN : { + if (!isInDismissState()) { + setDismissState(true); + return true; + } + break; + } + case KeyEvent.KEYCODE_DPAD_UP : { + if (isInDismissState()) { + setDismissState(false); + return true; + } + break; + } + + //Eat right and left key presses when we are in dismiss state + case KeyEvent.KEYCODE_DPAD_LEFT : { + if (isInDismissState()) { + return true; + } + break; + } + case KeyEvent.KEYCODE_DPAD_RIGHT : { + if (isInDismissState()) { + return true; + } + break; + } + default: + break; + } + return super.onKeyDown(keyCode, event); + } + + private void setDismissState(boolean dismissState) { + if (mDismissState != dismissState) { + mDismissState = dismissState; + if (dismissState) { + mDismissAnimationsHolder.startEnterAnimation(); + } else { + mDismissAnimationsHolder.startExitAnimation(); + } + } + } + + public boolean isInDismissState() { + return mDismissState; + } + + public void startDismissTaskAnimation(Animator.AnimatorListener listener) { + mDismissAnimationsHolder.startDismissAnimation(listener); + } + + @Override + protected void onDetachedFromWindow() { + super.onDetachedFromWindow(); + setDismissState(false); } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java index 4458639acfad..5c2de8e8e708 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalGridView.java @@ -41,7 +41,6 @@ public class TaskStackHorizontalGridView extends HorizontalGridView implements T private ArrayList<TaskCardView> mTaskViews = new ArrayList<>(); private Task mFocusedTask; - public TaskStackHorizontalGridView(Context context) { this(context, null); } @@ -53,7 +52,7 @@ public class TaskStackHorizontalGridView extends HorizontalGridView implements T @Override protected void onAttachedToWindow() { EventBus.getDefault().register(this, RecentsActivity.EVENT_BUS_PRIORITY + 1); - setItemMargin((int) getResources().getDimension(R.dimen.recents_tv_gird_card_spacing)); + setWindowAlignment(WINDOW_ALIGN_NO_EDGE); setImportantForAccessibility(View.IMPORTANT_FOR_ACCESSIBILITY_YES); super.onAttachedToWindow(); } @@ -109,6 +108,13 @@ public class TaskStackHorizontalGridView extends HorizontalGridView implements T } /** + * @return - The focused task card view. + */ + public TaskCardView getFocusedTaskCardView() { + return ((TaskCardView)findFocus()); + } + + /** * @param task * @return Child view for given task */ @@ -135,7 +141,7 @@ public class TaskStackHorizontalGridView extends HorizontalGridView implements T @Override public void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask, - Task newFrontMostTask, AnimationProps animation) { + Task newFrontMostTask, AnimationProps animation, boolean fromDockGesture) { getAdapter().notifyItemRemoved(stack.getStackTasks().indexOf(removedTask)); if (mFocusedTask == removedTask) { resetFocusedTask(removedTask); @@ -144,7 +150,9 @@ public class TaskStackHorizontalGridView extends HorizontalGridView implements T if (mStack.getStackTaskCount() == 0) { boolean shouldFinishActivity = (mStack.getStackTaskCount() == 0); if (shouldFinishActivity) { - EventBus.getDefault().send(new AllTaskViewsDismissedEvent()); + EventBus.getDefault().send(new AllTaskViewsDismissedEvent(fromDockGesture + ? R.string.recents_empty_message + : R.string.recents_empty_message_dismissed_all)); } } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalViewAdapter.java b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalViewAdapter.java index fba424ee2ee3..378871934f70 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalViewAdapter.java +++ b/packages/SystemUI/src/com/android/systemui/recents/tv/views/TaskStackHorizontalViewAdapter.java @@ -15,6 +15,7 @@ */ package com.android.systemui.recents.tv.views; +import android.animation.Animator; import android.app.Activity; import android.support.v7.widget.RecyclerView; import android.util.Log; @@ -25,6 +26,7 @@ import android.view.ViewGroup; import com.android.systemui.R; import com.android.systemui.recents.events.EventBus; import com.android.systemui.recents.events.activity.LaunchTvTaskEvent; +import com.android.systemui.recents.events.ui.DeleteTaskDataEvent; import com.android.systemui.recents.model.Task; import java.util.ArrayList; @@ -39,7 +41,7 @@ public class TaskStackHorizontalViewAdapter extends private static final String TAG = "TaskStackViewAdapter"; private List<Task> mTaskList; - static class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener{ + public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener{ private TaskCardView mTaskCardView; private Task mTask; public ViewHolder(View v) { @@ -58,9 +60,14 @@ public class TaskStackHorizontalViewAdapter extends @Override public void onClick(View v) { try { - EventBus.getDefault().send(new LaunchTvTaskEvent(mTaskCardView, mTask, - null, INVALID_STACK_ID)); - ((Activity)(v.getContext())).finish(); + if (mTaskCardView.isInDismissState()) { + mTaskCardView.startDismissTaskAnimation( + getRemoveAtListener(getAdapterPosition(), mTaskCardView)); + } else { + EventBus.getDefault().send(new LaunchTvTaskEvent(mTaskCardView, mTask, + null, INVALID_STACK_ID)); + ((Activity) (v.getContext())).finish(); + } } catch (Exception e) { Log.e(TAG, v.getContext() .getString(R.string.recents_launch_error_message, mTask.title), e); @@ -97,4 +104,31 @@ public class TaskStackHorizontalViewAdapter extends public int getItemCount() { return mTaskList.size(); } + + private Animator.AnimatorListener getRemoveAtListener(final int position, + final TaskCardView taskCardView) { + return new Animator.AnimatorListener() { + + @Override + public void onAnimationStart(Animator animation) { } + + @Override + public void onAnimationEnd(Animator animation) { + removeAt(position); + EventBus.getDefault().send(new DeleteTaskDataEvent(taskCardView.getTask())); + } + + @Override + public void onAnimationCancel(Animator animation) { } + + @Override + public void onAnimationRepeat(Animator animation) { } + }; + + } + + private void removeAt(int position) { + mTaskList.remove(position); + notifyItemRemoved(position); + } } diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java index 92356736763e..db97e8f95b55 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java @@ -632,7 +632,8 @@ public class RecentsView extends FrameLayout { AnimationProps stackAnim = new AnimationProps( TaskStackView.DEFAULT_SYNC_STACK_DURATION, Interpolators.FAST_OUT_SLOW_IN); - mTaskStackView.getStack().removeTask(event.task, stackAnim); + mTaskStackView.getStack().removeTask(event.task, stackAnim, + true /* fromDockGesture */); } })); diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java index 84590f25149f..33d5bb7b0c99 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/RecentsViewTouchHandler.java @@ -150,8 +150,7 @@ public class RecentsViewTouchHandler { mTaskView.setTranslationY(y); mVisibleDockStates.clear(); - if (ActivityManager.supportsMultiWindow() && - !ssp.hasDockedTask() && mRv.getTaskStack().getTaskCount() > 1) { + if (ActivityManager.supportsMultiWindow() && !ssp.hasDockedTask()) { if (!event.task.isDockable) { Toast.makeText(mRv.getContext(), R.string.recents_drag_non_dockable_task_message, Toast.LENGTH_SHORT).show(); diff --git a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java index 93b5b6c12904..0b20d21d806c 100644 --- a/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java +++ b/packages/SystemUI/src/com/android/systemui/recents/views/TaskStackView.java @@ -1395,7 +1395,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal */ @Override public void onStackTaskRemoved(TaskStack stack, Task removedTask, boolean wasFrontMostTask, - Task newFrontMostTask, AnimationProps animation) { + Task newFrontMostTask, AnimationProps animation, boolean fromDockGesture) { if (mFocusedTask == removedTask) { resetFocusedTask(removedTask); } @@ -1426,7 +1426,9 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal // If there are no remaining tasks, then just close recents if (mStack.getTaskCount() == 0) { - EventBus.getDefault().send(new AllTaskViewsDismissedEvent()); + EventBus.getDefault().send(new AllTaskViewsDismissedEvent(fromDockGesture + ? R.string.recents_empty_message + : R.string.recents_empty_message_dismissed_all)); } } @@ -1599,7 +1601,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal tv.dismissTask(); } else { // Otherwise, remove the task from the stack immediately - mStack.removeTask(t, AnimationProps.IMMEDIATE); + mStack.removeTask(t, AnimationProps.IMMEDIATE, false /* fromDockGesture */); } } } @@ -1937,7 +1939,7 @@ public class TaskStackView extends FrameLayout implements TaskStack.TaskStackCal // Remove the task from the stack mStack.removeTask(task, new AnimationProps(DEFAULT_SYNC_STACK_DURATION, - Interpolators.FAST_OUT_SLOW_IN)); + Interpolators.FAST_OUT_SLOW_IN), false /* fromDockGesture */); } /** diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java index e0156660efbb..132c09f03bdd 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/DividerView.java @@ -83,18 +83,6 @@ public class DividerView extends FrameLayout implements OnTouchListener, private static final int TASK_POSITION_SAME = Integer.MAX_VALUE; /** - * Fraction of the divider position between two snap targets to switch to the full-screen - * target. - */ - private static final float SWITCH_FULLSCREEN_FRACTION = 0.12f; - - /** - * Fraction of the divider position between two snap targets to switch to the larger target - * for the bottom/right app layout. - */ - private static final float BOTTOM_RIGHT_SWITCH_BIGGER_FRACTION = 0.2f; - - /** * How much the background gets scaled when we are in the minimized dock state. */ private static final float MINIMIZE_DOCK_SCALE = 0.375f; @@ -380,10 +368,9 @@ public class DividerView extends FrameLayout implements OnTouchListener, mMoving = true; } if (mMoving && mDockSide != WindowManager.DOCKED_INVALID) { - int position = calculatePosition(x, y); - SnapTarget snapTarget = mSnapAlgorithm.calculateSnapTarget(position, - 0 /* velocity */, false /* hardDismiss */); - resizeStack(calculatePosition(x, y), snapTarget.position, snapTarget); + SnapTarget snapTarget = mSnapAlgorithm.calculateSnapTarget( + mStartPosition, 0 /* velocity */, false /* hardDismiss */); + resizeStack(calculatePosition(x, y), mStartPosition, snapTarget); } break; case MotionEvent.ACTION_UP: @@ -393,6 +380,13 @@ public class DividerView extends FrameLayout implements OnTouchListener, x = (int) event.getRawX(); y = (int) event.getRawY(); + if (mMoving && mDockSide != WindowManager.DOCKED_INVALID) { + int position = calculatePosition(x, y); + SnapTarget snapTarget = mSnapAlgorithm.calculateSnapTarget(position, + 0 /* velocity */, false /* hardDismiss */); + resizeStack(calculatePosition(x, y), snapTarget.position, snapTarget); + } + mVelocityTracker.computeCurrentVelocity(1000); int position = calculatePosition(x, y); stopDragging(position, isHorizontalDivision() ? mVelocityTracker.getYVelocity() @@ -647,12 +641,6 @@ public class DividerView extends FrameLayout implements OnTouchListener, restrictDismissingTaskPosition(taskPosition, mDockSide, taskSnapTarget); int taskPositionOther = restrictDismissingTaskPosition(taskPosition, dockSideInverted, taskSnapTarget); - - taskPositionDocked = minimizeHoles(position, taskPositionDocked, mDockSide, - taskSnapTarget); - taskPositionOther = minimizeHoles(position, taskPositionOther, dockSideInverted, - taskSnapTarget); - calculateBoundsForPosition(taskPositionDocked, mDockSide, mDockedTaskRect); calculateBoundsForPosition(taskPositionOther, dockSideInverted, mOtherTaskRect); mDisplayRect.set(0, 0, mDisplayWidth, mDisplayHeight); @@ -718,51 +706,6 @@ public class DividerView extends FrameLayout implements OnTouchListener, } /** - * Given the current split position and the task position calculated by dragging, this - * method calculates a "better" task position in a sense so holes get smaller while dragging. - * - * @return the new task position - */ - private int minimizeHoles(int position, int taskPosition, int dockSide, - SnapTarget taskSnapTarget) { - if (dockSideTopLeft(dockSide)) { - if (position > taskPosition) { - SnapTarget nextTarget = mSnapAlgorithm.getNextTarget(taskSnapTarget); - - // If the next target is the dismiss end target, switch earlier to make the hole - // smaller. - if (nextTarget != taskSnapTarget - && nextTarget == mSnapAlgorithm.getDismissEndTarget()) { - float t = (float) (position - taskPosition) - / (nextTarget.position - taskPosition); - if (t > SWITCH_FULLSCREEN_FRACTION) { - return nextTarget.position; - } - } - } - } else if (dockSideBottomRight(dockSide)) { - if (position < taskPosition) { - SnapTarget previousTarget = mSnapAlgorithm.getPreviousTarget(taskSnapTarget); - if (previousTarget != taskSnapTarget) { - float t = (float) (taskPosition - position) - / (taskPosition - previousTarget.position); - - // In general, switch a bit earlier (at 20% instead of 50%), but if we are - // dismissing the top, switch really early. - float threshold = previousTarget == mSnapAlgorithm.getDismissStartTarget() - ? SWITCH_FULLSCREEN_FRACTION - : BOTTOM_RIGHT_SWITCH_BIGGER_FRACTION; - if (t > threshold) { - return previousTarget.position; - } - - } - } - } - return taskPosition; - } - - /** * When the snap target is dismissing one side, make sure that the dismissing side doesn't get * 0 size. */ diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java index e312fa2028a5..ef32f7e8777e 100644 --- a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java @@ -100,8 +100,8 @@ public class WindowManagerProxy { @Override public void run() { try { - ActivityManagerNative.getDefault().resizeStack(DOCKED_STACK_ID, null, true, true, - false); + ActivityManagerNative.getDefault().resizeStack( + DOCKED_STACK_ID, null, true, true, false, -1); } catch (RemoteException e) { Log.w(TAG, "Failed to resize stack: " + e); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/AlphaOptimizedImageView.java b/packages/SystemUI/src/com/android/systemui/statusbar/AlphaOptimizedImageView.java index 700ea346e327..ef03d5f7e746 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/AlphaOptimizedImageView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/AlphaOptimizedImageView.java @@ -17,18 +17,14 @@ package com.android.systemui.statusbar; import android.content.Context; -import android.content.res.TypedArray; import android.util.AttributeSet; import android.widget.ImageView; -import com.android.systemui.R; - /** * An ImageView which supports an attribute specifying whether it has overlapping rendering * commands and therefore does not need a layer when alpha is changed. */ public class AlphaOptimizedImageView extends ImageView { - private final boolean mHasOverlappingRendering; public AlphaOptimizedImageView(Context context) { this(context, null /* attrs */); @@ -45,21 +41,10 @@ public class AlphaOptimizedImageView extends ImageView { public AlphaOptimizedImageView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); - - TypedArray a = context.getTheme().obtainStyledAttributes(attrs, - R.styleable.AlphaOptimizedImageView, 0, 0); - - try { - // Default to true, which is what View.java defaults to - mHasOverlappingRendering = a.getBoolean( - R.styleable.AlphaOptimizedImageView_hasOverlappingRendering, true); - } finally { - a.recycle(); - } } @Override public boolean hasOverlappingRendering() { - return mHasOverlappingRendering; + return false; } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java b/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java index 767022321209..ae665c7fcee7 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java @@ -17,14 +17,19 @@ package com.android.systemui.statusbar; import android.content.Context; +import android.content.res.TypedArray; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.view.View; +import android.widget.ImageView; import android.widget.RemoteViews.RemoteView; +import com.android.systemui.R; + @RemoteView -public class AnimatedImageView extends AlphaOptimizedImageView { +public class AnimatedImageView extends ImageView { + private final boolean mHasOverlappingRendering; AnimationDrawable mAnim; boolean mAttached; @@ -34,11 +39,21 @@ public class AnimatedImageView extends AlphaOptimizedImageView { int mDrawableId; public AnimatedImageView(Context context) { - super(context); + this(context, null); } public AnimatedImageView(Context context, AttributeSet attrs) { super(context, attrs); + TypedArray a = context.getTheme().obtainStyledAttributes(attrs, + R.styleable.AnimatedImageView, 0, 0); + + try { + // Default to true, which is what View.java defaults toA + mHasOverlappingRendering = a.getBoolean( + R.styleable.AnimatedImageView_hasOverlappingRendering, true); + } finally { + a.recycle(); + } } private void updateAnim() { @@ -106,5 +121,10 @@ public class AnimatedImageView extends AlphaOptimizedImageView { } } } + + @Override + public boolean hasOverlappingRendering() { + return mHasOverlappingRendering; + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index bb4a771ec3d6..2d2a08a06227 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -1527,6 +1527,21 @@ public abstract class BaseStatusBar extends SystemUI implements row.setHeadsUpManager(mHeadsUpManager); row.setRemoteInputController(mRemoteInputController); row.setOnExpandClickListener(this); + + // Get the app name + final String pkg = sbn.getPackageName(); + String appname = pkg; + try { + final ApplicationInfo info = pmUser.getApplicationInfo(pkg, + PackageManager.GET_UNINSTALLED_PACKAGES + | PackageManager.GET_DISABLED_COMPONENTS); + if (info != null) { + appname = String.valueOf(pmUser.getApplicationLabel(info)); + } + } catch (NameNotFoundException e) { + // Do nothing + } + row.setAppName(appname); } workAroundBadLayerDrawableOpacity(row); @@ -2056,24 +2071,24 @@ public abstract class BaseStatusBar extends SystemUI implements } for (int i = 0; i < N; i++) { NotificationData.Entry entry = activeNotifications.get(i); + boolean childNotification = mGroupManager.isChildInGroupWithSummary(entry.notification); if (onKeyguard) { entry.row.setOnKeyguard(true); } else { entry.row.setOnKeyguard(false); - boolean top = (i == 0); - entry.row.setSystemExpanded(top); + entry.row.setSystemExpanded(visibleNotifications == 0 && !childNotification); } - boolean childNotification = mGroupManager.isChildInGroupWithSummary(entry.notification); + boolean suppressedSummary = mGroupManager.isSummaryOfSuppressedGroup(entry.notification); boolean childWithVisibleSummary = childNotification && mGroupManager.getGroupSummary(entry.notification).getVisibility() == View.VISIBLE; boolean showOnKeyguard = shouldShowOnKeyguard(entry.notification); - if ((isLockscreenPublicMode() && !mShowLockscreenNotifications) || + if (suppressedSummary || (isLockscreenPublicMode() && !mShowLockscreenNotifications) || (onKeyguard && (visibleNotifications >= maxNotifications && !childWithVisibleSummary || !showOnKeyguard))) { entry.row.setVisibility(View.GONE); - if (onKeyguard && showOnKeyguard && !childNotification) { + if (onKeyguard && showOnKeyguard && !childNotification && !suppressedSummary) { mKeyguardIconOverflowContainer.getIconsView().addNotification(entry); } } else { @@ -2082,7 +2097,8 @@ public abstract class BaseStatusBar extends SystemUI implements if (!childNotification) { if (wasGone) { // notify the scroller of a child addition - mStackScroller.generateAddAnimation(entry.row, true /* fromMoreCard */); + mStackScroller.generateAddAnimation(entry.row, + !showOnKeyguard /* fromMoreCard */); } visibleNotifications++; } @@ -2220,6 +2236,12 @@ public abstract class BaseStatusBar extends SystemUI implements // swipe-dismissable) bindVetoButtonClickListener(entry.row, notification); + if (!notification.isClearable()) { + // The user may have performed a dismiss action on the notification, since it's + // not clearable we should snap it back. + mStackScroller.snapViewIfNeeded(entry.row); + } + if (DEBUG) { // Is this for you? boolean isForCurrentUser = isNotificationForCurrentProfiles(notification); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java index 22bb8ebb2dc4..f9edeb312644 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/ExpandableNotificationRow.java @@ -43,6 +43,7 @@ import android.widget.RemoteViews; import com.android.systemui.R; import com.android.systemui.classifier.FalsingManager; +import com.android.systemui.statusbar.notification.HybridNotificationView; import com.android.systemui.statusbar.notification.NotificationViewWrapper; import com.android.systemui.statusbar.phone.NotificationGroupManager; import com.android.systemui.statusbar.policy.HeadsUpManager; @@ -109,6 +110,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { private NotificationGuts mGuts; private NotificationData.Entry mEntry; private StatusBarNotification mStatusBarNotification; + private String mAppName; private boolean mIsHeadsUp; private boolean mLastChronometerRunning = true; private NotificationHeaderView mNotificationHeader; @@ -227,6 +229,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { updateClearability(); if (mIsSummaryWithChildren) { recreateNotificationHeader(); + mChildrenContainer.onNotificationUpdated(); } if (mIconAnimationRunning) { setIconAnimationRunning(true); @@ -285,6 +288,13 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { mPrivateLayout.setRemoteInputController(r); } + public void setAppName(String appName) { + mAppName = appName; + if (mSettingsIconRow != null) { + mSettingsIconRow.setAppName(mAppName); + } + } + public void addChildNotification(ExpandableNotificationRow row) { addChildNotification(row, -1); } @@ -564,6 +574,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { mSettingsIconRow = (NotificationSettingsIconRow) LayoutInflater.from(mContext).inflate( R.layout.notification_settings_icon_row, this, false); mSettingsIconRow.setNotificationRowParent(ExpandableNotificationRow.this); + mSettingsIconRow.setAppName(mAppName); mSettingsIconRow.setVisibility(oldSettings.getVisibility()); addView(mSettingsIconRow, settingsIndex); @@ -584,6 +595,29 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { mPublicLayout.closeRemoteInput(); } + /** + * Set by how much the single line view should be indented. + */ + public void setSingleLineWidthIndention(int indention) { + mPrivateLayout.setSingleLineWidthIndention(indention); + } + + public int getNotificationColor() { + int color = getStatusBarNotification().getNotification().color; + if (color == Notification.COLOR_DEFAULT) { + return mContext.getColor(com.android.internal.R.color.notification_icon_default_color); + } + return color; + } + + public HybridNotificationView getSingleLineView() { + return mPrivateLayout.getSingleLineView(); + } + + public boolean isOnKeyguard() { + return mOnKeyguard; + } + public interface ExpansionLogger { public void logNotificationExpansion(String key, boolean userAction, boolean expanded); } @@ -658,6 +692,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { public void onInflate(ViewStub stub, View inflated) { mSettingsIconRow = (NotificationSettingsIconRow) inflated; mSettingsIconRow.setNotificationRowParent(ExpandableNotificationRow.this); + mSettingsIconRow.setAppName(mAppName); } }); mGutsStub = (ViewStub) findViewById(R.id.notification_guts_stub); @@ -677,6 +712,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { public void onInflate(ViewStub stub, View inflated) { mChildrenContainer = (NotificationChildrenContainer) inflated; mChildrenContainer.setNotificationParent(ExpandableNotificationRow.this); + mChildrenContainer.onNotificationUpdated(); mTranslateableViews.add(mChildrenContainer); } }); @@ -1026,11 +1062,8 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { private void onChildrenCountChanged() { mIsSummaryWithChildren = BaseStatusBar.ENABLE_CHILD_NOTIFICATIONS - && mGroupManager.hasGroupChildren(mStatusBarNotification); + && mChildrenContainer != null && mChildrenContainer.getChildCount() > 0; if (mIsSummaryWithChildren) { - if (mChildrenContainer == null) { - mChildrenContainerStub.inflate(); - } if (mNotificationHeader == null) { recreateNotificationHeader(); } @@ -1270,7 +1303,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { @Override public int getMinExpandHeight() { if (mIsSummaryWithChildren && !mShowingPublic) { - return mChildrenContainer.getMinExpandHeight(mOnKeyguard); + return mChildrenContainer.getMinExpandHeight(); } return getMinHeight(); } @@ -1357,7 +1390,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { if (isGroupExpanded()) { return 1.0f; } else if (isUserLocked()) { - return mChildrenContainer.getChildExpandFraction(); + return mChildrenContainer.getGroupExpandFraction(); } } return 0.0f; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java index c2df292c0880..0a41e42c9125 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationContentView.java @@ -31,7 +31,7 @@ import android.widget.FrameLayout; import com.android.systemui.R; import com.android.systemui.statusbar.notification.HybridNotificationView; -import com.android.systemui.statusbar.notification.HybridNotificationViewManager; +import com.android.systemui.statusbar.notification.HybridGroupManager; import com.android.systemui.statusbar.notification.NotificationCustomViewWrapper; import com.android.systemui.statusbar.notification.NotificationUtils; import com.android.systemui.statusbar.notification.NotificationViewWrapper; @@ -75,7 +75,7 @@ public class NotificationContentView extends FrameLayout { private NotificationViewWrapper mContractedWrapper; private NotificationViewWrapper mExpandedWrapper; private NotificationViewWrapper mHeadsUpWrapper; - private HybridNotificationViewManager mHybridViewManager; + private HybridGroupManager mHybridGroupManager; private int mClipTopAmount; private int mContentHeight; private int mUnrestrictedContentHeight; @@ -116,10 +116,11 @@ public class NotificationContentView extends FrameLayout { private ExpandableNotificationRow mContainingNotification; private int mTransformationStartVisibleType; private boolean mUserExpanding; + private int mSingleLineWidthIndention; public NotificationContentView(Context context, AttributeSet attrs) { super(context, attrs); - mHybridViewManager = new HybridNotificationViewManager(getContext(), this); + mHybridGroupManager = new HybridGroupManager(getContext(), this); mMinContractedHeight = getResources().getDimensionPixelSize( R.dimen.min_notification_layout_height); mNotificationContentMarginEnd = getResources().getDimensionPixelSize( @@ -139,6 +140,7 @@ public class NotificationContentView extends FrameLayout { boolean hasFixedHeight = heightMode == MeasureSpec.EXACTLY; boolean isHeightLimited = heightMode == MeasureSpec.AT_MOST; int maxSize = Integer.MAX_VALUE; + int width = MeasureSpec.getSize(widthMeasureSpec); if (hasFixedHeight || isHeightLimited) { maxSize = MeasureSpec.getSize(heightMeasureSpec); } @@ -187,12 +189,18 @@ public class NotificationContentView extends FrameLayout { maxChildHeight = Math.max(maxChildHeight, mHeadsUpChild.getMeasuredHeight()); } if (mSingleLineView != null) { - mSingleLineView.measure(widthMeasureSpec, + int singleLineWidthSpec = widthMeasureSpec; + if (mSingleLineWidthIndention != 0 + && MeasureSpec.getMode(widthMeasureSpec) != MeasureSpec.UNSPECIFIED) { + singleLineWidthSpec = MeasureSpec.makeMeasureSpec( + width - mSingleLineWidthIndention + mSingleLineView.getPaddingEnd(), + MeasureSpec.AT_MOST); + } + mSingleLineView.measure(singleLineWidthSpec, MeasureSpec.makeMeasureSpec(maxSize, MeasureSpec.AT_MOST)); maxChildHeight = Math.max(maxChildHeight, mSingleLineView.getMeasuredHeight()); } int ownHeight = Math.min(maxChildHeight, maxSize); - int width = MeasureSpec.getSize(widthMeasureSpec); setMeasuredDimension(width, ownHeight); } @@ -715,7 +723,7 @@ public class NotificationContentView extends FrameLayout { private void updateSingleLineView() { if (mIsChildInGroup) { - mSingleLineView = mHybridViewManager.bindFromNotification( + mSingleLineView = mHybridGroupManager.bindFromNotification( mSingleLineView, mStatusBarNotification.getNotification()); } else if (mSingleLineView != null) { removeView(mSingleLineView); @@ -878,4 +886,20 @@ public class NotificationContentView extends FrameLayout { updateBackgroundColor(false); } } + + /** + * Set by how much the single line view should be indented. Used when a overflow indicator is + * present and only during measuring + */ + public void setSingleLineWidthIndention(int singleLineWidthIndention) { + if (singleLineWidthIndention != mSingleLineWidthIndention) { + mSingleLineWidthIndention = singleLineWidthIndention; + mContainingNotification.forceLayout(); + forceLayout(); + } + } + + public HybridNotificationView getSingleLineView() { + return mSingleLineView; + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSettingsIconRow.java b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSettingsIconRow.java index fcc48bf8d510..a3e78c165b2f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSettingsIconRow.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/NotificationSettingsIconRow.java @@ -20,6 +20,7 @@ import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.ValueAnimator; import android.content.Context; +import android.content.res.Resources; import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; @@ -105,6 +106,13 @@ public class NotificationSettingsIconRow extends FrameLayout implements View.OnC mParent = parent; } + public void setAppName(String appName) { + Resources res = getResources(); + String description = String.format(res.getString(R.string.notification_gear_accessibility), + appName); + mGearIcon.setContentDescription(description); + } + public ExpandableNotificationRow getNotificationParent() { return mParent; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationViewManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridGroupManager.java index 28bb66f39572..8f2c81f0726b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationViewManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridGroupManager.java @@ -26,6 +26,7 @@ import android.text.style.TextAppearanceSpan; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; import com.android.systemui.R; import com.android.systemui.statusbar.ExpandableNotificationRow; @@ -33,18 +34,18 @@ import com.android.systemui.statusbar.ExpandableNotificationRow; import java.util.List; /** - * A class managing {@link HybridNotificationView} views + * A class managing hybrid groups that include {@link HybridNotificationView} and the notification + * group overflow. */ -public class HybridNotificationViewManager { +public class HybridGroupManager { private final Context mContext; private ViewGroup mParent; - private String mDivider; + private int mOverflowNumberColor; - public HybridNotificationViewManager(Context ctx, ViewGroup parent) { + public HybridGroupManager(Context ctx, ViewGroup parent) { mContext = ctx; mParent = parent; - mDivider = " • "; } private HybridNotificationView inflateHybridView() { @@ -55,6 +56,26 @@ public class HybridNotificationViewManager { return hybrid; } + private TextView inflateOverflowNumber() { + LayoutInflater inflater = mContext.getSystemService(LayoutInflater.class); + TextView numberView = (TextView) inflater.inflate( + R.layout.hybrid_overflow_number, mParent, false); + mParent.addView(numberView); + updateOverFlowNumberColor(numberView); + return numberView; + } + + private void updateOverFlowNumberColor(TextView numberView) { + numberView.setTextColor(mOverflowNumberColor); + } + + public void setOverflowNumberColor(TextView numberView, int overflowNumberColor) { + mOverflowNumberColor = overflowNumberColor; + if (numberView != null) { + updateOverFlowNumberColor(numberView); + } + } + public HybridNotificationView bindFromNotification(HybridNotificationView reusableView, Notification notification) { if (reusableView == null) { @@ -82,33 +103,15 @@ public class HybridNotificationViewManager { return titleText; } - public HybridNotificationView bindFromNotificationGroup( - HybridNotificationView reusableView, - List<ExpandableNotificationRow> group, int startIndex) { + public TextView bindOverflowNumber(TextView reusableView, int number) { if (reusableView == null) { - reusableView = inflateHybridView(); + reusableView = inflateOverflowNumber(); } - SpannableStringBuilder summary = new SpannableStringBuilder(); - int childCount = group.size(); - for (int i = startIndex; i < childCount; i++) { - ExpandableNotificationRow child = group.get(i); - CharSequence titleText = resolveTitle( - child.getStatusBarNotification().getNotification()); - if (titleText == null) { - continue; - } - if (!TextUtils.isEmpty(summary)) { - summary.append(mDivider, - new TextAppearanceSpan(mContext, R.style. - TextAppearance_Material_Notification_HybridNotificationDivider), - Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); - } - summary.append(BidiFormatter.getInstance().unicodeWrap(titleText)); + String text = mContext.getResources().getString( + R.string.notification_group_overflow_indicator, number); + if (!text.equals(reusableView.getText())) { + reusableView.setText(text); } - // We want to force the same orientation as the layout RTL mode - BidiFormatter formater = BidiFormatter.getInstance( - reusableView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL); - reusableView.bind(formater.unicodeWrap(summary)); return reusableView; } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationView.java index c80cad836f48..0a1795f21234 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/HybridNotificationView.java @@ -60,6 +60,14 @@ public class HybridNotificationView extends AlphaOptimizedLinearLayout super(context, attrs, defStyleAttr, defStyleRes); } + public TextView getTitleView() { + return mTitleView; + } + + public TextView getTextView() { + return mTextView; + } + @Override protected void onFinishInflate() { super.onFinishInflate(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationUtils.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationUtils.java index 6ef61ec337c4..844a2c495501 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationUtils.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationUtils.java @@ -17,15 +17,19 @@ package com.android.systemui.statusbar.notification; import android.graphics.Color; +import android.view.View; import android.widget.ImageView; import com.android.internal.util.NotificationColorUtil; import com.android.systemui.R; +import com.android.systemui.statusbar.stack.NotificationChildrenContainer; /** * A util class for various reusable functions */ public class NotificationUtils { + private static final int[] sLocationBase = new int[2]; + private static final int[] sLocationOffset = new int[2]; public static boolean isGrayscale(ImageView v, NotificationColorUtil colorUtil) { Object isGrayscale = v.getTag(R.id.icon_is_grayscale); if (isGrayscale != null) { @@ -47,4 +51,10 @@ public class NotificationUtils { (int) interpolate(Color.green(startColor), Color.green(endColor), amount), (int) interpolate(Color.blue(startColor), Color.blue(endColor), amount)); } + + public static float getRelativeYOffset(View offsetView, View baseView) { + baseView.getLocationOnScreen(sLocationBase); + offsetView.getLocationOnScreen(sLocationOffset); + return sLocationOffset[1] - sLocationBase[1]; + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java index 03dd25e3c5b0..8225dab4a598 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/MultiUserSwitch.java @@ -131,6 +131,9 @@ public class MultiUserSwitch extends FrameLayout implements View.OnClickListener getContext(), v, ContactsContract.Profile.CONTENT_URI, ContactsContract.QuickContact.MODE_LARGE, null); getContext().startActivityAsUser(intent, new UserHandle(UserHandle.USER_CURRENT)); + if (mQsPanel != null) { + mQsPanel.getHost().collapsePanels(); + } } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index 99896f8b7f23..56a7dbed52cb 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -25,7 +25,6 @@ import android.app.ActivityManagerNative; import android.app.StatusBarManager; import android.content.Context; import android.content.res.Configuration; -import android.content.res.Resources; import android.graphics.Point; import android.graphics.Rect; import android.graphics.drawable.Drawable; @@ -90,14 +89,13 @@ public class NavigationBarView extends LinearLayout { private final NavTransitionListener mTransitionListener = new NavTransitionListener(); private OnVerticalChangedListener mOnVerticalChangedListener; - private boolean mIsLayoutRtl; private boolean mLayoutTransitionsEnabled = true; private boolean mWakeAndUnlocking; private boolean mCarMode = false; private boolean mDockedStackExists; private final SparseArray<ButtonDispatcher> mButtonDisatchers = new SparseArray<>(); - private int mDensity; + private Configuration mConfiguration; private class NavTransitionListener implements TransitionListener { private boolean mBackTransitioning; @@ -183,13 +181,13 @@ public class NavigationBarView extends LinearLayout { mDisplay = ((WindowManager) context.getSystemService( Context.WINDOW_SERVICE)).getDefaultDisplay(); - final Resources res = getContext().getResources(); mVertical = false; mShowMenu = false; mGestureHelper = new NavigationBarGestureHelper(context); - mDensity = context.getResources().getConfiguration().densityDpi; - getIcons(context); + mConfiguration = new Configuration(); + mConfiguration.updateFrom(context.getResources().getConfiguration()); + updateIcons(context, Configuration.EMPTY, mConfiguration); mBarTransitions = new NavigationBarTransitions(this); @@ -263,7 +261,7 @@ public class NavigationBarView extends LinearLayout { return mButtonDisatchers.get(R.id.ime_switcher); } - private void getCarModeIcons(Context ctx) { + private void updateCarModeIcons(Context ctx) { mBackCarModeIcon = ctx.getDrawable(R.drawable.ic_sysbar_back_carmode); mBackLandCarModeIcon = mBackCarModeIcon; mBackAltCarModeIcon = ctx.getDrawable(R.drawable.ic_sysbar_back_ime_carmode); @@ -271,22 +269,27 @@ public class NavigationBarView extends LinearLayout { mHomeCarModeIcon = ctx.getDrawable(R.drawable.ic_sysbar_home_carmode); } - private void getIcons(Context ctx) { - mBackIcon = ctx.getDrawable(R.drawable.ic_sysbar_back); - mBackLandIcon = mBackIcon; - mBackAltIcon = ctx.getDrawable(R.drawable.ic_sysbar_back_ime); - mBackAltLandIcon = mBackAltIcon; + private void updateIcons(Context ctx, Configuration oldConfig, Configuration newConfig) { + if (oldConfig.orientation != newConfig.orientation) { + mDockedIcon = ctx.getDrawable(R.drawable.ic_sysbar_docked); + } + if (oldConfig.densityDpi != newConfig.densityDpi) { + mBackIcon = ctx.getDrawable(R.drawable.ic_sysbar_back); + mBackLandIcon = mBackIcon; + mBackAltIcon = ctx.getDrawable(R.drawable.ic_sysbar_back_ime); + mBackAltLandIcon = mBackAltIcon; - mHomeDefaultIcon = ctx.getDrawable(R.drawable.ic_sysbar_home); + mHomeDefaultIcon = ctx.getDrawable(R.drawable.ic_sysbar_home); - mRecentIcon = ctx.getDrawable(R.drawable.ic_sysbar_recent); - mDockedIcon = ctx.getDrawable(R.drawable.ic_sysbar_docked); - getCarModeIcons(ctx); + mRecentIcon = ctx.getDrawable(R.drawable.ic_sysbar_recent); + updateCarModeIcons(ctx); + } } @Override public void setLayoutDirection(int layoutDirection) { - getIcons(getContext()); + // Reload all the icons + updateIcons(getContext(), Configuration.EMPTY, mConfiguration); super.setLayoutDirection(layoutDirection); } @@ -598,10 +601,9 @@ public class NavigationBarView extends LinearLayout { // we are switching to. setNavigationIconHints(mNavigationIconHints, true); } - if (mDensity != newConfig.densityDpi) { - mDensity = newConfig.densityDpi; - getIcons(getContext()); - } + updateIcons(getContext(), mConfiguration, newConfig); + updateRecentsIcon(); + mConfiguration.updateFrom(newConfig); } /** diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java index d3681b72372b..f7a6b271bcc6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationGroupManager.java @@ -17,7 +17,7 @@ package com.android.systemui.statusbar.phone; import android.service.notification.StatusBarNotification; -import android.util.ArraySet; +import android.support.annotation.Nullable; import com.android.systemui.statusbar.ExpandableNotificationRow; import com.android.systemui.statusbar.NotificationData; @@ -35,7 +35,7 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged private final HashMap<String, NotificationGroup> mGroupMap = new HashMap<>(); private OnGroupChangeListener mListener; private int mBarState = -1; - private ArraySet<String> mHeadsUpedEntries = new ArraySet<>(); + private HashMap<String, StatusBarNotification> mIsolatedEntries = new HashMap<>(); public void setOnGroupChangeListener(OnGroupChangeListener listener) { mListener = listener; @@ -91,6 +91,7 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged } else { group.summary = null; } + updateSuppression(group); if (group.children.isEmpty()) { if (group.summary == null) { mGroupMap.remove(groupKey); @@ -109,43 +110,81 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged } if (isGroupChild) { group.children.add(added); + updateSuppression(group); } else { group.summary = added; group.expanded = added.row.areChildrenExpanded(); + updateSuppression(group); if (!group.children.isEmpty()) { mListener.onGroupCreatedFromChildren(group); } } } + private void updateSuppression(NotificationGroup group) { + if (group == null) { + return; + } + boolean prevSuppressed = group.suppressed; + group.suppressed = group.summary != null && !group.expanded + && (group.children.size() == 1 + || (group.children.size() == 0 + && !group.summary.notification.getNotification().isGroupChild() + && hasIsolatedChildren(group))); + if (prevSuppressed != group.suppressed) { + mListener.onGroupsChanged(); + } + } + + private boolean hasIsolatedChildren(NotificationGroup group) { + return getNumberOfIsolatedChildren(group.summary.notification.getGroupKey()) != 0; + } + + private int getNumberOfIsolatedChildren(String groupKey) { + int count = 0; + for (StatusBarNotification sbn : mIsolatedEntries.values()) { + if (sbn.getGroupKey().equals(groupKey) && isIsolated(sbn)) { + count++; + } + } + return count; + } + public void onEntryUpdated(NotificationData.Entry entry, StatusBarNotification oldNotification) { if (mGroupMap.get(getGroupKey(oldNotification)) != null) { onEntryRemovedInternal(entry, oldNotification); } onEntryAdded(entry); + if (isIsolated(entry.notification)) { + mIsolatedEntries.put(entry.key, entry.notification); + String oldKey = oldNotification.getGroupKey(); + String newKey = entry.notification.getGroupKey(); + if (!oldKey.equals(newKey)) { + updateSuppression(mGroupMap.get(oldKey)); + updateSuppression(mGroupMap.get(newKey)); + } + } } - public boolean isVisible(StatusBarNotification sbn) { - if (!isGroupChild(sbn)) { - return true; - } - NotificationGroup group = mGroupMap.get(getGroupKey(sbn)); - if (group != null && (group.expanded || group.summary == null)) { - return true; - } - return false; + public boolean isSummaryOfSuppressedGroup(StatusBarNotification sbn) { + return isGroupSuppressed(getGroupKey(sbn)) && sbn.getNotification().isGroupSummary(); } - public boolean hasGroupChildren(StatusBarNotification sbn) { - if (!isGroupSummary(sbn)) { - return false; - } - NotificationGroup group = mGroupMap.get(getGroupKey(sbn)); - if (group == null) { - return false; - } - return !group.children.isEmpty(); + public boolean isOnlyChildInSuppressedGroup(StatusBarNotification sbn) { + return isGroupSuppressed(sbn.getGroupKey()) + && sbn.getNotification().isGroupChild() + && getTotalNumberOfChildren(sbn) == 1; + } + + private int getTotalNumberOfChildren(StatusBarNotification sbn) { + return getNumberOfIsolatedChildren(sbn.getGroupKey()) + + mGroupMap.get(sbn.getGroupKey()).children.size(); + } + + private boolean isGroupSuppressed(String groupKey) { + NotificationGroup group = mGroupMap.get(groupKey); + return group != null && group.suppressed; } public void setStatusBarState(int newState) { @@ -163,6 +202,7 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged if (group.expanded) { setGroupExpanded(group, false); } + updateSuppression(group); } } @@ -174,7 +214,7 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged return false; } NotificationGroup group = mGroupMap.get(getGroupKey(sbn)); - if (group == null || group.summary == null) { + if (group == null || group.summary == null || group.suppressed) { return false; } return true; @@ -194,11 +234,30 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged return !group.children.isEmpty(); } + /** + * Get the summary of a specified status bar notification. For isolated notification this return + * itself. + */ public ExpandableNotificationRow getGroupSummary(StatusBarNotification sbn) { - NotificationGroup group = mGroupMap.get(getGroupKey(sbn)); + return getGroupSummary(getGroupKey(sbn)); + } + + /** + * Similar to {@link #getGroupSummary(StatusBarNotification)} but doesn't get the visual summary + * but the logical summary, i.e when a child is isolated, it still returns the summary as if + * it wasn't isolated. + */ + public ExpandableNotificationRow getLogicalGroupSummary( + StatusBarNotification sbn) { + return getGroupSummary(sbn.getGroupKey()); + } + + @Nullable + private ExpandableNotificationRow getGroupSummary(String groupKey) { + NotificationGroup group = mGroupMap.get(groupKey); return group == null ? null : group.summary == null ? null - : group.summary.row; + : group.summary.row; } public void toggleGroupExpansion(StatusBarNotification sbn) { @@ -210,7 +269,7 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged } private boolean isIsolated(StatusBarNotification sbn) { - return mHeadsUpedEntries.contains(sbn.getKey()) && sbn.getNotification().isGroupChild(); + return mIsolatedEntries.containsKey(sbn.getKey()); } private boolean isGroupSummary(StatusBarNotification sbn) { @@ -249,38 +308,55 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged public void onHeadsUpStateChanged(NotificationData.Entry entry, boolean isHeadsUp) { final StatusBarNotification sbn = entry.notification; if (entry.row.isHeadsUp()) { - if (!mHeadsUpedEntries.contains(sbn.getKey())) { - final boolean groupChild = sbn.getNotification().isGroupChild(); - if (groupChild) { - // We will be isolated now, so lets update the groups - onEntryRemovedInternal(entry, entry.notification); - } - mHeadsUpedEntries.add(sbn.getKey()); - if (groupChild) { - onEntryAdded(entry); - mListener.onChildIsolationChanged(); - } + if (shouldIsolate(sbn)) { + // We will be isolated now, so lets update the groups + onEntryRemovedInternal(entry, entry.notification); + + mIsolatedEntries.put(sbn.getKey(), sbn); + + onEntryAdded(entry); + // We also need to update the suppression of the old group, because this call comes + // even before the groupManager knows about the notification at all. + // When the notification gets added afterwards it is already isolated and therefore + // it doesn't lead to an update. + updateSuppression(mGroupMap.get(entry.notification.getGroupKey())); + mListener.onGroupsChanged(); } } else { - if (mHeadsUpedEntries.contains(sbn.getKey())) { - boolean isolatedBefore = isIsolated(sbn); - if (isolatedBefore) { - // not isolated anymore, we need to update the groups - onEntryRemovedInternal(entry, entry.notification); - } - mHeadsUpedEntries.remove(sbn.getKey()); - if (isolatedBefore) { - onEntryAdded(entry); - mListener.onChildIsolationChanged(); - } + if (mIsolatedEntries.containsKey(sbn.getKey())) { + // not isolated anymore, we need to update the groups + onEntryRemovedInternal(entry, entry.notification); + mIsolatedEntries.remove(sbn.getKey()); + onEntryAdded(entry); + mListener.onGroupsChanged(); } } } + private boolean shouldIsolate(StatusBarNotification sbn) { + NotificationGroup notificationGroup = mGroupMap.get(sbn.getGroupKey()); + return sbn.getNotification().isGroupChild() + && (sbn.getNotification().fullScreenIntent != null + || notificationGroup == null + || !notificationGroup.expanded + || isGroupNotFullyVisible(notificationGroup)); + } + + private boolean isGroupNotFullyVisible(NotificationGroup notificationGroup) { + return notificationGroup.summary == null + || notificationGroup.summary.row.getClipTopOptimization() > 0 + || notificationGroup.summary.row.getClipTopAmount() > 0 + || notificationGroup.summary.row.getTranslationY() < 0; + } + public static class NotificationGroup { public final HashSet<NotificationData.Entry> children = new HashSet<>(); public NotificationData.Entry summary; public boolean expanded; + /** + * Is this notification group suppressed, i.e its summary is hidden + */ + public boolean suppressed; } public interface OnGroupChangeListener { @@ -301,8 +377,9 @@ public class NotificationGroupManager implements HeadsUpManager.OnHeadsUpChanged void onGroupCreatedFromChildren(NotificationGroup group); /** - * The isolation of a child has changed i.e it's group changes. + * The groups have changed. This can happen if the isolation of a child has changes or if a + * group became suppressed / unsuppressed */ - void onChildIsolationChanged(); + void onGroupsChanged(); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java index 6e345f088b5d..a605a81bb504 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationIconAreaController.java @@ -114,6 +114,9 @@ public class NotificationIconAreaController { if (!PhoneStatusBar.isTopLevelChild(ent)) { continue; } + if (ent.row.getVisibility() == View.GONE) { + continue; + } toShow.add(ent.icon); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java index bf5861107b09..e84d8fc81903 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -132,6 +132,7 @@ import com.android.systemui.statusbar.DismissView; import com.android.systemui.statusbar.DragDownHelper; import com.android.systemui.statusbar.EmptyShadeView; import com.android.systemui.statusbar.ExpandableNotificationRow; +import com.android.systemui.statusbar.ExpandableView; import com.android.systemui.statusbar.GestureRecorder; import com.android.systemui.statusbar.KeyguardIndicationController; import com.android.systemui.statusbar.NotificationData; @@ -1632,16 +1633,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, private void updateSpeedbump() { int speedbumpIndex = -1; int currentIndex = 0; - ArrayList<Entry> activeNotifications = mNotificationData.getActiveNotifications(); - final int N = activeNotifications.size(); + final int N = mStackScroller.getChildCount(); for (int i = 0; i < N; i++) { - Entry entry = activeNotifications.get(i); - boolean isChild = !isTopLevelChild(entry); - if (isChild) { + View view = mStackScroller.getChildAt(i); + if (view.getVisibility() == View.GONE || !(view instanceof ExpandableNotificationRow)) { continue; } - if (entry.row.getVisibility() != View.GONE && - mNotificationData.isAmbient(entry.key)) { + ExpandableNotificationRow row = (ExpandableNotificationRow) view; + if (mNotificationData.isAmbient(row.getStatusBarNotification().getKey())) { speedbumpIndex = currentIndex; break; } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java index 676ff2ebc258..dc567fc20113 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationChildrenContainer.java @@ -22,13 +22,14 @@ import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.TextView; import com.android.systemui.R; import com.android.systemui.ViewInvertHelper; import com.android.systemui.statusbar.CrossFadeHelper; import com.android.systemui.statusbar.ExpandableNotificationRow; +import com.android.systemui.statusbar.notification.HybridGroupManager; import com.android.systemui.statusbar.notification.HybridNotificationView; -import com.android.systemui.statusbar.notification.HybridNotificationViewManager; import com.android.systemui.statusbar.notification.NotificationUtils; import com.android.systemui.statusbar.phone.NotificationPanelView; @@ -46,23 +47,22 @@ public class NotificationChildrenContainer extends ViewGroup { private final List<View> mDividers = new ArrayList<>(); private final List<ExpandableNotificationRow> mChildren = new ArrayList<>(); - private final HybridNotificationViewManager mHybridViewManager; + private final HybridGroupManager mHybridGroupManager; private int mChildPadding; private int mDividerHeight; private int mMaxNotificationHeight; private int mNotificationHeaderHeight; - private int mNotificationAppearDistance; private int mNotificatonTopPadding; private float mCollapsedBottompadding; private ViewInvertHelper mOverflowInvertHelper; private boolean mChildrenExpanded; private ExpandableNotificationRow mNotificationParent; - private HybridNotificationView mGroupOverflowContainer; + private TextView mOverflowNumber; private ViewState mGroupOverFlowState; private int mRealHeight; - private int mLayoutDirection = LAYOUT_DIRECTION_UNDEFINED; private boolean mUserLocked; private int mActualHeight; + private boolean mNeverAppliedGroupState; public NotificationChildrenContainer(Context context) { this(context, null); @@ -80,7 +80,7 @@ public class NotificationChildrenContainer extends ViewGroup { int defStyleRes) { super(context, attrs, defStyleAttr, defStyleRes); initDimens(); - mHybridViewManager = new HybridNotificationViewManager(getContext(), this); + mHybridGroupManager = new HybridGroupManager(getContext(), this); } private void initDimens() { @@ -90,8 +90,6 @@ public class NotificationChildrenContainer extends ViewGroup { R.dimen.notification_divider_height)); mMaxNotificationHeight = getResources().getDimensionPixelSize( R.dimen.notification_max_height); - mNotificationAppearDistance = getResources().getDimensionPixelSize( - R.dimen.notification_appear_distance); mNotificationHeaderHeight = getResources().getDimensionPixelSize( com.android.internal.R.dimen.notification_content_margin_top); mNotificatonTopPadding = getResources().getDimensionPixelSize( @@ -108,12 +106,12 @@ public class NotificationChildrenContainer extends ViewGroup { if (child.getVisibility() == View.GONE) { continue; } - child.layout(0, 0, getWidth(), child.getMeasuredHeight()); + child.layout(0, 0, child.getMeasuredWidth(), child.getMeasuredHeight()); mDividers.get(i).layout(0, 0, getWidth(), mDividerHeight); } - if (mGroupOverflowContainer != null) { - mGroupOverflowContainer.layout(0, 0, getWidth(), - mGroupOverflowContainer.getMeasuredHeight()); + if (mOverflowNumber != null) { + mOverflowNumber.layout(getWidth() - mOverflowNumber.getMeasuredWidth(), 0, getWidth(), + mOverflowNumber.getMeasuredHeight()); } } @@ -128,11 +126,20 @@ public class NotificationChildrenContainer extends ViewGroup { ownMaxHeight = Math.min(ownMaxHeight, size); } int newHeightSpec = MeasureSpec.makeMeasureSpec(ownMaxHeight, MeasureSpec.AT_MOST); + int width = MeasureSpec.getSize(widthMeasureSpec); + if (mOverflowNumber != null) { + mOverflowNumber.measure(MeasureSpec.makeMeasureSpec(width, MeasureSpec.AT_MOST), + newHeightSpec); + } int dividerHeightSpec = MeasureSpec.makeMeasureSpec(mDividerHeight, MeasureSpec.EXACTLY); int height = mNotificationHeaderHeight + mNotificatonTopPadding; int childCount = Math.min(mChildren.size(), NUMBER_OF_CHILDREN_WHEN_CHILDREN_EXPANDED); + int collapsedChildren = getMaxAllowedVisibleChildren(true /* likeCollapsed */); + int overflowIndex = childCount > collapsedChildren ? collapsedChildren - 1 : -1; for (int i = 0; i < childCount; i++) { - View child = mChildren.get(i); + ExpandableNotificationRow child = mChildren.get(i); + boolean isOverflow = i == overflowIndex; + child.setSingleLineWidthIndention(isOverflow ? mOverflowNumber.getMeasuredWidth() : 0); child.measure(widthMeasureSpec, newHeightSpec); height += child.getMeasuredHeight(); @@ -141,10 +148,6 @@ public class NotificationChildrenContainer extends ViewGroup { divider.measure(widthMeasureSpec, dividerHeightSpec); height += mDividerHeight; } - int width = MeasureSpec.getSize(widthMeasureSpec); - if (mGroupOverflowContainer != null) { - mGroupOverflowContainer.measure(widthMeasureSpec, newHeightSpec); - } mRealHeight = height; if (heightMode != MeasureSpec.UNSPECIFIED) { height = Math.min(height, size); @@ -200,22 +203,30 @@ public class NotificationChildrenContainer extends ViewGroup { public void updateGroupOverflow() { int childCount = mChildren.size(); int maxAllowedVisibleChildren = getMaxAllowedVisibleChildren(true /* likeCollapsed */); - boolean hasOverflow = childCount > maxAllowedVisibleChildren; - int lastVisibleIndex = hasOverflow ? maxAllowedVisibleChildren - 2 - : maxAllowedVisibleChildren - 1; - if (hasOverflow) { - mGroupOverflowContainer = mHybridViewManager.bindFromNotificationGroup( - mGroupOverflowContainer, mChildren, lastVisibleIndex + 1); + if (childCount > maxAllowedVisibleChildren) { + mOverflowNumber = mHybridGroupManager.bindOverflowNumber( + mOverflowNumber, childCount - maxAllowedVisibleChildren); if (mOverflowInvertHelper == null) { - mOverflowInvertHelper= new ViewInvertHelper(mGroupOverflowContainer, + mOverflowInvertHelper= new ViewInvertHelper(mOverflowNumber, NotificationPanelView.DOZE_ANIMATION_DURATION); } if (mGroupOverFlowState == null) { mGroupOverFlowState = new ViewState(); + mNeverAppliedGroupState = true; } - } else if (mGroupOverflowContainer != null) { - removeView(mGroupOverflowContainer); - mGroupOverflowContainer = null; + } else if (mOverflowNumber != null) { + removeView(mOverflowNumber); + if (isShown()) { + final View removedOverflowNumber = mOverflowNumber; + addTransientView(removedOverflowNumber, getTransientViewCount()); + CrossFadeHelper.fadeOut(removedOverflowNumber, new Runnable() { + @Override + public void run() { + removeTransientView(removedOverflowNumber); + } + }); + } + mOverflowNumber = null; mOverflowInvertHelper = null; mGroupOverFlowState = null; } @@ -224,11 +235,7 @@ public class NotificationChildrenContainer extends ViewGroup { @Override protected void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); - int layoutDirection = getLayoutDirection(); - if (layoutDirection != mLayoutDirection) { - updateGroupOverflow(); - mLayoutDirection = layoutDirection; - } + updateGroupOverflow(); } private View inflateDivider() { @@ -296,7 +303,7 @@ public class NotificationChildrenContainer extends ViewGroup { boolean firstChild = true; float expandFactor = 0; if (mUserLocked) { - expandFactor = getChildExpandFraction(); + expandFactor = getGroupExpandFraction(); } for (int i = 0; i < childCount; i++) { if (visibleChildren >= maxAllowedVisibleChildren) { @@ -346,14 +353,12 @@ public class NotificationChildrenContainer extends ViewGroup { int yPosition = mNotificationHeaderHeight; boolean firstChild = true; int maxAllowedVisibleChildren = getMaxAllowedVisibleChildren(); - boolean hasOverflow = !mChildrenExpanded && childCount > maxAllowedVisibleChildren - && maxAllowedVisibleChildren != NUMBER_OF_CHILDREN_WHEN_CHILDREN_EXPANDED; - int lastVisibleIndex = hasOverflow - ? maxAllowedVisibleChildren - 2 - : maxAllowedVisibleChildren - 1; + int lastVisibleIndex = maxAllowedVisibleChildren - 1; + int firstOverflowIndex = lastVisibleIndex + 1; float expandFactor = 0; if (mUserLocked) { - expandFactor = getChildExpandFraction(); + expandFactor = getGroupExpandFraction(); + firstOverflowIndex = getMaxAllowedVisibleChildren(true /* likeCollapsed */); } for (int i = 0; i < childCount; i++) { ExpandableNotificationRow child = mChildren.get(i); @@ -386,19 +391,38 @@ public class NotificationChildrenContainer extends ViewGroup { childState.belowSpeedBump = parentState.belowSpeedBump; childState.clipTopAmount = 0; childState.topOverLap = 0; - boolean visible = i <= lastVisibleIndex; - childState.alpha = visible ? 1 : 0; + childState.alpha = 0; + if (i < firstOverflowIndex) { + childState.alpha = 1; + } else if (expandFactor == 1.0f && i <= lastVisibleIndex) { + childState.alpha = (mActualHeight - childState.yTranslation) / childState.height; + childState.alpha = Math.max(0.0f, Math.min(1.0f, childState.alpha)); + } childState.location = parentState.location; yPosition += intrinsicHeight; } - if (mGroupOverflowContainer != null) { - mGroupOverFlowState.initFrom(mGroupOverflowContainer); - if (hasOverflow) { - StackViewState firstOverflowState = - resultState.getViewStateForView(mChildren.get(lastVisibleIndex + 1)); - mGroupOverFlowState.yTranslation = firstOverflowState.yTranslation; + if (mOverflowNumber != null) { + ExpandableNotificationRow overflowView = mChildren.get(Math.min( + getMaxAllowedVisibleChildren(true /* likeCollpased */), childCount) - 1); + mGroupOverFlowState.copyFrom(resultState.getViewStateForView(overflowView)); + if (!mChildrenExpanded) { + if (mUserLocked) { + HybridNotificationView singleLineView = overflowView.getSingleLineView(); + View mirrorView = singleLineView.getTextView(); + if (mirrorView.getVisibility() == GONE) { + mirrorView = singleLineView.getTitleView(); + } + if (mirrorView.getVisibility() == GONE) { + mirrorView = singleLineView; + } + mGroupOverFlowState.yTranslation += NotificationUtils.getRelativeYOffset( + mirrorView, overflowView); + mGroupOverFlowState.alpha = mirrorView.getAlpha(); + } + } else { + mGroupOverFlowState.yTranslation += mNotificationHeaderHeight; + mGroupOverFlowState.alpha = 0.0f; } - mGroupOverFlowState.alpha = mChildrenExpanded || !hasOverflow ? 0.0f : 1.0f; } } @@ -410,7 +434,8 @@ public class NotificationChildrenContainer extends ViewGroup { if (!likeCollapsed && (mChildrenExpanded || mNotificationParent.isUserLocked())) { return NUMBER_OF_CHILDREN_WHEN_CHILDREN_EXPANDED; } - if (mNotificationParent.isExpanded() || mNotificationParent.isHeadsUp()) { + if (!mNotificationParent.isOnKeyguard() + && (mNotificationParent.isExpanded() || mNotificationParent.isHeadsUp())) { return NUMBER_OF_CHILDREN_WHEN_SYSTEM_EXPANDED; } return NUMBER_OF_CHILDREN_WHEN_COLLAPSED; @@ -419,7 +444,10 @@ public class NotificationChildrenContainer extends ViewGroup { public void applyState(StackScrollState state) { int childCount = mChildren.size(); ViewState tmpState = new ViewState(); - float expandFraction = getChildExpandFraction(); + float expandFraction = 0.0f; + if (mUserLocked) { + expandFraction = getGroupExpandFraction(); + } for (int i = 0; i < childCount; i++) { ExpandableNotificationRow child = mChildren.get(i); StackViewState viewState = state.getViewStateForView(child); @@ -431,13 +459,17 @@ public class NotificationChildrenContainer extends ViewGroup { tmpState.yTranslation = viewState.yTranslation - mDividerHeight; float alpha = mChildrenExpanded && viewState.alpha != 0 ? 0.5f : 0; if (mUserLocked && viewState.alpha != 0) { - alpha = NotificationUtils.interpolate(0, 0.5f, expandFraction); + alpha = NotificationUtils.interpolate(0, 0.5f, + Math.min(viewState.alpha, expandFraction)); } tmpState.alpha = alpha; state.applyViewState(divider, tmpState); + // There is no fake shadow to be drawn on the children + child.setFakeShadowIntensity(0.0f, 0.0f, 0, 0); } - if (mGroupOverflowContainer != null) { - state.applyViewState(mGroupOverflowContainer, mGroupOverFlowState); + if (mOverflowNumber != null) { + state.applyViewState(mOverflowNumber, mGroupOverFlowState); + mNeverAppliedGroupState = false; } } @@ -456,7 +488,7 @@ public class NotificationChildrenContainer extends ViewGroup { long baseDelay, long duration) { int childCount = mChildren.size(); ViewState tmpState = new ViewState(); - float expandFraction = getChildExpandFraction(); + float expandFraction = getGroupExpandFraction(); for (int i = childCount - 1; i >= 0; i--) { ExpandableNotificationRow child = mChildren.get(i); StackViewState viewState = state.getViewStateForView(child); @@ -468,13 +500,23 @@ public class NotificationChildrenContainer extends ViewGroup { tmpState.yTranslation = viewState.yTranslation - mDividerHeight; float alpha = mChildrenExpanded && viewState.alpha != 0 ? 0.5f : 0; if (mUserLocked && viewState.alpha != 0) { - alpha = NotificationUtils.interpolate(0, 0.5f, expandFraction); + alpha = NotificationUtils.interpolate(0, 0.5f, + Math.min(viewState.alpha, expandFraction)); } tmpState.alpha = alpha; stateAnimator.startViewAnimations(divider, tmpState, baseDelay, duration); - } - if (mGroupOverflowContainer != null) { - stateAnimator.startViewAnimations(mGroupOverflowContainer, mGroupOverFlowState, + // There is no fake shadow to be drawn on the children + child.setFakeShadowIntensity(0.0f, 0.0f, 0, 0); + } + if (mOverflowNumber != null) { + if (mNeverAppliedGroupState) { + float alpha = mGroupOverFlowState.alpha; + mGroupOverFlowState.alpha = 0; + state.applyViewState(mOverflowNumber, mGroupOverFlowState); + mGroupOverFlowState.alpha = alpha; + mNeverAppliedGroupState = false; + } + stateAnimator.startViewAnimations(mOverflowNumber, mGroupOverFlowState, baseDelay, duration); } } @@ -529,44 +571,49 @@ public class NotificationChildrenContainer extends ViewGroup { return; } mActualHeight = actualHeight; - float fraction = getChildExpandFraction(); + float fraction = getGroupExpandFraction(); + int maxAllowedVisibleChildren = getMaxAllowedVisibleChildren(true /* forceCollapsed */); int childCount = mChildren.size(); for (int i = 0; i < childCount; i++) { ExpandableNotificationRow child = mChildren.get(i); float childHeight = child.isExpanded(true /* allowOnKeyguard */) ? child.getMaxExpandHeight() : child.getShowingLayout().getMinHeight(true /* likeGroupExpanded */); - float singleLineHeight = child.getShowingLayout().getMinHeight( - false /* likeGroupExpanded */); - child.setActualHeight((int) NotificationUtils.interpolate(singleLineHeight, childHeight, - fraction), false); + if (i < maxAllowedVisibleChildren) { + float singleLineHeight = child.getShowingLayout().getMinHeight( + false /* likeGroupExpanded */); + child.setActualHeight((int) NotificationUtils.interpolate(singleLineHeight, + childHeight, fraction), false); + } else { + child.setActualHeight((int) childHeight, false); + } } } - public float getChildExpandFraction() { - int allChildrenVisibleHeight = getChildrenExpandStartHeight(); - int maxContentHeight = getMaxContentHeight(); - float factor = (mActualHeight - allChildrenVisibleHeight) - / (float) (maxContentHeight - allChildrenVisibleHeight); + public float getGroupExpandFraction() { + int visibleChildrenExpandedHeight = getVisibleChildrenExpandHeight(); + int minExpandHeight = getMinExpandHeight(); + float factor = (mActualHeight - minExpandHeight) + / (float) (visibleChildrenExpandedHeight - minExpandHeight); return Math.max(0.0f, Math.min(1.0f, factor)); } - private int getChildrenExpandStartHeight() { - int intrinsicHeight = mNotificationHeaderHeight; + private int getVisibleChildrenExpandHeight() { + int intrinsicHeight = mNotificationHeaderHeight + mNotificatonTopPadding + mDividerHeight; int visibleChildren = 0; int childCount = mChildren.size(); + int maxAllowedVisibleChildren = getMaxAllowedVisibleChildren(true /* forceCollapsed */); for (int i = 0; i < childCount; i++) { - if (visibleChildren >= NUMBER_OF_CHILDREN_WHEN_CHILDREN_EXPANDED) { + if (visibleChildren >= maxAllowedVisibleChildren) { break; } ExpandableNotificationRow child = mChildren.get(i); - intrinsicHeight += child.getMinHeight(); + float childHeight = child.isExpanded(true /* allowOnKeyguard */) + ? child.getMaxExpandHeight() + : child.getShowingLayout().getMinHeight(true /* likeGroupExpanded */); + intrinsicHeight += childHeight; visibleChildren++; } - if (visibleChildren > 0) { - intrinsicHeight += (visibleChildren - 1) * mChildPadding; - } - intrinsicHeight += mCollapsedBottompadding; return intrinsicHeight; } @@ -574,9 +621,8 @@ public class NotificationChildrenContainer extends ViewGroup { return getIntrinsicHeight(NUMBER_OF_CHILDREN_WHEN_COLLAPSED); } - public int getMinExpandHeight(boolean onKeyguard) { - int maxAllowedVisibleChildren = onKeyguard ? NUMBER_OF_CHILDREN_WHEN_COLLAPSED - : getMaxAllowedVisibleChildren(true /* forceCollapsed */); + public int getMinExpandHeight() { + int maxAllowedVisibleChildren = getMaxAllowedVisibleChildren(true /* forceCollapsed */); int minExpandHeight = mNotificationHeaderHeight; int visibleChildren = 0; boolean firstChild = true; @@ -599,7 +645,7 @@ public class NotificationChildrenContainer extends ViewGroup { } public void setDark(boolean dark, boolean fade, long delay) { - if (mGroupOverflowContainer != null) { + if (mOverflowNumber != null) { mOverflowInvertHelper.setInverted(dark, fade, delay); } } @@ -624,4 +670,9 @@ public class NotificationChildrenContainer extends ViewGroup { child.setUserLocked(userLocked); } } + + public void onNotificationUpdated() { + mHybridGroupManager.setOverflowNumberColor(mOverflowNumber, + mNotificationParent.getNotificationColor()); + } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java index 686a71211dc9..bc276b7e5060 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java @@ -694,11 +694,7 @@ public class NotificationStackScrollLayout extends ViewGroup mHeadsUpManager.addSwipedOutNotification(row.getStatusBarNotification().getKey()); } } - final View veto = v.findViewById(R.id.veto); - if (veto != null && veto.getVisibility() != View.GONE) { - veto.performClick(); - } - if (DEBUG) Log.v(TAG, "onChildDismissed: " + v); + performDismiss(v); mFalsingManager.onNotificationDismissed(); if (mFalsingManager.shouldEnforceBouncer()) { @@ -707,6 +703,24 @@ public class NotificationStackScrollLayout extends ViewGroup } } + private void performDismiss(View v) { + if (v instanceof ExpandableNotificationRow) { + ExpandableNotificationRow row = (ExpandableNotificationRow) v; + if (mGroupManager.isOnlyChildInSuppressedGroup(row.getStatusBarNotification())) { + ExpandableNotificationRow groupSummary = + mGroupManager.getLogicalGroupSummary(row.getStatusBarNotification()); + if (groupSummary.isClearable()) { + performDismiss(groupSummary); + } + } + } + final View veto = v.findViewById(R.id.veto); + if (veto != null && veto.getVisibility() != View.GONE) { + veto.performClick(); + } + if (DEBUG) Log.v(TAG, "onChildDismissed: " + v); + } + @Override public void onChildSnappedBack(View animView, float targetLeft) { mAmbientState.onDragFinished(animView); @@ -943,6 +957,11 @@ public class NotificationStackScrollLayout extends ViewGroup mSwipeHelper.dismissChild(child, 0, endRunnable, delay, true, duration); } + public void snapViewIfNeeded(View child) { + boolean animate = mIsExpanded || isPinnedHeadsUp(child); + mSwipeHelper.snapChildIfNeeded(child, animate); + } + @Override public boolean onTouchEvent(MotionEvent ev) { boolean isCancelOrUp = ev.getActionMasked() == MotionEvent.ACTION_CANCEL @@ -3265,7 +3284,7 @@ public class NotificationStackScrollLayout extends ViewGroup } @Override - public void onChildIsolationChanged() { + public void onGroupsChanged() { mPhoneStatusBar.requestNotificationUpdate(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java index cf4802d70d15..dba5bbd27a7a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/StackStateAnimator.java @@ -972,10 +972,10 @@ public class StackStateAnimator { } /** - * Get the end value of the height animation running on a view or the actualHeight + * Get the end value of the yTranslation animation running on a view or the yTranslation * if no animation is running. */ - public static float getFinalTranslationY(ExpandableView view) { + public static float getFinalTranslationY(View view) { if (view == null) { return 0; } diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java index ff7ea276aa91..95cee4c0438e 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipManager.java @@ -120,6 +120,14 @@ public class PipManager { mMediaSessionManager.addOnActiveSessionsChangedListener( mActiveMediaSessionListener, null); updateMediaController(mMediaSessionManager.getActiveSessions(null)); + if (mIsRecentsShown) { + // If an activity becomes PIPed again after the fullscreen, the Recents is shown + // behind so we need to resize the pinned stack and show the correct overlay. + resizePinnedStack(STATE_PIP_OVERLAY); + } + for (int i = mListeners.size() - 1; i >= 0; i--) { + mListeners.get(i).onPipEntered(); + } } }; private final Runnable mOnTaskStackChanged = new Runnable() { @@ -152,6 +160,7 @@ public class PipManager { private final Runnable mOnPinnedActivityRestartAttempt = new Runnable() { @Override public void run() { + // If PIPed activity is launched again by Launcher or intent, make it fullscreen. movePipToFullscreen(); } }; @@ -315,11 +324,7 @@ public class PipManager { private void showPipOverlay() { if (DEBUG) Log.d(TAG, "showPipOverlay()"); mState = STATE_PIP_OVERLAY; - Intent intent = new Intent(mContext, PipOverlayActivity.class); - intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - final ActivityOptions options = ActivityOptions.makeBasic(); - options.setLaunchStackId(PINNED_STACK_ID); - mContext.startActivity(intent, options.toBundle()); + PipOverlayActivity.showPipOverlay(mContext); } /** @@ -385,9 +390,9 @@ public class PipManager { break; } try { - mActivityManager.resizeStack(PINNED_STACK_ID, mCurrentPipBounds, true, true, true); + mActivityManager.resizeStack(PINNED_STACK_ID, mCurrentPipBounds, true, true, true, -1); } catch (RemoteException e) { - Log.e(TAG, "showPipMenu failed", e); + Log.e(TAG, "resizeStack failed", e); } } @@ -485,17 +490,7 @@ public class PipManager { * Returns {@code true} if PIP is shown. */ public boolean isPipShown() { - return hasPipTasks(); - } - - private boolean hasPipTasks() { - try { - StackInfo stackInfo = mActivityManager.getStackInfo(PINNED_STACK_ID); - return stackInfo != null; - } catch (RemoteException e) { - Log.e(TAG, "getStackInfo failed", e); - return false; - } + return mState != STATE_NO_PIP; } private void handleMediaResourceGranted(String[] packageNames) { @@ -603,6 +598,13 @@ public class PipManager { * A listener interface to receive notification on changes in PIP. */ public interface Listener { + /** + * Invoked when an activity is pinned and PIP manager is set corresponding information. + * Classes must use this instead of {@link android.app.ITaskStackListener.onActivityPinned} + * because there's no guarantee for the PIP manager be return relavent information + * correctly. (e.g. {@link isPipShown}, {@link getPipBounds}) + */ + void onPipEntered(); /** Invoked when a PIPed activity is closed. */ void onPipActivityClosed(); /** Invoked when the PIP menu gets shown. */ diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java index 285dfd1f9318..b8b837a0cb84 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipMenuActivity.java @@ -198,6 +198,9 @@ public class PipMenuActivity extends Activity implements PipManager.Listener { } @Override + public void onPipEntered() { } + + @Override public void onPipActivityClosed() { finish(); } diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipOnboardingActivity.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipOnboardingActivity.java index ad45625b0f9c..79daf3d51056 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipOnboardingActivity.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipOnboardingActivity.java @@ -67,6 +67,9 @@ public class PipOnboardingActivity extends Activity implements PipManager.Listen } @Override + public void onPipEntered() { } + + @Override public void onPipActivityClosed() { finish(); } diff --git a/packages/SystemUI/src/com/android/systemui/tv/pip/PipOverlayActivity.java b/packages/SystemUI/src/com/android/systemui/tv/pip/PipOverlayActivity.java index 95d655c2f320..1de321dd1004 100644 --- a/packages/SystemUI/src/com/android/systemui/tv/pip/PipOverlayActivity.java +++ b/packages/SystemUI/src/com/android/systemui/tv/pip/PipOverlayActivity.java @@ -17,21 +17,31 @@ package com.android.systemui.tv.pip; import android.app.Activity; +import android.app.ActivityOptions; +import android.content.Context; +import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.view.View; import com.android.systemui.R; +import static android.app.ActivityManager.StackId.PINNED_STACK_ID; + /** * Activity to show an overlay on top of PIP activity to show how to pop up PIP menu. */ public class PipOverlayActivity extends Activity implements PipManager.Listener { - private static final String TAG = "PipOverlayActivity"; - private static final boolean DEBUG = false; - private static final long SHOW_GUIDE_OVERLAY_VIEW_DURATION_MS = 4000; + /** + * The single instance of PipOverlayActivity to prevent it from restarting. + * Note that {@link PipManager} moves the PIPed activity to fullscreen if the activity is + * restarted. It's because the activity may be started by the Launcher or an intent again, + * but we don't want do so for the PipOverlayActivity. + */ + private static PipOverlayActivity sPipOverlayActivity; + private final PipManager mPipManager = PipManager.getInstance(); private final Handler mHandler = new Handler(); private View mGuideOverlayView; @@ -42,6 +52,19 @@ public class PipOverlayActivity extends Activity implements PipManager.Listener } }; + /** + * Launches the PIP overlay. This should be only called on the main thread. + */ + public static void showPipOverlay(Context context) { + if (sPipOverlayActivity == null) { + Intent intent = new Intent(context, PipOverlayActivity.class); + intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + final ActivityOptions options = ActivityOptions.makeBasic(); + options.setLaunchStackId(PINNED_STACK_ID); + context.startActivity(intent, options.toBundle()); + } + } + @Override protected void onCreate(Bundle bundle) { super.onCreate(bundle); @@ -49,6 +72,8 @@ public class PipOverlayActivity extends Activity implements PipManager.Listener mGuideOverlayView = findViewById(R.id.guide_overlay); mGuideButtonsView = findViewById(R.id.guide_buttons); mPipManager.addListener(this); + + sPipOverlayActivity = this; } @Override @@ -76,6 +101,7 @@ public class PipOverlayActivity extends Activity implements PipManager.Listener @Override protected void onDestroy() { super.onDestroy(); + sPipOverlayActivity = null; mHandler.removeCallbacksAndMessages(null); mPipManager.removeListener(this); mPipManager.resumePipResizing( @@ -83,6 +109,9 @@ public class PipOverlayActivity extends Activity implements PipManager.Listener } @Override + public void onPipEntered() { } + + @Override public void onPipActivityClosed() { finish(); } @@ -105,6 +134,11 @@ public class PipOverlayActivity extends Activity implements PipManager.Listener } @Override - public void onMediaControllerChanged() { + public void onMediaControllerChanged() { } + + @Override + public void finish() { + sPipOverlayActivity = null; + super.finish(); } } diff --git a/packages/VpnDialogs/res/values-be-rBY/strings.xml b/packages/VpnDialogs/res/values-be-rBY/strings.xml new file mode 100644 index 000000000000..d96a1729f492 --- /dev/null +++ b/packages/VpnDialogs/res/values-be-rBY/strings.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="prompt" msgid="3183836924226407828">"Запыт на падлучэнне"</string> + <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> спрабуе наладзіць падлучэнне VPN, якое дазваляе сачыць за сеткавым трафікам. Прымайце толькі тады, калі вы давяраеце гэтай крыніцы. Калі VPN актыўны, у верхняй частцы экрана адлюстроўваецца <br /> <br /> <img src=vpn_icon />."</string> + <string name="legacy_title" msgid="192936250066580964">"VPN падключаны"</string> + <string name="configure" msgid="4905518375574791375">"Наладзіць"</string> + <string name="disconnect" msgid="971412338304200056">"Адключыцца"</string> + <string name="session" msgid="6470628549473641030">"Сессія"</string> + <string name="duration" msgid="3584782459928719435">"Працягласць:"</string> + <string name="data_transmitted" msgid="7988167672982199061">"Адпраўлена:"</string> + <string name="data_received" msgid="4062776929376067820">"Атрымана:"</string> + <string name="data_value_format" msgid="2192466557826897580">"<xliff:g id="NUMBER_0">%1$s</xliff:g> байт / <xliff:g id="NUMBER_1">%2$s</xliff:g> пакеты"</string> +</resources> diff --git a/packages/VpnDialogs/res/values-bs-rBA/strings.xml b/packages/VpnDialogs/res/values-bs-rBA/strings.xml new file mode 100644 index 000000000000..899908c290e8 --- /dev/null +++ b/packages/VpnDialogs/res/values-bs-rBA/strings.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<resources xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <string name="prompt" msgid="3183836924226407828">"Zahtjev za povezivanje"</string> + <string name="warning" msgid="809658604548412033">"Aplikacija <xliff:g id="APP">%s</xliff:g> želi podesiti VPN vezu koja joj omogućava praćenje mrežnog saobraćaja. Prihvatite samo ako je izvor pouzdan. <br /> <br /> <img src=vpn_icon /> se pojavi na vrhu ekrana kada je VPN aktivna."</string> + <string name="legacy_title" msgid="192936250066580964">"VPN veza uspostavljena"</string> + <string name="configure" msgid="4905518375574791375">"Konfiguriraj"</string> + <string name="disconnect" msgid="971412338304200056">"Prekini vezu"</string> + <string name="session" msgid="6470628549473641030">"Sesija:"</string> + <string name="duration" msgid="3584782459928719435">"Trajanje:"</string> + <string name="data_transmitted" msgid="7988167672982199061">"Poslano:"</string> + <string name="data_received" msgid="4062776929376067820">"Primljeno:"</string> + <string name="data_value_format" msgid="2192466557826897580">"Broj bajtova: <xliff:g id="NUMBER_0">%1$s</xliff:g>/Broj paketa: <xliff:g id="NUMBER_1">%2$s</xliff:g>"</string> +</resources> diff --git a/packages/VpnDialogs/res/values-ro/strings.xml b/packages/VpnDialogs/res/values-ro/strings.xml index a77ef0390ec8..4865e964fc74 100644 --- a/packages/VpnDialogs/res/values-ro/strings.xml +++ b/packages/VpnDialogs/res/values-ro/strings.xml @@ -20,10 +20,10 @@ <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> dorește să configureze o conexiune VPN care să îi permită să monitorizeze traficul în rețea. Acceptați numai dacă aveți încredere în sursă. Atunci când conexiunea VPN este activă, <br /> <br /> <img src=vpn_icon /> se afișează în partea de sus a ecranului."</string> <string name="legacy_title" msgid="192936250066580964">"VPN este conectat"</string> <string name="configure" msgid="4905518375574791375">"Configurați"</string> - <string name="disconnect" msgid="971412338304200056">"Deconectaţi"</string> + <string name="disconnect" msgid="971412338304200056">"Deconectați"</string> <string name="session" msgid="6470628549473641030">"Sesiune:"</string> <string name="duration" msgid="3584782459928719435">"Durată:"</string> <string name="data_transmitted" msgid="7988167672982199061">"Trimise:"</string> <string name="data_received" msgid="4062776929376067820">"Primite:"</string> - <string name="data_value_format" msgid="2192466557826897580">"<xliff:g id="NUMBER_0">%1$s</xliff:g> (de) octeţi/<xliff:g id="NUMBER_1">%2$s</xliff:g> (de) pachete"</string> + <string name="data_value_format" msgid="2192466557826897580">"<xliff:g id="NUMBER_0">%1$s</xliff:g> (de) octeți/<xliff:g id="NUMBER_1">%2$s</xliff:g> (de) pachete"</string> </resources> diff --git a/packages/VpnDialogs/res/values-uz-rUZ/strings.xml b/packages/VpnDialogs/res/values-uz-rUZ/strings.xml index 9185297da2e2..69e3e2962bca 100644 --- a/packages/VpnDialogs/res/values-uz-rUZ/strings.xml +++ b/packages/VpnDialogs/res/values-uz-rUZ/strings.xml @@ -17,7 +17,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="prompt" msgid="3183836924226407828">"Ulanish uchun so‘rov"</string> - <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> ilovasi tarmoq trafigini kuzatish uchun VPN ulanishini o‘rnatmoqchi. Agar ilova manbasiga ishonsangiz, unga rozi bo‘ling. VPN faol bo‘lsa, ekran tepasida <br /> <br /> <img src=vpn_icon /> paydo bo‘ladi."</string> + <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> ilovasi trafikni kuzatish uchun VPN tarmog‘iga ulanmoqchi. Agar ilovaga ishonsangiz, so‘rovga rozi bo‘ling.<br /> <br />VPN faol bo‘lsa, ekranning yuqori qismida <img src=vpn_icon /> belgisi paydo bo‘ladi."</string> <string name="legacy_title" msgid="192936250066580964">"VPN ulangan"</string> <string name="configure" msgid="4905518375574791375">"Moslash"</string> <string name="disconnect" msgid="971412338304200056">"Aloqani uzish"</string> diff --git a/rs/java/android/renderscript/RenderScript.java b/rs/java/android/renderscript/RenderScript.java index 425569cd8fa1..9beaba301072 100644 --- a/rs/java/android/renderscript/RenderScript.java +++ b/rs/java/android/renderscript/RenderScript.java @@ -1387,6 +1387,27 @@ public class RenderScript { } /** + * Name of the file that holds the object cache. + */ + private static String mCachePath; + + /** + * Gets the path to the code cache. + */ + static synchronized String getCachePath() { + if (mCachePath == null) { + final String CACHE_PATH = "com.android.renderscript.cache"; + if (RenderScriptCacheDir.mCacheDir == null) { + throw new RSRuntimeException("RenderScript code cache directory uninitialized."); + } + File f = new File(RenderScriptCacheDir.mCacheDir, CACHE_PATH); + mCachePath = f.getAbsolutePath(); + f.mkdirs(); + } + return mCachePath; + } + + /** * Create a RenderScript context. * * @param ctx The context. @@ -1415,11 +1436,7 @@ public class RenderScript { } // set up cache directory for entire context - final String CACHE_PATH = "com.android.renderscript.cache"; - File f = new File(RenderScriptCacheDir.mCacheDir, CACHE_PATH); - String mCachePath = f.getAbsolutePath(); - f.mkdirs(); - rs.nContextSetCacheDir(mCachePath); + rs.nContextSetCacheDir(RenderScript.getCachePath()); rs.mMessageThread = new MessageThread(rs); rs.mMessageThread.start(); diff --git a/rs/java/android/renderscript/ScriptC.java b/rs/java/android/renderscript/ScriptC.java index bf706c131e85..00ebe5756589 100644 --- a/rs/java/android/renderscript/ScriptC.java +++ b/rs/java/android/renderscript/ScriptC.java @@ -84,13 +84,6 @@ public class ScriptC extends Script { setID(id); } - /** - * Name of the file that holds the object cache. - */ - private static final String CACHE_PATH = "com.android.renderscript.cache"; - - static String mCachePath; - private static synchronized long internalCreate(RenderScript rs, Resources resources, int resourceID) { byte[] pgm; int pgmLength; @@ -122,26 +115,12 @@ public class ScriptC extends Script { String resName = resources.getResourceEntryName(resourceID); - // Create the RS cache path if we haven't done so already. - if (mCachePath == null) { - File f = new File(RenderScriptCacheDir.mCacheDir, CACHE_PATH); - mCachePath = f.getAbsolutePath(); - f.mkdirs(); - } // Log.v(TAG, "Create script for resource = " + resName); - return rs.nScriptCCreate(resName, mCachePath, pgm, pgmLength); + return rs.nScriptCCreate(resName, RenderScript.getCachePath(), pgm, pgmLength); } private static synchronized long internalStringCreate(RenderScript rs, String resName, byte[] bitcode) { - // Create the RS cache path if we haven't done so already. - if (mCachePath == null) { - File f = new File(RenderScriptCacheDir.mCacheDir, CACHE_PATH); - mCachePath = f.getAbsolutePath(); - f.mkdirs(); - } // Log.v(TAG, "Create script for resource = " + resName); - return rs.nScriptCCreate(resName, mCachePath, bitcode, bitcode.length); + return rs.nScriptCCreate(resName, RenderScript.getCachePath(), bitcode, bitcode.length); } - - } diff --git a/rs/java/android/renderscript/ScriptGroup.java b/rs/java/android/renderscript/ScriptGroup.java index 9bbacbc0d84c..9357c3bb0428 100644 --- a/rs/java/android/renderscript/ScriptGroup.java +++ b/rs/java/android/renderscript/ScriptGroup.java @@ -396,7 +396,7 @@ public final class ScriptGroup extends BaseObj { for (int i = 0; i < closureIDs.length; i++) { closureIDs[i] = closures.get(i).getID(rs); } - long id = rs.nScriptGroup2Create(name, ScriptC.mCachePath, closureIDs); + long id = rs.nScriptGroup2Create(name, RenderScript.getCachePath(), closureIDs); setID(id); } diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java index 9ce81ed2f10c..e710dedd31fe 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityManagerService.java @@ -1549,7 +1549,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { try { Settings.Secure.putIntForUser(mContext.getContentResolver(), Settings.Secure.ACCESSIBILITY_ENABLED, - userState.isHandlingAccessibilityEvents() ? 0 : 1, + userState.isHandlingAccessibilityEvents() ? 1 : 0, userState.mUserId); } finally { Binder.restoreCallingIdentity(identity); @@ -4086,7 +4086,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub { } public boolean isHandlingAccessibilityEvents() { - return !mBoundServices.isEmpty() || !mBoundServices.isEmpty(); + return !mBoundServices.isEmpty() || !mBindingServices.isEmpty(); } public void onSwitchToAnotherUser() { diff --git a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java index 8febecc1ce4e..215be4a0ea2e 100644 --- a/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java +++ b/services/appwidget/java/com/android/server/appwidget/AppWidgetServiceImpl.java @@ -332,7 +332,12 @@ class AppWidgetServiceImpl extends IAppWidgetService.Stub implements WidgetBacku for (int i = N - 1; i >= 0; i--) { Provider provider = installedProviders.get(i); - ensureGroupStateLoadedLocked(provider.getUserId()); + final int userId = provider.getUserId(); + if (!mUserManager.isUserUnlocked(userId) || + isProfileWithLockedParent(userId)) { + continue; + } + ensureGroupStateLoadedLocked(userId); if (!removedProviders.contains(provider.id)) { final boolean changed = updateProvidersForPackageLocked( diff --git a/services/backup/java/com/android/server/backup/BackupManagerService.java b/services/backup/java/com/android/server/backup/BackupManagerService.java index cd4d107d5a98..b737ae2c3ee4 100644 --- a/services/backup/java/com/android/server/backup/BackupManagerService.java +++ b/services/backup/java/com/android/server/backup/BackupManagerService.java @@ -2918,9 +2918,15 @@ public class BackupManagerService { mBackupRunning = false; if (mStatus == BackupTransport.TRANSPORT_NOT_INITIALIZED) { // Make sure we back up everything and perform the one-time init - clearMetadata(); if (MORE_DEBUG) Slog.d(TAG, "Server requires init; rerunning"); addBackupTrace("init required; rerunning"); + try { + mPendingInits.add(mTransport.transportDirName()); + } catch (Exception e) { + Slog.w(TAG, "Failed to query transport name heading for init", e); + // swallow it and proceed; we don't rely on this + } + clearMetadata(); backupNow(); } } @@ -4451,13 +4457,21 @@ public class BackupManagerService { } } - // We still could fail in backup runner thread, getting result from there. - int backupRunnerResult = backupRunner.getBackupResultBlocking(); - if (backupPackageStatus != BackupTransport.TRANSPORT_ERROR - && backupRunnerResult != BackupTransport.TRANSPORT_OK) { - // If there was an error in runner thread and - // not TRANSPORT_ERROR here, overwrite it. - backupPackageStatus = backupRunnerResult; + // TRANSPORT_ERROR here means that we've hit an error that the runner + // doesn't know about, so it's still moving data but we're pulling the + // rug out from under it. Don't ask for its result: we already know better + // and we'll hang if we block waiting for it, since it relies on us to + // read back the data it's writing into the engine. Just proceed with + // a graceful failure. The runner/engine mechanism will tear itself + // down cleanly when we close the pipes from this end. + if (backupPackageStatus != BackupTransport.TRANSPORT_ERROR) { + // We still could fail in backup runner thread, getting result from there. + int backupRunnerResult = backupRunner.getBackupResultBlocking(); + if (backupRunnerResult != BackupTransport.TRANSPORT_OK) { + // If there was an error in runner thread and + // not TRANSPORT_ERROR here, overwrite it. + backupPackageStatus = backupRunnerResult; + } } if (MORE_DEBUG) { diff --git a/services/core/java/com/android/server/AlarmManagerService.java b/services/core/java/com/android/server/AlarmManagerService.java index c5a210c6802d..7da247a45341 100644 --- a/services/core/java/com/android/server/AlarmManagerService.java +++ b/services/core/java/com/android/server/AlarmManagerService.java @@ -2297,7 +2297,7 @@ class AlarmManagerService extends SystemService { if (operation != null) { sb.append(operation.getTargetPackage()); } else { - sb.append(listener.asBinder().toString()); + sb.append(packageName); } sb.append('}'); return sb.toString(); diff --git a/services/core/java/com/android/server/AppOpsService.java b/services/core/java/com/android/server/AppOpsService.java index a94c8b8ebb31..e7db2a87c865 100644 --- a/services/core/java/com/android/server/AppOpsService.java +++ b/services/core/java/com/android/server/AppOpsService.java @@ -447,12 +447,8 @@ public class AppOpsService extends IAppOpsService.Stub { int[] ops) { mContext.enforcePermission(android.Manifest.permission.GET_APP_OPS_STATS, Binder.getCallingPid(), Binder.getCallingUid(), null); - String resolvedPackageName = resolvePackageName(uid, packageName); - if (resolvedPackageName == null) { - return Collections.emptyList(); - } synchronized (this) { - Ops pkgOps = getOpsRawLocked(uid, resolvedPackageName, false); + Ops pkgOps = getOpsLocked(uid, packageName, false); if (pkgOps == null) { return null; } @@ -470,7 +466,7 @@ public class AppOpsService extends IAppOpsService.Stub { private void pruneOp(Op op, int uid, String packageName) { if (op.time == 0 && op.rejectTime == 0) { - Ops ops = getOpsRawLocked(uid, packageName, false); + Ops ops = getOpsLocked(uid, packageName, false); if (ops != null) { ops.remove(op.op); if (ops.size() <= 0) { @@ -884,12 +880,8 @@ public class AppOpsService extends IAppOpsService.Stub { public int checkOperation(int code, int uid, String packageName) { verifyIncomingUid(uid); verifyIncomingOp(code); - String resolvedPackageName = resolvePackageName(uid, packageName); - if (resolvedPackageName == null) { - return AppOpsManager.MODE_IGNORED; - } synchronized (this) { - if (isOpRestricted(uid, code, resolvedPackageName)) { + if (isOpRestricted(uid, code, packageName)) { return AppOpsManager.MODE_IGNORED; } code = AppOpsManager.opToSwitch(code); @@ -900,7 +892,7 @@ public class AppOpsService extends IAppOpsService.Stub { return uidMode; } } - Op op = getOpLocked(code, uid, resolvedPackageName, false); + Op op = getOpLocked(code, uid, packageName, false); if (op == null) { return AppOpsManager.opToDefaultMode(code); } @@ -976,7 +968,6 @@ public class AppOpsService extends IAppOpsService.Stub { @Override public int checkPackage(int uid, String packageName) { - Preconditions.checkNotNull(packageName); synchronized (this) { if (getOpsRawLocked(uid, packageName, true) != null) { return AppOpsManager.MODE_ALLOWED; @@ -990,39 +981,26 @@ public class AppOpsService extends IAppOpsService.Stub { public int noteProxyOperation(int code, String proxyPackageName, int proxiedUid, String proxiedPackageName) { verifyIncomingOp(code); - final int proxyUid = Binder.getCallingUid(); - String resolveProxyPackageName = resolvePackageName(proxyUid, proxyPackageName); - if (resolveProxyPackageName == null) { - return AppOpsManager.MODE_IGNORED; - } - final int proxyMode = noteOperationUnchecked(code, proxyUid, - resolveProxyPackageName, -1, null); + final int proxyMode = noteOperationUnchecked(code, Binder.getCallingUid(), + proxyPackageName, -1, null); if (proxyMode != AppOpsManager.MODE_ALLOWED || Binder.getCallingUid() == proxiedUid) { return proxyMode; } - String resolveProxiedPackageName = resolvePackageName(proxiedUid, proxiedPackageName); - if (resolveProxiedPackageName == null) { - return AppOpsManager.MODE_IGNORED; - } - return noteOperationUnchecked(code, proxiedUid, resolveProxiedPackageName, - proxyMode, resolveProxyPackageName); + return noteOperationUnchecked(code, proxiedUid, proxiedPackageName, + Binder.getCallingUid(), proxyPackageName); } @Override public int noteOperation(int code, int uid, String packageName) { verifyIncomingUid(uid); verifyIncomingOp(code); - String resolvedPackageName = resolvePackageName(uid, packageName); - if (resolvedPackageName == null) { - return AppOpsManager.MODE_IGNORED; - } - return noteOperationUnchecked(code, uid, resolvedPackageName, 0, null); + return noteOperationUnchecked(code, uid, packageName, 0, null); } private int noteOperationUnchecked(int code, int uid, String packageName, int proxyUid, String proxyPackageName) { synchronized (this) { - Ops ops = getOpsRawLocked(uid, packageName, true); + Ops ops = getOpsLocked(uid, packageName, true); if (ops == null) { if (DEBUG) Log.d(TAG, "noteOperation: no op for code " + code + " uid " + uid + " package " + packageName); @@ -1070,20 +1048,16 @@ public class AppOpsService extends IAppOpsService.Stub { public int startOperation(IBinder token, int code, int uid, String packageName) { verifyIncomingUid(uid); verifyIncomingOp(code); - String resolvedPackageName = resolvePackageName(uid, packageName); - if (resolvedPackageName == null) { - return AppOpsManager.MODE_IGNORED; - } ClientState client = (ClientState)token; synchronized (this) { - Ops ops = getOpsRawLocked(uid, resolvedPackageName, true); + Ops ops = getOpsLocked(uid, packageName, true); if (ops == null) { if (DEBUG) Log.d(TAG, "startOperation: no op for code " + code + " uid " + uid - + " package " + resolvedPackageName); + + " package " + packageName); return AppOpsManager.MODE_ERRORED; } Op op = getOpLocked(ops, code, true); - if (isOpRestricted(uid, code, resolvedPackageName)) { + if (isOpRestricted(uid, code, packageName)) { return AppOpsManager.MODE_IGNORED; } final int switchCode = AppOpsManager.opToSwitch(code); @@ -1093,7 +1067,7 @@ public class AppOpsService extends IAppOpsService.Stub { if (uidMode != AppOpsManager.MODE_ALLOWED) { if (DEBUG) Log.d(TAG, "noteOperation: reject #" + op.mode + " for code " + switchCode + " (" + code + ") uid " + uid + " package " - + resolvedPackageName); + + packageName); op.rejectTime = System.currentTimeMillis(); return uidMode; } @@ -1101,13 +1075,12 @@ public class AppOpsService extends IAppOpsService.Stub { final Op switchOp = switchCode != code ? getOpLocked(ops, switchCode, true) : op; if (switchOp.mode != AppOpsManager.MODE_ALLOWED) { if (DEBUG) Log.d(TAG, "startOperation: reject #" + op.mode + " for code " - + switchCode + " (" + code + ") uid " + uid + " package " - + resolvedPackageName); + + switchCode + " (" + code + ") uid " + uid + " package " + packageName); op.rejectTime = System.currentTimeMillis(); return switchOp.mode; } if (DEBUG) Log.d(TAG, "startOperation: allowing code " + code + " uid " + uid - + " package " + resolvedPackageName); + + " package " + packageName); if (op.nesting == 0) { op.time = System.currentTimeMillis(); op.rejectTime = 0; @@ -1125,16 +1098,9 @@ public class AppOpsService extends IAppOpsService.Stub { public void finishOperation(IBinder token, int code, int uid, String packageName) { verifyIncomingUid(uid); verifyIncomingOp(code); - String resolvedPackageName = resolvePackageName(uid, packageName); - if (resolvedPackageName == null) { - return; - } - if (!(token instanceof ClientState)) { - return; - } - ClientState client = (ClientState) token; + ClientState client = (ClientState)token; synchronized (this) { - Op op = getOpLocked(code, uid, resolvedPackageName, true); + Op op = getOpLocked(code, uid, packageName, true); if (op == null) { return; } @@ -1150,9 +1116,6 @@ public class AppOpsService extends IAppOpsService.Stub { @Override public int permissionToOpCode(String permission) { - if (permission == null) { - return AppOpsManager.OP_NONE; - } return AppOpsManager.permissionToOpCode(permission); } @@ -1202,6 +1165,15 @@ public class AppOpsService extends IAppOpsService.Stub { return uidState; } + private Ops getOpsLocked(int uid, String packageName, boolean edit) { + if (uid == 0) { + packageName = "root"; + } else if (uid == Process.SHELL_UID) { + packageName = "com.android.shell"; + } + return getOpsRawLocked(uid, packageName, edit); + } + private Ops getOpsRawLocked(int uid, String packageName, boolean edit) { UidState uidState = getUidStateLocked(uid, edit); if (uidState == null) { @@ -1287,7 +1259,7 @@ public class AppOpsService extends IAppOpsService.Stub { } private Op getOpLocked(int code, int uid, String packageName, boolean edit) { - Ops ops = getOpsRawLocked(uid, packageName, edit); + Ops ops = getOpsLocked(uid, packageName, edit); if (ops == null) { return null; } @@ -1345,7 +1317,7 @@ public class AppOpsService extends IAppOpsService.Stub { if (AppOpsManager.opAllowSystemBypassRestriction(code)) { // If we are the system, bypass user restrictions for certain codes synchronized (this) { - Ops ops = getOpsRawLocked(uid, packageName, true); + Ops ops = getOpsLocked(uid, packageName, true); if ((ops != null) && ops.isPrivileged) { return false; } @@ -1610,7 +1582,7 @@ public class AppOpsService extends IAppOpsService.Stub { out.startTag(null, "uid"); out.attribute(null, "n", Integer.toString(pkg.getUid())); synchronized (this) { - Ops ops = getOpsRawLocked(pkg.getUid(), pkg.getPackageName(), false); + Ops ops = getOpsLocked(pkg.getUid(), pkg.getPackageName(), false); // Should always be present as the list of PackageOps is generated // from Ops. if (ops != null) { @@ -2131,7 +2103,6 @@ public class AppOpsService extends IAppOpsService.Stub { @Override public void setUserRestrictions(Bundle restrictions, IBinder token, int userHandle) { checkSystemUid("setUserRestrictions"); - Preconditions.checkNotNull(restrictions); Preconditions.checkNotNull(token); final boolean[] opRestrictions = getOrCreateUserRestrictionsForToken(token, userHandle); for (int i = 0; i < opRestrictions.length; ++i) { @@ -2346,15 +2317,6 @@ public class AppOpsService extends IAppOpsService.Stub { } } - private static String resolvePackageName(int uid, String packageName) { - if (uid == 0) { - return "root"; - } else if (uid == Process.SHELL_UID) { - return "com.android.shell"; - } - return packageName; - } - private static String[] getPackagesForUid(int uid) { String[] packageNames = null; try { diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index b7fca1a10ffc..5b01062a35c3 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -3845,8 +3845,16 @@ public class ConnectivityService extends IConnectivityManager.Stub @Override public NetworkRequest requestNetwork(NetworkCapabilities networkCapabilities, Messenger messenger, int timeoutMs, IBinder binder, int legacyType) { - networkCapabilities = new NetworkCapabilities(networkCapabilities); - enforceNetworkRequestPermissions(networkCapabilities); + // If the requested networkCapabilities is null, take them instead from + // the default network request. This allows callers to keep track of + // the system default network. + if (networkCapabilities == null) { + networkCapabilities = new NetworkCapabilities(mDefaultRequest.networkCapabilities); + enforceAccessPermission(); + } else { + networkCapabilities = new NetworkCapabilities(networkCapabilities); + enforceNetworkRequestPermissions(networkCapabilities); + } enforceMeteredApnPolicy(networkCapabilities); ensureRequestableCapabilities(networkCapabilities); diff --git a/services/core/java/com/android/server/DeviceIdleController.java b/services/core/java/com/android/server/DeviceIdleController.java index 7bf4b56c03d1..c8763b135f62 100644 --- a/services/core/java/com/android/server/DeviceIdleController.java +++ b/services/core/java/com/android/server/DeviceIdleController.java @@ -19,7 +19,6 @@ package com.android.server; import android.Manifest; import android.app.ActivityManagerNative; import android.app.AlarmManager; -import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -111,12 +110,6 @@ public class DeviceIdleController extends SystemService private static final int EVENT_BUFFER_SIZE = 40; - private static final String ACTION_STEP_IDLE_STATE = - "com.android.server.device_idle.STEP_IDLE_STATE"; - - private static final String ACTION_STEP_LIGHT_IDLE_STATE = - "com.android.server.device_idle.STEP_LIGHT_IDLE_STATE"; - private AlarmManager mAlarmManager; private IBatteryStats mBatteryStats; private PowerManagerInternal mLocalPowerManager; @@ -127,8 +120,6 @@ public class DeviceIdleController extends SystemService private Sensor mMotionSensor; private LocationManager mLocationManager; private LocationRequest mLocationRequest; - private PendingIntent mAlarmIntent; - private PendingIntent mLightAlarmIntent; private Intent mIdleIntent; private Intent mLightIdleIntent; private Display mCurDisplay; @@ -329,14 +320,36 @@ public class DeviceIdleController extends SystemService removePowerSaveWhitelistAppInternal(ssp); } } - } else if (ACTION_STEP_LIGHT_IDLE_STATE.equals(intent.getAction())) { - synchronized (DeviceIdleController.this) { - stepLightIdleStateLocked("s:alarm"); - } - } else if (ACTION_STEP_IDLE_STATE.equals(intent.getAction())) { - synchronized (DeviceIdleController.this) { - stepIdleStateLocked("s:alarm"); - } + } + } + }; + + private final AlarmManager.OnAlarmListener mLightAlarmListener + = new AlarmManager.OnAlarmListener() { + @Override + public void onAlarm() { + synchronized (DeviceIdleController.this) { + stepLightIdleStateLocked("s:alarm"); + } + } + }; + + private final AlarmManager.OnAlarmListener mDeepAlarmListener + = new AlarmManager.OnAlarmListener() { + @Override + public void onAlarm() { + synchronized (DeviceIdleController.this) { + stepIdleStateLocked("s:alarm"); + } + } + }; + + private final AlarmManager.OnAlarmListener mMaintenanceMinCheckListener + = new AlarmManager.OnAlarmListener() { + @Override + public void onAlarm() { + synchronized (DeviceIdleController.this) { + exitMaintenanceEarlyIfNeededLocked(); } } }; @@ -470,6 +483,8 @@ public class DeviceIdleController extends SystemService = "light_idle_maintenance_min_budget"; private static final String KEY_LIGHT_IDLE_MAINTENANCE_MAX_BUDGET = "light_idle_maintenance_max_budget"; + private static final String KEY_MIN_LIGHT_MAINTENANCE_TIME = "min_light_maintenance_time"; + private static final String KEY_MIN_DEEP_MAINTENANCE_TIME = "min_deep_maintenance_time"; private static final String KEY_INACTIVE_TIMEOUT = "inactive_to"; private static final String KEY_SENSING_TIMEOUT = "sensing_to"; private static final String KEY_LOCATING_TIMEOUT = "locating_to"; @@ -519,6 +534,28 @@ public class DeviceIdleController extends SystemService public long LIGHT_IDLE_MAINTENANCE_MAX_BUDGET; /** + * This is the minimum amount of time that we will stay in maintenance mode after + * a light doze. We have this minimum to allow various things to respond to switching + * in to maintenance mode and scheduling their work -- otherwise we may + * see there is nothing to do (no jobs or downloads pending) and go out of maintenance + * mode immediately. + * @see Settings.Global#DEVICE_IDLE_CONSTANTS + * @see #KEY_MIN_LIGHT_MAINTENANCE_TIME + */ + public long MIN_LIGHT_MAINTENANCE_TIME; + + /** + * This is the minimum amount of time that we will stay in maintenance mode after + * a full doze. We have this minimum to allow various things to respond to switching + * in to maintenance mode and scheduling their work -- otherwise we may + * see there is nothing to do (no jobs or downloads pending) and go out of maintenance + * mode immediately. + * @see Settings.Global#DEVICE_IDLE_CONSTANTS + * @see #KEY_MIN_DEEP_MAINTENANCE_TIME + */ + public long MIN_DEEP_MAINTENANCE_TIME; + + /** * This is the time, after becoming inactive, at which we start looking at the * motion sensor to determine if the device is being left alone. We don't do this * immediately after going inactive just because we don't want to be continually running @@ -682,6 +719,12 @@ public class DeviceIdleController extends SystemService LIGHT_IDLE_MAINTENANCE_MAX_BUDGET = mParser.getLong( KEY_LIGHT_IDLE_MAINTENANCE_MAX_BUDGET, !COMPRESS_TIME ? 5 * 60 * 1000L : 30 * 1000L); + MIN_LIGHT_MAINTENANCE_TIME = mParser.getLong( + KEY_MIN_LIGHT_MAINTENANCE_TIME, + !COMPRESS_TIME ? 5 * 1000L : 1 * 1000L); + MIN_DEEP_MAINTENANCE_TIME = mParser.getLong( + KEY_MIN_DEEP_MAINTENANCE_TIME, + !COMPRESS_TIME ? 30 * 1000L : 5 * 1000L); INACTIVE_TIMEOUT = mParser.getLong(KEY_INACTIVE_TIMEOUT, !COMPRESS_TIME ? 30 * 60 * 1000L : 3 * 60 * 1000L); SENSING_TIMEOUT = mParser.getLong(KEY_SENSING_TIMEOUT, @@ -731,6 +774,14 @@ public class DeviceIdleController extends SystemService TimeUtils.formatDuration(LIGHT_IDLE_MAINTENANCE_MAX_BUDGET, pw); pw.println(); + pw.print(" "); pw.print(KEY_MIN_LIGHT_MAINTENANCE_TIME); pw.print("="); + TimeUtils.formatDuration(MIN_LIGHT_MAINTENANCE_TIME, pw); + pw.println(); + + pw.print(" "); pw.print(KEY_MIN_DEEP_MAINTENANCE_TIME); pw.print("="); + TimeUtils.formatDuration(MIN_DEEP_MAINTENANCE_TIME, pw); + pw.println(); + pw.print(" "); pw.print(KEY_INACTIVE_TIMEOUT); pw.print("="); TimeUtils.formatDuration(INACTIVE_TIMEOUT, pw); pw.println(); @@ -860,7 +911,7 @@ public class DeviceIdleController extends SystemService try { mNetworkPolicyManager.setDeviceIdleMode(true); mBatteryStats.noteDeviceIdleMode(msg.what == MSG_REPORT_IDLE_ON - ? BatteryStats.DEVICE_IDLE_MODE_FULL + ? BatteryStats.DEVICE_IDLE_MODE_DEEP : BatteryStats.DEVICE_IDLE_MODE_LIGHT, null, Process.myUid()); } catch (RemoteException e) { } @@ -1220,16 +1271,6 @@ public class DeviceIdleController extends SystemService (PowerManager) getContext().getSystemService(Context.POWER_SERVICE), mHandler, mSensorManager, this, angleThreshold); - Intent intent = new Intent(ACTION_STEP_IDLE_STATE) - .setPackage("android") - .setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); - mAlarmIntent = PendingIntent.getBroadcast(getContext(), 0, intent, 0); - - Intent intentLight = new Intent(ACTION_STEP_LIGHT_IDLE_STATE) - .setPackage("android") - .setFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY); - mLightAlarmIntent = PendingIntent.getBroadcast(getContext(), 0, intentLight, 0); - mIdleIntent = new Intent(PowerManager.ACTION_DEVICE_IDLE_MODE_CHANGED); mIdleIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY | Intent.FLAG_RECEIVER_FOREGROUND); @@ -1239,8 +1280,6 @@ public class DeviceIdleController extends SystemService IntentFilter filter = new IntentFilter(); filter.addAction(Intent.ACTION_BATTERY_CHANGED); - filter.addAction(ACTION_STEP_IDLE_STATE); - filter.addAction(ACTION_STEP_LIGHT_IDLE_STATE); getContext().registerReceiver(mReceiver, filter); filter = new IntentFilter(); filter.addAction(Intent.ACTION_PACKAGE_REMOVED); @@ -1582,6 +1621,7 @@ public class DeviceIdleController extends SystemService mInactiveTimeout = mConstants.INACTIVE_TIMEOUT; mCurIdleBudget = 0; mMaintenanceStartTime = 0; + mAlarmManager.cancel(mMaintenanceMinCheckListener); resetIdleManagementLocked(); resetLightIdleManagementLocked(); addEvent(EVENT_NORMAL); @@ -1664,6 +1704,7 @@ public class DeviceIdleController extends SystemService EventLogTags.writeDeviceIdleLight(mLightState, reason); addEvent(EVENT_LIGHT_IDLE); mHandler.sendEmptyMessage(MSG_REPORT_IDLE_ON_LIGHT); + mAlarmManager.cancel(mMaintenanceMinCheckListener); break; case LIGHT_STATE_IDLE: // We have been idling long enough, now it is time to do some work. @@ -1674,7 +1715,6 @@ public class DeviceIdleController extends SystemService } else if (mCurIdleBudget > mConstants.LIGHT_IDLE_MAINTENANCE_MAX_BUDGET) { mCurIdleBudget = mConstants.LIGHT_IDLE_MAINTENANCE_MAX_BUDGET; } - mMaintenanceStartTime = SystemClock.elapsedRealtime(); scheduleLightAlarmLocked(mCurIdleBudget); if (DEBUG) Slog.d(TAG, "Moved from LIGHT_STATE_IDLE to LIGHT_STATE_IDLE_MAINTENANCE."); @@ -1682,6 +1722,9 @@ public class DeviceIdleController extends SystemService EventLogTags.writeDeviceIdleLight(mLightState, reason); addEvent(EVENT_LIGHT_MAINTENANCE); mHandler.sendEmptyMessage(MSG_REPORT_IDLE_OFF); + mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME, + mMaintenanceStartTime + mConstants.MIN_LIGHT_MAINTENANCE_TIME, + "DeviceIdleController.maint-check", mMaintenanceMinCheckListener, mHandler); break; } } @@ -1773,6 +1816,7 @@ public class DeviceIdleController extends SystemService EventLogTags.writeDeviceIdle(mState, reason); addEvent(EVENT_DEEP_IDLE); mHandler.sendEmptyMessage(MSG_REPORT_IDLE_ON); + mAlarmManager.cancel(mMaintenanceMinCheckListener); break; case STATE_IDLE: // We have been idling long enough, now it is time to do some work. @@ -1780,12 +1824,16 @@ public class DeviceIdleController extends SystemService scheduleAlarmLocked(mNextIdlePendingDelay, false); if (DEBUG) Slog.d(TAG, "Moved from STATE_IDLE to STATE_IDLE_MAINTENANCE. " + "Next alarm in " + mNextIdlePendingDelay + " ms."); + mMaintenanceStartTime = SystemClock.elapsedRealtime(); mNextIdlePendingDelay = Math.min(mConstants.MAX_IDLE_PENDING_TIMEOUT, (long)(mNextIdlePendingDelay * mConstants.IDLE_PENDING_FACTOR)); mState = STATE_IDLE_MAINTENANCE; EventLogTags.writeDeviceIdle(mState, reason); addEvent(EVENT_DEEP_MAINTENANCE); mHandler.sendEmptyMessage(MSG_REPORT_IDLE_OFF); + mAlarmManager.setExact(AlarmManager.ELAPSED_REALTIME, + mMaintenanceStartTime + mConstants.MIN_DEEP_MAINTENANCE_TIME, + "DeviceIdleController.maint-check", mMaintenanceMinCheckListener, mHandler); break; } } @@ -1886,10 +1934,23 @@ public class DeviceIdleController extends SystemService if (mState == STATE_IDLE_MAINTENANCE || mLightState == LIGHT_STATE_IDLE_MAINTENANCE) { if (mActiveIdleOpCount <= 0 && mDownloadServiceActive == null && !mSyncActive && !mJobsActive && !mAlarmsActive) { + final long now = SystemClock.elapsedRealtime(); + if (DEBUG) { + StringBuilder sb = new StringBuilder(); + sb.append("Exit: start="); + TimeUtils.formatDuration(mMaintenanceStartTime, sb); + sb.append(" now="); + TimeUtils.formatDuration(now, sb); + Slog.d(TAG, sb.toString()); + } if (mState == STATE_IDLE_MAINTENANCE) { - stepIdleStateLocked("s:early"); + if (now >= (mMaintenanceStartTime + mConstants.MIN_DEEP_MAINTENANCE_TIME)) { + stepIdleStateLocked("s:early"); + } } else { - stepLightIdleStateLocked("s:early"); + if (now >= (mMaintenanceStartTime + mConstants.MIN_LIGHT_MAINTENANCE_TIME)) { + stepLightIdleStateLocked("s:early"); + } } } } @@ -1977,14 +2038,14 @@ public class DeviceIdleController extends SystemService void cancelAlarmLocked() { if (mNextAlarmTime != 0) { mNextAlarmTime = 0; - mAlarmManager.cancel(mAlarmIntent); + mAlarmManager.cancel(mDeepAlarmListener); } } void cancelLightAlarmLocked() { if (mNextLightAlarmTime != 0) { mNextLightAlarmTime = 0; - mAlarmManager.cancel(mLightAlarmIntent); + mAlarmManager.cancel(mLightAlarmListener); } } @@ -2008,10 +2069,10 @@ public class DeviceIdleController extends SystemService mNextAlarmTime = SystemClock.elapsedRealtime() + delay; if (idleUntil) { mAlarmManager.setIdleUntil(AlarmManager.ELAPSED_REALTIME_WAKEUP, - mNextAlarmTime, mAlarmIntent); + mNextAlarmTime, "DeviceIdleController.deep", mDeepAlarmListener, mHandler); } else { mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, - mNextAlarmTime, mAlarmIntent); + mNextAlarmTime, "DeviceIdleController.deep", mDeepAlarmListener, mHandler); } } @@ -2026,7 +2087,7 @@ public class DeviceIdleController extends SystemService } mNextLightAlarmTime = SystemClock.elapsedRealtime() + delay; mAlarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, - mNextLightAlarmTime, mLightAlarmIntent); + mNextLightAlarmTime, "DeviceIdleController.light", mLightAlarmListener, mHandler); } private static int[] buildAppIdArray(ArrayMap<String, Integer> systemApps, @@ -2229,10 +2290,8 @@ public class DeviceIdleController extends SystemService pw.println("Device idle controller (deviceidle) commands:"); pw.println(" help"); pw.println(" Print this help text."); - pw.println(" step"); + pw.println(" step [light|deep]"); pw.println(" Immediately step to next state, without waiting for alarm."); - pw.println(" light-step"); - pw.println(" Immediately step to next light idle state, without waiting for alarm."); pw.println(" force-idle"); pw.println(" Force directly into idle mode, regardless of other device state."); pw.println(" Use \"step\" to get out."); @@ -2272,24 +2331,20 @@ public class DeviceIdleController extends SystemService null); synchronized (this) { long token = Binder.clearCallingIdentity(); + String arg = shell.getNextArg(); try { - exitForceIdleLocked(); - stepIdleStateLocked("s:shell"); - pw.print("Stepped to: "); - pw.println(stateToString(mState)); - } finally { - Binder.restoreCallingIdentity(token); - } - } - } else if ("light-step".equals(cmd)) { - getContext().enforceCallingOrSelfPermission(android.Manifest.permission.DEVICE_POWER, - null); - synchronized (this) { - long token = Binder.clearCallingIdentity(); - try { - exitForceIdleLocked(); - stepLightIdleStateLocked("s:shell"); - pw.print("Stepped to: "); pw.println(lightStateToString(mLightState)); + if (arg == null || "deep".equals(arg)) { + exitForceIdleLocked(); + stepIdleStateLocked("s:shell"); + pw.print("Stepped to deep: "); + pw.println(stateToString(mState)); + } else if ("light".equals(arg)) { + exitForceIdleLocked(); + stepLightIdleStateLocked("s:shell"); + pw.print("Stepped to light: "); pw.println(lightStateToString(mLightState)); + } else { + pw.println("Unknown idle mode: " + arg); + } } finally { Binder.restoreCallingIdentity(token); } diff --git a/services/core/java/com/android/server/HardwarePropertiesManagerService.java b/services/core/java/com/android/server/HardwarePropertiesManagerService.java index cc21e99371e4..575d99e06507 100644 --- a/services/core/java/com/android/server/HardwarePropertiesManagerService.java +++ b/services/core/java/com/android/server/HardwarePropertiesManagerService.java @@ -22,6 +22,7 @@ import android.content.pm.PackageManager; import android.os.Binder; import android.os.CpuUsageInfo; import android.os.IHardwarePropertiesManager; +import android.os.Process; import java.util.Arrays; @@ -33,7 +34,7 @@ public class HardwarePropertiesManagerService extends IHardwarePropertiesManager private static native void nativeInit(); private static native float[] nativeGetFanSpeeds(); - private static native float[] nativeGetDeviceTemperatures(int type); + private static native float[] nativeGetDeviceTemperatures(int type, int source); private static native CpuUsageInfo[] nativeGetCpuUsages(); private final Context mContext; @@ -47,10 +48,11 @@ public class HardwarePropertiesManagerService extends IHardwarePropertiesManager } @Override - public float[] getDeviceTemperatures(String callingPackage, int type) throws SecurityException { + public float[] getDeviceTemperatures(String callingPackage, int type, int source) + throws SecurityException { enforceHardwarePropertiesRetrievalAllowed(callingPackage); synchronized (mLock) { - return nativeGetDeviceTemperatures(type); + return nativeGetDeviceTemperatures(type, source); } } @@ -76,8 +78,8 @@ public class HardwarePropertiesManagerService extends IHardwarePropertiesManager * * @param callingPackage The calling package name. * - * @throws SecurityException if a non profile or device owner tries to retrieve information - * provided by the service. + * @throws SecurityException if a non profile or device owner or system tries to retrieve + * information provided by the service. */ private void enforceHardwarePropertiesRetrievalAllowed(String callingPackage) throws SecurityException { @@ -92,8 +94,9 @@ public class HardwarePropertiesManagerService extends IHardwarePropertiesManager } final DevicePolicyManager dpm = mContext.getSystemService(DevicePolicyManager.class); - if (!dpm.isDeviceOwnerApp(callingPackage) && !dpm.isProfileOwnerApp(callingPackage)) { - throw new SecurityException("The caller is not a device or profile owner."); + if (!dpm.isDeviceOwnerApp(callingPackage) && !dpm.isProfileOwnerApp(callingPackage) + && Binder.getCallingUid() != Process.SYSTEM_UID) { + throw new SecurityException("The caller is not a device or profile owner or system."); } } } diff --git a/services/core/java/com/android/server/InputMethodManagerService.java b/services/core/java/com/android/server/InputMethodManagerService.java index 00a49bdb7273..898d5b73b8d6 100644 --- a/services/core/java/com/android/server/InputMethodManagerService.java +++ b/services/core/java/com/android/server/InputMethodManagerService.java @@ -112,6 +112,7 @@ import android.view.WindowManager; import android.view.WindowManagerInternal; import android.view.inputmethod.EditorInfo; import android.view.inputmethod.InputBinding; +import android.view.inputmethod.InputConnectionInspector; import android.view.inputmethod.InputMethod; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; @@ -327,6 +328,13 @@ public class InputMethodManagerService extends IInputMethodManager.Stub IInputContext mCurInputContext; /** + * The missing method flags for the input context last provided by the current client. + * + * @see android.view.inputmethod.InputConnectionInspector.MissingMethodFlags + */ + int mCurInputContextMissingMethods; + + /** * The attributes last provided by the current client. */ EditorInfo mCurAttribute; @@ -1289,11 +1297,13 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } final SessionState session = mCurClient.curSession; if (initial) { - executeOrSendMessage(session.method, mCaller.obtainMessageOOO( - MSG_START_INPUT, session, mCurInputContext, mCurAttribute)); + executeOrSendMessage(session.method, mCaller.obtainMessageIOOO( + MSG_START_INPUT, mCurInputContextMissingMethods, session, mCurInputContext, + mCurAttribute)); } else { - executeOrSendMessage(session.method, mCaller.obtainMessageOOO( - MSG_RESTART_INPUT, session, mCurInputContext, mCurAttribute)); + executeOrSendMessage(session.method, mCaller.obtainMessageIOOO( + MSG_RESTART_INPUT, mCurInputContextMissingMethods, session, mCurInputContext, + mCurAttribute)); } if (mShowRequested) { if (DEBUG) Slog.v(TAG, "Attach new input asks to show input"); @@ -1306,8 +1316,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub InputBindResult startInputLocked( /* @InputMethodClient.StartInputReason */ final int startInputReason, - IInputMethodClient client, IInputContext inputContext, EditorInfo attribute, - int controlFlags) { + IInputMethodClient client, IInputContext inputContext, + /* @InputConnectionInspector.missingMethods */ final int missingMethods, + @Nullable EditorInfo attribute, int controlFlags) { // If no method is currently selected, do nothing. if (mCurMethodId == null) { return mNoBinding; @@ -1319,6 +1330,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub + client.asBinder()); } + if (attribute == null) { + Slog.w(TAG, "Ignoring startInput with null EditorInfo." + + " uid=" + cs.uid + " pid=" + cs.pid); + return null; + } + try { if (!mIWindowManager.inputMethodClientHasFocus(cs.client)) { // Check with the window manager to make sure this client actually @@ -1333,10 +1350,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } catch (RemoteException e) { } - return startInputUncheckedLocked(cs, inputContext, attribute, controlFlags); + return startInputUncheckedLocked(cs, inputContext, missingMethods, attribute, + controlFlags); } InputBindResult startInputUncheckedLocked(@NonNull ClientState cs, IInputContext inputContext, + /* @InputConnectionInspector.missingMethods */ final int missingMethods, @NonNull EditorInfo attribute, int controlFlags) { // If no method is currently selected, do nothing. if (mCurMethodId == null) { @@ -1371,6 +1390,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub if (mCurSeq <= 0) mCurSeq = 1; mCurClient = cs; mCurInputContext = inputContext; + mCurInputContextMissingMethods = missingMethods; mCurAttribute = attribute; // Check if the input method is changing. @@ -1459,8 +1479,9 @@ public class InputMethodManagerService extends IInputMethodManager.Stub private InputBindResult startInput( /* @InputMethodClient.StartInputReason */ final int startInputReason, - IInputMethodClient client, IInputContext inputContext, EditorInfo attribute, - int controlFlags) { + IInputMethodClient client, IInputContext inputContext, + /* @InputConnectionInspector.missingMethods */ final int missingMethods, + @Nullable EditorInfo attribute, int controlFlags) { if (!calledFromValidUser()) { return null; } @@ -1470,13 +1491,15 @@ public class InputMethodManagerService extends IInputMethodManager.Stub + InputMethodClient.getStartInputReason(startInputReason) + " client = " + client.asBinder() + " inputContext=" + inputContext + + " missingMethods=" + + InputConnectionInspector.getMissingMethodFlagsAsString(missingMethods) + " attribute=" + attribute + " controlFlags=#" + Integer.toHexString(controlFlags)); } final long ident = Binder.clearCallingIdentity(); try { - return startInputLocked(startInputReason, client, inputContext, attribute, - controlFlags); + return startInputLocked(startInputReason, client, inputContext, missingMethods, + attribute, controlFlags); } finally { Binder.restoreCallingIdentity(ident); } @@ -2190,19 +2213,22 @@ public class InputMethodManagerService extends IInputMethodManager.Stub public InputBindResult startInputOrWindowGainedFocus( /* @InputMethodClient.StartInputReason */ final int startInputReason, IInputMethodClient client, IBinder windowToken, int controlFlags, int softInputMode, - int windowFlags, EditorInfo attribute, IInputContext inputContext) { + int windowFlags, @Nullable EditorInfo attribute, IInputContext inputContext, + /* @InputConnectionInspector.missingMethods */ final int missingMethods) { if (windowToken != null) { return windowGainedFocus(startInputReason, client, windowToken, controlFlags, - softInputMode, windowFlags, attribute, inputContext); + softInputMode, windowFlags, attribute, inputContext, missingMethods); } else { - return startInput(startInputReason, client, inputContext, attribute, controlFlags); + return startInput(startInputReason, client, inputContext, missingMethods, attribute, + controlFlags); } } private InputBindResult windowGainedFocus( /* @InputMethodClient.StartInputReason */ final int startInputReason, IInputMethodClient client, IBinder windowToken, int controlFlags, int softInputMode, - int windowFlags, EditorInfo attribute, IInputContext inputContext) { + int windowFlags, EditorInfo attribute, IInputContext inputContext, + /* @InputConnectionInspector.missingMethods */ final int missingMethods) { // Needs to check the validity before clearing calling identity final boolean calledFromValidUser = calledFromValidUser(); InputBindResult res = null; @@ -2213,6 +2239,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub + InputMethodClient.getStartInputReason(startInputReason) + " client=" + client.asBinder() + " inputContext=" + inputContext + + " missingMethods=" + + InputConnectionInspector.getMissingMethodFlagsAsString(missingMethods) + " attribute=" + attribute + " controlFlags=#" + Integer.toHexString(controlFlags) + " softInputMode=#" + Integer.toHexString(softInputMode) @@ -2250,8 +2278,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub Slog.w(TAG, "Window already focused, ignoring focus gain of: " + client + " attribute=" + attribute + ", token = " + windowToken); if (attribute != null) { - return startInputUncheckedLocked(cs, inputContext, attribute, - controlFlags); + return startInputUncheckedLocked(cs, inputContext, missingMethods, + attribute, controlFlags); } return null; } @@ -2300,8 +2328,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub // is more room for the target window + IME. if (DEBUG) Slog.v(TAG, "Unspecified window will show input"); if (attribute != null) { - res = startInputUncheckedLocked(cs, inputContext, attribute, - controlFlags); + res = startInputUncheckedLocked(cs, inputContext, + missingMethods, attribute, controlFlags); didStart = true; } showCurrentInputLocked(InputMethodManager.SHOW_IMPLICIT, null); @@ -2326,8 +2354,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub WindowManager.LayoutParams.SOFT_INPUT_IS_FORWARD_NAVIGATION) != 0) { if (DEBUG) Slog.v(TAG, "Window asks to show input going forward"); if (attribute != null) { - res = startInputUncheckedLocked(cs, inputContext, attribute, - controlFlags); + res = startInputUncheckedLocked(cs, inputContext, + missingMethods, attribute, controlFlags); didStart = true; } showCurrentInputLocked(InputMethodManager.SHOW_IMPLICIT, null); @@ -2336,8 +2364,8 @@ public class InputMethodManagerService extends IInputMethodManager.Stub case WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE: if (DEBUG) Slog.v(TAG, "Window asks to always show input"); if (attribute != null) { - res = startInputUncheckedLocked(cs, inputContext, attribute, - controlFlags); + res = startInputUncheckedLocked(cs, inputContext, missingMethods, + attribute, controlFlags); didStart = true; } showCurrentInputLocked(InputMethodManager.SHOW_IMPLICIT, null); @@ -2345,7 +2373,7 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } if (!didStart && attribute != null) { - res = startInputUncheckedLocked(cs, inputContext, attribute, + res = startInputUncheckedLocked(cs, inputContext, missingMethods, attribute, controlFlags); } } @@ -2807,28 +2835,32 @@ public class InputMethodManagerService extends IInputMethodManager.Stub } // --------------------------------------------------------- - case MSG_START_INPUT: - args = (SomeArgs)msg.obj; + case MSG_START_INPUT: { + int missingMethods = msg.arg1; + args = (SomeArgs) msg.obj; try { - SessionState session = (SessionState)args.arg1; + SessionState session = (SessionState) args.arg1; setEnabledSessionInMainThread(session); - session.method.startInput((IInputContext)args.arg2, - (EditorInfo)args.arg3); + session.method.startInput((IInputContext) args.arg2, missingMethods, + (EditorInfo) args.arg3); } catch (RemoteException e) { } args.recycle(); return true; - case MSG_RESTART_INPUT: - args = (SomeArgs)msg.obj; + } + case MSG_RESTART_INPUT: { + int missingMethods = msg.arg1; + args = (SomeArgs) msg.obj; try { - SessionState session = (SessionState)args.arg1; + SessionState session = (SessionState) args.arg1; setEnabledSessionInMainThread(session); - session.method.restartInput((IInputContext)args.arg2, - (EditorInfo)args.arg3); + session.method.restartInput((IInputContext) args.arg2, missingMethods, + (EditorInfo) args.arg3); } catch (RemoteException e) { } args.recycle(); return true; + } // --------------------------------------------------------- diff --git a/services/core/java/com/android/server/MountService.java b/services/core/java/com/android/server/MountService.java index 65a22b9a29e9..ccca5baa798a 100644 --- a/services/core/java/com/android/server/MountService.java +++ b/services/core/java/com/android/server/MountService.java @@ -1946,6 +1946,10 @@ class MountService extends IMountService.Stub throw new IllegalStateException( "Emulation not available on device with native FBE"); } + if (mLockPatternUtils.isCredentialRequiredToDecrypt(false)) { + throw new IllegalStateException( + "Emulation requires disabling 'Secure start-up' in Settings > Security"); + } final long token = Binder.clearCallingIdentity(); try { diff --git a/services/core/java/com/android/server/NetworkManagementService.java b/services/core/java/com/android/server/NetworkManagementService.java index 07c10b09287a..548b66284937 100644 --- a/services/core/java/com/android/server/NetworkManagementService.java +++ b/services/core/java/com/android/server/NetworkManagementService.java @@ -1149,81 +1149,6 @@ public class NetworkManagementService extends INetworkManagementService.Stub } @Override - public RouteInfo[] getRoutes(String interfaceName) { - mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); - ArrayList<RouteInfo> routes = new ArrayList<RouteInfo>(); - - // v4 routes listed as: - // iface dest-addr gateway-addr flags refcnt use metric netmask mtu window IRTT - for (String s : readRouteList("/proc/net/route")) { - String[] fields = s.split("\t"); - - if (fields.length > 7) { - String iface = fields[0]; - - if (interfaceName.equals(iface)) { - String dest = fields[1]; - String gate = fields[2]; - String flags = fields[3]; // future use? - String mask = fields[7]; - try { - // address stored as a hex string, ex: 0014A8C0 - InetAddress destAddr = - NetworkUtils.intToInetAddress((int)Long.parseLong(dest, 16)); - int prefixLength = - NetworkUtils.netmaskIntToPrefixLength( - (int)Long.parseLong(mask, 16)); - LinkAddress linkAddress = new LinkAddress(destAddr, prefixLength); - - // address stored as a hex string, ex 0014A8C0 - InetAddress gatewayAddr = - NetworkUtils.intToInetAddress((int)Long.parseLong(gate, 16)); - - RouteInfo route = new RouteInfo(linkAddress, gatewayAddr); - routes.add(route); - } catch (Exception e) { - Log.e(TAG, "Error parsing route " + s + " : " + e); - continue; - } - } - } - } - - // v6 routes listed as: - // dest-addr prefixlength ?? ?? gateway-addr ?? ?? ?? ?? iface - for (String s : readRouteList("/proc/net/ipv6_route")) { - String[]fields = s.split("\\s+"); - if (fields.length > 9) { - String iface = fields[9].trim(); - if (interfaceName.equals(iface)) { - String dest = fields[0]; - String prefix = fields[1]; - String gate = fields[4]; - - try { - // prefix length stored as a hex string, ex 40 - int prefixLength = Integer.parseInt(prefix, 16); - - // address stored as a 32 char hex string - // ex fe800000000000000000000000000000 - InetAddress destAddr = NetworkUtils.hexToInet6Address(dest); - LinkAddress linkAddress = new LinkAddress(destAddr, prefixLength); - - InetAddress gateAddr = NetworkUtils.hexToInet6Address(gate); - - RouteInfo route = new RouteInfo(linkAddress, gateAddr); - routes.add(route); - } catch (Exception e) { - Log.e(TAG, "Error parsing route " + s + " : " + e); - continue; - } - } - } - } - return routes.toArray(new RouteInfo[routes.size()]); - } - - @Override public void setMtu(String iface, int mtu) { mContext.enforceCallingOrSelfPermission(CONNECTIVITY_INTERNAL, TAG); diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java index 322df04ee2ac..1632f92dd40c 100644 --- a/services/core/java/com/android/server/accounts/AccountManagerService.java +++ b/services/core/java/com/android/server/accounts/AccountManagerService.java @@ -797,6 +797,7 @@ public class AccountManagerService @Override public boolean addAccountExplicitly(Account account, String password, Bundle extras) { + Bundle.setDefusable(extras, true); final int callingUid = Binder.getCallingUid(); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "addAccountExplicitly: " + account @@ -873,6 +874,7 @@ public class AccountManagerService @Override public void onResult(Bundle result) { + Bundle.setDefusable(result, true); if (result != null && result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT, false)) { // Create a Session for the target user and pass in the bundle @@ -946,6 +948,7 @@ public class AccountManagerService private void completeCloningAccount(IAccountManagerResponse response, final Bundle accountCredentials, final Account account, final UserAccounts targetUser, final int parentUserId){ + Bundle.setDefusable(accountCredentials, true); long id = clearCallingIdentity(); try { new Session(targetUser, response, account.type, false, @@ -975,6 +978,7 @@ public class AccountManagerService @Override public void onResult(Bundle result) { + Bundle.setDefusable(result, true); // TODO: Anything to do if if succedded? // TODO: If it failed: Show error notification? Should we remove the shadow // account to avoid retries? @@ -996,6 +1000,7 @@ public class AccountManagerService private boolean addAccountInternal(UserAccounts accounts, Account account, String password, Bundle extras, boolean restricted, int callingUid) { + Bundle.setDefusable(extras, true); if (account == null) { return false; } @@ -1128,6 +1133,7 @@ public class AccountManagerService @Override public void onResult(Bundle result) { + Bundle.setDefusable(result, true); IAccountManagerResponse response = getResponseAndClose(); if (response != null) { try { @@ -1429,6 +1435,7 @@ public class AccountManagerService @Override public void onResult(Bundle result) { + Bundle.setDefusable(result, true); if (result != null && result.containsKey(AccountManager.KEY_BOOLEAN_RESULT) && !result.containsKey(AccountManager.KEY_INTENT)) { final boolean removalAllowed = result.getBoolean(AccountManager.KEY_BOOLEAN_RESULT); @@ -1880,6 +1887,7 @@ public class AccountManagerService @Override public void onResult(Bundle result) { + Bundle.setDefusable(result, true); if (result != null) { String label = result.getString(AccountManager.KEY_AUTH_TOKEN_LABEL); Bundle bundle = new Bundle(); @@ -1904,6 +1912,7 @@ public class AccountManagerService final boolean notifyOnAuthFailure, final boolean expectActivityLaunch, final Bundle loginOptions) { + Bundle.setDefusable(loginOptions, true); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "getAuthToken: " + account + ", response " + response @@ -2044,6 +2053,7 @@ public class AccountManagerService @Override public void onResult(Bundle result) { + Bundle.setDefusable(result, true); if (result != null) { if (result.containsKey(AccountManager.KEY_AUTH_TOKEN_LABEL)) { Intent intent = newGrantCredentialsPermissionIntent( @@ -2206,6 +2216,7 @@ public class AccountManagerService public void addAccount(final IAccountManagerResponse response, final String accountType, final String authTokenType, final String[] requiredFeatures, final boolean expectActivityLaunch, final Bundle optionsIn) { + Bundle.setDefusable(optionsIn, true); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "addAccount: accountType " + accountType + ", response " + response @@ -2280,6 +2291,7 @@ public class AccountManagerService public void addAccountAsUser(final IAccountManagerResponse response, final String accountType, final String authTokenType, final String[] requiredFeatures, final boolean expectActivityLaunch, final Bundle optionsIn, int userId) { + Bundle.setDefusable(optionsIn, true); int callingUid = Binder.getCallingUid(); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "addAccount: accountType " + accountType @@ -2366,6 +2378,7 @@ public class AccountManagerService final String[] requiredFeatures, final boolean expectActivityLaunch, final Bundle optionsIn) { + Bundle.setDefusable(optionsIn, true); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "startAddAccountSession: accountType " + accountType @@ -2459,6 +2472,7 @@ public class AccountManagerService @Override public void onResult(Bundle result) { + Bundle.setDefusable(result, true); mNumResults++; Intent intent = null; if (result != null @@ -2543,6 +2557,7 @@ public class AccountManagerService boolean expectActivityLaunch, Bundle appInfo, int userId) { + Bundle.setDefusable(sessionBundle, true); int callingUid = Binder.getCallingUid(); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, @@ -2698,6 +2713,7 @@ public class AccountManagerService final Bundle options, final boolean expectActivityLaunch, int userId) { + Bundle.setDefusable(options, true); int callingUid = Binder.getCallingUid(); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "confirmCredentials: " + account @@ -2741,6 +2757,7 @@ public class AccountManagerService public void updateCredentials(IAccountManagerResponse response, final Account account, final String authTokenType, final boolean expectActivityLaunch, final Bundle loginOptions) { + Bundle.setDefusable(loginOptions, true); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "updateCredentials: " + account + ", response " + response @@ -2784,6 +2801,7 @@ public class AccountManagerService final String authTokenType, final boolean expectActivityLaunch, final Bundle loginOptions) { + Bundle.setDefusable(loginOptions, true); if (Log.isLoggable(TAG, Log.VERBOSE)) { Log.v(TAG, "startUpdateCredentialsSession: " + account + ", response " + response @@ -2891,6 +2909,7 @@ public class AccountManagerService @Override public void onResult(Bundle result) { + Bundle.setDefusable(result, true); IAccountManagerResponse response = getResponseAndClose(); if (response == null) { return; @@ -3051,6 +3070,7 @@ public class AccountManagerService @Override public void onResult(Bundle result) { + Bundle.setDefusable(result, true); mNumResults++; if (result == null) { onError(AccountManager.ERROR_CODE_INVALID_RESPONSE, "null bundle"); @@ -3685,6 +3705,7 @@ public class AccountManagerService @Override public void onResult(Bundle result) { + Bundle.setDefusable(result, true); mNumResults++; Intent intent = null; if (result != null) { diff --git a/services/core/java/com/android/server/am/ActiveServices.java b/services/core/java/com/android/server/am/ActiveServices.java index 63a0e87efc59..f51fb6c68cd4 100755 --- a/services/core/java/com/android/server/am/ActiveServices.java +++ b/services/core/java/com/android/server/am/ActiveServices.java @@ -811,10 +811,8 @@ public final class ActiveServices { // Hacky kind of thing -- allow system stuff to tell us // what they are, so we can report this elsewhere for // others to know why certain services are running. - try { - clientIntent = service.getParcelableExtra(Intent.EXTRA_CLIENT_INTENT); - } catch (RuntimeException e) { - } + service.setDefusable(true); + clientIntent = service.getParcelableExtra(Intent.EXTRA_CLIENT_INTENT); if (clientIntent != null) { clientLabel = service.getIntExtra(Intent.EXTRA_CLIENT_LABEL, 0); if (clientLabel != 0) { diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java index 4f0f7704f0b8..c1ec71c92a2d 100644 --- a/services/core/java/com/android/server/am/ActivityManagerService.java +++ b/services/core/java/com/android/server/am/ActivityManagerService.java @@ -63,6 +63,7 @@ import org.xmlpull.v1.XmlPullParserException; import org.xmlpull.v1.XmlSerializer; import android.Manifest; +import android.annotation.UserIdInt; import android.app.Activity; import android.app.ActivityManager; import android.app.ActivityManager.RunningTaskInfo; @@ -2168,17 +2169,19 @@ public final class ActivityManagerService extends ActivityManagerNative final ActivityRecord r = (ActivityRecord) msg.obj; boolean vrMode; ComponentName requestedPackage; + ComponentName callingPackage; int userId; synchronized (ActivityManagerService.this) { vrMode = r.requestedVrComponent != null; requestedPackage = r.requestedVrComponent; userId = r.userId; + callingPackage = r.info.getComponentName(); if (mInVrMode != vrMode) { mInVrMode = vrMode; mShowDialogs = shouldShowDialogs(mConfiguration, mInVrMode); } } - vrService.setVrMode(vrMode, requestedPackage, userId); + vrService.setVrMode(vrMode, requestedPackage, userId, callingPackage); } break; } } @@ -6920,6 +6923,7 @@ public final class ActivityManagerService extends ActivityManagerNative intents[i].setDefusable(true); } } + Bundle.setDefusable(bOptions, true); final boolean noCreate = (flags&PendingIntent.FLAG_NO_CREATE) != 0; final boolean cancelCurrent = (flags&PendingIntent.FLAG_CANCEL_CURRENT) != 0; @@ -9670,14 +9674,14 @@ public final class ActivityManagerService extends ActivityManagerNative @Override public void resizeStack(int stackId, Rect bounds, boolean allowResizeInDockedMode, - boolean preserveWindows, boolean animate) { + boolean preserveWindows, boolean animate, int animationDuration) { enforceCallingPermission(MANAGE_ACTIVITY_STACKS, "resizeStack()"); long ident = Binder.clearCallingIdentity(); try { synchronized (this) { if (animate) { if (stackId == PINNED_STACK_ID) { - mWindowManager.animateResizePinnedStack(bounds); + mWindowManager.animateResizePinnedStack(bounds, animationDuration); } else { throw new IllegalArgumentException("Stack: " + stackId + " doesn't support animated resize."); @@ -11390,13 +11394,9 @@ public final class ActivityManagerService extends ActivityManagerNative + android.Manifest.permission.DEVICE_POWER); } - final int user = UserHandle.myUserId(); synchronized(this) { long ident = Binder.clearCallingIdentity(); try { - if (!shown && mStackSupervisor.isFocusedUserLockedProfile()) { - startHomeActivityLocked(user, "setLockScreenShown"); - } if (DEBUG_LOCKSCREEN) logLockScreen(" shown=" + shown); mLockScreenShown = shown ? LOCK_SCREEN_SHOWN : LOCK_SCREEN_HIDDEN; updateSleepIfNeededLocked(); @@ -11407,6 +11407,42 @@ public final class ActivityManagerService extends ActivityManagerNative } @Override + public void notifyLockedProfile(@UserIdInt int userId) { + try { + if (!AppGlobals.getPackageManager().isUidPrivileged(Binder.getCallingUid())) { + throw new SecurityException("Only privileged app can call notifyLockedProfile"); + } + } catch (RemoteException ex) { + throw new SecurityException("Fail to check is caller a privileged app", ex); + } + + synchronized (this) { + if (mStackSupervisor.isFocusedUserLockedProfile()) { + final long ident = Binder.clearCallingIdentity(); + try { + final int currentUserId = mUserController.getCurrentUserIdLocked(); + // Get the focused task before launching launcher. + final int taskId = (mFocusedActivity == null) + ? -1 : mFocusedActivity.task.taskId; + startHomeActivityLocked(currentUserId, "notifyLockedProfile"); + if (mUserController.isLockScreenDisabled(currentUserId)) { + // If there is no device lock, we first go to launcher and then resume the + // original task. Work challenge will be shown because we intercepted + // startActivityFromRecentsInner and the reason why we switch to home stack + // first is to prevent pressing back button brings user back to the work + // app. + if (taskId != -1) { + startActivityFromRecentsInner(taskId, null); + } + } + } finally { + Binder.restoreCallingIdentity(ident); + } + } + } + } + + @Override public void stopAppSwitches() { if (checkCallingPermission(android.Manifest.permission.STOP_APP_SWITCHES) != PackageManager.PERMISSION_GRANTED) { diff --git a/services/core/java/com/android/server/am/ActivityStackSupervisor.java b/services/core/java/com/android/server/am/ActivityStackSupervisor.java index d364d8569db0..7def1bd57aaf 100644 --- a/services/core/java/com/android/server/am/ActivityStackSupervisor.java +++ b/services/core/java/com/android/server/am/ActivityStackSupervisor.java @@ -2408,7 +2408,7 @@ public final class ActivityStackSupervisor implements DisplayListener { ensureActivitiesVisibleLocked(null, 0, !PRESERVE_WINDOWS); resumeFocusedStackTopActivityLocked(); - mWindowManager.animateResizePinnedStack(bounds); + mWindowManager.animateResizePinnedStack(bounds, -1); mService.notifyActivityPinnedLocked(); } diff --git a/services/core/java/com/android/server/am/ActivityStarter.java b/services/core/java/com/android/server/am/ActivityStarter.java index efa74209afaa..af69c93b8a64 100644 --- a/services/core/java/com/android/server/am/ActivityStarter.java +++ b/services/core/java/com/android/server/am/ActivityStarter.java @@ -1483,7 +1483,8 @@ class ActivityStarter { if (mLaunchBounds != null) { final int stackId = mTargetStack.mStackId; if (StackId.resizeStackWithLaunchBounds(stackId)) { - mService.resizeStack(stackId, mLaunchBounds, true, !PRESERVE_WINDOWS, ANIMATE); + mService.resizeStack( + stackId, mLaunchBounds, true, !PRESERVE_WINDOWS, ANIMATE, -1); } else { mStartActivity.task.updateOverrideConfiguration(mLaunchBounds); } @@ -1571,7 +1572,7 @@ class ActivityStarter { stackId = stack.mStackId; } if (StackId.resizeStackWithLaunchBounds(stackId)) { - mService.resizeStack(stackId, mLaunchBounds, true, !PRESERVE_WINDOWS, ANIMATE); + mService.resizeStack(stackId, mLaunchBounds, true, !PRESERVE_WINDOWS, ANIMATE, -1); } } mTargetStack = mInTask.stack; diff --git a/services/core/java/com/android/server/am/PendingIntentRecord.java b/services/core/java/com/android/server/am/PendingIntentRecord.java index 8039072dccda..b8f45bc342a8 100644 --- a/services/core/java/com/android/server/am/PendingIntentRecord.java +++ b/services/core/java/com/android/server/am/PendingIntentRecord.java @@ -208,7 +208,10 @@ final class PendingIntentRecord extends IIntentSender.Stub { String requiredPermission, IBinder resultTo, String resultWho, int requestCode, int flagsMask, int flagsValues, Bundle options, IActivityContainer container) throws TransactionTooLargeException { - synchronized(owner) { + if (intent != null) intent.setDefusable(true); + if (options != null) options.setDefusable(true); + + synchronized (owner) { final ActivityContainer activityContainer = (ActivityContainer)container; if (activityContainer != null && activityContainer.mParentActivity != null && activityContainer.mParentActivity.state diff --git a/services/core/java/com/android/server/am/UserController.java b/services/core/java/com/android/server/am/UserController.java index 59c2682bdb0f..5baba524aab4 100644 --- a/services/core/java/com/android/server/am/UserController.java +++ b/services/core/java/com/android/server/am/UserController.java @@ -39,6 +39,7 @@ import static com.android.server.am.ActivityManagerService.SYSTEM_USER_UNLOCK_MS import static com.android.server.am.ActivityManagerService.USER_SWITCH_TIMEOUT_MSG; import android.annotation.NonNull; +import android.annotation.UserIdInt; import android.app.ActivityManager; import android.app.AppOpsManager; import android.app.Dialog; @@ -1340,6 +1341,10 @@ final class UserController { return km.isDeviceLocked(userId); } + boolean isLockScreenDisabled(@UserIdInt int userId) { + return mLockPatternUtils.isLockScreenDisabled(userId); + } + void dump(PrintWriter pw, boolean dumpAll) { pw.println(" mStartedUsers:"); for (int i = 0; i < mStartedUsers.size(); i++) { diff --git a/services/core/java/com/android/server/connectivity/ApfFilter.java b/services/core/java/com/android/server/connectivity/ApfFilter.java index d62a0b3fb090..824db6541001 100644 --- a/services/core/java/com/android/server/connectivity/ApfFilter.java +++ b/services/core/java/com/android/server/connectivity/ApfFilter.java @@ -90,6 +90,7 @@ public class ApfFilter { } private static final String TAG = "ApfFilter"; + private static final boolean DBG = true; private static final boolean VDBG = false; private final ConnectivityService mConnectivityService; @@ -205,6 +206,10 @@ public class ApfFilter { // For debugging only. How many times this RA was seen. int seenCount = 0; + // For debugging only. Returns the hex representation of the last matching packet. + String getLastMatchingPacket() { + return HexDump.toHexString(mPacket.array(), 0, mPacket.capacity(), false /* lowercase */); + } private String IPv6AddresstoString(int pos) { try { @@ -406,11 +411,17 @@ public class ApfFilter { for (int i = 0; i < mNonLifetimes.size(); i++) { // Generate code to match the packet bytes Pair<Integer, Integer> nonLifetime = mNonLifetimes.get(i); - gen.addLoadImmediate(Register.R0, nonLifetime.first); - gen.addJumpIfBytesNotEqual(Register.R0, - Arrays.copyOfRange(mPacket.array(), nonLifetime.first, - nonLifetime.first + nonLifetime.second), - nextFilterLabel); + // Don't generate JNEBS instruction for 0 bytes as it always fails the + // ASSERT_FORWARD_IN_PROGRAM(pc + cmp_imm - 1) check where cmp_imm is + // the number of bytes to compare. nonLifetime is zero between the + // valid and preferred lifetimes in the prefix option. + if (nonLifetime.second != 0) { + gen.addLoadImmediate(Register.R0, nonLifetime.first); + gen.addJumpIfBytesNotEqual(Register.R0, + Arrays.copyOfRange(mPacket.array(), nonLifetime.first, + nonLifetime.first + nonLifetime.second), + nextFilterLabel); + } // Generate code to test the lifetimes haven't gone down too far if ((i + 1) < mNonLifetimes.size()) { Pair<Integer, Integer> nextNonLifetime = mNonLifetimes.get(i + 1); @@ -454,7 +465,7 @@ public class ApfFilter { private long mLastInstalledProgramMinLifetime; // For debugging only. The length in bytes of the last program. - private long mLastInstalledProgramLength; + private byte[] mLastInstalledProgram; private void installNewProgram() { if (mRas.size() == 0) return; @@ -495,7 +506,7 @@ public class ApfFilter { } mLastTimeInstalledProgram = curTime(); mLastInstalledProgramMinLifetime = programMinLifetime; - mLastInstalledProgramLength = program.length; + mLastInstalledProgram = program; if (VDBG) { hexDump("Installing filter: ", program, program.length); } else { @@ -515,7 +526,7 @@ public class ApfFilter { } private void hexDump(String msg, byte[] packet, int length) { - log(msg + HexDump.toHexString(packet, 0, length)); + log(msg + HexDump.toHexString(packet, 0, length, false /* lowercase */)); } private void processRa(byte[] packet, int length) { @@ -608,7 +619,7 @@ public class ApfFilter { pw.println(String.format( "Last program length %d, installed %ds ago, lifetime %d", - mLastInstalledProgramLength, curTime() - mLastTimeInstalledProgram, + mLastInstalledProgram.length, curTime() - mLastTimeInstalledProgram, mLastInstalledProgramMinLifetime)); pw.println("RA filters:"); @@ -618,8 +629,22 @@ public class ApfFilter { pw.increaseIndent(); pw.println(String.format( "Seen: %d, last %ds ago", ra.seenCount, curTime() - ra.mLastSeen)); + if (DBG) { + pw.println("Last match:"); + pw.increaseIndent(); + pw.println(ra.getLastMatchingPacket()); + pw.decreaseIndent(); + } + pw.decreaseIndent(); + } + + if (DBG) { + pw.println("Last program:"); + pw.increaseIndent(); + pw.println(HexDump.toHexString(mLastInstalledProgram, false /* lowercase */)); pw.decreaseIndent(); } + pw.decreaseIndent(); } } diff --git a/services/core/java/com/android/server/content/ContentService.java b/services/core/java/com/android/server/content/ContentService.java index 03191a0977cc..28170f2a6b1c 100644 --- a/services/core/java/com/android/server/content/ContentService.java +++ b/services/core/java/com/android/server/content/ContentService.java @@ -286,6 +286,7 @@ public final class ContentService extends IContentService.Stub { UserHandle.getCallingUserId()); } + @Override public void unregisterContentObserver(IContentObserver observer) { if (observer == null) { throw new IllegalArgumentException("You must pass a valid observer"); @@ -409,7 +410,9 @@ public final class ContentService extends IContentService.Stub { } } + @Override public void requestSync(Account account, String authority, Bundle extras) { + Bundle.setDefusable(extras, true); ContentResolver.validateSyncExtrasBundle(extras); int userId = UserHandle.getCallingUserId(); int uId = Binder.getCallingUid(); @@ -438,6 +441,7 @@ public final class ContentService extends IContentService.Stub { * Depending on the request, we enqueue to suit in the SyncManager. * @param request The request object. Validation of this object is done by its builder. */ + @Override public void sync(SyncRequest request) { syncAsUser(request, UserHandle.getCallingUserId()); } @@ -446,6 +450,7 @@ public final class ContentService extends IContentService.Stub { * If the user id supplied is different to the calling user, the caller must hold the * INTERACT_ACROSS_USERS_FULL permission. */ + @Override public void syncAsUser(SyncRequest request, int userId) { enforceCrossUserPermission(userId, "no permission to request sync as user: " + userId); int callerUid = Binder.getCallingUid(); @@ -544,6 +549,7 @@ public final class ContentService extends IContentService.Stub { } } + @Override public void cancelRequest(SyncRequest request) { SyncManager syncManager = getSyncManager(); if (syncManager == null) return; @@ -678,6 +684,7 @@ public final class ContentService extends IContentService.Stub { @Override public void addPeriodicSync(Account account, String authority, Bundle extras, long pollFrequency) { + Bundle.setDefusable(extras, true); if (account == null) { throw new IllegalArgumentException("Account must not be null"); } @@ -706,7 +713,9 @@ public final class ContentService extends IContentService.Stub { } } + @Override public void removePeriodicSync(Account account, String authority, Bundle extras) { + Bundle.setDefusable(extras, true); if (account == null) { throw new IllegalArgumentException("Account must not be null"); } @@ -728,7 +737,7 @@ public final class ContentService extends IContentService.Stub { } } - + @Override public List<PeriodicSync> getPeriodicSyncs(Account account, String providerName, ComponentName cname) { if (account == null) { @@ -750,6 +759,7 @@ public final class ContentService extends IContentService.Stub { } } + @Override public int getIsSyncable(Account account, String providerName) { return getIsSyncableAsUser(account, providerName, UserHandle.getCallingUserId()); } @@ -758,6 +768,7 @@ public final class ContentService extends IContentService.Stub { * If the user id supplied is different to the calling user, the caller must hold the * INTERACT_ACROSS_USERS_FULL permission. */ + @Override public int getIsSyncableAsUser(Account account, String providerName, int userId) { enforceCrossUserPermission(userId, "no permission to read the sync settings for user " + userId); @@ -777,6 +788,7 @@ public final class ContentService extends IContentService.Stub { return -1; } + @Override public void setIsSyncable(Account account, String providerName, int syncable) { if (TextUtils.isEmpty(providerName)) { throw new IllegalArgumentException("Authority must not be empty"); @@ -848,11 +860,11 @@ public final class ContentService extends IContentService.Stub { } } + @Override public boolean isSyncActive(Account account, String authority, ComponentName cname) { mContext.enforceCallingOrSelfPermission(Manifest.permission.READ_SYNC_STATS, "no permission to read the sync stats"); int userId = UserHandle.getCallingUserId(); - int callingUid = Binder.getCallingUid(); long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); @@ -866,6 +878,7 @@ public final class ContentService extends IContentService.Stub { } } + @Override public List<SyncInfo> getCurrentSyncs() { return getCurrentSyncsAsUser(UserHandle.getCallingUserId()); } @@ -874,6 +887,7 @@ public final class ContentService extends IContentService.Stub { * If the user id supplied is different to the calling user, the caller must hold the * INTERACT_ACROSS_USERS_FULL permission. */ + @Override public List<SyncInfo> getCurrentSyncsAsUser(int userId) { enforceCrossUserPermission(userId, "no permission to read the sync settings for user " + userId); @@ -892,6 +906,7 @@ public final class ContentService extends IContentService.Stub { } } + @Override public SyncStatusInfo getSyncStatus(Account account, String authority, ComponentName cname) { return getSyncStatusAsUser(account, authority, cname, UserHandle.getCallingUserId()); } @@ -900,6 +915,7 @@ public final class ContentService extends IContentService.Stub { * If the user id supplied is different to the calling user, the caller must hold the * INTERACT_ACROSS_USERS_FULL permission. */ + @Override public SyncStatusInfo getSyncStatusAsUser(Account account, String authority, ComponentName cname, int userId) { if (TextUtils.isEmpty(authority)) { @@ -911,7 +927,6 @@ public final class ContentService extends IContentService.Stub { mContext.enforceCallingOrSelfPermission(Manifest.permission.READ_SYNC_STATS, "no permission to read the sync stats"); - int callerUid = Binder.getCallingUid(); long identityToken = clearCallingIdentity(); try { SyncManager syncManager = getSyncManager(); @@ -930,6 +945,7 @@ public final class ContentService extends IContentService.Stub { } } + @Override public boolean isSyncPending(Account account, String authority, ComponentName cname) { return isSyncPendingAsUser(account, authority, cname, UserHandle.getCallingUserId()); } @@ -941,7 +957,6 @@ public final class ContentService extends IContentService.Stub { "no permission to read the sync stats"); enforceCrossUserPermission(userId, "no permission to retrieve the sync settings for user " + userId); - int callerUid = Binder.getCallingUid(); long identityToken = clearCallingIdentity(); SyncManager syncManager = getSyncManager(); if (syncManager == null) return false; @@ -959,6 +974,7 @@ public final class ContentService extends IContentService.Stub { } } + @Override public void addStatusChangeListener(int mask, ISyncStatusObserver callback) { long identityToken = clearCallingIdentity(); try { @@ -971,6 +987,7 @@ public final class ContentService extends IContentService.Stub { } } + @Override public void removeStatusChangeListener(ISyncStatusObserver callback) { long identityToken = clearCallingIdentity(); try { @@ -1027,6 +1044,7 @@ public final class ContentService extends IContentService.Stub { @Override public void putCache(String packageName, Uri key, Bundle value, int userId) { + Bundle.setDefusable(value, true); enforceCrossUserPermission(userId, TAG); mContext.enforceCallingOrSelfPermission(android.Manifest.permission.CACHE_CONTENT, TAG); mContext.getSystemService(AppOpsManager.class).checkPackage(Binder.getCallingUid(), @@ -1113,6 +1131,7 @@ public final class ContentService extends IContentService.Stub { } } + @Override public void binderDied() { synchronized (observersLock) { removeObserverLocked(observer); diff --git a/services/core/java/com/android/server/job/JobSchedulerService.java b/services/core/java/com/android/server/job/JobSchedulerService.java index 9fd7f90e7e72..e34fb9bef2ba 100644 --- a/services/core/java/com/android/server/job/JobSchedulerService.java +++ b/services/core/java/com/android/server/job/JobSchedulerService.java @@ -209,7 +209,9 @@ public final class JobSchedulerService extends com.android.server.SystemService private final BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - Slog.d(TAG, "Receieved: " + intent.getAction()); + if (DEBUG) { + Slog.d(TAG, "Receieved: " + intent.getAction()); + } if (Intent.ACTION_PACKAGE_REMOVED.equals(intent.getAction())) { // If this is an outright uninstall rather than the first half of an // app update sequence, cancel the jobs associated with the app. diff --git a/services/core/java/com/android/server/job/controllers/TimeController.java b/services/core/java/com/android/server/job/controllers/TimeController.java index 36fa9ec68050..35432495942d 100644 --- a/services/core/java/com/android/server/job/controllers/TimeController.java +++ b/services/core/java/com/android/server/job/controllers/TimeController.java @@ -39,9 +39,9 @@ public class TimeController extends StateController { private static final String TAG = "JobScheduler.Time"; /** Deadline alarm tag for logging purposes */ - private final String DEADLINE_TAG = "deadline"; + private final String DEADLINE_TAG = "JobScheduler.deadline"; /** Delay alarm tag for logging purposes */ - private final String DELAY_TAG = "delay"; + private final String DELAY_TAG = "JobScheduler.delay"; private long mNextJobExpiredElapsedMillis; private long mNextDelayExpiredElapsedMillis; diff --git a/services/core/java/com/android/server/media/MediaResourceMonitorService.java b/services/core/java/com/android/server/media/MediaResourceMonitorService.java index 50dd607e5a5a..e169d638c442 100644 --- a/services/core/java/com/android/server/media/MediaResourceMonitorService.java +++ b/services/core/java/com/android/server/media/MediaResourceMonitorService.java @@ -37,13 +37,6 @@ public class MediaResourceMonitorService extends SystemService { private static final String SERVICE_NAME = "media_resource_monitor"; - /* - * Resource types. Should be in sync with: - * frameworks/av/media/libmedia/MediaResource.cpp - */ - private static final String RESOURCE_AUDIO_CODEC = "audio-codec"; - private static final String RESOURCE_VIDEO_CODEC = "video-codec"; - private final MediaResourceMonitorImpl mMediaResourceMonitorImpl; public MediaResourceMonitorService(Context context) { @@ -58,25 +51,18 @@ public class MediaResourceMonitorService extends SystemService { class MediaResourceMonitorImpl extends IMediaResourceMonitor.Stub { @Override - public void notifyResourceGranted(int pid, String type, String subType, long value) + public void notifyResourceGranted(int pid, int type) throws RemoteException { if (DEBUG) { - Slog.d(TAG, "notifyResourceGranted(pid=" + pid + ", type=" + type + ", subType=" - + subType + ", value=" + value + ")"); + Slog.d(TAG, "notifyResourceGranted(pid=" + pid + ", type=" + type + ")"); } final long identity = Binder.clearCallingIdentity(); try { String pkgNames[] = getPackageNamesFromPid(pid); - Integer resourceType = null; - if (RESOURCE_AUDIO_CODEC.equals(subType)) { - resourceType = Intent.EXTRA_MEDIA_RESOURCE_TYPE_AUDIO_CODEC; - } else if (RESOURCE_VIDEO_CODEC.equals(subType)) { - resourceType = Intent.EXTRA_MEDIA_RESOURCE_TYPE_VIDEO_CODEC; - } - if (pkgNames != null && resourceType != null) { + if (pkgNames != null) { Intent intent = new Intent(Intent.ACTION_MEDIA_RESOURCE_GRANTED); intent.putExtra(Intent.EXTRA_PACKAGES, pkgNames); - intent.putExtra(Intent.EXTRA_MEDIA_RESOURCE_TYPE, resourceType); + intent.putExtra(Intent.EXTRA_MEDIA_RESOURCE_TYPE, type); getContext().sendBroadcastAsUser(intent, new UserHandle(ActivityManager.getCurrentUser()), android.Manifest.permission.RECEIVE_MEDIA_RESOURCE_USAGE); diff --git a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java index 56edcca7ac0f..49ae2936d6ff 100644 --- a/services/core/java/com/android/server/net/NetworkPolicyManagerService.java +++ b/services/core/java/com/android/server/net/NetworkPolicyManagerService.java @@ -28,13 +28,12 @@ import static android.content.Intent.ACTION_UID_REMOVED; import static android.content.Intent.ACTION_USER_ADDED; import static android.content.Intent.ACTION_USER_REMOVED; import static android.content.Intent.EXTRA_UID; - import static android.net.ConnectivityManager.CONNECTIVITY_ACTION; -import static android.net.ConnectivityManager.TYPE_MOBILE; -import static android.net.ConnectivityManager.TYPE_WIMAX; import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_DISABLED; import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_ENABLED; import static android.net.ConnectivityManager.RESTRICT_BACKGROUND_STATUS_WHITELISTED; +import static android.net.ConnectivityManager.TYPE_MOBILE; +import static android.net.ConnectivityManager.TYPE_WIMAX; import static android.net.ConnectivityManager.isNetworkTypeMobile; import static android.net.NetworkPolicy.CYCLE_NONE; import static android.net.NetworkPolicy.LIMIT_DISABLED; @@ -47,11 +46,9 @@ import static android.net.NetworkPolicyManager.FIREWALL_CHAIN_STANDBY; import static android.net.NetworkPolicyManager.FIREWALL_RULE_ALLOW; import static android.net.NetworkPolicyManager.FIREWALL_RULE_DEFAULT; import static android.net.NetworkPolicyManager.FIREWALL_RULE_DENY; -import static android.net.NetworkPolicyManager.POLICY_ALLOW_BACKGROUND_BATTERY_SAVE; import static android.net.NetworkPolicyManager.POLICY_NONE; import static android.net.NetworkPolicyManager.POLICY_REJECT_METERED_BACKGROUND; import static android.net.NetworkPolicyManager.RULE_ALLOW_ALL; -import static android.net.NetworkPolicyManager.RULE_REJECT_ALL; import static android.net.NetworkPolicyManager.RULE_REJECT_METERED; import static android.net.NetworkPolicyManager.RULE_UNKNOWN; import static android.net.NetworkPolicyManager.computeLastCycleBoundary; @@ -80,6 +77,7 @@ import static com.android.internal.util.XmlUtils.writeIntAttribute; import static com.android.internal.util.XmlUtils.writeLongAttribute; import static com.android.server.NetworkManagementService.LIMIT_GLOBAL_ALERT; import static com.android.server.net.NetworkStatsService.ACTION_NETWORK_STATS_UPDATED; + import static org.xmlpull.v1.XmlPullParser.END_DOCUMENT; import static org.xmlpull.v1.XmlPullParser.END_TAG; import static org.xmlpull.v1.XmlPullParser.START_TAG; @@ -130,12 +128,12 @@ import android.os.IDeviceIdleController; import android.os.INetworkManagementService; import android.os.IPowerManager; import android.os.Message; -import android.os.ResultReceiver; import android.os.MessageQueue.IdleHandler; import android.os.PowerManager; import android.os.PowerManagerInternal; import android.os.RemoteCallbackList; import android.os.RemoteException; +import android.os.ResultReceiver; import android.os.ServiceManager; import android.os.UserHandle; import android.os.UserManager; @@ -157,8 +155,6 @@ import android.util.SparseIntArray; import android.util.TrustedTime; import android.util.Xml; -import libcore.io.IoUtils; - import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; import com.android.internal.content.PackageMonitor; @@ -169,6 +165,9 @@ import com.android.server.DeviceIdleController; import com.android.server.EventLogTags; import com.android.server.LocalServices; import com.android.server.SystemConfig; + +import libcore.io.IoUtils; + import com.google.android.collect.Lists; import org.xmlpull.v1.XmlPullParser; @@ -688,7 +687,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { // global background data policy if (LOGV) Slog.v(TAG, "ACTION_PACKAGE_ADDED for uid=" + uid); synchronized (mRulesLock) { - updateRulesForUidLocked(uid); + updateRestrictDataRulesForUidLocked(uid); } } } @@ -706,7 +705,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { if (LOGV) Slog.v(TAG, "ACTION_UID_REMOVED for uid=" + uid); synchronized (mRulesLock) { mUidPolicy.delete(uid); - updateRulesForUidLocked(uid); + updateRestrictDataRulesForUidLocked(uid); writePolicyLocked(); } } @@ -1446,9 +1445,11 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { final NetworkTemplate template = new NetworkTemplate(networkTemplate, subscriberId, networkId); - mNetworkPolicy.put(template, new NetworkPolicy(template, cycleDay, - cycleTimezone, warningBytes, limitBytes, lastWarningSnooze, - lastLimitSnooze, metered, inferred)); + if (template.isPersistable()) { + mNetworkPolicy.put(template, new NetworkPolicy(template, cycleDay, + cycleTimezone, warningBytes, limitBytes, lastWarningSnooze, + lastLimitSnooze, metered, inferred)); + } } else if (TAG_UID_POLICY.equals(tag)) { final int uid = readIntAttribute(in, ATTR_UID); @@ -1535,6 +1536,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { for (int i = 0; i < mNetworkPolicy.size(); i++) { final NetworkPolicy policy = mNetworkPolicy.valueAt(i); final NetworkTemplate template = policy.template; + if (!template.isPersistable()) continue; out.startTag(null, TAG_NETWORK_POLICY); writeIntAttribute(out, ATTR_NETWORK_TEMPLATE, template.getMatchRule()); @@ -1676,7 +1678,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { mUidPolicy.put(uid, policy); // uid policy changed, recompute rules and persist policy. - updateRulesForUidLocked(uid); + updateRestrictDataRulesForUidLocked(uid); if (persist) { writePolicyLocked(); } @@ -1731,8 +1733,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } writePolicy = true; } - updateRulesForGlobalChangeLocked(true); - // Remove associated UID policies int[] uids = new int[0]; for (int i = 0; i < mUidPolicy.size(); i++) { @@ -1745,11 +1745,12 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { if (uids.length > 0) { for (int uid : uids) { mUidPolicy.delete(uid); - updateRulesForUidLocked(uid); } writePolicy = true; } + updateRulesForGlobalChangeLocked(true); + if (writePolicy) { writePolicyLocked(); } @@ -1896,7 +1897,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { maybeRefreshTrustedTime(); synchronized (mRulesLock) { mRestrictBackground = restrictBackground; - updateRulesForGlobalChangeLocked(true); + updateRulesForRestrictDataLocked(); updateNotificationsLocked(); writePolicyLocked(); } @@ -2303,7 +2304,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { /** * Process state of UID changed; if needed, will trigger - * {@link #updateRulesForUidLocked(int)}. + * {@link #updateRestrictDataRulesForUidLocked(int)}. */ void updateUidStateLocked(int uid, int uidState) { final int oldUidState = mUidState.get(uid, ActivityManager.PROCESS_STATE_CACHED_EMPTY); @@ -2345,7 +2346,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { final boolean oldForeground = oldUidState <= ActivityManager.PROCESS_STATE_TOP; final boolean newForeground = newUidState <= ActivityManager.PROCESS_STATE_TOP; if (oldForeground != newForeground) { - updateRulesForUidLocked(uid); + updateRestrictDataRulesForUidLocked(uid); } } @@ -2369,7 +2370,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { for (int i = 0; i < size; i++) { if (mUidState.valueAt(i) <= ActivityManager.PROCESS_STATE_TOP) { final int uid = mUidState.keyAt(i); - updateRulesForUidLocked(uid); + updateRestrictDataRulesForUidLocked(uid); } } } @@ -2444,8 +2445,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { setUidFirewallRule(chain, uid, FIREWALL_RULE_DEFAULT); } } - - updateRulesForUidLocked(uid); } void updateRulesForAppIdleLocked() { @@ -2482,29 +2481,40 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } else { setUidFirewallRule(FIREWALL_CHAIN_STANDBY, uid, FIREWALL_RULE_DEFAULT); } - - updateRulesForUidLocked(uid); } void updateRulesForAppIdleParoleLocked() { boolean enableChain = !mUsageStats.isAppIdleParoleOn(); enableFirewallChainLocked(FIREWALL_CHAIN_STANDBY, enableChain); - updateRulesForUidsLocked(mUidFirewallStandbyRules); } /** * Update rules that might be changed by {@link #mRestrictBackground}, * {@link #mRestrictPower}, or {@link #mDeviceIdleMode} value. */ - void updateRulesForGlobalChangeLocked(boolean restrictedNetworksChanged) { + private void updateRulesForGlobalChangeLocked(boolean restrictedNetworksChanged) { long start; if (LOGD) start = System.currentTimeMillis(); - final PackageManager pm = mContext.getPackageManager(); - updateRulesForDeviceIdleLocked(); updateRulesForAppIdleLocked(); updateRulesForRestrictPowerLocked(); + updateRulesForRestrictDataLocked(); + + // If the set of restricted networks may have changed, re-evaluate those. + if (restrictedNetworksChanged) { + normalizePoliciesLocked(); + updateNetworkRulesLocked(); + } + if (LOGD) { + final long delta = System.currentTimeMillis() - start; + Slog.d(TAG, "updateRulesForGlobalChangeLocked(" + restrictedNetworksChanged + ") took " + + delta + "ms"); + } + } + + private void updateRulesForRestrictDataLocked() { + final PackageManager pm = mContext.getPackageManager(); // update rules for all installed applications final List<UserInfo> users = mUserManager.getUsers(); @@ -2520,27 +2530,16 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { for (int j = 0; j < appsSize; j++) { final ApplicationInfo app = apps.get(j); final int uid = UserHandle.getUid(user.id, app.uid); - updateRulesForUidLocked(uid); + updateRestrictDataRulesForUidLocked(uid); } } // limit data usage for some internal system services - updateRulesForUidLocked(android.os.Process.MEDIA_UID); - updateRulesForUidLocked(android.os.Process.DRM_UID); - - // If the set of restricted networks may have changed, re-evaluate those. - if (restrictedNetworksChanged) { - normalizePoliciesLocked(); - updateNetworkRulesLocked(); - } - if (LOGD) { - final long delta = System.currentTimeMillis() - start; - Slog.d(TAG, "updateRulesForGlobalChangeLocked(" + restrictedNetworksChanged + ") took " - + delta + "ms"); - } + updateRestrictDataRulesForUidLocked(android.os.Process.MEDIA_UID); + updateRestrictDataRulesForUidLocked(android.os.Process.DRM_UID); } - void updateRulesForTempWhitelistChangeLocked() { + private void updateRulesForTempWhitelistChangeLocked() { final List<UserInfo> users = mUserManager.getUsers(); for (int i = 0; i < users.size(); i++) { final UserInfo user = users.get(i); @@ -2578,12 +2577,6 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { return true; } - void updateRulesForUidsLocked(SparseIntArray uids) { - for (int i = 0; i < uids.size(); i++) { - updateRulesForUidLocked(uids.keyAt(i)); - } - } - /** * Checks if an uid has INTERNET permissions. * <p> @@ -2601,72 +2594,45 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { } /** - * Applies network rules to bandwidth and firewall controllers based on uid policy. + * Applies network rules to bandwidth controllers based on uid policy. + * * @param uid The uid for which to apply the latest policy */ - void updateRulesForUidLocked(int uid) { + private void updateRestrictDataRulesForUidLocked(int uid) { if (!isUidValidForRules(uid) || !hasInternetPermissions(uid)) return; final int uidPolicy = mUidPolicy.get(uid, POLICY_NONE); final boolean uidForeground = isUidForegroundLocked(uid); // Derive active rules based on policy and active state - int appId = UserHandle.getAppId(uid); - int uidRules = RULE_ALLOW_ALL; - if (!uidForeground && (uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0) { - // uid in background, and policy says to block metered data - uidRules = RULE_REJECT_METERED; - } else if (mRestrictBackground) { - if (!uidForeground) { - // uid in background, global background disabled, and this uid is not on the white - // list of those allowed background access while global background is disabled - if (!mRestrictBackgroundWhitelistUids.get(uid)) { - uidRules = RULE_REJECT_METERED; - } - } - } else if (mRestrictPower) { - final boolean whitelisted = mPowerSaveWhitelistExceptIdleAppIds.get(appId) - || mPowerSaveTempWhitelistAppIds.get(appId); - if (!whitelisted && !uidForeground - && (uidPolicy & POLICY_ALLOW_BACKGROUND_BATTERY_SAVE) == 0) { - // uid is in background, restrict power use mode is on (so we want to - // restrict all background network access), and this uid is not on the - // white list of those allowed background access. - uidRules = RULE_REJECT_METERED; - } - } - - // Check dozable state, which is whitelist - if (mFirewallChainStates.get(FIREWALL_CHAIN_DOZABLE) - && mUidFirewallDozableRules.get(uid, FIREWALL_RULE_DEFAULT) != FIREWALL_RULE_ALLOW) { - uidRules = RULE_REJECT_ALL; - } + int newRule = RULE_ALLOW_ALL; - // Check powersave state, which is whitelist - if (mFirewallChainStates.get(FIREWALL_CHAIN_POWERSAVE) - && mUidFirewallPowerSaveRules.get(uid, FIREWALL_RULE_DEFAULT) != FIREWALL_RULE_ALLOW) { - uidRules = RULE_REJECT_ALL; + if (!uidForeground) { + // If the app is not in foreground, reject access if: + // - app is blacklisted by policy or + // - data saver mode is and app is not whitelisted + if (((uidPolicy & POLICY_REJECT_METERED_BACKGROUND) != 0) + || (mRestrictBackground && !mRestrictBackgroundWhitelistUids.get(uid))) { + newRule = RULE_REJECT_METERED; + } } - // Check standby state, which is blacklist - if (mFirewallChainStates.get(FIREWALL_CHAIN_STANDBY) - && mUidFirewallStandbyRules.get(uid, FIREWALL_RULE_DEFAULT) == FIREWALL_RULE_DENY) { - uidRules = RULE_REJECT_ALL; - } + final int oldRule = mUidRules.get(uid); + if (LOGV) Log.v(TAG, "updateBandwithControllerRulesForUidLocked(" + uid + "): oldRule = " + + oldRule + ", newRule = " + newRule); - final int oldRules = mUidRules.get(uid); - if (uidRules == RULE_ALLOW_ALL) { + if (newRule == RULE_ALLOW_ALL) { mUidRules.delete(uid); } else { - mUidRules.put(uid, uidRules); + mUidRules.put(uid, newRule); } - final boolean rejectMetered = (uidRules == RULE_REJECT_METERED); + final boolean rejectMetered = (newRule == RULE_REJECT_METERED); setUidNetworkRules(uid, rejectMetered); // dispatch changed rule to existing listeners - if (oldRules != uidRules) { - mHandler.obtainMessage(MSG_RULES_CHANGED, uid, uidRules).sendToTarget(); + if (oldRule != newRule) { + mHandler.obtainMessage(MSG_RULES_CHANGED, uid, newRule).sendToTarget(); } try { diff --git a/services/core/java/com/android/server/notification/NotificationManagerService.java b/services/core/java/com/android/server/notification/NotificationManagerService.java index 575de1664847..0f23fded2e92 100644 --- a/services/core/java/com/android/server/notification/NotificationManagerService.java +++ b/services/core/java/com/android/server/notification/NotificationManagerService.java @@ -1852,6 +1852,11 @@ public class NotificationManagerService extends SystemService { } private boolean checkPolicyAccess(String pkg) { + if (PackageManager.PERMISSION_GRANTED == ActivityManager.checkComponentPermission( + android.Manifest.permission.MANAGE_NOTIFICATIONS, Binder.getCallingUid(), + -1, true)) { + return true; + } return checkPackagePolicyAccess(pkg) || mListeners.isComponentEnabledForPackage(pkg); } @@ -1946,7 +1951,7 @@ public class NotificationManagerService extends SystemService { public boolean isNotificationPolicyAccessGrantedForPackage(String pkg) {; enforceSystemOrSystemUIOrSamePackage(pkg, "request policy access status for another package"); - return checkPackagePolicyAccess(pkg); + return checkPolicyAccess(pkg); } @Override @@ -2247,11 +2252,6 @@ public class NotificationManagerService extends SystemService { // Sanitize inputs notification.priority = clamp(notification.priority, Notification.PRIORITY_MIN, Notification.PRIORITY_MAX); - if (notification.extras != null) { - // If the remote side sent us bad parcelables, they won't get the - // results they want, which is their loss. - notification.extras.setDefusable(true); - } // setup local book-keeping final StatusBarNotification n = new StatusBarNotification( diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java index c2e0992e7b79..9335116d4451 100644 --- a/services/core/java/com/android/server/pm/PackageManagerService.java +++ b/services/core/java/com/android/server/pm/PackageManagerService.java @@ -10451,10 +10451,10 @@ public class PackageManagerService extends IPackageManager.Stub { void startCleaningPackages() { // reader + if (!isExternalMediaAvailable()) { + return; + } synchronized (mPackages) { - if (!isExternalMediaAvailable()) { - return; - } if (mSettings.mPackagesToBeCleaned.isEmpty()) { return; } diff --git a/services/core/java/com/android/server/pm/ShortcutLauncher.java b/services/core/java/com/android/server/pm/ShortcutLauncher.java new file mode 100644 index 000000000000..f1920c7e8e22 --- /dev/null +++ b/services/core/java/com/android/server/pm/ShortcutLauncher.java @@ -0,0 +1,199 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.server.pm; + +import android.annotation.NonNull; +import android.annotation.UserIdInt; +import android.content.pm.ShortcutInfo; +import android.util.ArrayMap; +import android.util.ArraySet; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlSerializer; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.List; + +/** + * Launcher information used by {@link ShortcutService}. + */ +class ShortcutLauncher { + private static final String TAG = ShortcutService.TAG; + + static final String TAG_ROOT = "launcher-pins"; + + private static final String TAG_PACKAGE = "package"; + private static final String TAG_PIN = "pin"; + + private static final String ATTR_VALUE = "value"; + private static final String ATTR_PACKAGE_NAME = "package-name"; + + @UserIdInt + final int mUserId; + + @NonNull + final String mPackageName; + + /** + * Package name -> IDs. + */ + final private ArrayMap<String, ArraySet<String>> mPinnedShortcuts = new ArrayMap<>(); + + ShortcutLauncher(@UserIdInt int userId, @NonNull String packageName) { + mUserId = userId; + mPackageName = packageName; + } + + public void pinShortcuts(@NonNull ShortcutService s, @NonNull String packageName, + @NonNull List<String> ids) { + final int idSize = ids.size(); + if (idSize == 0) { + mPinnedShortcuts.remove(packageName); + } else { + final ArraySet<String> prevSet = mPinnedShortcuts.get(packageName); + + // Pin shortcuts. Make sure only pin the ones that were visible to the caller. + // i.e. a non-dynamic, pinned shortcut by *other launchers* shouldn't be pinned here. + + final ShortcutPackage packageShortcuts = + s.getPackageShortcutsLocked(packageName, mUserId); + final ArraySet<String> newSet = new ArraySet<>(); + + for (int i = 0; i < idSize; i++) { + final String id = ids.get(i); + final ShortcutInfo si = packageShortcuts.findShortcutById(id); + if (si == null) { + continue; + } + if (si.isDynamic() || (prevSet != null && prevSet.contains(id))) { + newSet.add(id); + } + } + mPinnedShortcuts.put(packageName, newSet); + } + s.getPackageShortcutsLocked(packageName, mUserId).refreshPinnedFlags(s); + } + + /** + * Return the pinned shortcut IDs for the publisher package. + */ + public ArraySet<String> getPinnedShortcutIds(@NonNull String packageName) { + return mPinnedShortcuts.get(packageName); + } + + boolean cleanUpPackage(String packageName) { + return mPinnedShortcuts.remove(packageName) != null; + } + + /** + * Persist. + */ + public void saveToXml(XmlSerializer out) throws IOException { + final int size = mPinnedShortcuts.size(); + if (size == 0) { + return; // Nothing to write. + } + + out.startTag(null, TAG_ROOT); + ShortcutService.writeAttr(out, ATTR_PACKAGE_NAME, + mPackageName); + + for (int i = 0; i < size; i++) { + out.startTag(null, TAG_PACKAGE); + ShortcutService.writeAttr(out, ATTR_PACKAGE_NAME, + mPinnedShortcuts.keyAt(i)); + + final ArraySet<String> ids = mPinnedShortcuts.valueAt(i); + final int idSize = ids.size(); + for (int j = 0; j < idSize; j++) { + ShortcutService.writeTagValue(out, TAG_PIN, ids.valueAt(j)); + } + out.endTag(null, TAG_PACKAGE); + } + + out.endTag(null, TAG_ROOT); + } + + /** + * Load. + */ + public static ShortcutLauncher loadFromXml(XmlPullParser parser, int userId) + throws IOException, XmlPullParserException { + final String launcherPackageName = ShortcutService.parseStringAttribute(parser, + ATTR_PACKAGE_NAME); + + final ShortcutLauncher ret = new ShortcutLauncher(userId, launcherPackageName); + + ArraySet<String> ids = null; + final int outerDepth = parser.getDepth(); + int type; + while ((type = parser.next()) != XmlPullParser.END_DOCUMENT + && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { + if (type != XmlPullParser.START_TAG) { + continue; + } + final int depth = parser.getDepth(); + final String tag = parser.getName(); + switch (tag) { + case TAG_PACKAGE: { + final String packageName = ShortcutService.parseStringAttribute(parser, + ATTR_PACKAGE_NAME); + ids = new ArraySet<>(); + ret.mPinnedShortcuts.put(packageName, ids); + continue; + } + case TAG_PIN: { + ids.add(ShortcutService.parseStringAttribute(parser, + ATTR_VALUE)); + continue; + } + } + throw ShortcutService.throwForInvalidTag(depth, tag); + } + return ret; + } + + public void dump(@NonNull ShortcutService s, @NonNull PrintWriter pw, @NonNull String prefix) { + pw.println(); + + pw.print(prefix); + pw.print("Launcher: "); + pw.print(mPackageName); + pw.println(); + + final int size = mPinnedShortcuts.size(); + for (int i = 0; i < size; i++) { + pw.println(); + + pw.print(prefix); + pw.print(" "); + pw.print("Package: "); + pw.println(mPinnedShortcuts.keyAt(i)); + + final ArraySet<String> ids = mPinnedShortcuts.valueAt(i); + final int idSize = ids.size(); + + for (int j = 0; j < idSize; j++) { + pw.print(prefix); + pw.print(" "); + pw.print(ids.valueAt(j)); + pw.println(); + } + } + } +} diff --git a/services/core/java/com/android/server/pm/ShortcutPackage.java b/services/core/java/com/android/server/pm/ShortcutPackage.java new file mode 100644 index 000000000000..d6142510015e --- /dev/null +++ b/services/core/java/com/android/server/pm/ShortcutPackage.java @@ -0,0 +1,520 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.server.pm; + +import android.annotation.NonNull; +import android.annotation.Nullable; +import android.annotation.UserIdInt; +import android.content.ComponentName; +import android.content.Intent; +import android.content.pm.ShortcutInfo; +import android.os.PersistableBundle; +import android.text.format.Formatter; +import android.util.ArrayMap; +import android.util.ArraySet; +import android.util.Slog; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlSerializer; + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Predicate; + +/** + * Package information used by {@link ShortcutService}. + */ +class ShortcutPackage { + private static final String TAG = ShortcutService.TAG; + + static final String TAG_ROOT = "package"; + private static final String TAG_INTENT_EXTRAS = "intent-extras"; + private static final String TAG_EXTRAS = "extras"; + private static final String TAG_SHORTCUT = "shortcut"; + + private static final String ATTR_NAME = "name"; + private static final String ATTR_DYNAMIC_COUNT = "dynamic-count"; + private static final String ATTR_CALL_COUNT = "call-count"; + private static final String ATTR_LAST_RESET = "last-reset"; + private static final String ATTR_ID = "id"; + private static final String ATTR_ACTIVITY = "activity"; + private static final String ATTR_TITLE = "title"; + private static final String ATTR_INTENT = "intent"; + private static final String ATTR_WEIGHT = "weight"; + private static final String ATTR_TIMESTAMP = "timestamp"; + private static final String ATTR_FLAGS = "flags"; + private static final String ATTR_ICON_RES = "icon-res"; + private static final String ATTR_BITMAP_PATH = "bitmap-path"; + + @UserIdInt + final int mUserId; + + @NonNull + final String mPackageName; + + /** + * All the shortcuts from the package, keyed on IDs. + */ + final private ArrayMap<String, ShortcutInfo> mShortcuts = new ArrayMap<>(); + + /** + * # of dynamic shortcuts. + */ + private int mDynamicShortcutCount = 0; + + /** + * # of times the package has called rate-limited APIs. + */ + private int mApiCallCount; + + /** + * When {@link #mApiCallCount} was reset last time. + */ + private long mLastResetTime; + + ShortcutPackage(int userId, String packageName) { + mUserId = userId; + mPackageName = packageName; + } + + @Nullable + public ShortcutInfo findShortcutById(String id) { + return mShortcuts.get(id); + } + + private ShortcutInfo deleteShortcut(@NonNull ShortcutService s, + @NonNull String id) { + final ShortcutInfo shortcut = mShortcuts.remove(id); + if (shortcut != null) { + s.removeIcon(mUserId, shortcut); + shortcut.clearFlags(ShortcutInfo.FLAG_DYNAMIC | ShortcutInfo.FLAG_PINNED); + } + return shortcut; + } + + void addShortcut(@NonNull ShortcutService s, @NonNull ShortcutInfo newShortcut) { + deleteShortcut(s, newShortcut.getId()); + s.saveIconAndFixUpShortcut(mUserId, newShortcut); + mShortcuts.put(newShortcut.getId(), newShortcut); + } + + /** + * Add a shortcut, or update one with the same ID, with taking over existing flags. + * + * It checks the max number of dynamic shortcuts. + */ + public void addDynamicShortcut(@NonNull ShortcutService s, + @NonNull ShortcutInfo newShortcut) { + newShortcut.addFlags(ShortcutInfo.FLAG_DYNAMIC); + + final ShortcutInfo oldShortcut = mShortcuts.get(newShortcut.getId()); + + final boolean wasPinned; + final int newDynamicCount; + + if (oldShortcut == null) { + wasPinned = false; + newDynamicCount = mDynamicShortcutCount + 1; // adding a dynamic shortcut. + } else { + wasPinned = oldShortcut.isPinned(); + if (oldShortcut.isDynamic()) { + newDynamicCount = mDynamicShortcutCount; // not adding a dynamic shortcut. + } else { + newDynamicCount = mDynamicShortcutCount + 1; // adding a dynamic shortcut. + } + } + + // Make sure there's still room. + s.enforceMaxDynamicShortcuts(newDynamicCount); + + // Okay, make it dynamic and add. + if (wasPinned) { + newShortcut.addFlags(ShortcutInfo.FLAG_PINNED); + } + + addShortcut(s, newShortcut); + mDynamicShortcutCount = newDynamicCount; + } + + /** + * Remove all shortcuts that aren't pinned nor dynamic. + */ + private void removeOrphans(@NonNull ShortcutService s) { + ArrayList<String> removeList = null; // Lazily initialize. + + for (int i = mShortcuts.size() - 1; i >= 0; i--) { + final ShortcutInfo si = mShortcuts.valueAt(i); + + if (si.isPinned() || si.isDynamic()) continue; + + if (removeList == null) { + removeList = new ArrayList<>(); + } + removeList.add(si.getId()); + } + if (removeList != null) { + for (int i = removeList.size() - 1; i >= 0; i--) { + deleteShortcut(s, removeList.get(i)); + } + } + } + + /** + * Remove all dynamic shortcuts. + */ + public void deleteAllDynamicShortcuts(@NonNull ShortcutService s) { + for (int i = mShortcuts.size() - 1; i >= 0; i--) { + mShortcuts.valueAt(i).clearFlags(ShortcutInfo.FLAG_DYNAMIC); + } + removeOrphans(s); + mDynamicShortcutCount = 0; + } + + /** + * Remove a dynamic shortcut by ID. + */ + public void deleteDynamicWithId(@NonNull ShortcutService s, @NonNull String shortcutId) { + final ShortcutInfo oldShortcut = mShortcuts.get(shortcutId); + + if (oldShortcut == null) { + return; + } + if (oldShortcut.isDynamic()) { + mDynamicShortcutCount--; + } + if (oldShortcut.isPinned()) { + oldShortcut.clearFlags(ShortcutInfo.FLAG_DYNAMIC); + } else { + deleteShortcut(s, shortcutId); + } + } + + /** + * Called after a launcher updates the pinned set. For each shortcut in this package, + * set FLAG_PINNED if any launcher has pinned it. Otherwise, clear it. + * + * <p>Then remove all shortcuts that are not dynamic and no longer pinned either. + */ + public void refreshPinnedFlags(@NonNull ShortcutService s) { + // First, un-pin all shortcuts + for (int i = mShortcuts.size() - 1; i >= 0; i--) { + mShortcuts.valueAt(i).clearFlags(ShortcutInfo.FLAG_PINNED); + } + + // Then, for the pinned set for each launcher, set the pin flag one by one. + final ArrayMap<String, ShortcutLauncher> launchers = + s.getUserShortcutsLocked(mUserId).getLaunchers(); + + for (int l = launchers.size() - 1; l >= 0; l--) { + final ShortcutLauncher launcherShortcuts = launchers.valueAt(l); + final ArraySet<String> pinned = launcherShortcuts.getPinnedShortcutIds(mPackageName); + + if (pinned == null || pinned.size() == 0) { + continue; + } + for (int i = pinned.size() - 1; i >= 0; i--) { + final ShortcutInfo si = mShortcuts.get(pinned.valueAt(i)); + if (si == null) { + s.wtf("Shortcut not found"); + } else { + si.addFlags(ShortcutInfo.FLAG_PINNED); + } + } + } + + // Lastly, remove the ones that are no longer pinned nor dynamic. + removeOrphans(s); + } + + /** + * Number of calls that the caller has made, since the last reset. + */ + public int getApiCallCount(@NonNull ShortcutService s) { + final long last = s.getLastResetTimeLocked(); + + final long now = s.injectCurrentTimeMillis(); + if (ShortcutService.isClockValid(now) && mLastResetTime > now) { + Slog.w(TAG, "Clock rewound"); + // Clock rewound. + mLastResetTime = now; + mApiCallCount = 0; + return mApiCallCount; + } + + // If not reset yet, then reset. + if (mLastResetTime < last) { + if (ShortcutService.DEBUG) { + Slog.d(TAG, String.format("My last reset=%d, now=%d, last=%d: resetting", + mLastResetTime, now, last)); + } + mApiCallCount = 0; + mLastResetTime = last; + } + return mApiCallCount; + } + + /** + * If the caller app hasn't been throttled yet, increment {@link #mApiCallCount} + * and return true. Otherwise just return false. + */ + public boolean tryApiCall(@NonNull ShortcutService s) { + if (getApiCallCount(s) >= s.mMaxDailyUpdates) { + return false; + } + mApiCallCount++; + return true; + } + + public void resetRateLimitingForCommandLine() { + mApiCallCount = 0; + mLastResetTime = 0; + } + + /** + * Find all shortcuts that match {@code query}. + */ + public void findAll(@NonNull ShortcutService s, @NonNull List<ShortcutInfo> result, + @Nullable Predicate<ShortcutInfo> query, int cloneFlag, + @Nullable String callingLauncher) { + + // Set of pinned shortcuts by the calling launcher. + final ArraySet<String> pinnedByCallerSet = (callingLauncher == null) ? null + : s.getLauncherShortcuts(callingLauncher, mUserId) + .getPinnedShortcutIds(mPackageName); + + for (int i = 0; i < mShortcuts.size(); i++) { + final ShortcutInfo si = mShortcuts.valueAt(i); + + // If it's called by non-launcher (i.e. publisher, always include -> true. + // Otherwise, only include non-dynamic pinned one, if the calling launcher has pinned + // it. + final boolean isPinnedByCaller = (callingLauncher == null) + || ((pinnedByCallerSet != null) && pinnedByCallerSet.contains(si.getId())); + if (!si.isDynamic()) { + if (!si.isPinned()) { + s.wtf("Shortcut not pinned here"); + continue; + } + if (!isPinnedByCaller) { + continue; + } + } + final ShortcutInfo clone = si.clone(cloneFlag); + // Fix up isPinned for the caller. Note we need to do it before the "test" callback, + // since it may check isPinned. + if (!isPinnedByCaller) { + clone.clearFlags(ShortcutInfo.FLAG_PINNED); + } + if (query == null || query.test(clone)) { + result.add(clone); + } + } + } + + public void resetThrottling() { + mApiCallCount = 0; + } + + public void dump(@NonNull ShortcutService s, @NonNull PrintWriter pw, @NonNull String prefix) { + pw.println(); + + pw.print(prefix); + pw.print("Package: "); + pw.print(mPackageName); + pw.println(); + + pw.print(prefix); + pw.print(" "); + pw.print("Calls: "); + pw.print(getApiCallCount(s)); + pw.println(); + + // This should be after getApiCallCount(), which may update it. + pw.print(prefix); + pw.print(" "); + pw.print("Last reset: ["); + pw.print(mLastResetTime); + pw.print("] "); + pw.print(s.formatTime(mLastResetTime)); + pw.println(); + + pw.println(" Shortcuts:"); + long totalBitmapSize = 0; + final ArrayMap<String, ShortcutInfo> shortcuts = mShortcuts; + final int size = shortcuts.size(); + for (int i = 0; i < size; i++) { + final ShortcutInfo si = shortcuts.valueAt(i); + pw.print(" "); + pw.println(si.toInsecureString()); + if (si.getBitmapPath() != null) { + final long len = new File(si.getBitmapPath()).length(); + pw.print(" "); + pw.print("bitmap size="); + pw.println(len); + + totalBitmapSize += len; + } + } + pw.print(prefix); + pw.print(" "); + pw.print("Total bitmap size: "); + pw.print(totalBitmapSize); + pw.print(" ("); + pw.print(Formatter.formatFileSize(s.mContext, totalBitmapSize)); + pw.println(")"); + } + + public void saveToXml(@NonNull XmlSerializer out) throws IOException, XmlPullParserException { + final int size = mShortcuts.size(); + + if (size == 0 && mApiCallCount == 0) { + return; // nothing to write. + } + + out.startTag(null, TAG_ROOT); + + ShortcutService.writeAttr(out, ATTR_NAME, mPackageName); + ShortcutService.writeAttr(out, ATTR_DYNAMIC_COUNT, mDynamicShortcutCount); + ShortcutService.writeAttr(out, ATTR_CALL_COUNT, mApiCallCount); + ShortcutService.writeAttr(out, ATTR_LAST_RESET, mLastResetTime); + + for (int j = 0; j < size; j++) { + saveShortcut(out, mShortcuts.valueAt(j)); + } + + out.endTag(null, TAG_ROOT); + } + + private static void saveShortcut(XmlSerializer out, ShortcutInfo si) + throws IOException, XmlPullParserException { + out.startTag(null, TAG_SHORTCUT); + ShortcutService.writeAttr(out, ATTR_ID, si.getId()); + // writeAttr(out, "package", si.getPackageName()); // not needed + ShortcutService.writeAttr(out, ATTR_ACTIVITY, si.getActivityComponent()); + // writeAttr(out, "icon", si.getIcon()); // We don't save it. + ShortcutService.writeAttr(out, ATTR_TITLE, si.getTitle()); + ShortcutService.writeAttr(out, ATTR_INTENT, si.getIntentNoExtras()); + ShortcutService.writeAttr(out, ATTR_WEIGHT, si.getWeight()); + ShortcutService.writeAttr(out, ATTR_TIMESTAMP, + si.getLastChangedTimestamp()); + ShortcutService.writeAttr(out, ATTR_FLAGS, si.getFlags()); + ShortcutService.writeAttr(out, ATTR_ICON_RES, si.getIconResourceId()); + ShortcutService.writeAttr(out, ATTR_BITMAP_PATH, si.getBitmapPath()); + + ShortcutService.writeTagExtra(out, TAG_INTENT_EXTRAS, + si.getIntentPersistableExtras()); + ShortcutService.writeTagExtra(out, TAG_EXTRAS, si.getExtras()); + + out.endTag(null, TAG_SHORTCUT); + } + + public static ShortcutPackage loadFromXml(XmlPullParser parser, int userId) + throws IOException, XmlPullParserException { + + final String packageName = ShortcutService.parseStringAttribute(parser, + ATTR_NAME); + + final ShortcutPackage ret = new ShortcutPackage(userId, packageName); + + ret.mDynamicShortcutCount = + ShortcutService.parseIntAttribute(parser, ATTR_DYNAMIC_COUNT); + ret.mApiCallCount = + ShortcutService.parseIntAttribute(parser, ATTR_CALL_COUNT); + ret.mLastResetTime = + ShortcutService.parseLongAttribute(parser, ATTR_LAST_RESET); + + final int outerDepth = parser.getDepth(); + int type; + while ((type = parser.next()) != XmlPullParser.END_DOCUMENT + && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { + if (type != XmlPullParser.START_TAG) { + continue; + } + final int depth = parser.getDepth(); + final String tag = parser.getName(); + switch (tag) { + case TAG_SHORTCUT: + final ShortcutInfo si = parseShortcut(parser, packageName); + + // Don't use addShortcut(), we don't need to save the icon. + ret.mShortcuts.put(si.getId(), si); + continue; + } + throw ShortcutService.throwForInvalidTag(depth, tag); + } + return ret; + } + + private static ShortcutInfo parseShortcut(XmlPullParser parser, String packageName) + throws IOException, XmlPullParserException { + String id; + ComponentName activityComponent; + // Icon icon; + String title; + Intent intent; + PersistableBundle intentPersistableExtras = null; + int weight; + PersistableBundle extras = null; + long lastChangedTimestamp; + int flags; + int iconRes; + String bitmapPath; + + id = ShortcutService.parseStringAttribute(parser, ATTR_ID); + activityComponent = ShortcutService.parseComponentNameAttribute(parser, + ATTR_ACTIVITY); + title = ShortcutService.parseStringAttribute(parser, ATTR_TITLE); + intent = ShortcutService.parseIntentAttribute(parser, ATTR_INTENT); + weight = (int) ShortcutService.parseLongAttribute(parser, ATTR_WEIGHT); + lastChangedTimestamp = (int) ShortcutService.parseLongAttribute(parser, + ATTR_TIMESTAMP); + flags = (int) ShortcutService.parseLongAttribute(parser, ATTR_FLAGS); + iconRes = (int) ShortcutService.parseLongAttribute(parser, ATTR_ICON_RES); + bitmapPath = ShortcutService.parseStringAttribute(parser, ATTR_BITMAP_PATH); + + final int outerDepth = parser.getDepth(); + int type; + while ((type = parser.next()) != XmlPullParser.END_DOCUMENT + && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { + if (type != XmlPullParser.START_TAG) { + continue; + } + final int depth = parser.getDepth(); + final String tag = parser.getName(); + if (ShortcutService.DEBUG_LOAD) { + Slog.d(TAG, String.format(" depth=%d type=%d name=%s", + depth, type, tag)); + } + switch (tag) { + case TAG_INTENT_EXTRAS: + intentPersistableExtras = PersistableBundle.restoreFromXml(parser); + continue; + case TAG_EXTRAS: + extras = PersistableBundle.restoreFromXml(parser); + continue; + } + throw ShortcutService.throwForInvalidTag(depth, tag); + } + return new ShortcutInfo( + id, packageName, activityComponent, /* icon =*/ null, title, intent, + intentPersistableExtras, weight, extras, lastChangedTimestamp, flags, + iconRes, bitmapPath); + } +} diff --git a/services/core/java/com/android/server/pm/ShortcutService.java b/services/core/java/com/android/server/pm/ShortcutService.java index e831bb1a67ee..42954f528a2b 100644 --- a/services/core/java/com/android/server/pm/ShortcutService.java +++ b/services/core/java/com/android/server/pm/ShortcutService.java @@ -53,6 +53,7 @@ import android.os.ResultReceiver; import android.os.SELinux; import android.os.ShellCommand; import android.os.UserHandle; +import android.os.UserManager; import android.text.TextUtils; import android.text.format.Formatter; import android.text.format.Time; @@ -67,6 +68,7 @@ import android.util.Xml; import com.android.internal.annotations.GuardedBy; import com.android.internal.annotations.VisibleForTesting; +import com.android.internal.content.PackageMonitor; import com.android.internal.os.BackgroundThread; import com.android.internal.util.FastXmlSerializer; import com.android.internal.util.Preconditions; @@ -99,6 +101,11 @@ import java.util.function.Predicate; * * - Default launcher check does take a few ms. Worth caching. * + * - Allow non-default launcher to start pinned shortcuts. (but not dynamic.) + * + * - Extract the user/package/launcher classes to their own files. Maybe rename so they all have + * the same "Shortcut" prefix. + * * - Listen to PACKAGE_*, remove orphan info, update timestamp for icon res * -> Need to scan all packages when a user starts too. * -> Clear data -> remove all dynamic? but not the pinned? @@ -215,7 +222,7 @@ public class ShortcutService extends IShortcutService.Stub { * User ID -> UserShortcuts */ @GuardedBy("mLock") - private final SparseArray<UserShortcuts> mUsers = new SparseArray<>(); + private final SparseArray<ShortcutUser> mUsers = new SparseArray<>(); /** * Max number of dynamic shortcuts that each application can have at a time. @@ -243,6 +250,7 @@ public class ShortcutService extends IShortcutService.Stub { private int mSaveDelayMillis; private final PackageManagerInternal mPackageManagerInternal; + private final UserManager mUserManager; @GuardedBy("mLock") private List<Integer> mDirtyUserIds = new ArrayList<>(); @@ -257,6 +265,9 @@ public class ShortcutService extends IShortcutService.Stub { LocalServices.addService(ShortcutServiceInternal.class, new LocalService()); mHandler = new Handler(looper); mPackageManagerInternal = LocalServices.getService(PackageManagerInternal.class); + mUserManager = context.getSystemService(UserManager.class); + + mPackageMonitor.register(context, looper, UserHandle.ALL, /* externalStorage= */ false); } /** @@ -282,16 +293,12 @@ public class ShortcutService extends IShortcutService.Stub { @Override public void onCleanupUser(int userHandle) { - synchronized (mService.mLock) { - mService.onCleanupUserLocked(userHandle); - } + mService.handleCleanupUser(userHandle); } @Override public void onUnlockUser(int userId) { - synchronized (mService.mLock) { - mService.onStartUserLocked(userId); - } + mService.handleUnlockUser(userId); } } @@ -308,13 +315,24 @@ public class ShortcutService extends IShortcutService.Stub { } /** lifecycle event */ - void onStartUserLocked(int userId) { - // Preload - getUserShortcutsLocked(userId); + void handleUnlockUser(int userId) { + synchronized (mLock) { + // Preload + getUserShortcutsLocked(userId); + } } /** lifecycle event */ - void onCleanupUserLocked(int userId) { + void handleCleanupUser(int userId) { + synchronized (mLock) { + unloadUserLocked(userId); + } + } + + private void unloadUserLocked(int userId) { + if (DEBUG) { + Slog.d(TAG, "unloadUserLocked: user=" + userId); + } // Save all dirty information. saveDirtyInfo(); @@ -615,7 +633,7 @@ public class ShortcutService extends IShortcutService.Stub { } @Nullable - private UserShortcuts loadUserLocked(@UserIdInt int userId) { + private ShortcutUser loadUserLocked(@UserIdInt int userId) { final File path = new File(injectUserDataPath(userId), FILENAME_USER_PACKAGES); if (DEBUG) { Slog.d(TAG, "Loading from " + path); @@ -631,7 +649,7 @@ public class ShortcutService extends IShortcutService.Stub { } return null; } - UserShortcuts ret = null; + ShortcutUser ret = null; try { XmlPullParser parser = Xml.newPullParser(); parser.setInput(in, StandardCharsets.UTF_8.name()); @@ -648,8 +666,8 @@ public class ShortcutService extends IShortcutService.Stub { Slog.d(TAG, String.format("depth=%d type=%d name=%s", depth, type, tag)); } - if ((depth == 1) && UserShortcuts.TAG_ROOT.equals(tag)) { - ret = UserShortcuts.loadFromXml(parser, userId); + if ((depth == 1) && ShortcutUser.TAG_ROOT.equals(tag)) { + ret = ShortcutUser.loadFromXml(parser, userId); continue; } throwForInvalidTag(depth, tag); @@ -752,15 +770,21 @@ public class ShortcutService extends IShortcutService.Stub { } } + @GuardedBy("mLock") + @NonNull + boolean isUserLoadedLocked(@UserIdInt int userId) { + return mUsers.get(userId) != null; + } + /** Return the per-user state. */ @GuardedBy("mLock") @NonNull - UserShortcuts getUserShortcutsLocked(@UserIdInt int userId) { - UserShortcuts userPackages = mUsers.get(userId); + ShortcutUser getUserShortcutsLocked(@UserIdInt int userId) { + ShortcutUser userPackages = mUsers.get(userId); if (userPackages == null) { userPackages = loadUserLocked(userId); if (userPackages == null) { - userPackages = new UserShortcuts(userId); + userPackages = new ShortcutUser(userId); } mUsers.put(userId, userPackages); } @@ -770,14 +794,14 @@ public class ShortcutService extends IShortcutService.Stub { /** Return the per-user per-package state. */ @GuardedBy("mLock") @NonNull - PackageShortcuts getPackageShortcutsLocked( + ShortcutPackage getPackageShortcutsLocked( @NonNull String packageName, @UserIdInt int userId) { return getUserShortcutsLocked(userId).getPackageShortcuts(packageName); } @GuardedBy("mLock") @NonNull - LauncherShortcuts getLauncherShortcuts( + ShortcutLauncher getLauncherShortcuts( @NonNull String packageName, @UserIdInt int userId) { return getUserShortcutsLocked(userId).getLauncherShortcuts(packageName); } @@ -1047,6 +1071,9 @@ public class ShortcutService extends IShortcutService.Stub { } private void notifyListeners(@NonNull String packageName, @UserIdInt int userId) { + if (!mUserManager.isUserRunning(userId)) { + return; + } postToHandler(() -> { final ArrayList<ShortcutChangeListener> copy; synchronized (mLock) { @@ -1142,7 +1169,7 @@ public class ShortcutService extends IShortcutService.Stub { final int size = newShortcuts.size(); synchronized (mLock) { - final PackageShortcuts ps = getPackageShortcutsLocked(packageName, userId); + final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId); // Throttling. if (!ps.tryApiCall(this)) { @@ -1177,7 +1204,7 @@ public class ShortcutService extends IShortcutService.Stub { final int size = newShortcuts.size(); synchronized (mLock) { - final PackageShortcuts ps = getPackageShortcutsLocked(packageName, userId); + final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId); // Throttling. if (!ps.tryApiCall(this)) { @@ -1214,7 +1241,7 @@ public class ShortcutService extends IShortcutService.Stub { verifyCaller(packageName, userId); synchronized (mLock) { - final PackageShortcuts ps = getPackageShortcutsLocked(packageName, userId); + final ShortcutPackage ps = getPackageShortcutsLocked(packageName, userId); // Throttling. if (!ps.tryApiCall(this)) { @@ -1354,7 +1381,7 @@ public class ShortcutService extends IShortcutService.Stub { start = System.currentTimeMillis(); } - final UserShortcuts user = getUserShortcutsLocked(userId); + final ShortcutUser user = getUserShortcutsLocked(userId); final List<ResolveInfo> allHomeCandidates = new ArrayList<>(); @@ -1420,6 +1447,44 @@ public class ShortcutService extends IShortcutService.Stub { } } + // === House keeping === + + @VisibleForTesting + void cleanUpPackageLocked(String packageName, int userId) { + final boolean wasUserLoaded = isUserLoadedLocked(userId); + + final ShortcutUser mUser = getUserShortcutsLocked(userId); + boolean doNotify = false; + + // First, remove the package from the package list (if the package is a publisher). + if (mUser.getPackages().remove(packageName) != null) { + doNotify = true; + } + // Also remove from the launcher list (if the package is a launcher). + mUser.getLaunchers().remove(packageName); + + // Then remove pinned shortcuts from all launchers. + for (int i = mUser.getLaunchers().size() - 1; i >= 0; i--) { + mUser.getLaunchers().valueAt(i).cleanUpPackage(packageName); + } + // Now there may be orphan shortcuts because we removed pinned shortucts at the previous + // step. Remove them too. + for (int i = mUser.getPackages().size() - 1; i >= 0; i--) { + mUser.getPackages().valueAt(i).refreshPinnedFlags(this); + } + + scheduleSaveUser(userId); + + if (doNotify) { + notifyListeners(packageName, userId); + } + + if (!wasUserLoaded) { + // Note this will execute the scheduled save. + unloadUserLocked(userId); + } + } + /** * Entry point from {@link LauncherApps}. */ @@ -1441,7 +1506,7 @@ public class ShortcutService extends IShortcutService.Stub { callingPackage, packageName, changedSince, componentName, queryFlags, userId, ret, cloneFlag); } else { - final ArrayMap<String, PackageShortcuts> packages = + final ArrayMap<String, ShortcutPackage> packages = getUserShortcutsLocked(userId).getPackages(); for (int i = packages.size() - 1; i >= 0; i--) { getShortcutsInnerLocked( @@ -1575,6 +1640,50 @@ public class ShortcutService extends IShortcutService.Stub { } } + private PackageMonitor mPackageMonitor = new PackageMonitor() { + @Override + public void onPackageUpdateFinished(String packageName, int uid) { + handlePackageUpdateFinished(packageName, getChangingUserId()); + } + + @Override + public void onPackageRemoved(String packageName, int uid) { + handlePackageRemoved(packageName, getChangingUserId()); + } + + @Override + public void onPackageRemovedAllUsers(String packageName, int uid) { + handlePackageRemovedAllUsers(packageName, getChangingUserId()); + } + }; + + void handlePackageUpdateFinished(String packageName, @UserIdInt int userId) { + if (DEBUG) { + Slog.d(TAG, "onPackageUpdateFinished() userId=" + userId); + } + // TODO Update the version. + } + + void handlePackageRemoved(String packageName, @UserIdInt int userId) { + if (DEBUG) { + Slog.d(TAG, "onPackageRemoved() userId=" + userId); + } + synchronized (mLock) { + cleanUpPackageLocked(packageName, userId); + } + } + + void handlePackageRemovedAllUsers(String packageName, @UserIdInt int userId) { + if (DEBUG) { + Slog.d(TAG, "onPackageRemovedAllUsers() userId=" + userId); + } + synchronized (mLock) { + cleanUpPackageLocked(packageName, userId); + } + + // TODO Remove from all users, which we can't if the user is locked. + } + // === Dump === @Override @@ -1823,25 +1932,29 @@ public class ShortcutService extends IShortcutService.Stub { // === Unit test support === // Injection point. + @VisibleForTesting long injectCurrentTimeMillis() { return System.currentTimeMillis(); } // Injection point. + @VisibleForTesting int injectBinderCallingUid() { return getCallingUid(); } - final int getCallingUserId() { + private int getCallingUserId() { return UserHandle.getUserId(injectBinderCallingUid()); } // Injection point. + @VisibleForTesting long injectClearCallingIdentity() { return Binder.clearCallingIdentity(); } // Injection point. + @VisibleForTesting void injectRestoreCallingIdentity(long token) { Binder.restoreCallingIdentity(token); } @@ -1854,10 +1967,12 @@ public class ShortcutService extends IShortcutService.Stub { Slog.wtf(TAG, message, e); } + @VisibleForTesting File injectSystemDataPath() { return Environment.getDataSystemDirectory(); } + @VisibleForTesting File injectUserDataPath(@UserIdInt int userId) { return new File(Environment.getDataSystemCeDirectory(userId), DIRECTORY_PER_USER); } @@ -1867,16 +1982,18 @@ public class ShortcutService extends IShortcutService.Stub { return ActivityManager.isLowRamDeviceStatic(); } + @VisibleForTesting PackageManagerInternal injectPackageManagerInternal() { return mPackageManagerInternal; } + @VisibleForTesting File getUserBitmapFilePath(@UserIdInt int userId) { return new File(injectUserDataPath(userId), DIRECTORY_BITMAPS); } @VisibleForTesting - SparseArray<UserShortcuts> getShortcutsForTest() { + SparseArray<ShortcutUser> getShortcutsForTest() { return mUsers; } @@ -1913,790 +2030,13 @@ public class ShortcutService extends IShortcutService.Stub { @VisibleForTesting ShortcutInfo getPackageShortcutForTest(String packageName, String shortcutId, int userId) { synchronized (mLock) { - return getPackageShortcutsLocked(packageName, userId).findShortcutById(shortcutId); - } - } -} - -/** - * Per-user information. - */ -class UserShortcuts { - private static final String TAG = ShortcutService.TAG; - - static final String TAG_ROOT = "user"; - private static final String TAG_LAUNCHER = "launcher"; - - private static final String ATTR_VALUE = "value"; - - @UserIdInt - final int mUserId; - - private final ArrayMap<String, PackageShortcuts> mPackages = new ArrayMap<>(); - - private final ArrayMap<String, LauncherShortcuts> mLaunchers = new ArrayMap<>(); - - private ComponentName mLauncherComponent; - - public UserShortcuts(int userId) { - mUserId = userId; - } - - public ArrayMap<String, PackageShortcuts> getPackages() { - return mPackages; - } - - public ArrayMap<String, LauncherShortcuts> getLaunchers() { - return mLaunchers; - } - - public PackageShortcuts getPackageShortcuts(@NonNull String packageName) { - PackageShortcuts ret = mPackages.get(packageName); - if (ret == null) { - ret = new PackageShortcuts(mUserId, packageName); - mPackages.put(packageName, ret); - } - return ret; - } - - public LauncherShortcuts getLauncherShortcuts(@NonNull String packageName) { - LauncherShortcuts ret = mLaunchers.get(packageName); - if (ret == null) { - ret = new LauncherShortcuts(mUserId, packageName); - mLaunchers.put(packageName, ret); - } - return ret; - } - - public void saveToXml(XmlSerializer out) throws IOException, XmlPullParserException { - out.startTag(null, TAG_ROOT); - - ShortcutService.writeTagValue(out, TAG_LAUNCHER, - mLauncherComponent); - - final int lsize = mLaunchers.size(); - for (int i = 0; i < lsize; i++) { - mLaunchers.valueAt(i).saveToXml(out); - } - - final int psize = mPackages.size(); - for (int i = 0; i < psize; i++) { - mPackages.valueAt(i).saveToXml(out); - } - - out.endTag(null, TAG_ROOT); - } - - public static UserShortcuts loadFromXml(XmlPullParser parser, int userId) - throws IOException, XmlPullParserException { - final UserShortcuts ret = new UserShortcuts(userId); - - final int outerDepth = parser.getDepth(); - int type; - while ((type = parser.next()) != XmlPullParser.END_DOCUMENT - && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { - if (type != XmlPullParser.START_TAG) { - continue; - } - final int depth = parser.getDepth(); - final String tag = parser.getName(); - switch (tag) { - case TAG_LAUNCHER: { - ret.mLauncherComponent = ShortcutService.parseComponentNameAttribute( - parser, ATTR_VALUE); - continue; - } - case PackageShortcuts.TAG_ROOT: { - final PackageShortcuts shortcuts = PackageShortcuts.loadFromXml(parser, userId); - - // Don't use addShortcut(), we don't need to save the icon. - ret.getPackages().put(shortcuts.mPackageName, shortcuts); - continue; - } - - case LauncherShortcuts.TAG_ROOT: { - final LauncherShortcuts shortcuts = - LauncherShortcuts.loadFromXml(parser, userId); - - ret.getLaunchers().put(shortcuts.mPackageName, shortcuts); - continue; - } - } - throw ShortcutService.throwForInvalidTag(depth, tag); - } - return ret; - } - - public ComponentName getLauncherComponent() { - return mLauncherComponent; - } - - public void setLauncherComponent(ShortcutService s, ComponentName launcherComponent) { - if (Objects.equal(mLauncherComponent, launcherComponent)) { - return; - } - mLauncherComponent = launcherComponent; - s.scheduleSaveUser(mUserId); - } - - public void resetThrottling() { - for (int i = mPackages.size() - 1; i >= 0; i--) { - mPackages.valueAt(i).resetThrottling(); - } - } - - public void dump(@NonNull ShortcutService s, @NonNull PrintWriter pw, @NonNull String prefix) { - pw.print(prefix); - pw.print("User: "); - pw.print(mUserId); - pw.println(); - - pw.print(prefix); - pw.print(" "); - pw.print("Default launcher: "); - pw.print(mLauncherComponent); - pw.println(); - - for (int i = 0; i < mLaunchers.size(); i++) { - mLaunchers.valueAt(i).dump(s, pw, prefix + " "); - } - - for (int i = 0; i < mPackages.size(); i++) { - mPackages.valueAt(i).dump(s, pw, prefix + " "); - } - } -} - -class LauncherShortcuts { - private static final String TAG = ShortcutService.TAG; - - static final String TAG_ROOT = "launcher-pins"; - - private static final String TAG_PACKAGE = "package"; - private static final String TAG_PIN = "pin"; - - private static final String ATTR_VALUE = "value"; - private static final String ATTR_PACKAGE_NAME = "package-name"; - - @UserIdInt - final int mUserId; - - @NonNull - final String mPackageName; - - /** - * Package name -> IDs. - */ - final private ArrayMap<String, ArraySet<String>> mPinnedShortcuts = new ArrayMap<>(); - - LauncherShortcuts(@UserIdInt int userId, @NonNull String packageName) { - mUserId = userId; - mPackageName = packageName; - } - - public void pinShortcuts(@NonNull ShortcutService s, @NonNull String packageName, - @NonNull List<String> ids) { - final int idSize = ids.size(); - if (idSize == 0) { - mPinnedShortcuts.remove(packageName); - } else { - final ArraySet<String> prevSet = mPinnedShortcuts.get(packageName); - - // Pin shortcuts. Make sure only pin the ones that were visible to the caller. - // i.e. a non-dynamic, pinned shortcut by *other launchers* shouldn't be pinned here. - - final PackageShortcuts packageShortcuts = - s.getPackageShortcutsLocked(packageName, mUserId); - final ArraySet<String> newSet = new ArraySet<>(); - - for (int i = 0; i < idSize; i++) { - final String id = ids.get(i); - final ShortcutInfo si = packageShortcuts.findShortcutById(id); - if (si == null) { - continue; - } - if (si.isDynamic() || (prevSet != null && prevSet.contains(id))) { - newSet.add(id); - } - } - mPinnedShortcuts.put(packageName, newSet); - } - s.getPackageShortcutsLocked(packageName, mUserId).refreshPinnedFlags(s); - } - - /** - * Return the pinned shortcut IDs for the publisher package. - */ - public ArraySet<String> getPinnedShortcutIds(@NonNull String packageName) { - return mPinnedShortcuts.get(packageName); - } - - /** - * Persist. - */ - public void saveToXml(XmlSerializer out) throws IOException { - out.startTag(null, TAG_ROOT); - ShortcutService.writeAttr(out, ATTR_PACKAGE_NAME, - mPackageName); - - final int size = mPinnedShortcuts.size(); - for (int i = 0; i < size; i++) { - out.startTag(null, TAG_PACKAGE); - ShortcutService.writeAttr(out, ATTR_PACKAGE_NAME, - mPinnedShortcuts.keyAt(i)); - - final ArraySet<String> ids = mPinnedShortcuts.valueAt(i); - final int idSize = ids.size(); - for (int j = 0; j < idSize; j++) { - ShortcutService.writeTagValue(out, TAG_PIN, ids.valueAt(j)); - } - out.endTag(null, TAG_PACKAGE); - } - - out.endTag(null, TAG_ROOT); - } + final ShortcutUser user = mUsers.get(userId); + if (user == null) return null; - /** - * Load. - */ - public static LauncherShortcuts loadFromXml(XmlPullParser parser, int userId) - throws IOException, XmlPullParserException { - final String launcherPackageName = ShortcutService.parseStringAttribute(parser, - ATTR_PACKAGE_NAME); - - final LauncherShortcuts ret = new LauncherShortcuts(userId, launcherPackageName); - - ArraySet<String> ids = null; - final int outerDepth = parser.getDepth(); - int type; - while ((type = parser.next()) != XmlPullParser.END_DOCUMENT - && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { - if (type != XmlPullParser.START_TAG) { - continue; - } - final int depth = parser.getDepth(); - final String tag = parser.getName(); - switch (tag) { - case TAG_PACKAGE: { - final String packageName = ShortcutService.parseStringAttribute(parser, - ATTR_PACKAGE_NAME); - ids = new ArraySet<>(); - ret.mPinnedShortcuts.put(packageName, ids); - continue; - } - case TAG_PIN: { - ids.add(ShortcutService.parseStringAttribute(parser, - ATTR_VALUE)); - continue; - } - } - throw ShortcutService.throwForInvalidTag(depth, tag); - } - return ret; - } - - public void dump(@NonNull ShortcutService s, @NonNull PrintWriter pw, @NonNull String prefix) { - pw.println(); - - pw.print(prefix); - pw.print("Launcher: "); - pw.print(mPackageName); - pw.println(); - - final int size = mPinnedShortcuts.size(); - for (int i = 0; i < size; i++) { - pw.println(); - - pw.print(prefix); - pw.print(" "); - pw.print("Package: "); - pw.println(mPinnedShortcuts.keyAt(i)); - - final ArraySet<String> ids = mPinnedShortcuts.valueAt(i); - final int idSize = ids.size(); - - for (int j = 0; j < idSize; j++) { - pw.print(prefix); - pw.print(" "); - pw.print(ids.valueAt(j)); - pw.println(); - } - } - } -} - -/** - * All the information relevant to shortcuts from a single package (per-user). - */ -class PackageShortcuts { - private static final String TAG = ShortcutService.TAG; - - static final String TAG_ROOT = "package"; - private static final String TAG_INTENT_EXTRAS = "intent-extras"; - private static final String TAG_EXTRAS = "extras"; - private static final String TAG_SHORTCUT = "shortcut"; - - private static final String ATTR_NAME = "name"; - private static final String ATTR_DYNAMIC_COUNT = "dynamic-count"; - private static final String ATTR_CALL_COUNT = "call-count"; - private static final String ATTR_LAST_RESET = "last-reset"; - private static final String ATTR_ID = "id"; - private static final String ATTR_ACTIVITY = "activity"; - private static final String ATTR_TITLE = "title"; - private static final String ATTR_INTENT = "intent"; - private static final String ATTR_WEIGHT = "weight"; - private static final String ATTR_TIMESTAMP = "timestamp"; - private static final String ATTR_FLAGS = "flags"; - private static final String ATTR_ICON_RES = "icon-res"; - private static final String ATTR_BITMAP_PATH = "bitmap-path"; - - @UserIdInt - final int mUserId; - - @NonNull - final String mPackageName; - - /** - * All the shortcuts from the package, keyed on IDs. - */ - final private ArrayMap<String, ShortcutInfo> mShortcuts = new ArrayMap<>(); - - /** - * # of dynamic shortcuts. - */ - private int mDynamicShortcutCount = 0; - - /** - * # of times the package has called rate-limited APIs. - */ - private int mApiCallCount; - - /** - * When {@link #mApiCallCount} was reset last time. - */ - private long mLastResetTime; - - PackageShortcuts(int userId, String packageName) { - mUserId = userId; - mPackageName = packageName; - } - - @Nullable - public ShortcutInfo findShortcutById(String id) { - return mShortcuts.get(id); - } - - private ShortcutInfo deleteShortcut(@NonNull ShortcutService s, - @NonNull String id) { - final ShortcutInfo shortcut = mShortcuts.remove(id); - if (shortcut != null) { - s.removeIcon(mUserId, shortcut); - shortcut.clearFlags(ShortcutInfo.FLAG_DYNAMIC | ShortcutInfo.FLAG_PINNED); - } - return shortcut; - } - - void addShortcut(@NonNull ShortcutService s, @NonNull ShortcutInfo newShortcut) { - deleteShortcut(s, newShortcut.getId()); - s.saveIconAndFixUpShortcut(mUserId, newShortcut); - mShortcuts.put(newShortcut.getId(), newShortcut); - } - - /** - * Add a shortcut, or update one with the same ID, with taking over existing flags. - * - * It checks the max number of dynamic shortcuts. - */ - public void addDynamicShortcut(@NonNull ShortcutService s, - @NonNull ShortcutInfo newShortcut) { - newShortcut.addFlags(ShortcutInfo.FLAG_DYNAMIC); - - final ShortcutInfo oldShortcut = mShortcuts.get(newShortcut.getId()); - - final boolean wasPinned; - final int newDynamicCount; - - if (oldShortcut == null) { - wasPinned = false; - newDynamicCount = mDynamicShortcutCount + 1; // adding a dynamic shortcut. - } else { - wasPinned = oldShortcut.isPinned(); - if (oldShortcut.isDynamic()) { - newDynamicCount = mDynamicShortcutCount; // not adding a dynamic shortcut. - } else { - newDynamicCount = mDynamicShortcutCount + 1; // adding a dynamic shortcut. - } - } - - // Make sure there's still room. - s.enforceMaxDynamicShortcuts(newDynamicCount); - - // Okay, make it dynamic and add. - if (wasPinned) { - newShortcut.addFlags(ShortcutInfo.FLAG_PINNED); - } - - addShortcut(s, newShortcut); - mDynamicShortcutCount = newDynamicCount; - } - - /** - * Remove all shortcuts that aren't pinned nor dynamic. - */ - private void removeOrphans(@NonNull ShortcutService s) { - ArrayList<String> removeList = null; // Lazily initialize. - - for (int i = mShortcuts.size() - 1; i >= 0; i--) { - final ShortcutInfo si = mShortcuts.valueAt(i); - - if (si.isPinned() || si.isDynamic()) continue; - - if (removeList == null) { - removeList = new ArrayList<>(); - } - removeList.add(si.getId()); - } - if (removeList != null) { - for (int i = removeList.size() - 1 ; i >= 0; i--) { - deleteShortcut(s, removeList.get(i)); - } - } - } - - /** - * Remove all dynamic shortcuts. - */ - public void deleteAllDynamicShortcuts(@NonNull ShortcutService s) { - for (int i = mShortcuts.size() - 1; i >= 0; i--) { - mShortcuts.valueAt(i).clearFlags(ShortcutInfo.FLAG_DYNAMIC); - } - removeOrphans(s); - mDynamicShortcutCount = 0; - } - - /** - * Remove a dynamic shortcut by ID. - */ - public void deleteDynamicWithId(@NonNull ShortcutService s, @NonNull String shortcutId) { - final ShortcutInfo oldShortcut = mShortcuts.get(shortcutId); - - if (oldShortcut == null) { - return; - } - if (oldShortcut.isDynamic()) { - mDynamicShortcutCount--; - } - if (oldShortcut.isPinned()) { - oldShortcut.clearFlags(ShortcutInfo.FLAG_DYNAMIC); - } else { - deleteShortcut(s, shortcutId); - } - } - - /** - * Called after a launcher updates the pinned set. For each shortcut in this package, - * set FLAG_PINNED if any launcher has pinned it. Otherwise, clear it. - * - * <p>Then remove all shortcuts that are not dynamic and no longer pinned either. - */ - public void refreshPinnedFlags(@NonNull ShortcutService s) { - // First, un-pin all shortcuts - for (int i = mShortcuts.size() - 1; i >= 0; i--) { - mShortcuts.valueAt(i).clearFlags(ShortcutInfo.FLAG_PINNED); - } - - // Then, for the pinned set for each launcher, set the pin flag one by one. - final ArrayMap<String, LauncherShortcuts> launchers = - s.getUserShortcutsLocked(mUserId).getLaunchers(); - - for (int l = launchers.size() - 1; l >= 0; l--) { - final LauncherShortcuts launcherShortcuts = launchers.valueAt(l); - final ArraySet<String> pinned = launcherShortcuts.getPinnedShortcutIds(mPackageName); - - if (pinned == null || pinned.size() == 0) { - continue; - } - for (int i = pinned.size() - 1; i >= 0; i--) { - final ShortcutInfo si = mShortcuts.get(pinned.valueAt(i)); - if (si == null) { - s.wtf("Shortcut not found"); - } else { - si.addFlags(ShortcutInfo.FLAG_PINNED); - } - } - } - - // Lastly, remove the ones that are no longer pinned nor dynamic. - removeOrphans(s); - } - - /** - * Number of calls that the caller has made, since the last reset. - */ - public int getApiCallCount(@NonNull ShortcutService s) { - final long last = s.getLastResetTimeLocked(); - - final long now = s.injectCurrentTimeMillis(); - if (ShortcutService.isClockValid(now) && mLastResetTime > now) { - Slog.w(TAG, "Clock rewound"); - // Clock rewound. - mLastResetTime = now; - mApiCallCount = 0; - return mApiCallCount; - } - - // If not reset yet, then reset. - if (mLastResetTime < last) { - if (ShortcutService.DEBUG) { - Slog.d(TAG, String.format("My last reset=%d, now=%d, last=%d: resetting", - mLastResetTime, now, last)); - } - mApiCallCount = 0; - mLastResetTime = last; - } - return mApiCallCount; - } - - /** - * If the caller app hasn't been throttled yet, increment {@link #mApiCallCount} - * and return true. Otherwise just return false. - */ - public boolean tryApiCall(@NonNull ShortcutService s) { - if (getApiCallCount(s) >= s.mMaxDailyUpdates) { - return false; - } - mApiCallCount++; - return true; - } - - public void resetRateLimitingForCommandLine() { - mApiCallCount = 0; - mLastResetTime = 0; - } + final ShortcutPackage pkg = user.getPackages().get(packageName); + if (pkg == null) return null; - /** - * Find all shortcuts that match {@code query}. - */ - public void findAll(@NonNull ShortcutService s, @NonNull List<ShortcutInfo> result, - @Nullable Predicate<ShortcutInfo> query, int cloneFlag, - @Nullable String callingLauncher) { - - // Set of pinned shortcuts by the calling launcher. - final ArraySet<String> pinnedByCallerSet = (callingLauncher == null) ? null - : s.getLauncherShortcuts(callingLauncher, mUserId) - .getPinnedShortcutIds(mPackageName); - - for (int i = 0; i < mShortcuts.size(); i++) { - final ShortcutInfo si = mShortcuts.valueAt(i); - - // If it's called by non-launcher (i.e. publisher, always include -> true. - // Otherwise, only include non-dynamic pinned one, if the calling launcher has pinned - // it. - final boolean isPinnedByCaller = (callingLauncher == null) - || ((pinnedByCallerSet != null) && pinnedByCallerSet.contains(si.getId())); - if (!si.isDynamic()) { - if (!si.isPinned()) { - s.wtf("Shortcut not pinned here"); - continue; - } - if (!isPinnedByCaller) { - continue; - } - } - final ShortcutInfo clone = si.clone(cloneFlag); - // Fix up isPinned for the caller. Note we need to do it before the "test" callback, - // since it may check isPinned. - if (!isPinnedByCaller) { - clone.clearFlags(ShortcutInfo.FLAG_PINNED); - } - if (query == null || query.test(clone)) { - result.add(clone); - } - } - } - - public void resetThrottling() { - mApiCallCount = 0; - } - - public void dump(@NonNull ShortcutService s, @NonNull PrintWriter pw, @NonNull String prefix) { - pw.println(); - - pw.print(prefix); - pw.print("Package: "); - pw.print(mPackageName); - pw.println(); - - pw.print(prefix); - pw.print(" "); - pw.print("Calls: "); - pw.print(getApiCallCount(s)); - pw.println(); - - // This should be after getApiCallCount(), which may update it. - pw.print(prefix); - pw.print(" "); - pw.print("Last reset: ["); - pw.print(mLastResetTime); - pw.print("] "); - pw.print(s.formatTime(mLastResetTime)); - pw.println(); - - pw.println(" Shortcuts:"); - long totalBitmapSize = 0; - final ArrayMap<String, ShortcutInfo> shortcuts = mShortcuts; - final int size = shortcuts.size(); - for (int i = 0; i < size; i++) { - final ShortcutInfo si = shortcuts.valueAt(i); - pw.print(" "); - pw.println(si.toInsecureString()); - if (si.getBitmapPath() != null) { - final long len = new File(si.getBitmapPath()).length(); - pw.print(" "); - pw.print("bitmap size="); - pw.println(len); - - totalBitmapSize += len; - } - } - pw.print(prefix); - pw.print(" "); - pw.print("Total bitmap size: "); - pw.print(totalBitmapSize); - pw.print(" ("); - pw.print(Formatter.formatFileSize(s.mContext, totalBitmapSize)); - pw.println(")"); - } - - public void saveToXml(@NonNull XmlSerializer out) throws IOException, XmlPullParserException { - out.startTag(null, TAG_ROOT); - - ShortcutService.writeAttr(out, ATTR_NAME, mPackageName); - ShortcutService.writeAttr(out, ATTR_DYNAMIC_COUNT, mDynamicShortcutCount); - ShortcutService.writeAttr(out, ATTR_CALL_COUNT, mApiCallCount); - ShortcutService.writeAttr(out, ATTR_LAST_RESET, mLastResetTime); - - final int size = mShortcuts.size(); - for (int j = 0; j < size; j++) { - saveShortcut(out, mShortcuts.valueAt(j)); - } - - out.endTag(null, TAG_ROOT); - } - - private static void saveShortcut(XmlSerializer out, ShortcutInfo si) - throws IOException, XmlPullParserException { - out.startTag(null, TAG_SHORTCUT); - ShortcutService.writeAttr(out, ATTR_ID, si.getId()); - // writeAttr(out, "package", si.getPackageName()); // not needed - ShortcutService.writeAttr(out, ATTR_ACTIVITY, si.getActivityComponent()); - // writeAttr(out, "icon", si.getIcon()); // We don't save it. - ShortcutService.writeAttr(out, ATTR_TITLE, si.getTitle()); - ShortcutService.writeAttr(out, ATTR_INTENT, si.getIntentNoExtras()); - ShortcutService.writeAttr(out, ATTR_WEIGHT, si.getWeight()); - ShortcutService.writeAttr(out, ATTR_TIMESTAMP, - si.getLastChangedTimestamp()); - ShortcutService.writeAttr(out, ATTR_FLAGS, si.getFlags()); - ShortcutService.writeAttr(out, ATTR_ICON_RES, si.getIconResourceId()); - ShortcutService.writeAttr(out, ATTR_BITMAP_PATH, si.getBitmapPath()); - - ShortcutService.writeTagExtra(out, TAG_INTENT_EXTRAS, - si.getIntentPersistableExtras()); - ShortcutService.writeTagExtra(out, TAG_EXTRAS, si.getExtras()); - - out.endTag(null, TAG_SHORTCUT); - } - - public static PackageShortcuts loadFromXml(XmlPullParser parser, int userId) - throws IOException, XmlPullParserException { - - final String packageName = ShortcutService.parseStringAttribute(parser, - ATTR_NAME); - - final PackageShortcuts ret = new PackageShortcuts(userId, packageName); - - ret.mDynamicShortcutCount = - ShortcutService.parseIntAttribute(parser, ATTR_DYNAMIC_COUNT); - ret.mApiCallCount = - ShortcutService.parseIntAttribute(parser, ATTR_CALL_COUNT); - ret.mLastResetTime = - ShortcutService.parseLongAttribute(parser, ATTR_LAST_RESET); - - final int outerDepth = parser.getDepth(); - int type; - while ((type = parser.next()) != XmlPullParser.END_DOCUMENT - && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { - if (type != XmlPullParser.START_TAG) { - continue; - } - final int depth = parser.getDepth(); - final String tag = parser.getName(); - switch (tag) { - case TAG_SHORTCUT: - final ShortcutInfo si = parseShortcut(parser, packageName); - - // Don't use addShortcut(), we don't need to save the icon. - ret.mShortcuts.put(si.getId(), si); - continue; - } - throw ShortcutService.throwForInvalidTag(depth, tag); - } - return ret; - } - - private static ShortcutInfo parseShortcut(XmlPullParser parser, String packageName) - throws IOException, XmlPullParserException { - String id; - ComponentName activityComponent; - // Icon icon; - String title; - Intent intent; - PersistableBundle intentPersistableExtras = null; - int weight; - PersistableBundle extras = null; - long lastChangedTimestamp; - int flags; - int iconRes; - String bitmapPath; - - id = ShortcutService.parseStringAttribute(parser, ATTR_ID); - activityComponent = ShortcutService.parseComponentNameAttribute(parser, - ATTR_ACTIVITY); - title = ShortcutService.parseStringAttribute(parser, ATTR_TITLE); - intent = ShortcutService.parseIntentAttribute(parser, ATTR_INTENT); - weight = (int) ShortcutService.parseLongAttribute(parser, ATTR_WEIGHT); - lastChangedTimestamp = (int) ShortcutService.parseLongAttribute(parser, - ATTR_TIMESTAMP); - flags = (int) ShortcutService.parseLongAttribute(parser, ATTR_FLAGS); - iconRes = (int) ShortcutService.parseLongAttribute(parser, ATTR_ICON_RES); - bitmapPath = ShortcutService.parseStringAttribute(parser, ATTR_BITMAP_PATH); - - final int outerDepth = parser.getDepth(); - int type; - while ((type = parser.next()) != XmlPullParser.END_DOCUMENT - && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { - if (type != XmlPullParser.START_TAG) { - continue; - } - final int depth = parser.getDepth(); - final String tag = parser.getName(); - if (ShortcutService.DEBUG_LOAD) { - Slog.d(TAG, String.format(" depth=%d type=%d name=%s", - depth, type, tag)); - } - switch (tag) { - case TAG_INTENT_EXTRAS: - intentPersistableExtras = PersistableBundle.restoreFromXml(parser); - continue; - case TAG_EXTRAS: - extras = PersistableBundle.restoreFromXml(parser); - continue; - } - throw ShortcutService.throwForInvalidTag(depth, tag); + return pkg.findShortcutById(shortcutId); } - return new ShortcutInfo( - id, packageName, activityComponent, /* icon =*/ null, title, intent, - intentPersistableExtras, weight, extras, lastChangedTimestamp, flags, - iconRes, bitmapPath); } } diff --git a/services/core/java/com/android/server/pm/ShortcutUser.java b/services/core/java/com/android/server/pm/ShortcutUser.java new file mode 100644 index 000000000000..4a6b1e4d6bfc --- /dev/null +++ b/services/core/java/com/android/server/pm/ShortcutUser.java @@ -0,0 +1,179 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.server.pm; + +import android.annotation.NonNull; +import android.annotation.UserIdInt; +import android.content.ComponentName; +import android.util.ArrayMap; + +import libcore.util.Objects; + +import org.xmlpull.v1.XmlPullParser; +import org.xmlpull.v1.XmlPullParserException; +import org.xmlpull.v1.XmlSerializer; + +import java.io.IOException; +import java.io.PrintWriter; + +/** + * User information used by {@link ShortcutService}. + */ +class ShortcutUser { + private static final String TAG = ShortcutService.TAG; + + static final String TAG_ROOT = "user"; + private static final String TAG_LAUNCHER = "launcher"; + + private static final String ATTR_VALUE = "value"; + + @UserIdInt + final int mUserId; + + private final ArrayMap<String, ShortcutPackage> mPackages = new ArrayMap<>(); + + private final ArrayMap<String, ShortcutLauncher> mLaunchers = new ArrayMap<>(); + + private ComponentName mLauncherComponent; + + public ShortcutUser(int userId) { + mUserId = userId; + } + + public ArrayMap<String, ShortcutPackage> getPackages() { + return mPackages; + } + + public ArrayMap<String, ShortcutLauncher> getLaunchers() { + return mLaunchers; + } + + public ShortcutPackage getPackageShortcuts(@NonNull String packageName) { + ShortcutPackage ret = mPackages.get(packageName); + if (ret == null) { + ret = new ShortcutPackage(mUserId, packageName); + mPackages.put(packageName, ret); + } + return ret; + } + + public ShortcutLauncher getLauncherShortcuts(@NonNull String packageName) { + ShortcutLauncher ret = mLaunchers.get(packageName); + if (ret == null) { + ret = new ShortcutLauncher(mUserId, packageName); + mLaunchers.put(packageName, ret); + } + return ret; + } + + public void saveToXml(XmlSerializer out) throws IOException, XmlPullParserException { + out.startTag(null, TAG_ROOT); + + ShortcutService.writeTagValue(out, TAG_LAUNCHER, + mLauncherComponent); + + final int lsize = mLaunchers.size(); + for (int i = 0; i < lsize; i++) { + mLaunchers.valueAt(i).saveToXml(out); + } + + final int psize = mPackages.size(); + for (int i = 0; i < psize; i++) { + mPackages.valueAt(i).saveToXml(out); + } + + out.endTag(null, TAG_ROOT); + } + + public static ShortcutUser loadFromXml(XmlPullParser parser, int userId) + throws IOException, XmlPullParserException { + final ShortcutUser ret = new ShortcutUser(userId); + + final int outerDepth = parser.getDepth(); + int type; + while ((type = parser.next()) != XmlPullParser.END_DOCUMENT + && (type != XmlPullParser.END_TAG || parser.getDepth() > outerDepth)) { + if (type != XmlPullParser.START_TAG) { + continue; + } + final int depth = parser.getDepth(); + final String tag = parser.getName(); + switch (tag) { + case TAG_LAUNCHER: { + ret.mLauncherComponent = ShortcutService.parseComponentNameAttribute( + parser, ATTR_VALUE); + continue; + } + case ShortcutPackage.TAG_ROOT: { + final ShortcutPackage shortcuts = ShortcutPackage.loadFromXml(parser, userId); + + // Don't use addShortcut(), we don't need to save the icon. + ret.getPackages().put(shortcuts.mPackageName, shortcuts); + continue; + } + + case ShortcutLauncher.TAG_ROOT: { + final ShortcutLauncher shortcuts = + ShortcutLauncher.loadFromXml(parser, userId); + + ret.getLaunchers().put(shortcuts.mPackageName, shortcuts); + continue; + } + } + throw ShortcutService.throwForInvalidTag(depth, tag); + } + return ret; + } + + public ComponentName getLauncherComponent() { + return mLauncherComponent; + } + + public void setLauncherComponent(ShortcutService s, ComponentName launcherComponent) { + if (Objects.equal(mLauncherComponent, launcherComponent)) { + return; + } + mLauncherComponent = launcherComponent; + s.scheduleSaveUser(mUserId); + } + + public void resetThrottling() { + for (int i = mPackages.size() - 1; i >= 0; i--) { + mPackages.valueAt(i).resetThrottling(); + } + } + + public void dump(@NonNull ShortcutService s, @NonNull PrintWriter pw, @NonNull String prefix) { + pw.print(prefix); + pw.print("User: "); + pw.print(mUserId); + pw.println(); + + pw.print(prefix); + pw.print(" "); + pw.print("Default launcher: "); + pw.print(mLauncherComponent); + pw.println(); + + for (int i = 0; i < mLaunchers.size(); i++) { + mLaunchers.valueAt(i).dump(s, pw, prefix + " "); + } + + for (int i = 0; i < mPackages.size(); i++) { + mPackages.valueAt(i).dump(s, pw, prefix + " "); + } + } +} diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 5fd196b4eb5b..715f1e5e4345 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -1,3 +1,4 @@ + /* * Copyright (C) 2011 The Android Open Source Project * @@ -387,6 +388,15 @@ public class UserManagerService extends IUserManager.Stub { synchronized (mRestrictionsLock) { applyUserRestrictionsLR(UserHandle.USER_SYSTEM); } + + UserInfo currentGuestUser = findCurrentGuestUser(); + if (currentGuestUser != null && !hasUserRestriction( + UserManager.DISALLOW_CONFIG_WIFI, currentGuestUser.id)) { + // If a guest user currently exists, apply the DISALLOW_CONFIG_WIFI option + // to it, in case this guest was created in a previous version where this + // user restriction was not a default guest restriction. + setUserRestriction(UserManager.DISALLOW_CONFIG_WIFI, true, currentGuestUser.id); + } } @Override @@ -641,18 +651,27 @@ public class UserManagerService extends IUserManager.Stub { @Override public UserInfo getUserInfo(int userId) { + checkManageUsersPermission("query user"); + synchronized (mUsersLock) { + return getUserInfoLU(userId); + } + } + + @Override + public boolean isManagedProfile(int userId) { int callingUserId = UserHandle.getCallingUserId(); if (callingUserId != userId && !hasManageUsersPermission()) { synchronized (mPackagesLock) { if (!isSameProfileGroupLP(callingUserId, userId)) { throw new SecurityException( - "You need MANAGE_USERS permission to: query users outside profile" + - " group"); + "You need MANAGE_USERS permission to: check if specified user a " + + "managed profile outside your profile group"); } } } synchronized (mUsersLock) { - return getUserInfoLU(userId); + UserInfo userInfo = getUserInfoLU(userId); + return userInfo != null && userInfo.isManagedProfile(); } } @@ -828,6 +847,7 @@ public class UserManagerService extends IUserManager.Stub { private void initDefaultGuestRestrictions() { synchronized (mGuestRestrictions) { if (mGuestRestrictions.isEmpty()) { + mGuestRestrictions.putBoolean(UserManager.DISALLOW_CONFIG_WIFI, true); mGuestRestrictions.putBoolean(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES, true); mGuestRestrictions.putBoolean(UserManager.DISALLOW_OUTGOING_CALLS, true); mGuestRestrictions.putBoolean(UserManager.DISALLOW_SMS, true); diff --git a/services/core/java/com/android/server/policy/ShortcutManager.java b/services/core/java/com/android/server/policy/ShortcutManager.java index a47f250feea8..a14c6145c548 100644 --- a/services/core/java/com/android/server/policy/ShortcutManager.java +++ b/services/core/java/com/android/server/policy/ShortcutManager.java @@ -78,7 +78,7 @@ class ShortcutManager { public Intent getIntent(KeyCharacterMap kcm, int keyCode, int metaState) { ShortcutInfo shortcut = null; - // If the Shift key is preesed, then search for the shift shortcuts. + // If the Shift key is pressed, then search for the shift shortcuts. boolean isShiftOn = (metaState & KeyEvent.META_SHIFT_ON) == KeyEvent.META_SHIFT_ON; SparseArray<ShortcutInfo> shortcutMap = isShiftOn ? mShiftShortcuts : mShortcuts; diff --git a/services/core/java/com/android/server/power/PowerManagerService.java b/services/core/java/com/android/server/power/PowerManagerService.java index 91d86710a1a9..ff5a0f967b54 100644 --- a/services/core/java/com/android/server/power/PowerManagerService.java +++ b/services/core/java/com/android/server/power/PowerManagerService.java @@ -17,6 +17,7 @@ package com.android.server.power; import android.Manifest; +import android.annotation.IntDef; import android.app.ActivityManager; import android.content.BroadcastReceiver; import android.content.ContentResolver; @@ -70,10 +71,14 @@ import com.android.server.Watchdog; import com.android.server.am.BatteryStatsService; import com.android.server.lights.Light; import com.android.server.lights.LightsManager; +import com.android.server.vr.VrManagerInternal; +import com.android.server.vr.VrStateListener; import libcore.util.Objects; import java.io.FileDescriptor; import java.io.PrintWriter; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; import java.util.ArrayList; import java.util.Arrays; @@ -155,6 +160,7 @@ public final class PowerManagerService extends SystemService // Power hints defined in hardware/libhardware/include/hardware/power.h. private static final int POWER_HINT_LOW_POWER = 5; private static final int POWER_HINT_SUSTAINED_PERFORMANCE = 6; + private static final int POWER_HINT_VR_MODE = 7; // Power features defined in hardware/libhardware/include/hardware/power.h. private static final int POWER_FEATURE_DOUBLE_TAP_TO_WAKE = 1; @@ -162,6 +168,14 @@ public final class PowerManagerService extends SystemService // Default setting for double tap to wake. private static final int DEFAULT_DOUBLE_TAP_TO_WAKE = 0; + /** Constants for {@link #shutdownOrRebootInternal} */ + @Retention(RetentionPolicy.SOURCE) + @IntDef({HALT_MODE_SHUTDOWN, HALT_MODE_REBOOT, HALT_MODE_REBOOT_SAFE_MODE}) + public @interface HaltMode {} + private static final int HALT_MODE_SHUTDOWN = 0; + private static final int HALT_MODE_REBOOT = 1; + private static final int HALT_MODE_REBOOT_SAFE_MODE = 2; + private final Context mContext; private final ServiceThread mHandlerThread; private final PowerManagerHandler mHandler; @@ -643,6 +657,7 @@ public final class PowerManagerService extends SystemService resolver.registerContentObserver(Settings.Secure.getUriFor( Secure.BRIGHTNESS_USE_TWILIGHT), false, mSettingsObserver, UserHandle.USER_ALL); + getLocalService(VrManagerInternal.class).registerListener(mVrStateListener); // Go. readConfigurationLocked(); updateSettingsLocked(); @@ -2392,7 +2407,7 @@ public final class PowerManagerService extends SystemService updatePowerStateLocked(); } - private void shutdownOrRebootInternal(final boolean shutdown, final boolean confirm, + private void shutdownOrRebootInternal(final @HaltMode int haltMode, final boolean confirm, final String reason, boolean wait) { if (mHandler == null || !mSystemReady) { throw new IllegalStateException("Too early to call shutdown() or reboot()"); @@ -2402,10 +2417,12 @@ public final class PowerManagerService extends SystemService @Override public void run() { synchronized (this) { - if (shutdown) { - ShutdownThread.shutdown(mContext, reason, confirm); - } else { + if (haltMode == HALT_MODE_REBOOT_SAFE_MODE) { + ShutdownThread.rebootSafeMode(mContext, confirm); + } else if (haltMode == HALT_MODE_REBOOT) { ShutdownThread.reboot(mContext, reason, confirm); + } else { + ShutdownThread.shutdown(mContext, reason, confirm); } } } @@ -2989,6 +3006,13 @@ public final class PowerManagerService extends SystemService } } + private final VrStateListener mVrStateListener = new VrStateListener() { + @Override + public void onVrStateChanged(boolean enabled) { + powerHintInternal(POWER_HINT_VR_MODE, enabled ? 1 : 0); + } + }; + /** * Handler for asynchronous operations performed by the power manager. */ @@ -3465,7 +3489,26 @@ public final class PowerManagerService extends SystemService final long ident = Binder.clearCallingIdentity(); try { - shutdownOrRebootInternal(false, confirm, reason, wait); + shutdownOrRebootInternal(HALT_MODE_REBOOT, confirm, reason, wait); + } finally { + Binder.restoreCallingIdentity(ident); + } + } + + /** + * Reboots the device into safe mode + * + * @param confirm If true, shows a reboot confirmation dialog. + * @param wait If true, this call waits for the reboot to complete and does not return. + */ + @Override // Binder call + public void rebootSafeMode(boolean confirm, boolean wait) { + mContext.enforceCallingOrSelfPermission(android.Manifest.permission.REBOOT, null); + + final long ident = Binder.clearCallingIdentity(); + try { + shutdownOrRebootInternal(HALT_MODE_REBOOT_SAFE_MODE, confirm, + PowerManager.REBOOT_SAFE_MODE, wait); } finally { Binder.restoreCallingIdentity(ident); } @@ -3483,7 +3526,7 @@ public final class PowerManagerService extends SystemService final long ident = Binder.clearCallingIdentity(); try { - shutdownOrRebootInternal(true, confirm, reason, wait); + shutdownOrRebootInternal(HALT_MODE_SHUTDOWN, confirm, reason, wait); } finally { Binder.restoreCallingIdentity(ident); } diff --git a/services/core/java/com/android/server/utils/ManagedApplicationService.java b/services/core/java/com/android/server/utils/ManagedApplicationService.java index a64570130e45..ad8acef0c12a 100644 --- a/services/core/java/com/android/server/utils/ManagedApplicationService.java +++ b/services/core/java/com/android/server/utils/ManagedApplicationService.java @@ -60,6 +60,8 @@ public class ManagedApplicationService { private ServiceConnection mPendingConnection; private ServiceConnection mConnection; private IInterface mBoundInterface; + private PendingEvent mPendingEvent; + private ManagedApplicationService(final Context context, final ComponentName component, @@ -82,6 +84,13 @@ public class ManagedApplicationService { } /** + * Implement to call IInterface methods after service is connected. + */ + public interface PendingEvent { + void runEvent(IInterface service) throws RemoteException; + } + + /** * Create a new ManagedApplicationService object but do not yet bind to the user service. * * @param context a Context to use for binding the application service. @@ -131,6 +140,30 @@ public class ManagedApplicationService { return true; } + + /** + * Send an event to run as soon as the binder interface is available. + * + * @param event a {@link PendingEvent} to send. + */ + public void sendEvent(@NonNull PendingEvent event) { + IInterface iface; + synchronized (mLock) { + iface = mBoundInterface; + if (iface == null) { + mPendingEvent = event; + } + } + + if (iface != null) { + try { + event.runEvent(iface); + } catch (RuntimeException | RemoteException ex) { + Slog.e(TAG, "Received exception from user service: ", ex); + } + } + } + /** * Asynchronously unbind from the application service if bound. */ @@ -168,6 +201,8 @@ public class ManagedApplicationService { final ServiceConnection serviceConnection = new ServiceConnection() { @Override public void onServiceConnected(ComponentName componentName, IBinder iBinder) { + IInterface iface = null; + PendingEvent pendingEvent = null; synchronized (mLock) { if (mPendingConnection == this) { // No longer pending, remove from pending connection @@ -186,12 +221,22 @@ public class ManagedApplicationService { mContext.unbindService(this); mBoundInterface = null; } + iface = mBoundInterface; + pendingEvent = mPendingEvent; + mPendingEvent = null; } catch (RemoteException e) { // DOA Slog.w(TAG, "Unable to bind service: " + intent, e); mBoundInterface = null; } } + if (iface != null && pendingEvent != null) { + try { + pendingEvent.runEvent(iface); + } catch (RuntimeException | RemoteException ex) { + Slog.e(TAG, "Received exception from user service: ", ex); + } + } } @Override diff --git a/services/core/java/com/android/server/vr/VrManagerInternal.java b/services/core/java/com/android/server/vr/VrManagerInternal.java index 6b5523f0510b..8316efa7eb4c 100644 --- a/services/core/java/com/android/server/vr/VrManagerInternal.java +++ b/services/core/java/com/android/server/vr/VrManagerInternal.java @@ -43,9 +43,10 @@ public abstract class VrManagerInternal { * @param enabled {@code true} to enable VR mode. * @param packageName The package name of the requested VrListenerService to bind. * @param userId the user requesting the VrListenerService component. + * @param calling the component currently using VR mode, or null to leave unchanged. */ public abstract void setVrMode(boolean enabled, @NonNull ComponentName packageName, - int userId); + int userId, @NonNull ComponentName calling); /** * Add a listener for VR mode state changes. diff --git a/services/core/java/com/android/server/vr/VrManagerService.java b/services/core/java/com/android/server/vr/VrManagerService.java index d0ee6e030c09..6bf949cf8655 100644 --- a/services/core/java/com/android/server/vr/VrManagerService.java +++ b/services/core/java/com/android/server/vr/VrManagerService.java @@ -19,14 +19,12 @@ import android.app.AppOpsManager; import android.annotation.NonNull; import android.content.Context; import android.content.ComponentName; -import android.content.Intent; -import android.content.pm.PackageManager; import android.os.Binder; import android.os.Handler; import android.os.IBinder; import android.os.IInterface; import android.os.Looper; -import android.os.UserHandle; +import android.os.RemoteException; import android.provider.Settings; import android.service.vr.IVrListener; import android.service.vr.VrListenerService; @@ -35,11 +33,13 @@ import android.util.Slog; import com.android.internal.R; import com.android.server.SystemService; +import com.android.server.utils.ManagedApplicationService.PendingEvent; import com.android.server.vr.EnabledComponentsObserver.EnabledComponentChangeListener; import com.android.server.utils.ManagedApplicationService; import com.android.server.utils.ManagedApplicationService.BinderChecker; import java.util.ArrayList; +import java.util.Objects; import java.util.Set; /** @@ -79,6 +79,8 @@ public class VrManagerService extends SystemService implements EnabledComponentC private EnabledComponentsObserver mComponentObserver; private ManagedApplicationService mCurrentVrService; private Context mContext; + private ComponentName mCurrentVrModeComponent; + private int mCurrentVrModeUser; private static final BinderChecker sBinderChecker = new BinderChecker() { @Override @@ -105,7 +107,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC // There is an active service, update it if needed updateCurrentVrServiceLocked(mVrModeEnabled, mCurrentVrService.getComponent(), - mCurrentVrService.getUserId()); + mCurrentVrService.getUserId(), null); } } @@ -119,8 +121,9 @@ public class VrManagerService extends SystemService implements EnabledComponentC } @Override - public void setVrMode(boolean enabled, ComponentName packageName, int userId) { - VrManagerService.this.setVrMode(enabled, packageName, userId); + public void setVrMode(boolean enabled, ComponentName packageName, int userId, + ComponentName callingPackage) { + VrManagerService.this.setVrMode(enabled, packageName, userId, callingPackage); } @Override @@ -155,7 +158,7 @@ public class VrManagerService extends SystemService implements EnabledComponentC @Override public void onBootPhase(int phase) { - if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) { + if (phase == SystemService.PHASE_SYSTEM_SERVICES_READY) { synchronized (mLock) { Looper looper = Looper.getMainLooper(); Handler handler = new Handler(looper); @@ -227,11 +230,14 @@ public class VrManagerService extends SystemService implements EnabledComponentC * @param enabled new state for VR mode. * @param component new component to be bound as a VR listener. * @param userId user owning the component to be bound. + * @param calling the component currently using VR mode, or null to leave unchanged. * * @return {@code true} if the component/user combination specified is valid. */ private boolean updateCurrentVrServiceLocked(boolean enabled, - @NonNull ComponentName component, int userId) { + @NonNull ComponentName component, int userId, ComponentName calling) { + + boolean sendUpdatedCaller = false; boolean validUserComponent = (mComponentObserver.isValid(component, userId) == EnabledComponentsObserver.NO_ERROR); @@ -247,31 +253,49 @@ public class VrManagerService extends SystemService implements EnabledComponentC mCurrentVrService.disconnect(); mCurrentVrService = null; } - return validUserComponent; - } - - if (mCurrentVrService != null) { - // Unbind any running service that doesn't match the component/user selection - if (mCurrentVrService.disconnectIfNotMatching(component, userId)) { - Slog.i(TAG, "Disconnecting " + mCurrentVrService.getComponent() + " for user " + - mCurrentVrService.getUserId()); - mCurrentVrService = VrManagerService.create(mContext, component, userId); - mCurrentVrService.connect(); - Slog.i(TAG, "Connecting " + mCurrentVrService.getComponent() + " for user " + + } else { + if (mCurrentVrService != null) { + // Unbind any running service that doesn't match the component/user selection + if (mCurrentVrService.disconnectIfNotMatching(component, userId)) { + Slog.i(TAG, "Disconnecting " + mCurrentVrService.getComponent() + " for user " + mCurrentVrService.getUserId()); + createAndConnectService(component, userId); + sendUpdatedCaller = true; + } + // The service with the correct component/user is bound + } else { + // Nothing was previously running, bind a new service + createAndConnectService(component, userId); + sendUpdatedCaller = true; } - // The service with the correct component/user is bound - } else { - // Nothing was previously running, bind a new service - mCurrentVrService = VrManagerService.create(mContext, component, userId); - mCurrentVrService.connect(); - Slog.i(TAG, "Connecting " + mCurrentVrService.getComponent() + " for user " + - mCurrentVrService.getUserId()); + } + + if (calling != null && !Objects.equals(calling, mCurrentVrModeComponent)) { + mCurrentVrModeComponent = calling; + mCurrentVrModeUser = userId; + sendUpdatedCaller = true; + } + + if (mCurrentVrService != null && sendUpdatedCaller) { + final ComponentName c = mCurrentVrModeComponent; + mCurrentVrService.sendEvent(new PendingEvent() { + @Override + public void runEvent(IInterface service) throws RemoteException { + IVrListener l = (IVrListener) service; + l.focusedActivityChanged(c); + } + }); } return validUserComponent; } + private void createAndConnectService(@NonNull ComponentName component, int userId) { + mCurrentVrService = VrManagerService.create(mContext, component, userId); + mCurrentVrService.connect(); + Slog.i(TAG, "Connecting " + component + " for user " + userId); + } + /** * Send VR mode change callbacks to HAL and system services if mode has actually changed. * <p/> @@ -319,9 +343,9 @@ public class VrManagerService extends SystemService implements EnabledComponentC */ private boolean setVrMode(boolean enabled, @NonNull ComponentName targetPackageName, - int userId) { + int userId, @NonNull ComponentName callingPackage) { synchronized (mLock) { - return updateCurrentVrServiceLocked(enabled, targetPackageName, userId); + return updateCurrentVrServiceLocked(enabled, targetPackageName, userId, callingPackage); } } diff --git a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java index 3cf95900edde..fb9b1cec862a 100644 --- a/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java +++ b/services/core/java/com/android/server/wallpaper/WallpaperManagerService.java @@ -20,6 +20,7 @@ import static android.app.WallpaperManager.FLAG_SET_SYSTEM; import static android.app.WallpaperManager.FLAG_SET_LOCK; import static android.os.ParcelFileDescriptor.*; +import android.app.ActivityManager; import android.app.ActivityManagerNative; import android.app.AppGlobals; import android.app.AppOpsManager; @@ -875,12 +876,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { if (!isWallpaperSupported(callingPackage) || !isWallpaperSettingAllowed(callingPackage)) { return; } - if (userId != UserHandle.getCallingUserId()) { - // cross-user call - mContext.enforceCallingOrSelfPermission( - android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, - "WallpaperManagerService"); - } + userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), + Binder.getCallingUid(), userId, false, true, "clearWallpaper", null); synchronized (mLock) { clearWallpaperLocked(false, which, userId, null); @@ -1103,12 +1100,8 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { @Override public ParcelFileDescriptor getWallpaper(IWallpaperManagerCallback cb, final int which, Bundle outParams, int wallpaperUserId) { - if (wallpaperUserId != UserHandle.getCallingUserId()) { - // cross-user call - mContext.enforceCallingOrSelfPermission( - android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, - "WallpaperManagerService"); - } + wallpaperUserId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), + Binder.getCallingUid(), wallpaperUserId, false, true, "getWallpaper", null); if (which != FLAG_SET_SYSTEM && which != FLAG_SET_LOCK) { throw new IllegalArgumentException("Must specify exactly one kind of wallpaper to read"); @@ -1147,6 +1140,7 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { } } + @Override public WallpaperInfo getWallpaperInfo() { int userId = UserHandle.getCallingUserId(); synchronized (mLock) { @@ -1159,6 +1153,26 @@ public class WallpaperManagerService extends IWallpaperManager.Stub { } @Override + public int getWallpaperIdForUser(int which, int userId) { + userId = ActivityManager.handleIncomingUser(Binder.getCallingPid(), + Binder.getCallingUid(), userId, false, true, "getWallpaperIdForUser", null); + + if (which != FLAG_SET_SYSTEM && which != FLAG_SET_LOCK) { + throw new IllegalArgumentException("Must specify exactly one kind of wallpaper"); + } + + final SparseArray<WallpaperData> map = + (which == FLAG_SET_LOCK) ? mLockWallpaperMap : mWallpaperMap; + synchronized (mLock) { + WallpaperData wallpaper = map.get(userId); + if (wallpaper != null) { + return wallpaper.wallpaperId; + } + } + return -1; + } + + @Override public boolean setLockWallpaperCallback(IWallpaperManagerCallback cb) { checkPermission(android.Manifest.permission.INTERNAL_SYSTEM_WINDOW); synchronized (mLock) { diff --git a/services/core/java/com/android/server/webkit/WebViewUpdateService.java b/services/core/java/com/android/server/webkit/WebViewUpdateService.java index a4bbb515154f..50699f8ccf4a 100644 --- a/services/core/java/com/android/server/webkit/WebViewUpdateService.java +++ b/services/core/java/com/android/server/webkit/WebViewUpdateService.java @@ -35,14 +35,14 @@ import android.os.RemoteException; import android.os.ResultReceiver; import android.os.UserHandle; import android.os.UserManager; -import android.provider.Settings; import android.provider.Settings.Global; +import android.provider.Settings; import android.util.AndroidRuntimeException; import android.util.Slog; import android.webkit.IWebViewUpdateService; +import android.webkit.WebViewFactory; import android.webkit.WebViewProviderInfo; import android.webkit.WebViewProviderResponse; -import android.webkit.WebViewFactory; import com.android.server.SystemService; @@ -76,9 +76,11 @@ public class WebViewUpdateService extends SystemService { private WebViewProviderInfo[] mCurrentValidWebViewPackages = null; private BroadcastReceiver mWebViewUpdatedReceiver; + private WebViewUtilityInterface mWebViewUtility; public WebViewUpdateService(Context context) { super(context); + mWebViewUtility = new WebViewUtilityImpl(); } @Override @@ -114,7 +116,7 @@ public class WebViewUpdateService extends SystemService { updateFallbackState(context, intent); - for (WebViewProviderInfo provider : WebViewFactory.getWebViewPackages()) { + for (WebViewProviderInfo provider : mWebViewUtility.getWebViewPackages()) { String webviewPackage = "package:" + provider.packageName; if (webviewPackage.equals(intent.getDataString())) { @@ -153,11 +155,7 @@ public class WebViewUpdateService extends SystemService { // package that was not the previous provider then we must kill // packages dependent on the old package ourselves. The framework // only kills dependents of packages that are being removed. - try { - ActivityManagerNative.getDefault().killPackageDependents( - oldProviderName, UserHandle.USER_ALL); - } catch (RemoteException e) { - } + mWebViewUtility.killPackageDependents(oldProviderName); } return; } @@ -170,7 +168,7 @@ public class WebViewUpdateService extends SystemService { filter.addAction(Intent.ACTION_PACKAGE_CHANGED); filter.addDataScheme("package"); // Make sure we only receive intents for WebView packages from our config file. - for (WebViewProviderInfo provider : WebViewFactory.getWebViewPackages()) { + for (WebViewProviderInfo provider : mWebViewUtility.getWebViewPackages()) { filter.addDataSchemeSpecificPart(provider.packageName, PatternMatcher.PATTERN_LITERAL); } getContext().registerReceiver(mWebViewUpdatedReceiver, filter); @@ -210,7 +208,7 @@ public class WebViewUpdateService extends SystemService { void handleNewUser(int userId) { if (!isFallbackLogicEnabled()) return; - WebViewProviderInfo[] webviewProviders = WebViewFactory.getWebViewPackages(); + WebViewProviderInfo[] webviewProviders = mWebViewUtility.getWebViewPackages(); WebViewProviderInfo fallbackProvider = getFallbackProvider(webviewProviders); if (fallbackProvider == null) return; boolean existsValidNonFallbackProvider = @@ -228,7 +226,7 @@ public class WebViewUpdateService extends SystemService { void updateFallbackState(final Context context, final Intent intent) { if (!isFallbackLogicEnabled()) return; - WebViewProviderInfo[] webviewProviders = WebViewFactory.getWebViewPackages(); + WebViewProviderInfo[] webviewProviders = mWebViewUtility.getWebViewPackages(); if (intent != null && (intent.getAction().equals(Intent.ACTION_PACKAGE_ADDED) || intent.getAction().equals(Intent.ACTION_PACKAGE_CHANGED))) { @@ -319,10 +317,10 @@ public class WebViewUpdateService extends SystemService { return false; } - private static boolean isFallbackPackage(String packageName) { + private boolean isFallbackPackage(String packageName) { if (packageName == null || !isFallbackLogicEnabled()) return false; - WebViewProviderInfo[] webviewPackages = WebViewFactory.getWebViewPackages(); + WebViewProviderInfo[] webviewPackages = mWebViewUtility.getWebViewPackages(); WebViewProviderInfo fallbackProvider = getFallbackProvider(webviewPackages); return (fallbackProvider != null && packageName.equals(fallbackProvider.packageName)); @@ -359,13 +357,13 @@ public class WebViewUpdateService extends SystemService { PackageInfo newPackage = null; synchronized(this) { oldPackage = mCurrentWebViewPackage; - updateUserSetting(newProviderName); + mWebViewUtility.updateUserSetting(getContext(), newProviderName); try { newPackage = findPreferredWebViewPackage(); if (oldPackage != null && newPackage.packageName.equals(oldPackage.packageName)) { // If we don't perform the user change, revert the settings change. - updateUserSetting(newPackage.packageName); + mWebViewUtility.updateUserSetting(getContext(), newPackage.packageName); return newPackage.packageName; } } catch (WebViewFactory.MissingWebViewPackageException e) { @@ -378,12 +376,8 @@ public class WebViewUpdateService extends SystemService { onWebViewProviderChanged(newPackage); } // Kill apps using the old provider - try { - if (oldPackage != null) { - ActivityManagerNative.getDefault().killPackageDependents( - oldPackage.packageName, UserHandle.USER_ALL); - } - } catch (RemoteException e) { + if (oldPackage != null) { + mWebViewUtility.killPackageDependents(oldPackage.packageName); } return newPackage.packageName; } @@ -397,14 +391,14 @@ public class WebViewUpdateService extends SystemService { mAnyWebViewInstalled = true; if (mNumRelroCreationsStarted == mNumRelroCreationsFinished) { mCurrentWebViewPackage = newPackage; - updateUserSetting(newPackage.packageName); + mWebViewUtility.updateUserSetting(getContext(), newPackage.packageName); // The relro creations might 'finish' (not start at all) before // WebViewFactory.onWebViewProviderChanged which means we might not know the number // of started creations before they finish. mNumRelroCreationsStarted = NUMBER_OF_RELROS_UNKNOWN; mNumRelroCreationsFinished = 0; - mNumRelroCreationsStarted = WebViewFactory.onWebViewProviderChanged(newPackage); + mNumRelroCreationsStarted = mWebViewUtility.onWebViewProviderChanged(newPackage); // If the relro creations finish before we know the number of started creations we // will have to do any cleanup/notifying here. checkIfRelrosDoneLocked(); @@ -421,7 +415,7 @@ public class WebViewUpdateService extends SystemService { * */ private void updateValidWebViewPackages() { List<WebViewProviderInfo> webViewProviders = - new ArrayList<WebViewProviderInfo>(Arrays.asList(WebViewFactory.getWebViewPackages())); + new ArrayList<WebViewProviderInfo>(Arrays.asList(mWebViewUtility.getWebViewPackages())); Iterator<WebViewProviderInfo> it = webViewProviders.iterator(); // remove non-valid packages while(it.hasNext()) { @@ -435,17 +429,6 @@ public class WebViewUpdateService extends SystemService { } } - private static String getUserChosenWebViewProvider() { - return Settings.Global.getString(AppGlobals.getInitialApplication().getContentResolver(), - Settings.Global.WEBVIEW_PROVIDER); - } - - private void updateUserSetting(String newProviderName) { - Settings.Global.putString(getContext().getContentResolver(), - Settings.Global.WEBVIEW_PROVIDER, - newProviderName == null ? "" : newProviderName); - } - /** * Returns either the package info of the WebView provider determined in the following way: * If the user has chosen a provider then use that if it is valid, @@ -456,7 +439,7 @@ public class WebViewUpdateService extends SystemService { private PackageInfo findPreferredWebViewPackage() { WebViewProviderInfo[] providers = mCurrentValidWebViewPackages; - String userChosenProvider = getUserChosenWebViewProvider(); + String userChosenProvider = mWebViewUtility.getUserChosenWebViewProvider(getContext()); // If the user has chosen provider, use that for (WebViewProviderInfo provider : providers) { @@ -616,6 +599,11 @@ public class WebViewUpdateService extends SystemService { } @Override // Binder call + public WebViewProviderInfo[] getAllWebViewPackages() { + return WebViewUpdateService.this.mWebViewUtility.getWebViewPackages(); + } + + @Override // Binder call public String getCurrentWebViewPackageName() { synchronized(WebViewUpdateService.this) { if (WebViewUpdateService.this.mCurrentWebViewPackage == null) @@ -626,7 +614,7 @@ public class WebViewUpdateService extends SystemService { @Override // Binder call public boolean isFallbackPackage(String packageName) { - return WebViewUpdateService.isFallbackPackage(packageName); + return WebViewUpdateService.this.isFallbackPackage(packageName); } @Override // Binder call diff --git a/services/core/java/com/android/server/webkit/WebViewUtilityImpl.java b/services/core/java/com/android/server/webkit/WebViewUtilityImpl.java new file mode 100644 index 000000000000..4dbd02d1ede5 --- /dev/null +++ b/services/core/java/com/android/server/webkit/WebViewUtilityImpl.java @@ -0,0 +1,161 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.webkit; + +import android.app.ActivityManagerNative; +import android.app.AppGlobals; +import android.content.Context; +import android.content.pm.PackageInfo; +import android.content.res.XmlResourceParser; +import android.os.RemoteException; +import android.os.UserHandle; +import android.provider.Settings; +import android.util.AndroidRuntimeException; +import android.util.Log; +import android.webkit.WebViewFactory; +import android.webkit.WebViewFactory.MissingWebViewPackageException; +import android.webkit.WebViewProviderInfo; + +import com.android.internal.util.XmlUtils; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import org.xmlpull.v1.XmlPullParserException; + +/** + * Default implementation for the WebView preparation Utility interface. + * @hide + */ +public class WebViewUtilityImpl implements WebViewUtilityInterface { + private static final String TAG = WebViewUtilityImpl.class.getSimpleName(); + private static final String TAG_START = "webviewproviders"; + private static final String TAG_WEBVIEW_PROVIDER = "webviewprovider"; + private static final String TAG_PACKAGE_NAME = "packageName"; + private static final String TAG_DESCRIPTION = "description"; + // Whether or not the provider must be explicitly chosen by the user to be used. + private static final String TAG_AVAILABILITY = "availableByDefault"; + private static final String TAG_SIGNATURE = "signature"; + private static final String TAG_FALLBACK = "isFallback"; + + /** + * Returns all packages declared in the framework resources as potential WebView providers. + * @hide + * */ + @Override + public WebViewProviderInfo[] getWebViewPackages() { + int numFallbackPackages = 0; + XmlResourceParser parser = null; + List<WebViewProviderInfo> webViewProviders = new ArrayList<WebViewProviderInfo>(); + try { + parser = AppGlobals.getInitialApplication().getResources().getXml( + com.android.internal.R.xml.config_webview_packages); + XmlUtils.beginDocument(parser, TAG_START); + while(true) { + XmlUtils.nextElement(parser); + String element = parser.getName(); + if (element == null) { + break; + } + if (element.equals(TAG_WEBVIEW_PROVIDER)) { + String packageName = parser.getAttributeValue(null, TAG_PACKAGE_NAME); + if (packageName == null) { + throw new MissingWebViewPackageException( + "WebView provider in framework resources missing package name"); + } + String description = parser.getAttributeValue(null, TAG_DESCRIPTION); + if (description == null) { + throw new MissingWebViewPackageException( + "WebView provider in framework resources missing description"); + } + boolean availableByDefault = "true".equals( + parser.getAttributeValue(null, TAG_AVAILABILITY)); + boolean isFallback = "true".equals( + parser.getAttributeValue(null, TAG_FALLBACK)); + WebViewProviderInfo currentProvider = + new WebViewProviderInfo(packageName, description, availableByDefault, + isFallback, readSignatures(parser)); + if (currentProvider.isFallbackPackage()) { + numFallbackPackages++; + if (numFallbackPackages > 1) { + throw new AndroidRuntimeException( + "There can be at most one webview fallback package."); + } + } + webViewProviders.add(currentProvider); + } + else { + Log.e(TAG, "Found an element that is not a webview provider"); + } + } + } catch(XmlPullParserException e) { + throw new MissingWebViewPackageException("Error when parsing WebView meta data " + e); + } catch(IOException e) { + throw new MissingWebViewPackageException("Error when parsing WebView meta data " + e); + } finally { + if (parser != null) parser.close(); + } + return webViewProviders.toArray(new WebViewProviderInfo[webViewProviders.size()]); + } + + /** + * Reads all signatures at the current depth (within the current provider) from the XML parser. + */ + private static String[] readSignatures(XmlResourceParser parser) throws IOException, + XmlPullParserException { + List<String> signatures = new ArrayList<String>(); + int outerDepth = parser.getDepth(); + while(XmlUtils.nextElementWithin(parser, outerDepth)) { + if (parser.getName().equals(TAG_SIGNATURE)) { + // Parse the value within the signature tag + String signature = parser.nextText(); + signatures.add(signature); + } else { + Log.e(TAG, "Found an element in a webview provider that is not a signature"); + } + } + return signatures.toArray(new String[signatures.size()]); + } + + @Override + public int onWebViewProviderChanged(PackageInfo packageInfo) { + return WebViewFactory.onWebViewProviderChanged(packageInfo); + } + + @Override + public String getUserChosenWebViewProvider(Context context) { + return Settings.Global.getString(context.getContentResolver(), + Settings.Global.WEBVIEW_PROVIDER); + } + + @Override + public void updateUserSetting(Context context, String newProviderName) { + Settings.Global.putString(context.getContentResolver(), + Settings.Global.WEBVIEW_PROVIDER, + newProviderName == null ? "" : newProviderName); + } + + @Override + public void killPackageDependents(String packageName) { + try { + ActivityManagerNative.getDefault().killPackageDependents(packageName, + UserHandle.USER_ALL); + } catch (RemoteException e) { + } + } +} diff --git a/services/core/java/com/android/server/webkit/WebViewUtilityInterface.java b/services/core/java/com/android/server/webkit/WebViewUtilityInterface.java new file mode 100644 index 000000000000..1919f400c29a --- /dev/null +++ b/services/core/java/com/android/server/webkit/WebViewUtilityInterface.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.server.webkit; + +import android.webkit.WebViewProviderInfo; +import android.content.Context; +import android.content.pm.PackageInfo; + +/** + * Utility interface for the WebViewUpdateService. + * This interface provides a way to test the WebView preparation mechanism - during normal use this + * interface is implemented using calls to the Android framework, but by providing an alternative + * implementation we can test the WebView preparation logic without reaching other framework code. + * @hide + */ +public interface WebViewUtilityInterface { + public WebViewProviderInfo[] getWebViewPackages(); + public int onWebViewProviderChanged(PackageInfo packageInfo); + + public String getUserChosenWebViewProvider(Context context); + public void updateUserSetting(Context context, String newProviderName); + public void killPackageDependents(String packageName); +} diff --git a/services/core/java/com/android/server/wm/BoundsAnimationController.java b/services/core/java/com/android/server/wm/BoundsAnimationController.java index 79d3d84cfae2..b7d6062a3dc0 100644 --- a/services/core/java/com/android/server/wm/BoundsAnimationController.java +++ b/services/core/java/com/android/server/wm/BoundsAnimationController.java @@ -214,7 +214,7 @@ public class BoundsAnimationController { void getFullScreenBounds(Rect bounds); } - void animateBounds(final AnimateBoundsUser target, Rect from, Rect to) { + void animateBounds(final AnimateBoundsUser target, Rect from, Rect to, int animationDuration) { boolean moveToFullscreen = false; if (to == null) { to = new Rect(); @@ -242,7 +242,8 @@ public class BoundsAnimationController { new BoundsAnimator(target, from, to, moveToFullscreen, replacing); mRunningAnimations.put(target, animator); animator.setFloatValues(0f, 1f); - animator.setDuration(DEFAULT_APP_TRANSITION_DURATION * DEBUG_ANIMATION_SLOW_DOWN_FACTOR); + animator.setDuration((animationDuration != -1 ? animationDuration + : DEFAULT_APP_TRANSITION_DURATION) * DEBUG_ANIMATION_SLOW_DOWN_FACTOR); animator.setInterpolator(new LinearInterpolator()); animator.start(); } diff --git a/services/core/java/com/android/server/wm/Session.java b/services/core/java/com/android/server/wm/Session.java index a589f894e3bc..c0c1ed8e2d0c 100644 --- a/services/core/java/com/android/server/wm/Session.java +++ b/services/core/java/com/android/server/wm/Session.java @@ -195,8 +195,10 @@ final class Session extends IWindowSession.Stub @Override public void repositionChild(IWindow window, int left, int top, int right, int bottom, - long deferTransactionUntilFrame, Rect outFrame) { + int requestedWidth, int requestedHeight, + long deferTransactionUntilFrame, Rect outFrame) { mService.repositionChild(this, window, left, top, right, bottom, + requestedWidth, requestedHeight, deferTransactionUntilFrame, outFrame); } diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java index 60b2e4a68f6d..c6677670190e 100644 --- a/services/core/java/com/android/server/wm/TaskStack.java +++ b/services/core/java/com/android/server/wm/TaskStack.java @@ -1089,7 +1089,7 @@ public class TaskStack implements DimLayer.DimLayerUser, } } try { - mService.mActivityManager.resizeStack(mStackId, bounds, false, true, false); + mService.mActivityManager.resizeStack(mStackId, bounds, false, true, false, -1); } catch (RemoteException e) { } return true; diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 607a3e96ecba..14291caa4072 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -2522,6 +2522,7 @@ public class WindowManagerService extends IWindowManager.Stub void repositionChild(Session session, IWindow client, int left, int top, int right, int bottom, + int requestedWidth, int requestedHeight, long deferTransactionUntilFrame, Rect outFrame) { Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "repositionChild"); long origId = Binder.clearCallingIdentity(); @@ -2537,6 +2538,7 @@ public class WindowManagerService extends IWindowManager.Stub "repositionChild called but window is not" + "attached to a parent win=" + win); } + win.setRequestedSize(requestedWidth, requestedHeight); win.mAttrs.x = left; win.mAttrs.y = top; @@ -2593,7 +2595,8 @@ public class WindowManagerService extends IWindowManager.Stub == PackageManager.PERMISSION_GRANTED; long origId = Binder.clearCallingIdentity(); - + final boolean preserveGeometry = (attrs != null) && (attrs.privateFlags & + WindowManager.LayoutParams.PRIVATE_FLAG_PRESERVE_GEOMETRY) != 0; synchronized(mWindowMap) { WindowState win = windowForClientLocked(session, client, false); if (win == null) { @@ -2601,7 +2604,7 @@ public class WindowManagerService extends IWindowManager.Stub } WindowStateAnimator winAnimator = win.mWinAnimator; - if (viewVisibility != View.GONE) { + if (!preserveGeometry && viewVisibility != View.GONE) { win.setRequestedSize(requestedWidth, requestedHeight); } @@ -2650,7 +2653,9 @@ public class WindowManagerService extends IWindowManager.Stub if ((attrChanges & WindowManager.LayoutParams.ALPHA_CHANGED) != 0) { winAnimator.mAlpha = attrs.alpha; } - win.setWindowScale(requestedWidth, requestedHeight); + if (!preserveGeometry) { + win.setWindowScale(win.mRequestedWidth, win.mRequestedHeight); + } boolean imMayMove = (flagChanges & (FLAG_ALT_FOCUSABLE_IM | FLAG_NOT_FOCUSABLE)) != 0; final boolean isDefaultDisplay = win.isDefaultDisplay(); @@ -8241,8 +8246,8 @@ public class WindowManagerService extends IWindowManager.Stub break; case RESIZE_STACK: { try { - mActivityManager.resizeStack(msg.arg1, (Rect) msg.obj, msg.arg2 == 1, false, - false); + mActivityManager.resizeStack( + msg.arg1, (Rect) msg.obj, msg.arg2 == 1, false, false, -1); } catch (RemoteException e) { // This will not happen since we are in the same process. } @@ -10460,7 +10465,7 @@ public class WindowManagerService extends IWindowManager.Stub } } - public void animateResizePinnedStack(final Rect bounds) { + public void animateResizePinnedStack(final Rect bounds, final int animationDuration) { synchronized (mWindowMap) { final TaskStack stack = mStackIdToStack.get(PINNED_STACK_ID); if (stack == null) { @@ -10472,7 +10477,8 @@ public class WindowManagerService extends IWindowManager.Stub UiThread.getHandler().post(new Runnable() { @Override public void run() { - mBoundsAnimationController.animateBounds(stack, originalBounds, bounds); + mBoundsAnimationController.animateBounds( + stack, originalBounds, bounds, animationDuration); } }); } diff --git a/services/core/java/com/android/server/wm/WindowSurfaceController.java b/services/core/java/com/android/server/wm/WindowSurfaceController.java index 11f37719f047..be3ad3bef631 100644 --- a/services/core/java/com/android/server/wm/WindowSurfaceController.java +++ b/services/core/java/com/android/server/wm/WindowSurfaceController.java @@ -623,6 +623,13 @@ class WindowSurfaceController { } } + @Override + public void setTransparentRegionHint(Region region) { + if (LOG_SURFACE_TRACE) Slog.v(SURFACE_TAG, "setTransparentRegionHint(" + region + + "): OLD: " + this + " . Called by " + Debug.getCallers(3)); + super.setTransparentRegionHint(region); + } + static void dumpAllSurfaces(PrintWriter pw, String header) { synchronized (sSurfaces) { final int N = sSurfaces.size(); diff --git a/services/core/jni/com_android_server_HardwarePropertiesManagerService.cpp b/services/core/jni/com_android_server_HardwarePropertiesManagerService.cpp index 214d9882c499..ec5e8c921979 100644 --- a/services/core/jni/com_android_server_HardwarePropertiesManagerService.cpp +++ b/services/core/jni/com_android_server_HardwarePropertiesManagerService.cpp @@ -21,116 +21,150 @@ #include <stdlib.h> -#include <hardware/hardware_properties.h> +#include <hardware/thermal.h> #include <utils/Log.h> #include <utils/String8.h> -#include <hardware_properties/HardwarePropertiesManager.h> - #include "core_jni_helpers.h" namespace android { // --------------------------------------------------------------------------- +// These values must be kept in sync with the temperature source constants in +// HardwarePropertiesManager.java +enum { + TEMPERATURE_CURRENT = 0, + TEMPERATURE_THROTTLING = 1, + TEMPERATURE_SHUTDOWN = 2 +}; + static struct { jclass clazz; jmethodID initMethod; } gCpuUsageInfoClassInfo; -static struct hardware_properties_module* gHardwarePropertiesModule; +jfloat gUndefinedTemperature; + +static struct thermal_module* gThermalModule; // ---------------------------------------------------------------------------- static void nativeInit(JNIEnv* env, jobject obj) { - status_t err = hw_get_module(HARDWARE_PROPERTIES_HARDWARE_MODULE_ID, - (hw_module_t const**)&gHardwarePropertiesModule); + status_t err = hw_get_module(THERMAL_HARDWARE_MODULE_ID, (hw_module_t const**)&gThermalModule); if (err) { - ALOGE("Couldn't load %s module (%s)", HARDWARE_PROPERTIES_HARDWARE_MODULE_ID, - strerror(-err)); + ALOGE("Couldn't load %s module (%s)", THERMAL_HARDWARE_MODULE_ID, strerror(-err)); } } static jfloatArray nativeGetFanSpeeds(JNIEnv *env, jclass /* clazz */) { - if (gHardwarePropertiesModule && gHardwarePropertiesModule->getFanSpeeds) { - float *speeds = nullptr; - ssize_t size = gHardwarePropertiesModule->getFanSpeeds(gHardwarePropertiesModule, &speeds); - - if (speeds && size > 0) { - jfloatArray fanSpeeds = env->NewFloatArray(size); - env->SetFloatArrayRegion(fanSpeeds, 0, size, speeds); - free(speeds); - return fanSpeeds; - } + if (gThermalModule && gThermalModule->getCoolingDevices) { + ssize_t list_size = gThermalModule->getCoolingDevices(gThermalModule, nullptr, 0); + + if (list_size >= 0) { + cooling_device_t *list = (cooling_device_t *) + malloc(list_size * sizeof(cooling_device_t)); + ssize_t size = gThermalModule->getCoolingDevices(gThermalModule, list, list_size); + if (size >= 0) { + if (list_size > size) { + list_size = size; + } + jfloat values[list_size]; + for (ssize_t i = 0; i < list_size; ++i) { + values[i] = list[i].current_value; + } + + jfloatArray fanSpeeds = env->NewFloatArray(list_size); + env->SetFloatArrayRegion(fanSpeeds, 0, list_size, values); + free(list); + return fanSpeeds; + } - if (size < 0) { - ALOGE("Cloudn't get fan speeds because of HAL error"); + free(list); } + + ALOGE("Cloudn't get fan speeds because of HAL error"); } return env->NewFloatArray(0); } -static jfloatArray nativeGetDeviceTemperatures(JNIEnv *env, jclass /* clazz */, int type) { - if (gHardwarePropertiesModule) { - ssize_t size = 0; - float *temps = nullptr; - switch (type) { - case DEVICE_TEMPERATURE_CPU: - if (gHardwarePropertiesModule->getCpuTemperatures) { - size = gHardwarePropertiesModule->getCpuTemperatures(gHardwarePropertiesModule, - &temps); - } - break; - case DEVICE_TEMPERATURE_GPU: - if (gHardwarePropertiesModule->getGpuTemperatures) { - size = gHardwarePropertiesModule->getGpuTemperatures(gHardwarePropertiesModule, - &temps); +static jfloatArray nativeGetDeviceTemperatures(JNIEnv *env, jclass /* clazz */, int type, + int source) { + if (gThermalModule && gThermalModule->getTemperatures) { + ssize_t list_size = gThermalModule->getTemperatures(gThermalModule, nullptr, 0); + if (list_size >= 0) { + temperature_t *list = (temperature_t *) malloc(list_size * sizeof(temperature_t)); + ssize_t size = gThermalModule->getTemperatures(gThermalModule, list, list_size); + if (size >= 0) { + if (list_size > size) { + list_size = size; + } + + jfloat values[list_size]; + size_t length = 0; + + for (ssize_t i = 0; i < list_size; ++i) { + if (list[i].type == type) { + switch (source) { + case TEMPERATURE_CURRENT: + if (list[i].current_value == UNKNOWN_TEMPERATURE) { + values[length++] = gUndefinedTemperature; + } else { + values[length++] = list[i].current_value; + } + break; + case TEMPERATURE_THROTTLING: + if (list[i].throttling_threshold == UNKNOWN_TEMPERATURE) { + values[length++] = gUndefinedTemperature; + } else { + values[length++] = list[i].throttling_threshold; + } + break; + case TEMPERATURE_SHUTDOWN: + if (list[i].shutdown_threshold == UNKNOWN_TEMPERATURE) { + values[length++] = gUndefinedTemperature; + } else { + values[length++] = list[i].shutdown_threshold; + } + break; + } + } + } + jfloatArray deviceTemps = env->NewFloatArray(length); + env->SetFloatArrayRegion(deviceTemps, 0, length, values); + free(list); + return deviceTemps; } - break; - case DEVICE_TEMPERATURE_BATTERY: - if (gHardwarePropertiesModule->getBatteryTemperatures) { - size = gHardwarePropertiesModule->getBatteryTemperatures(gHardwarePropertiesModule, - &temps); - } - break; - } - if (temps && size > 0) { - jfloatArray deviceTemps = env->NewFloatArray(size); - env->SetFloatArrayRegion(deviceTemps, 0, size, temps); - free(temps); - return deviceTemps; - } - if (size < 0) { - ALOGE("Couldn't get device temperatures type=%d because of HAL error", type); + free(list); } + ALOGE("Couldn't get device temperatures because of HAL error"); } return env->NewFloatArray(0); } static jobjectArray nativeGetCpuUsages(JNIEnv *env, jclass /* clazz */) { - if (gHardwarePropertiesModule && gHardwarePropertiesModule->getCpuUsages - && gCpuUsageInfoClassInfo.initMethod) { - int64_t *active_times = nullptr; - int64_t *total_times = nullptr; - ssize_t size = gHardwarePropertiesModule->getCpuUsages(gHardwarePropertiesModule, - &active_times, &total_times); - if (active_times && total_times && size > 0) { - jobjectArray cpuUsages = env->NewObjectArray(size, gCpuUsageInfoClassInfo.clazz, - nullptr); - for (ssize_t i = 0; i < size; ++i) { - jobject cpuUsage = env->NewObject(gCpuUsageInfoClassInfo.clazz, - gCpuUsageInfoClassInfo.initMethod, - active_times[i], total_times[i]); - env->SetObjectArrayElement(cpuUsages, i, cpuUsage); + if (gThermalModule && gThermalModule->getCpuUsages + && gCpuUsageInfoClassInfo.initMethod) { + ssize_t size = gThermalModule->getCpuUsages(gThermalModule, nullptr); + if (size >= 0) { + cpu_usage_t *list = (cpu_usage_t *) malloc(size * sizeof(cpu_usage_t)); + size = gThermalModule->getCpuUsages(gThermalModule, list); + if (size >= 0) { + jobjectArray cpuUsages = env->NewObjectArray(size, gCpuUsageInfoClassInfo.clazz, + nullptr); + for (ssize_t i = 0; i < size; ++i) { + if (list[i].is_online) { + jobject cpuUsage = env->NewObject(gCpuUsageInfoClassInfo.clazz, + gCpuUsageInfoClassInfo.initMethod, list[i].active, list[i].total); + env->SetObjectArrayElement(cpuUsages, i, cpuUsage); + } + } + free(list); + return cpuUsages; } - free(active_times); - free(total_times); - return cpuUsages; - } - - if (size < 0) { - ALOGE("Couldn't get CPU usages because of HAL error"); + free(list); } + ALOGE("Couldn't get CPU usages because of HAL error"); } return env->NewObjectArray(0, gCpuUsageInfoClassInfo.clazz, nullptr); } @@ -143,14 +177,14 @@ static const JNINativeMethod gHardwarePropertiesManagerServiceMethods[] = { (void*) nativeInit }, { "nativeGetFanSpeeds", "()[F", (void*) nativeGetFanSpeeds }, - { "nativeGetDeviceTemperatures", "(I)[F", + { "nativeGetDeviceTemperatures", "(II)[F", (void*) nativeGetDeviceTemperatures }, { "nativeGetCpuUsages", "()[Landroid/os/CpuUsageInfo;", (void*) nativeGetCpuUsages } }; int register_android_server_HardwarePropertiesManagerService(JNIEnv* env) { - gHardwarePropertiesModule = nullptr; + gThermalModule = nullptr; int res = jniRegisterNativeMethods(env, "com/android/server/HardwarePropertiesManagerService", gHardwarePropertiesManagerServiceMethods, NELEM(gHardwarePropertiesManagerServiceMethods)); @@ -158,6 +192,12 @@ int register_android_server_HardwarePropertiesManagerService(JNIEnv* env) { gCpuUsageInfoClassInfo.clazz = MakeGlobalRefOrDie(env, clazz); gCpuUsageInfoClassInfo.initMethod = GetMethodIDOrDie(env, gCpuUsageInfoClassInfo.clazz, "<init>", "(JJ)V"); + + clazz = env->FindClass("android/os/HardwarePropertiesManager"); + jfieldID undefined_temperature_field = GetStaticFieldIDOrDie(env, clazz, + "UNDEFINED_TEMPERATURE", "F"); + gUndefinedTemperature = env->GetStaticFloatField(clazz, undefined_temperature_field); + return res; } diff --git a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp index e2c71a1aa2f8..ae050429efed 100644 --- a/services/core/jni/com_android_server_location_GnssLocationProvider.cpp +++ b/services/core/jni/com_android_server_location_GnssLocationProvider.cpp @@ -1108,7 +1108,7 @@ const char *const JavaMethodHelper<bool>::signature_ = "(Z)V"; } while (false) static jobject translate_gps_clock(JNIEnv* env, GpsClock* clock) { - static uint32_t discontinuity_count_to_handle_old_lock_type = 0; + static uint32_t discontinuity_count_to_handle_old_clock_type = 0; JavaObject object(env, "android/location/GnssClock"); GpsClockFlags flags = clock->flags; @@ -1137,7 +1137,7 @@ static jobject translate_gps_clock(JNIEnv* env, GpsClock* clock) { clock->full_bias_ns = clock->time_ns; clock->time_ns = 0; SET(HardwareClockDiscontinuityCount, - discontinuity_count_to_handle_old_lock_type++); + discontinuity_count_to_handle_old_clock_type++); break; } @@ -1226,10 +1226,6 @@ static jobject translate_gps_measurement(JNIEnv* env, static_cast<int32_t>(measurement->multipath_indicator)); SET_IF(GNSS_MEASUREMENT_HAS_SNR, SnrInDb, measurement->snr_db); - SET_IF_NOT(GPS_MEASUREMENT_HAS_UNCORRECTED_PSEUDORANGE_RATE, - PseudorangeRateCorrected, - true); - return object.get(); } diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java index 53022533d69d..c362c9c3ceb2 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java @@ -6237,19 +6237,20 @@ public class DevicePolicyManagerService extends IDevicePolicyManager.Stub { } @Override - public void setApplicationRestrictionsManagingPackage(ComponentName admin, String packageName) { + public boolean setApplicationRestrictionsManagingPackage(ComponentName admin, + String packageName) { Preconditions.checkNotNull(admin, "ComponentName is null"); final int userHandle = mInjector.userHandleGetCallingUserId(); synchronized (this) { getActiveAdminForCallerLocked(admin, DeviceAdminInfo.USES_POLICY_PROFILE_OWNER); if (packageName != null && !isPackageInstalledForUser(packageName, userHandle)) { - throw new IllegalArgumentException("Package " + packageName + " is not installed " - + "on the current user"); + return false; } DevicePolicyData policy = getUserData(userHandle); policy.mApplicationRestrictionsManagingPackage = packageName; saveSettingsLocked(userHandle); + return true; } } diff --git a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java index 34f2e2e12594..8e11511127db 100644 --- a/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java +++ b/services/tests/servicestests/src/com/android/server/ConnectivityServiceTest.java @@ -1008,29 +1008,41 @@ public class ConnectivityServiceTest extends AndroidTestCase { private class TestNetworkCallback extends NetworkCallback { private final ConditionVariable mConditionVariable = new ConditionVariable(); private CallbackState mLastCallback = CallbackState.NONE; + private Network mLastNetwork; public void onAvailable(Network network) { assertEquals(CallbackState.NONE, mLastCallback); mLastCallback = CallbackState.AVAILABLE; + mLastNetwork = network; mConditionVariable.open(); } public void onLosing(Network network, int maxMsToLive) { assertEquals(CallbackState.NONE, mLastCallback); mLastCallback = CallbackState.LOSING; + mLastNetwork = network; mConditionVariable.open(); } public void onLost(Network network) { assertEquals(CallbackState.NONE, mLastCallback); mLastCallback = CallbackState.LOST; + mLastNetwork = network; mConditionVariable.open(); } void expectCallback(CallbackState state) { + expectCallback(state, null); + } + + void expectCallback(CallbackState state, MockNetworkAgent mockAgent) { waitFor(mConditionVariable); assertEquals(state, mLastCallback); + if (mockAgent != null) { + assertEquals(mockAgent.getNetwork(), mLastNetwork); + } mLastCallback = CallbackState.NONE; + mLastNetwork = null; mConditionVariable.close(); } @@ -1389,6 +1401,55 @@ public class ConnectivityServiceTest extends AndroidTestCase { execptionCalled); } + @LargeTest + public void testRegisterDefaultNetworkCallback() throws Exception { + final TestNetworkCallback defaultNetworkCallback = new TestNetworkCallback(); + mCm.registerDefaultNetworkCallback(defaultNetworkCallback); + defaultNetworkCallback.assertNoCallback(); + + // Create a TRANSPORT_CELLULAR request to keep the mobile interface up + // whenever Wi-Fi is up. Without this, the mobile network agent is + // reaped before any other activity can take place. + final TestNetworkCallback cellNetworkCallback = new TestNetworkCallback(); + final NetworkRequest cellRequest = new NetworkRequest.Builder() + .addTransportType(TRANSPORT_CELLULAR).build(); + mCm.requestNetwork(cellRequest, cellNetworkCallback); + cellNetworkCallback.assertNoCallback(); + + // Bring up cell and expect CALLBACK_AVAILABLE. + mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR); + mCellNetworkAgent.connect(true); + cellNetworkCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent); + defaultNetworkCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent); + + // Bring up wifi and expect CALLBACK_AVAILABLE. + mWiFiNetworkAgent = new MockNetworkAgent(TRANSPORT_WIFI); + mWiFiNetworkAgent.connect(true); + cellNetworkCallback.assertNoCallback(); + defaultNetworkCallback.expectCallback(CallbackState.AVAILABLE, mWiFiNetworkAgent); + + // Bring down cell. Expect no default network callback, since it wasn't the default. + mCellNetworkAgent.disconnect(); + cellNetworkCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent); + defaultNetworkCallback.assertNoCallback(); + + // Bring up cell. Expect no default network callback, since it won't be the default. + mCellNetworkAgent = new MockNetworkAgent(TRANSPORT_CELLULAR); + mCellNetworkAgent.connect(true); + cellNetworkCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent); + defaultNetworkCallback.assertNoCallback(); + + // Bring down wifi. Expect the default network callback to notified of LOST wifi + // followed by AVAILABLE cell. + mWiFiNetworkAgent.disconnect(); + cellNetworkCallback.assertNoCallback(); + defaultNetworkCallback.expectCallback(CallbackState.LOST, mWiFiNetworkAgent); + defaultNetworkCallback.expectCallback(CallbackState.AVAILABLE, mCellNetworkAgent); + mCellNetworkAgent.disconnect(); + cellNetworkCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent); + defaultNetworkCallback.expectCallback(CallbackState.LOST, mCellNetworkAgent); + } + private static class TestKeepaliveCallback extends PacketKeepaliveCallback { public static enum CallbackType { ON_STARTED, ON_STOPPED, ON_ERROR }; 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 6c2bdda3e21a..e6963d52e88a 100644 --- a/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/devicepolicy/DevicePolicyManagerTest.java @@ -1117,9 +1117,9 @@ public class DevicePolicyManagerTest extends DpmTestBase { dpm.setApplicationRestrictionsManagingPackage(admin1, nonExistAppRestrictionsManagerPackage); fail("Non-existent app set as app restriction manager."); - } catch (IllegalArgumentException expected) { + } catch (PackageManager.NameNotFoundException expected) { MoreAsserts.assertContainsRegex( - "is not installed on the current user", expected.getMessage()); + nonExistAppRestrictionsManagerPackage, expected.getMessage()); } // Let appRestrictionsManagerPackage manage app restrictions diff --git a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java index ad86fd08cea9..28966ca5a722 100644 --- a/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/pm/ShortcutManagerTest.java @@ -22,6 +22,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; import android.annotation.NonNull; import android.annotation.UserIdInt; @@ -56,6 +57,7 @@ import android.os.UserManager; import android.test.InstrumentationTestCase; import android.test.mock.MockContext; import android.test.suitebuilder.annotation.SmallTest; +import android.util.ArraySet; import android.util.Log; import android.util.SparseArray; @@ -124,6 +126,11 @@ public class ShortcutManagerTest extends InstrumentationTestCase { } @Override + public String getSystemServiceName(Class<?> serviceClass) { + return getTestContext().getSystemServiceName(serviceClass); + } + + @Override public PackageManager getPackageManager() { return mMockPackageManager; } @@ -231,7 +238,7 @@ public class ShortcutManagerTest extends InstrumentationTestCase { @Override boolean injectIsLowRamDevice() { - return mInjectdIsLowRamDevice; + return mInjectedIsLowRamDevice; } @Override @@ -343,7 +350,7 @@ public class ShortcutManagerTest extends InstrumentationTestCase { private long mInjectedCurrentTimeLillis; - private boolean mInjectdIsLowRamDevice; + private boolean mInjectedIsLowRamDevice; private int mInjectedCallingUid; private String mInjectedClientPackage; @@ -657,6 +664,14 @@ public class ShortcutManagerTest extends InstrumentationTestCase { return new ComponentName(mClientContext, clazz); } + private <T> Set<T> makeSet(T... values) { + final HashSet<T> ret = new HashSet<>(); + for (T s : values) { + ret.add(s); + } + return ret; + } + @NonNull private ShortcutInfo findById(List<ShortcutInfo> list, String id) { for (ShortcutInfo s : list) { @@ -841,6 +856,14 @@ public class ShortcutManagerTest extends InstrumentationTestCase { return mService.getPackageShortcutForTest(packageName, shortcutId, userId); } + private void assertShortcutExists(String packageName, String shortcutId, int userId) { + assertTrue(getPackageShortcut(packageName, shortcutId, userId) != null); + } + + private void assertShortcutNotExists(String packageName, String shortcutId, int userId) { + assertTrue(getPackageShortcut(packageName, shortcutId, userId) == null); + } + private ShortcutInfo getPackageShortcut(String packageName, String shortcutId) { return getPackageShortcut(packageName, shortcutId, getCallingUserId()); } @@ -849,6 +872,27 @@ public class ShortcutManagerTest extends InstrumentationTestCase { return getPackageShortcut(getCallingPackage(), shortcutId, getCallingUserId()); } + private List<ShortcutInfo> getLauncherShortcuts(String launcher, int userId, int queryFlags) { + final List<ShortcutInfo>[] ret = new List[1]; + runWithCaller(launcher, userId, () -> { + final ShortcutQuery q = new ShortcutQuery(); + q.setQueryFlags(queryFlags); + ret[0] = mLauncherApps.getShortcuts(q, UserHandle.of(userId)); + }); + return ret[0]; + } + + private List<ShortcutInfo> getLauncherPinnedShortcuts(String launcher, int userId) { + return getLauncherShortcuts(launcher, userId, ShortcutQuery.FLAG_GET_PINNED); + } + + /** + * Wrap a set in an ArraySet just to get a better toString. + */ + private <T> Set<T> set(Set<T> in) { + return new ArraySet<T>(in); + } + /** * Test for the first launch path, no settings file available. */ @@ -857,7 +901,8 @@ public class ShortcutManagerTest extends InstrumentationTestCase { } /** - * Test for {@link ShortcutService#updateTimes()} + * Test for {@link ShortcutService#getLastResetTimeLocked()} and + * {@link ShortcutService#getNextResetTimeLocked()}. */ public void testUpdateAndGetNextResetTimeLocked() { assertResetTimes(START_TIME, START_TIME + INTERVAL); @@ -928,7 +973,7 @@ public class ShortcutManagerTest extends InstrumentationTestCase { assertEquals(CompressFormat.WEBP, mService.getIconPersistFormatForTest()); assertEquals(75, mService.getIconPersistQualityForTest()); - mInjectdIsLowRamDevice = true; + mInjectedIsLowRamDevice = true; mService.updateConfigurationLocked( ConfigConstants.KEY_MAX_ICON_DIMENSION_DP + "=100," + ConfigConstants.KEY_MAX_ICON_DIMENSION_DP_LOWRAM + "=50," @@ -2205,6 +2250,8 @@ public class ShortcutManagerTest extends InstrumentationTestCase { // TODO Add "multi" version -- run the test with two launchers and make sure the callback // argument only contains the ones that are actually visible to each launcher. + when(mMockUserManager.isUserRunning(eq(USER_0))).thenReturn(true); + LauncherApps.Callback c0 = mock(LauncherApps.Callback.class); // Set listeners @@ -2320,6 +2367,20 @@ public class ShortcutManagerTest extends InstrumentationTestCase { eq(UserHandle.of(USER_0)) ); assertEquals(0, shortcuts.getValue().size()); + + // Remove CALLING_PACKAGE_2 + reset(c0); + mService.cleanUpPackageLocked(CALLING_PACKAGE_2, USER_0); + + // Should get a callback with an empty list. + waitOnMainThread(); + shortcuts = ArgumentCaptor.forClass(List.class); + verify(c0).onShortcutsChanged( + eq(CALLING_PACKAGE_2), + shortcuts.capture(), + eq(UserHandle.of(USER_0)) + ); + assertEquals(0, shortcuts.getValue().size()); } // === Test for persisting === @@ -2436,7 +2497,7 @@ public class ShortcutManagerTest extends InstrumentationTestCase { assertEquals(0, mService.getShortcutsForTest().size()); // this will pre-load the per-user info. - mService.onStartUserLocked(UserHandle.USER_SYSTEM); + mService.handleUnlockUser(UserHandle.USER_SYSTEM); // Now it's loaded. assertEquals(1, mService.getShortcutsForTest().size()); @@ -2462,7 +2523,7 @@ public class ShortcutManagerTest extends InstrumentationTestCase { .getLauncherComponent().getPackageName()); // Start another user - mService.onStartUserLocked(USER_10); + mService.handleUnlockUser(USER_10); // Now the size is 2. assertEquals(2, mService.getShortcutsForTest().size()); @@ -2478,7 +2539,7 @@ public class ShortcutManagerTest extends InstrumentationTestCase { assertNull(mService.getShortcutsForTest().get(USER_10).getLauncherComponent()); // Try stopping the user - mService.onCleanupUserLocked(USER_10); + mService.handleCleanupUser(USER_10); // Now it's unloaded. assertEquals(1, mService.getShortcutsForTest().size()); @@ -2486,6 +2547,248 @@ public class ShortcutManagerTest extends InstrumentationTestCase { // TODO Check all other fields } + public void testCleanupPackage() { + runWithCaller(CALLING_PACKAGE_1, USER_0, () -> { + assertTrue(mManager.setDynamicShortcuts(Arrays.asList( + makeShortcut("s0_1")))); + }); + runWithCaller(CALLING_PACKAGE_2, USER_0, () -> { + assertTrue(mManager.setDynamicShortcuts(Arrays.asList( + makeShortcut("s0_2")))); + }); + runWithCaller(LAUNCHER_1, USER_0, () -> { + mLauncherApps.pinShortcuts(CALLING_PACKAGE_1, Arrays.asList("s0_1"), + UserHandle.of(USER_0)); + mLauncherApps.pinShortcuts(CALLING_PACKAGE_2, Arrays.asList("s0_2"), + UserHandle.of(USER_0)); + }); + runWithCaller(LAUNCHER_2, USER_0, () -> { + mLauncherApps.pinShortcuts(CALLING_PACKAGE_1, Arrays.asList("s0_1"), + UserHandle.of(USER_0)); + mLauncherApps.pinShortcuts(CALLING_PACKAGE_2, Arrays.asList("s0_2"), + UserHandle.of(USER_0)); + }); + + runWithCaller(CALLING_PACKAGE_1, USER_10, () -> { + assertTrue(mManager.setDynamicShortcuts(Arrays.asList( + makeShortcut("s10_1")))); + }); + runWithCaller(CALLING_PACKAGE_2, USER_10, () -> { + assertTrue(mManager.setDynamicShortcuts(Arrays.asList( + makeShortcut("s10_2")))); + }); + runWithCaller(LAUNCHER_1, USER_10, () -> { + mLauncherApps.pinShortcuts(CALLING_PACKAGE_1, Arrays.asList("s10_1"), + UserHandle.of(USER_10)); + mLauncherApps.pinShortcuts(CALLING_PACKAGE_2, Arrays.asList("s10_2"), + UserHandle.of(USER_10)); + }); + runWithCaller(LAUNCHER_2, USER_10, () -> { + mLauncherApps.pinShortcuts(CALLING_PACKAGE_1, Arrays.asList("s10_1"), + UserHandle.of(USER_10)); + mLauncherApps.pinShortcuts(CALLING_PACKAGE_2, Arrays.asList("s10_2"), + UserHandle.of(USER_10)); + }); + + // Remove all dynamic shortcuts; now all shortcuts are just pinned. + runWithCaller(CALLING_PACKAGE_1, USER_0, () -> { + mManager.deleteAllDynamicShortcuts(); + }); + runWithCaller(CALLING_PACKAGE_2, USER_0, () -> { + mManager.deleteAllDynamicShortcuts(); + }); + runWithCaller(CALLING_PACKAGE_1, USER_10, () -> { + mManager.deleteAllDynamicShortcuts(); + }); + runWithCaller(CALLING_PACKAGE_2, USER_10, () -> { + mManager.deleteAllDynamicShortcuts(); + }); + + + final SparseArray<ShortcutUser> users = mService.getShortcutsForTest(); + assertEquals(2, users.size()); + assertEquals(USER_0, users.keyAt(0)); + assertEquals(USER_10, users.keyAt(1)); + + final ShortcutUser user0 = users.get(USER_0); + final ShortcutUser user10 = users.get(USER_10); + + + // Check the registered packages. + + assertEquals(makeSet(CALLING_PACKAGE_1, CALLING_PACKAGE_2), + set(user0.getPackages().keySet())); + assertEquals(makeSet(CALLING_PACKAGE_1, CALLING_PACKAGE_2), + set(user10.getPackages().keySet())); + assertEquals(makeSet(LAUNCHER_1, LAUNCHER_2), + set(user0.getLaunchers().keySet())); + assertEquals(makeSet(LAUNCHER_1, LAUNCHER_2), + set(user10.getLaunchers().keySet())); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_1, USER_0), + "s0_1", "s0_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_2, USER_0), + "s0_1", "s0_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_1, USER_10), + "s10_1", "s10_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_2, USER_10), + "s10_1", "s10_2"); + assertShortcutExists(CALLING_PACKAGE_1, "s0_1", USER_0); + assertShortcutExists(CALLING_PACKAGE_2, "s0_2", USER_0); + assertShortcutExists(CALLING_PACKAGE_1, "s10_1", USER_10); + assertShortcutExists(CALLING_PACKAGE_2, "s10_2", USER_10); + + mService.saveDirtyInfo(); + + // Nonexistent package. + mService.cleanUpPackageLocked("abc", USER_0); + + // No changes. + assertEquals(makeSet(CALLING_PACKAGE_1, CALLING_PACKAGE_2), + set(user0.getPackages().keySet())); + assertEquals(makeSet(CALLING_PACKAGE_1, CALLING_PACKAGE_2), + set(user10.getPackages().keySet())); + assertEquals(makeSet(LAUNCHER_1, LAUNCHER_2), + set(user0.getLaunchers().keySet())); + assertEquals(makeSet(LAUNCHER_1, LAUNCHER_2), + set(user10.getLaunchers().keySet())); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_1, USER_0), + "s0_1", "s0_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_2, USER_0), + "s0_1", "s0_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_1, USER_10), + "s10_1", "s10_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_2, USER_10), + "s10_1", "s10_2"); + assertShortcutExists(CALLING_PACKAGE_1, "s0_1", USER_0); + assertShortcutExists(CALLING_PACKAGE_2, "s0_2", USER_0); + assertShortcutExists(CALLING_PACKAGE_1, "s10_1", USER_10); + assertShortcutExists(CALLING_PACKAGE_2, "s10_2", USER_10); + + mService.saveDirtyInfo(); + + // Remove a package. + mService.cleanUpPackageLocked(CALLING_PACKAGE_1, USER_0); + + assertEquals(makeSet(CALLING_PACKAGE_2), + set(user0.getPackages().keySet())); + assertEquals(makeSet(CALLING_PACKAGE_1, CALLING_PACKAGE_2), + set(user10.getPackages().keySet())); + assertEquals(makeSet(LAUNCHER_1, LAUNCHER_2), + set(user0.getLaunchers().keySet())); + assertEquals(makeSet(LAUNCHER_1, LAUNCHER_2), + set(user10.getLaunchers().keySet())); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_1, USER_0), + "s0_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_2, USER_0), + "s0_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_1, USER_10), + "s10_1", "s10_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_2, USER_10), + "s10_1", "s10_2"); + assertShortcutNotExists(CALLING_PACKAGE_1, "s0_1", USER_0); + assertShortcutExists(CALLING_PACKAGE_2, "s0_2", USER_0); + assertShortcutExists(CALLING_PACKAGE_1, "s10_1", USER_10); + assertShortcutExists(CALLING_PACKAGE_2, "s10_2", USER_10); + + mService.saveDirtyInfo(); + + // Remove a launcher. + mService.cleanUpPackageLocked(LAUNCHER_1, USER_10); + + assertEquals(makeSet(CALLING_PACKAGE_2), + set(user0.getPackages().keySet())); + assertEquals(makeSet(CALLING_PACKAGE_1, CALLING_PACKAGE_2), + set(user10.getPackages().keySet())); + assertEquals(makeSet(LAUNCHER_1, LAUNCHER_2), + set(user0.getLaunchers().keySet())); + assertEquals(makeSet(LAUNCHER_2), + set(user10.getLaunchers().keySet())); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_1, USER_0), + "s0_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_2, USER_0), + "s0_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_2, USER_10), + "s10_1", "s10_2"); + assertShortcutNotExists(CALLING_PACKAGE_1, "s0_1", USER_0); + assertShortcutExists(CALLING_PACKAGE_2, "s0_2", USER_0); + assertShortcutExists(CALLING_PACKAGE_1, "s10_1", USER_10); + assertShortcutExists(CALLING_PACKAGE_2, "s10_2", USER_10); + + mService.saveDirtyInfo(); + + // Remove a package. + mService.cleanUpPackageLocked(CALLING_PACKAGE_2, USER_10); + + assertEquals(makeSet(CALLING_PACKAGE_2), + set(user0.getPackages().keySet())); + assertEquals(makeSet(CALLING_PACKAGE_1), + set(user10.getPackages().keySet())); + assertEquals(makeSet(LAUNCHER_1, LAUNCHER_2), + set(user0.getLaunchers().keySet())); + assertEquals(makeSet(LAUNCHER_2), + set(user10.getLaunchers().keySet())); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_1, USER_0), + "s0_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_2, USER_0), + "s0_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_2, USER_10), + "s10_1"); + assertShortcutNotExists(CALLING_PACKAGE_1, "s0_1", USER_0); + assertShortcutExists(CALLING_PACKAGE_2, "s0_2", USER_0); + assertShortcutExists(CALLING_PACKAGE_1, "s10_1", USER_10); + assertShortcutNotExists(CALLING_PACKAGE_2, "s10_2", USER_10); + + mService.saveDirtyInfo(); + + // Remove the other launcher from user 10 too. + mService.cleanUpPackageLocked(LAUNCHER_2, USER_10); + + assertEquals(makeSet(CALLING_PACKAGE_2), + set(user0.getPackages().keySet())); + assertEquals(makeSet(CALLING_PACKAGE_1), + set(user10.getPackages().keySet())); + assertEquals(makeSet(LAUNCHER_1, LAUNCHER_2), + set(user0.getLaunchers().keySet())); + assertEquals(makeSet(), + set(user10.getLaunchers().keySet())); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_1, USER_0), + "s0_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_2, USER_0), + "s0_2"); + + // Note the pinned shortcuts on user-10 no longer referred, so they should both be removed. + assertShortcutNotExists(CALLING_PACKAGE_1, "s0_1", USER_0); + assertShortcutExists(CALLING_PACKAGE_2, "s0_2", USER_0); + assertShortcutNotExists(CALLING_PACKAGE_1, "s10_1", USER_10); + assertShortcutNotExists(CALLING_PACKAGE_2, "s10_2", USER_10); + + mService.saveDirtyInfo(); + + // More remove. + mService.cleanUpPackageLocked(CALLING_PACKAGE_1, USER_10); + + assertEquals(makeSet(CALLING_PACKAGE_2), + set(user0.getPackages().keySet())); + assertEquals(makeSet(), + set(user10.getPackages().keySet())); + assertEquals(makeSet(LAUNCHER_1, LAUNCHER_2), + set(user0.getLaunchers().keySet())); + assertEquals(makeSet(), + set(user10.getLaunchers().keySet())); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_1, USER_0), + "s0_2"); + assertShortcutIds(getLauncherPinnedShortcuts(LAUNCHER_2, USER_0), + "s0_2"); + + // Note the pinned shortcuts on user-10 no longer referred, so they should both be removed. + assertShortcutNotExists(CALLING_PACKAGE_1, "s0_1", USER_0); + assertShortcutExists(CALLING_PACKAGE_2, "s0_2", USER_0); + assertShortcutNotExists(CALLING_PACKAGE_1, "s10_1", USER_10); + assertShortcutNotExists(CALLING_PACKAGE_2, "s10_2", USER_10); + + mService.saveDirtyInfo(); + } + // TODO Detailed test for hasShortcutPermissionInner(). // TODO Add tests for the command line functions too. diff --git a/services/usb/java/com/android/server/usb/UsbDeviceManager.java b/services/usb/java/com/android/server/usb/UsbDeviceManager.java index 35a04644c836..5fe944cfa462 100644 --- a/services/usb/java/com/android/server/usb/UsbDeviceManager.java +++ b/services/usb/java/com/android/server/usb/UsbDeviceManager.java @@ -608,6 +608,7 @@ public class UsbDeviceManager { intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING | Intent.FLAG_RECEIVER_FOREGROUND); intent.putExtra(UsbManager.USB_CONNECTED, mConnected); + intent.putExtra(UsbManager.USB_HOST_CONNECTED, mHostConnected); intent.putExtra(UsbManager.USB_CONFIGURED, mConfigured); intent.putExtra(UsbManager.USB_DATA_UNLOCKED, isUsbTransferAllowed() && mUsbDataUnlocked); @@ -717,6 +718,9 @@ public class UsbDeviceManager { case MSG_UPDATE_HOST_STATE: mHostConnected = (msg.arg1 == 1); updateUsbNotification(); + if (mBootCompleted) { + updateUsbStateBroadcastIfNeeded(); + } break; case MSG_ENABLE_ADB: setAdbEnabled(msg.arg1 == 1); diff --git a/telecomm/java/android/telecom/ParcelableConnection.java b/telecomm/java/android/telecom/ParcelableConnection.java index fe0a4d8eef3d..ce51c967e021 100644 --- a/telecomm/java/android/telecom/ParcelableConnection.java +++ b/telecomm/java/android/telecom/ParcelableConnection.java @@ -188,7 +188,7 @@ public final class ParcelableConnection implements Parcelable { DisconnectCause disconnectCause = source.readParcelable(classLoader); List<String> conferenceableConnectionIds = new ArrayList<>(); source.readStringList(conferenceableConnectionIds); - Bundle extras = source.readBundle(classLoader); + Bundle extras = Bundle.setDefusable(source.readBundle(classLoader), true); return new ParcelableConnection( phoneAccount, diff --git a/telecomm/java/android/telecom/PhoneAccountHandle.java b/telecomm/java/android/telecom/PhoneAccountHandle.java index 6dc6e9cfd122..77b510df8ff8 100644 --- a/telecomm/java/android/telecom/PhoneAccountHandle.java +++ b/telecomm/java/android/telecom/PhoneAccountHandle.java @@ -16,6 +16,7 @@ package android.telecom; +import android.annotation.NonNull; import android.content.ComponentName; import android.os.Parcel; import android.os.Parcelable; @@ -33,6 +34,9 @@ import java.util.Objects; * component name.</li> * </ul> * + * Note: This Class requires a non-null {@link ComponentName} and {@link UserHandle} to operate + * properly. Passing in invalid parameters will generate a log warning. + * * See {@link PhoneAccount}, {@link TelecomManager}. */ public final class PhoneAccountHandle implements Parcelable { @@ -41,15 +45,16 @@ public final class PhoneAccountHandle implements Parcelable { private final UserHandle mUserHandle; public PhoneAccountHandle( - ComponentName componentName, - String id) { + @NonNull ComponentName componentName, + @NonNull String id) { this(componentName, id, Process.myUserHandle()); } public PhoneAccountHandle( - ComponentName componentName, - String id, - UserHandle userHandle) { + @NonNull ComponentName componentName, + @NonNull String id, + @NonNull UserHandle userHandle) { + checkParameters(componentName, userHandle); mComponentName = componentName; mId = id; mUserHandle = userHandle; @@ -136,6 +141,17 @@ public final class PhoneAccountHandle implements Parcelable { mUserHandle.writeToParcel(out, flags); } + private void checkParameters(ComponentName componentName, UserHandle userHandle) { + if(componentName == null) { + android.util.Log.w("PhoneAccountHandle", new Exception("PhoneAccountHandle has " + + "been created with null ComponentName!")); + } + if(userHandle == null) { + android.util.Log.w("PhoneAccountHandle", new Exception("PhoneAccountHandle has " + + "been created with null UserHandle!")); + } + } + public static final Creator<PhoneAccountHandle> CREATOR = new Creator<PhoneAccountHandle>() { @Override public PhoneAccountHandle createFromParcel(Parcel in) { diff --git a/telephony/java/android/telephony/CarrierConfigManager.java b/telephony/java/android/telephony/CarrierConfigManager.java index 86518b57c430..c69a360aeb5e 100644 --- a/telephony/java/android/telephony/CarrierConfigManager.java +++ b/telephony/java/android/telephony/CarrierConfigManager.java @@ -590,21 +590,8 @@ public class CarrierConfigManager { * When {@code true}, video calls to emergency numbers will be allowed. When {@code false}, * video calls to emergency numbers will be initiated as audio-only calls instead. */ - @SystemApi - public static final String BOOL_ALLOW_EMERGENCY_VIDEO_CALLS = - "bool_allow_emergency_video_calls"; - - /** - * Flag indicating whether the carrier supports video pause signaling. When {@code true}, the - * carrier supports use of the {@link android.telecom.VideoProfile#STATE_PAUSED} video state - * to pause transmission of video when the In-Call app is sent to the background. - * When {@code false}, video pause signaling is not supported. {@code True} by default unless - * a carrier configuration overrides the default. - */ - @SystemApi - public static final String BOOL_ALLOW_VIDEO_PAUSE = - "bool_allow_video_pause"; - + public static final String KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL = + "allow_emergency_video_calls_bool"; /** * Flag indicating whether the carrier supports RCS presence indication for video calls. When @@ -617,7 +604,6 @@ public class CarrierConfigManager { * and can choose to hide or show the video calling icon based on whether a contact supports * video. */ - @SystemApi public static final String KEY_USE_RCS_PRESENCE_BOOL = "use_rcs_presence_bool"; /** @@ -715,8 +701,7 @@ public class CarrierConfigManager { sDefaults.putBoolean(KEY_EDITABLE_ENHANCED_4G_LTE_BOOL, true); sDefaults.putBoolean(KEY_HIDE_IMS_APN_BOOL, false); sDefaults.putBoolean(KEY_HIDE_PREFERRED_NETWORK_TYPE_BOOL, false); - sDefaults.putBoolean(BOOL_ALLOW_EMERGENCY_VIDEO_CALLS, false); - sDefaults.putBoolean(BOOL_ALLOW_VIDEO_PAUSE, true); + sDefaults.putBoolean(KEY_ALLOW_EMERGENCY_VIDEO_CALLS_BOOL, false); sDefaults.putBoolean(KEY_EDITABLE_WFC_MODE_BOOL, true); // MMS defaults diff --git a/telephony/java/com/android/ims/internal/uce/common/CapInfo.aidl b/telephony/java/com/android/ims/internal/uce/common/CapInfo.aidl new file mode 100644 index 000000000000..5b0ac1f4da99 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/common/CapInfo.aidl @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.ims.internal.uce.common; + +parcelable CapInfo;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/common/CapInfo.java b/telephony/java/com/android/ims/internal/uce/common/CapInfo.java new file mode 100644 index 000000000000..56969a8fb612 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/common/CapInfo.java @@ -0,0 +1,443 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.common; + +import android.os.Parcel; +import android.os.Parcelable; +import android.util.Log; + +/** Class for capability discovery information. + * @hide */ +public class CapInfo implements Parcelable { + + /** IM session support. */ + private boolean mImSupported = false; + /** File transfer support. */ + private boolean mFtSupported = false; + /** File transfer Thumbnail support. */ + private boolean mFtThumbSupported = false; + /** File transfer Store and forward support. */ + private boolean mFtSnFSupported = false; + /** File transfer HTTP support. */ + private boolean mFtHttpSupported = false; + /** Image sharing support. */ + private boolean mIsSupported = false; + /** Video sharing during a CS call support -- IR-74. */ + private boolean mVsDuringCSSupported = false; + /** Video sharing outside of voice call support -- IR-84. */ + private boolean mVsSupported = false; + /** Social presence support. */ + private boolean mSpSupported = false; + /** Presence discovery support. */ + private boolean mCdViaPresenceSupported = false; + /** IP voice call support (IR-92/IR-58). */ + private boolean mIpVoiceSupported = false; + /** IP video call support (IR-92/IR-58). */ + private boolean mIpVideoSupported = false; + /** IP Geo location Pull using File Transfer support. */ + private boolean mGeoPullFtSupported = false; + /** IP Geo location Pull support. */ + private boolean mGeoPullSupported = false; + /** IP Geo location Push support. */ + private boolean mGeoPushSupported = false; + /** Standalone messaging support. */ + private boolean mSmSupported = false; + /** Full Store and Forward Group Chat information. */ + private boolean mFullSnFGroupChatSupported = false; + /** RCS IP Voice call support . */ + private boolean mRcsIpVoiceCallSupported = false; + /** RCS IP Video call support . */ + private boolean mRcsIpVideoCallSupported = false; + /** RCS IP Video call support . */ + private boolean mRcsIpVideoOnlyCallSupported = false; + /** List of supported extensions. */ + private String[] mExts = new String[10]; + /** Time used to compute when to query again. */ + private long mCapTimestamp = 0; + + + /** + * Constructor for the CapInfo class. + */ + public CapInfo() { + }; + + + /** + * Checks whether IM is supported. + */ + public boolean isImSupported() { + return mImSupported; + } + + /** + * Sets IM as supported or not supported. + */ + public void setImSupported(boolean imSupported) { + this.mImSupported = imSupported; + } + + /** + * Checks whether FT Thumbnail is supported. + */ + public boolean isFtThumbSupported() { + return mFtThumbSupported; + } + + /** + * Sets FT thumbnail as supported or not supported. + */ + public void setFtThumbSupported(boolean ftThumbSupported) { + this.mFtThumbSupported = ftThumbSupported; + } + + + + /** + * Checks whether FT Store and Forward is supported + */ + public boolean isFtSnFSupported() { + return mFtSnFSupported; + } + + /** + * Sets FT Store and Forward as supported or not supported. + */ + public void setFtSnFSupported(boolean ftSnFSupported) { + this.mFtSnFSupported = ftSnFSupported; + } + + /** + * Checks whether File transfer HTTP is supported. + */ + public boolean isFtHttpSupported() { + return mFtHttpSupported; + } + + /** + * Sets File transfer HTTP as supported or not supported. + */ + public void setFtHttpSupported(boolean ftHttpSupported) { + this.mFtHttpSupported = ftHttpSupported; + } + + /** + * Checks whether FT is supported. + */ + public boolean isFtSupported() { + return mFtSupported; + } + + /** + * Sets FT as supported or not supported. + */ + public void setFtSupported(boolean ftSupported) { + this.mFtSupported = ftSupported; + } + + /** + * Checks whether IS is supported. + */ + public boolean isIsSupported() { + return mIsSupported; + } + + /** + * Sets IS as supported or not supported. + */ + public void setIsSupported(boolean isSupported) { + this.mIsSupported = isSupported; + } + + /** + * Checks whether video sharing is supported during a CS call. + */ + public boolean isVsDuringCSSupported() { + return mVsDuringCSSupported; + } + + /** + * Sets video sharing as supported or not supported during a CS + * call. + */ + public void setVsDuringCSSupported(boolean vsDuringCSSupported) { + this.mVsDuringCSSupported = vsDuringCSSupported; + } + + /** + * Checks whether video sharing outside a voice call is + * supported. + */ + public boolean isVsSupported() { + return mVsSupported; + } + + /** + * Sets video sharing as supported or not supported. + */ + public void setVsSupported(boolean vsSupported) { + this.mVsSupported = vsSupported; + } + + /** + * Checks whether social presence is supported. + */ + public boolean isSpSupported() { + return mSpSupported; + } + + /** + * Sets social presence as supported or not supported. + */ + public void setSpSupported(boolean spSupported) { + this.mSpSupported = spSupported; + } + + /** + * Checks whether capability discovery via presence is + * supported. + */ + public boolean isCdViaPresenceSupported() { + return mCdViaPresenceSupported; + } + + /** + * Sets capability discovery via presence as supported or not + * supported. + */ + public void setCdViaPresenceSupported(boolean cdViaPresenceSupported) { + this.mCdViaPresenceSupported = cdViaPresenceSupported; + } + + /** + * Checks whether IP voice call is supported. + */ + public boolean isIpVoiceSupported() { + return mIpVoiceSupported; + } + + /** + * Sets IP voice call as supported or not supported. + */ + public void setIpVoiceSupported(boolean ipVoiceSupported) { + this.mIpVoiceSupported = ipVoiceSupported; + } + + /** + * Checks whether IP video call is supported. + */ + public boolean isIpVideoSupported() { + return mIpVideoSupported; + } + + /** + * Sets IP video call as supported or not supported. + */ + public void setIpVideoSupported(boolean ipVideoSupported) { + this.mIpVideoSupported = ipVideoSupported; + } + + /** + * Checks whether Geo location Pull using File Transfer is + * supported. + */ + public boolean isGeoPullFtSupported() { + return mGeoPullFtSupported; + } + + /** + * Sets Geo location Pull using File Transfer as supported or + * not supported. + */ + public void setGeoPullFtSupported(boolean geoPullFtSupported) { + this.mGeoPullFtSupported = geoPullFtSupported; + } + + /** + * Checks whether Geo Pull is supported. + */ + public boolean isGeoPullSupported() { + return mGeoPullSupported; + } + + /** + * Sets Geo Pull as supported or not supported. + */ + public void setGeoPullSupported(boolean geoPullSupported) { + this.mGeoPullSupported = geoPullSupported; + } + + /** + * Checks whether Geo Push is supported. + */ + public boolean isGeoPushSupported() { + return mGeoPushSupported; + } + + /** + * Sets Geo Push as supported or not supported. + */ + public void setGeoPushSupported(boolean geoPushSupported) { + this.mGeoPushSupported = geoPushSupported; + } + + /** + * Checks whether short messaging is supported. + */ + public boolean isSmSupported() { + return mSmSupported; + } + + /** + * Sets short messaging as supported or not supported. + */ + public void setSmSupported(boolean smSupported) { + this.mSmSupported = smSupported; + } + + /** + * Checks whether store/forward and group chat are supported. + */ + public boolean isFullSnFGroupChatSupported() { + return mFullSnFGroupChatSupported; + } + + public boolean isRcsIpVoiceCallSupported() { + return mRcsIpVoiceCallSupported; + } + + public boolean isRcsIpVideoCallSupported() { + return mRcsIpVideoCallSupported; + } + + public boolean isRcsIpVideoOnlyCallSupported() { + return mRcsIpVideoOnlyCallSupported; + } + + /** + * Sets store/forward and group chat supported or not supported. + */ + public void setFullSnFGroupChatSupported(boolean fullSnFGroupChatSupported) { + this.mFullSnFGroupChatSupported = fullSnFGroupChatSupported; + } + + public void setRcsIpVoiceCallSupported(boolean rcsIpVoiceCallSupported) { + this.mRcsIpVoiceCallSupported = rcsIpVoiceCallSupported; + } + public void setRcsIpVideoCallSupported(boolean rcsIpVideoCallSupported) { + this.mRcsIpVideoCallSupported = rcsIpVideoCallSupported; + } + public void setRcsIpVideoOnlyCallSupported(boolean rcsIpVideoOnlyCallSupported) { + this.mRcsIpVideoOnlyCallSupported = rcsIpVideoOnlyCallSupported; + } + + /** Gets the list of supported extensions. */ + public String[] getExts() { + return mExts; + } + + /** Sets the list of supported extensions. */ + public void setExts(String[] exts) { + this.mExts = exts; + } + + + /** Gets the time stamp for when to query again. */ + public long getCapTimestamp() { + return mCapTimestamp; + } + + /** Sets the time stamp for when to query again. */ + public void setCapTimestamp(long capTimestamp) { + this.mCapTimestamp = capTimestamp; + } + + public int describeContents() { + // TODO Auto-generated method stub + return 0; + } + + public void writeToParcel(Parcel dest, int flags) { + + dest.writeInt(mImSupported ? 1 : 0); + dest.writeInt(mFtSupported ? 1 : 0); + dest.writeInt(mFtThumbSupported ? 1 : 0); + dest.writeInt(mFtSnFSupported ? 1 : 0); + dest.writeInt(mFtHttpSupported ? 1 : 0); + dest.writeInt(mIsSupported ? 1 : 0); + dest.writeInt(mVsDuringCSSupported ? 1 : 0); + dest.writeInt(mVsSupported ? 1 : 0); + dest.writeInt(mSpSupported ? 1 : 0); + dest.writeInt(mCdViaPresenceSupported ? 1 : 0); + dest.writeInt(mIpVoiceSupported ? 1 : 0); + dest.writeInt(mIpVideoSupported ? 1 : 0); + dest.writeInt(mGeoPullFtSupported ? 1 : 0); + dest.writeInt(mGeoPullSupported ? 1 : 0); + dest.writeInt(mGeoPushSupported ? 1 : 0); + dest.writeInt(mSmSupported ? 1 : 0); + dest.writeInt(mFullSnFGroupChatSupported ? 1 : 0); + + dest.writeInt(mRcsIpVoiceCallSupported ? 1 : 0); + dest.writeInt(mRcsIpVideoCallSupported ? 1 : 0); + dest.writeInt(mRcsIpVideoOnlyCallSupported ? 1 : 0); + dest.writeStringArray(mExts); + dest.writeLong(mCapTimestamp); + } + + public static final Parcelable.Creator<CapInfo> CREATOR = new Parcelable.Creator<CapInfo>() { + + public CapInfo createFromParcel(Parcel source) { + return new CapInfo(source); + } + + public CapInfo[] newArray(int size) { + return new CapInfo[size]; + } + }; + + private CapInfo(Parcel source) { + readFromParcel(source); + } + + public void readFromParcel(Parcel source) { + + mImSupported = (source.readInt() == 0) ? false : true; + mFtSupported = (source.readInt() == 0) ? false : true; + mFtThumbSupported = (source.readInt() == 0) ? false : true; + mFtSnFSupported = (source.readInt() == 0) ? false : true; + mFtHttpSupported = (source.readInt() == 0) ? false : true; + mIsSupported = (source.readInt() == 0) ? false : true; + mVsDuringCSSupported = (source.readInt() == 0) ? false : true; + mVsSupported = (source.readInt() == 0) ? false : true; + mSpSupported = (source.readInt() == 0) ? false : true; + mCdViaPresenceSupported = (source.readInt() == 0) ? false : true; + mIpVoiceSupported = (source.readInt() == 0) ? false : true; + mIpVideoSupported = (source.readInt() == 0) ? false : true; + mGeoPullFtSupported = (source.readInt() == 0) ? false : true; + mGeoPullSupported = (source.readInt() == 0) ? false : true; + mGeoPushSupported = (source.readInt() == 0) ? false : true; + mSmSupported = (source.readInt() == 0) ? false : true; + mFullSnFGroupChatSupported = (source.readInt() == 0) ? false : true; + + mRcsIpVoiceCallSupported = (source.readInt() == 0) ? false : true; + mRcsIpVideoCallSupported = (source.readInt() == 0) ? false : true; + mRcsIpVideoOnlyCallSupported = (source.readInt() == 0) ? false : true; + + mExts = source.createStringArray(); + mCapTimestamp = source.readLong(); + } +} diff --git a/telephony/java/com/android/ims/internal/uce/common/StatusCode.aidl b/telephony/java/com/android/ims/internal/uce/common/StatusCode.aidl new file mode 100644 index 000000000000..e1e5798b4333 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/common/StatusCode.aidl @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.ims.internal.uce.common; + +parcelable StatusCode;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/common/StatusCode.java b/telephony/java/com/android/ims/internal/uce/common/StatusCode.java new file mode 100644 index 000000000000..ad9b669e5f2b --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/common/StatusCode.java @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.common; + +import android.os.Parcel; +import android.os.Parcelable; +import android.util.Log; + + +/** Class for UCE status codes. + * @hide */ +public class StatusCode implements Parcelable { + + /** + * UCE status code definitions. + * @hide + */ + + /** Request was processed successfully. */ + public static final int UCE_SUCCESS = 0; + /** Request was processed unsuccessfully. */ + public static final int UCE_FAILURE = 1; + /** Asynchronous request was handled successfully; the final + * result will be updated through + * callback. + */ + public static final int UCE_SUCCESS_ASYC_UPDATE = 2; + /** Provided service handle is not valid. */ + public static final int UCE_INVALID_SERVICE_HANDLE = 3; + /** Provided listener handler is not valid. */ + public static final int UCE_INVALID_LISTENER_HANDLE = 4; + /** Invalid parameter(s). */ + public static final int UCE_INVALID_PARAM = 5; + /** Fetch error. */ + public static final int UCE_FETCH_ERROR = 6; + /** Request timed out. */ + public static final int UCE_REQUEST_TIMEOUT = 7; + /** Failure due to insufficient memory available. */ + public static final int UCE_INSUFFICIENT_MEMORY = 8; + /** Network connection is lost. */ + public static final int UCE_LOST_NET = 9; + /** Requested feature/resource is not supported. */ + public static final int UCE_NOT_SUPPORTED = 10; + /** Contact or resource is not found. */ + public static final int UCE_NOT_FOUND = 11; + /** Service is not available. */ + public static final int UCE_SERVICE_UNAVAILABLE = 12; + /** No Change in Capabilities */ + public static final int UCE_NO_CHANGE_IN_CAP = 13; + /** Service is unknown. */ + public static final int UCE_SERVICE_UNKNOWN = 14; + + + private int mStatusCode = UCE_SUCCESS; + + /** + * Constructor for the StatusCode class. + * @hide + */ + public StatusCode() {} + + /** + * Gets the status code. + * @hide + */ + public int getStatusCode() { + return mStatusCode; + } + + /** + * Sets the status code. + * @hide + */ + public void setStatusCode(int nStatusCode) { + this.mStatusCode = nStatusCode; + } + + /** @hide */ + public int describeContents() { + // TODO Auto-generated method stub + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mStatusCode); + } + + /** @hide */ + public static final Parcelable.Creator<StatusCode> CREATOR = + new Parcelable.Creator<StatusCode>() { + + public StatusCode createFromParcel(Parcel source) { + // TODO Auto-generated method stub + return new StatusCode(source); + } + + public StatusCode[] newArray(int size) { + // TODO Auto-generated method stub + return new StatusCode[size]; + } + }; + + /** @hide */ + private StatusCode(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mStatusCode = source.readInt(); + } +} diff --git a/telephony/java/com/android/ims/internal/uce/common/UceLong.aidl b/telephony/java/com/android/ims/internal/uce/common/UceLong.aidl new file mode 100644 index 000000000000..2a15f4214544 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/common/UceLong.aidl @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.ims.internal.uce.common; + +parcelable UceLong;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/common/UceLong.java b/telephony/java/com/android/ims/internal/uce/common/UceLong.java new file mode 100644 index 000000000000..fd07fe8d2210 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/common/UceLong.java @@ -0,0 +1,118 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.common; + +import android.os.Parcel; +import android.os.Parcelable; +import android.util.Log; + + +/** Simple object wrapper for a long type. + * @hide */ +public class UceLong implements Parcelable { + + private long mUceLong; + private int mClientId = 1001; + + /** + * Constructor for the UceLong class. + * @hide + */ + public UceLong() { + }; + + /** + * Gets the long value. + * @hide + */ + public long getUceLong() { + return mUceLong; + } + + /** + * Sets the long value. + * @hide + */ + public void setUceLong(long uceLong) { + this.mUceLong = uceLong; + } + + /** Get the client ID as integer value. + * @hide + */ + public int getClientId() { + return mClientId; + } + + /** + * Set the client ID as integer value. + * @hide + */ + public void setClientId(int nClientId) { + this.mClientId = nClientId; + } + + + /** + * Gets the instance of a UceLong class. + * @hide + */ + public static UceLong getUceLongInstance() { + return new UceLong(); + } + + /** @hide */ + public int describeContents() { + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + writeToParcel(dest); + + } + + /** @hide */ + private void writeToParcel(Parcel out) { + out.writeLong(mUceLong); + out.writeInt(mClientId); + } + + /** @hide */ + public static final Parcelable.Creator<UceLong> CREATOR = + new Parcelable.Creator<UceLong>() { + + public UceLong createFromParcel(Parcel source) { + return new UceLong(source); + } + + public UceLong[] newArray(int size) { + return new UceLong[size]; + } + }; + + /** @hide */ + private UceLong(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mUceLong = source.readLong(); + mClientId = source.readInt(); + } +} diff --git a/telephony/java/com/android/ims/internal/uce/options/IOptionsListener.aidl b/telephony/java/com/android/ims/internal/uce/options/IOptionsListener.aidl new file mode 100644 index 000000000000..8cb1153c48bb --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/options/IOptionsListener.aidl @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.options; + +import com.android.ims.internal.uce.options.OptionsSipResponse; +import com.android.ims.internal.uce.options.OptionsCapInfo; +import com.android.ims.internal.uce.options.OptionsCmdStatus; +import com.android.ims.internal.uce.common.StatusCode; + +/** {@hide} */ +interface IOptionsListener +{ + /** + * Callback invoked with the version information of Options service implementation. + * @param version, version information of the service. + * @hide + */ + void getVersionCb(in String version ); + + /** + * Callback function to be invoked by the Options service to notify the listener of service + * availability. + * @param statusCode, UCE_SUCCESS as service availability. + * @hide + */ + void serviceAvailable(in StatusCode statusCode); + + /** + * Callback function to be invoked by the Options service to notify the listener of service + * unavailability. + * @param statusCode, UCE_SUCCESS as service unavailability. + * @hide + */ + void serviceUnavailable(in StatusCode statusCode); + + /** + * Callback function to be invoked to inform the client when the response for a SIP OPTIONS + * has been received. + * @param uri, URI of the remote entity received in network response. + * @param sipResponse, data of the network response received. + * @param capInfo, capabilities of the remote entity received. + * @hide + */ + void sipResponseReceived( String uri, + in OptionsSipResponse sipResponse, in OptionsCapInfo capInfo); + + /** + * Callback function to be invoked to inform the client of the status of an asynchronous call. + * @param cmdStatus, command status of the request placed. + * @hide + */ + void cmdStatus(in OptionsCmdStatus cmdStatus); + + /** + * Callback function to be invoked to inform the client of an incoming OPTIONS request + * from the network. + * @param uri, URI of the remote entity received. + * @param capInfo, capabilities of the remote entity. + * @param tID, transation of the request received from network. + * @hide + */ + void incomingOptions( String uri, in OptionsCapInfo capInfo, + in int tID); +} diff --git a/telephony/java/com/android/ims/internal/uce/options/IOptionsService.aidl b/telephony/java/com/android/ims/internal/uce/options/IOptionsService.aidl new file mode 100644 index 000000000000..839bb5574d33 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/options/IOptionsService.aidl @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.options; + +import com.android.ims.internal.uce.options.IOptionsListener; +import com.android.ims.internal.uce.options.OptionsCapInfo; +import com.android.ims.internal.uce.common.CapInfo; +import com.android.ims.internal.uce.common.StatusCode; +import com.android.ims.internal.uce.common.UceLong; + +/** {@hide} */ +interface IOptionsService +{ + + /** + * Gets the version of the Options service implementation. + * the result of this Call is received in getVersionCb + * @param optionsServiceHandle, received in serviceCreated() of IOptionsListener. + * @return StatusCode, status of the request placed. + * @hide + */ + StatusCode getVersion(int optionsServiceHandle); + + /** + * Adds a listener to the Options service. + * @param optionsServiceHandle, this returned in serviceCreated() of IOptionsListener. + * @param optionsListener, IOptionsListener object. + * @param optionsServiceListenerHdl wrapper for client's listener handle to be stored. + * + * The service will fill UceLong.mUceLong with optionsServiceListenerHdl + * @return StatusCode, status of the request placed. + */ + StatusCode addListener(int optionsServiceHandle, IOptionsListener optionsListener, + inout UceLong optionsServiceListenerHdl); + + /** + * Removes a listener from the Options service. + * @param optionsServiceHandle, received in serviceCreated() of IOptionsListener. + * @param optionsListenerHandle, received in serviceCreated() of IOptionsListener. + * @param optionsServiceListenerHdl provided in createOptionsService() or Addlistener(). + * @return StatusCode, status of the request placed. + */ + StatusCode removeListener(int optionsServiceHandle, in UceLong optionsServiceListenerHdl); + + /** + * Sets the capabilities information of the self device. + * The status of the call is received in cmdStatus callback + * @param optionsServiceHandle, this returned in serviceCreated() of IOptionsListener. + * @param capInfo, capability information to store. + * @param reqUserData, userData provided by client to identify the request/API call, it + * is returned in the cmdStatus() callback for client to match response + * with original request. + * @return StatusCode, status of the request placed. + */ + StatusCode setMyInfo(int optionsServiceHandle , in CapInfo capInfo, int reqUserData); + + + /** + * Gets the capabilities information of remote device. + * The Capability information is received in cmdStatus callback + * @param optionsServiceHandle, this returned in serviceCreated() of IOptionsListener. + * @param reqUserData, userData provided by client to identify the request/API call, it + * is returned in the cmdStatus() callback for client to match response + * with original request. + * @return StatusCode, status of the request placed. + */ + StatusCode getMyInfo(int optionsServiceHandle , int reqUserdata); + + /** + * Requests the capabilities information of a remote URI. + * the remote party capability is received in sipResponseReceived() callback. + * @param optionsServiceHandle, this returned in serviceCreated() of IOptionsListener. + * @param remoteURI, URI of the remote contact. + * @param reqUserData, userData provided by client to identify the request/API call, it + * is returned in the cmdStatus() callback for client to match response + * with original request. + * @return StatusCode, status of the request placed. + */ + StatusCode getContactCap(int optionsServiceHandle , String remoteURI, int reqUserData); + + + /** + * Requests the capabilities information of specified contacts. + * For each remote party capability is received in sipResponseReceived() callback + * @param optionsServiceHandle, this returned in serviceCreated() of IOptionsListener. + * @param remoteURIList, list of remote contact URI's. + * @param reqUserData, userData provided by client to identify the request/API call, it + * is returned in the cmdStatus() callback for client to match response + * with original request. + * @return StatusCode, status of the request placed. + */ + StatusCode getContactListCap(int optionsServiceHandle, in String[] remoteURIList, + int reqUserData); + + + /** + * Requests the capabilities information of specified contacts. + * The incoming Options request is received in incomingOptions() callback. + * + * @param optionsServiceHandle, this returned in serviceCreated() of IOptionsListener. + * @param tId, transaction ID received in incomingOptions() call of IOptionsListener. + * @param sipResponseCode, SIP response code the UE needs to share to network. + * @param reasonPhrase, response phrase corresponding to the response code. + * @param capInfo, capabilities to share in the resonse to network. + * @param bContactInBL, true if the contact is blacklisted, else false. + * @return StatusCode, status of the request placed. + */ + StatusCode responseIncomingOptions(int optionsServiceHandle, int tId, int sipResponseCode, + String reasonPhrase, in OptionsCapInfo capInfo, + in boolean bContactInBL); + +} diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.aidl b/telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.aidl new file mode 100644 index 000000000000..711c51679547 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.aidl @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.ims.internal.uce.options; + +parcelable OptionsCapInfo;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.java b/telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.java new file mode 100644 index 000000000000..c570f495a4ac --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/options/OptionsCapInfo.java @@ -0,0 +1,87 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.ims.internal.uce.options; + +import com.android.ims.internal.uce.common.CapInfo; +import android.os.Parcel; +import android.os.Parcelable; +import android.util.Log; + +/** @hide */ +public class OptionsCapInfo implements Parcelable { + + private String mSdp = ""; // SDP message body. It is client responsibility. + private CapInfo mCapInfo; + + public static OptionsCapInfo getOptionsCapInfoInstance() { + return new OptionsCapInfo(); + } + + public String getSdp() { + return mSdp; + } + + public void setSdp(String sdp) { + this.mSdp = sdp; + } + + /** + * Constructor for the OptionsCapInfo class. + */ + public OptionsCapInfo() { + mCapInfo = new CapInfo(); + }; + + public CapInfo getCapInfo() { + return mCapInfo; + } + /** + * Sets the CapInfo + */ + public void setCapInfo(CapInfo capInfo) { + this.mCapInfo = capInfo; + } + + public int describeContents() { + return 0; + } + + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(mSdp); + dest.writeParcelable(mCapInfo, flags); + } + + public static final Parcelable.Creator<OptionsCapInfo> CREATOR = + new Parcelable.Creator<OptionsCapInfo>() { + + public OptionsCapInfo createFromParcel(Parcel source) { + return new OptionsCapInfo(source); + } + + public OptionsCapInfo[] newArray(int size) { + return new OptionsCapInfo[size]; + } + }; + + private OptionsCapInfo(Parcel source) { + readFromParcel(source); + } + + public void readFromParcel(Parcel source) { + mSdp = source.readString(); + mCapInfo = source.readParcelable(CapInfo.class.getClassLoader()); + } +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.aidl b/telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.aidl new file mode 100644 index 000000000000..e83e13e8fe44 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.options; + +parcelable OptionsCmdId;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.java b/telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.java new file mode 100644 index 000000000000..35f769cdc072 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/options/OptionsCmdId.java @@ -0,0 +1,99 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.options; + + +import android.os.Parcel; +import android.os.Parcelable; + +/** @hide */ +public class OptionsCmdId implements Parcelable { + + /** UCE CD command ID types */ + + /** Command ID corresponding to API GetMyInfo(). */ + public static final int UCE_OPTIONS_CMD_GETMYCDINFO = 0; + /** Command ID corresponding to API SetMyInfo(). */ + public static final int UCE_OPTIONS_CMD_SETMYCDINFO = 1; + /** Command ID corresponding to API GetContactCap(). */ + public static final int UCE_OPTIONS_CMD_GETCONTACTCAP = 2; + /** Command ID corresponding to API GetContactListCap(). */ + public static final int UCE_OPTIONS_CMD_GETCONTACTLISTCAP = 3; + /** Command ID corresponding to API ResponseIncomingOptions(). */ + public static final int UCE_OPTIONS_CMD_RESPONSEINCOMINGOPTIONS = 4; + /** Command ID corresponding to API GetVersion(). */ + public static final int UCE_OPTIONS_CMD_GET_VERSION = 5; + /** Default Command ID as Unknown. */ + public static final int UCE_OPTIONS_CMD_UNKNOWN = 6; + + + private int mCmdId = UCE_OPTIONS_CMD_UNKNOWN; + + /** + * Gets the command ID. + * @hide + */ + public int getCmdId() { + return mCmdId; + } + + /** + * Sets the command ID. + * @hide + */ + public void setCmdId(int nCmdId) { + this.mCmdId = nCmdId; + } + + /** + * Constructor for the OptionsCDCmdId class. + * @hide + */ + public OptionsCmdId(){}; + + /** @hide */ + public int describeContents() { + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mCmdId); + } + + /** @hide */ + public static final Parcelable.Creator<OptionsCmdId> CREATOR = + new Parcelable.Creator<OptionsCmdId>() { + public OptionsCmdId createFromParcel(Parcel source) { + return new OptionsCmdId(source); + } + + public OptionsCmdId[] newArray(int size) { + return new OptionsCmdId[size]; + } + }; + + /** @hide */ + private OptionsCmdId(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mCmdId = source.readInt(); + } +} diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.aidl b/telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.aidl new file mode 100644 index 000000000000..1d30a9b2547e --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.aidl @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.ims.internal.uce.options; + +parcelable OptionsCmdStatus;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java b/telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java new file mode 100644 index 000000000000..dab191cfb364 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/options/OptionsCmdStatus.java @@ -0,0 +1,147 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.options; + +import com.android.ims.internal.uce.common.StatusCode; +import com.android.ims.internal.uce.common.CapInfo; + +import android.os.Parcel; +import android.os.Parcelable; + +/** @hide */ +public class OptionsCmdStatus implements Parcelable { + + private OptionsCmdId mCmdId; + private StatusCode mStatus; + private int mUserData; + private CapInfo mCapInfo; + + /** + * Gets the UCE command ID. + * @hide + */ + public OptionsCmdId getCmdId() { + return mCmdId; + } + /** + * Sets the command ID. + * @hide + */ + public void setCmdId(OptionsCmdId cmdId) { + this.mCmdId = cmdId; + } + + /** + * Gets the user data. + * @hide + */ + public int getUserData() { + return mUserData; + } + + /** + Sets the user data. + @hide */ + public void setUserData(int userData) { + this.mUserData = userData; + } + + /** + * Gets the status code. + * @hide + */ + public StatusCode getStatus() { + return mStatus; + } + + /** + * Sets the status code. + * @hide + */ + public void setStatus(StatusCode status) { + this.mStatus = status; + } + + /** + * Constructor for the OptionsCmdStatus class. + * @hide + */ + public OptionsCmdStatus() { + mStatus = new StatusCode(); + mCapInfo = new CapInfo(); + mCmdId = new OptionsCmdId(); + mUserData = 0; + }; + + /** @hide */ + public CapInfo getCapInfo() { + return mCapInfo; + } + + /** + * Sets the CapInfo + * @hide + */ + public void setCapInfo(CapInfo capInfo) { + this.mCapInfo = capInfo; + } + + /** + * Gets the instance of the OptionsCmdStatus class. + * @hide + */ + public static OptionsCmdStatus getOptionsCmdStatusInstance() { + return new OptionsCmdStatus(); + } + + /** @hide */ + public int describeContents() { + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mUserData); + dest.writeParcelable(mCmdId, flags); + dest.writeParcelable(mStatus, flags); + dest.writeParcelable(mCapInfo, flags); + } + + /** @hide */ + public static final Parcelable.Creator<OptionsCmdStatus> CREATOR = + new Parcelable.Creator<OptionsCmdStatus>() { + public OptionsCmdStatus createFromParcel(Parcel source) { + return new OptionsCmdStatus(source); + } + public OptionsCmdStatus[] newArray(int size) { + return new OptionsCmdStatus[size]; + } + }; + + /** @hide */ + private OptionsCmdStatus(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mUserData = source.readInt(); + mCmdId = source.readParcelable(OptionsCmdId.class.getClassLoader()); + mStatus = source.readParcelable(StatusCode.class.getClassLoader()); + mCapInfo = source.readParcelable(CapInfo.class.getClassLoader()); + } +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.aidl b/telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.aidl new file mode 100644 index 000000000000..6e9583d9c0b8 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.aidl @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.ims.internal.uce.options; + +parcelable OptionsSipResponse;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.java b/telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.java new file mode 100644 index 000000000000..0b9dd21ffe3f --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/options/OptionsSipResponse.java @@ -0,0 +1,160 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.options; + +import android.os.Parcel; +import android.os.Parcelable; + + +/** @hide */ +public class OptionsSipResponse implements Parcelable { + + private OptionsCmdId mCmdId; + private int mRequestId = 0; + private int mSipResponseCode = 0; + private int mRetryAfter = 0; + private String mReasonPhrase = ""; + + /** + * Gets the Options command ID. + * @hide + */ + public OptionsCmdId getCmdId() { + return mCmdId; + } + + /** + * Sets the Options command ID. + * @hide + */ + public void setCmdId(OptionsCmdId cmdId) { + this.mCmdId = cmdId; + } + + /** + * Gets the request ID + * @hide + */ + public int getRequestId() { + return mRequestId; + } + + /** + * Sets the request ID + * @hide + */ + public void setRequestId(int requestId) { + this.mRequestId = requestId; + } + + /** + * Gets the SIP response code. + * @hide + */ + public int getSipResponseCode() { + return mSipResponseCode; + } + + /** + * Sets the SIP response code. + * @hide + */ + public void setSipResponseCode(int sipResponseCode) { + this.mSipResponseCode = sipResponseCode; + } + + /** + * Gets the reason phrase associated with the SIP responce code. + * @hide + */ + public String getReasonPhrase() { + return mReasonPhrase; + } + + /** + * Sets the SIP response code reason phrase. + * @hide + */ + public void setReasonPhrase(String reasonPhrase) { + this.mReasonPhrase = reasonPhrase; + } + + /** + * Gets the SIP retryAfter sec value . + * @hide + */ + public int getRetryAfter() { + return mRetryAfter; + } + + /** + * Sets the SIP retryAfter sec value + * @hide + */ + public void setRetryAfter(int retryAfter) { + this.mRetryAfter = retryAfter; + } + + /** + * Constructor for the OptionsSipResponse class. + * @hide + */ + public OptionsSipResponse() { + mCmdId = new OptionsCmdId(); + }; + + /** @hide */ + public int describeContents() { + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + + dest.writeInt(mRequestId); + dest.writeInt(mSipResponseCode); + dest.writeString(mReasonPhrase); + dest.writeParcelable(mCmdId, flags); + dest.writeInt(mRetryAfter); + } + + /** @hide */ + public static final Parcelable.Creator<OptionsSipResponse> CREATOR = + new Parcelable.Creator<OptionsSipResponse>() { + public OptionsSipResponse createFromParcel(Parcel source) { + return new OptionsSipResponse(source); + } + + public OptionsSipResponse[] newArray(int size) { + return new OptionsSipResponse[size]; + } + }; + + /** @hide */ + private OptionsSipResponse(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mRequestId = source.readInt(); + mSipResponseCode = source.readInt(); + mReasonPhrase = source.readString(); + mCmdId = source.readParcelable(OptionsCmdId.class.getClassLoader()); + mRetryAfter = source.readInt(); + } +} diff --git a/telephony/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl b/telephony/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl new file mode 100644 index 000000000000..5b7114982758 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/IPresenceListener.aidl @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import com.android.ims.internal.uce.common.StatusCode; +import com.android.ims.internal.uce.presence.PresPublishTriggerType; +import com.android.ims.internal.uce.presence.PresCmdStatus; +import com.android.ims.internal.uce.presence.PresCapInfo; +import com.android.ims.internal.uce.presence.PresSipResponse; +import com.android.ims.internal.uce.presence.PresTupleInfo; +import com.android.ims.internal.uce.presence.PresResInstanceInfo; +import com.android.ims.internal.uce.presence.PresResInfo; +import com.android.ims.internal.uce.presence.PresRlmiInfo; + + +/** + * IPresenceListener + * {@hide} */ +interface IPresenceListener +{ + /** + * Gets the version of the presence listener implementation. + * @param version, version information. + */ + void getVersionCb(in String version ); + + /** + * Callback function to be invoked by the Presence service to notify the listener of service + * availability. + * @param statusCode, UCE_SUCCESS as service availability. + */ + void serviceAvailable(in StatusCode statusCode); + + /** + * Callback function to be invoked by the Presence service to notify the listener of service + * unavailability. + * @param statusCode, UCE_SUCCESS as service unAvailability. + */ + void serviceUnAvailable(in StatusCode statusCode); + + /** + * Callback function to be invoked by the Presence service to notify the listener to send a + * publish request. + * @param publishTrigger, Publish trigger for the network being supported. + */ + void publishTriggering(in PresPublishTriggerType publishTrigger); + + /** + * Callback function to be invoked to inform the client of the status of an asynchronous call. + * @param cmdStatus, command status of the request placed. + */ + void cmdStatus( in PresCmdStatus cmdStatus); + + /** + * Callback function to be invoked to inform the client when the response for a SIP message, + * such as PUBLISH or SUBSCRIBE, has been received. + * @param sipResponse, network response received for the request placed. + */ + void sipResponseReceived(in PresSipResponse sipResponse); + + /** + * Callback function to be invoked to inform the client when the NOTIFY message carrying a + * single contact's capabilities information is received. + * @param presentityURI, URI of the remote entity the request was placed. + * @param tupleInfo, array of capability information remote entity supports. + */ + void capInfoReceived(in String presentityURI, + in PresTupleInfo [] tupleInfo); + + /** + * Callback function to be invoked to inform the client when the NOTIFY message carrying + * contact's capabilities information is received. + * @param rlmiInfo, resource infomation received from network. + * @param resInfo, array of capabilities received from network for the list of remore URI. + */ + void listCapInfoReceived(in PresRlmiInfo rlmiInfo, + in PresResInfo [] resInfo); +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/IPresenceService.aidl b/telephony/java/com/android/ims/internal/uce/presence/IPresenceService.aidl new file mode 100644 index 000000000000..fdea6d35c195 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/IPresenceService.aidl @@ -0,0 +1,128 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import com.android.ims.internal.uce.presence.IPresenceListener; +import com.android.ims.internal.uce.presence.PresCapInfo; +import com.android.ims.internal.uce.presence.PresServiceInfo; +import com.android.ims.internal.uce.common.UceLong; +import com.android.ims.internal.uce.common.StatusCode; + +/** IPresenceService +{@hide} */ +interface IPresenceService +{ + + /** + * Gets the version of the Presence service implementation. + * The verion information is received in getVersionCb callback. + * @param presenceServiceHdl returned in createPresenceService(). + * @return StatusCode, status of the request placed. + */ + StatusCode getVersion(int presenceServiceHdl); + + /** + * Adds a listener to the Presence service. + * @param presenceServiceHdl returned in createPresenceService(). + * @param presenceServiceListener IPresenceListener Object. + * @param presenceServiceListenerHdl wrapper for client's listener handle to be stored. + * + * The service will fill UceLong.mUceLong with presenceListenerHandle. + * + * @return StatusCode, status of the request placed + */ + StatusCode addListener(int presenceServiceHdl, IPresenceListener presenceServiceListener, + inout UceLong presenceServiceListenerHdl); + + /** + * Removes a listener from the Presence service. + * @param presenceServiceHdl returned in createPresenceService(). + * @param presenceServiceListenerHdl provided in createPresenceService() or Addlistener(). + * @return StatusCode, status of the request placed. + */ + StatusCode removeListener(int presenceServiceHdl, in UceLong presenceServiceListenerHdl); + + /** + * Re-enables the Presence service if it is in the Blocked state due to receiving a SIP + * response 489 Bad event. + * The application must call this API before calling any presence API after receiving a SIP + * response 489 Bad event. + * The status of this request is notified in cmdStatus callback. + * + * @param presenceServiceHdl returned in createPresenceService(). + * @param userData, userData provided by client to identify the request/API call, it + * is returned in the cmdStatus() callback for client to match response + * with original request. + * @return StatusCode, status of the request placed. + */ + StatusCode reenableService(int presenceServiceHdl, int userData); + + /** + * Sends a request to publish current device capabilities. + * The network response is notifed in sipResponseReceived() callback. + * @param presenceServiceHdl returned in createPresenceService(). + * @param myCapInfo PresCapInfo object. + * @param userData, userData provided by client to identify the request/API call, it + * is returned in the cmdStatus() callback for client to match response + * with original request. + * @return StatusCode, status of the request placed. + */ + StatusCode publishMyCap(int presenceServiceHdl, in PresCapInfo myCapInfo , int userData); + + /** + * Retrieves the capability information for a single contact. Clients receive the requested + * information via the listener callback function capInfoReceived() callback. + * + * @param presenceServiceHdl returned in createPresenceService(). + * @param remoteUri remote contact URI + * @param userData, userData provided by client to identify the request/API call, it + * is returned in the cmdStatus() callback for client to match response + * with original request. + * @return StatusCode, status of the request placed. + */ + StatusCode getContactCap(int presenceServiceHdl , String remoteUri, int userData); + + /** + * Retrieves the capability information for a list of contacts. Clients receive the requested + * information via the listener callback function listCapInfoReceived() callback. + * + * @param presenceServiceHdl returned in createPresenceService(). + * @param remoteUriList list of remote contact URI's. + * @param userData, userData provided by client to identify the request/API call, it + * is returned in the cmdStatus() callback for client to match response + * with original request. + * @return StatusCode, status of the request placed. + */ + StatusCode getContactListCap(int presenceServiceHdl, in String[] remoteUriList, int userData); + + /** + * Sets the mapping between a new feature tag and the corresponding service tuple information + * to be included in the published document. + * The staus of this call is received in cmdStatus callback. + * + * @param presenceServiceHdl returned in createPresenceService(). + * @param featureTag to be supported + * @param PresServiceInfo service information describing the featureTag. + * @param userData, userData provided by client to identify the request/API call, it + * is returned in the cmdStatus() callback for client to match response + * with original request. + * @return StatusCode, status of the request placed. + */ + StatusCode setNewFeatureTag(int presenceServiceHdl, String featureTag, + in PresServiceInfo serviceInfo, int userData); + +} diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.aidl b/telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.aidl new file mode 100644 index 000000000000..df9d75a4b7e9 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +parcelable PresCapInfo; diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.java b/telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.java new file mode 100644 index 000000000000..60fc2260304f --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresCapInfo.java @@ -0,0 +1,105 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import com.android.ims.internal.uce.common.CapInfo; + +import android.os.Parcel; +import android.os.Parcelable; + + +/** @hide */ +public class PresCapInfo implements Parcelable { + + private CapInfo mCapInfo; + private String mContactUri = ""; + + /** + * Gets the UCE capability information. + * @hide + */ + public CapInfo getCapInfo() { + return mCapInfo; + } + + /** Sets the UCE Capability information. + * @hide + */ + public void setCapInfo(CapInfo capInfo) { + this.mCapInfo = capInfo; + } + + + /** + * Gets the contact URI. + * @hide + */ + public String getContactUri() { + return mContactUri; + } + + /** + * Sets the contact URI. + * @hide + */ + public void setContactUri(String contactUri) { + this.mContactUri = contactUri; + } + + /** + * Constructor for the PresCapInfo class. + * @hide + */ + public PresCapInfo() { + mCapInfo = new CapInfo(); + }; + + /** @hide */ + public int describeContents() { + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(mContactUri); + dest.writeParcelable(mCapInfo, flags); + } + + /** @hide */ + public static final Parcelable.Creator<PresCapInfo> CREATOR = + new Parcelable.Creator<PresCapInfo>() { + + public PresCapInfo createFromParcel(Parcel source) { + return new PresCapInfo(source); + } + + public PresCapInfo[] newArray(int size) { + return new PresCapInfo[size]; + } + }; + + /** @hide */ + private PresCapInfo(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mContactUri = source.readString(); + mCapInfo = source.readParcelable(CapInfo.class.getClassLoader()); + } +} diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCmdId.aidl b/telephony/java/com/android/ims/internal/uce/presence/PresCmdId.aidl new file mode 100644 index 000000000000..6ece045ffcf7 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresCmdId.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +parcelable PresCmdID;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCmdId.java b/telephony/java/com/android/ims/internal/uce/presence/PresCmdId.java new file mode 100644 index 000000000000..395f3e87fc29 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresCmdId.java @@ -0,0 +1,107 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import android.os.Parcel; +import android.os.Parcelable; + +/** @hide */ +public class PresCmdId implements Parcelable { + + /** Presence Command Status ID + * @hide */ + + + /** Command ID corresponding to function GetVersion(). */ + public static final int UCE_PRES_CMD_GET_VERSION = 0; + /** Command ID corresponding to function Publish(). */ + public static final int UCE_PRES_CMD_PUBLISHMYCAP = 1; + /** Command ID corresponding to function GetContactCap(). */ + public static final int UCE_PRES_CMD_GETCONTACTCAP = 2; + /** Command ID corresponding to function GetContactListCap(). */ + public static final int UCE_PRES_CMD_GETCONTACTLISTCAP = 3; + /** Command ID corresponding to function SetNewFeatureTag(). */ + public static final int UCE_PRES_CMD_SETNEWFEATURETAG = 4; + /** Command ID corresponding to API ReenableService(). */ + public static final int UCE_PRES_CMD_REENABLE_SERVICE = 5; + /** Command ID is unknown. */ + public static final int UCE_PRES_CMD_UNKNOWN = 6; + + + private int mCmdId = UCE_PRES_CMD_UNKNOWN; + + + /** + * Gets the command ID. + * @hide + */ + public int getCmdId() { + return mCmdId; + } + + /** + * Sets the command ID. + * @hide + */ + public void setCmdId(int nCmdId) { + this.mCmdId = nCmdId; + } + + + /** + * Constructor for the PresCmdId class. + * @hide + */ + public PresCmdId(){}; + + + /** @hide */ + public int describeContents() { + + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mCmdId); + } + + /** @hide */ + public static final Parcelable.Creator<PresCmdId> CREATOR = + new Parcelable.Creator<PresCmdId>() { + + public PresCmdId createFromParcel(Parcel source) { + + return new PresCmdId(source); + } + + public PresCmdId[] newArray(int size) { + + return new PresCmdId[size]; + } + }; + + /** @hide */ + private PresCmdId(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mCmdId = source.readInt(); + } +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.aidl b/telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.aidl new file mode 100644 index 000000000000..69bca2f9af0d --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +parcelable PresCmdStatus;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.java b/telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.java new file mode 100644 index 000000000000..a5b498bd9105 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresCmdStatus.java @@ -0,0 +1,146 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import com.android.ims.internal.uce.common.StatusCode; + +import android.os.Parcel; +import android.os.Parcelable; + + +/** @hide */ +public class PresCmdStatus implements Parcelable{ + + private PresCmdId mCmdId = new PresCmdId(); + private StatusCode mStatus = new StatusCode(); + private int mUserData; + private int mRequestId; + + /** + * Gets the Presence command ID. + * @hide + */ + public PresCmdId getCmdId() { + return mCmdId; + } + + /** + * Sets the command ID. + * @hide + */ + public void setCmdId(PresCmdId cmdId) { + this.mCmdId = cmdId; + } + + /** + * Gets the user data. + * @hide + */ + public int getUserData() { + return mUserData; + } + + /** + * Sets the user data. + * @hide + */ + public void setUserData(int userData) { + this.mUserData = userData; + } + + /** + * Gets the status code. + * @hide + */ + public StatusCode getStatus() { + return mStatus; + } + /** + * Sets the status code. + * @hide + */ + public void setStatus(StatusCode status) { + this.mStatus = status; + } + + /** + * Gets the request ID. + * @hide + */ + public int getRequestId() { + return mRequestId; + } + + /** + * Sets the request ID. + * @hide + */ + public void setRequestId(int requestId) { + this.mRequestId = requestId; + } + + /** + * Constructor for the PresCmdStatus class. + * @hide + */ + public PresCmdStatus() { + mStatus = new StatusCode(); + }; + + /** @hide */ + public int describeContents() { + + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mUserData); + dest.writeInt(mRequestId); + dest.writeParcelable(mCmdId, flags); + dest.writeParcelable(mStatus, flags); + } + + /** @hide */ + public static final Parcelable.Creator<PresCmdStatus> CREATOR = + new Parcelable.Creator<PresCmdStatus>() { + + public PresCmdStatus createFromParcel(Parcel source) { + + return new PresCmdStatus(source); + } + + public PresCmdStatus[] newArray(int size) { + + return new PresCmdStatus[size]; + } + }; + + /** @hide */ + private PresCmdStatus(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mUserData = source.readInt(); + mRequestId = source.readInt(); + mCmdId = source.readParcelable(PresCmdId.class.getClassLoader()); + mStatus = source.readParcelable(StatusCode.class.getClassLoader()); + } + +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.aidl b/telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.aidl new file mode 100644 index 000000000000..0fc0f1b5b375 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +parcelable PresPublishTriggerType;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java b/telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java new file mode 100644 index 000000000000..3e8531a73421 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresPublishTriggerType.java @@ -0,0 +1,113 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import android.os.Parcel; +import android.os.Parcelable; + +/** @hide */ +public class PresPublishTriggerType implements Parcelable { + + /** Publish Trigger Indication Definitions + * @hide + */ + + /** ETag expired. */ + public static final int UCE_PRES_PUBLISH_TRIGGER_ETAG_EXPIRED = 0; + /** Move to LTE with VoPS disabled. */ + public static final int UCE_PRES_PUBLISH_TRIGGER_MOVE_TO_LTE_VOPS_DISABLED = 1; + /** Move to LTE with VoPS enabled. */ + public static final int UCE_PRES_PUBLISH_TRIGGER_MOVE_TO_LTE_VOPS_ENABLED = 2; + /** Move to eHRPD. */ + public static final int UCE_PRES_PUBLISH_TRIGGER_MOVE_TO_EHRPD = 3; + /** Move to HSPA+. */ + public static final int UCE_PRES_PUBLISH_TRIGGER_MOVE_TO_HSPAPLUS = 4; + /** Move to 3G. */ + public static final int UCE_PRES_PUBLISH_TRIGGER_MOVE_TO_3G = 5; + /** Move to 2G. */ + public static final int UCE_PRES_PUBLISH_TRIGGER_MOVE_TO_2G = 6; + /** Move to WLAN */ + public static final int UCE_PRES_PUBLISH_TRIGGER_MOVE_TO_WLAN = 7; + /** Move to IWLAN */ + public static final int UCE_PRES_PUBLISH_TRIGGER_MOVE_TO_IWLAN = 8; + /** Trigger is unknown. */ + public static final int UCE_PRES_PUBLISH_TRIGGER_UNKNOWN = 9; + + + + + private int mPublishTriggerType = UCE_PRES_PUBLISH_TRIGGER_UNKNOWN; + + + /** + * Gets the publish trigger types. + * @hide + */ + public int getPublishTrigeerType() { + return mPublishTriggerType; + } + + /** + * Sets the publish trigger type. + * @hide + */ + public void setPublishTrigeerType(int nPublishTriggerType) { + this.mPublishTriggerType = nPublishTriggerType; + } + + + /** + * Constructor for the PresPublishTriggerType class. + * @hide + */ + public PresPublishTriggerType(){}; + + /** @hide */ + public int describeContents() { + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mPublishTriggerType); + } + + /** @hide */ + public static final Parcelable.Creator<PresPublishTriggerType> CREATOR = + new Parcelable.Creator<PresPublishTriggerType>() { + + public PresPublishTriggerType createFromParcel(Parcel source) { + + return new PresPublishTriggerType(source); + } + + public PresPublishTriggerType[] newArray(int size) { + + return new PresPublishTriggerType[size]; + } + }; + + /** @hide */ + private PresPublishTriggerType(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mPublishTriggerType = source.readInt(); + } +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresResInfo.aidl b/telephony/java/com/android/ims/internal/uce/presence/PresResInfo.aidl new file mode 100644 index 000000000000..2b7b3bbd8733 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresResInfo.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +parcelable PresResInfo;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresResInfo.java b/telephony/java/com/android/ims/internal/uce/presence/PresResInfo.java new file mode 100644 index 000000000000..a073a234d1ec --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresResInfo.java @@ -0,0 +1,121 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import android.os.Parcel; +import android.os.Parcelable; + +/** @hide */ +public class PresResInfo implements Parcelable { + + private String mResUri = ""; + private String mDisplayName = ""; + private PresResInstanceInfo mInstanceInfo; + + /** + * Gets the Presence service resource instance information. + * @hide + */ + public PresResInstanceInfo getInstanceInfo() { + return mInstanceInfo; + } + + /** + * Sets the Presence service resource instance information. + * @hide + */ + public void setInstanceInfo(PresResInstanceInfo instanceInfo) { + this.mInstanceInfo = instanceInfo; + } + + /** + * Gets the resource URI. + * @hide + */ + public String getResUri() { + return mResUri; + } + + /** + * Sets the resource URI. + * @hide + */ + public void setResUri(String resUri) { + this.mResUri = resUri; + } + + /** + * Gets the display name. + * @hide + */ + public String getDisplayName() { + return mDisplayName; + } + + /** + * Sets the display name. + * @hide + */ + public void setDisplayName(String displayName) { + this.mDisplayName = displayName; + } + + + /** + * Constructor for the PresResInstanceInfo class. + * @hide + */ + public PresResInfo() { + mInstanceInfo = new PresResInstanceInfo(); + }; + + /** @hide */ + public int describeContents() { + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(mResUri); + dest.writeString(mDisplayName); + dest.writeParcelable(mInstanceInfo, flags); + } + + /** @hide */ + public static final Parcelable.Creator<PresResInfo> CREATOR = + new Parcelable.Creator<PresResInfo>() { + public PresResInfo createFromParcel(Parcel source) { + return new PresResInfo(source); + } + + public PresResInfo[] newArray(int size) { + return new PresResInfo[size]; + } + }; + + /** @hide */ + private PresResInfo(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mResUri = source.readString(); + mDisplayName = source.readString(); + mInstanceInfo = source.readParcelable(PresResInstanceInfo.class.getClassLoader()); + } +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.aidl b/telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.aidl new file mode 100644 index 000000000000..3a0cfc44aa98 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +parcelable PresResInstanceInfo;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java b/telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java new file mode 100644 index 000000000000..430cff196d33 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresResInstanceInfo.java @@ -0,0 +1,192 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import android.os.Parcel; +import android.os.Parcelable; +import java.util.Arrays; + +/** @hide */ +public class PresResInstanceInfo implements Parcelable{ + + /** + * UCE resource instance state definitions. + * @hide + */ + + /** Active state. */ + public static final int UCE_PRES_RES_INSTANCE_STATE_ACTIVE = 0; + /** Pending state. */ + public static final int UCE_PRES_RES_INSTANCE_STATE_PENDING = 1; + /** Terminated state. */ + public static final int UCE_PRES_RES_INSTANCE_STATE_TERMINATED = 2; + /** Unknown state. */ + public static final int UCE_PRES_RES_INSTANCE_STATE_UNKNOWN = 3; + /** Unknown instance. */ + public static final int UCE_PRES_RES_INSTANCE_UNKNOWN = 4; + + + private int mResInstanceState; + private String mId = ""; + private String mReason = ""; + private String mPresentityUri = ""; + private PresTupleInfo mTupleInfoArray[]; + + + /** + * Gets the resource instance state. + * @hide + */ + public int getResInstanceState() { + return mResInstanceState; + } + + /** + * Sets the resource instance state. + * @hide + */ + public void setResInstanceState(int nResInstanceState) { + this.mResInstanceState = nResInstanceState; + } + + /** + * Gets the resource ID. + * @hide + */ + public String getResId() { + return mId; + } + + /** + * Sets the resource ID. + * @hide + */ + public void setResId(String resourceId) { + this.mId = resourceId; + } + + /** + * Gets the reason phrase associated with the SIP response + * code. + * @hide + */ + public String getReason() { + return mReason; + } + + /** + * Sets the reason phrase associated with the SIP response + * code. + * @hide + */ + public void setReason(String reason) { + this.mReason = reason; + } + + /** + * Gets the entity URI. + * @hide + */ + public String getPresentityUri() { + return mPresentityUri; + } + + /** + * Sets the entity URI. + * @hide + */ + public void setPresentityUri(String presentityUri) { + this.mPresentityUri = presentityUri; + } + + /** + * Gets the tuple information. + * @hide + */ + public PresTupleInfo[] getTupleInfo() { + return mTupleInfoArray; + } + + /** + * Sets the tuple information. + * @hide + */ + public void setTupleInfo(PresTupleInfo[] tupleInfo) { + this.mTupleInfoArray = new PresTupleInfo[tupleInfo.length]; + this.mTupleInfoArray = tupleInfo; + } + + + /** + * Constructor for the PresResInstanceInfo class. + * @hide + */ + public PresResInstanceInfo(){ + + }; + + /** @hide */ + public int describeContents() { + + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(mId); + dest.writeString(mReason); + dest.writeInt(mResInstanceState); + dest.writeString(mPresentityUri); + dest.writeParcelableArray(mTupleInfoArray, flags); + } + + /** @hide */ + public static final Parcelable.Creator<PresResInstanceInfo> CREATOR = + new Parcelable.Creator<PresResInstanceInfo>() { + + public PresResInstanceInfo createFromParcel(Parcel source) { + + return new PresResInstanceInfo(source); + } + + public PresResInstanceInfo[] newArray(int size) { + + return new PresResInstanceInfo[size]; + } + }; + + /** @hide */ + private PresResInstanceInfo(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mId = source.readString(); + mReason = source.readString(); + mResInstanceState = source.readInt(); + mPresentityUri = source.readString(); + Parcelable[] tempParcelableArray = source.readParcelableArray( + PresTupleInfo.class.getClassLoader()); + mTupleInfoArray = new PresTupleInfo[] {}; + if(tempParcelableArray != null) { + mTupleInfoArray = Arrays.copyOf(tempParcelableArray, tempParcelableArray.length, + PresTupleInfo[].class); + } + + } +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.aidl b/telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.aidl new file mode 100644 index 000000000000..2689c2dce1ac --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +parcelable PresRlmiInfo;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java b/telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java new file mode 100644 index 000000000000..987dd775f86a --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresRlmiInfo.java @@ -0,0 +1,232 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import android.os.Parcel; +import android.os.Parcelable; + +/** @hide */ +public class PresRlmiInfo implements Parcelable { + + /** + * uri corresponding to the list. Typically, this is the URI to + * which the SUBSCRIBE request was sent. + */ + private String mUri = ""; + /** list version number from 0 to 2^32-1 */ + private int mVersion; + /** + * Indicate whether the NOTIFY message contains information for + * every resource in the list + */ + private boolean mFullState; + /** list name */ + private String mListName = ""; + /** + * unique request ID used to match NOTIFY with original list + * SUBSCRIBE + */ + private int mRequestId; + /** subscription state*/ + private PresSubscriptionState mPresSubscriptionState; + /** active subscription expires time in second */ + private int mSubscriptionExpireTime; + /** list subscrption terminated reason */ + private String mSubscriptionTerminatedReason; + + /** + * Gets the URI. + * @hide + */ + public String getUri() { + return mUri; + } + + /** + * Sets the URI. + * @hide + */ + public void setUri(String uri) { + this.mUri = uri; + } + + /** + * Gets the version. + * @hide + */ + public int getVersion() { + return mVersion; + } + + /** + * Sets the version. + * @hide + */ + public void setVersion(int version) { + this.mVersion = version; + } + + /** + * Gets the RLMI state. + * @hide + */ + public boolean isFullState() { + return mFullState; + } + + /** + * Sets the RLMI state. + * @hide + */ + public void setFullState(boolean fullState) { + this.mFullState = fullState; + } + + /** + * Gets the RLMI list name. + * @hide + */ + public String getListName() { + return mListName; + } + + /** + * Sets the RLMI list name. + * @hide + */ + public void setListName(String listName) { + this.mListName = listName; + } + + /** + * Gets the subscription request ID. + * @hide + */ + public int getRequestId() { + return mRequestId; + } + + /** + * Sets the subscription request ID. + * @hide + */ + public void setRequestId(int requestId) { + this.mRequestId = requestId; + } + + /** + * Gets the presence subscription state. + * @hide + */ + public PresSubscriptionState getPresSubscriptionState() { + return mPresSubscriptionState; + } + + /** + * Sets the presence subscription state. + * @hide + */ + public void setPresSubscriptionState(PresSubscriptionState presSubscriptionState) { + this.mPresSubscriptionState = presSubscriptionState; + } + + /** + * Gets the presence subscription expiration time. + * @hide + */ + public int getSubscriptionExpireTime() { + return mSubscriptionExpireTime; + } + + /** + * Sets the presence subscription expiration time. + * @hide + */ + public void setSubscriptionExpireTime(int subscriptionExpireTime) { + this.mSubscriptionExpireTime = subscriptionExpireTime; + } + + /** + * Gets the presence subscription terminated reason. + * @hide + */ + public String getSubscriptionTerminatedReason() { + return mSubscriptionTerminatedReason; + } + + /** + * Sets the presence subscription terminated reason. + * @hide + */ + public void setSubscriptionTerminatedReason(String subscriptionTerminatedReason) { + this.mSubscriptionTerminatedReason = subscriptionTerminatedReason; + } + + /** + * Constructor for the PresTupleInfo class. + * @hide + */ + public PresRlmiInfo(){}; + + /** @hide */ + public int describeContents() { + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(mUri); + dest.writeInt(mVersion); + dest.writeInt(mFullState ? 1 : 0); + dest.writeString(mListName); + dest.writeInt(mRequestId); + dest.writeParcelable(mPresSubscriptionState, flags); + dest.writeInt(mSubscriptionExpireTime); + dest.writeString(mSubscriptionTerminatedReason); + } + + /** @hide */ + public static final Parcelable.Creator<PresRlmiInfo> CREATOR = + new Parcelable.Creator<PresRlmiInfo>() { + + public PresRlmiInfo createFromParcel(Parcel source) { + return new PresRlmiInfo(source); + } + + public PresRlmiInfo[] newArray(int size) { + return new PresRlmiInfo[size]; + } + }; + + /** @hide */ + private PresRlmiInfo(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mUri = source.readString(); + mVersion = source.readInt(); + mFullState = (source.readInt() == 0) ? false : true; + mListName = source.readString(); + mRequestId = source.readInt(); + mPresSubscriptionState = source.readParcelable( + PresSubscriptionState.class.getClassLoader()); + mSubscriptionExpireTime = source.readInt(); + mSubscriptionTerminatedReason = source.readString(); + } +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.aidl b/telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.aidl new file mode 100644 index 000000000000..91ddf866734d --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +parcelable PresServiceInfo;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.java b/telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.java new file mode 100644 index 000000000000..f7b7264fe528 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresServiceInfo.java @@ -0,0 +1,152 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import android.os.Parcel; +import android.os.Parcelable; + +/** @hide */ +public class PresServiceInfo implements Parcelable { + + /** Presence Service Information + * @hide + */ + + /** No media capability. */ + public static final int UCE_PRES_MEDIA_CAP_NONE = 0; + /** Full duplex audio only. */ + public static final int UCE_PRES_MEDIA_CAP_FULL_AUDIO_ONLY = 1; + /** Full duplex audio and video. */ + public static final int UCE_PRES_MEDIA_CAP_FULL_AUDIO_AND_VIDEO = 2; + /** Media cap is unknown. */ + public static final int UCE_PRES_MEDIA_CAP_UNKNOWN = 3; + + + private int mMediaCap = UCE_PRES_MEDIA_CAP_NONE; + private String mServiceID = ""; + private String mServiceDesc = ""; + private String mServiceVer = ""; + + /** + * Gets the media type. + * @hide + */ + public int getMediaType() { + return mMediaCap; + } + + /** + * Sets the media type. + * @hide + */ + public void setMediaType(int nMediaCap) { + this.mMediaCap = nMediaCap; + } + + /** + * Gets the service ID. + * @hide + */ + public String getServiceId() { + return mServiceID; + } + + /** + * Sets the service ID. + * @hide + */ + public void setServiceId(String serviceID) { + this.mServiceID = serviceID; + } + /** + * Gets the service description. + * @hide + */ + public String getServiceDesc() { + return mServiceDesc; + } + + /** + * Sets the service description. + * @hide + */ + public void setServiceDesc(String serviceDesc) { + this.mServiceDesc = serviceDesc; + } + + /** + * Gets the service version. + * @hide + */ + public String getServiceVer() { + return mServiceVer; + } + + /** + * Sets the service version. + * @hide + */ + public void setServiceVer(String serviceVer) { + this.mServiceVer = serviceVer; + } + + /** + * Constructor for the PresServiceInfo class. + * @hide + */ + public PresServiceInfo() {}; + + + /** @hide */ + public int describeContents() { + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(mServiceID); + dest.writeString(mServiceDesc); + dest.writeString(mServiceVer); + dest.writeInt(mMediaCap); + } + + /** @hide */ + public static final Parcelable.Creator<PresServiceInfo> CREATOR = + new Parcelable.Creator<PresServiceInfo>() { + + public PresServiceInfo createFromParcel(Parcel source) { + return new PresServiceInfo(source); + } + + public PresServiceInfo[] newArray(int size) { + return new PresServiceInfo[size]; + } + }; + + /** @hide */ + private PresServiceInfo(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mServiceID = source.readString(); + mServiceDesc = source.readString(); + mServiceVer = source.readString(); + mMediaCap = source.readInt(); + } +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.aidl b/telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.aidl new file mode 100644 index 000000000000..7dfff3db9a1d --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +parcelable PresSipResponse;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.java b/telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.java new file mode 100644 index 000000000000..456b443a392a --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresSipResponse.java @@ -0,0 +1,159 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import android.os.Parcel; +import android.os.Parcelable; + +/** @hide */ +public class PresSipResponse implements Parcelable { + + private PresCmdId mCmdId = new PresCmdId(); + private int mRequestId = 0; + private int mSipResponseCode = 0; + private int mRetryAfter = 0; + private String mReasonPhrase = ""; + + /** + * Gets the Presence command ID. + * @hide + */ + public PresCmdId getCmdId() { + return mCmdId; + } + + /** + * Sets the Presence command ID. + * @hide + */ + public void setCmdId(PresCmdId cmdId) { + this.mCmdId = cmdId; + } + + /** + * Gets the request ID. + * @hide + */ + public int getRequestId() { + return mRequestId; + } + + /** + * Sets the request ID. + * @hide + */ + public void setRequestId(int requestId) { + this.mRequestId = requestId; + } + + /** + * Gets the SIP response code. + * @hide + */ + public int getSipResponseCode() { + return mSipResponseCode; + } + + /** + * Sets the SIP response code. + * @hide + */ + public void setSipResponseCode(int sipResponseCode) { + this.mSipResponseCode = sipResponseCode; + } + + + /** + * Gets the reason phrase associated with the SIP responce + * code. + * @hide + */ + public String getReasonPhrase() { + return mReasonPhrase; + } + + /** + * Sets the SIP response code reason phrase. + * @hide + */ + public void setReasonPhrase(String reasonPhrase) { + this.mReasonPhrase = reasonPhrase; + } + + /** + * Gets the SIP retryAfter sec value. + * @hide + */ + public int getRetryAfter() { + return mRetryAfter; + } + + /** + * Sets the SIP retryAfter sec value + * @hide + */ + public void setRetryAfter(int retryAfter) { + this.mRetryAfter = retryAfter; + } + + /** + * Constructor for the PresSipResponse class. + * @hide + */ + public PresSipResponse(){}; + + /** @hide */ + public int describeContents() { + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mRequestId); + dest.writeInt(mSipResponseCode); + dest.writeString(mReasonPhrase); + dest.writeParcelable(mCmdId, flags); + dest.writeInt(mRetryAfter); + } + + /** @hide */ + public static final Parcelable.Creator<PresSipResponse> CREATOR = + new Parcelable.Creator<PresSipResponse>() { + + public PresSipResponse createFromParcel(Parcel source) { + return new PresSipResponse(source); + } + + public PresSipResponse[] newArray(int size) { + return new PresSipResponse[size]; + } + }; + + /** @hide */ + private PresSipResponse(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mRequestId = source.readInt(); + mSipResponseCode = source.readInt(); + mReasonPhrase = source.readString(); + mCmdId = source.readParcelable(PresCmdId.class.getClassLoader()); + mRetryAfter = source.readInt(); + } +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.aidl b/telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.aidl new file mode 100644 index 000000000000..7bff24ab6974 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +parcelable PresSubscriptionState;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java b/telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java new file mode 100644 index 000000000000..872bc23ee9ab --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresSubscriptionState.java @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import android.os.Parcel; +import android.os.Parcelable; + +/** @hide */ +public class PresSubscriptionState implements Parcelable { + + /** + * Subscription states. + * @hide + */ + + /** Active state. */ + public static final int UCE_PRES_SUBSCRIPTION_STATE_ACTIVE = 0; + /** Pending state. */ + public static final int UCE_PRES_SUBSCRIPTION_STATE_PENDING = 1; + /** Terminated state. */ + public static final int UCE_PRES_SUBSCRIPTION_STATE_TERMINATED = 2; + /** Unknown state. */ + public static final int UCE_PRES_SUBSCRIPTION_STATE_UNKNOWN = 3; + + + private int mPresSubscriptionState = UCE_PRES_SUBSCRIPTION_STATE_UNKNOWN; + + + /** @hide */ + public int describeContents() { + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeInt(mPresSubscriptionState); + } + + /** @hide */ + public static final Parcelable.Creator<PresSubscriptionState> CREATOR = + new Parcelable.Creator<PresSubscriptionState>() { + + public PresSubscriptionState createFromParcel(Parcel source) { + return new PresSubscriptionState(source); + } + + public PresSubscriptionState[] newArray(int size) { + return new PresSubscriptionState[size]; + } + }; + + /** @hide */ + private PresSubscriptionState(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mPresSubscriptionState = source.readInt(); + } + + /** + * Constructor for the PresSubscriptionState class. + * @hide + */ + public PresSubscriptionState() { }; + + /** + * Gets the Presence subscription state. + * @hide + */ + public int getPresSubscriptionStateValue() { + return mPresSubscriptionState; + } + + + /** + * Sets the Presence subscription state. + * @hide + */ + public void setPresSubscriptionState(int nPresSubscriptionState) { + this.mPresSubscriptionState = nPresSubscriptionState; + } +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.aidl b/telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.aidl new file mode 100644 index 000000000000..6571ebe8b74c --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.aidl @@ -0,0 +1,19 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +parcelable PresTupleInfo;
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.java b/telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.java new file mode 100644 index 000000000000..e1867c55836b --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/presence/PresTupleInfo.java @@ -0,0 +1,119 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.presence; + +import android.os.Parcel; +import android.os.Parcelable; + +/** @hide */ +public class PresTupleInfo implements Parcelable { + + private String mFeatureTag = ""; + private String mContactUri = ""; + private String mTimestamp = ""; + + + /** + * Gets the feature tag. + * @hide + */ + public String getFeatureTag() { + return mFeatureTag; + } + + /** + * Sets the feature tag. + * @hide + */ + public void setFeatureTag(String featureTag) { + this.mFeatureTag = featureTag; + } + + /** + * Gets the contact URI. + * @hide + */ + public String getContactUri() { + return mContactUri; + } + /** + * Sets the contact URI. + * @hide + */ + public void setContactUri(String contactUri) { + this.mContactUri = contactUri; + } + + /** + * Gets the timestamp. + * @hide + */ + public String getTimestamp() { + return mTimestamp; + } + + /** + * Sets the timestamp. + * @hide + */ + public void setTimestamp(String timestamp) { + this.mTimestamp = timestamp; + } + + /** + * Constructor for the PresTupleInfo class. + * @hide + */ + public PresTupleInfo(){}; + + /** @hide */ + public int describeContents() { + return 0; + } + + /** @hide */ + public void writeToParcel(Parcel dest, int flags) { + dest.writeString(mFeatureTag); + dest.writeString(mContactUri); + dest.writeString(mTimestamp); + } + + /** @hide */ + public static final Parcelable.Creator<PresTupleInfo> CREATOR = + new Parcelable.Creator<PresTupleInfo>() { + + public PresTupleInfo createFromParcel(Parcel source) { + return new PresTupleInfo(source); + } + + public PresTupleInfo[] newArray(int size) { + return new PresTupleInfo[size]; + } + }; + + /** @hide */ + private PresTupleInfo(Parcel source) { + readFromParcel(source); + } + + /** @hide */ + public void readFromParcel(Parcel source) { + mFeatureTag = source.readString(); + mContactUri = source.readString(); + mTimestamp = source.readString(); + } +}
\ No newline at end of file diff --git a/telephony/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl b/telephony/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl new file mode 100644 index 000000000000..13707a16a0c1 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/uceservice/IUceListener.aidl @@ -0,0 +1,29 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.uceservice; + +/** IUceListener + * {@hide} */ +interface IUceListener +{ + /** + * Get UCE Status + * @param serviceStatusValue defined in ImsUceManager + * @hide + */ + void setStatus(int serviceStatusValue); +} diff --git a/telephony/java/com/android/ims/internal/uce/uceservice/IUceService.aidl b/telephony/java/com/android/ims/internal/uce/uceservice/IUceService.aidl new file mode 100644 index 000000000000..43f83cd94d57 --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/uceservice/IUceService.aidl @@ -0,0 +1,127 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.uceservice; + +import com.android.ims.internal.uce.uceservice.IUceListener; +import com.android.ims.internal.uce.presence.IPresenceService; +import com.android.ims.internal.uce.options.IOptionsListener; +import com.android.ims.internal.uce.presence.IPresenceListener; +import com.android.ims.internal.uce.options.IOptionsService; +import com.android.ims.internal.uce.common.UceLong; +import com.android.ims.internal.uce.common.StatusCode; + +/** IUceService + * UCE service interface class. + * {@hide} */ +interface IUceService +{ + + /** + * Starts the Uce service. + * @param uceListener IUceListener object + * @return boolean true if the service stop start is processed successfully, FALSE otherwise. + * + * Service status is returned in setStatus callback in IUceListener. + * @hide + */ + boolean startService(IUceListener uceListener); + + /** + * Stops the UCE service. + * @return boolean true if the service stop request is processed successfully, FALSE otherwise. + * @hide + */ + boolean stopService(); + + + + /** + * Requests the UCE service start status. + * @return boolean true if service started else false. + * @hide + */ + boolean isServiceStarted(); + + /** + * Creates a options service for Capability Discovery. + * @param optionsListener IOptionsListener object. + * @param optionsServiceListenerHdl wrapper for client's listener handle to be stored. + * + * The service will fill UceLong.mUceLong with presenceListenerHandle allocated and + * used to validate callbacks received in IPresenceListener are indeed from the + * service the client created. + * + * @return optionsServiceHandle + * @hide + */ + int createOptionsService(IOptionsListener optionsListener, + inout UceLong optionsServiceListenerHdl); + + /** + * Destroys a Options service. + * @param optionsServiceHandle this is received in serviceCreated() callback + * in IOptionsListener + * @hide + */ + void destroyOptionsService(int optionsServiceHandle); + + /** + * Creates a presence service. + * @param presenceServiceListener IPresenceListener object + * @param presenceServiceListenerHdl wrapper for client's listener handle to be stored. + * + * The service will fill UceLong.mUceLong with presenceListenerHandle allocated and + * used to validate callbacks received in IPresenceListener are indeed from the + * service the client created. + * + * @return presenceServiceHdl + * @hide + */ + int createPresenceService(IPresenceListener presenceServiceListener, + inout UceLong presenceServiceListenerHdl); + + /** + * Destroys a presence service. + * @param presenceServiceHdl handle returned during createPresenceService() + * @hide + */ + void destroyPresenceService(int presenceServiceHdl); + + + + /** + * Query the UCE Service for information to know whether the is registered. + * @return boolean, true if Registered to for network events else false. + * @hide + */ + boolean getServiceStatus(); + + /** + * Query the UCE Service for presence Service. + * @return IPresenceService object. + * @hide + */ + IPresenceService getPresenceService(); + + /** + * Query the UCE Service for options service object. + * @return IOptionsService object. + * @hide + */ + IOptionsService getOptionsService(); + +} diff --git a/telephony/java/com/android/ims/internal/uce/uceservice/ImsUceManager.java b/telephony/java/com/android/ims/internal/uce/uceservice/ImsUceManager.java new file mode 100644 index 000000000000..4b0b098d4e5b --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/uceservice/ImsUceManager.java @@ -0,0 +1,187 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce.uceservice; + +import android.content.Context; +import android.content.Intent; + +import android.os.Handler; +import android.os.HandlerThread; +import android.os.IBinder; +import android.os.Message; +import android.os.ServiceManager; +import android.os.RemoteException; + +import java.util.HashMap; +import android.util.Log; + +/** + * ImsUceManager Declaration + * @hide + */ +public class ImsUceManager { + + private static final String LOG_TAG = "ImsUceManager"; + /** + * Uce Service name Internal Uce only + * @hide + */ + private static final String UCE_SERVICE = "uce"; + + /** + * IUceService object + * @hide + */ + private IUceService mUceService = null; + private UceServiceDeathRecipient mDeathReceipient = new UceServiceDeathRecipient(); + private Context mContext; + private int mPhoneId; + /** + * Stores the UceManager instaces of Clients identified by + * phoneId + * @hide + */ + private static HashMap<Integer, ImsUceManager> sUceManagerInstances = + new HashMap<Integer, ImsUceManager>(); + + public static final String ACTION_UCE_SERVICE_UP = + "com.android.ims.internal.uce.UCE_SERVICE_UP"; + public static final String ACTION_UCE_SERVICE_DOWN = + "com.android.ims.internal.uce.UCE_SERVICE_DOWN"; + + /** Uce Service status received in IUceListener.setStatus() + * callback + * @hide + */ + public static final int UCE_SERVICE_STATUS_FAILURE = 0; + /** indicate UI to call Presence/Options API. */ + public static final int UCE_SERVICE_STATUS_ON = 1; + /** Indicate UI destroy Presence/Options */ + public static final int UCE_SERVICE_STATUS_CLOSED = 2; + /** Service up and trying to register for network events */ + public static final int UCE_SERVICE_STATUS_READY = 3; + + /** + * Part of the ACTION_UCE_SERVICE_UP or _DOWN intents. A long + * value; the phone ID corresponding to the IMS service coming up or down. + * Internal use only. + * @hide + */ + public static final String EXTRA_PHONE_ID = "android:phone_id"; + + + /** + * Gets the instance of UCE Manager + * @hide + */ + public static ImsUceManager getInstance(Context context, int phoneId) { + //if (DBG) Log.d (LOG_TAG, "GetInstance Called"); + synchronized (sUceManagerInstances) { + if (sUceManagerInstances.containsKey(phoneId)) { + return sUceManagerInstances.get(phoneId); + } else { + ImsUceManager uceMgr = new ImsUceManager(context, phoneId); + sUceManagerInstances.put(phoneId, uceMgr); + return uceMgr; + } + } + } + + /** + * Constructor + * @hide + */ + private ImsUceManager(Context context, int phoneId) { + //if (DBG) Log.d (LOG_TAG, "Constructor"); + mContext = context; + mPhoneId = phoneId; + createUceService(true); + } + + /** + * Gets the Uce service Instance + * + * client should call this API only after createUceService() + * this instance is deleted when ACTION_UCE_SERVICE_DOWN event + * is received. + * @hide + */ + public IUceService getUceServiceInstance() { + //if (DBG) Log.d (LOG_TAG, "GetUceServiceInstance Called"); + return mUceService; + } + + /** + * Gets the UCE service name + * @hide + */ + private String getUceServiceName(int phoneId) { + return UCE_SERVICE; + } + + /** + * Gets the IBinder to UCE service + * + * Client should call this after receving ACTION_UCE_SERVICE_UP + * event. + * @hide + */ + public void createUceService(boolean checkService) { + //if (DBG) Log.d (LOG_TAG, "CreateUceService Called"); + if (checkService) { + IBinder binder = ServiceManager.checkService(getUceServiceName(mPhoneId)); + + if (binder == null) { + //if (DBG)Log.d (LOG_TAG, "Unable to find IBinder"); + return; + } + } + IBinder b = ServiceManager.getService(getUceServiceName(mPhoneId)); + + if (b != null) { + try { + b.linkToDeath(mDeathReceipient, 0); + } catch (RemoteException e) { + } + } + + this.mUceService = IUceService.Stub.asInterface(b); + } + + + /** + * Death recipient class for monitoring IMS service. + * + * After receiving ACTION_UCE_SERVICE_DOWN event, the client + * should wait to receive ACTION_UCE_SERVICE_UP and call + * createUceService inorder to create mUceService instance. + * @hide + */ + private class UceServiceDeathRecipient implements IBinder.DeathRecipient { + @Override + public void binderDied() { + //if (DBG) Log.d (LOG_TAG, "found IBinder/IUceService Service Died"); + mUceService = null; + + if (mContext != null) { + Intent intent = new Intent(ACTION_UCE_SERVICE_DOWN); + intent.putExtra(EXTRA_PHONE_ID, mPhoneId); + mContext.sendBroadcast(new Intent(intent)); + } + } + } +} diff --git a/telephony/java/com/android/ims/internal/uce/uceservice/UceServiceBase.java b/telephony/java/com/android/ims/internal/uce/uceservice/UceServiceBase.java new file mode 100644 index 000000000000..3660e039582d --- /dev/null +++ b/telephony/java/com/android/ims/internal/uce/uceservice/UceServiceBase.java @@ -0,0 +1,153 @@ +/* + * Copyright (c) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.ims.internal.uce; + +import com.android.ims.internal.uce.uceservice.IUceService; +import com.android.ims.internal.uce.uceservice.IUceListener; +import com.android.ims.internal.uce.common.StatusCode; +import com.android.ims.internal.uce.common.UceLong; +import com.android.ims.internal.uce.options.IOptionsListener; +import com.android.ims.internal.uce.options.IOptionsService; +import com.android.ims.internal.uce.presence.IPresenceService; +import com.android.ims.internal.uce.presence.IPresenceListener; + +/** + * Sub IUceService interface. To enable forward compatability + * during developlemt + * @hide + */ +public abstract class UceServiceBase { + /** + * IUceService Stub Implementation + */ + private final class UceServiceBinder extends IUceService.Stub { + @Override + public boolean startService(IUceListener uceListener) { + return onServiceStart(uceListener); + } + + @Override + public boolean stopService() { + return onStopService(); + } + + @Override + public boolean isServiceStarted() { + return onIsServiceStarted(); + } + + @Override + public int createOptionsService(IOptionsListener optionsListener, + UceLong optionsServiceListenerHdl) { + return onCreateOptionsService(optionsListener, optionsServiceListenerHdl); + } + + + @Override + public void destroyOptionsService(int optionsServiceHandle) { + onDestroyOptionsService(optionsServiceHandle); + } + + @Override + public int createPresenceService( + IPresenceListener presServiceListener, + UceLong presServiceListenerHdl) { + return onCreatePresService(presServiceListener, presServiceListenerHdl); + } + + @Override + public void destroyPresenceService(int presServiceHdl) { + onDestroyPresService(presServiceHdl); + } + + @Override + public boolean getServiceStatus() { + return onGetServiceStatus(); + } + + @Override + public IPresenceService getPresenceService() { + return onGetPresenceService(); + } + + @Override + public IOptionsService getOptionsService() { + return onGetOptionsService(); + } + } + + private UceServiceBinder mBinder; + + public UceServiceBinder getBinder() { + if (mBinder == null) { + mBinder = new UceServiceBinder(); + } + return mBinder; + } + + protected boolean onServiceStart(IUceListener uceListener) { + //no-op + return false; + } + + protected boolean onStopService() { + //no-op + return false; + } + + protected boolean onIsServiceStarted() { + //no-op + return false; + } + + protected int onCreateOptionsService(IOptionsListener optionsListener, + UceLong optionsServiceListenerHdl) { + //no-op + return 0; + } + + protected void onDestroyOptionsService(int cdServiceHandle) { + //no-op + return; + } + + protected int onCreatePresService(IPresenceListener presServiceListener, + UceLong presServiceListenerHdl) { + //no-op + return 0; + } + + protected void onDestroyPresService(int presServiceHdl) { + //no-op + return; + } + + protected boolean onGetServiceStatus() { + //no-op + return false; + } + + protected IPresenceService onGetPresenceService() { + //no-op + return null; + } + + protected IOptionsService onGetOptionsService () { + //no-op + return null; + } +} diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index 4f0e036e04ca..8aa0e3406ee3 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -81,8 +81,7 @@ public interface RILConstants { int INTERNAL_ERR = 38; /* Hit unexpected vendor internal error scenario */ int SYSTEM_ERR = 39; /* Hit platform or system error */ int MODEM_ERR = 40; /* Hit unexpected modem error */ - int INVALID_STATE = 41; /* Can not process the request as vendor RIL is in - invalid state. */ + int INVALID_STATE = 41; /* Unexpected request for the current state */ int NO_RESOURCES = 42; /* Not sufficient resource to process the request */ int SIM_ERR = 43; /* Received error from SIM card */ int INVALID_ARGUMENTS = 44; /* Received invalid arguments in request */ @@ -103,6 +102,11 @@ public interface RILConstants { int NO_SUCH_ENTRY = 59; /* No such entry present to perform the request */ int NETWORK_NOT_READY = 60; /* Network is not ready to perform the request */ int NOT_PROVISIONED = 61; /* Device doesnot have this value provisioned */ + int NO_SUBSCRIPTION = 62; /* Device doesnot have subscription */ + int NO_NETWORK_FOUND = 63; /* Network cannot be found */ + int DEVICE_IN_USE = 64; /* Operation cannot be performed because the device + is currently in use */ + int ABORTED = 65; /* Operation aborted */ // Below is list of OEM specific error codes which can by used by OEMs in case they don't want to // reveal particular replacement for Generic failure int OEM_ERROR_1 = 501; diff --git a/tools/aapt/Bundle.h b/tools/aapt/Bundle.h index c4495509614e..ca06ac440731 100644 --- a/tools/aapt/Bundle.h +++ b/tools/aapt/Bundle.h @@ -249,7 +249,7 @@ public: * above. SDK levels that have a non-numeric identifier are assumed * to be newer than any SDK level that has a number designated. */ - bool isMinSdkAtLeast(int desired) { + bool isMinSdkAtLeast(int desired) const { /* If the application specifies a minSdkVersion in the manifest * then use that. Otherwise, check what the user specified on * the command line. If neither, it's not available since diff --git a/tools/aapt/Images.cpp b/tools/aapt/Images.cpp index 40466bd25451..9939c188cdd9 100644 --- a/tools/aapt/Images.cpp +++ b/tools/aapt/Images.cpp @@ -1134,10 +1134,9 @@ static void analyze_image(const char *imageName, image_info &imageInfo, int gray } } - static void write_png(const char* imageName, png_structp write_ptr, png_infop write_info, - image_info& imageInfo, int grayscaleTolerance) + image_info& imageInfo, const Bundle* bundle) { png_uint_32 width, height; int color_type; @@ -1174,9 +1173,26 @@ static void write_png(const char* imageName, bool hasTransparency; int paletteEntries, alphaPaletteEntries; + int grayscaleTolerance = bundle->getGrayscaleTolerance(); analyze_image(imageName, imageInfo, grayscaleTolerance, rgbPalette, alphaPalette, &paletteEntries, &alphaPaletteEntries, &hasTransparency, &color_type, outRows); + // Legacy versions of aapt would always encode 9patch PNGs as RGBA. This had the unintended + // benefit of working around a bug decoding paletted images in Android 4.1. + // https://code.google.com/p/android/issues/detail?id=34619 + // + // If SDK_JELLY_BEAN is supported, we need to avoid a paletted encoding in order to not expose + // this bug. + if (!bundle->isMinSdkAtLeast(SDK_JELLY_BEAN_MR1)) { + if (imageInfo.is9Patch && PNG_COLOR_TYPE_PALETTE == color_type) { + if (hasTransparency) { + color_type = PNG_COLOR_TYPE_RGB_ALPHA; + } else { + color_type = PNG_COLOR_TYPE_RGB; + } + } + } + if (kIsDebug) { switch (color_type) { case PNG_COLOR_TYPE_PALETTE: @@ -1332,8 +1348,7 @@ static bool write_png_protected(png_structp write_ptr, String8& printableName, p return false; } - write_png(printableName.string(), write_ptr, write_info, *imageInfo, - bundle->getGrayscaleTolerance()); + write_png(printableName.string(), write_ptr, write_info, *imageInfo, bundle); return true; } @@ -1543,8 +1558,7 @@ status_t preProcessImageToCache(const Bundle* bundle, const String8& source, con } // Actually write out to the new png - write_png(dest.string(), write_ptr, write_info, imageInfo, - bundle->getGrayscaleTolerance()); + write_png(dest.string(), write_ptr, write_info, imageInfo, bundle); if (bundle->getVerbose()) { // Find the size of our new file diff --git a/tools/fonts/fontchain_lint.py b/tools/fonts/fontchain_lint.py index c16de7b3dfc3..a8483464ff47 100755 --- a/tools/fonts/fontchain_lint.py +++ b/tools/fonts/fontchain_lint.py @@ -255,8 +255,9 @@ def main(): ucd_path = sys.argv[2] parse_ucd(ucd_path) - check_emoji_availability() - check_emoji_defaults() + # Temporarily disable emoji checks for Bug 27785690 + # check_emoji_availability() + # check_emoji_defaults() if __name__ == '__main__': diff --git a/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java b/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java index 1ca94dc7fa84..ff3f19f3f742 100644 --- a/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java +++ b/tools/layoutlib/bridge/src/android/graphics/PorterDuffColorFilter_Delegate.java @@ -48,7 +48,7 @@ public class PorterDuffColorFilter_Delegate extends ColorFilter_Delegate { // ---- delegate data ---- - private final int mSrcColor; + private final java.awt.Color mSrcColor; private final Mode mMode; @@ -66,9 +66,9 @@ public class PorterDuffColorFilter_Delegate extends ColorFilter_Delegate { @Override public void applyFilter(Graphics2D g, int width, int height) { - BufferedImage image = createFilterImage(width, height); g.setComposite(getComposite(mMode, 0xFF)); - g.drawImage(image, 0, 0, null); + g.setColor(mSrcColor); + g.fillRect(0, 0, width, height); } // ---- native methods ---- @@ -84,22 +84,10 @@ public class PorterDuffColorFilter_Delegate extends ColorFilter_Delegate { // ---- Private delegate/helper methods ---- private PorterDuffColorFilter_Delegate(int srcColor, int mode) { - mSrcColor = srcColor; + mSrcColor = new java.awt.Color(srcColor, true /* hasAlpha */); mMode = getCompatibleMode(getPorterDuffMode(mode)); } - private BufferedImage createFilterImage(int width, int height) { - BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_ARGB); - Graphics2D graphics = image.createGraphics(); - try { - graphics.setColor(new java.awt.Color(mSrcColor, true /* hasAlpha */)); - graphics.fillRect(0, 0, width, height); - } finally { - graphics.dispose(); - } - return image; - } - // For filtering the colors, the src image should contain the "color" only for pixel values // which are not transparent in the target image. But, we are using a simple rectangular image // completely filled with color. Hence some Composite rules do not apply as intended. However, diff --git a/tools/layoutlib/bridge/src/android/view/BridgeInflater.java b/tools/layoutlib/bridge/src/android/view/BridgeInflater.java index 723e8278bcc0..bdddfd8d8ba3 100644 --- a/tools/layoutlib/bridge/src/android/view/BridgeInflater.java +++ b/tools/layoutlib/bridge/src/android/view/BridgeInflater.java @@ -265,12 +265,15 @@ public final class BridgeInflater extends LayoutInflater { if (viewKey != null) { bc.addViewKey(view, viewKey); } - String scrollPos = attrs.getAttributeValue(BridgeConstants.NS_RESOURCES, "scrollY"); - if (scrollPos != null) { - if (scrollPos.endsWith("px")) { - int value = Integer.parseInt(scrollPos.substring(0, scrollPos.length() - 2)); - bc.setScrollYPos(view, value); - } + String scrollPosX = attrs.getAttributeValue(BridgeConstants.NS_RESOURCES, "scrollX"); + if (scrollPosX != null && scrollPosX.endsWith("px")) { + int value = Integer.parseInt(scrollPosX.substring(0, scrollPosX.length() - 2)); + bc.setScrollXPos(view, value); + } + String scrollPosY = attrs.getAttributeValue(BridgeConstants.NS_RESOURCES, "scrollY"); + if (scrollPosY != null && scrollPosY.endsWith("px")) { + int value = Integer.parseInt(scrollPosY.substring(0, scrollPosY.length() - 2)); + bc.setScrollYPos(view, value); } if (ReflectionUtils.isInstanceOf(view, RecyclerViewUtil.CN_RECYCLER_VIEW)) { Integer resourceId = null; diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java index b3f1ee1fdfdf..4161307aa8f3 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeContext.java @@ -127,7 +127,8 @@ public final class BridgeContext extends Context { private final LayoutlibCallback mLayoutlibCallback; private final WindowManager mWindowManager; private final DisplayManager mDisplayManager; - private final HashMap<View, Integer> mScrollYPos = new HashMap<View, Integer>(); + private final HashMap<View, Integer> mScrollYPos = new HashMap<>(); + private final HashMap<View, Integer> mScrollXPos = new HashMap<>(); private Resources.Theme mTheme; @@ -1837,6 +1838,15 @@ public final class BridgeContext extends Context { return pos != null ? pos : 0; } + public void setScrollXPos(@NonNull View view, int scrollPos) { + mScrollXPos.put(view, scrollPos); + } + + public int getScrollXPos(@NonNull View view) { + Integer pos = mScrollXPos.get(view); + return pos != null ? pos : 0; + } + @Override public Context createDeviceProtectedStorageContext() { // pass diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeIInputMethodManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeIInputMethodManager.java index 5c74caf2695d..0cf51a46f63f 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeIInputMethodManager.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeIInputMethodManager.java @@ -222,7 +222,8 @@ public class BridgeIInputMethodManager implements IInputMethodManager { public InputBindResult startInputOrWindowGainedFocus( /* @InputMethodClient.StartInputReason */ int startInputReason, IInputMethodClient client, IBinder windowToken, int controlFlags, int softInputMode, - int windowFlags, EditorInfo attribute, IInputContext inputContext) + int windowFlags, EditorInfo attribute, IInputContext inputContext, + /* @InputConnectionInspector.MissingMethodFlags */ int missingMethodFlags) throws RemoteException { // TODO Auto-generated method stub return null; diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java index e9b7819e9d8b..9f73d79ff142 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgePowerManager.java @@ -86,6 +86,11 @@ public class BridgePowerManager implements IPowerManager { } @Override + public void rebootSafeMode(boolean confirm, boolean wait) { + // pass for now. + } + + @Override public void shutdown(boolean confirm, String reason, boolean wait) { // pass for now. } diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java index fe05b0e91e83..53adb41af0cb 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/BridgeWindowSession.java @@ -96,7 +96,8 @@ public final class BridgeWindowSession implements IWindowSession { } @Override - public void repositionChild(IWindow childWindow, int x, int y, int width, int height, + public void repositionChild(IWindow window, int left, int top, int right, int bottom, + int requestedWidth, int requestedHeight, long deferTransactionUntilFrame, Rect outFrame) { // pass for now. return; diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/RenderParamsFlags.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/RenderParamsFlags.java index b98f96f27c91..bd17a2fe6ca2 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/RenderParamsFlags.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/android/RenderParamsFlags.java @@ -16,6 +16,7 @@ package com.android.layoutlib.bridge.android; +import com.android.ide.common.rendering.api.LayoutlibCallback; import com.android.ide.common.rendering.api.RenderParams; import com.android.ide.common.rendering.api.SessionParams.Key; @@ -42,11 +43,16 @@ public final class RenderParamsFlags { public static final Key<Boolean> FLAG_KEY_RECYCLER_VIEW_SUPPORT = new Key<Boolean>("recyclerViewSupport", Boolean.class); /** - * The application package name. Used via - * {@link com.android.ide.common.rendering.api.LayoutlibCallback#getFlag(Key)} + * The application package name. Used via {@link LayoutlibCallback#getFlag(Key)} */ public static final Key<String> FLAG_KEY_APPLICATION_PACKAGE = new Key<String>("applicationPackage", String.class); + /** + * To tell LayoutLib that IDE supports providing XML Parser for a file (useful for getting in + * memory contents of the file). Used via {@link LayoutlibCallback#getFlag(Key)} + */ + public static final Key<Boolean> FLAG_KEY_XML_FILE_PARSER_SUPPORT = + new Key<Boolean>("xmlFileParser", Boolean.class); // Disallow instances. private RenderParamsFlags() {} diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java index 53f1912a833b..016825ae66e2 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/RenderSessionImpl.java @@ -1057,25 +1057,30 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { } /** - * Set the vertical scroll position on all the components with the "scrollY" attribute. If the - * component supports nested scrolling attempt that first, then use the unconsumed scroll part - * to scroll the content in the component. + * Set the scroll position on all the components with the "scrollX" and "scrollY" attribute. If + * the component supports nested scrolling attempt that first, then use the unconsumed scroll + * part to scroll the content in the component. */ private void handleScrolling(View view) { BridgeContext context = getContext(); - int scrollPos = context.getScrollYPos(view); - if (scrollPos != 0) { + int scrollPosX = context.getScrollXPos(view); + int scrollPosY = context.getScrollYPos(view); + if (scrollPosX != 0 || scrollPosY != 0) { if (view.isNestedScrollingEnabled()) { int[] consumed = new int[2]; - if (view.startNestedScroll(DesignLibUtil.SCROLL_AXIS_VERTICAL)) { - view.dispatchNestedPreScroll(0, scrollPos, consumed, null); - view.dispatchNestedScroll(consumed[0], consumed[1], 0, scrollPos, null); + int axis = scrollPosX != 0 ? View.SCROLL_AXIS_HORIZONTAL : 0; + axis |= scrollPosY != 0 ? View.SCROLL_AXIS_VERTICAL : 0; + if (view.startNestedScroll(axis)) { + view.dispatchNestedPreScroll(scrollPosX, scrollPosY, consumed, null); + view.dispatchNestedScroll(consumed[0], consumed[1], scrollPosX, scrollPosY, + null); view.stopNestedScroll(); - scrollPos -= consumed[1]; + scrollPosX -= consumed[0]; + scrollPosY -= consumed[1]; } } - if (scrollPos != 0) { - view.scrollBy(0, scrollPos); + if (scrollPosX != 0 || scrollPosY != 0) { + view.scrollBy(scrollPosX, scrollPosY); } } @@ -1276,14 +1281,20 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { return null; } + ViewParent parent = view.getParent(); ViewInfo result; if (isContentFrame) { + // Account for parent scroll values when calculating the bounding box + int scrollX = parent != null ? ((View)parent).getScrollX() : 0; + int scrollY = parent != null ? ((View)parent).getScrollY() : 0; + // The view is part of the layout added by the user. Hence, // the ViewCookie may be obtained only through the Context. result = new ViewInfo(view.getClass().getName(), getContext().getViewKey(view), - view.getLeft(), view.getTop() + offset, view.getRight(), - view.getBottom() + offset, view, view.getLayoutParams()); + -scrollX + view.getLeft(), -scrollY + view.getTop() + offset, + -scrollX + view.getRight(), -scrollY + view.getBottom() + offset, + view, view.getLayoutParams()); } else { // We are part of the system decor. SystemViewInfo r = new SystemViewInfo(view.getClass().getName(), @@ -1311,7 +1322,6 @@ public class RenderSessionImpl extends RenderAction<SessionParams> { // its parent is of type ActionMenuView. We can also check if the view is // instanceof ActionMenuItemView but that will fail for menus using // actionProviderClass. - ViewParent parent = view.getParent(); while (parent != mViewRoot && parent instanceof ViewGroup) { if (parent instanceof ActionMenuView) { r.setViewType(ViewType.ACTION_BAR_MENU); diff --git a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/ResourceHelper.java b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/ResourceHelper.java index 494b3d2492f9..a21de56066cb 100644 --- a/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/ResourceHelper.java +++ b/tools/layoutlib/bridge/src/com/android/layoutlib/bridge/impl/ResourceHelper.java @@ -25,6 +25,7 @@ import com.android.internal.util.XmlUtils; import com.android.layoutlib.bridge.Bridge; import com.android.layoutlib.bridge.android.BridgeContext; import com.android.layoutlib.bridge.android.BridgeXmlBlockParser; +import com.android.layoutlib.bridge.android.RenderParamsFlags; import com.android.ninepatch.NinePatch; import com.android.ninepatch.NinePatchChunk; import com.android.resources.Density; @@ -142,8 +143,13 @@ public final class ResourceHelper { return null; } + XmlPullParser parser = null; // first check if the value is a file (xml most likely) - XmlPullParser parser = context.getLayoutlibCallback().getXmlFileParser(value); + Boolean psiParserSupport = context.getLayoutlibCallback().getFlag( + RenderParamsFlags.FLAG_KEY_XML_FILE_PARSER_SUPPORT); + if (psiParserSupport != null && psiParserSupport) { + parser = context.getLayoutlibCallback().getXmlFileParser(value); + } if (parser == null) { File f = new File(value); if (f.isFile()) { diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/scrolled.png b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/scrolled.png Binary files differnew file mode 100644 index 000000000000..87bd5020bcd4 --- /dev/null +++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/golden/scrolled.png diff --git a/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/scrolled.xml b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/scrolled.xml new file mode 100644 index 000000000000..a5ebc2e20847 --- /dev/null +++ b/tools/layoutlib/bridge/tests/res/testApp/MyApplication/src/main/res/layout/scrolled.xml @@ -0,0 +1,57 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:scrollX="10px" + android:scrollY="30px"> + <LinearLayout + android:layout_width="60dp" + android:layout_height="60dp" + android:background="#FF0000" /> + <LinearLayout + android:layout_width="60dp" + android:layout_height="30dp" + android:background="#00FF00" /> + <LinearLayout + android:layout_width="60dp" + android:layout_height="60dp" + android:background="#0000FF" /> + <LinearLayout + android:layout_width="60dp" + android:layout_height="30dp" + android:background="#FF00FF" /> + <LinearLayout + android:layout_width="60dp" + android:layout_height="60dp" + android:background="#00FFFF" /> + + <LinearLayout + android:layout_width="200dp" + android:layout_height="400dp" + android:orientation="vertical" + android:scrollX="-30px" + android:scrollY="150px"> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="60dp" + android:background="#FF0000" /> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="30dp" + android:background="#00FF00" /> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="60dp" + android:background="#0000FF" /> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="30dp" + android:background="#FF00FF" /> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="60dp" + android:background="#00FFFF" /> + </LinearLayout> + + +</LinearLayout> diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java index 27260421a938..c2f06e8b9aa2 100644 --- a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java +++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/Main.java @@ -21,6 +21,7 @@ import com.android.ide.common.rendering.api.RenderSession; import com.android.ide.common.rendering.api.Result; import com.android.ide.common.rendering.api.SessionParams; import com.android.ide.common.rendering.api.SessionParams.RenderingMode; +import com.android.ide.common.rendering.api.ViewInfo; import com.android.ide.common.resources.FrameworkResources; import com.android.ide.common.resources.ResourceItem; import com.android.ide.common.resources.ResourceRepository; @@ -48,9 +49,11 @@ import java.io.IOException; import java.net.URL; import java.util.Arrays; import java.util.Comparator; -import java.util.Map; import java.util.concurrent.TimeUnit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; /** @@ -398,6 +401,40 @@ public class Main { renderAndVerify(params, "vector_drawable.png", TimeUnit.SECONDS.toNanos(2)); } + /** Test activity.xml */ + @Test + public void testScrolling() throws ClassNotFoundException { + // Create the layout pull parser. + LayoutPullParser parser = new LayoutPullParser(APP_TEST_RES + "/layout/" + + "scrolled.xml"); + // Create LayoutLibCallback. + LayoutLibTestCallback layoutLibCallback = new LayoutLibTestCallback(getLogger()); + layoutLibCallback.initResources(); + + SessionParams params = getSessionParams(parser, ConfigGenerator.NEXUS_5, + layoutLibCallback, "Theme.Material.NoActionBar.Fullscreen", false, + RenderingMode.V_SCROLL, 22); + params.setForceNoDecor(); + params.setExtendedViewInfoMode(true); + + RenderResult result = renderAndVerify(params, "scrolled.png"); + assertNotNull(result); + assertTrue(result.getResult().isSuccess()); + + ViewInfo rootLayout = result.getRootViews().get(0); + // Check the first box in the main LinearLayout + assertEquals(-90, rootLayout.getChildren().get(0).getTop()); + assertEquals(-30, rootLayout.getChildren().get(0).getLeft()); + assertEquals(90, rootLayout.getChildren().get(0).getBottom()); + assertEquals(150, rootLayout.getChildren().get(0).getRight()); + + // Check the first box within the nested LinearLayout + assertEquals(-450, rootLayout.getChildren().get(5).getChildren().get(0).getTop()); + assertEquals(90, rootLayout.getChildren().get(5).getChildren().get(0).getLeft()); + assertEquals(-270, rootLayout.getChildren().get(5).getChildren().get(0).getBottom()); + assertEquals(690, rootLayout.getChildren().get(5).getChildren().get(0).getRight()); + } + /** * Create a new rendering session and test that rendering the given layout doesn't throw any * exceptions and matches the provided image. @@ -405,7 +442,8 @@ public class Main { * If frameTimeNanos is >= 0 a frame will be executed during the rendering. The time indicates * how far in the future is. */ - private void renderAndVerify(SessionParams params, String goldenFileName, long frameTimeNanos) + @Nullable + private RenderResult renderAndVerify(SessionParams params, String goldenFileName, long frameTimeNanos) throws ClassNotFoundException { // TODO: Set up action bar handler properly to test menu rendering. // Create session params. @@ -428,36 +466,43 @@ public class Main { try { String goldenImagePath = APP_TEST_DIR + "/golden/" + goldenFileName; ImageUtils.requireSimilar(goldenImagePath, session.getImage()); + + return RenderResult.getFromSession(session); } catch (IOException e) { getLogger().error(e, e.getMessage()); } finally { session.dispose(); } + + return null; } /** * Create a new rendering session and test that rendering the given layout doesn't throw any * exceptions and matches the provided image. */ - private void renderAndVerify(SessionParams params, String goldenFileName) + @Nullable + private RenderResult renderAndVerify(SessionParams params, String goldenFileName) throws ClassNotFoundException { - renderAndVerify(params, goldenFileName, -1); + return renderAndVerify(params, goldenFileName, -1); } /** * Create a new rendering session and test that rendering the given layout on nexus 5 * doesn't throw any exceptions and matches the provided image. */ - private void renderAndVerify(String layoutFileName, String goldenFileName) + @Nullable + private RenderResult renderAndVerify(String layoutFileName, String goldenFileName) throws ClassNotFoundException { - renderAndVerify(layoutFileName, goldenFileName, ConfigGenerator.NEXUS_5); + return renderAndVerify(layoutFileName, goldenFileName, ConfigGenerator.NEXUS_5); } /** * Create a new rendering session and test that rendering the given layout on given device * doesn't throw any exceptions and matches the provided image. */ - private void renderAndVerify(String layoutFileName, String goldenFileName, + @Nullable + private RenderResult renderAndVerify(String layoutFileName, String goldenFileName, ConfigGenerator deviceConfig) throws ClassNotFoundException { // Create the layout pull parser. @@ -469,7 +514,7 @@ public class Main { // Create session params. SessionParams params = getSessionParams(parser, deviceConfig, layoutLibCallback, "AppTheme", true, RenderingMode.NORMAL, 22); - renderAndVerify(params, goldenFileName); + return renderAndVerify(params, goldenFileName); } /** diff --git a/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderResult.java b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderResult.java new file mode 100644 index 000000000000..17b20f76d2cd --- /dev/null +++ b/tools/layoutlib/bridge/tests/src/com/android/layoutlib/bridge/intensive/RenderResult.java @@ -0,0 +1,63 @@ +/* + * Copyright (C) 2016 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.layoutlib.bridge.intensive; + +import com.android.ide.common.rendering.api.RenderSession; +import com.android.ide.common.rendering.api.Result; +import com.android.ide.common.rendering.api.ViewInfo; + +import android.annotation.NonNull; +import android.annotation.Nullable; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +class RenderResult { + private final List<ViewInfo> mRootViews; + private final List<ViewInfo> mSystemViews; + private final Result mRenderResult; + + private RenderResult(@Nullable Result result, @Nullable List<ViewInfo> systemViewInfoList, + @Nullable List<ViewInfo> rootViewInfoList) { + mSystemViews = systemViewInfoList == null ? Collections.emptyList() : systemViewInfoList; + mRootViews = rootViewInfoList == null ? Collections.emptyList() : rootViewInfoList; + mRenderResult = result; + } + + @NonNull + static RenderResult getFromSession(@NonNull RenderSession session) { + return new RenderResult(session.getResult(), + new ArrayList<>(session.getSystemRootViews()), + new ArrayList<>(session.getRootViews())); + } + + @Nullable + Result getResult() { + return mRenderResult; + } + + @NonNull + public List<ViewInfo> getRootViews() { + return mRootViews; + } + + @NonNull + public List<ViewInfo> getSystemViews() { + return mSystemViews; + } +} diff --git a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java index 58e876130e0c..9e15d6009e72 100644 --- a/wifi/java/android/net/wifi/WifiEnterpriseConfig.java +++ b/wifi/java/android/net/wifi/WifiEnterpriseConfig.java @@ -1047,7 +1047,7 @@ public class WifiEnterpriseConfig implements Parcelable { StringBuffer sb = new StringBuffer(); for (String key : mFields.keySet()) { // Don't display password in toString(). - String value = (key == PASSWORD_KEY) ? "<removed>" : mFields.get(key); + String value = PASSWORD_KEY.equals(key) ? "<removed>" : mFields.get(key); sb.append(key).append(" ").append(value).append("\n"); } return sb.toString(); diff --git a/wifi/java/android/net/wifi/WifiManager.java b/wifi/java/android/net/wifi/WifiManager.java index 823fd26c7904..8c1fbc3a6def 100644 --- a/wifi/java/android/net/wifi/WifiManager.java +++ b/wifi/java/android/net/wifi/WifiManager.java @@ -671,9 +671,7 @@ public class WifiManager { private AsyncChannel mAsyncChannel; private CountDownLatch mConnected; - - /* TODO(b/27432949): Use a common connectivity thread for this. */ - private HandlerThread mHandlerThread; + private Looper mLooper; /** * Create a new WifiManager instance. @@ -685,11 +683,11 @@ public class WifiManager { * @hide - hide this because it takes in a parameter of type IWifiManager, which * is a system private class. */ - public WifiManager(Context context, IWifiManager service) { + public WifiManager(Context context, IWifiManager service, Looper looper) { mContext = context; mService = service; + mLooper = looper; mTargetSdkVersion = context.getApplicationInfo().targetSdkVersion; - init(); } /** @@ -1478,8 +1476,7 @@ public class WifiManager { * @hide for CTS test only */ public void getTxPacketCount(TxPacketCountListener listener) { - validateChannel(); - mAsyncChannel.sendMessage(RSSI_PKTCNT_FETCH, 0, putListener(listener)); + getChannel().sendMessage(RSSI_PKTCNT_FETCH, 0, putListener(listener)); } /** @@ -1972,30 +1969,26 @@ public class WifiManager { } } - private void init() { - Messenger messenger = getWifiServiceMessenger(); - if (messenger == null) { - mAsyncChannel = null; - return; - } + private synchronized AsyncChannel getChannel() { + if (mAsyncChannel == null) { + Messenger messenger = getWifiServiceMessenger(); + if (messenger == null) { + throw new IllegalStateException( + "getWifiServiceMessenger() returned null! This is invalid."); + } - mHandlerThread = new HandlerThread("WifiManager"); - mAsyncChannel = new AsyncChannel(); - mConnected = new CountDownLatch(1); + mAsyncChannel = new AsyncChannel(); + mConnected = new CountDownLatch(1); - mHandlerThread.start(); - Handler handler = new ServiceHandler(mHandlerThread.getLooper()); - mAsyncChannel.connect(mContext, handler, messenger); - try { - mConnected.await(); - } catch (InterruptedException e) { - Log.e(TAG, "interrupted wait at init"); + Handler handler = new ServiceHandler(mLooper); + mAsyncChannel.connect(mContext, handler, messenger); + try { + mConnected.await(); + } catch (InterruptedException e) { + Log.e(TAG, "interrupted wait at init"); + } } - } - - private void validateChannel() { - if (mAsyncChannel == null) throw new IllegalStateException( - "No permission to access and change wifi or a bad initialization"); + return mAsyncChannel; } /** @@ -2016,10 +2009,9 @@ public class WifiManager { */ public void connect(WifiConfiguration config, ActionListener listener) { if (config == null) throw new IllegalArgumentException("config cannot be null"); - validateChannel(); // Use INVALID_NETWORK_ID for arg1 when passing a config object // arg1 is used to pass network id when the network already exists - mAsyncChannel.sendMessage(CONNECT_NETWORK, WifiConfiguration.INVALID_NETWORK_ID, + getChannel().sendMessage(CONNECT_NETWORK, WifiConfiguration.INVALID_NETWORK_ID, putListener(listener), config); } @@ -2038,8 +2030,7 @@ public class WifiManager { */ public void connect(int networkId, ActionListener listener) { if (networkId < 0) throw new IllegalArgumentException("Network id cannot be negative"); - validateChannel(); - mAsyncChannel.sendMessage(CONNECT_NETWORK, networkId, putListener(listener)); + getChannel().sendMessage(CONNECT_NETWORK, networkId, putListener(listener)); } /** @@ -2062,8 +2053,7 @@ public class WifiManager { */ public void save(WifiConfiguration config, ActionListener listener) { if (config == null) throw new IllegalArgumentException("config cannot be null"); - validateChannel(); - mAsyncChannel.sendMessage(SAVE_NETWORK, 0, putListener(listener), config); + getChannel().sendMessage(SAVE_NETWORK, 0, putListener(listener), config); } /** @@ -2081,8 +2071,7 @@ public class WifiManager { */ public void forget(int netId, ActionListener listener) { if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative"); - validateChannel(); - mAsyncChannel.sendMessage(FORGET_NETWORK, netId, putListener(listener)); + getChannel().sendMessage(FORGET_NETWORK, netId, putListener(listener)); } /** @@ -2096,8 +2085,7 @@ public class WifiManager { */ public void disable(int netId, ActionListener listener) { if (netId < 0) throw new IllegalArgumentException("Network id cannot be negative"); - validateChannel(); - mAsyncChannel.sendMessage(DISABLE_NETWORK, netId, putListener(listener)); + getChannel().sendMessage(DISABLE_NETWORK, netId, putListener(listener)); } /** @@ -2125,8 +2113,7 @@ public class WifiManager { */ public void startWps(WpsInfo config, WpsCallback listener) { if (config == null) throw new IllegalArgumentException("config cannot be null"); - validateChannel(); - mAsyncChannel.sendMessage(START_WPS, 0, putListener(listener), config); + getChannel().sendMessage(START_WPS, 0, putListener(listener), config); } /** @@ -2137,8 +2124,7 @@ public class WifiManager { * initialized again */ public void cancelWps(WpsCallback listener) { - validateChannel(); - mAsyncChannel.sendMessage(CANCEL_WPS, 0, putListener(listener)); + getChannel().sendMessage(CANCEL_WPS, 0, putListener(listener)); } /** @@ -2153,8 +2139,6 @@ public class WifiManager { return mService.getWifiServiceMessenger(); } catch (RemoteException e) { throw e.rethrowFromSystemServer(); - } catch (SecurityException e) { - return null; } } |
