Merge "Removed the Content Capture blacklist APIs."
diff --git a/Android.bp b/Android.bp
index c6cf75d..8d25704 100644
--- a/Android.bp
+++ b/Android.bp
@@ -117,7 +117,6 @@
"core/java/android/app/timedetector/ITimeDetectorService.aidl",
"core/java/android/app/timezone/ICallback.aidl",
"core/java/android/app/timezone/IRulesManager.aidl",
- "core/java/android/app/timezonedetector/ITimeZoneDetectorService.aidl",
"core/java/android/app/usage/ICacheQuotaService.aidl",
"core/java/android/app/usage/IStorageStatsManager.aidl",
"core/java/android/app/usage/IUsageStatsManager.aidl",
@@ -735,6 +734,7 @@
no_framework_libs: true,
libs: [
"ext",
+ "updatable_media_stubs",
],
jarjar_rules: "jarjar_rules_hidl.txt",
@@ -746,6 +746,7 @@
"game-driver-protos",
"mediaplayer2-protos",
"android.hidl.base-V1.0-java",
+ "android.hardware.cas-V1.1-java",
"android.hardware.cas-V1.0-java",
"android.hardware.contexthub-V1.0-java",
"android.hardware.health-V1.0-java-constants",
@@ -1296,7 +1297,7 @@
":non_openjdk_javadoc_files",
":android_icu4j_src_files_for_docs",
":conscrypt_public_api_files",
- ":media-srcs-without-aidls",
+ ":updatable-media-srcs-without-aidls",
"test-mock/src/**/*.java",
"test-runner/src/**/*.java",
],
@@ -1358,7 +1359,7 @@
":non_openjdk_javadoc_files",
":android_icu4j_src_files_for_docs",
":conscrypt_public_api_files",
- ":media-srcs-without-aidls",
+ ":updatable-media-srcs-without-aidls",
],
srcs_lib: "framework",
srcs_lib_whitelist_dirs: frameworks_base_subdirs,
diff --git a/apct-tests/perftests/core/src/android/os/KernelCpuThreadReaderPerfTest.java b/apct-tests/perftests/core/src/android/os/KernelCpuThreadReaderPerfTest.java
index 11c7599..9234849 100644
--- a/apct-tests/perftests/core/src/android/os/KernelCpuThreadReaderPerfTest.java
+++ b/apct-tests/perftests/core/src/android/os/KernelCpuThreadReaderPerfTest.java
@@ -39,7 +39,8 @@
@Rule
public final PerfStatusReporter mPerfStatusReporter = new PerfStatusReporter();
- private final KernelCpuThreadReader mKernelCpuThreadReader = KernelCpuThreadReader.create();
+ private final KernelCpuThreadReader mKernelCpuThreadReader =
+ KernelCpuThreadReader.create(8, uid -> 1000 <= uid && uid < 2000);
@Test
public void timeReadCurrentProcessCpuUsage() {
diff --git a/api/current.txt b/api/current.txt
index cb62ffc..ab18d72 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -1511,6 +1511,7 @@
field public static final int use32bitAbi = 16844053; // 0x1010515
field public static final int useAppZygote = 16844184; // 0x1010598
field public static final int useDefaultMargins = 16843641; // 0x1010379
+ field public static final int useEmbeddedDex = 16844196; // 0x10105a4
field public static final int useIntrinsicSizeAsMinimum = 16843536; // 0x1010310
field public static final int useLevel = 16843167; // 0x101019f
field public static final int userVisible = 16843409; // 0x1010291
@@ -11323,7 +11324,7 @@
public final class ModuleInfo implements android.os.Parcelable {
method public int describeContents();
- method @Nullable public String getName();
+ method @Nullable public CharSequence getName();
method @Nullable public String getPackageName();
method public boolean isHidden();
method public void writeToParcel(android.os.Parcel, int);
@@ -11464,11 +11465,12 @@
method public boolean isSessionReady();
method public boolean isStaged();
method public void writeToParcel(android.os.Parcel, int);
- field public static final int ACTIVATION_FAILED = 2; // 0x2
field public static final android.os.Parcelable.Creator<android.content.pm.PackageInstaller.SessionInfo> CREATOR;
field public static final int INVALID_ID = -1; // 0xffffffff
- field public static final int NO_ERROR = 0; // 0x0
- field public static final int VERIFICATION_FAILED = 1; // 0x1
+ field public static final int STAGED_SESSION_ACTIVATION_FAILED = 2; // 0x2
+ field public static final int STAGED_SESSION_NO_ERROR = 0; // 0x0
+ field public static final int STAGED_SESSION_UNKNOWN = 3; // 0x3
+ field public static final int STAGED_SESSION_VERIFICATION_FAILED = 1; // 0x1
}
public static class PackageInstaller.SessionParams implements android.os.Parcelable {
@@ -12387,7 +12389,7 @@
method public String getPositionDescription();
method @AnyRes public int getResourceId(@StyleableRes int, int);
method public android.content.res.Resources getResources();
- method @StyleRes public int getSourceStyleResourceId(@StyleableRes int, @StyleRes int);
+ method @StyleRes public int getSourceResourceId(@StyleableRes int, @StyleRes int);
method @Nullable public String getString(@StyleableRes int);
method public CharSequence getText(@StyleableRes int);
method public CharSequence[] getTextArray(@StyleableRes int);
@@ -24049,7 +24051,8 @@
}
public static interface MediaCas.EventListener {
- method public void onEvent(android.media.MediaCas, int, int, @Nullable byte[]);
+ method public void onEvent(@NonNull android.media.MediaCas, int, int, @Nullable byte[]);
+ method public default void onSessionEvent(@NonNull android.media.MediaCas, @NonNull android.media.MediaCas.Session, int, int, @Nullable byte[]);
}
public static class MediaCas.PluginDescriptor {
@@ -24061,6 +24064,7 @@
method public void close();
method public void processEcm(@NonNull byte[], int, int) throws android.media.MediaCasException;
method public void processEcm(@NonNull byte[]) throws android.media.MediaCasException;
+ method public void sendSessionEvent(int, int, @Nullable byte[]) throws android.media.MediaCasException;
method public void setPrivateData(@NonNull byte[]) throws android.media.MediaCasException;
}
@@ -27523,7 +27527,6 @@
method @NonNull public java.util.List<android.media.Session2Token> getSession2Tokens();
method public boolean isTrustedForMediaControl(@NonNull android.media.session.MediaSessionManager.RemoteUserInfo);
method public void notifySession2Created(@NonNull android.media.Session2Token);
- method public void notifySession2Destroyed(@NonNull android.media.Session2Token);
method public void removeOnActiveSessionsChangedListener(@NonNull android.media.session.MediaSessionManager.OnActiveSessionsChangedListener);
method public void removeOnSession2TokensChangedListener(@NonNull android.media.session.MediaSessionManager.OnSession2TokensChangedListener);
}
@@ -30577,6 +30580,7 @@
method public int getNumSuccessfulMeasurements();
method @Nullable public android.net.wifi.aware.PeerHandle getPeerHandle();
method public long getRangingTimestampMillis();
+ method @Nullable public android.net.wifi.rtt.ResponderLocation getResponderLocation();
method public int getRssi();
method public int getStatus();
method public void writeToParcel(android.os.Parcel, int);
@@ -30594,6 +30598,64 @@
field public static final int STATUS_CODE_FAIL_RTT_NOT_AVAILABLE = 2; // 0x2
}
+ public final class ResponderLocation implements android.os.Parcelable {
+ method public int describeContents();
+ method public double getAltitude();
+ method public int getAltitudeType();
+ method public double getAltitudeUncertainty();
+ method public java.util.List<android.net.MacAddress> getColocatedBssids();
+ method public int getDatum();
+ method public int getExpectedToMove();
+ method public double getLatitude();
+ method public double getLatitudeUncertainty();
+ method public int getLciFlags();
+ method public double getLongitude();
+ method public double getLongitudeUncertainty();
+ method public int getMapImageType();
+ method @Nullable public java.net.URL getMapImageUrl();
+ method public double getStaFloorNumber();
+ method public double getStaHeightAboveFloorMeters();
+ method public double getStaHeightAboveFloorUncertaintyMeters();
+ method public boolean isLciSubelementValid();
+ method public boolean isZsubelementValid();
+ method public void writeToParcel(android.os.Parcel, int);
+ field public static final int ALTITUDE_FLOORS = 2; // 0x2
+ field public static final int ALTITUDE_METERS = 1; // 0x1
+ field public static final int ALTITUDE_UNDEFINED = 0; // 0x0
+ field public static final android.os.Parcelable.Creator<android.net.wifi.rtt.ResponderLocation> CREATOR;
+ field public static final int DATUM_NAD83_MLLW = 3; // 0x3
+ field public static final int DATUM_NAD83_NAV88 = 2; // 0x2
+ field public static final int DATUM_UNDEFINED = 0; // 0x0
+ field public static final int DATUM_WGS84 = 1; // 0x1
+ field public static final int LCI_FLAGS_MASK_DEPENDENT_STA = 4; // 0x4
+ field public static final int LCI_FLAGS_MASK_REGLOC_AGREEMENT = 16; // 0x10
+ field public static final int LCI_FLAGS_MASK_REGLOC_DSE = 8; // 0x8
+ field public static final int LCI_FLAGS_MASK_VERSION = 3; // 0x3
+ field public static final int LCI_VERSION_1 = 1; // 0x1
+ field public static final int LOCATION_FIXED = 0; // 0x0
+ field public static final int LOCATION_MOVEMENT_UNKNOWN = 2; // 0x2
+ field public static final int LOCATION_RESERVED = 3; // 0x3
+ field public static final int LOCATION_VARIABLE = 1; // 0x1
+ field public static final int MAP_TYPE_BMP = 12; // 0xc
+ field public static final int MAP_TYPE_CAD = 8; // 0x8
+ field public static final int MAP_TYPE_DWF = 7; // 0x7
+ field public static final int MAP_TYPE_DWG = 6; // 0x6
+ field public static final int MAP_TYPE_DXF = 5; // 0x5
+ field public static final int MAP_TYPE_GIF = 2; // 0x2
+ field public static final int MAP_TYPE_GML = 10; // 0xa
+ field public static final int MAP_TYPE_ICO = 17; // 0x11
+ field public static final int MAP_TYPE_JPG = 3; // 0x3
+ field public static final int MAP_TYPE_KML = 11; // 0xb
+ field public static final int MAP_TYPE_PGM = 13; // 0xd
+ field public static final int MAP_TYPE_PNG = 1; // 0x1
+ field public static final int MAP_TYPE_PPM = 14; // 0xe
+ field public static final int MAP_TYPE_SVG = 4; // 0x4
+ field public static final int MAP_TYPE_TIFF = 9; // 0x9
+ field public static final int MAP_TYPE_URL_DEFINED = 0; // 0x0
+ field public static final int MAP_TYPE_XBM = 15; // 0xf
+ field public static final int MAP_TYPE_XPM = 16; // 0x10
+ }
+
public class WifiRttManager {
method public boolean isAvailable();
method @RequiresPermission(allOf={android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_WIFI_STATE}) public void startRanging(@NonNull android.net.wifi.rtt.RangingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.rtt.RangingResultCallback);
@@ -43848,12 +43910,12 @@
public class TelecomManager {
method public void acceptHandover(android.net.Uri, int, android.telecom.PhoneAccountHandle);
- method @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall();
- method @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall(int);
+ method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall();
+ method @Deprecated @RequiresPermission(anyOf={android.Manifest.permission.ANSWER_PHONE_CALLS, android.Manifest.permission.MODIFY_PHONE_STATE}) public void acceptRingingCall(int);
method public void addNewIncomingCall(android.telecom.PhoneAccountHandle, android.os.Bundle);
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public void cancelMissedCallsNotification();
method public android.content.Intent createManageBlockedNumbersIntent();
- method @RequiresPermission(android.Manifest.permission.ANSWER_PHONE_CALLS) public boolean endCall();
+ method @Deprecated @RequiresPermission(android.Manifest.permission.ANSWER_PHONE_CALLS) public boolean endCall();
method @RequiresPermission(android.Manifest.permission.MODIFY_PHONE_STATE) public android.net.Uri getAdnUriForPhoneAccount(android.telecom.PhoneAccountHandle);
method @RequiresPermission(android.Manifest.permission.READ_PHONE_STATE) public java.util.List<android.telecom.PhoneAccountHandle> getCallCapablePhoneAccounts();
method public String getDefaultDialerPackage();
@@ -48449,6 +48511,7 @@
method public static boolean logEvent(int);
method public static boolean logStart(int);
method public static boolean logStop(int);
+ method public static void write(int, @NonNull java.lang.Object...);
}
public class StringBuilderPrinter implements android.util.Printer {
@@ -48534,7 +48597,7 @@
field public int data;
field public int density;
field @AnyRes public int resourceId;
- field public int sourceStyleResourceId;
+ field public int sourceResourceId;
field public CharSequence string;
field public int type;
}
@@ -51028,6 +51091,7 @@
public class ViewConfiguration {
ctor @Deprecated public ViewConfiguration();
method public static android.view.ViewConfiguration get(android.content.Context);
+ method @FloatRange(from=1.0) public static float getAmbiguousGestureMultiplier();
method public static long getDefaultActionModeHideDuration();
method public static int getDoubleTapTimeout();
method @Deprecated public static int getEdgeSlop();
@@ -53343,6 +53407,11 @@
package android.view.inspector {
+ public class GeneratedInspectionCompanionProvider implements android.view.inspector.InspectionCompanionProvider {
+ ctor public GeneratedInspectionCompanionProvider();
+ method @Nullable public <T> android.view.inspector.InspectionCompanion<T> provide(@NonNull Class<T>);
+ }
+
public interface InspectionCompanion<T> {
method @Nullable public default String getNodeName();
method public void mapProperties(@NonNull android.view.inspector.PropertyMapper);
@@ -53353,6 +53422,10 @@
ctor public InspectionCompanion.UninitializedPropertyMapException();
}
+ public interface InspectionCompanionProvider {
+ method @Nullable public <T> android.view.inspector.InspectionCompanion<T> provide(@NonNull Class<T>);
+ }
+
public final class IntEnumMapping {
method @Nullable public String get(int);
}
diff --git a/api/system-current.txt b/api/system-current.txt
index 3205db7..7bc2c81 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -518,7 +518,7 @@
method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public byte[] getStatsMetadata() throws android.app.StatsManager.StatsUnavailableException;
method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void removeConfig(long) throws android.app.StatsManager.StatsUnavailableException;
method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public boolean removeConfiguration(long);
- method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void setActiveConfigsChangedOperation(@Nullable android.app.PendingIntent) throws android.app.StatsManager.StatsUnavailableException;
+ method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public long[] setActiveConfigsChangedOperation(@Nullable android.app.PendingIntent) throws android.app.StatsManager.StatsUnavailableException;
method @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public void setBroadcastSubscriber(android.app.PendingIntent, long, long) throws android.app.StatsManager.StatsUnavailableException;
method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public boolean setBroadcastSubscriber(long, long, android.app.PendingIntent);
method @Deprecated @RequiresPermission(allOf={android.Manifest.permission.DUMP, android.Manifest.permission.PACKAGE_USAGE_STATS}) public boolean setDataFetchOperation(long, android.app.PendingIntent);
@@ -1127,6 +1127,7 @@
method public String getNotificationChannelId();
method @Nullable public String getTaskRootClassName();
method @Nullable public String getTaskRootPackageName();
+ method public boolean isInstantApp();
field public static final int NOTIFICATION_INTERRUPTION = 12; // 0xc
field public static final int NOTIFICATION_SEEN = 10; // 0xa
field public static final int SLICE_PINNED = 14; // 0xe
@@ -1318,6 +1319,32 @@
method public void sendOrderedBroadcast(android.content.Intent, String, android.os.Bundle, android.content.BroadcastReceiver, android.os.Handler, int, String, android.os.Bundle);
}
+ public class DynamicAndroidClient {
+ ctor public DynamicAndroidClient(@NonNull android.content.Context);
+ method public void bind();
+ method public void setOnStatusChangedListener(@NonNull android.content.DynamicAndroidClient.OnStatusChangedListener, @NonNull java.util.concurrent.Executor);
+ method public void setOnStatusChangedListener(@NonNull android.content.DynamicAndroidClient.OnStatusChangedListener);
+ method public void start(String, long);
+ method public void start(String, long, long);
+ method public void unbind();
+ field public static final int CAUSE_ERROR_EXCEPTION = 6; // 0x6
+ field public static final int CAUSE_ERROR_INVALID_URL = 4; // 0x4
+ field public static final int CAUSE_ERROR_IO = 3; // 0x3
+ field public static final int CAUSE_ERROR_IPC = 5; // 0x5
+ field public static final int CAUSE_INSTALL_CANCELLED = 2; // 0x2
+ field public static final int CAUSE_INSTALL_COMPLETED = 1; // 0x1
+ field public static final int CAUSE_NOT_SPECIFIED = 0; // 0x0
+ field public static final int STATUS_IN_PROGRESS = 2; // 0x2
+ field public static final int STATUS_IN_USE = 4; // 0x4
+ field public static final int STATUS_NOT_STARTED = 1; // 0x1
+ field public static final int STATUS_READY = 3; // 0x3
+ field public static final int STATUS_UNKNOWN = 0; // 0x0
+ }
+
+ public static interface DynamicAndroidClient.OnStatusChangedListener {
+ method public void onStatusChanged(int, int, long);
+ }
+
public class Intent implements java.lang.Cloneable android.os.Parcelable {
field public static final String ACTION_BATTERY_LEVEL_CHANGED = "android.intent.action.BATTERY_LEVEL_CHANGED";
field public static final String ACTION_CALL_EMERGENCY = "android.intent.action.CALL_EMERGENCY";
@@ -1639,6 +1666,7 @@
public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
field public static final int FLAG_REMOVED = 2; // 0x2
+ field public static final int PROTECTION_FLAG_APP_PREDICTOR = 2097152; // 0x200000
field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000
field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000
field public static final int PROTECTION_FLAG_INCIDENT_REPORT_APPROVER = 1048576; // 0x100000
@@ -1815,7 +1843,9 @@
field public static final android.os.Parcelable.Creator<android.hardware.display.BrightnessChangeEvent> CREATOR;
field public final float batteryLevel;
field public final float brightness;
+ field public final long colorSampleDuration;
field public final int colorTemperature;
+ field @Nullable public final long[] colorValueBuckets;
field public final boolean isDefaultBrightnessConfig;
field public final boolean isUserSetBrightness;
field public final float lastBrightness;
@@ -3292,6 +3322,7 @@
method public boolean isLocationControllerExtraPackageEnabled();
method public boolean isLocationEnabledForUser(android.os.UserHandle);
method public boolean isProviderEnabledForUser(String, android.os.UserHandle);
+ method public boolean isProviderPackage(String);
method @RequiresPermission(android.Manifest.permission.LOCATION_HARDWARE) public boolean registerGnssBatchedLocationCallback(long, boolean, android.location.BatchedLocationCallback, android.os.Handler);
method @Deprecated public void removeGpsMeasurementListener(android.location.GpsMeasurementsEvent.Listener);
method @Deprecated public void removeGpsNavigationMessageListener(android.location.GpsNavigationMessageEvent.Listener);
@@ -3461,15 +3492,6 @@
method public void stop();
}
- public final class Session2Token implements android.os.Parcelable {
- ctor public Session2Token(@NonNull android.content.Context, @NonNull String, @Nullable android.os.Bundle);
- method public void destroy();
- method @NonNull public android.os.Bundle getExtras();
- method public int getPid();
- method public boolean isDestroyed();
- field public static final String SESSION_SERVICE_INTERFACE = "android.media.MediaSession2Service";
- }
-
public static class SubtitleData.Builder {
ctor public SubtitleData.Builder();
ctor public SubtitleData.Builder(@NonNull android.media.SubtitleData);
@@ -4922,6 +4944,10 @@
field public final boolean supports80211mc;
}
+ public final class ResponderLocation implements android.os.Parcelable {
+ method public boolean getExtraInfoOnAssociationIndication();
+ }
+
public class WifiRttManager {
method @RequiresPermission(allOf={android.Manifest.permission.LOCATION_HARDWARE}) public void cancelRanging(@Nullable android.os.WorkSource);
method @RequiresPermission(allOf={android.Manifest.permission.LOCATION_HARDWARE, android.Manifest.permission.ACCESS_FINE_LOCATION, android.Manifest.permission.CHANGE_WIFI_STATE, android.Manifest.permission.ACCESS_WIFI_STATE}) public void startRanging(@Nullable android.os.WorkSource, @NonNull android.net.wifi.rtt.RangingRequest, @NonNull java.util.concurrent.Executor, @NonNull android.net.wifi.rtt.RangingResultCallback);
@@ -5501,6 +5527,8 @@
public final class PermissionControllerManager {
method @RequiresPermission(android.Manifest.permission.REVOKE_RUNTIME_PERMISSIONS) public void revokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull java.util.concurrent.Executor, @NonNull android.permission.PermissionControllerManager.OnRevokeRuntimePermissionsCallback);
+ field public static final int COUNT_ONLY_WHEN_GRANTED = 1; // 0x1
+ field public static final int COUNT_WHEN_SYSTEM = 2; // 0x2
field public static final int REASON_INSTALLER_POLICY_VIOLATION = 2; // 0x2
field public static final int REASON_MALWARE = 1; // 0x1
}
@@ -5514,11 +5542,13 @@
ctor public PermissionControllerService();
method public final void attachBaseContext(android.content.Context);
method public final android.os.IBinder onBind(android.content.Intent);
- method public abstract int onCountPermissionApps(@NonNull java.util.List<java.lang.String>, boolean, boolean);
+ method public abstract int onCountPermissionApps(@NonNull java.util.List<java.lang.String>, int);
method @NonNull public abstract java.util.List<android.permission.RuntimePermissionPresentationInfo> onGetAppPermissions(@NonNull String);
method @NonNull public abstract java.util.List<android.permission.RuntimePermissionUsageInfo> onGetPermissionUsages(boolean, long);
method public abstract void onGetRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.OutputStream);
method public abstract boolean onIsApplicationQualifiedForRole(@NonNull String, @NonNull String);
+ method @BinderThread public abstract boolean onRestoreDelayedRuntimePermissionsBackup(@NonNull String, @NonNull android.os.UserHandle);
+ method @BinderThread public abstract void onRestoreRuntimePermissionsBackup(@NonNull android.os.UserHandle, @NonNull java.io.InputStream);
method public abstract void onRevokeRuntimePermission(@NonNull String, @NonNull String);
method @NonNull public abstract java.util.Map<java.lang.String,java.util.List<java.lang.String>> onRevokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull String);
field public static final String SERVICE_INTERFACE = "android.permission.PermissionControllerService";
@@ -9181,6 +9211,21 @@
method public int getUid();
}
+ public class StatsLogAtoms {
+ field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED = 170; // 0xaa
+ field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_DENIED = 8; // 0x8
+ field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_GRANTED = 5; // 0x5
+ field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED = 1; // 0x1
+ field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED = 3; // 0x3
+ field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED = 2; // 0x2
+ field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED = 6; // 0x6
+ field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_PREJUDICE = 7; // 0x7
+ field public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED = 4; // 0x4
+ }
+
+ @java.lang.annotation.Retention(java.lang.annotation.RetentionPolicy.SOURCE) @IntDef(prefix="PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__", value={android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_GRANTED, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_PREJUDICE, android.util.StatsLogAtoms.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_DENIED}) public static @interface StatsLogAtoms.PermissionGrantRequestResultReported_Result {
+ }
+
}
package android.view {
diff --git a/api/test-current.txt b/api/test-current.txt
index 9023a85..2a9a149 100644
--- a/api/test-current.txt
+++ b/api/test-current.txt
@@ -521,6 +521,7 @@
}
public class PermissionInfo extends android.content.pm.PackageItemInfo implements android.os.Parcelable {
+ field public static final int PROTECTION_FLAG_APP_PREDICTOR = 2097152; // 0x200000
field public static final int PROTECTION_FLAG_CONFIGURATOR = 524288; // 0x80000
field public static final int PROTECTION_FLAG_DOCUMENTER = 262144; // 0x40000
field public static final int PROTECTION_FLAG_INCIDENT_REPORT_APPROVER = 1048576; // 0x100000
@@ -659,7 +660,9 @@
field public static final android.os.Parcelable.Creator<android.hardware.display.BrightnessChangeEvent> CREATOR;
field public final float batteryLevel;
field public final float brightness;
+ field public final long colorSampleDuration;
field public final int colorTemperature;
+ field @Nullable public final long[] colorValueBuckets;
field public final boolean isDefaultBrightnessConfig;
field public final boolean isUserSetBrightness;
field public final float lastBrightness;
@@ -1691,6 +1694,8 @@
public final class PermissionControllerManager {
method @RequiresPermission("android.permission.REVOKE_RUNTIME_PERMISSIONS") public void revokeRuntimePermissions(@NonNull java.util.Map<java.lang.String,java.util.List<java.lang.String>>, boolean, int, @NonNull java.util.concurrent.Executor, @NonNull android.permission.PermissionControllerManager.OnRevokeRuntimePermissionsCallback);
+ field public static final int COUNT_ONLY_WHEN_GRANTED = 1; // 0x1
+ field public static final int COUNT_WHEN_SYSTEM = 2; // 0x2
field public static final int REASON_INSTALLER_POLICY_VIOLATION = 2; // 0x2
field public static final int REASON_MALWARE = 1; // 0x1
}
diff --git a/cmds/statsd/src/atoms.proto b/cmds/statsd/src/atoms.proto
index 937588b..5f47e06 100644
--- a/cmds/statsd/src/atoms.proto
+++ b/cmds/statsd/src/atoms.proto
@@ -235,6 +235,9 @@
BluetoothClassicPairingEventReported bluetooth_classic_pairing_event_reported = 166;
BluetoothSmpPairingEventReported bluetooth_smp_pairing_event_reported = 167;
ScreenTimeoutExtensionReported screen_timeout_extension_reported = 168;
+ ProcessStartTime process_start_time = 169;
+ PermissionGrantRequestResultReported permission_grant_request_result_reported = 170;
+ BluetoothSocketConnectionStateChanged bluetooth_socket_connection_state_changed = 171;
}
// Pulled events will start at field 10000.
@@ -290,6 +293,7 @@
DebugFailingElapsedClock debug_failing_elapsed_clock = 10047;
NumBiometricsEnrolled num_faces_enrolled = 10048;
RoleHolder role_holder = 10049;
+ DangerousPermissionState dangerous_permission_state = 10050;
}
// DO NOT USE field numbers above 100,000 in AOSP.
@@ -2065,6 +2069,36 @@
}
/**
+ * Logs when a Bluetooth socket’s connection state changed
+ *
+ * Logged from:
+ * system/bt
+ */
+message BluetoothSocketConnectionStateChanged {
+ // An identifier that can be used to match events for this device.
+ // Currently, this is a salted hash of the MAC address of this Bluetooth device.
+ // Salt: Randomly generated 256 bit value
+ // Hash algorithm: HMAC-SHA256
+ // Size: 32 byte
+ // Default: null or empty if the device identifier is not known
+ optional bytes obfuscated_id = 1 [(android.os.statsd.log_mode) = MODE_BYTES];
+ // Port of this socket
+ // Default 0 when unknown or don't care
+ optional int32 port = 2;
+ // Socket type as mentioned in
+ // frameworks/base/core/java/android/bluetooth/BluetoothSocket.java
+ // Default: SOCKET_TYPE_UNKNOWN
+ optional android.bluetooth.SocketTypeEnum type = 3;
+ // Socket connection state
+ // Default: SOCKET_CONNECTION_STATE_UNKNOWN
+ optional android.bluetooth.SocketConnectionstateEnum state = 4;
+ // Number of bytes sent to remote device during this connection
+ optional int64 tx_bytes = 5;
+ // Number of bytes received from remote device during this connection
+ optional int64 rx_bytes = 6;
+}
+
+/**
* Logs when something is plugged into or removed from the USB-C connector.
*
* Logged from:
@@ -5096,6 +5130,48 @@
}
/**
+ * Information about a permission grant request
+ */
+message PermissionGrantRequestResultReported {
+ // unique value identifying an API call. A API call might result in multiple of these atoms
+ optional int64 request_id = 1;
+
+ // UID of package requesting the permission grant
+ optional int32 requesting_uid = 2 [(is_uid) = true];
+
+ // Name of package requesting the permission grant
+ optional string requesting_package_name = 3;
+
+ // The permission to be granted
+ optional string permission_name = 4;
+
+ // If the permission was explicitly requested via the API or added by the system
+ optional bool is_implicit = 5;
+
+ enum Result {
+ UNDEFINED = 0;
+ // permission request was ignored
+ IGNORED = 1;
+ // permission request was ignored because it was user fixed
+ IGNORED_USER_FIXED = 2;
+ // permission request was ignored because it was policy fixed
+ IGNORED_POLICY_FIXED = 3;
+ // permission was granted by user action
+ USER_GRANTED = 4;
+ // permission was automatically granted
+ AUTO_GRANTED = 5;
+ // permission was denied by user action
+ USER_DENIED = 6;
+ // permission was denied with prejudice by the user
+ USER_DENIED_WITH_PREJUDICE = 7;
+ // permission was automatically denied
+ AUTO_DENIED = 8;
+ }
+ // The result of the permission grant
+ optional Result result = 6;
+}
+
+/**
* Logs when Omapi API used
* Logged from:
* packages/apps/SecureElement/src/com/android/se/Terminal.java
@@ -5304,3 +5380,76 @@
// Describes how many times in a row did the power manager reset the screen off timeout.
optional uint32 consecutive_timeout_extended_count = 1;
}
+
+/*
+* Logs number of milliseconds it takes to start a process.
+* The definition of app process start time is from the app launch time to
+* the time that Zygote finished forking the app process and loaded the
+* application package's java classes.
+
+* This metric is different from AppStartOccurred which is for foreground
+* activity only.
+
+* ProcessStartTime can report all processes (both foreground and background)
+* start time.
+*
+* Logged from:
+* frameworks/base/services/core/java/com/android/server/am/ActivityManagerService.java
+*/
+message ProcessStartTime {
+ // The uid of the ProcessRecord.
+ optional int32 uid = 1 [(is_uid) = true];
+
+ // The process pid.
+ optional int32 pid = 2;
+
+ // The process name.
+ // Usually package name, "system" for system server.
+ // Provided by ActivityManagerService.
+ optional string process_name = 3;
+
+ enum StartType {
+ UNKNOWN = 0;
+ WARM = 1;
+ HOT = 2;
+ COLD = 3;
+ }
+
+ // The start type.
+ optional StartType type = 4;
+
+ // The elapsed realtime at the start of the process.
+ optional int64 process_start_time_millis = 5;
+
+ // Number of milliseconds it takes to reach bind application.
+ optional int32 bind_application_delay_millis = 6;
+
+ // Number of milliseconds it takes to finish start of the process.
+ optional int32 process_start_delay_millis = 7;
+
+ // hostingType field in ProcessRecord, the component type such as "activity",
+ // "service", "content provider", "broadcast" or other strings.
+ optional string hosting_type = 8;
+
+ // hostingNameStr field in ProcessRecord. The component class name that runs
+ // in this process.
+ optional string hosting_name = 9;
+}
+
+/**
+ * State of a dangerous permission requested by a package
+ */
+message DangerousPermissionState {
+ // Name of the permission
+ optional string permission_name = 1;
+
+ // Uid of the package
+ optional int32 uid = 2 [(is_uid) = true];
+
+ // Package requesting the permission
+ optional string package_name = 3;
+
+ // If the permission is granted to the uid
+ optional bool is_granted = 4;
+}
+
diff --git a/cmds/statsd/src/external/StatsPullerManager.cpp b/cmds/statsd/src/external/StatsPullerManager.cpp
index 6f3eeaa..c69384c 100644
--- a/cmds/statsd/src/external/StatsPullerManager.cpp
+++ b/cmds/statsd/src/external/StatsPullerManager.cpp
@@ -223,6 +223,9 @@
// RoleHolder.
{android::util::ROLE_HOLDER,
{.puller = new StatsCompanionServicePuller(android::util::ROLE_HOLDER)}},
+ // PermissionState.
+ {android::util::DANGEROUS_PERMISSION_STATE,
+ {.puller = new StatsCompanionServicePuller(android::util::DANGEROUS_PERMISSION_STATE)}},
};
StatsPullerManager::StatsPullerManager() : mNextPullTimeNs(NO_ALARM_UPDATE) {
diff --git a/cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp b/cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp
index d5c358d..24a9980 100644
--- a/cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp
+++ b/cmds/statsd/tests/e2e/GaugeMetric_e2e_pull_test.cpp
@@ -31,8 +31,8 @@
StatsdConfig CreateStatsdConfig(const GaugeMetric::SamplingType sampling_type) {
StatsdConfig config;
config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.
- auto temperatureAtomMatcher = CreateTemperatureAtomMatcher();
- *config.add_atom_matcher() = temperatureAtomMatcher;
+ auto atomMatcher = CreateSimpleAtomMatcher("TestMatcher", android::util::SUBSYSTEM_SLEEP_STATE);
+ *config.add_atom_matcher() = atomMatcher;
*config.add_atom_matcher() = CreateScreenTurnedOnAtomMatcher();
*config.add_atom_matcher() = CreateScreenTurnedOffAtomMatcher();
@@ -41,12 +41,12 @@
auto gaugeMetric = config.add_gauge_metric();
gaugeMetric->set_id(123456);
- gaugeMetric->set_what(temperatureAtomMatcher.id());
+ gaugeMetric->set_what(atomMatcher.id());
gaugeMetric->set_condition(screenIsOffPredicate.id());
gaugeMetric->set_sampling_type(sampling_type);
gaugeMetric->mutable_gauge_fields_filter()->set_include_all(true);
*gaugeMetric->mutable_dimensions_in_what() =
- CreateDimensions(android::util::TEMPERATURE, {2/* sensor name field */ });
+ CreateDimensions(android::util::SUBSYSTEM_SLEEP_STATE, {1 /* subsystem name */});
gaugeMetric->set_bucket(FIVE_MINUTES);
gaugeMetric->set_max_pull_delay_sec(INT_MAX);
config.set_hash_strings_in_metric_report(false);
@@ -139,9 +139,9 @@
EXPECT_GT((int)gaugeMetrics.data_size(), 1);
auto data = gaugeMetrics.data(0);
- EXPECT_EQ(android::util::TEMPERATURE, data.dimensions_in_what().field());
+ EXPECT_EQ(android::util::SUBSYSTEM_SLEEP_STATE, data.dimensions_in_what().field());
EXPECT_EQ(1, data.dimensions_in_what().value_tuple().dimensions_value_size());
- EXPECT_EQ(2 /* sensor name field */,
+ EXPECT_EQ(1 /* subsystem name field */,
data.dimensions_in_what().value_tuple().dimensions_value(0).field());
EXPECT_FALSE(data.dimensions_in_what().value_tuple().dimensions_value(0).value_str().empty());
EXPECT_EQ(6, data.bucket_info_size());
@@ -152,8 +152,8 @@
EXPECT_EQ(0, data.bucket_info(0).wall_clock_timestamp_nanos_size());
EXPECT_EQ(baseTimeNs + 2 * bucketSizeNs, data.bucket_info(0).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 3 * bucketSizeNs, data.bucket_info(0).end_bucket_elapsed_nanos());
- EXPECT_TRUE(data.bucket_info(0).atom(0).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(0).atom(0).temperature().temperature_deci_celsius(), 0);
+ EXPECT_TRUE(data.bucket_info(0).atom(0).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(0).atom(0).subsystem_sleep_state().time_millis(), 0);
EXPECT_EQ(1, data.bucket_info(1).atom_size());
EXPECT_EQ(baseTimeNs + 3 * bucketSizeNs + 1,
@@ -161,8 +161,8 @@
EXPECT_EQ(configAddedTimeNs + 55, data.bucket_info(0).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 3 * bucketSizeNs, data.bucket_info(1).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 4 * bucketSizeNs, data.bucket_info(1).end_bucket_elapsed_nanos());
- EXPECT_TRUE(data.bucket_info(1).atom(0).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(1).atom(0).temperature().temperature_deci_celsius(), 0);
+ EXPECT_TRUE(data.bucket_info(1).atom(0).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(1).atom(0).subsystem_sleep_state().time_millis(), 0);
EXPECT_EQ(1, data.bucket_info(2).atom_size());
EXPECT_EQ(1, data.bucket_info(2).elapsed_timestamp_nanos_size());
@@ -170,8 +170,8 @@
data.bucket_info(2).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 4 * bucketSizeNs, data.bucket_info(2).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 5 * bucketSizeNs, data.bucket_info(2).end_bucket_elapsed_nanos());
- EXPECT_TRUE(data.bucket_info(2).atom(0).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(2).atom(0).temperature().temperature_deci_celsius(), 0);
+ EXPECT_TRUE(data.bucket_info(2).atom(0).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(2).atom(0).subsystem_sleep_state().time_millis(), 0);
EXPECT_EQ(1, data.bucket_info(3).atom_size());
EXPECT_EQ(1, data.bucket_info(3).elapsed_timestamp_nanos_size());
@@ -179,8 +179,8 @@
data.bucket_info(3).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 5 * bucketSizeNs, data.bucket_info(3).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 6 * bucketSizeNs, data.bucket_info(3).end_bucket_elapsed_nanos());
- EXPECT_TRUE(data.bucket_info(3).atom(0).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(3).atom(0).temperature().temperature_deci_celsius(), 0);
+ EXPECT_TRUE(data.bucket_info(3).atom(0).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(3).atom(0).subsystem_sleep_state().time_millis(), 0);
EXPECT_EQ(1, data.bucket_info(4).atom_size());
EXPECT_EQ(1, data.bucket_info(4).elapsed_timestamp_nanos_size());
@@ -188,8 +188,8 @@
data.bucket_info(4).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 7 * bucketSizeNs, data.bucket_info(4).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 8 * bucketSizeNs, data.bucket_info(4).end_bucket_elapsed_nanos());
- EXPECT_TRUE(data.bucket_info(4).atom(0).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(4).atom(0).temperature().temperature_deci_celsius(), 0);
+ EXPECT_TRUE(data.bucket_info(4).atom(0).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(4).atom(0).subsystem_sleep_state().time_millis(), 0);
EXPECT_EQ(1, data.bucket_info(5).atom_size());
EXPECT_EQ(1, data.bucket_info(5).elapsed_timestamp_nanos_size());
@@ -197,8 +197,8 @@
data.bucket_info(5).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 8 * bucketSizeNs, data.bucket_info(5).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 9 * bucketSizeNs, data.bucket_info(5).end_bucket_elapsed_nanos());
- EXPECT_TRUE(data.bucket_info(5).atom(0).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(5).atom(0).temperature().temperature_deci_celsius(), 0);
+ EXPECT_TRUE(data.bucket_info(5).atom(0).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(5).atom(0).subsystem_sleep_state().time_millis(), 0);
}
TEST(GaugeMetricE2eTest, TestConditionChangeToTrueSamplePulledEvents) {
@@ -262,9 +262,9 @@
EXPECT_GT((int)gaugeMetrics.data_size(), 1);
auto data = gaugeMetrics.data(0);
- EXPECT_EQ(android::util::TEMPERATURE, data.dimensions_in_what().field());
+ EXPECT_EQ(android::util::SUBSYSTEM_SLEEP_STATE, data.dimensions_in_what().field());
EXPECT_EQ(1, data.dimensions_in_what().value_tuple().dimensions_value_size());
- EXPECT_EQ(2 /* sensor name field */,
+ EXPECT_EQ(1 /* subsystem name field */,
data.dimensions_in_what().value_tuple().dimensions_value(0).field());
EXPECT_FALSE(data.dimensions_in_what().value_tuple().dimensions_value(0).value_str().empty());
EXPECT_EQ(3, data.bucket_info_size());
@@ -275,8 +275,8 @@
EXPECT_EQ(0, data.bucket_info(0).wall_clock_timestamp_nanos_size());
EXPECT_EQ(baseTimeNs + 2 * bucketSizeNs, data.bucket_info(0).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 3 * bucketSizeNs, data.bucket_info(0).end_bucket_elapsed_nanos());
- EXPECT_TRUE(data.bucket_info(0).atom(0).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(0).atom(0).temperature().temperature_deci_celsius(), 0);
+ EXPECT_TRUE(data.bucket_info(0).atom(0).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(0).atom(0).subsystem_sleep_state().time_millis(), 0);
EXPECT_EQ(1, data.bucket_info(1).atom_size());
EXPECT_EQ(baseTimeNs + 3 * bucketSizeNs + 100,
@@ -284,8 +284,8 @@
EXPECT_EQ(configAddedTimeNs + 55, data.bucket_info(0).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 3 * bucketSizeNs, data.bucket_info(1).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 4 * bucketSizeNs, data.bucket_info(1).end_bucket_elapsed_nanos());
- EXPECT_TRUE(data.bucket_info(1).atom(0).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(1).atom(0).temperature().temperature_deci_celsius(), 0);
+ EXPECT_TRUE(data.bucket_info(1).atom(0).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(1).atom(0).subsystem_sleep_state().time_millis(), 0);
EXPECT_EQ(2, data.bucket_info(2).atom_size());
EXPECT_EQ(2, data.bucket_info(2).elapsed_timestamp_nanos_size());
@@ -295,10 +295,10 @@
data.bucket_info(2).elapsed_timestamp_nanos(1));
EXPECT_EQ(baseTimeNs + 7 * bucketSizeNs, data.bucket_info(2).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 8 * bucketSizeNs, data.bucket_info(2).end_bucket_elapsed_nanos());
- EXPECT_TRUE(data.bucket_info(2).atom(0).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(2).atom(0).temperature().temperature_deci_celsius(), 0);
- EXPECT_TRUE(data.bucket_info(2).atom(1).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(2).atom(1).temperature().temperature_deci_celsius(), 0);
+ EXPECT_TRUE(data.bucket_info(2).atom(0).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(2).atom(0).subsystem_sleep_state().time_millis(), 0);
+ EXPECT_TRUE(data.bucket_info(2).atom(1).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(2).atom(1).subsystem_sleep_state().time_millis(), 0);
}
@@ -366,9 +366,9 @@
EXPECT_GT((int)gaugeMetrics.data_size(), 1);
auto data = gaugeMetrics.data(0);
- EXPECT_EQ(android::util::TEMPERATURE, data.dimensions_in_what().field());
+ EXPECT_EQ(android::util::SUBSYSTEM_SLEEP_STATE, data.dimensions_in_what().field());
EXPECT_EQ(1, data.dimensions_in_what().value_tuple().dimensions_value_size());
- EXPECT_EQ(2 /* sensor name field */,
+ EXPECT_EQ(1 /* subsystem name field */,
data.dimensions_in_what().value_tuple().dimensions_value(0).field());
EXPECT_FALSE(data.dimensions_in_what().value_tuple().dimensions_value(0).value_str().empty());
EXPECT_EQ(3, data.bucket_info_size());
@@ -378,8 +378,8 @@
EXPECT_EQ(configAddedTimeNs + 55, data.bucket_info(0).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 2 * bucketSizeNs, data.bucket_info(0).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 3 * bucketSizeNs, data.bucket_info(0).end_bucket_elapsed_nanos());
- EXPECT_TRUE(data.bucket_info(0).atom(0).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(0).atom(0).temperature().temperature_deci_celsius(), 0);
+ EXPECT_TRUE(data.bucket_info(0).atom(0).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(0).atom(0).subsystem_sleep_state().time_millis(), 0);
EXPECT_EQ(1, data.bucket_info(1).atom_size());
EXPECT_EQ(configAddedTimeNs + 3 * bucketSizeNs + 11,
@@ -387,8 +387,8 @@
EXPECT_EQ(configAddedTimeNs + 55, data.bucket_info(0).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 5 * bucketSizeNs, data.bucket_info(1).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 6 * bucketSizeNs, data.bucket_info(1).end_bucket_elapsed_nanos());
- EXPECT_TRUE(data.bucket_info(1).atom(0).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(1).atom(0).temperature().temperature_deci_celsius(), 0);
+ EXPECT_TRUE(data.bucket_info(1).atom(0).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(1).atom(0).subsystem_sleep_state().time_millis(), 0);
EXPECT_EQ(1, data.bucket_info(2).atom_size());
EXPECT_EQ(1, data.bucket_info(2).elapsed_timestamp_nanos_size());
@@ -396,9 +396,8 @@
data.bucket_info(2).elapsed_timestamp_nanos(0));
EXPECT_EQ(baseTimeNs + 6 * bucketSizeNs, data.bucket_info(2).start_bucket_elapsed_nanos());
EXPECT_EQ(baseTimeNs + 7 * bucketSizeNs, data.bucket_info(2).end_bucket_elapsed_nanos());
- EXPECT_TRUE(data.bucket_info(2).atom(0).temperature().sensor_name().empty());
- EXPECT_GT(data.bucket_info(2).atom(0).temperature().temperature_deci_celsius(), 0);
-
+ EXPECT_TRUE(data.bucket_info(2).atom(0).subsystem_sleep_state().subsystem_name().empty());
+ EXPECT_GT(data.bucket_info(2).atom(0).subsystem_sleep_state().time_millis(), 0);
}
#else
diff --git a/cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp b/cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp
index 370c36c..aee0c1f 100644
--- a/cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp
+++ b/cmds/statsd/tests/e2e/PartialBucket_e2e_test.cpp
@@ -70,18 +70,19 @@
StatsdConfig config;
config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.
- auto temperatureAtomMatcher = CreateTemperatureAtomMatcher();
- *config.add_atom_matcher() = temperatureAtomMatcher;
+ auto pulledAtomMatcher =
+ CreateSimpleAtomMatcher("TestMatcher", android::util::SUBSYSTEM_SLEEP_STATE);
+ *config.add_atom_matcher() = pulledAtomMatcher;
*config.add_atom_matcher() = CreateScreenTurnedOnAtomMatcher();
*config.add_atom_matcher() = CreateScreenTurnedOffAtomMatcher();
auto valueMetric = config.add_value_metric();
valueMetric->set_id(123456);
- valueMetric->set_what(temperatureAtomMatcher.id());
+ valueMetric->set_what(pulledAtomMatcher.id());
*valueMetric->mutable_value_field() =
- CreateDimensions(android::util::TEMPERATURE, {3 /* temperature degree field */});
+ CreateDimensions(android::util::SUBSYSTEM_SLEEP_STATE, {4 /* time sleeping field */});
*valueMetric->mutable_dimensions_in_what() =
- CreateDimensions(android::util::TEMPERATURE, {2 /* sensor name field */});
+ CreateDimensions(android::util::SUBSYSTEM_SLEEP_STATE, {1 /* subsystem name */});
valueMetric->set_bucket(FIVE_MINUTES);
valueMetric->set_min_bucket_size_nanos(minTime);
valueMetric->set_use_absolute_value_on_reset(true);
@@ -92,17 +93,18 @@
StatsdConfig config;
config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.
- auto temperatureAtomMatcher = CreateTemperatureAtomMatcher();
- *config.add_atom_matcher() = temperatureAtomMatcher;
+ auto pulledAtomMatcher =
+ CreateSimpleAtomMatcher("TestMatcher", android::util::SUBSYSTEM_SLEEP_STATE);
+ *config.add_atom_matcher() = pulledAtomMatcher;
*config.add_atom_matcher() = CreateScreenTurnedOnAtomMatcher();
*config.add_atom_matcher() = CreateScreenTurnedOffAtomMatcher();
auto gaugeMetric = config.add_gauge_metric();
gaugeMetric->set_id(123456);
- gaugeMetric->set_what(temperatureAtomMatcher.id());
+ gaugeMetric->set_what(pulledAtomMatcher.id());
gaugeMetric->mutable_gauge_fields_filter()->set_include_all(true);
*gaugeMetric->mutable_dimensions_in_what() =
- CreateDimensions(android::util::TEMPERATURE, {2 /* sensor name field */});
+ CreateDimensions(android::util::SUBSYSTEM_SLEEP_STATE, {1 /* subsystem name */});
gaugeMetric->set_bucket(FIVE_MINUTES);
gaugeMetric->set_min_bucket_size_nanos(minTime);
return config;
diff --git a/cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp b/cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp
index cab6eac..f3c4e12 100644
--- a/cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp
+++ b/cmds/statsd/tests/e2e/ValueMetric_pull_e2e_test.cpp
@@ -31,8 +31,9 @@
StatsdConfig CreateStatsdConfig() {
StatsdConfig config;
config.add_allowed_log_source("AID_ROOT"); // LogEvent defaults to UID of root.
- auto temperatureAtomMatcher = CreateTemperatureAtomMatcher();
- *config.add_atom_matcher() = temperatureAtomMatcher;
+ auto pulledAtomMatcher =
+ CreateSimpleAtomMatcher("TestMatcher", android::util::SUBSYSTEM_SLEEP_STATE);
+ *config.add_atom_matcher() = pulledAtomMatcher;
*config.add_atom_matcher() = CreateScreenTurnedOnAtomMatcher();
*config.add_atom_matcher() = CreateScreenTurnedOffAtomMatcher();
@@ -41,12 +42,12 @@
auto valueMetric = config.add_value_metric();
valueMetric->set_id(123456);
- valueMetric->set_what(temperatureAtomMatcher.id());
+ valueMetric->set_what(pulledAtomMatcher.id());
valueMetric->set_condition(screenIsOffPredicate.id());
*valueMetric->mutable_value_field() =
- CreateDimensions(android::util::TEMPERATURE, {3/* temperature degree field */ });
+ CreateDimensions(android::util::SUBSYSTEM_SLEEP_STATE, {4 /* time sleeping field */});
*valueMetric->mutable_dimensions_in_what() =
- CreateDimensions(android::util::TEMPERATURE, {2/* sensor name field */ });
+ CreateDimensions(android::util::SUBSYSTEM_SLEEP_STATE, {1 /* subsystem name */});
valueMetric->set_bucket(FIVE_MINUTES);
valueMetric->set_use_absolute_value_on_reset(true);
valueMetric->set_skip_zero_diff_output(false);
@@ -134,9 +135,9 @@
EXPECT_GT((int)valueMetrics.data_size(), 1);
auto data = valueMetrics.data(0);
- EXPECT_EQ(android::util::TEMPERATURE, data.dimensions_in_what().field());
+ EXPECT_EQ(android::util::SUBSYSTEM_SLEEP_STATE, data.dimensions_in_what().field());
EXPECT_EQ(1, data.dimensions_in_what().value_tuple().dimensions_value_size());
- EXPECT_EQ(2 /* sensor name field */,
+ EXPECT_EQ(1 /* subsystem name field */,
data.dimensions_in_what().value_tuple().dimensions_value(0).field());
EXPECT_FALSE(data.dimensions_in_what().value_tuple().dimensions_value(0).value_str().empty());
EXPECT_EQ(5, data.bucket_info_size());
@@ -241,9 +242,9 @@
EXPECT_GT((int)valueMetrics.data_size(), 1);
auto data = valueMetrics.data(0);
- EXPECT_EQ(android::util::TEMPERATURE, data.dimensions_in_what().field());
+ EXPECT_EQ(android::util::SUBSYSTEM_SLEEP_STATE, data.dimensions_in_what().field());
EXPECT_EQ(1, data.dimensions_in_what().value_tuple().dimensions_value_size());
- EXPECT_EQ(2 /* sensor name field */,
+ EXPECT_EQ(1 /* subsystem name field */,
data.dimensions_in_what().value_tuple().dimensions_value(0).field());
EXPECT_FALSE(data.dimensions_in_what().value_tuple().dimensions_value(0).value_str().empty());
EXPECT_EQ(3, data.bucket_info_size());
diff --git a/cmds/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java b/cmds/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java
index d9aba61..fc7b778 100644
--- a/cmds/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java
+++ b/cmds/statsd/tools/localtools/src/com/android/statsd/shelltools/testdrive/TestDrive.java
@@ -32,7 +32,8 @@
import java.io.File;
import java.io.IOException;
-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
@@ -60,6 +61,7 @@
};
private static final Logger LOGGER = Logger.getLogger(TestDrive.class.getName());
+ private String mAdditionalAllowedPackage;
private final Set<Long> mTrackedMetrics = new HashSet<>();
public static void main(String[] args) {
@@ -69,11 +71,16 @@
String remoteConfigPath = null;
if (args.length < 1) {
- LOGGER.log(Level.SEVERE, "Usage: ./test_drive <atomId1> <atomId2> ... <atomIdN>");
+ LOGGER.log(Level.SEVERE, "Usage: ./test_drive [-p additional_allowed_package] "
+ + "<atomId1> <atomId2> ... <atomIdN>");
return;
}
- for (int i = 0; i < args.length; i++) {
+ if (args.length >= 3 && args[0].equals("-p")) {
+ testDrive.mAdditionalAllowedPackage = args[1];
+ }
+
+ for (int i = testDrive.mAdditionalAllowedPackage == null ? 0 : 2; i < args.length; i++) {
try {
int atomId = Integer.valueOf(args[i]);
if (Atom.getDescriptor().findFieldByNumber(atomId) == null) {
@@ -137,9 +144,15 @@
long metricId = METRIC_ID_BASE;
long atomMatcherId = ATOM_MATCHER_ID_BASE;
+ ArrayList<String> allowedSources = new ArrayList<>();
+ Collections.addAll(allowedSources, ALLOWED_LOG_SOURCES);
+ if (mAdditionalAllowedPackage != null) {
+ allowedSources.add(mAdditionalAllowedPackage);
+ }
+
StatsdConfig.Builder builder = StatsdConfig.newBuilder();
builder
- .addAllAllowedLogSource(Arrays.asList(ALLOWED_LOG_SOURCES))
+ .addAllAllowedLogSource(allowedSources)
.setHashStringsInMetricReport(false);
for (int atomId : atomIds) {
diff --git a/config/boot-image-profile.txt b/config/boot-image-profile.txt
index 7f4d1d0..6061b66 100644
--- a/config/boot-image-profile.txt
+++ b/config/boot-image-profile.txt
@@ -32559,7 +32559,7 @@
HSPLandroid/util/apk/ApkSignatureSchemeV3Verifier;->verify(Ljava/lang/String;Z)Landroid/util/apk/ApkSignatureSchemeV3Verifier$VerifiedSigner;
HSPLandroid/util/apk/ApkSignatureSchemeV3Verifier;->verifyAdditionalAttributes(Ljava/nio/ByteBuffer;Ljava/util/List;Ljava/security/cert/CertificateFactory;)Landroid/util/apk/ApkSignatureSchemeV3Verifier$VerifiedSigner;
HSPLandroid/util/apk/ApkSignatureSchemeV3Verifier;->verifySigner(Ljava/nio/ByteBuffer;Ljava/util/Map;Ljava/security/cert/CertificateFactory;)Landroid/util/apk/ApkSignatureSchemeV3Verifier$VerifiedSigner;
-HSPLandroid/util/apk/ApkSignatureVerifier;->plsCertsNoVerifyOnlyCerts(Ljava/lang/String;I)Landroid/content/pm/PackageParser$SigningDetails;
+HSPLandroid/util/apk/ApkSignatureVerifier;->unsafeGetCertsWithoutVerification(Ljava/lang/String;I)Landroid/content/pm/PackageParser$SigningDetails;
HSPLandroid/util/apk/ApkSigningBlockUtils;->compareContentDigestAlgorithm(II)I
HSPLandroid/util/apk/ApkSigningBlockUtils;->compareSignatureAlgorithm(II)I
HSPLandroid/util/apk/ApkSigningBlockUtils;->findApkSignatureSchemeBlock(Ljava/nio/ByteBuffer;I)Ljava/nio/ByteBuffer;
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index e77e212..aac8f08 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1768,7 +1768,7 @@
protected void onResume() {
if (DEBUG_LIFECYCLE) Slog.v(TAG, "onResume " + this);
dispatchActivityResumed();
- mActivityTransitionState.onResume(this, isTopOfTask());
+ mActivityTransitionState.onResume(this);
enableAutofillCompatibilityIfNeeded();
if (mAutoFillResetNeeded) {
if (!mAutoFillIgnoreFirstResumePause) {
diff --git a/core/java/android/app/ActivityManagerInternal.java b/core/java/android/app/ActivityManagerInternal.java
index 86e658d..69c450c 100644
--- a/core/java/android/app/ActivityManagerInternal.java
+++ b/core/java/android/app/ActivityManagerInternal.java
@@ -23,6 +23,7 @@
import android.content.IIntentSender;
import android.content.Intent;
import android.content.pm.ActivityInfo;
+import android.content.pm.ActivityPresentationInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.UserInfo;
import android.os.Bundle;
@@ -247,6 +248,9 @@
/** Gets the task id for a given activity. */
public abstract int getTaskIdForActivity(@NonNull IBinder token, boolean onlyRoot);
+ /** Gets the basic info for a given activity. */
+ public abstract ActivityPresentationInfo getActivityPresentationInfo(@NonNull IBinder token);
+
public abstract void setBooting(boolean booting);
public abstract boolean isBooting();
public abstract void setBooted(boolean booted);
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index 22dcce5..21d66e5 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -129,6 +129,7 @@
import android.util.Pair;
import android.util.PrintWriterPrinter;
import android.util.Slog;
+import android.util.SparseArray;
import android.util.SparseIntArray;
import android.util.SuperNotCalledException;
import android.util.proto.ProtoOutputStream;
@@ -305,8 +306,14 @@
@UnsupportedAppUsage
final ArrayList<Application> mAllApplications
= new ArrayList<Application>();
- // set of instantiated backup agents, keyed by package name
- final ArrayMap<String, BackupAgent> mBackupAgents = new ArrayMap<String, BackupAgent>();
+ /**
+ * Bookkeeping of instantiated backup agents indexed first by user id, then by package name.
+ * Indexing by user id supports parallel backups across users on system packages as they run in
+ * the same process with the same package name. Indexing by package name supports multiple
+ * distinct applications running in the same process.
+ */
+ private final SparseArray<ArrayMap<String, BackupAgent>> mBackupAgentsByUser =
+ new SparseArray<>();
/** Reference to singleton {@link ActivityThread} */
@UnsupportedAppUsage
private static volatile ActivityThread sCurrentActivityThread;
@@ -659,10 +666,11 @@
ApplicationInfo appInfo;
CompatibilityInfo compatInfo;
int backupMode;
+ int userId;
public String toString() {
return "CreateBackupAgentData{appInfo=" + appInfo
+ " backupAgent=" + appInfo.backupAgentName
- + " mode=" + backupMode + "}";
+ + " mode=" + backupMode + " userId=" + userId + "}";
}
}
@@ -877,20 +885,22 @@
}
public final void scheduleCreateBackupAgent(ApplicationInfo app,
- CompatibilityInfo compatInfo, int backupMode) {
+ CompatibilityInfo compatInfo, int backupMode, int userId) {
CreateBackupAgentData d = new CreateBackupAgentData();
d.appInfo = app;
d.compatInfo = compatInfo;
d.backupMode = backupMode;
+ d.userId = userId;
sendMessage(H.CREATE_BACKUP_AGENT, d);
}
public final void scheduleDestroyBackupAgent(ApplicationInfo app,
- CompatibilityInfo compatInfo) {
+ CompatibilityInfo compatInfo, int userId) {
CreateBackupAgentData d = new CreateBackupAgentData();
d.appInfo = app;
d.compatInfo = compatInfo;
+ d.userId = userId;
sendMessage(H.DESTROY_BACKUP_AGENT, d);
}
@@ -3616,7 +3626,8 @@
try {
IBinder binder = null;
- BackupAgent agent = mBackupAgents.get(packageName);
+ ArrayMap<String, BackupAgent> backupAgents = getBackupAgentsForUser(data.userId);
+ BackupAgent agent = backupAgents.get(packageName);
if (agent != null) {
// reusing the existing instance
if (DEBUG_BACKUP) {
@@ -3635,9 +3646,9 @@
context.setOuterContext(agent);
agent.attach(context);
- agent.onCreate();
+ agent.onCreate(UserHandle.of(data.userId));
binder = agent.onBind();
- mBackupAgents.put(packageName, agent);
+ backupAgents.put(packageName, agent);
} catch (Exception e) {
// If this is during restore, fail silently; otherwise go
// ahead and let the user see the crash.
@@ -3653,7 +3664,7 @@
// tell the OS that we're live now
try {
- ActivityManager.getService().backupAgentCreated(packageName, binder);
+ ActivityManager.getService().backupAgentCreated(packageName, binder, data.userId);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -3669,7 +3680,8 @@
LoadedApk packageInfo = getPackageInfoNoCheck(data.appInfo, data.compatInfo);
String packageName = packageInfo.mPackageName;
- BackupAgent agent = mBackupAgents.get(packageName);
+ ArrayMap<String, BackupAgent> backupAgents = getBackupAgentsForUser(data.userId);
+ BackupAgent agent = backupAgents.get(packageName);
if (agent != null) {
try {
agent.onDestroy();
@@ -3677,12 +3689,21 @@
Slog.w(TAG, "Exception thrown in onDestroy by backup agent of " + data.appInfo);
e.printStackTrace();
}
- mBackupAgents.remove(packageName);
+ backupAgents.remove(packageName);
} else {
Slog.w(TAG, "Attempt to destroy unknown backup agent " + data);
}
}
+ private ArrayMap<String, BackupAgent> getBackupAgentsForUser(int userId) {
+ ArrayMap<String, BackupAgent> backupAgents = mBackupAgentsByUser.get(userId);
+ if (backupAgents == null) {
+ backupAgents = new ArrayMap<>();
+ mBackupAgentsByUser.put(userId, backupAgents);
+ }
+ return backupAgents;
+ }
+
@UnsupportedAppUsage
private void handleCreateService(CreateServiceData data) {
// If we are getting ready to gc after going to the background, well
diff --git a/core/java/android/app/ActivityTransitionState.java b/core/java/android/app/ActivityTransitionState.java
index 3201feb..3a95839 100644
--- a/core/java/android/app/ActivityTransitionState.java
+++ b/core/java/android/app/ActivityTransitionState.java
@@ -258,10 +258,10 @@
}
}
- public void onResume(Activity activity, boolean isTopOfTask) {
+ public void onResume(Activity activity) {
// After orientation change, the onResume can come in before the top Activity has
// left, so if the Activity is not top, wait a second for the top Activity to exit.
- if (isTopOfTask || mEnterTransitionCoordinator == null) {
+ if (mEnterTransitionCoordinator == null || activity.isTopOfTask()) {
restoreExitedViews();
restoreReenteringViews();
} else {
diff --git a/core/java/android/app/ApplicationPackageManager.java b/core/java/android/app/ApplicationPackageManager.java
index a937422..98032dc 100644
--- a/core/java/android/app/ApplicationPackageManager.java
+++ b/core/java/android/app/ApplicationPackageManager.java
@@ -3017,6 +3017,15 @@
}
@Override
+ public String getAppPredictionServicePackageName() {
+ try {
+ return mPM.getAppPredictionServicePackageName();
+ } catch (RemoteException e) {
+ throw e.rethrowAsRuntimeException();
+ }
+ }
+
+ @Override
public String getContentCaptureServicePackageName() {
try {
return mPM.getContentCaptureServicePackageName();
diff --git a/core/java/android/app/IActivityManager.aidl b/core/java/android/app/IActivityManager.aidl
index eea0543..3aa9fa7 100644
--- a/core/java/android/app/IActivityManager.aidl
+++ b/core/java/android/app/IActivityManager.aidl
@@ -221,8 +221,8 @@
boolean shutdown(int timeout);
void stopAppSwitches();
void resumeAppSwitches();
- boolean bindBackupAgent(in String packageName, int backupRestoreMode, int userId);
- void backupAgentCreated(in String packageName, in IBinder agent);
+ boolean bindBackupAgent(in String packageName, int backupRestoreMode, int targetUserId);
+ void backupAgentCreated(in String packageName, in IBinder agent, int userId);
void unbindBackupAgent(in ApplicationInfo appInfo);
int getUidForIntentSender(in IIntentSender sender);
int handleIncomingUser(int callingPid, int callingUid, int userId, boolean allowAll,
diff --git a/core/java/android/app/IApplicationThread.aidl b/core/java/android/app/IApplicationThread.aidl
index c64fcf3..e7a8c0e 100644
--- a/core/java/android/app/IApplicationThread.aidl
+++ b/core/java/android/app/IApplicationThread.aidl
@@ -88,9 +88,9 @@
void profilerControl(boolean start, in ProfilerInfo profilerInfo, int profileType);
void setSchedulingGroup(int group);
void scheduleCreateBackupAgent(in ApplicationInfo app, in CompatibilityInfo compatInfo,
- int backupMode);
+ int backupMode, int userId);
void scheduleDestroyBackupAgent(in ApplicationInfo app,
- in CompatibilityInfo compatInfo);
+ in CompatibilityInfo compatInfo, int userId);
void scheduleOnNewActivityOptions(IBinder token, in Bundle options);
void scheduleSuicide();
void dispatchPackageBroadcast(int cmd, in String[] packages);
diff --git a/core/java/android/app/StatsManager.java b/core/java/android/app/StatsManager.java
index 9b66c92..3119b37 100644
--- a/core/java/android/app/StatsManager.java
+++ b/core/java/android/app/StatsManager.java
@@ -289,20 +289,23 @@
* @param pendingIntent the PendingIntent to use when broadcasting info to the subscriber
* associated with the given subscriberId. May be null, in which case
* it removes any associated pending intent for this client.
+ * @return A list of configs that are currently active for this client. If the pendingIntent is
+ * null, this will be an empty list.
* @throws StatsUnavailableException if unsuccessful due to failing to connect to stats service
*/
@RequiresPermission(allOf = { DUMP, PACKAGE_USAGE_STATS })
- public void setActiveConfigsChangedOperation(@Nullable PendingIntent pendingIntent)
+ public long[] setActiveConfigsChangedOperation(@Nullable PendingIntent pendingIntent)
throws StatsUnavailableException {
synchronized (this) {
try {
IStatsManager service = getIStatsManagerLocked();
if (pendingIntent == null) {
service.removeActiveConfigsChangedOperation(mContext.getOpPackageName());
+ return new long[0];
} else {
// Extracts IIntentSender from the PendingIntent and turns it into an IBinder.
IBinder intentSender = pendingIntent.getTarget().asBinder();
- service.setActiveConfigsChangedOperation(intentSender,
+ return service.setActiveConfigsChangedOperation(intentSender,
mContext.getOpPackageName());
}
diff --git a/core/java/android/app/SystemServiceRegistry.java b/core/java/android/app/SystemServiceRegistry.java
index 31a3def..807b7f2 100644
--- a/core/java/android/app/SystemServiceRegistry.java
+++ b/core/java/android/app/SystemServiceRegistry.java
@@ -30,7 +30,6 @@
import android.app.slice.SliceManager;
import android.app.timedetector.TimeDetector;
import android.app.timezone.RulesManager;
-import android.app.timezonedetector.TimeZoneDetector;
import android.app.trust.TrustManager;
import android.app.usage.IStorageStatsManager;
import android.app.usage.IUsageStatsManager;
@@ -1223,13 +1222,6 @@
throws ServiceNotFoundException {
return new TimeDetector();
}});
- registerService(Context.TIME_ZONE_DETECTOR_SERVICE, TimeZoneDetector.class,
- new CachedServiceFetcher<TimeZoneDetector>() {
- @Override
- public TimeZoneDetector createService(ContextImpl ctx)
- throws ServiceNotFoundException {
- return new TimeZoneDetector();
- }});
registerService(Context.PERMISSION_SERVICE, PermissionManager.class,
new CachedServiceFetcher<PermissionManager>() {
diff --git a/core/java/android/app/timezonedetector/ITimeZoneDetectorService.aidl b/core/java/android/app/timezonedetector/ITimeZoneDetectorService.aidl
deleted file mode 100644
index ef2cbab..0000000
--- a/core/java/android/app/timezonedetector/ITimeZoneDetectorService.aidl
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2018 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.app.timezonedetector;
-
-/**
- * System private API to comunicate with time zone detector service.
- *
- * <p>Used by parts of the Android system with signals associated with the device's time zone to
- * provide information to the Time Zone Detector Service.
- *
- * <p>Use the {@link android.app.timezonedetector.TimeZoneDetector} class rather than going through
- * this Binder interface directly. See {@link android.app.timezonedetector.TimeZoneDetectorService}
- * for more complete documentation.
- *
- *
- * {@hide}
- */
-interface ITimeZoneDetectorService {
- void stubbedCall();
-}
diff --git a/core/java/android/app/timezonedetector/TimeZoneDetector.java b/core/java/android/app/timezonedetector/TimeZoneDetector.java
deleted file mode 100644
index be3c764..0000000
--- a/core/java/android/app/timezonedetector/TimeZoneDetector.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2018 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.app.timezonedetector;
-
-import android.annotation.SystemService;
-import android.content.Context;
-import android.os.RemoteException;
-import android.os.ServiceManager;
-import android.os.ServiceManager.ServiceNotFoundException;
-import android.util.Log;
-
-/**
- * The interface through which system components can send signals to the TimeZoneDetectorService.
- * @hide
- */
-@SystemService(Context.TIME_ZONE_DETECTOR_SERVICE)
-public final class TimeZoneDetector {
-
- private static final String TAG = "timezonedetector.TimeZoneDetector";
- private static final boolean DEBUG = false;
-
- private final ITimeZoneDetectorService mITimeZoneDetectorService;
-
- public TimeZoneDetector() throws ServiceNotFoundException {
- mITimeZoneDetectorService = ITimeZoneDetectorService.Stub.asInterface(
- ServiceManager.getServiceOrThrow(Context.TIME_ZONE_DETECTOR_SERVICE));
-
- }
- /**
- * Does nothing.
- * TODO: Remove this when the service implementation is built out.
- */
- public void stubbedCall() {
- if (DEBUG) {
- Log.d(TAG, "stubbedCall called");
- }
- try {
- mITimeZoneDetectorService.stubbedCall();
- } catch (RemoteException e) {
- throw e.rethrowFromSystemServer();
- }
- }
-}
diff --git a/core/java/android/app/usage/UsageEvents.java b/core/java/android/app/usage/UsageEvents.java
index 451f44b..fafea34 100644
--- a/core/java/android/app/usage/UsageEvents.java
+++ b/core/java/android/app/usage/UsageEvents.java
@@ -52,6 +52,14 @@
public static final int NONE = 0;
/**
+ * A device level event like {@link #DEVICE_SHUTDOWN} does not have package name, but some
+ * user code always expect a non-null {@link #mPackage} for every event. Use
+ * {@link #DEVICE_EVENT_PACKAGE_NAME} as packageName for these device level events.
+ * @hide
+ */
+ public static final String DEVICE_EVENT_PACKAGE_NAME = "android";
+
+ /**
* @deprecated by {@link #ACTIVITY_RESUMED}
*/
@Deprecated
@@ -405,6 +413,16 @@
}
/**
+ * Indicates whether it is an instant app.
+ * STOPSHIP b/111407095: Add GTS tests for the newly added API method.
+ * @hide
+ */
+ @SystemApi
+ public boolean isInstantApp() {
+ return (mFlags & FLAG_IS_PACKAGE_INSTANT_APP) == FLAG_IS_PACKAGE_INSTANT_APP;
+ }
+
+ /**
* The class name of the source of this event. This may be null for
* certain events.
*/
@@ -530,7 +548,7 @@
/** @hide */
public Event getObfuscatedIfInstantApp() {
- if ((mFlags & FLAG_IS_PACKAGE_INSTANT_APP) == 0) {
+ if (!isInstantApp()) {
return this;
}
final Event ret = new Event(this);
@@ -735,6 +753,7 @@
p.writeString(event.mNotificationChannelId);
break;
}
+ p.writeInt(event.mFlags);
}
/**
@@ -802,6 +821,7 @@
eventOut.mNotificationChannelId = p.readString();
break;
}
+ eventOut.mFlags = p.readInt();
}
@Override
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index 13d12c9..f138d39 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -28,7 +28,6 @@
import android.annotation.Nullable;
import android.annotation.UnsupportedAppUsage;
import android.app.AppOpsManager;
-import android.app.role.RoleManager;
import android.content.pm.PathPermission;
import android.content.pm.ProviderInfo;
import android.content.res.AssetFileDescriptor;
@@ -226,17 +225,6 @@
@Override
public Cursor query(String callingPkg, Uri uri, @Nullable String[] projection,
@Nullable Bundle queryArgs, @Nullable ICancellationSignal cancellationSignal) {
- if (uri.toString().startsWith("content://sms")) {
- RoleManager rm = getContext().getSystemService(RoleManager.class);
- if (!rm.isRoleHeld(RoleManager.ROLE_SMS)
- && !rm.isRoleHeld(RoleManager.ROLE_DIALER)
- && !rm.isRoleHeld(RoleManager.ROLE_ASSISTANT)) {
- // STOPSHIP: log it to westworld instead
- Log.wtf(TAG, "Sms access attempted by " + callingPkg
- + " despite not holding an appropriate role");
- }
- }
-
uri = validateIncomingUri(uri);
uri = maybeGetUriWithoutUserId(uri);
if (enforceReadPermission(callingPkg, uri, null) != AppOpsManager.MODE_ALLOWED) {
diff --git a/core/java/android/content/Context.java b/core/java/android/content/Context.java
index 97323ca..957a484 100644
--- a/core/java/android/content/Context.java
+++ b/core/java/android/content/Context.java
@@ -3186,7 +3186,6 @@
CROSS_PROFILE_APPS_SERVICE,
//@hide: SYSTEM_UPDATE_SERVICE,
//@hide: TIME_DETECTOR_SERVICE,
- //@hide: TIME_ZONE_DETECTOR_SERVICE,
PERMISSION_SERVICE,
})
@Retention(RetentionPolicy.SOURCE)
@@ -4564,15 +4563,6 @@
public static final String TIME_DETECTOR_SERVICE = "time_detector";
/**
- * Use with {@link #getSystemService(String)} to retrieve an
- * {@link android.app.timezonedetector.ITimeZoneDetectorService}.
- * @hide
- *
- * @see #getSystemService(String)
- */
- public static final String TIME_ZONE_DETECTOR_SERVICE = "time_zone_detector";
-
- /**
* Binder service name for {@link AppBindingService}.
* @hide
*/
diff --git a/core/java/android/content/DynamicAndroidClient.java b/core/java/android/content/DynamicAndroidClient.java
new file mode 100644
index 0000000..571cba4
--- /dev/null
+++ b/core/java/android/content/DynamicAndroidClient.java
@@ -0,0 +1,370 @@
+/*
+ * Copyright (C) 2019 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.content;
+
+import android.annotation.CallbackExecutor;
+import android.annotation.IntDef;
+import android.annotation.NonNull;
+import android.annotation.SystemApi;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.IBinder;
+import android.os.Looper;
+import android.os.Message;
+import android.os.Messenger;
+import android.os.RemoteException;
+import android.util.Slog;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.ref.WeakReference;
+import java.util.concurrent.Executor;
+
+/**
+ * This class contains methods and constants used to start DynamicAndroid
+ * installation, and a listener for progress update.
+ * @hide
+ */
+@SystemApi
+public class DynamicAndroidClient {
+ /** @hide */
+ @IntDef(prefix = { "STATUS_" }, value = {
+ STATUS_UNKNOWN,
+ STATUS_NOT_STARTED,
+ STATUS_IN_PROGRESS,
+ STATUS_READY,
+ STATUS_IN_USE,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface InstallationStatus {}
+
+ /** @hide */
+ @IntDef(prefix = { "CAUSE_" }, value = {
+ CAUSE_NOT_SPECIFIED,
+ CAUSE_INSTALL_COMPLETED,
+ CAUSE_INSTALL_CANCELLED,
+ CAUSE_ERROR_IO,
+ CAUSE_ERROR_INVALID_URL,
+ CAUSE_ERROR_IPC,
+ CAUSE_ERROR_EXCEPTION,
+ })
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface StatusChangedCause {}
+
+ private static final String TAG = "DynAndroidClient";
+
+ private static final long DEFAULT_USERDATA_SIZE = (10L << 30);
+
+
+ /** Listener for installation status update. */
+ public interface OnStatusChangedListener {
+ /**
+ * This callback is called when installation status is changed, and when the
+ * client is {@link #bind} to DynamicAndroid installation service.
+ *
+ * @param status status code, also defined in {@code DynamicAndroidClient}.
+ * @param cause cause code, also defined in {@code DynamicAndroidClient}.
+ * @param progress number of bytes installed.
+ */
+ void onStatusChanged(@InstallationStatus int status, @StatusChangedCause int cause,
+ long progress);
+ }
+
+ /*
+ * Status codes
+ */
+ /** We are bound to installation service, but failed to get its status */
+ public static final int STATUS_UNKNOWN = 0;
+
+ /** Installation is not started yet. */
+ public static final int STATUS_NOT_STARTED = 1;
+
+ /** Installation is in progress. */
+ public static final int STATUS_IN_PROGRESS = 2;
+
+ /** Installation is finished but the user has not launched it. */
+ public static final int STATUS_READY = 3;
+
+ /** Device is running in Dynamic Android. */
+ public static final int STATUS_IN_USE = 4;
+
+ /*
+ * Causes
+ */
+ /** Cause is not specified. This means the status is not changed. */
+ public static final int CAUSE_NOT_SPECIFIED = 0;
+
+ /** Status changed because installation is completed. */
+ public static final int CAUSE_INSTALL_COMPLETED = 1;
+
+ /** Status changed because installation is cancelled. */
+ public static final int CAUSE_INSTALL_CANCELLED = 2;
+
+ /** Installation failed due to IOException. */
+ public static final int CAUSE_ERROR_IO = 3;
+
+ /** Installation failed because the image URL source is not supported. */
+ public static final int CAUSE_ERROR_INVALID_URL = 4;
+
+ /** Installation failed due to IPC error. */
+ public static final int CAUSE_ERROR_IPC = 5;
+
+ /** Installation failed due to unhandled exception. */
+ public static final int CAUSE_ERROR_EXCEPTION = 6;
+
+ /*
+ * IPC Messages
+ */
+ /**
+ * Message to register listener.
+ * @hide
+ */
+ public static final int MSG_REGISTER_LISTENER = 1;
+
+ /**
+ * Message to unregister listener.
+ * @hide
+ */
+ public static final int MSG_UNREGISTER_LISTENER = 2;
+
+ /**
+ * Message for status update.
+ * @hide
+ */
+ public static final int MSG_POST_STATUS = 3;
+
+ /*
+ * Messages keys
+ */
+ /**
+ * Message key, for progress update.
+ * @hide
+ */
+ public static final String KEY_INSTALLED_SIZE = "KEY_INSTALLED_SIZE";
+
+ /*
+ * Intent Actions
+ */
+ /**
+ * Intent action: start installation.
+ * @hide
+ */
+ public static final String ACTION_START_INSTALL =
+ "android.content.action.START_INSTALL";
+
+ /**
+ * Intent action: notify user if we are currently running in Dynamic Android.
+ * @hide
+ */
+ public static final String ACTION_NOTIFY_IF_IN_USE =
+ "android.content.action.NOTIFY_IF_IN_USE";
+
+ /*
+ * Intent Keys
+ */
+ /**
+ * Intent key: URL to system image.
+ * @hide
+ */
+ public static final String KEY_SYSTEM_URL = "KEY_SYSTEM_URL";
+
+ /**
+ * Intent key: Size of system image, in bytes.
+ * @hide
+ */
+ public static final String KEY_SYSTEM_SIZE = "KEY_SYSTEM_SIZE";
+
+ /**
+ * Intent key: Number of bytes to reserve for userdata.
+ * @hide
+ */
+ public static final String KEY_USERDATA_SIZE = "KEY_USERDATA_SIZE";
+
+
+ private static class IncomingHandler extends Handler {
+ private final WeakReference<DynamicAndroidClient> mWeakClient;
+
+ IncomingHandler(DynamicAndroidClient service) {
+ super(Looper.getMainLooper());
+ mWeakClient = new WeakReference<>(service);
+ }
+
+ @Override
+ public void handleMessage(Message msg) {
+ DynamicAndroidClient service = mWeakClient.get();
+
+ if (service != null) {
+ service.handleMessage(msg);
+ }
+ }
+ }
+
+ private class DynAndroidServiceConnection implements ServiceConnection {
+ public void onServiceConnected(ComponentName className, IBinder service) {
+ Slog.v(TAG, "DynAndroidService connected");
+
+ mService = new Messenger(service);
+
+ try {
+ Message msg = Message.obtain(null, MSG_REGISTER_LISTENER);
+ msg.replyTo = mMessenger;
+
+ mService.send(msg);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "Unable to get status from installation service");
+ mExecutor.execute(() -> {
+ mListener.onStatusChanged(STATUS_UNKNOWN, CAUSE_ERROR_IPC, 0);
+ });
+ }
+ }
+
+ public void onServiceDisconnected(ComponentName className) {
+ Slog.v(TAG, "DynAndroidService disconnected");
+ mService = null;
+ }
+ }
+
+ private final Context mContext;
+ private final DynAndroidServiceConnection mConnection;
+ private final Messenger mMessenger;
+
+ private boolean mBound;
+ private Executor mExecutor;
+ private OnStatusChangedListener mListener;
+ private Messenger mService;
+
+ /**
+ * @hide
+ */
+ @SystemApi
+ public DynamicAndroidClient(@NonNull Context context) {
+ mContext = context;
+ mConnection = new DynAndroidServiceConnection();
+ mMessenger = new Messenger(new IncomingHandler(this));
+ }
+
+ /**
+ * This method register a listener for status change. The listener is called using
+ * the executor.
+ */
+ public void setOnStatusChangedListener(
+ @NonNull OnStatusChangedListener listener,
+ @NonNull @CallbackExecutor Executor executor) {
+ mListener = listener;
+ mExecutor = executor;
+ }
+
+ /**
+ * This method register a listener for status change. The listener is called in main
+ * thread.
+ */
+ public void setOnStatusChangedListener(
+ @NonNull OnStatusChangedListener listener) {
+ mListener = listener;
+ mExecutor = null;
+ }
+
+ /**
+ * Bind to DynamicAndroidInstallationService.
+ */
+ public void bind() {
+ Intent intent = new Intent();
+ intent.setClassName("com.android.dynandroid",
+ "com.android.dynandroid.DynamicAndroidInstallationService");
+
+ mContext.bindService(intent, mConnection, Context.BIND_AUTO_CREATE);
+
+ mBound = true;
+ }
+
+ /**
+ * Unbind from DynamicAndroidInstallationService.
+ */
+ public void unbind() {
+ if (!mBound) {
+ return;
+ }
+
+ if (mService != null) {
+ try {
+ Message msg = Message.obtain(null, MSG_UNREGISTER_LISTENER);
+ msg.replyTo = mMessenger;
+ mService.send(msg);
+ } catch (RemoteException e) {
+ Slog.e(TAG, "Unable to unregister from installation service");
+ }
+ }
+
+ // Detach our existing connection.
+ mContext.unbindService(mConnection);
+
+ mBound = false;
+ }
+
+ /**
+ * Start installing DynamicAndroid from URL with default userdata size.
+ *
+ * @param systemUrl A network URL or a file URL to system image.
+ * @param systemSize size of system image.
+ */
+ public void start(String systemUrl, long systemSize) {
+ start(systemUrl, systemSize, DEFAULT_USERDATA_SIZE);
+ }
+
+ /**
+ * Start installing DynamicAndroid from URL.
+ *
+ * @param systemUrl A network URL or a file URL to system image.
+ * @param systemSize size of system image.
+ * @param userdataSize bytes reserved for userdata.
+ */
+ public void start(String systemUrl, long systemSize, long userdataSize) {
+ Intent intent = new Intent();
+
+ intent.setClassName("com.android.dynandroid",
+ "com.android.dynandroid.VerificationActivity");
+
+ intent.setAction(ACTION_START_INSTALL);
+
+ intent.putExtra(KEY_SYSTEM_URL, systemUrl);
+ intent.putExtra(KEY_SYSTEM_SIZE, systemSize);
+ intent.putExtra(KEY_USERDATA_SIZE, userdataSize);
+
+ mContext.startActivity(intent);
+ }
+
+ private void handleMessage(Message msg) {
+ switch (msg.what) {
+ case MSG_POST_STATUS:
+ int status = msg.arg1;
+ int cause = msg.arg2;
+ // obj is non-null
+ long progress = ((Bundle) msg.obj).getLong(KEY_INSTALLED_SIZE);
+
+ if (mExecutor != null) {
+ mExecutor.execute(() -> {
+ mListener.onStatusChanged(status, cause, progress);
+ });
+ } else {
+ mListener.onStatusChanged(status, cause, progress);
+ }
+ break;
+ default:
+ // do nothing
+
+ }
+ }
+}
diff --git a/core/java/android/content/pm/ActivityPresentationInfo.java b/core/java/android/content/pm/ActivityPresentationInfo.java
new file mode 100644
index 0000000..ccc61dc
--- /dev/null
+++ b/core/java/android/content/pm/ActivityPresentationInfo.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2019 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.content.pm;
+
+import android.annotation.NonNull;
+import android.content.ComponentName;
+
+/**
+ * Holds basic information about an activity.
+ *
+ * @hide
+ */
+public final class ActivityPresentationInfo {
+ public final int taskId;
+ public final int displayId;
+
+ @NonNull
+ public final ComponentName componentName;
+
+ public ActivityPresentationInfo(int taskId, int displayId,
+ @NonNull ComponentName componentName) {
+ this.taskId = taskId;
+ this.displayId = displayId;
+ this.componentName = componentName;
+ }
+}
diff --git a/core/java/android/content/pm/BasicActivityInfo.aidl b/core/java/android/content/pm/BasicActivityInfo.aidl
new file mode 100644
index 0000000..f04bf9a
--- /dev/null
+++ b/core/java/android/content/pm/BasicActivityInfo.aidl
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2019 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.content.pm;
+
+/** @hide */
+parcelable BasicActivityInfo;
diff --git a/core/java/android/content/pm/IPackageManager.aidl b/core/java/android/content/pm/IPackageManager.aidl
index a6a6f01..36ffb0e 100644
--- a/core/java/android/content/pm/IPackageManager.aidl
+++ b/core/java/android/content/pm/IPackageManager.aidl
@@ -686,6 +686,8 @@
String getWellbeingPackageName();
+ String getAppPredictionServicePackageName();
+
String getContentCaptureServicePackageName();
String getIncidentReportApproverPackageName();
diff --git a/core/java/android/content/pm/ModuleInfo.java b/core/java/android/content/pm/ModuleInfo.java
index 07e640b..044e87d 100644
--- a/core/java/android/content/pm/ModuleInfo.java
+++ b/core/java/android/content/pm/ModuleInfo.java
@@ -32,7 +32,7 @@
// constructor, and writeToParcel.
/** Public name of this module. */
- private String mName;
+ private CharSequence mName;
/** The package name of this module. */
private String mPackageName;
@@ -57,13 +57,13 @@
}
/** @hide Sets the public name of this module. */
- public ModuleInfo setName(String name) {
+ public ModuleInfo setName(CharSequence name) {
mName = name;
return this;
}
/** Gets the public name of this module. */
- public @Nullable String getName() {
+ public @Nullable CharSequence getName() {
return mName;
}
@@ -123,13 +123,13 @@
/** Flattens this object into the given {@link Parcel}. */
public void writeToParcel(Parcel dest, int parcelableFlags) {
- dest.writeString(mName);
+ dest.writeCharSequence(mName);
dest.writeString(mPackageName);
dest.writeBoolean(mHidden);
}
private ModuleInfo(Parcel source) {
- mName = source.readString();
+ mName = source.readCharSequence();
mPackageName = source.readString();
mHidden = source.readBoolean();
}
diff --git a/core/java/android/content/pm/PackageInstaller.java b/core/java/android/content/pm/PackageInstaller.java
index 8b8f3e5..0ac4f64 100644
--- a/core/java/android/content/pm/PackageInstaller.java
+++ b/core/java/android/content/pm/PackageInstaller.java
@@ -1625,26 +1625,35 @@
private static final int[] NO_SESSIONS = {};
/** @hide */
- @IntDef(value = {NO_ERROR, VERIFICATION_FAILED, ACTIVATION_FAILED})
+ @IntDef(prefix = { "STAGED_SESSION_" }, value = {
+ STAGED_SESSION_NO_ERROR,
+ STAGED_SESSION_VERIFICATION_FAILED,
+ STAGED_SESSION_ACTIVATION_FAILED,
+ STAGED_SESSION_UNKNOWN})
@Retention(RetentionPolicy.SOURCE)
public @interface StagedSessionErrorCode{}
/**
* Constant indicating that no error occurred during the preparation or the activation of
* this staged session.
*/
- public static final int NO_ERROR = 0;
+ public static final int STAGED_SESSION_NO_ERROR = 0;
/**
* Constant indicating that an error occurred during the verification phase (pre-reboot) of
* this staged session.
*/
- public static final int VERIFICATION_FAILED = 1;
+ public static final int STAGED_SESSION_VERIFICATION_FAILED = 1;
/**
* Constant indicating that an error occurred during the activation phase (post-reboot) of
* this staged session.
*/
- public static final int ACTIVATION_FAILED = 2;
+ public static final int STAGED_SESSION_ACTIVATION_FAILED = 2;
+
+ /**
+ * Constant indicating that an unknown error occurred while processing this staged session.
+ */
+ public static final int STAGED_SESSION_UNKNOWN = 3;
/** {@hide} */
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)
diff --git a/core/java/android/content/pm/PackageManager.java b/core/java/android/content/pm/PackageManager.java
index 84f87ff..e2907e2 100644
--- a/core/java/android/content/pm/PackageManager.java
+++ b/core/java/android/content/pm/PackageManager.java
@@ -6725,6 +6725,16 @@
}
/**
+ * @return the system defined app predictor package name, or null if there's none.
+ *
+ * @hide
+ */
+ public String getAppPredictionServicePackageName() {
+ throw new UnsupportedOperationException(
+ "getAppPredictionServicePackageName not implemented in subclass");
+ }
+
+ /**
* @return the system defined content capture service package name, or null if there's none.
*
* @hide
diff --git a/core/java/android/content/pm/PackageManagerInternal.java b/core/java/android/content/pm/PackageManagerInternal.java
index 738730e..cfe35b0 100644
--- a/core/java/android/content/pm/PackageManagerInternal.java
+++ b/core/java/android/content/pm/PackageManagerInternal.java
@@ -57,6 +57,7 @@
public static final int PACKAGE_DOCUMENTER = 8;
public static final int PACKAGE_CONFIGURATOR = 9;
public static final int PACKAGE_INCIDENT_REPORT_APPROVER = 10;
+ public static final int PACKAGE_APP_PREDICTOR = 11;
@IntDef(value = {
PACKAGE_SYSTEM,
PACKAGE_SETUP_WIZARD,
@@ -69,6 +70,7 @@
PACKAGE_DOCUMENTER,
PACKAGE_CONFIGURATOR,
PACKAGE_INCIDENT_REPORT_APPROVER,
+ PACKAGE_APP_PREDICTOR,
})
@Retention(RetentionPolicy.SOURCE)
public @interface KnownPackage {}
@@ -135,6 +137,32 @@
}
/**
+ * Provider for default browser
+ */
+ public interface DefaultBrowserProvider {
+
+ /**
+ * Get the package name of the default browser.
+ *
+ * @param userId the user id
+ *
+ * @return the package name of the default browser, or {@code null} if none
+ */
+ @Nullable
+ String getDefaultBrowser(@UserIdInt int userId);
+
+ /**
+ * Set the package name of the default browser.
+ *
+ * @param packageName package name of the default browser, or {@code null} to remove
+ * @param userId the user id
+ *
+ * @return whether the default browser was successfully set.
+ */
+ boolean setDefaultBrowser(@Nullable String packageName, @UserIdInt int userId);
+ }
+
+ /**
* Sets the location provider packages provider.
* @param provider The packages provider.
*/
@@ -841,4 +869,21 @@
* {@code token} can be completed.
*/
public abstract void finishPackageInstall(int token, boolean didLaunch);
+
+ /**
+ * Remove the default browser stored in the legacy package settings.
+ *
+ * @param userId the user id
+ *
+ * @return the package name of the default browser, or {@code null} if none
+ */
+ @Nullable
+ public abstract String removeLegacyDefaultBrowserPackageName(int userId);
+
+ /**
+ * Sets the default browser provider.
+ *
+ * @param provider the provider
+ */
+ public abstract void setDefaultBrowserProvider(@NonNull DefaultBrowserProvider provider);
}
diff --git a/core/java/android/content/pm/PackageParser.java b/core/java/android/content/pm/PackageParser.java
index f10f0c6..6044914 100644
--- a/core/java/android/content/pm/PackageParser.java
+++ b/core/java/android/content/pm/PackageParser.java
@@ -1533,7 +1533,7 @@
SigningDetails verified;
if (skipVerify) {
// systemDir APKs are already trusted, save time by not verifying
- verified = ApkSignatureVerifier.plsCertsNoVerifyOnlyCerts(
+ verified = ApkSignatureVerifier.unsafeGetCertsWithoutVerification(
apkPath, minSignatureScheme);
} else {
verified = ApkSignatureVerifier.verify(apkPath, minSignatureScheme);
@@ -4423,7 +4423,7 @@
a.owner = owner;
a.setPackageName(owner.packageName);
- a.info.theme = 0;
+ a.info.theme = android.R.style.Theme_NoDisplay;
a.info.exported = true;
a.info.name = AppDetailsActivity.class.getName();
a.info.processName = owner.applicationInfo.processName;
diff --git a/core/java/android/content/pm/PermissionInfo.java b/core/java/android/content/pm/PermissionInfo.java
index e776984..fb63e0d 100644
--- a/core/java/android/content/pm/PermissionInfo.java
+++ b/core/java/android/content/pm/PermissionInfo.java
@@ -224,6 +224,17 @@
@TestApi
public static final int PROTECTION_FLAG_INCIDENT_REPORT_APPROVER = 0x100000;
+ /**
+ * Additional flag for {@link #protectionLevel}, corresponding
+ * to the <code>app_predictor</code> value of
+ * {@link android.R.attr#protectionLevel}.
+ *
+ * @hide
+ */
+ @SystemApi
+ @TestApi
+ public static final int PROTECTION_FLAG_APP_PREDICTOR = 0x200000;
+
/** @hide */
@IntDef(flag = true, prefix = { "PROTECTION_FLAG_" }, value = {
PROTECTION_FLAG_PRIVILEGED,
@@ -244,6 +255,7 @@
PROTECTION_FLAG_DOCUMENTER,
PROTECTION_FLAG_CONFIGURATOR,
PROTECTION_FLAG_INCIDENT_REPORT_APPROVER,
+ PROTECTION_FLAG_APP_PREDICTOR,
})
@Retention(RetentionPolicy.SOURCE)
public @interface ProtectionFlags {}
@@ -445,6 +457,9 @@
if ((level & PermissionInfo.PROTECTION_FLAG_INCIDENT_REPORT_APPROVER) != 0) {
protLevel += "|incidentReportApprover";
}
+ if ((level & PermissionInfo.PROTECTION_FLAG_APP_PREDICTOR) != 0) {
+ protLevel += "|appPredictor";
+ }
return protLevel;
}
diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java
index 536a1b7..8a92017 100644
--- a/core/java/android/content/res/Configuration.java
+++ b/core/java/android/content/res/Configuration.java
@@ -1096,34 +1096,38 @@
* @param protoOutputStream Stream to write the Configuration object to.
* @param fieldId Field Id of the Configuration as defined in the parent message
* @param persisted Note if this proto will be persisted to disk
+ * @param critical If true, reduce amount of data written.
* @hide
*/
- public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId, boolean persisted) {
+ public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId, boolean persisted,
+ boolean critical) {
final long token = protoOutputStream.start(fieldId);
- protoOutputStream.write(FONT_SCALE, fontScale);
- protoOutputStream.write(MCC, mcc);
- protoOutputStream.write(MNC, mnc);
- if (mLocaleList != null) {
- mLocaleList.writeToProto(protoOutputStream, LOCALES);
+ if (!critical) {
+ protoOutputStream.write(FONT_SCALE, fontScale);
+ protoOutputStream.write(MCC, mcc);
+ protoOutputStream.write(MNC, mnc);
+ if (mLocaleList != null) {
+ mLocaleList.writeToProto(protoOutputStream, LOCALES);
+ }
+ protoOutputStream.write(SCREEN_LAYOUT, screenLayout);
+ protoOutputStream.write(COLOR_MODE, colorMode);
+ protoOutputStream.write(TOUCHSCREEN, touchscreen);
+ protoOutputStream.write(KEYBOARD, keyboard);
+ protoOutputStream.write(KEYBOARD_HIDDEN, keyboardHidden);
+ protoOutputStream.write(HARD_KEYBOARD_HIDDEN, hardKeyboardHidden);
+ protoOutputStream.write(NAVIGATION, navigation);
+ protoOutputStream.write(NAVIGATION_HIDDEN, navigationHidden);
+ protoOutputStream.write(UI_MODE, uiMode);
+ protoOutputStream.write(SMALLEST_SCREEN_WIDTH_DP, smallestScreenWidthDp);
+ protoOutputStream.write(DENSITY_DPI, densityDpi);
+ // For persistence, we do not care about window configuration
+ if (!persisted && windowConfiguration != null) {
+ windowConfiguration.writeToProto(protoOutputStream, WINDOW_CONFIGURATION);
+ }
}
- protoOutputStream.write(SCREEN_LAYOUT, screenLayout);
- protoOutputStream.write(COLOR_MODE, colorMode);
- protoOutputStream.write(TOUCHSCREEN, touchscreen);
- protoOutputStream.write(KEYBOARD, keyboard);
- protoOutputStream.write(KEYBOARD_HIDDEN, keyboardHidden);
- protoOutputStream.write(HARD_KEYBOARD_HIDDEN, hardKeyboardHidden);
- protoOutputStream.write(NAVIGATION, navigation);
- protoOutputStream.write(NAVIGATION_HIDDEN, navigationHidden);
protoOutputStream.write(ORIENTATION, orientation);
- protoOutputStream.write(UI_MODE, uiMode);
protoOutputStream.write(SCREEN_WIDTH_DP, screenWidthDp);
protoOutputStream.write(SCREEN_HEIGHT_DP, screenHeightDp);
- protoOutputStream.write(SMALLEST_SCREEN_WIDTH_DP, smallestScreenWidthDp);
- protoOutputStream.write(DENSITY_DPI, densityDpi);
- // For persistence, we do not care about window configuration
- if (!persisted && windowConfiguration != null) {
- windowConfiguration.writeToProto(protoOutputStream, WINDOW_CONFIGURATION);
- }
protoOutputStream.end(token);
}
@@ -1136,7 +1140,20 @@
* @hide
*/
public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId) {
- writeToProto(protoOutputStream, fieldId, false);
+ writeToProto(protoOutputStream, fieldId, false /* persisted */, false /* critical */);
+ }
+
+ /**
+ * Write to a protocol buffer output stream.
+ * Protocol buffer message definition at {@link android.content.ConfigurationProto}
+ *
+ * @param protoOutputStream Stream to write the Configuration object to.
+ * @param fieldId Field Id of the Configuration as defined in the parent message
+ * @param critical If true, reduce amount of data written.
+ * @hide
+ */
+ public void writeToProto(ProtoOutputStream protoOutputStream, long fieldId, boolean critical) {
+ writeToProto(protoOutputStream, fieldId, false /* persisted */, critical);
}
/**
diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java
index d53834c..d36e076 100644
--- a/core/java/android/content/res/TypedArray.java
+++ b/core/java/android/content/res/TypedArray.java
@@ -72,7 +72,7 @@
static final int STYLE_RESOURCE_ID = 3;
static final int STYLE_CHANGING_CONFIGURATIONS = 4;
static final int STYLE_DENSITY = 5;
- static final int SYTLE_SOURCE_STYLE_RESOURCE_ID = 6;
+ static final int SYTLE_SOURCE_RESOURCE_ID = 6;
@UnsupportedAppUsage
private final Resources mResources;
@@ -1101,28 +1101,51 @@
}
/**
- * Returns the resource ID of the style against which the specified attribute was resolved,
- * otherwise returns defValue.
+ * Returns the resource ID of the style or layout against which the specified attribute was
+ * resolved, otherwise returns defValue.
+ *
+ * For example, if you we resolving two attributes {@code android:attribute1} and
+ * {@code android:attribute2} and you were inflating a {@link android.view.View} from
+ * {@code layout/my_layout.xml}:
+ * <pre>
+ * <View
+ * style="@style/viewStyle"
+ * android:layout_width="wrap_content"
+ * android:layout_height="wrap_content"
+ * android:attribute1="foo"/>
+ * </pre>
+ *
+ * and {@code @style/viewStyle} is:
+ * <pre>
+ * <style android:name="viewStyle">
+ * <item name="android:attribute2">bar<item/>
+ * <style/>
+ * </pre>
+ *
+ * then resolved {@link TypedArray} will have values that return source resource ID of
+ * {@code R.layout.my_layout} for {@code android:attribute1} and {@code R.style.viewStyle} for
+ * {@code android:attribute2}.
*
* @param index Index of attribute whose source style to retrieve.
- * @param defValue Value to return if the attribute is not defined or
- * not a resource.
+ * @param defaultValue Value to return if the attribute is not defined or
+ * not a resource.
*
- * @return Attribute source style resource ID or defValue if it was not resolved in any style.
+ * @return Either a style resource ID, layout resource ID, or defaultValue if it was not
+ * resolved in a style or layout.
* @throws RuntimeException if the TypedArray has already been recycled.
*/
@StyleRes
- public int getSourceStyleResourceId(@StyleableRes int index, @StyleRes int defValue) {
+ public int getSourceResourceId(@StyleableRes int index, @StyleRes int defaultValue) {
if (mRecycled) {
throw new RuntimeException("Cannot make calls to a recycled instance!");
}
index *= STYLE_NUM_ENTRIES;
- final int resid = mData[index + SYTLE_SOURCE_STYLE_RESOURCE_ID];
+ final int resid = mData[index + SYTLE_SOURCE_RESOURCE_ID];
if (resid != 0) {
return resid;
}
- return defValue;
+ return defaultValue;
}
/**
@@ -1337,7 +1360,7 @@
data[index + STYLE_CHANGING_CONFIGURATIONS]);
outValue.density = data[index + STYLE_DENSITY];
outValue.string = (type == TypedValue.TYPE_STRING) ? loadStringValueAt(index) : null;
- outValue.sourceStyleResourceId = data[index + SYTLE_SOURCE_STYLE_RESOURCE_ID];
+ outValue.sourceResourceId = data[index + SYTLE_SOURCE_RESOURCE_ID];
return true;
}
diff --git a/core/java/android/content/res/XmlBlock.java b/core/java/android/content/res/XmlBlock.java
index d8c3dde..626bf77 100644
--- a/core/java/android/content/res/XmlBlock.java
+++ b/core/java/android/content/res/XmlBlock.java
@@ -82,23 +82,22 @@
public XmlResourceParser newParser(@AnyRes int resId) {
synchronized (this) {
if (mNative != 0) {
- return new Parser(nativeCreateParseState(mNative), this, resId);
+ return new Parser(nativeCreateParseState(mNative, resId), this);
}
return null;
}
}
/*package*/ final class Parser implements XmlResourceParser {
- Parser(long parseState, XmlBlock block, @AnyRes int sourceResId) {
+ Parser(long parseState, XmlBlock block) {
mParseState = parseState;
mBlock = block;
block.mOpenCount++;
- mSourceResId = sourceResId;
}
@AnyRes
public int getSourceResId() {
- return mSourceResId;
+ return nativeGetSourceResId(mParseState);
}
public void setFeature(String name, boolean state) throws XmlPullParserException {
@@ -486,7 +485,6 @@
private boolean mDecNextDepth = false;
private int mDepth = 0;
private int mEventType = START_DOCUMENT;
- private @AnyRes int mSourceResId;
}
protected void finalize() throws Throwable {
@@ -515,7 +513,7 @@
int offset,
int size);
private static final native long nativeGetStringBlock(long obj);
- private static final native long nativeCreateParseState(long obj);
+ private static final native long nativeCreateParseState(long obj, int resId);
private static final native void nativeDestroyParseState(long state);
private static final native void nativeDestroy(long obj);
@@ -553,4 +551,6 @@
private static final native int nativeGetStyleAttribute(long state);
@FastNative
private static final native int nativeGetAttributeIndex(long state, String namespace, String name);
+ @FastNative
+ private static final native int nativeGetSourceResId(long state);
}
diff --git a/core/java/android/content/rollback/RollbackInfo.java b/core/java/android/content/rollback/RollbackInfo.java
index 3fd2476..0cde6ba 100644
--- a/core/java/android/content/rollback/RollbackInfo.java
+++ b/core/java/android/content/rollback/RollbackInfo.java
@@ -22,6 +22,7 @@
import android.os.Parcel;
import android.os.Parcelable;
+import java.util.Collections;
import java.util.List;
/**
@@ -42,18 +43,31 @@
private final List<VersionedPackage> mCausePackages;
+ private final boolean mIsStaged;
+ private final int mCommittedSessionId;
+
/** @hide */
- public RollbackInfo(int rollbackId, List<PackageRollbackInfo> packages,
- List<VersionedPackage> causePackages) {
+ public RollbackInfo(int rollbackId, List<PackageRollbackInfo> packages, boolean isStaged) {
+ this(rollbackId, packages, isStaged, Collections.emptyList(),
+ PackageInstaller.SessionInfo.INVALID_ID);
+ }
+
+ /** @hide */
+ public RollbackInfo(int rollbackId, List<PackageRollbackInfo> packages, boolean isStaged,
+ List<VersionedPackage> causePackages, int committedSessionId) {
this.mRollbackId = rollbackId;
this.mPackages = packages;
+ this.mIsStaged = isStaged;
this.mCausePackages = causePackages;
+ this.mCommittedSessionId = committedSessionId;
}
private RollbackInfo(Parcel in) {
mRollbackId = in.readInt();
mPackages = in.createTypedArrayList(PackageRollbackInfo.CREATOR);
+ mIsStaged = in.readBoolean();
mCausePackages = in.createTypedArrayList(VersionedPackage.CREATOR);
+ mCommittedSessionId = in.readInt();
}
/**
@@ -75,8 +89,7 @@
* being committed.
*/
public boolean isStaged() {
- // TODO: Support rollback of staged installs.
- return false;
+ return mIsStaged;
}
/**
@@ -84,8 +97,7 @@
* Only applicable for rollbacks that have been committed.
*/
public int getCommittedSessionId() {
- // TODO: Support rollback of staged installs.
- return PackageInstaller.SessionInfo.INVALID_ID;
+ return mCommittedSessionId;
}
/**
@@ -106,7 +118,9 @@
public void writeToParcel(Parcel out, int flags) {
out.writeInt(mRollbackId);
out.writeTypedList(mPackages);
+ out.writeBoolean(mIsStaged);
out.writeTypedList(mCausePackages);
+ out.writeInt(mCommittedSessionId);
}
public static final Parcelable.Creator<RollbackInfo> CREATOR =
diff --git a/core/java/android/database/sqlite/SQLiteConnection.java b/core/java/android/database/sqlite/SQLiteConnection.java
index 20505ca..3c8e236 100644
--- a/core/java/android/database/sqlite/SQLiteConnection.java
+++ b/core/java/android/database/sqlite/SQLiteConnection.java
@@ -448,6 +448,8 @@
} finally {
execute(success ? "COMMIT" : "ROLLBACK", null, null);
}
+ } catch (SQLiteException ex) {
+ throw ex;
} catch (RuntimeException ex) {
throw new SQLiteException("Failed to change locale for db '" + mConfiguration.label
+ "' to '" + newLocale + "'.", ex);
diff --git a/core/java/android/database/sqlite/SQLiteDatabase.java b/core/java/android/database/sqlite/SQLiteDatabase.java
index a1b0803..ae456af 100644
--- a/core/java/android/database/sqlite/SQLiteDatabase.java
+++ b/core/java/android/database/sqlite/SQLiteDatabase.java
@@ -890,9 +890,14 @@
try {
try {
openInner();
- } catch (SQLiteDatabaseCorruptException ex) {
- onCorruption();
- openInner();
+ } catch (RuntimeException ex) {
+ if (SQLiteDatabaseCorruptException.isCorruptException(ex)) {
+ Log.e(TAG, "Database corruption detected in open()", ex);
+ onCorruption();
+ openInner();
+ } else {
+ throw ex;
+ }
}
} catch (SQLiteException ex) {
Log.e(TAG, "Failed to open database '" + getLabel() + "'.", ex);
diff --git a/core/java/android/database/sqlite/SQLiteDatabaseCorruptException.java b/core/java/android/database/sqlite/SQLiteDatabaseCorruptException.java
index 73b6c0c..488ef46 100644
--- a/core/java/android/database/sqlite/SQLiteDatabaseCorruptException.java
+++ b/core/java/android/database/sqlite/SQLiteDatabaseCorruptException.java
@@ -25,4 +25,20 @@
public SQLiteDatabaseCorruptException(String error) {
super(error);
}
+
+ /**
+ * @return true if a given {@link Throwable} or any of its inner causes is of
+ * {@link SQLiteDatabaseCorruptException}.
+ *
+ * @hide
+ */
+ public static boolean isCorruptException(Throwable th) {
+ while (th != null) {
+ if (th instanceof SQLiteDatabaseCorruptException) {
+ return true;
+ }
+ th = th.getCause();
+ }
+ return false;
+ }
}
diff --git a/core/java/android/hardware/biometrics/BiometricFaceConstants.java b/core/java/android/hardware/biometrics/BiometricFaceConstants.java
index 125dabe..b708ef1 100644
--- a/core/java/android/hardware/biometrics/BiometricFaceConstants.java
+++ b/core/java/android/hardware/biometrics/BiometricFaceConstants.java
@@ -268,7 +268,7 @@
* capture plane is too high.
*
* The tilt angle is defined as the angle swept out by the user’s face looking up
- * and down. The pan angle would be zero if the user faced the camera directly.
+ * and down. The tilt angle would be zero if the user faced the camera directly.
*
* The user should be informed to look more directly at the camera.
*/
@@ -279,8 +279,8 @@
* capture plane is too high.
*
* The roll angle is defined as the angle swept out by the user’s face tilting their head
- * towards their shoulders to the left and right. The pan angle would be zero if the user
- * faced the camera directly.
+ * towards their shoulders to the left and right. The roll angle would be zero if the user's
+ * head is vertically aligned with the camera.
*
* The user should be informed to look more directly at the camera.
*/
diff --git a/core/java/android/hardware/biometrics/BiometricPrompt.java b/core/java/android/hardware/biometrics/BiometricPrompt.java
index ec62aba..d569a78 100644
--- a/core/java/android/hardware/biometrics/BiometricPrompt.java
+++ b/core/java/android/hardware/biometrics/BiometricPrompt.java
@@ -202,6 +202,9 @@
* Required: Set the text for the negative button. This would typically be used as a
* "Cancel" button, but may be also used to show an alternative method for authentication,
* such as screen that asks for a backup password.
+ *
+ * Note that this should not be set if {@link #setEnableFallback(boolean)} is set to true.
+ *
* @param text
* @return
*/
@@ -248,6 +251,10 @@
/**
* The user will first be prompted to authenticate with biometrics, but also given the
* option to authenticate with their device PIN, pattern, or password.
+ *
+ * Note that {@link #setNegativeButton(CharSequence, Executor,
+ * DialogInterface.OnClickListener)} should not be set if this is set to true.
+ *
* @param enable When true, the prompt will fall back to ask for the user's device
* credentials (PIN, pattern, or password).
* @return
diff --git a/core/java/android/hardware/display/BrightnessChangeEvent.java b/core/java/android/hardware/display/BrightnessChangeEvent.java
index 02eb28c..c6186bb 100644
--- a/core/java/android/hardware/display/BrightnessChangeEvent.java
+++ b/core/java/android/hardware/display/BrightnessChangeEvent.java
@@ -16,11 +16,15 @@
package android.hardware.display;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
import android.annotation.SystemApi;
import android.annotation.TestApi;
import android.os.Parcel;
import android.os.Parcelable;
+import java.util.Objects;
+
/**
* Data about a brightness settings change.
*
@@ -72,12 +76,29 @@
/** Whether brightness curve includes a user brightness point */
public final boolean isUserSetBrightness;
+ /**
+ * Histogram counting how many times a pixel of a given value was displayed onscreen for the
+ * Value component of HSV if the device supports color sampling, if the device does not support
+ * color sampling the value will be null.
+ * The buckets of the histogram are evenly weighted, the number of buckets is device specific.
+ * For example if we had {10, 6, 4, 1} this means that 10 pixels were in the range
+ * [0x00,0x3f], 6 pixels were in the range [0x40,0x7f] etc.
+ */
+ @Nullable
+ public final long[] colorValueBuckets;
+
+ /**
+ * How many milliseconds of data are contained in the colorValueBuckets.
+ */
+ public final long colorSampleDuration;
+
/** @hide */
private BrightnessChangeEvent(float brightness, long timeStamp, String packageName,
int userId, float[] luxValues, long[] luxTimestamps, float batteryLevel,
float powerBrightnessFactor, boolean nightMode, int colorTemperature,
- float lastBrightness, boolean isDefaultBrightnessConfig, boolean isUserSetBrightness) {
+ float lastBrightness, boolean isDefaultBrightnessConfig, boolean isUserSetBrightness,
+ long[] colorValueBuckets, long colorSampleDuration) {
this.brightness = brightness;
this.timeStamp = timeStamp;
this.packageName = packageName;
@@ -91,6 +112,8 @@
this.lastBrightness = lastBrightness;
this.isDefaultBrightnessConfig = isDefaultBrightnessConfig;
this.isUserSetBrightness = isUserSetBrightness;
+ this.colorValueBuckets = colorValueBuckets;
+ this.colorSampleDuration = colorSampleDuration;
}
/** @hide */
@@ -108,6 +131,8 @@
this.lastBrightness = other.lastBrightness;
this.isDefaultBrightnessConfig = other.isDefaultBrightnessConfig;
this.isUserSetBrightness = other.isUserSetBrightness;
+ this.colorValueBuckets = other.colorValueBuckets;
+ this.colorSampleDuration = other.colorSampleDuration;
}
private BrightnessChangeEvent(Parcel source) {
@@ -124,6 +149,8 @@
lastBrightness = source.readFloat();
isDefaultBrightnessConfig = source.readBoolean();
isUserSetBrightness = source.readBoolean();
+ colorValueBuckets = source.createLongArray();
+ colorSampleDuration = source.readLong();
}
public static final Creator<BrightnessChangeEvent> CREATOR =
@@ -156,6 +183,8 @@
dest.writeFloat(lastBrightness);
dest.writeBoolean(isDefaultBrightnessConfig);
dest.writeBoolean(isUserSetBrightness);
+ dest.writeLongArray(colorValueBuckets);
+ dest.writeLong(colorSampleDuration);
}
/** @hide */
@@ -173,6 +202,8 @@
private float mLastBrightness;
private boolean mIsDefaultBrightnessConfig;
private boolean mIsUserSetBrightness;
+ private long[] mColorValueBuckets;
+ private long mColorSampleDuration;
/** {@see BrightnessChangeEvent#brightness} */
public Builder setBrightness(float brightness) {
@@ -252,12 +283,21 @@
return this;
}
+ /** {@see BrightnessChangeEvent#valueBuckets} */
+ public Builder setColorValues(@NonNull long[] colorValueBuckets, long colorSampleDuration) {
+ Objects.requireNonNull(colorValueBuckets);
+ mColorValueBuckets = colorValueBuckets;
+ mColorSampleDuration = colorSampleDuration;
+ return this;
+ }
+
/** Builds a BrightnessChangeEvent */
public BrightnessChangeEvent build() {
return new BrightnessChangeEvent(mBrightness, mTimeStamp,
mPackageName, mUserId, mLuxValues, mLuxTimestamps, mBatteryLevel,
mPowerBrightnessFactor, mNightMode, mColorTemperature, mLastBrightness,
- mIsDefaultBrightnessConfig, mIsUserSetBrightness);
+ mIsDefaultBrightnessConfig, mIsUserSetBrightness, mColorValueBuckets,
+ mColorSampleDuration);
}
}
}
diff --git a/core/java/android/hardware/hdmi/HdmiClient.java b/core/java/android/hardware/hdmi/HdmiClient.java
index 45a79e1..bff8c39 100644
--- a/core/java/android/hardware/hdmi/HdmiClient.java
+++ b/core/java/android/hardware/hdmi/HdmiClient.java
@@ -56,6 +56,26 @@
}
/**
+ * Sends a volume key event to the primary audio receiver in the system. This method should only
+ * be called when the volume key is not handled by the local device. HDMI framework handles the
+ * logic of finding the address of the receiver.
+ *
+ * @param keyCode key code to send. Defined in {@link android.view.KeyEvent}.
+ * @param isPressed true if this is key press event
+ *
+ * @hide
+ * TODO(b/110094868): unhide for Q
+ */
+ public void sendVolumeKeyEvent(int keyCode, boolean isPressed) {
+ try {
+ mService.sendVolumeKeyEvent(getDeviceType(), keyCode, isPressed);
+ } catch (RemoteException e) {
+ Log.e(TAG, "sendVolumeKeyEvent threw exception ", e);
+ throw e.rethrowFromSystemServer();
+ }
+ }
+
+ /**
* Sends vendor-specific command.
*
* @param targetAddress address of the target device
diff --git a/core/java/android/hardware/hdmi/IHdmiControlService.aidl b/core/java/android/hardware/hdmi/IHdmiControlService.aidl
index 1cd9920..95eaf75 100644
--- a/core/java/android/hardware/hdmi/IHdmiControlService.aidl
+++ b/core/java/android/hardware/hdmi/IHdmiControlService.aidl
@@ -47,6 +47,7 @@
void deviceSelect(int deviceId, IHdmiControlCallback callback);
void portSelect(int portId, IHdmiControlCallback callback);
void sendKeyEvent(int deviceType, int keyCode, boolean isPressed);
+ void sendVolumeKeyEvent(int deviceType, int keyCode, boolean isPressed);
List<HdmiPortInfo> getPortInfo();
boolean canChangeSystemAudioMode();
boolean getSystemAudioMode();
diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java
index 1656c6f..ce2de9a 100644
--- a/core/java/android/net/ConnectivityManager.java
+++ b/core/java/android/net/ConnectivityManager.java
@@ -1816,7 +1816,7 @@
@Override
public void handleMessage(Message message) {
switch (message.what) {
- case NetworkAgent.EVENT_PACKET_KEEPALIVE:
+ case NetworkAgent.EVENT_SOCKET_KEEPALIVE:
int error = message.arg2;
try {
if (error == SUCCESS) {
diff --git a/core/java/android/net/KeepalivePacketData.java b/core/java/android/net/KeepalivePacketData.java
index 7436ad0..16555d8 100644
--- a/core/java/android/net/KeepalivePacketData.java
+++ b/core/java/android/net/KeepalivePacketData.java
@@ -16,22 +16,20 @@
package android.net;
-import static android.net.ConnectivityManager.PacketKeepalive.*;
+import static android.net.SocketKeepalive.ERROR_INVALID_IP_ADDRESS;
+import static android.net.SocketKeepalive.ERROR_INVALID_PORT;
+import android.net.SocketKeepalive.InvalidPacketException;
import android.net.util.IpUtils;
import android.os.Parcel;
import android.os.Parcelable;
-import android.system.OsConstants;
import android.util.Log;
-import java.net.Inet4Address;
import java.net.InetAddress;
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
/**
* Represents the actual packets that are sent by the
- * {@link android.net.ConnectivityManager.PacketKeepalive} API.
+ * {@link android.net.SocketKeepalive} API.
*
* @hide
*/
@@ -53,8 +51,8 @@
/** Packet data. A raw byte string of packet data, not including the link-layer header. */
private final byte[] mPacket;
- private static final int IPV4_HEADER_LENGTH = 20;
- private static final int UDP_HEADER_LENGTH = 8;
+ protected static final int IPV4_HEADER_LENGTH = 20;
+ protected static final int UDP_HEADER_LENGTH = 8;
// This should only be constructed via static factory methods, such as
// nattKeepalivePacket
@@ -80,53 +78,10 @@
}
}
- public static class InvalidPacketException extends Exception {
- public final int error;
- public InvalidPacketException(int error) {
- this.error = error;
- }
- }
-
public byte[] getPacket() {
return mPacket.clone();
}
- public static KeepalivePacketData nattKeepalivePacket(
- InetAddress srcAddress, int srcPort, InetAddress dstAddress, int dstPort)
- throws InvalidPacketException {
-
- if (!(srcAddress instanceof Inet4Address) || !(dstAddress instanceof Inet4Address)) {
- throw new InvalidPacketException(ERROR_INVALID_IP_ADDRESS);
- }
-
- if (dstPort != NATT_PORT) {
- throw new InvalidPacketException(ERROR_INVALID_PORT);
- }
-
- int length = IPV4_HEADER_LENGTH + UDP_HEADER_LENGTH + 1;
- ByteBuffer buf = ByteBuffer.allocate(length);
- buf.order(ByteOrder.BIG_ENDIAN);
- buf.putShort((short) 0x4500); // IP version and TOS
- buf.putShort((short) length);
- buf.putInt(0); // ID, flags, offset
- buf.put((byte) 64); // TTL
- buf.put((byte) OsConstants.IPPROTO_UDP);
- int ipChecksumOffset = buf.position();
- buf.putShort((short) 0); // IP checksum
- buf.put(srcAddress.getAddress());
- buf.put(dstAddress.getAddress());
- buf.putShort((short) srcPort);
- buf.putShort((short) dstPort);
- buf.putShort((short) (length - 20)); // UDP length
- int udpChecksumOffset = buf.position();
- buf.putShort((short) 0); // UDP checksum
- buf.put((byte) 0xff); // NAT-T keepalive
- buf.putShort(ipChecksumOffset, IpUtils.ipChecksum(buf, 0));
- buf.putShort(udpChecksumOffset, IpUtils.udpChecksum(buf, 0, IPV4_HEADER_LENGTH));
-
- return new KeepalivePacketData(srcAddress, srcPort, dstAddress, dstPort, buf.array());
- }
-
/* Parcelable Implementation */
public int describeContents() {
return 0;
diff --git a/core/java/android/net/NattKeepalivePacketData.java b/core/java/android/net/NattKeepalivePacketData.java
new file mode 100644
index 0000000..aa9f799
--- /dev/null
+++ b/core/java/android/net/NattKeepalivePacketData.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2018 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.net.SocketKeepalive.InvalidPacketException;
+import android.net.util.IpUtils;
+import android.system.OsConstants;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+/** @hide */
+public final class NattKeepalivePacketData extends KeepalivePacketData {
+
+ // This should only be constructed via static factory methods, such as
+ // nattKeepalivePacket
+ private NattKeepalivePacketData(InetAddress srcAddress, int srcPort,
+ InetAddress dstAddress, int dstPort, byte[] data) throws
+ InvalidPacketException {
+ super(srcAddress, srcPort, dstAddress, dstPort, data);
+ }
+
+ /**
+ * Factory method to create Nat-T keepalive packet structure.
+ */
+ public static NattKeepalivePacketData nattKeepalivePacket(
+ InetAddress srcAddress, int srcPort, InetAddress dstAddress, int dstPort)
+ throws InvalidPacketException {
+
+ if (!(srcAddress instanceof Inet4Address) || !(dstAddress instanceof Inet4Address)) {
+ throw new InvalidPacketException(SocketKeepalive.ERROR_INVALID_IP_ADDRESS);
+ }
+
+ if (dstPort != NattSocketKeepalive.NATT_PORT) {
+ throw new InvalidPacketException(SocketKeepalive.ERROR_INVALID_PORT);
+ }
+
+ int length = IPV4_HEADER_LENGTH + UDP_HEADER_LENGTH + 1;
+ ByteBuffer buf = ByteBuffer.allocate(length);
+ buf.order(ByteOrder.BIG_ENDIAN);
+ buf.putShort((short) 0x4500); // IP version and TOS
+ buf.putShort((short) length);
+ buf.putInt(0); // ID, flags, offset
+ buf.put((byte) 64); // TTL
+ buf.put((byte) OsConstants.IPPROTO_UDP);
+ int ipChecksumOffset = buf.position();
+ buf.putShort((short) 0); // IP checksum
+ buf.put(srcAddress.getAddress());
+ buf.put(dstAddress.getAddress());
+ buf.putShort((short) srcPort);
+ buf.putShort((short) dstPort);
+ buf.putShort((short) (length - 20)); // UDP length
+ int udpChecksumOffset = buf.position();
+ buf.putShort((short) 0); // UDP checksum
+ buf.put((byte) 0xff); // NAT-T keepalive
+ buf.putShort(ipChecksumOffset, IpUtils.ipChecksum(buf, 0));
+ buf.putShort(udpChecksumOffset, IpUtils.udpChecksum(buf, 0, IPV4_HEADER_LENGTH));
+
+ return new NattKeepalivePacketData(srcAddress, srcPort, dstAddress, dstPort, buf.array());
+ }
+}
diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java
index 204c25f..c3783783 100644
--- a/core/java/android/net/NetworkAgent.java
+++ b/core/java/android/net/NetworkAgent.java
@@ -18,7 +18,6 @@
import android.annotation.UnsupportedAppUsage;
import android.content.Context;
-import android.net.ConnectivityManager.PacketKeepalive;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
@@ -155,7 +154,7 @@
*
* Also used internally by ConnectivityService / KeepaliveTracker, with different semantics.
*/
- public static final int CMD_START_PACKET_KEEPALIVE = BASE + 11;
+ public static final int CMD_START_SOCKET_KEEPALIVE = BASE + 11;
/**
* Requests that the specified keepalive packet be stopped.
@@ -164,20 +163,20 @@
*
* Also used internally by ConnectivityService / KeepaliveTracker, with different semantics.
*/
- public static final int CMD_STOP_PACKET_KEEPALIVE = BASE + 12;
+ public static final int CMD_STOP_SOCKET_KEEPALIVE = BASE + 12;
/**
- * Sent by the NetworkAgent to ConnectivityService to provide status on a packet keepalive
- * request. This may either be the reply to a CMD_START_PACKET_KEEPALIVE, or an asynchronous
+ * Sent by the NetworkAgent to ConnectivityService to provide status on a socket keepalive
+ * request. This may either be the reply to a CMD_START_SOCKET_KEEPALIVE, or an asynchronous
* error notification.
*
- * This is also sent by KeepaliveTracker to the app's ConnectivityManager.PacketKeepalive to
- * so that the app's PacketKeepaliveCallback methods can be called.
+ * This is also sent by KeepaliveTracker to the app's {@link SocketKeepalive},
+ * so that the app's {@link SocketKeepalive.Callback} methods can be called.
*
* arg1 = slot number of the keepalive
* arg2 = error code
*/
- public static final int EVENT_PACKET_KEEPALIVE = BASE + 13;
+ public static final int EVENT_SOCKET_KEEPALIVE = BASE + 13;
/**
* Sent by ConnectivityService to inform this network transport of signal strength thresholds
@@ -305,12 +304,12 @@
saveAcceptUnvalidated(msg.arg1 != 0);
break;
}
- case CMD_START_PACKET_KEEPALIVE: {
- startPacketKeepalive(msg);
+ case CMD_START_SOCKET_KEEPALIVE: {
+ startSocketKeepalive(msg);
break;
}
- case CMD_STOP_PACKET_KEEPALIVE: {
- stopPacketKeepalive(msg);
+ case CMD_STOP_SOCKET_KEEPALIVE: {
+ stopSocketKeepalive(msg);
break;
}
@@ -460,22 +459,22 @@
/**
* Requests that the network hardware send the specified packet at the specified interval.
*/
- protected void startPacketKeepalive(Message msg) {
- onPacketKeepaliveEvent(msg.arg1, PacketKeepalive.ERROR_HARDWARE_UNSUPPORTED);
+ protected void startSocketKeepalive(Message msg) {
+ onSocketKeepaliveEvent(msg.arg1, SocketKeepalive.ERROR_HARDWARE_UNSUPPORTED);
}
/**
* Requests that the network hardware send the specified packet at the specified interval.
*/
- protected void stopPacketKeepalive(Message msg) {
- onPacketKeepaliveEvent(msg.arg1, PacketKeepalive.ERROR_HARDWARE_UNSUPPORTED);
+ protected void stopSocketKeepalive(Message msg) {
+ onSocketKeepaliveEvent(msg.arg1, SocketKeepalive.ERROR_HARDWARE_UNSUPPORTED);
}
/**
- * Called by the network when a packet keepalive event occurs.
+ * Called by the network when a socket keepalive event occurs.
*/
- public void onPacketKeepaliveEvent(int slot, int reason) {
- queueOrSendMessage(EVENT_PACKET_KEEPALIVE, slot, reason);
+ public void onSocketKeepaliveEvent(int slot, int reason) {
+ queueOrSendMessage(EVENT_SOCKET_KEEPALIVE, slot, reason);
}
/**
diff --git a/core/java/android/net/SocketKeepalive.java b/core/java/android/net/SocketKeepalive.java
index 97d50f4..a47c11af 100644
--- a/core/java/android/net/SocketKeepalive.java
+++ b/core/java/android/net/SocketKeepalive.java
@@ -109,6 +109,18 @@
**/
public static final int MAX_INTERVAL_SEC = 3600;
+ /**
+ * This packet is invalid.
+ * See the error code for details.
+ * @hide
+ */
+ public static class InvalidPacketException extends Exception {
+ public final int error;
+ public InvalidPacketException(int error) {
+ this.error = error;
+ }
+ }
+
@NonNull final IConnectivityManager mService;
@NonNull final Network mNetwork;
@NonNull private final Executor mExecutor;
@@ -135,7 +147,7 @@
@Override
public void handleMessage(Message message) {
switch (message.what) {
- case NetworkAgent.EVENT_PACKET_KEEPALIVE:
+ case NetworkAgent.EVENT_SOCKET_KEEPALIVE:
final int status = message.arg2;
try {
if (status == SUCCESS) {
diff --git a/core/java/android/os/Binder.java b/core/java/android/os/Binder.java
index 1ebb551..b28c2f4 100644
--- a/core/java/android/os/Binder.java
+++ b/core/java/android/os/Binder.java
@@ -967,7 +967,7 @@
* By default, we use the calling uid since we can always trust it.
*/
private static volatile BinderInternal.WorkSourceProvider sWorkSourceProvider =
- Binder::getCallingUid;
+ (x) -> Binder.getCallingUid();
/**
* Sets the work source provider.
@@ -991,21 +991,23 @@
// Entry point from android_util_Binder.cpp's onTransact
private boolean execTransact(int code, long dataObj, long replyObj,
int flags) {
- final int workSourceUid = sWorkSourceProvider.resolveWorkSourceUid();
- final long origWorkSource = ThreadLocalWorkSource.setUid(workSourceUid);
+ // At that point, the parcel request headers haven't been parsed so we do not know what
+ // WorkSource the caller has set. Use calling uid as the default.
+ final int callingUid = Binder.getCallingUid();
+ final long origWorkSource = ThreadLocalWorkSource.setUid(callingUid);
try {
- return execTransactInternal(code, dataObj, replyObj, flags, workSourceUid);
+ return execTransactInternal(code, dataObj, replyObj, flags, callingUid);
} finally {
ThreadLocalWorkSource.restore(origWorkSource);
}
}
- private boolean execTransactInternal(int code, long dataObj, long replyObj,
- int flags, int workSourceUid) {
+ private boolean execTransactInternal(int code, long dataObj, long replyObj, int flags,
+ int callingUid) {
// Make sure the observer won't change while processing a transaction.
final BinderInternal.Observer observer = sObserver;
final CallSession callSession =
- observer != null ? observer.callStarted(this, code, workSourceUid) : null;
+ observer != null ? observer.callStarted(this, code, UNSET_WORKSOURCE) : null;
Parcel data = Parcel.obtain(dataObj);
Parcel reply = Parcel.obtain(replyObj);
// theoretically, we should call transact, which will call onTransact,
@@ -1045,6 +1047,10 @@
Trace.traceEnd(Trace.TRACE_TAG_ALWAYS);
}
if (observer != null) {
+ // The parcel RPC headers have been called during onTransact so we can now access
+ // the worksource uid from the parcel.
+ final int workSourceUid = sWorkSourceProvider.resolveWorkSourceUid(
+ data.readCallingWorkSourceUid());
observer.callEnded(callSession, data.dataSize(), reply.dataSize(), workSourceUid);
}
}
diff --git a/core/java/android/os/BinderProxy.java b/core/java/android/os/BinderProxy.java
index 97d72f0..97c0a13 100644
--- a/core/java/android/os/BinderProxy.java
+++ b/core/java/android/os/BinderProxy.java
@@ -493,8 +493,17 @@
// Make sure the listener won't change while processing a transaction.
final Binder.ProxyTransactListener transactListener = sTransactListener;
Object session = null;
+
if (transactListener != null) {
+ final int origWorkSourceUid = Binder.getCallingWorkSourceUid();
session = transactListener.onTransactStarted(this, code);
+
+ // Allow the listener to update the work source uid. We need to update the request
+ // header if the uid is updated.
+ final int updatedWorkSourceUid = Binder.getCallingWorkSourceUid();
+ if (origWorkSourceUid != updatedWorkSourceUid) {
+ data.replaceCallingWorkSourceUid(updatedWorkSourceUid);
+ }
}
try {
diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java
index b9cdcc0..79e9ba5 100644
--- a/core/java/android/os/Parcel.java
+++ b/core/java/android/os/Parcel.java
@@ -333,6 +333,12 @@
private static native void nativeWriteInterfaceToken(long nativePtr, String interfaceName);
private static native void nativeEnforceInterface(long nativePtr, String interfaceName);
+ @CriticalNative
+ private static native boolean nativeReplaceCallingWorkSourceUid(
+ long nativePtr, int workSourceUid);
+ @CriticalNative
+ private static native int nativeReadCallingWorkSourceUid(long nativePtr);
+
/** Last time exception with a stack trace was written */
private static volatile long sLastWriteExceptionStackTrace;
/** Used for throttling of writing stack trace, which is costly */
@@ -613,6 +619,35 @@
}
/**
+ * Writes the work source uid to the request headers.
+ *
+ * <p>It requires the headers to have been written/read already to replace the work source.
+ *
+ * @return true if the request headers have been updated.
+ *
+ * @hide
+ */
+ public boolean replaceCallingWorkSourceUid(int workSourceUid) {
+ return nativeReplaceCallingWorkSourceUid(mNativePtr, workSourceUid);
+ }
+
+ /**
+ * Reads the work source uid from the request headers.
+ *
+ * <p>Unlike other read methods, this method does not read the parcel at the current
+ * {@link #dataPosition}. It will set the {@link #dataPosition} before the read and restore the
+ * position after reading the request header.
+ *
+ * @return the work source uid or {@link Binder#UNSET_WORKSOURCE} if headers have not been
+ * written/parsed yet.
+ *
+ * @hide
+ */
+ public int readCallingWorkSourceUid() {
+ return nativeReadCallingWorkSourceUid(mNativePtr);
+ }
+
+ /**
* Write a byte array into the parcel at the current {@link #dataPosition},
* growing {@link #dataCapacity} if needed.
* @param b Bytes to place into the parcel.
diff --git a/core/java/android/permission/IPermissionController.aidl b/core/java/android/permission/IPermissionController.aidl
index 5dd869f..7e9ba5d 100644
--- a/core/java/android/permission/IPermissionController.aidl
+++ b/core/java/android/permission/IPermissionController.aidl
@@ -30,10 +30,13 @@
void revokeRuntimePermissions(in Bundle request, boolean doDryRun, int reason,
String callerPackageName, in RemoteCallback callback);
void getRuntimePermissionBackup(in UserHandle user, in ParcelFileDescriptor pipe);
+ void restoreRuntimePermissionBackup(in UserHandle user, in ParcelFileDescriptor pipe);
+ void restoreDelayedRuntimePermissionBackup(String packageName, in UserHandle user,
+ in RemoteCallback callback);
void getAppPermissions(String packageName, in RemoteCallback callback);
void revokeRuntimePermission(String packageName, String permissionName);
- void countPermissionApps(in List<String> permissionNames, boolean countOnlyGranted,
- boolean countSystem, in RemoteCallback callback);
+ void countPermissionApps(in List<String> permissionNames, int flags,
+ in RemoteCallback callback);
void getPermissionUsages(boolean countSystem, long numMillis, in RemoteCallback callback);
void isApplicationQualifiedForRole(String roleName, String packageName,
in RemoteCallback callback);
diff --git a/core/java/android/permission/PermissionControllerManager.java b/core/java/android/permission/PermissionControllerManager.java
index b59d0c7..89967c3 100644
--- a/core/java/android/permission/PermissionControllerManager.java
+++ b/core/java/android/permission/PermissionControllerManager.java
@@ -20,9 +20,12 @@
import static com.android.internal.util.Preconditions.checkArgumentNonnegative;
import static com.android.internal.util.Preconditions.checkCollectionElementsNotNull;
+import static com.android.internal.util.Preconditions.checkFlagsArgument;
import static com.android.internal.util.Preconditions.checkNotNull;
import static com.android.internal.util.Preconditions.checkStringNotEmpty;
+import static java.lang.Math.min;
+
import android.Manifest;
import android.annotation.CallbackExecutor;
import android.annotation.IntDef;
@@ -59,6 +62,7 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.ArrayList;
@@ -113,6 +117,20 @@
*/
public static final int REASON_INSTALLER_POLICY_VIOLATION = 2;
+ /** @hide */
+ @IntDef(prefix = { "COUNT_" }, value = {
+ COUNT_ONLY_WHEN_GRANTED,
+ COUNT_WHEN_SYSTEM,
+ }, flag = true)
+ @Retention(RetentionPolicy.SOURCE)
+ public @interface CountPermissionAppsFlag {}
+
+ /** Count an app only if the permission is granted to the app. */
+ public static final int COUNT_ONLY_WHEN_GRANTED = 1;
+
+ /** Count and app even if it is a system app. */
+ public static final int COUNT_WHEN_SYSTEM = 2;
+
/**
* Callback for delivering the result of {@link #revokeRuntimePermissions}.
*/
@@ -162,7 +180,7 @@
*/
public interface OnCountPermissionAppsResultCallback {
/**
- * The result for {@link #countPermissionApps(List, boolean, boolean,
+ * The result for {@link #countPermissionApps(List, int,
* OnCountPermissionAppsResultCallback, Handler)}.
*
* @param numApps The number of apps that have one of the permissions
@@ -254,6 +272,7 @@
public void getRuntimePermissionBackup(@NonNull UserHandle user,
@NonNull @CallbackExecutor Executor executor,
@NonNull OnGetRuntimePermissionBackupCallback callback) {
+ checkNotNull(user);
checkNotNull(executor);
checkNotNull(callback);
@@ -262,6 +281,49 @@
}
/**
+ * Restore a backup of the runtime permissions.
+ *
+ * @param backup the backup to restore. The backup is sent asynchronously, hence it should not
+ * be modified after calling this method.
+ * @param user The user to be restore
+ *
+ * @hide
+ */
+ @RequiresPermission(Manifest.permission.GRANT_RUNTIME_PERMISSIONS)
+ public void restoreRuntimePermissionBackup(@NonNull byte[] backup, @NonNull UserHandle user) {
+ checkNotNull(backup);
+ checkNotNull(user);
+
+ sRemoteService.scheduleAsyncRequest(
+ new PendingRestoreRuntimePermissionBackup(sRemoteService, backup, user));
+ }
+
+ /**
+ * Restore a backup of the runtime permissions that has been delayed.
+ *
+ * @param packageName The package that is ready to have it's permissions restored.
+ * @param user The user to restore
+ * @param executor Executor to execute the callback on
+ * @param callback Is called with {@code true} iff there is still more delayed backup left
+ *
+ * @hide
+ */
+ @RequiresPermission(Manifest.permission.GRANT_RUNTIME_PERMISSIONS)
+ public void restoreDelayedRuntimePermissionBackup(@NonNull String packageName,
+ @NonNull UserHandle user,
+ @NonNull @CallbackExecutor Executor executor,
+ @NonNull Consumer<Boolean> callback) {
+ checkNotNull(packageName);
+ checkNotNull(user);
+ checkNotNull(executor);
+ checkNotNull(callback);
+
+ sRemoteService.scheduleRequest(
+ new PendingRestoreDelayedRuntimePermissionBackup(sRemoteService, packageName,
+ user, executor, callback));
+ }
+
+ /**
* Gets the runtime permissions for an app.
*
* @param packageName The package for which to query.
@@ -302,8 +364,8 @@
* Count how many apps have one of a set of permissions.
*
* @param permissionNames The permissions the app might have
- * @param countOnlyGranted Count an app only if the permission is granted to the app
- * @param countSystem Also count system apps
+ * @param flags Modify which apps to count. By default all non-system apps that request a
+ * permission are counted
* @param callback Callback to receive the result
* @param handler Handler on which to invoke the callback
*
@@ -311,13 +373,14 @@
*/
@RequiresPermission(Manifest.permission.GET_RUNTIME_PERMISSIONS)
public void countPermissionApps(@NonNull List<String> permissionNames,
- boolean countOnlyGranted, boolean countSystem,
+ @CountPermissionAppsFlag int flags,
@NonNull OnCountPermissionAppsResultCallback callback, @Nullable Handler handler) {
checkCollectionElementsNotNull(permissionNames, "permissionNames");
+ checkFlagsArgument(flags, COUNT_WHEN_SYSTEM | COUNT_ONLY_WHEN_GRANTED);
checkNotNull(callback);
sRemoteService.scheduleRequest(new PendingCountPermissionAppsRequest(sRemoteService,
- permissionNames, countOnlyGranted, countSystem, callback,
+ permissionNames, flags, callback,
handler == null ? sRemoteService.getHandler() : handler));
}
@@ -503,6 +566,80 @@
}
/**
+ * Task to send a large amount of data to a remote service.
+ */
+ private static class FileWriterTask extends AsyncTask<byte[], Void, Void> {
+ private static final int CHUNK_SIZE = 4 * 1024;
+
+ private ParcelFileDescriptor mLocalPipe;
+ private ParcelFileDescriptor mRemotePipe;
+
+ @Override
+ protected void onPreExecute() {
+ ParcelFileDescriptor[] pipe;
+ try {
+ pipe = ParcelFileDescriptor.createPipe();
+ } catch (IOException e) {
+ Log.e(TAG, "Could not create pipe needed to send runtime permission backup",
+ e);
+ return;
+ }
+
+ mRemotePipe = pipe[0];
+ mLocalPipe = pipe[1];
+ }
+
+ /**
+ * Get the file descriptor the remote service should read the data from.
+ *
+ * @return The file the data should be read from
+ */
+ ParcelFileDescriptor getRemotePipe() {
+ return mRemotePipe;
+ }
+
+ /**
+ * Send the data to the remove service.
+ *
+ * @param in The data to send
+ *
+ * @return ignored
+ */
+ @Override
+ protected Void doInBackground(byte[]... in) {
+ byte[] buffer = in[0];
+ try (OutputStream out = new ParcelFileDescriptor.AutoCloseOutputStream(mLocalPipe)) {
+ for (int offset = 0; offset < buffer.length; offset += CHUNK_SIZE) {
+ out.write(buffer, offset, min(CHUNK_SIZE, buffer.length - offset));
+ }
+ } catch (IOException | NullPointerException e) {
+ Log.e(TAG, "Error sending runtime permission backup", e);
+ }
+
+ return null;
+ }
+
+ /**
+ * Interrupt the send of the data.
+ *
+ * <p>Needs to be called when canceling this task as it might be hung.
+ */
+ void interruptRead() {
+ IoUtils.closeQuietly(mLocalPipe);
+ }
+
+ @Override
+ protected void onCancelled() {
+ onPostExecute(null);
+ }
+
+ @Override
+ protected void onPostExecute(Void ignored) {
+ IoUtils.closeQuietly(mLocalPipe);
+ }
+ }
+
+ /**
* Request for {@link #revokeRuntimePermissions}
*/
private static final class PendingRevokeRuntimePermissionRequest extends
@@ -651,6 +788,97 @@
}
/**
+ * Request for {@link #restoreRuntimePermissionBackup}
+ */
+ private static final class PendingRestoreRuntimePermissionBackup implements
+ AbstractRemoteService.AsyncRequest<IPermissionController> {
+ private final @NonNull FileWriterTask mBackupSender;
+ private final @NonNull byte[] mBackup;
+ private final @NonNull UserHandle mUser;
+
+ private PendingRestoreRuntimePermissionBackup(@NonNull RemoteService service,
+ @NonNull byte[] backup, @NonNull UserHandle user) {
+ mBackup = backup;
+ mUser = user;
+
+ mBackupSender = new FileWriterTask();
+ }
+
+ @Override
+ public void run(@NonNull IPermissionController service) {
+ ParcelFileDescriptor remotePipe = mBackupSender.getRemotePipe();
+ try {
+ service.restoreRuntimePermissionBackup(mUser, remotePipe);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error sending runtime permission backup", e);
+ mBackupSender.cancel(false);
+ } finally {
+ // Remote pipe end is duped by binder call. Local copy is not needed anymore
+ IoUtils.closeQuietly(remotePipe);
+ }
+
+ mBackupSender.execute(mBackup);
+ }
+ }
+
+ /**
+ * Request for {@link #restoreDelayedRuntimePermissionBackup(String, UserHandle, Executor,
+ * Consumer<Boolean>)}
+ */
+ private static final class PendingRestoreDelayedRuntimePermissionBackup extends
+ AbstractRemoteService.PendingRequest<RemoteService, IPermissionController> {
+ private final @NonNull String mPackageName;
+ private final @NonNull UserHandle mUser;
+ private final @NonNull Executor mExecutor;
+ private final @NonNull Consumer<Boolean> mCallback;
+
+ private final @NonNull RemoteCallback mRemoteCallback;
+
+ private PendingRestoreDelayedRuntimePermissionBackup(@NonNull RemoteService service,
+ @NonNull String packageName, @NonNull UserHandle user, @NonNull Executor executor,
+ @NonNull Consumer<Boolean> callback) {
+ super(service);
+
+ mPackageName = packageName;
+ mUser = user;
+ mExecutor = executor;
+ mCallback = callback;
+
+ mRemoteCallback = new RemoteCallback(result -> executor.execute(() -> {
+ long token = Binder.clearCallingIdentity();
+ try {
+ callback.accept(result.getBoolean(KEY_RESULT, false));
+ } finally {
+ Binder.restoreCallingIdentity(token);
+
+ finish();
+ }
+ }), null);
+ }
+
+ @Override
+ protected void onTimeout(RemoteService remoteService) {
+ long token = Binder.clearCallingIdentity();
+ try {
+ mExecutor.execute(
+ () -> mCallback.accept(true));
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+
+ @Override
+ public void run() {
+ try {
+ getService().getServiceInterface().restoreDelayedRuntimePermissionBackup(
+ mPackageName, mUser, mRemoteCallback);
+ } catch (RemoteException e) {
+ Log.e(TAG, "Error restoring delayed permissions for " + mPackageName, e);
+ }
+ }
+ }
+
+ /**
* Request for {@link #getAppPermissions}
*/
private static final class PendingGetAppPermissionRequest extends
@@ -731,20 +959,17 @@
AbstractRemoteService.PendingRequest<RemoteService, IPermissionController> {
private final @NonNull List<String> mPermissionNames;
private final @NonNull OnCountPermissionAppsResultCallback mCallback;
- private final boolean mCountOnlyGranted;
- private final boolean mCountSystem;
+ private final @CountPermissionAppsFlag int mFlags;
private final @NonNull RemoteCallback mRemoteCallback;
private PendingCountPermissionAppsRequest(@NonNull RemoteService service,
- @NonNull List<String> permissionNames, boolean countOnlyGranted,
- boolean countSystem, @NonNull OnCountPermissionAppsResultCallback callback,
- @NonNull Handler handler) {
+ @NonNull List<String> permissionNames, @CountPermissionAppsFlag int flags,
+ @NonNull OnCountPermissionAppsResultCallback callback, @NonNull Handler handler) {
super(service);
mPermissionNames = permissionNames;
- mCountOnlyGranted = countOnlyGranted;
- mCountSystem = countSystem;
+ mFlags = flags;
mCallback = callback;
mRemoteCallback = new RemoteCallback(result -> {
@@ -770,7 +995,7 @@
public void run() {
try {
getService().getServiceInterface().countPermissionApps(mPermissionNames,
- mCountOnlyGranted, mCountSystem, mRemoteCallback);
+ mFlags, mRemoteCallback);
} catch (RemoteException e) {
Log.e(TAG, "Error counting permission apps", e);
}
diff --git a/core/java/android/permission/PermissionControllerService.java b/core/java/android/permission/PermissionControllerService.java
index 9a58b97..fb6c061 100644
--- a/core/java/android/permission/PermissionControllerService.java
+++ b/core/java/android/permission/PermissionControllerService.java
@@ -16,14 +16,19 @@
package android.permission;
+import static android.permission.PermissionControllerManager.COUNT_ONLY_WHEN_GRANTED;
+import static android.permission.PermissionControllerManager.COUNT_WHEN_SYSTEM;
+
import static com.android.internal.util.Preconditions.checkArgument;
import static com.android.internal.util.Preconditions.checkArgumentNonnegative;
import static com.android.internal.util.Preconditions.checkCollectionElementsNotNull;
+import static com.android.internal.util.Preconditions.checkFlagsArgument;
import static com.android.internal.util.Preconditions.checkNotNull;
import static com.android.internal.util.Preconditions.checkStringNotEmpty;
import static com.android.internal.util.function.pooled.PooledLambda.obtainMessage;
import android.Manifest;
+import android.annotation.BinderThread;
import android.annotation.NonNull;
import android.annotation.SystemApi;
import android.app.Service;
@@ -37,12 +42,14 @@
import android.os.ParcelFileDescriptor;
import android.os.RemoteCallback;
import android.os.UserHandle;
+import android.permission.PermissionControllerManager.CountPermissionAppsFlag;
import android.util.ArrayMap;
import android.util.Log;
import com.android.internal.util.Preconditions;
import java.io.IOException;
+import java.io.InputStream;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
@@ -51,7 +58,7 @@
/**
* This service is meant to be implemented by the app controlling permissions.
*
- * @see PermissionController
+ * @see PermissionControllerManager
*
* @hide
*/
@@ -93,10 +100,32 @@
* Create a backup of the runtime permissions.
*
* @param user The user to back up
- * @param out The stream to write the backup to
+ * @param backup The stream to write the backup to
*/
public abstract void onGetRuntimePermissionsBackup(@NonNull UserHandle user,
- @NonNull OutputStream out);
+ @NonNull OutputStream backup);
+
+ /**
+ * Restore a backup of the runtime permissions.
+ *
+ * @param user The user to restore
+ * @param backup The stream to read the backup from
+ */
+ @BinderThread
+ public abstract void onRestoreRuntimePermissionsBackup(@NonNull UserHandle user,
+ @NonNull InputStream backup);
+
+ /**
+ * Restore a delayed backup of the runtime permissions.
+ *
+ * @param packageName The app to restore
+ * @param user The user to restore
+ *
+ * @return {@code true} iff there is still delayed backup left
+ */
+ @BinderThread
+ public abstract boolean onRestoreDelayedRuntimePermissionsBackup(@NonNull String packageName,
+ @NonNull UserHandle user);
/**
* Gets the runtime permissions for an app.
@@ -121,13 +150,13 @@
* Count how many apps have one of a set of permissions.
*
* @param permissionNames The permissions the app might have
- * @param countOnlyGranted Count an app only if the permission is granted to the app
- * @param countSystem Also count system apps
+ * @param flags Modify which apps to count. By default all non-system apps that request a
+ * permission are counted
*
* @return the number of apps that have one of the permissions
*/
public abstract int onCountPermissionApps(@NonNull List<String> permissionNames,
- boolean countOnlyGranted, boolean countSystem);
+ @CountPermissionAppsFlag int flags);
/**
* Count how many apps have used permissions.
@@ -202,6 +231,36 @@
}
@Override
+ public void restoreRuntimePermissionBackup(UserHandle user, ParcelFileDescriptor pipe) {
+ checkNotNull(user);
+ checkNotNull(pipe);
+
+ enforceCallingPermission(Manifest.permission.GRANT_RUNTIME_PERMISSIONS, null);
+
+ try (InputStream backup = new ParcelFileDescriptor.AutoCloseInputStream(pipe)) {
+ onRestoreRuntimePermissionsBackup(user, backup);
+ } catch (IOException e) {
+ Log.e(LOG_TAG, "Could not open pipe to read backup from", e);
+ }
+ }
+
+ @Override
+ public void restoreDelayedRuntimePermissionBackup(String packageName, UserHandle user,
+ RemoteCallback callback) {
+ checkNotNull(packageName);
+ checkNotNull(user);
+ checkNotNull(callback);
+
+ enforceCallingPermission(Manifest.permission.GRANT_RUNTIME_PERMISSIONS, null);
+
+ boolean hasMoreBackup = onRestoreDelayedRuntimePermissionsBackup(packageName, user);
+
+ Bundle result = new Bundle();
+ result.putBoolean(PermissionControllerManager.KEY_RESULT, hasMoreBackup);
+ callback.sendResult(result);
+ }
+
+ @Override
public void getAppPermissions(String packageName, RemoteCallback callback) {
checkNotNull(packageName, "packageName");
checkNotNull(callback, "callback");
@@ -226,17 +285,18 @@
}
@Override
- public void countPermissionApps(List<String> permissionNames, boolean countOnlyGranted,
- boolean countSystem, RemoteCallback callback) {
+ public void countPermissionApps(List<String> permissionNames, int flags,
+ RemoteCallback callback) {
checkCollectionElementsNotNull(permissionNames, "permissionNames");
+ checkFlagsArgument(flags, COUNT_WHEN_SYSTEM | COUNT_ONLY_WHEN_GRANTED);
checkNotNull(callback, "callback");
enforceCallingPermission(Manifest.permission.GET_RUNTIME_PERMISSIONS, null);
mHandler.sendMessage(
obtainMessage(PermissionControllerService::countPermissionApps,
- PermissionControllerService.this, permissionNames, countOnlyGranted,
- countSystem, callback));
+ PermissionControllerService.this, permissionNames, flags,
+ callback));
}
@Override
@@ -291,11 +351,11 @@
}
private void getRuntimePermissionsBackup(@NonNull UserHandle user,
- @NonNull ParcelFileDescriptor outFile) {
- try (OutputStream out = new ParcelFileDescriptor.AutoCloseOutputStream(outFile)) {
- onGetRuntimePermissionsBackup(user, out);
+ @NonNull ParcelFileDescriptor backupFile) {
+ try (OutputStream backup = new ParcelFileDescriptor.AutoCloseOutputStream(backupFile)) {
+ onGetRuntimePermissionsBackup(user, backup);
} catch (IOException e) {
- Log.e(LOG_TAG, "Could not open pipe to write backup tp", e);
+ Log.e(LOG_TAG, "Could not open pipe to write backup to", e);
}
}
@@ -311,8 +371,8 @@
}
private void countPermissionApps(@NonNull List<String> permissionNames,
- boolean countOnlyGranted, boolean countSystem, @NonNull RemoteCallback callback) {
- int numApps = onCountPermissionApps(permissionNames, countOnlyGranted, countSystem);
+ @CountPermissionAppsFlag int flags, @NonNull RemoteCallback callback) {
+ int numApps = onCountPermissionApps(permissionNames, flags);
Bundle result = new Bundle();
result.putInt(PermissionControllerManager.KEY_RESULT, numApps);
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java
index ffa47a9..e14bb66 100644
--- a/core/java/android/provider/Settings.java
+++ b/core/java/android/provider/Settings.java
@@ -3536,6 +3536,16 @@
private static final Validator MASTER_MONO_VALIDATOR = BOOLEAN_VALIDATOR;
/**
+ * Master balance (float -1.f = 100% left, 0.f = dead center, 1.f = 100% right).
+ *
+ * @hide
+ */
+ public static final String MASTER_BALANCE = "master_balance";
+
+ private static final Validator MASTER_BALANCE_VALIDATOR =
+ new SettingsValidators.InclusiveFloatRangeValidator(-1.f, 1.f);
+
+ /**
* Whether the notifications should use the ring volume (value of 1) or
* a separate notification volume (value of 0). In most cases, users
* will have this enabled so the notification and ringer volumes will be
@@ -4288,6 +4298,7 @@
HEARING_AID,
TTY_MODE,
MASTER_MONO,
+ MASTER_BALANCE,
SOUND_EFFECTS_ENABLED,
HAPTIC_FEEDBACK_ENABLED,
POWER_SOUNDS_ENABLED, // moved to global
@@ -4395,6 +4406,7 @@
PRIVATE_SETTINGS.add(VIBRATE_INPUT_DEVICES);
PRIVATE_SETTINGS.add(VOLUME_MASTER);
PRIVATE_SETTINGS.add(MASTER_MONO);
+ PRIVATE_SETTINGS.add(MASTER_BALANCE);
PRIVATE_SETTINGS.add(NOTIFICATIONS_USE_RING_VOLUME);
PRIVATE_SETTINGS.add(VIBRATE_IN_SILENT);
PRIVATE_SETTINGS.add(MEDIA_BUTTON_RECEIVER);
@@ -4488,6 +4500,7 @@
VALIDATORS.put(SCREEN_AUTO_BRIGHTNESS_ADJ, SCREEN_AUTO_BRIGHTNESS_ADJ_VALIDATOR);
VALIDATORS.put(VIBRATE_INPUT_DEVICES, VIBRATE_INPUT_DEVICES_VALIDATOR);
VALIDATORS.put(MASTER_MONO, MASTER_MONO_VALIDATOR);
+ VALIDATORS.put(MASTER_BALANCE, MASTER_BALANCE_VALIDATOR);
VALIDATORS.put(NOTIFICATIONS_USE_RING_VOLUME, NOTIFICATIONS_USE_RING_VOLUME_VALIDATOR);
VALIDATORS.put(VIBRATE_IN_SILENT, VIBRATE_IN_SILENT_VALIDATOR);
VALIDATORS.put(MEDIA_BUTTON_RECEIVER, MEDIA_BUTTON_RECEIVER_VALIDATOR);
@@ -14315,6 +14328,19 @@
public static final String LOOPER_STATS = "looper_stats";
/**
+ * Settings for collecting statistics on CPU usage per thread
+ *
+ * The following strings are supported as keys:
+ * <pre>
+ * num_buckets (int)
+ * collected_uids (string)
+ * </pre>
+ *
+ * @hide
+ */
+ public static final String KERNEL_CPU_THREAD_READER = "kernel_cpu_thread_reader";
+
+ /**
* Default user id to boot into. They map to user ids, for example, 10, 11, 12.
*
* @hide
diff --git a/core/java/android/service/notification/ZenModeConfig.java b/core/java/android/service/notification/ZenModeConfig.java
index bec654a..bff118e 100644
--- a/core/java/android/service/notification/ZenModeConfig.java
+++ b/core/java/android/service/notification/ZenModeConfig.java
@@ -958,13 +958,15 @@
if (zenPolicy.isCategoryAllowed(ZenPolicy.PRIORITY_CATEGORY_MESSAGES,
isPriorityCategoryEnabled(Policy.PRIORITY_CATEGORY_MESSAGES, defaultPolicy))) {
priorityCategories |= Policy.PRIORITY_CATEGORY_MESSAGES;
- messageSenders = getNotificationPolicySenders(zenPolicy.getPriorityMessageSenders());
+ messageSenders = getNotificationPolicySenders(zenPolicy.getPriorityMessageSenders(),
+ messageSenders);
}
if (zenPolicy.isCategoryAllowed(ZenPolicy.PRIORITY_CATEGORY_CALLS,
isPriorityCategoryEnabled(Policy.PRIORITY_CATEGORY_CALLS, defaultPolicy))) {
priorityCategories |= Policy.PRIORITY_CATEGORY_CALLS;
- callSenders = getNotificationPolicySenders(zenPolicy.getPriorityCallSenders());
+ callSenders = getNotificationPolicySenders(zenPolicy.getPriorityCallSenders(),
+ callSenders);
}
if (zenPolicy.isCategoryAllowed(ZenPolicy.PRIORITY_CATEGORY_REPEAT_CALLERS,
@@ -1056,16 +1058,17 @@
return (policy.suppressedVisualEffects & visualEffect) == 0;
}
- private int getNotificationPolicySenders(@ZenPolicy.PeopleType int senders) {
+ private int getNotificationPolicySenders(@ZenPolicy.PeopleType int senders,
+ int defaultPolicySender) {
switch (senders) {
case ZenPolicy.PEOPLE_TYPE_ANYONE:
return Policy.PRIORITY_SENDERS_ANY;
case ZenPolicy.PEOPLE_TYPE_CONTACTS:
-
return Policy.PRIORITY_SENDERS_CONTACTS;
case ZenPolicy.PEOPLE_TYPE_STARRED:
- default:
return Policy.PRIORITY_SENDERS_STARRED;
+ default:
+ return defaultPolicySender;
}
}
diff --git a/core/java/android/service/voice/VoiceInteractionService.java b/core/java/android/service/voice/VoiceInteractionService.java
index e76e096..ea2a25d 100644
--- a/core/java/android/service/voice/VoiceInteractionService.java
+++ b/core/java/android/service/voice/VoiceInteractionService.java
@@ -348,7 +348,7 @@
*/
public final void setVoiceState(int state) {
try {
- mSystemService.setVoiceState(state);
+ mSystemService.setVoiceState(mInterface, state);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -359,7 +359,7 @@
*/
public final void setTranscription(@NonNull String transcription) {
try {
- mSystemService.setTranscription(transcription);
+ mSystemService.setTranscription(mInterface, transcription);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
@@ -372,7 +372,7 @@
*/
public final void clearTranscription(boolean immediate) {
try {
- mSystemService.clearTranscription(immediate);
+ mSystemService.clearTranscription(mInterface, immediate);
} catch (RemoteException e) {
throw e.rethrowFromSystemServer();
}
diff --git a/core/java/android/util/StatsLog.java b/core/java/android/util/StatsLog.java
index e3de307..ace4bf4 100644
--- a/core/java/android/util/StatsLog.java
+++ b/core/java/android/util/StatsLog.java
@@ -16,6 +16,7 @@
package android.util;
+import android.annotation.NonNull;
import android.os.IStatsManager;
import android.os.RemoteException;
import android.os.ServiceManager;
@@ -113,4 +114,18 @@
sService = IStatsManager.Stub.asInterface(ServiceManager.getService("stats"));
return sService;
}
+
+ /**
+ * Add a log to the stats log.
+ *
+ * @param id The id of the atom
+ * @param params The parameters of the atom's message.
+ */
+ public static void write(int id, @NonNull Object... params) {
+ switch (id) {
+ case PERMISSION_GRANT_REQUEST_RESULT_REPORTED:
+ write(id, (long) params[0], (int) params[1], (String) params[2], (String) params[3],
+ (boolean) params[4], (int) params[5]);
+ }
+ }
}
diff --git a/core/java/android/util/StatsLogAtoms.java b/core/java/android/util/StatsLogAtoms.java
new file mode 100644
index 0000000..bbede53
--- /dev/null
+++ b/core/java/android/util/StatsLogAtoms.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright (C) 2019 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.util;
+
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import android.annotation.IntDef;
+import android.annotation.SystemApi;
+
+import java.lang.annotation.Retention;
+
+/**
+ * Exposed stats logs atom ids.
+ *
+ * @hide
+ */
+@SystemApi
+public class StatsLogAtoms {
+ private StatsLogAtoms() {
+ }
+
+ /**
+ * Information about a permission grant request
+ *
+ * Usage: {@code StatsLog.write(PERMISSION_GRANT_REQUEST_RESULT_REPORTED, long request_id,
+ * int requesting_uid, String requesting_package_name, String permission_name,
+ * boolean is_implicit, @PermissionGrantRequestResultReported_Result int result)}
+ */
+ public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED =
+ StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED;
+
+ @Retention(SOURCE)
+ @IntDef(prefix = "PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__",
+ value = {PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED,
+ PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED,
+ PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED,
+ PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED,
+ PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_GRANTED,
+ PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED,
+ PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_PREJUDICE,
+ PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_DENIED})
+ public @interface PermissionGrantRequestResultReported_Result {}
+
+ /**
+ * Possible value of {@link PermissionGrantRequestResultReported_Result}:
+ * permission request was ignored
+ */
+ public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED =
+ StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED;
+
+ /**
+ * Possible value of {@link PermissionGrantRequestResultReported_Result}:
+ * permission request was ignored because it was user fixed
+ */
+ public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED =
+ StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_USER_FIXED;
+
+ /**
+ * Possible value of {@link PermissionGrantRequestResultReported_Result}:
+ * permission request was ignored because it was policy fixed
+ */
+ public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED =
+ StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__IGNORED_POLICY_FIXED;
+
+ /**
+ * Possible value of {@link PermissionGrantRequestResultReported_Result}:
+ * permission was granted by user action
+ */
+ public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED =
+ StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_GRANTED;
+
+ /**
+ * Possible value of {@link PermissionGrantRequestResultReported_Result}:
+ * permission was automatically granted
+ */
+ public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_GRANTED =
+ StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_GRANTED;
+
+ /**
+ * Possible value of {@link PermissionGrantRequestResultReported_Result}:
+ * permission was denied by user action
+ */
+ public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED =
+ StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED;
+
+ /**
+ * Possible value of {@link PermissionGrantRequestResultReported_Result}:
+ * permission was denied with prejudice by the user
+ */
+ public static final int
+ PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_PREJUDICE =
+ StatsLogInternal
+ .PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__USER_DENIED_WITH_PREJUDICE;
+
+ /**
+ * Possible value of {@link PermissionGrantRequestResultReported_Result}:
+ * permission was automatically denied
+ */
+ public static final int PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_DENIED =
+ StatsLogInternal.PERMISSION_GRANT_REQUEST_RESULT_REPORTED__RESULT__AUTO_DENIED;
+}
diff --git a/core/java/android/util/TypedValue.java b/core/java/android/util/TypedValue.java
index 99106be..7f1ee30 100644
--- a/core/java/android/util/TypedValue.java
+++ b/core/java/android/util/TypedValue.java
@@ -217,10 +217,10 @@
public int density;
/**
- * If the Value came from a style resource, this holds the corresponding style resource id
- * against which the attribute was resolved.
+ * If the Value came from a style resource or a layout resource (set in an XML layout), this
+ * holds the corresponding style or layout resource id against which the attribute was resolved.
*/
- public int sourceStyleResourceId;
+ public int sourceResourceId;
/* ------------------------------------------------------------ */
diff --git a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java
index 1bbef8e..b36888e 100644
--- a/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java
+++ b/core/java/android/util/apk/ApkSignatureSchemeV2Verifier.java
@@ -120,7 +120,7 @@
* @throws SignatureNotFoundException if the APK is not signed using APK Signature Scheme v2.
* @throws IOException if an I/O error occurs while reading the APK file.
*/
- public static X509Certificate[][] plsCertsNoVerifyOnlyCerts(String apkFile)
+ public static X509Certificate[][] unsafeGetCertsWithoutVerification(String apkFile)
throws SignatureNotFoundException, SecurityException, IOException {
VerifiedSigner vSigner = verify(apkFile, false);
return vSigner.certs;
diff --git a/core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java b/core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java
index 1471870..602e6df 100644
--- a/core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java
+++ b/core/java/android/util/apk/ApkSignatureSchemeV3Verifier.java
@@ -117,7 +117,7 @@
* @throws SignatureNotFoundException if the APK is not signed using APK Signature Scheme v3.
* @throws IOException if an I/O error occurs while reading the APK file.
*/
- public static VerifiedSigner plsCertsNoVerifyOnlyCerts(String apkFile)
+ public static VerifiedSigner unsafeGetCertsWithoutVerification(String apkFile)
throws SignatureNotFoundException, SecurityException, IOException {
return verify(apkFile, false);
}
diff --git a/core/java/android/util/apk/ApkSignatureVerifier.java b/core/java/android/util/apk/ApkSignatureVerifier.java
index ac4ea75..ab67d37 100644
--- a/core/java/android/util/apk/ApkSignatureVerifier.java
+++ b/core/java/android/util/apk/ApkSignatureVerifier.java
@@ -302,7 +302,7 @@
* @throws PackageParserException if the APK's signature failed to verify.
* or greater is not found, except in the case of no JAR signature.
*/
- public static PackageParser.SigningDetails plsCertsNoVerifyOnlyCerts(
+ public static PackageParser.SigningDetails unsafeGetCertsWithoutVerification(
String apkPath, int minSignatureSchemeVersion)
throws PackageParserException {
@@ -317,7 +317,7 @@
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "certsOnlyV3");
try {
ApkSignatureSchemeV3Verifier.VerifiedSigner vSigner =
- ApkSignatureSchemeV3Verifier.plsCertsNoVerifyOnlyCerts(apkPath);
+ ApkSignatureSchemeV3Verifier.unsafeGetCertsWithoutVerification(apkPath);
Certificate[][] signerCerts = new Certificate[][] { vSigner.certs };
Signature[] signerSigs = convertToSignatures(signerCerts);
Signature[] pastSignerSigs = null;
@@ -359,7 +359,7 @@
Trace.traceBegin(TRACE_TAG_PACKAGE_MANAGER, "certsOnlyV2");
try {
Certificate[][] signerCerts =
- ApkSignatureSchemeV2Verifier.plsCertsNoVerifyOnlyCerts(apkPath);
+ ApkSignatureSchemeV2Verifier.unsafeGetCertsWithoutVerification(apkPath);
Signature[] signerSigs = convertToSignatures(signerCerts);
return new PackageParser.SigningDetails(signerSigs,
SignatureSchemeVersion.SIGNING_BLOCK_V2);
diff --git a/core/java/android/view/GestureDetector.java b/core/java/android/view/GestureDetector.java
index 7d9ec70..c794a69 100644
--- a/core/java/android/view/GestureDetector.java
+++ b/core/java/android/view/GestureDetector.java
@@ -237,16 +237,6 @@
private static final int LONG_PRESS = 2;
private static final int TAP = 3;
- /**
- * If a MotionEvent has CLASSIFICATION_AMBIGUOUS_GESTURE set, then certain actions, such as
- * scrolling, will be inhibited. However, to account for the possibility of incorrect
- * classification, the default scrolling will only be inhibited if the gesture moves beyond
- * (default touch slop * AMBIGUOUS_GESTURE_MULTIPLIER). Likewise, the default long press
- * timeout will be increased for some situations where the default behaviour
- * is to cancel it.
- */
- private static final int AMBIGUOUS_GESTURE_MULTIPLIER = 2;
-
private final Handler mHandler;
@UnsupportedAppUsage
private final OnGestureListener mListener;
@@ -636,6 +626,7 @@
hasPendingLongPress && ambiguousGesture;
if (shouldInhibitDefaultAction) {
// Inhibit default long press
+ final float multiplier = ViewConfiguration.getAmbiguousGestureMultiplier();
if (distance > slopSquare) {
// The default action here is to remove long press. But if the touch
// slop below gets increased, and we never exceed the modified touch
@@ -643,15 +634,15 @@
// will happen in response to user input. To prevent this,
// reschedule long press with a modified timeout.
mHandler.removeMessages(LONG_PRESS);
- final int longPressTimeout = ViewConfiguration.getLongPressTimeout();
+ final long longPressTimeout = ViewConfiguration.getLongPressTimeout();
mHandler.sendEmptyMessageAtTime(LONG_PRESS, ev.getDownTime()
- + longPressTimeout * AMBIGUOUS_GESTURE_MULTIPLIER);
+ + (long) (longPressTimeout * multiplier));
}
// Inhibit default scroll. If a gesture is ambiguous, we prevent scroll
// until the gesture is resolved.
// However, for safety, simply increase the touch slop in case the
// classification is erroneous. Since the value is squared, multiply twice.
- slopSquare *= AMBIGUOUS_GESTURE_MULTIPLIER * AMBIGUOUS_GESTURE_MULTIPLIER;
+ slopSquare *= multiplier * multiplier;
}
if (distance > slopSquare) {
diff --git a/core/java/android/view/InsetsAnimationControlImpl.java b/core/java/android/view/InsetsAnimationControlImpl.java
index 7291d0b..625ddc2 100644
--- a/core/java/android/view/InsetsAnimationControlImpl.java
+++ b/core/java/android/view/InsetsAnimationControlImpl.java
@@ -127,16 +127,18 @@
final Insets offset = Insets.subtract(mShownInsets, mPendingInsets);
ArrayList<SurfaceParams> params = new ArrayList<>();
if (offset.left != 0) {
- updateLeashesForSide(INSET_SIDE_LEFT, offset.left, params, state);
+ updateLeashesForSide(INSET_SIDE_LEFT, offset.left, mPendingInsets.left, params, state);
}
if (offset.top != 0) {
- updateLeashesForSide(INSET_SIDE_TOP, offset.top, params, state);
+ updateLeashesForSide(INSET_SIDE_TOP, offset.top, mPendingInsets.top, params, state);
}
if (offset.right != 0) {
- updateLeashesForSide(INSET_SIDE_RIGHT, offset.right, params, state);
+ updateLeashesForSide(INSET_SIDE_RIGHT, offset.right, mPendingInsets.right, params,
+ state);
}
if (offset.bottom != 0) {
- updateLeashesForSide(INSET_SIDE_BOTTOM, offset.bottom, params, state);
+ updateLeashesForSide(INSET_SIDE_BOTTOM, offset.bottom, mPendingInsets.bottom, params,
+ state);
}
SyncRtSurfaceTransactionApplier applier = mTransactionApplierSupplier.get();
applier.scheduleApply(params.toArray(new SurfaceParams[params.size()]));
@@ -171,7 +173,7 @@
return Insets.max(Insets.min(insets, mShownInsets), mHiddenInsets);
}
- private void updateLeashesForSide(@InsetSide int side, int inset,
+ private void updateLeashesForSide(@InsetSide int side, int offset, int inset,
ArrayList<SurfaceParams> surfaceParams, InsetsState state) {
ArraySet<InsetsSourceConsumer> items = mSideSourceMap.get(side);
// TODO: Implement behavior when inset spans over multiple types
@@ -182,10 +184,10 @@
mTmpMatrix.setTranslate(source.getFrame().left, source.getFrame().top);
mTmpFrame.set(source.getFrame());
- addTranslationToMatrix(side, inset, mTmpMatrix, mTmpFrame);
+ addTranslationToMatrix(side, offset, mTmpMatrix, mTmpFrame);
state.getSource(source.getType()).setFrame(mTmpFrame);
- surfaceParams.add(new SurfaceParams(leash, 1f, mTmpMatrix, null, 0, 0f));
+ surfaceParams.add(new SurfaceParams(leash, 1f, mTmpMatrix, null, 0, 0f, inset != 0));
}
}
diff --git a/core/java/android/view/InsetsController.java b/core/java/android/view/InsetsController.java
index 4f9ecd5..93a6741 100644
--- a/core/java/android/view/InsetsController.java
+++ b/core/java/android/view/InsetsController.java
@@ -34,6 +34,8 @@
import android.view.InsetsState.InternalInsetType;
import android.view.SurfaceControl.Transaction;
import android.view.WindowInsets.Type.InsetType;
+import android.view.animation.Interpolator;
+import android.view.animation.PathInterpolator;
import com.android.internal.annotations.VisibleForTesting;
@@ -46,8 +48,9 @@
*/
public class InsetsController implements WindowInsetsController {
- // TODO: Use animation scaling and more optimal duration.
- private static final int ANIMATION_DURATION_MS = 400;
+ private static final int ANIMATION_DURATION_SHOW_MS = 275;
+ private static final int ANIMATION_DURATION_HIDE_MS = 340;
+ private static final Interpolator INTERPOLATOR = new PathInterpolator(0.4f, 0f, 0.2f, 1f);
private static final int DIRECTION_NONE = 0;
private static final int DIRECTION_SHOW = 1;
private static final int DIRECTION_HIDE = 2;
@@ -329,6 +332,11 @@
WindowInsetsAnimationControlListener listener = new WindowInsetsAnimationControlListener() {
@Override
public void onReady(WindowInsetsAnimationController controller, int types) {
+ if (show) {
+ showDirectly(types);
+ } else {
+ hideDirectly(types);
+ }
mAnimator = ObjectAnimator.ofObject(
controller,
new InsetsProperty(),
@@ -336,7 +344,10 @@
show ? controller.getHiddenStateInsets() : controller.getShownStateInsets(),
show ? controller.getShownStateInsets() : controller.getHiddenStateInsets()
);
- mAnimator.setDuration(ANIMATION_DURATION_MS);
+ mAnimator.setDuration(show
+ ? ANIMATION_DURATION_SHOW_MS
+ : ANIMATION_DURATION_HIDE_MS);
+ mAnimator.setInterpolator(INTERPOLATOR);
mAnimator.addListener(new AnimatorListenerAdapter() {
@Override
public void onAnimationCancel(Animator animation) {
@@ -356,11 +367,6 @@
private void onAnimationFinish() {
mAnimationDirection = DIRECTION_NONE;
- if (show) {
- showOnAnimationEnd(types);
- } else {
- hideOnAnimationEnd(types);
- }
}
};
// TODO: Instead of clearing this here, properly wire up
@@ -369,14 +375,14 @@
controlWindowInsetsAnimation(types, listener);
}
- private void hideOnAnimationEnd(@InsetType int types) {
+ private void hideDirectly(@InsetType int types) {
final ArraySet<Integer> internalTypes = InsetsState.toInternalType(types);
for (int i = internalTypes.size() - 1; i >= 0; i--) {
getSourceConsumer(internalTypes.valueAt(i)).hide();
}
}
- private void showOnAnimationEnd(@InsetType int types) {
+ private void showDirectly(@InsetType int types) {
final ArraySet<Integer> internalTypes = InsetsState.toInternalType(types);
for (int i = internalTypes.size() - 1; i >= 0; i--) {
getSourceConsumer(internalTypes.valueAt(i)).show();
diff --git a/core/java/android/view/InsetsSourceConsumer.java b/core/java/android/view/InsetsSourceConsumer.java
index f48318c..cccfd87 100644
--- a/core/java/android/view/InsetsSourceConsumer.java
+++ b/core/java/android/view/InsetsSourceConsumer.java
@@ -109,7 +109,6 @@
return;
}
mVisible = visible;
- applyHiddenToControl();
applyLocalVisibilityOverride();
mController.notifyVisibilityChanged();
}
@@ -119,7 +118,6 @@
return;
}
- // TODO: Animation
final Transaction t = mTransactionSupplier.get();
if (mVisible) {
t.show(mSourceControl.getLeash());
diff --git a/core/java/android/view/Surface.java b/core/java/android/view/Surface.java
index 7fcb2af..d0194f9 100644
--- a/core/java/android/view/Surface.java
+++ b/core/java/android/view/Surface.java
@@ -57,7 +57,8 @@
throws OutOfResourcesException;
private static native long nativeCreateFromSurfaceControl(long surfaceControlNativeObject);
- private static native long nativeGetFromSurfaceControl(long surfaceControlNativeObject);
+ private static native long nativeGetFromSurfaceControl(long surfaceObject,
+ long surfaceControlNativeObject);
private static native long nativeLockCanvas(long nativeObject, Canvas canvas, Rect dirty)
throws OutOfResourcesException;
@@ -519,9 +520,12 @@
throw new NullPointerException(
"null SurfaceControl native object. Are you using a released SurfaceControl?");
}
- long newNativeObject = nativeGetFromSurfaceControl(surfaceControlPtr);
+ long newNativeObject = nativeGetFromSurfaceControl(mNativeObject, surfaceControlPtr);
synchronized (mLock) {
+ if (newNativeObject == mNativeObject) {
+ return;
+ }
if (mNativeObject != 0) {
nativeRelease(mNativeObject);
}
diff --git a/core/java/android/view/SurfaceView.java b/core/java/android/view/SurfaceView.java
index ecbec65..cd5207c 100644
--- a/core/java/android/view/SurfaceView.java
+++ b/core/java/android/view/SurfaceView.java
@@ -492,7 +492,7 @@
if (mBackgroundControl == null) {
return;
}
- if ((mSurfaceFlags & PixelFormat.OPAQUE) != 0) {
+ if ((mSurfaceFlags & SurfaceControl.OPAQUE) != 0) {
mBackgroundControl.show();
mBackgroundControl.setLayer(Integer.MIN_VALUE);
} else {
diff --git a/core/java/android/view/SyncRtSurfaceTransactionApplier.java b/core/java/android/view/SyncRtSurfaceTransactionApplier.java
index 0270acb..85457cb 100644
--- a/core/java/android/view/SyncRtSurfaceTransactionApplier.java
+++ b/core/java/android/view/SyncRtSurfaceTransactionApplier.java
@@ -77,7 +77,11 @@
t.setAlpha(params.surface, params.alpha);
t.setLayer(params.surface, params.layer);
t.setCornerRadius(params.surface, params.cornerRadius);
- t.show(params.surface);
+ if (params.visible) {
+ t.show(params.surface);
+ } else {
+ t.hide(params.surface);
+ }
}
/**
@@ -121,13 +125,14 @@
* @param windowCrop Crop to apply.
*/
public SurfaceParams(SurfaceControl surface, float alpha, Matrix matrix,
- Rect windowCrop, int layer, float cornerRadius) {
+ Rect windowCrop, int layer, float cornerRadius, boolean visible) {
this.surface = surface;
this.alpha = alpha;
this.matrix = new Matrix(matrix);
this.windowCrop = new Rect(windowCrop);
this.layer = layer;
this.cornerRadius = cornerRadius;
+ this.visible = visible;
}
@VisibleForTesting
@@ -147,5 +152,7 @@
@VisibleForTesting
public final int layer;
+
+ public final boolean visible;
}
}
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index ec8ed5b..992b996 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -3986,15 +3986,6 @@
public static final int SCROLL_AXIS_VERTICAL = 1 << 1;
/**
- * If a MotionEvent has CLASSIFICATION_AMBIGUOUS_GESTURE set, then certain the default
- * long press action will be inhibited. However, to account for the possibility of incorrect
- * classification, the default long press timeout will instead be increased for some situations
- * by the following factor.
- * Likewise, the touch slop for allowing long press will be increased when gesture is uncertain.
- */
- private static final int AMBIGUOUS_GESTURE_MULTIPLIER = 2;
-
- /**
* Controls the over-scroll mode for this view.
* See {@link #overScrollBy(int, int, int, int, int, int, int, int, boolean)},
* {@link #OVER_SCROLL_ALWAYS}, {@link #OVER_SCROLL_IF_CONTENT_SCROLLS},
@@ -14807,18 +14798,20 @@
motionClassification == MotionEvent.CLASSIFICATION_AMBIGUOUS_GESTURE;
int touchSlop = mTouchSlop;
if (ambiguousGesture && hasPendingLongPressCallback()) {
+ final float ambiguousMultiplier =
+ ViewConfiguration.getAmbiguousGestureMultiplier();
if (!pointInView(x, y, touchSlop)) {
// The default action here is to cancel long press. But instead, we
// just extend the timeout here, in case the classification
// stays ambiguous.
removeLongPressCallback();
- long delay = ViewConfiguration.getLongPressTimeout()
- * AMBIGUOUS_GESTURE_MULTIPLIER;
+ long delay = (long) (ViewConfiguration.getLongPressTimeout()
+ * ambiguousMultiplier);
// Subtract the time already spent
delay -= event.getEventTime() - event.getDownTime();
checkForLongClick(delay, x, y);
}
- touchSlop *= AMBIGUOUS_GESTURE_MULTIPLIER;
+ touchSlop *= ambiguousMultiplier;
}
// Be lenient about moving outside of buttons
diff --git a/core/java/android/view/ViewConfiguration.java b/core/java/android/view/ViewConfiguration.java
index d03d97e..94d1b6d 100644
--- a/core/java/android/view/ViewConfiguration.java
+++ b/core/java/android/view/ViewConfiguration.java
@@ -16,6 +16,7 @@
package android.view;
+import android.annotation.FloatRange;
import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.app.AppGlobals;
@@ -286,6 +287,11 @@
private static final int HAS_PERMANENT_MENU_KEY_TRUE = 1;
private static final int HAS_PERMANENT_MENU_KEY_FALSE = 2;
+ /**
+ * The multiplication factor for inhibiting default gestures.
+ */
+ private static final float AMBIGUOUS_GESTURE_MULTIPLIER = 2f;
+
private final int mEdgeSlop;
private final int mFadingEdgeLength;
private final int mMinimumFlingVelocity;
@@ -911,6 +917,22 @@
}
/**
+ * If a MotionEvent has CLASSIFICATION_AMBIGUOUS_GESTURE set, then certain actions, such as
+ * scrolling, will be inhibited.
+ * However, to account for the possibility of incorrect classification,
+ * the default scrolling will only be inhibited if the pointer travels less than
+ * (getScaledTouchSlop() * this factor).
+ * Likewise, the default long press timeout will be increased by this factor for some situations
+ * where the default behaviour is to cancel it.
+ *
+ * @return The multiplication factor for inhibiting default gestures.
+ */
+ @FloatRange(from = 1.0)
+ public static float getAmbiguousGestureMultiplier() {
+ return AMBIGUOUS_GESTURE_MULTIPLIER;
+ }
+
+ /**
* Report if the device has a permanent menu key available to the user.
*
* <p>As of Android 3.0, devices may not have a permanent menu key available.
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java
index 9213f32..9a317db 100644
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -2289,6 +2289,7 @@
surfaceChanged |= surfaceSizeChanged;
final boolean alwaysConsumeNavBarChanged =
mPendingAlwaysConsumeNavBar != mAttachInfo.mAlwaysConsumeNavBar;
+ final boolean colorModeChanged = hasColorModeChanged(lp.getColorMode());
if (contentInsetsChanged) {
mAttachInfo.mContentInsets.set(mPendingContentInsets);
if (DEBUG_LAYOUT) Log.v(mTag, "Content insets changing to: "
@@ -2335,6 +2336,10 @@
if (DEBUG_LAYOUT) Log.v(mTag, "Visible insets changing to: "
+ mAttachInfo.mVisibleInsets);
}
+ if (colorModeChanged && mAttachInfo.mThreadedRenderer != null) {
+ mAttachInfo.mThreadedRenderer.setWideGamut(
+ lp.getColorMode() == ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT);
+ }
if (!hadSurface) {
if (mSurface.isValid()) {
@@ -2387,7 +2392,7 @@
mAttachInfo.mThreadedRenderer.destroy();
}
} else if ((surfaceGenerationId != mSurface.getGenerationId()
- || surfaceSizeChanged || windowRelayoutWasForced)
+ || surfaceSizeChanged || windowRelayoutWasForced || colorModeChanged)
&& mSurfaceHolder == null
&& mAttachInfo.mThreadedRenderer != null) {
mFullRedrawNeeded = true;
@@ -4009,6 +4014,20 @@
}
}
+ private boolean hasColorModeChanged(int colorMode) {
+ if (mAttachInfo.mThreadedRenderer == null) {
+ return false;
+ }
+ final boolean isWideGamut = colorMode == ActivityInfo.COLOR_MODE_WIDE_COLOR_GAMUT;
+ if (mAttachInfo.mThreadedRenderer.isWideGamut() == isWideGamut) {
+ return false;
+ }
+ if (isWideGamut && !mContext.getResources().getConfiguration().isScreenWideColorGamut()) {
+ return false;
+ }
+ return true;
+ }
+
@Override
public void requestChildFocus(View child, View focused) {
if (DEBUG_INPUT_RESIZE) {
diff --git a/core/java/android/view/contentcapture/ContentCaptureContext.java b/core/java/android/view/contentcapture/ContentCaptureContext.java
index 1928613..5814759 100644
--- a/core/java/android/view/contentcapture/ContentCaptureContext.java
+++ b/core/java/android/view/contentcapture/ContentCaptureContext.java
@@ -27,6 +27,7 @@
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
+import android.view.Display;
import android.view.View;
import com.android.internal.util.Preconditions;
@@ -90,8 +91,8 @@
// Fields below are set by server when the session starts
private final @Nullable ComponentName mComponentName;
private final int mTaskId;
- private final int mDisplayId;
private final int mFlags;
+ private final int mDisplayId;
// Fields below are set by the service upon "delivery" and are not marshalled in the parcel
private @Nullable String mParentSessionId;
@@ -123,7 +124,8 @@
mAction = builder.mAction;
mComponentName = null;
- mTaskId = mFlags = mDisplayId = 0;
+ mTaskId = mFlags = 0;
+ mDisplayId = Display.INVALID_DISPLAY;
}
/**
diff --git a/core/java/android/view/inspector/GeneratedInspectionCompanionProvider.java b/core/java/android/view/inspector/GeneratedInspectionCompanionProvider.java
new file mode 100644
index 0000000..8faae1f
--- /dev/null
+++ b/core/java/android/view/inspector/GeneratedInspectionCompanionProvider.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2019 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.inspector;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+
+/**
+ * An inspection companion provider that loads pre-generated inspection companions
+ *
+ * @see android.processor.view.inspector.PlatformInspectableProcessor
+ */
+public class GeneratedInspectionCompanionProvider implements InspectionCompanionProvider {
+ /**
+ * The suffix used for the generated class
+ */
+ private static final String COMPANION_SUFFIX = "$$InspectionCompanion";
+
+ @Override
+ @Nullable
+ @SuppressWarnings("unchecked")
+ public <T> InspectionCompanion<T> provide(@NonNull Class<T> cls) {
+ final String companionName = cls.getName() + COMPANION_SUFFIX;
+
+ try {
+ final Class<InspectionCompanion<T>> companionClass =
+ (Class<InspectionCompanion<T>>) cls.getClassLoader().loadClass(companionName);
+ return companionClass.newInstance();
+ } catch (ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+ return null;
+ }
+ }
+}
diff --git a/core/java/android/view/inspector/InspectionCompanionProvider.java b/core/java/android/view/inspector/InspectionCompanionProvider.java
new file mode 100644
index 0000000..c08f49c
--- /dev/null
+++ b/core/java/android/view/inspector/InspectionCompanionProvider.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2019 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.inspector;
+
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+
+/**
+ * An interface for services that can provide inspection companions for a class.
+ */
+public interface InspectionCompanionProvider {
+ /**
+ * Provide an {@link InspectionCompanion} for the supplied class.
+ *
+ * Implementing classes must not cache companion instances, and should instantiate a new one
+ * for each request.
+ *
+ * @param cls A {@link Class} representing the inspectable type
+ * @param <T> The type to find the companion for
+ * @return The inspection companion for the supplied type
+ */
+ @Nullable
+ <T> InspectionCompanion<T> provide(@NonNull Class<T> cls);
+}
diff --git a/core/java/android/widget/Editor.java b/core/java/android/widget/Editor.java
index e9d72a2..2618527 100644
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -273,7 +273,7 @@
boolean mDiscardNextActionUp;
boolean mIgnoreActionUpEvent;
- @UnsupportedAppUsage
+ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 123769485)
private long mShowCursor;
private boolean mRenderCursorRegardlessTiming;
private Blink mBlink;
@@ -3531,8 +3531,8 @@
}
}
- @VisibleForTesting
- public class SuggestionsPopupWindow extends PinnedPopupWindow implements OnItemClickListener {
+ private final class SuggestionsPopupWindow extends PinnedPopupWindow
+ implements OnItemClickListener {
private static final int MAX_NUMBER_SUGGESTIONS = SuggestionSpan.SUGGESTIONS_MAX_SIZE;
// Key of intent extras for inserting new word into user dictionary.
@@ -3734,11 +3734,6 @@
}
}
- @VisibleForTesting
- public ViewGroup getContentViewForTesting() {
- return mContentView;
- }
-
@Override
public void show() {
if (!(mTextView.getText() instanceof Editable)) return;
@@ -6021,6 +6016,9 @@
}
updateSelection(event);
+ if (mTextView.hasSelection() && mEndHandle != null) {
+ mEndHandle.updateMagnifier(event);
+ }
break;
case MotionEvent.ACTION_UP:
@@ -6028,6 +6026,9 @@
break;
}
updateSelection(event);
+ if (mEndHandle != null) {
+ mEndHandle.dismissMagnifier();
+ }
// No longer dragging to select text, let the parent intercept events.
mTextView.getParent().requestDisallowInterceptTouchEvent(false);
@@ -6454,11 +6455,6 @@
return 0 <= start && start <= end && end <= text.length();
}
- @VisibleForTesting
- public SuggestionsPopupWindow getSuggestionsPopupWindowForTesting() {
- return mSuggestionsPopupWindow;
- }
-
/**
* An InputFilter that monitors text input to maintain undo history. It does not modify the
* text being typed (and hence always returns null from the filter() method).
diff --git a/core/java/android/widget/Toast.java b/core/java/android/widget/Toast.java
index c256d57..eef40e1 100644
--- a/core/java/android/widget/Toast.java
+++ b/core/java/android/widget/Toast.java
@@ -341,10 +341,10 @@
// the proper ordering of these system-wide.
// =======================================================================================
- @UnsupportedAppUsage
+ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
private static INotificationManager sService;
- @UnsupportedAppUsage
+ @UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P)
static private INotificationManager getService() {
if (sService != null) {
return sService;
diff --git a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl
index b85488f..8dde44e 100644
--- a/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl
+++ b/core/java/com/android/internal/app/IVoiceInteractionManagerService.aidl
@@ -155,15 +155,15 @@
/**
* Sets the transcribed voice to the given string.
*/
- void setTranscription(String transcription);
+ void setTranscription(IVoiceInteractionService service, String transcription);
/**
* Indicates that the transcription session is finished.
*/
- void clearTranscription(boolean immediate);
+ void clearTranscription(IVoiceInteractionService service, boolean immediate);
/**
* Sets the voice state indication based upon the given value.
*/
- void setVoiceState(int state);
+ void setVoiceState(IVoiceInteractionService service, int state);
}
diff --git a/core/java/com/android/internal/os/BinderInternal.java b/core/java/com/android/internal/os/BinderInternal.java
index 5b69979..aa4846f 100644
--- a/core/java/com/android/internal/os/BinderInternal.java
+++ b/core/java/com/android/internal/os/BinderInternal.java
@@ -96,9 +96,10 @@
* <p>The implementation should never execute a binder call since it is called during a
* binder transaction.
*
+ * @param untrustedWorkSourceUid The work source set by the caller.
* @return the uid of the process to attribute the binder transaction to.
*/
- int resolveWorkSourceUid();
+ int resolveWorkSourceUid(int untrustedWorkSourceUid);
}
/**
diff --git a/core/java/com/android/internal/os/KernelCpuThreadReader.java b/core/java/com/android/internal/os/KernelCpuThreadReader.java
index 2742b7c..b1328e8 100644
--- a/core/java/com/android/internal/os/KernelCpuThreadReader.java
+++ b/core/java/com/android/internal/os/KernelCpuThreadReader.java
@@ -37,9 +37,10 @@
* frequency band.
*
* <p>Frequencies are bucketed together to reduce the amount of data created. This means that we
- * return {@link #NUM_BUCKETS} frequencies instead of the full number. Frequencies are reported as
- * the lowest frequency in that range. Frequencies are spread as evenly as possible across the
- * buckets. The buckets do not cross over the little/big frequencies reported.
+ * return less frequencies than provided by {@link ProcTimeInStateReader}. The number of
+ * frequencies is configurable by {@link #setNumBuckets}. Frequencies are reported as the lowest
+ * frequency in that range. Frequencies are spread as evenly as possible across the buckets. The
+ * buckets do not cross over the little/big frequencies reported.
*
* <p>N.B.: In order to bucket across little/big frequencies correctly, we assume that the {@code
* time_in_state} file contains every little core frequency in ascending order, followed by every
@@ -97,22 +98,17 @@
DEFAULT_PROC_PATH.resolve("self/time_in_state");
/**
- * Number of frequency buckets
- */
- private static final int NUM_BUCKETS = 8;
-
- /**
- * Default predicate for what UIDs to check for when getting processes. This filters to only
- * select UID 1000 (the {@code system} user)
- */
- private static final Predicate<Integer> DEFAULT_UID_PREDICATE = uid -> uid == 1000;
-
- /**
* Value returned when there was an error getting an integer ID value (e.g. PID, UID)
*/
private static final int ID_ERROR = -1;
/**
+ * When checking whether to report data for a thread, we check the UID of the thread's owner
+ * against this predicate
+ */
+ private Predicate<Integer> mUidPredicate;
+
+ /**
* Where the proc filesystem is mounted
*/
private final Path mProcPath;
@@ -121,7 +117,7 @@
* Frequencies read from the {@code time_in_state} file. Read from {@link
* #mProcTimeInStateReader#getCpuFrequenciesKhz()} and cast to {@code int[]}
*/
- private final int[] mFrequenciesKhz;
+ private int[] mFrequenciesKhz;
/**
* Used to read and parse {@code time_in_state} files
@@ -131,17 +127,10 @@
/**
* Used to sort frequencies and usage times into buckets
*/
- private final FrequencyBucketCreator mFrequencyBucketCreator;
+ private FrequencyBucketCreator mFrequencyBucketCreator;
private final Injector mInjector;
- private KernelCpuThreadReader() throws IOException {
- this(
- DEFAULT_PROC_PATH,
- DEFAULT_INITIAL_TIME_IN_STATE_PATH,
- new Injector());
- }
-
/**
* Create with a path where `proc` is mounted. Used primarily for testing
*
@@ -151,17 +140,16 @@
*/
@VisibleForTesting
public KernelCpuThreadReader(
+ int numBuckets,
+ Predicate<Integer> uidPredicate,
Path procPath,
Path initialTimeInStatePath,
Injector injector) throws IOException {
+ mUidPredicate = uidPredicate;
mProcPath = procPath;
mProcTimeInStateReader = new ProcTimeInStateReader(initialTimeInStatePath);
mInjector = injector;
-
- // Copy mProcTimeInState's frequencies and initialize bucketing
- final long[] frequenciesKhz = mProcTimeInStateReader.getFrequenciesKhz();
- mFrequencyBucketCreator = new FrequencyBucketCreator(frequenciesKhz, NUM_BUCKETS);
- mFrequenciesKhz = mFrequencyBucketCreator.getBucketMinFrequencies(frequenciesKhz);
+ setNumBuckets(numBuckets);
}
/**
@@ -170,9 +158,14 @@
* @return the reader, null if an exception was thrown during creation
*/
@Nullable
- public static KernelCpuThreadReader create() {
+ public static KernelCpuThreadReader create(int numBuckets, Predicate<Integer> uidPredicate) {
try {
- return new KernelCpuThreadReader();
+ return new KernelCpuThreadReader(
+ numBuckets,
+ uidPredicate,
+ DEFAULT_PROC_PATH,
+ DEFAULT_INITIAL_TIME_IN_STATE_PATH,
+ new Injector());
} catch (IOException e) {
Slog.e(TAG, "Failed to initialize KernelCpuThreadReader", e);
return null;
@@ -180,14 +173,6 @@
}
/**
- * Get the per-thread CPU usage of all processes belonging to UIDs between {@code [1000, 2000)}
- */
- @Nullable
- public ArrayList<ProcessCpuUsage> getProcessCpuUsageByUids() {
- return getProcessCpuUsageByUids(DEFAULT_UID_PREDICATE);
- }
-
- /**
* Get the per-thread CPU usage of all processes belonging to a set of UIDs
*
* <p>This function will crawl through all process {@code proc} directories found by the pattern
@@ -195,10 +180,11 @@
* approximately 500ms on a Pixel 2. Therefore, this method can be computationally expensive,
* and should not be called more than once an hour.
*
- * @param uidPredicate only get usage from processes owned by UIDs that match this predicate
+ * <p>Data is only collected for UIDs passing the predicate supplied in {@link
+ * #setUidPredicate}.
*/
@Nullable
- public ArrayList<ProcessCpuUsage> getProcessCpuUsageByUids(Predicate<Integer> uidPredicate) {
+ public ArrayList<ProcessCpuUsage> getProcessCpuUsageByUids() {
if (DEBUG) {
Slog.d(TAG, "Reading CPU thread usages for processes owned by UIDs");
}
@@ -213,7 +199,7 @@
if (uid == ID_ERROR || processId == ID_ERROR) {
continue;
}
- if (!uidPredicate.test(uid)) {
+ if (!mUidPredicate.test(uid)) {
continue;
}
@@ -247,10 +233,7 @@
*/
@Nullable
public ProcessCpuUsage getCurrentProcessCpuUsage() {
- return getProcessCpuUsage(
- mProcPath.resolve("self"),
- mInjector.myPid(),
- mInjector.myUid());
+ return getProcessCpuUsage(mProcPath.resolve("self"), mInjector.myPid(), mInjector.myUid());
}
/**
@@ -300,6 +283,31 @@
}
/**
+ * Set the number of frequency buckets to use
+ */
+ void setNumBuckets(int numBuckets) {
+ if (numBuckets < 1) {
+ Slog.w(TAG, "Number of buckets must be at least 1, but was " + numBuckets);
+ return;
+ }
+ // If `numBuckets` hasn't changed since the last set, do nothing
+ if (mFrequenciesKhz != null && mFrequenciesKhz.length == numBuckets) {
+ return;
+ }
+ mFrequencyBucketCreator = new FrequencyBucketCreator(
+ mProcTimeInStateReader.getFrequenciesKhz(), numBuckets);
+ mFrequenciesKhz = mFrequencyBucketCreator.getBucketMinFrequencies(
+ mProcTimeInStateReader.getFrequenciesKhz());
+ }
+
+ /**
+ * Set the UID predicate for {@link #getProcessCpuUsageByUids}
+ */
+ void setUidPredicate(Predicate<Integer> uidPredicate) {
+ mUidPredicate = uidPredicate;
+ }
+
+ /**
* Get the CPU frequencies that correspond to the times reported in
* {@link ThreadCpuUsage#usageTimesMillis}
*/
diff --git a/core/java/com/android/internal/os/KernelCpuThreadReaderSettingsObserver.java b/core/java/com/android/internal/os/KernelCpuThreadReaderSettingsObserver.java
new file mode 100644
index 0000000..77f6a17
--- /dev/null
+++ b/core/java/com/android/internal/os/KernelCpuThreadReaderSettingsObserver.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2018 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.internal.os;
+
+import android.annotation.Nullable;
+import android.content.Context;
+import android.database.ContentObserver;
+import android.net.Uri;
+import android.os.UserHandle;
+import android.provider.Settings;
+import android.util.KeyValueListParser;
+import android.util.Range;
+import android.util.Slog;
+
+import com.android.internal.annotations.VisibleForTesting;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Service that handles settings for {@link KernelCpuThreadReader}
+ *
+ * <p>N.B.: The `collected_uids` setting takes a string representation of what UIDs to collect data
+ * for. A string representation is used as we will want to express UID ranges, therefore an integer
+ * array could not be used. The format of the string representation is detailed here: {@link
+ * UidPredicate#fromString}.
+ *
+ * @hide Only for use within the system server
+ */
+public class KernelCpuThreadReaderSettingsObserver extends ContentObserver {
+ private static final String TAG = "KernelCpuThreadReaderSettingsObserver";
+
+ /**
+ * The number of frequency buckets to report
+ */
+ private static final String NUM_BUCKETS_SETTINGS_KEY = "num_buckets";
+ private static final int NUM_BUCKETS_DEFAULT = 8;
+
+ /**
+ * List of UIDs to report data for
+ */
+ private static final String COLLECTED_UIDS_SETTINGS_KEY = "collected_uids";
+ private static final String COLLECTED_UIDS_DEFAULT = "1000-1000";
+
+ private final Context mContext;
+
+ @Nullable
+ private final KernelCpuThreadReader mKernelCpuThreadReader;
+
+ /**
+ * @return returns a created {@link KernelCpuThreadReader} that will be modified by any
+ * change in settings, returns null if creation failed
+ */
+ @Nullable
+ public static KernelCpuThreadReader getSettingsModifiedReader(Context context) {
+ // Create the observer
+ KernelCpuThreadReaderSettingsObserver settingsObserver =
+ new KernelCpuThreadReaderSettingsObserver(context);
+ // Register the observer to listen for setting changes
+ Uri settingsUri =
+ Settings.Global.getUriFor(Settings.Global.KERNEL_CPU_THREAD_READER);
+ context.getContentResolver().registerContentObserver(
+ settingsUri, false, settingsObserver, UserHandle.USER_SYSTEM);
+ // Return the observer's reader
+ return settingsObserver.mKernelCpuThreadReader;
+ }
+
+ private KernelCpuThreadReaderSettingsObserver(Context context) {
+ super(BackgroundThread.getHandler());
+ mContext = context;
+ mKernelCpuThreadReader = KernelCpuThreadReader.create(
+ NUM_BUCKETS_DEFAULT,
+ UidPredicate.fromString(COLLECTED_UIDS_DEFAULT));
+ }
+
+ @Override
+ public void onChange(boolean selfChange, Uri uri, int userId) {
+ updateReader();
+ }
+
+ /**
+ * Update the reader with new settings
+ */
+ private void updateReader() {
+ if (mKernelCpuThreadReader == null) {
+ return;
+ }
+
+ final KeyValueListParser parser = new KeyValueListParser(',');
+ try {
+ parser.setString(Settings.Global.getString(
+ mContext.getContentResolver(), Settings.Global.KERNEL_CPU_THREAD_READER));
+ } catch (IllegalArgumentException e) {
+ Slog.e(TAG, "Bad settings", e);
+ return;
+ }
+
+ final UidPredicate uidPredicate;
+ try {
+ uidPredicate = UidPredicate.fromString(
+ parser.getString(COLLECTED_UIDS_SETTINGS_KEY, COLLECTED_UIDS_DEFAULT));
+ } catch (NumberFormatException e) {
+ Slog.w(TAG, "Failed to get UID predicate", e);
+ return;
+ }
+
+ mKernelCpuThreadReader.setNumBuckets(
+ parser.getInt(NUM_BUCKETS_SETTINGS_KEY, NUM_BUCKETS_DEFAULT));
+ mKernelCpuThreadReader.setUidPredicate(uidPredicate);
+ }
+
+ /**
+ * Check whether a UID belongs to a set of UIDs
+ */
+ @VisibleForTesting
+ public static class UidPredicate implements Predicate<Integer> {
+ private static final Pattern UID_RANGE_PATTERN = Pattern.compile("([0-9]+)-([0-9]+)");
+ private static final String UID_SPECIFIER_DELIMITER = ";";
+ private final List<Range<Integer>> mAcceptedUidRanges;
+
+ /**
+ * Create a UID predicate from a string representing a list of UID ranges
+ *
+ * <p>UID ranges are a pair of integers separated by a '-'. If you want to specify a single
+ * UID (e.g. UID 1000), you can use {@code 1000-1000}. Lists of ranges are separated by
+ * a single ';'. For example, this would be a valid string representation: {@code
+ * "1000-1999;2003-2003;2004-2004;2050-2060"}.
+ *
+ * <p>We do not use ',' to delimit as it is already used in separating different setting
+ * arguments.
+ *
+ * @throws NumberFormatException if the input string is incorrectly formatted
+ * @throws IllegalArgumentException if an UID range has a lower end than start
+ */
+ @VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
+ public static UidPredicate fromString(String predicateString) throws NumberFormatException {
+ final List<Range<Integer>> acceptedUidRanges = new ArrayList<>();
+ for (String uidSpecifier : predicateString.split(UID_SPECIFIER_DELIMITER)) {
+ final Matcher uidRangeMatcher = UID_RANGE_PATTERN.matcher(uidSpecifier);
+ if (!uidRangeMatcher.matches()) {
+ throw new NumberFormatException(
+ "Failed to recognize as number range: " + uidSpecifier);
+ }
+ acceptedUidRanges.add(Range.create(
+ Integer.parseInt(uidRangeMatcher.group(1)),
+ Integer.parseInt(uidRangeMatcher.group(2))));
+ }
+ return new UidPredicate(acceptedUidRanges);
+ }
+
+ private UidPredicate(List<Range<Integer>> acceptedUidRanges) {
+ mAcceptedUidRanges = acceptedUidRanges;
+ }
+
+ @Override
+ public boolean test(Integer uid) {
+ for (int i = 0; i < mAcceptedUidRanges.size(); i++) {
+ if (mAcceptedUidRanges.get(i).contains(uid)) {
+ return true;
+ }
+ }
+ return false;
+ }
+ }
+}
diff --git a/core/java/com/android/internal/os/LooperStats.java b/core/java/com/android/internal/os/LooperStats.java
index 0f0eedd..b3d9ca7 100644
--- a/core/java/com/android/internal/os/LooperStats.java
+++ b/core/java/com/android/internal/os/LooperStats.java
@@ -126,9 +126,11 @@
}
DispatchSession session = (DispatchSession) token;
- Entry entry = findEntry(msg, /* allowCreateNew= */true);
- synchronized (entry) {
- entry.exceptionCount++;
+ Entry entry = findEntry(msg, /* allowCreateNew= */session != DispatchSession.NOT_SAMPLED);
+ if (entry != null) {
+ synchronized (entry) {
+ entry.exceptionCount++;
+ }
}
recycleSession(session);
diff --git a/core/java/com/android/internal/os/Zygote.java b/core/java/com/android/internal/os/Zygote.java
index 474d4d7..b881aef 100644
--- a/core/java/com/android/internal/os/Zygote.java
+++ b/core/java/com/android/internal/os/Zygote.java
@@ -94,6 +94,11 @@
*/
public static final int PROFILE_SYSTEM_SERVER = 1 << 14;
+ /**
+ * Enable profiling from shell.
+ */
+ public static final int PROFILE_FROM_SHELL = 1 << 15;
+
/** No external storage should be mounted. */
public static final int MOUNT_EXTERNAL_NONE = IVold.REMOUNT_MODE_NONE;
/** Default external storage should be mounted. */
diff --git a/core/java/com/android/internal/util/CollectionUtils.java b/core/java/com/android/internal/util/CollectionUtils.java
index f91b837..78fdfe4 100644
--- a/core/java/com/android/internal/util/CollectionUtils.java
+++ b/core/java/com/android/internal/util/CollectionUtils.java
@@ -335,6 +335,13 @@
}
/**
+ * @return the first element if not empty/null, null otherwise
+ */
+ public static @Nullable <T> T firstOrNull(@Nullable Collection<T> cur) {
+ return isEmpty(cur) ? null : cur.iterator().next();
+ }
+
+ /**
* @return list of single given element if it's not null, empty list otherwise
*/
public static @NonNull <T> List<T> singletonOrEmpty(@Nullable T item) {
diff --git a/core/java/com/android/server/backup/PermissionBackupHelper.java b/core/java/com/android/server/backup/PermissionBackupHelper.java
index ff0e63d..c0ba181 100644
--- a/core/java/com/android/server/backup/PermissionBackupHelper.java
+++ b/core/java/com/android/server/backup/PermissionBackupHelper.java
@@ -19,7 +19,6 @@
import android.app.AppGlobals;
import android.app.backup.BlobBackupHelper;
import android.content.pm.IPackageManager;
-import android.os.UserHandle;
import android.util.Slog;
public class PermissionBackupHelper extends BlobBackupHelper {
@@ -32,8 +31,12 @@
// key under which the permission-grant state blob is committed to backup
private static final String KEY_PERMISSIONS = "permissions";
- public PermissionBackupHelper() {
+ private final int mUserId;
+
+ public PermissionBackupHelper(int userId) {
super(STATE_VERSION, KEY_PERMISSIONS);
+
+ mUserId = userId;
}
@Override
@@ -45,7 +48,7 @@
try {
switch (key) {
case KEY_PERMISSIONS:
- return pm.getPermissionGrantBackup(UserHandle.USER_SYSTEM);
+ return pm.getPermissionGrantBackup(mUserId);
default:
Slog.w(TAG, "Unexpected backup key " + key);
@@ -65,7 +68,7 @@
try {
switch (key) {
case KEY_PERMISSIONS:
- pm.restorePermissionGrants(payload, UserHandle.USER_SYSTEM);
+ pm.restorePermissionGrants(payload, mUserId);
break;
default:
diff --git a/core/java/com/android/server/backup/SystemBackupAgent.java b/core/java/com/android/server/backup/SystemBackupAgent.java
index 47e7a0e7..8878421 100644
--- a/core/java/com/android/server/backup/SystemBackupAgent.java
+++ b/core/java/com/android/server/backup/SystemBackupAgent.java
@@ -19,7 +19,7 @@
import android.app.IWallpaperManager;
import android.app.backup.BackupAgentHelper;
import android.app.backup.BackupDataInput;
-import android.app.backup.BackupDataOutput;
+import android.app.backup.BackupHelper;
import android.app.backup.FullBackup;
import android.app.backup.FullBackupDataOutput;
import android.app.backup.WallpaperBackupHelper;
@@ -31,8 +31,11 @@
import android.os.UserHandle;
import android.util.Slog;
+import com.google.android.collect.Sets;
+
import java.io.File;
import java.io.IOException;
+import java.util.Set;
/**
* Backup agent for various system-managed data. Wallpapers are now handled by a
@@ -77,20 +80,25 @@
// Use old keys to keep legacy data compatibility and avoid writing two wallpapers
private static final String WALLPAPER_IMAGE_KEY = WallpaperBackupHelper.WALLPAPER_IMAGE_KEY;
- private WallpaperBackupHelper mWallpaperHelper = null;
+ private static final Set<String> sEligibleForMultiUser = Sets.newArraySet(
+ PERMISSION_HELPER);
+
+ private int mUserId = UserHandle.USER_SYSTEM;
@Override
- public void onBackup(ParcelFileDescriptor oldState, BackupDataOutput data,
- ParcelFileDescriptor newState) throws IOException {
+ public void onCreate(UserHandle user) {
+ super.onCreate(user);
+
+ mUserId = user.getIdentifier();
+
addHelper(SYNC_SETTINGS_HELPER, new AccountSyncSettingsBackupHelper(this));
addHelper(PREFERRED_HELPER, new PreferredActivityBackupHelper());
addHelper(NOTIFICATION_HELPER, new NotificationBackupHelper(this));
- addHelper(PERMISSION_HELPER, new PermissionBackupHelper());
+ addHelper(PERMISSION_HELPER, new PermissionBackupHelper(mUserId));
addHelper(USAGE_STATS_HELPER, new UsageStatsBackupHelper(this));
addHelper(SHORTCUT_MANAGER_HELPER, new ShortcutBackupHelper());
addHelper(ACCOUNT_MANAGER_HELPER, new AccountManagerBackupHelper());
addHelper(SLICES_HELPER, new SliceBackupHelper(this));
- super.onBackup(oldState, data, newState);
}
@Override
@@ -103,26 +111,25 @@
throws IOException {
// Slot in a restore helper for the older wallpaper backup schema to support restore
// from devices still generating data in that format.
- mWallpaperHelper = new WallpaperBackupHelper(this,
- new String[] { WALLPAPER_IMAGE_KEY} );
- addHelper(WALLPAPER_HELPER, mWallpaperHelper);
+ addHelper(WALLPAPER_HELPER, new WallpaperBackupHelper(this,
+ new String[] { WALLPAPER_IMAGE_KEY}));
// On restore, we also support a long-ago wallpaper data schema "system_files"
addHelper("system_files", new WallpaperBackupHelper(this,
new String[] { WALLPAPER_IMAGE_KEY} ));
- addHelper(SYNC_SETTINGS_HELPER, new AccountSyncSettingsBackupHelper(this));
- addHelper(PREFERRED_HELPER, new PreferredActivityBackupHelper());
- addHelper(NOTIFICATION_HELPER, new NotificationBackupHelper(this));
- addHelper(PERMISSION_HELPER, new PermissionBackupHelper());
- addHelper(USAGE_STATS_HELPER, new UsageStatsBackupHelper(this));
- addHelper(SHORTCUT_MANAGER_HELPER, new ShortcutBackupHelper());
- addHelper(ACCOUNT_MANAGER_HELPER, new AccountManagerBackupHelper());
- addHelper(SLICES_HELPER, new SliceBackupHelper(this));
-
super.onRestore(data, appVersionCode, newState);
}
+ @Override
+ public void addHelper(String keyPrefix, BackupHelper helper) {
+ if (mUserId != UserHandle.USER_SYSTEM && !sEligibleForMultiUser.contains(keyPrefix)) {
+ return;
+ }
+
+ super.addHelper(keyPrefix, helper);
+ }
+
/**
* Support for 'adb restore' of legacy archives
*/
diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 51a3b48..e7a1c49 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -27,10 +27,6 @@
"-Wno-error=deprecated-declarations",
"-Wunused",
"-Wunreachable-code",
-
- // TODO: Linear blending should be enabled by default, but we are
- // TODO: making it an opt-in while it's a work in progress
- //"-DANDROID_ENABLE_LINEAR_BLENDING",
],
cppflags: ["-Wno-conversion-null"],
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 34abcd8..a2ed7d3 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -621,6 +621,24 @@
}
static jint
+android_media_AudioSystem_setMasterBalance(JNIEnv *env, jobject thiz, jfloat balance)
+{
+ return (jint) check_AudioSystem_Command(AudioSystem::setMasterBalance(balance));
+}
+
+static jfloat
+android_media_AudioSystem_getMasterBalance(JNIEnv *env, jobject thiz)
+{
+ float balance;
+ const status_t status = AudioSystem::getMasterBalance(&balance);
+ if (status != NO_ERROR) {
+ ALOGW("%s getMasterBalance error %d, returning 0.f, audioserver down?", __func__, status);
+ balance = 0.f;
+ }
+ return balance;
+}
+
+static jint
android_media_AudioSystem_getDevicesForStream(JNIEnv *env, jobject thiz, jint stream)
{
return (jint) AudioSystem::getDevicesForStream(static_cast <audio_stream_type_t>(stream));
@@ -2160,6 +2178,8 @@
{"getMasterMute", "()Z", (void *)android_media_AudioSystem_getMasterMute},
{"setMasterMono", "(Z)I", (void *)android_media_AudioSystem_setMasterMono},
{"getMasterMono", "()Z", (void *)android_media_AudioSystem_getMasterMono},
+ {"setMasterBalance", "(F)I", (void *)android_media_AudioSystem_setMasterBalance},
+ {"getMasterBalance", "()F", (void *)android_media_AudioSystem_getMasterBalance},
{"getDevicesForStream", "(I)I", (void *)android_media_AudioSystem_getDevicesForStream},
{"getPrimaryOutputSamplingRate", "()I", (void *)android_media_AudioSystem_getPrimaryOutputSamplingRate},
{"getPrimaryOutputFrameCount", "()I", (void *)android_media_AudioSystem_getPrimaryOutputFrameCount},
diff --git a/core/jni/android_os_Parcel.cpp b/core/jni/android_os_Parcel.cpp
index 3b59321..d80c071 100644
--- a/core/jni/android_os_Parcel.cpp
+++ b/core/jni/android_os_Parcel.cpp
@@ -670,6 +670,24 @@
return 0;
}
+static jint android_os_Parcel_readCallingWorkSourceUid(jlong nativePtr)
+{
+ Parcel* parcel = reinterpret_cast<Parcel*>(nativePtr);
+ if (parcel != NULL) {
+ return parcel->readCallingWorkSourceUid();
+ }
+ return IPCThreadState::kUnsetWorkSource;
+}
+
+static jboolean android_os_Parcel_replaceCallingWorkSourceUid(jlong nativePtr, jint uid)
+{
+ Parcel* parcel = reinterpret_cast<Parcel*>(nativePtr);
+ if (parcel != NULL) {
+ return parcel->replaceCallingWorkSourceUid(uid);
+ }
+ return false;
+}
+
// ----------------------------------------------------------------------------
static const JNINativeMethod gParcelMethods[] = {
@@ -740,6 +758,11 @@
// @CriticalNative
{"nativeGetBlobAshmemSize", "(J)J", (void*)android_os_Parcel_getBlobAshmemSize},
+
+ // @CriticalNative
+ {"nativeReadCallingWorkSourceUid", "(J)I", (void*)android_os_Parcel_readCallingWorkSourceUid},
+ // @CriticalNative
+ {"nativeReplaceCallingWorkSourceUid", "(JI)Z", (void*)android_os_Parcel_replaceCallingWorkSourceUid},
};
const char* const kParcelPathName = "android/os/Parcel";
diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index 26a474c..2d7069c 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -355,30 +355,34 @@
static void get_cpuset_cores_for_policy(SchedPolicy policy, cpu_set_t *cpu_set)
{
FILE *file;
- const char *filename;
+ std::string filename;
CPU_ZERO(cpu_set);
switch (policy) {
case SP_BACKGROUND:
- filename = "/dev/cpuset/background/cpus";
+ if (!CgroupGetAttributePath("LowCapacityCPUs", &filename)) {
+ return;
+ }
break;
case SP_FOREGROUND:
case SP_AUDIO_APP:
case SP_AUDIO_SYS:
case SP_RT_APP:
- filename = "/dev/cpuset/foreground/cpus";
+ if (!CgroupGetAttributePath("HighCapacityCPUs", &filename)) {
+ return;
+ }
break;
case SP_TOP_APP:
- filename = "/dev/cpuset/top-app/cpus";
+ if (!CgroupGetAttributePath("MaxCapacityCPUs", &filename)) {
+ return;
+ }
break;
default:
- filename = NULL;
+ return;
}
- if (!filename) return;
-
- file = fopen(filename, "re");
+ file = fopen(filename.c_str(), "re");
if (file != NULL) {
// Parse cpus string
char *line = NULL;
@@ -388,7 +392,7 @@
if (num_read > 0) {
parse_cpuset_cpus(line, cpu_set);
} else {
- ALOGE("Failed to read %s", filename);
+ ALOGE("Failed to read %s", filename.c_str());
}
free(line);
}
diff --git a/core/jni/android_util_XmlBlock.cpp b/core/jni/android_util_XmlBlock.cpp
index ad6bad2..8913300 100644
--- a/core/jni/android_util_XmlBlock.cpp
+++ b/core/jni/android_util_XmlBlock.cpp
@@ -72,7 +72,7 @@
}
static jlong android_content_XmlBlock_nativeCreateParseState(JNIEnv* env, jobject clazz,
- jlong token)
+ jlong token, jint res_id)
{
ResXMLTree* osb = reinterpret_cast<ResXMLTree*>(token);
if (osb == NULL) {
@@ -86,6 +86,7 @@
return 0;
}
+ st->setSourceResourceId(res_id);
st->restart();
return reinterpret_cast<jlong>(st);
@@ -335,6 +336,17 @@
? value.data : 0;
}
+static jint android_content_XmlBlock_nativeGetSourceResId(JNIEnv* env, jobject clazz,
+ jlong token)
+{
+ ResXMLParser* st = reinterpret_cast<ResXMLParser*>(token);
+ if (st == NULL) {
+ return 0;
+ } else {
+ return st->getSourceResourceId();
+ }
+}
+
static void android_content_XmlBlock_nativeDestroyParseState(JNIEnv* env, jobject clazz,
jlong token)
{
@@ -370,7 +382,7 @@
(void*) android_content_XmlBlock_nativeCreate },
{ "nativeGetStringBlock", "(J)J",
(void*) android_content_XmlBlock_nativeGetStringBlock },
- { "nativeCreateParseState", "(J)J",
+ { "nativeCreateParseState", "(JI)J",
(void*) android_content_XmlBlock_nativeCreateParseState },
{ "nativeDestroyParseState", "(J)V",
(void*) android_content_XmlBlock_nativeDestroyParseState },
@@ -411,6 +423,8 @@
(void*) android_content_XmlBlock_nativeGetClassAttribute },
{ "nativeGetStyleAttribute", "(J)I",
(void*) android_content_XmlBlock_nativeGetStyleAttribute },
+ { "nativeGetSourceResId", "(J)I",
+ (void*) android_content_XmlBlock_nativeGetSourceResId},
};
int register_android_content_XmlBlock(JNIEnv* env)
diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
index f9407f4..67a56ae 100644
--- a/core/jni/android_view_Surface.cpp
+++ b/core/jni/android_view_Surface.cpp
@@ -415,18 +415,23 @@
}
static jlong nativeGetFromSurfaceControl(JNIEnv* env, jclass clazz,
+ jlong nativeObject,
jlong surfaceControlNativeObj) {
- /*
- * This is used by the WindowManagerService just after constructing
- * a Surface and is necessary for returning the Surface reference to
- * the caller. At this point, we should only have a SurfaceControl.
- */
-
+ Surface* self(reinterpret_cast<Surface *>(nativeObject));
sp<SurfaceControl> ctrl(reinterpret_cast<SurfaceControl *>(surfaceControlNativeObj));
+
+ // If the underlying IGBP's are the same, we don't need to do anything.
+ if (self != nullptr &&
+ IInterface::asBinder(self->getIGraphicBufferProducer()) ==
+ IInterface::asBinder(ctrl->getIGraphicBufferProducer())) {
+ return nativeObject;
+ }
+
sp<Surface> surface(ctrl->getSurface());
if (surface != NULL) {
surface->incStrong(&sRefBaseOwner);
}
+
return reinterpret_cast<jlong>(surface.get());
}
@@ -614,7 +619,7 @@
(void*)nativeAllocateBuffers },
{"nativeCreateFromSurfaceControl", "(J)J",
(void*)nativeCreateFromSurfaceControl },
- {"nativeGetFromSurfaceControl", "(J)J",
+ {"nativeGetFromSurfaceControl", "(JJ)J",
(void*)nativeGetFromSurfaceControl },
{"nativeReadFromParcel", "(JLandroid/os/Parcel;)J",
(void*)nativeReadFromParcel },
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 6ee9606..5a65028 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -276,6 +276,7 @@
// Must match values in com.android.internal.os.Zygote.
enum RuntimeFlags : uint32_t {
DEBUG_ENABLE_JDWP = 1,
+ PROFILE_FROM_SHELL = 1 << 15,
};
// Forward declaration so we don't have to move the signal handler.
@@ -1224,6 +1225,13 @@
if ((runtime_flags & RuntimeFlags::DEBUG_ENABLE_JDWP) != 0) {
EnableDebugger();
}
+ if ((runtime_flags & RuntimeFlags::PROFILE_FROM_SHELL) != 0) {
+ // simpleperf needs the process to be dumpable to profile it.
+ if (prctl(PR_SET_DUMPABLE, 1, 0, 0, 0) == -1) {
+ ALOGE("prctl(PR_SET_DUMPABLE) failed: %s", strerror(errno));
+ RuntimeAbort(env, __LINE__, "prctl(PR_SET_DUMPABLE, 1) failed");
+ }
+ }
if (NeedsNoRandomizeWorkaround()) {
// Work around ARM kernel ASLR lossage (http://b/5817320).
@@ -1526,15 +1534,12 @@
RuntimeAbort(env, __LINE__, "System server process has died. Restarting Zygote!");
}
- bool low_ram_device = GetBoolProperty("ro.config.low_ram", false);
- bool per_app_memcg = GetBoolProperty("ro.config.per_app_memcg", low_ram_device);
- if (per_app_memcg) {
+ if (UsePerAppMemcg()) {
// Assign system_server to the correct memory cgroup.
- // Not all devices mount /dev/memcg so check for the file first
+ // Not all devices mount memcg so check if it is mounted first
// to avoid unnecessarily printing errors and denials in the logs.
- if (!access("/dev/memcg/system/tasks", F_OK) &&
- !WriteStringToFile(StringPrintf("%d", pid), "/dev/memcg/system/tasks")) {
- ALOGE("couldn't write %d to /dev/memcg/system/tasks", pid);
+ if (!SetTaskProfiles(pid, std::vector<std::string>{"SystemMemoryProcess"})) {
+ ALOGE("couldn't add process %d into system memcg group", pid);
}
}
}
diff --git a/core/proto/android/app/settings_enums.proto b/core/proto/android/app/settings_enums.proto
index 631fa1d..30b9b78 100644
--- a/core/proto/android/app/settings_enums.proto
+++ b/core/proto/android/app/settings_enums.proto
@@ -600,6 +600,16 @@
// CATEGORY: SETTINGS
// OS: Q
CLICK_ACCOUNT_AVATAR = 1643;
+
+ // ACTION: Set new password (action intent android.app.action.SET_NEW_PASSWORD)
+ // CATEGORY: SETTINGS
+ // OS: Q
+ ACTION_SET_NEW_PASSWORD = 1645;
+
+ // ACTION: Set new password (action intent android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD)
+ // CATEGORY: SETTINGS
+ // OS: Q
+ ACTION_SET_NEW_PARENT_PROFILE_PASSWORD = 1646;
}
/**
@@ -2199,4 +2209,9 @@
// details for a SIM/eSIM mobile network > Click edit icon to bring up a rename dialog.
// OS: Q
MOBILE_NETWORK_RENAME_DIALOG = 1642;
+
+ // OPEN: Set new password (android.app.action.SET_NEW_PASSWORD action intent)
+ // CATEGORY: SETTINGS
+ // OS: Q
+ SET_NEW_PASSWORD_ACTIVITY = 1644;
}
diff --git a/core/proto/android/bluetooth/enums.proto b/core/proto/android/bluetooth/enums.proto
index a88a06c..5b5c9c2 100644
--- a/core/proto/android/bluetooth/enums.proto
+++ b/core/proto/android/bluetooth/enums.proto
@@ -110,3 +110,25 @@
UNBOND_REASON_REMOTE_AUTH_CANCELED = 8;
UNBOND_REASON_REMOVED = 9;
}
+
+enum SocketTypeEnum {
+ SOCKET_TYPE_UNKNOWN = 0;
+ SOCKET_TYPE_RFCOMM = 1;
+ SOCKET_TYPE_SCO = 2;
+ SOCKET_TYPE_L2CAP_BREDR = 3;
+ SOCKET_TYPE_L2CAP_LE = 4;
+}
+
+enum SocketConnectionstateEnum {
+ SOCKET_CONNECTION_STATE_UNKNOWN = 0;
+ // Socket acts as a server waiting for connection
+ SOCKET_CONNECTION_STATE_LISTENING = 1;
+ // Socket acts as a client trying to connect
+ SOCKET_CONNECTION_STATE_CONNECTING = 2;
+ // Socket is connected
+ SOCKET_CONNECTION_STATE_CONNECTED = 3;
+ // Socket tries to disconnect from remote
+ SOCKET_CONNECTION_STATE_DISCONNECTING = 4;
+ // This socket is closed
+ SOCKET_CONNECTION_STATE_DISCONNECTED = 5;
+}
diff --git a/core/proto/android/providers/settings/system.proto b/core/proto/android/providers/settings/system.proto
index dfc4081..41a7498 100644
--- a/core/proto/android/providers/settings/system.proto
+++ b/core/proto/android/providers/settings/system.proto
@@ -232,6 +232,8 @@
// Which streams are affected by mute. The stream type's bit should be set
// to 1 if it should be muted when a mute request is received.
optional SettingProto mute_streams_affected = 12 [ (android.privacy).dest = DEST_AUTOMATIC ];
+ // Master balance (float -1.f = 100% left, 0.f = dead center, 1.f = 100% right).
+ optional SettingProto master_balance = 13 [ (android.privacy).dest = DEST_AUTOMATIC ];
}
optional Volume volume = 33;
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml
index bc9dc57..c7b528c 100644
--- a/core/res/AndroidManifest.xml
+++ b/core/res/AndroidManifest.xml
@@ -274,6 +274,7 @@
<protected-broadcast android:name="android.media.MASTER_VOLUME_CHANGED_ACTION" />
<protected-broadcast android:name="android.media.MASTER_MUTE_CHANGED_ACTION" />
<protected-broadcast android:name="android.media.MASTER_MONO_CHANGED_ACTION" />
+ <protected-broadcast android:name="android.media.MASTER_BALANCE_CHANGED_ACTION" />
<protected-broadcast android:name="android.media.SCO_AUDIO_STATE_CHANGED" />
<protected-broadcast android:name="android.media.ACTION_SCO_AUDIO_STATE_UPDATED" />
@@ -4332,7 +4333,7 @@
<!-- @SystemApi Allows an application to manage the app predictions service.
@hide <p>Not for use by third-party applications.</p> -->
<permission android:name="android.permission.MANAGE_APP_PREDICTIONS"
- android:protectionLevel="signature" />
+ android:protectionLevel="signature|appPredictor" />
<!-- Allows an app to set the theme overlay in /vendor/overlay
being used.
@@ -4408,7 +4409,7 @@
{@link android.provider.Telephony.Intents#ACTION_DEFAULT_SMS_PACKAGE_CHANGED_INTERNAL}
broadcast -->
<permission android:name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE"
- android:protectionLevel="signature" />
+ android:protectionLevel="signature|privileged" />
<!-- A subclass of {@link android.app.SmsAppService} must be protected with this permission. -->
<permission android:name="android.permission.BIND_SMS_APP_SERVICE"
diff --git a/core/res/res/anim/lock_in.xml b/core/res/res/anim/lock_in.xml
new file mode 100755
index 0000000..992bc92
--- /dev/null
+++ b/core/res/res/anim/lock_in.xml
@@ -0,0 +1,404 @@
+<!--
+ Copyright (C) 2019 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.
+-->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt">
+ <aapt:attr name="android:drawable">
+ <vector
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <group android:name="_R_G">
+ <group android:name="_R_G_L_2_G_N_3_T_0_M">
+ <group
+ android:name="_R_G_L_2_G_N_3_T_0"
+ android:pivotX="2.25"
+ android:pivotY="2.25"
+ android:scaleX="0"
+ android:scaleY="0"
+ android:translateX="9.75"
+ android:translateY="12.75">
+ <group
+ android:name="_R_G_L_2_G_T_1"
+ android:scaleX="0.12346"
+ android:scaleY="0.12346"
+ android:translateX="2.25"
+ android:translateY="2.373">
+ <group
+ android:name="_R_G_L_2_G"
+ android:translateY="32">
+ <path
+ android:name="_R_G_L_2_G_D_0_P_0"
+ android:fillAlpha="0"
+ android:fillColor="#ff0000"
+ android:fillType="nonZero"
+ android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:trimPathStart="0.14"
+ android:trimPathEnd="0.89"
+ android:trimPathOffset="0" />
+ <path
+ android:name="_R_G_L_2_G_D_1_P_0"
+ android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:strokeWidth="16"
+ android:strokeAlpha="1"
+ android:strokeColor="?attr/textColor"
+ android:trimPathStart="0.14"
+ android:trimPathEnd="0.89"
+ android:trimPathOffset="0" />
+ </group>
+ </group>
+ </group>
+ </group>
+ <group
+ android:name="_R_G_L_1_G"
+ android:pivotX="8.25"
+ android:pivotY="7.25"
+ android:scaleX="0"
+ android:scaleY="0"
+ android:translateX="3.75"
+ android:translateY="7.75">
+ <path
+ android:name="_R_G_L_1_G_D_0_P_0"
+ android:fillAlpha="1"
+ android:fillColor="?attr/textColor"
+ android:fillType="nonZero"
+ android:pathData=" M14.25 0.25 C14.25,0.25 12.75,0.25 12.75,0.25 C12.75,0.25 10.75,0.25 10.75,0.25 C10.75,0.25 5.75,0.25 5.75,0.25 C5.75,0.25 3.75,0.25 3.75,0.25 C3.75,0.25 2.25,0.25 2.25,0.25 C1.15,0.25 0.25,1.15 0.25,2.25 C0.25,2.25 0.25,12.25 0.25,12.25 C0.25,13.35 1.15,14.25 2.25,14.25 C2.25,14.25 14.25,14.25 14.25,14.25 C15.35,14.25 16.25,13.35 16.25,12.25 C16.25,12.25 16.25,2.25 16.25,2.25 C16.25,1.15 15.35,0.25 14.25,0.25c M14.25 12.25 C14.25,12.25 2.25,12.25 2.25,12.25 C2.25,12.25 2.25,2.25 2.25,2.25 C2.25,2.25 3.75,2.25 3.75,2.25 C3.75,2.25 12.75,2.25 12.75,2.25 C12.75,2.25 14.25,2.25 14.25,2.25 C14.25,2.25 14.25,12.25 14.25,12.25c " />
+ </group>
+ <group
+ android:name="_R_G_L_0_G"
+ android:pivotX="2.25"
+ android:pivotY="2.25"
+ android:scaleX="0"
+ android:scaleY="0"
+ android:translateX="9.75"
+ android:translateY="12.75">
+ <path
+ android:name="_R_G_L_0_G_D_0_P_0"
+ android:fillAlpha="1"
+ android:fillColor="?attr/textColor"
+ android:fillType="nonZero"
+ android:pathData=" M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c " />
+ </group>
+ </group>
+ <group android:name="time_group" />
+ </vector>
+ </aapt:attr>
+ <target android:name="_R_G_L_2_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="50"
+ android:propertyName="trimPathStart"
+ android:startOffset="0"
+ android:valueFrom="0.14"
+ android:valueTo="0.14"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="67"
+ android:propertyName="trimPathStart"
+ android:startOffset="50"
+ android:valueFrom="0.14"
+ android:valueTo="0"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="50"
+ android:propertyName="trimPathEnd"
+ android:startOffset="0"
+ android:valueFrom="0.89"
+ android:valueTo="0.89"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="67"
+ android:propertyName="trimPathEnd"
+ android:startOffset="50"
+ android:valueFrom="0.89"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_D_1_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="50"
+ android:propertyName="trimPathStart"
+ android:startOffset="0"
+ android:valueFrom="0.14"
+ android:valueTo="0.14"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="67"
+ android:propertyName="trimPathStart"
+ android:startOffset="50"
+ android:valueFrom="0.14"
+ android:valueTo="0"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_D_1_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="50"
+ android:propertyName="trimPathEnd"
+ android:startOffset="0"
+ android:valueFrom="0.89"
+ android:valueTo="0.89"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="67"
+ android:propertyName="trimPathEnd"
+ android:startOffset="50"
+ android:valueFrom="0.89"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_T_1">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="150"
+ android:pathData="M 2.25,2.373C 2.25,1.2001604776382402 2.25,-3.49116047763824 2.25,-4.664"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="0">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_N_3_T_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="233"
+ android:propertyName="scaleX"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="1.0125"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.043,0.556 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="233"
+ android:propertyName="scaleY"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="1.0125"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.043,0.556 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="117"
+ android:propertyName="scaleX"
+ android:startOffset="233"
+ android:valueFrom="1.0125"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="117"
+ android:propertyName="scaleY"
+ android:startOffset="233"
+ android:valueFrom="1.0125"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_N_3_T_0_M">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="0"
+ android:propertyName="scaleX"
+ android:startOffset="50"
+ android:valueFrom="0"
+ android:valueTo="1"
+ android:valueType="floatType" />
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_1_G">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="233"
+ android:propertyName="scaleX"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="1.025"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="233"
+ android:propertyName="scaleY"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="1.025"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="117"
+ android:propertyName="scaleX"
+ android:startOffset="233"
+ android:valueFrom="1.025"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="117"
+ android:propertyName="scaleY"
+ android:startOffset="233"
+ android:valueFrom="1.025"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_0_G">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="233"
+ android:propertyName="scaleX"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="1.0125"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.043,0.556 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="233"
+ android:propertyName="scaleY"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="1.0125"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.043,0.556 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="117"
+ android:propertyName="scaleX"
+ android:startOffset="233"
+ android:valueFrom="1.0125"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="117"
+ android:propertyName="scaleY"
+ android:startOffset="233"
+ android:valueFrom="1.0125"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="time_group">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="717"
+ android:propertyName="translateX"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="1"
+ android:valueType="floatType" />
+ </set>
+ </aapt:attr>
+ </target>
+</animated-vector>
\ No newline at end of file
diff --git a/core/res/res/anim/lock_lock.xml b/core/res/res/anim/lock_lock.xml
new file mode 100755
index 0000000..8b7887c
--- /dev/null
+++ b/core/res/res/anim/lock_lock.xml
@@ -0,0 +1,16 @@
+<!--
+ Copyright (C) 2019 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.
+-->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"><aapt:attr name="android:drawable"><vector android:height="24dp" android:width="24dp" android:viewportHeight="24" android:viewportWidth="24"><group android:name="_R_G"><group android:name="_R_G_L_2_G_T_1" android:translateX="12" android:translateY="15"><group android:name="_R_G_L_2_G" android:translateX="-8.25" android:translateY="-7.25"><path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/textColor" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M14.25 0.25 C14.25,0.25 12.75,0.25 12.75,0.25 C12.75,0.25 10.75,0.25 10.75,0.25 C10.75,0.25 5.75,0.25 5.75,0.25 C5.75,0.25 3.75,0.25 3.75,0.25 C3.75,0.25 2.25,0.25 2.25,0.25 C1.15,0.25 0.25,1.15 0.25,2.25 C0.25,2.25 0.25,12.25 0.25,12.25 C0.25,13.35 1.15,14.25 2.25,14.25 C2.25,14.25 14.25,14.25 14.25,14.25 C15.35,14.25 16.25,13.35 16.25,12.25 C16.25,12.25 16.25,2.25 16.25,2.25 C16.25,1.15 15.35,0.25 14.25,0.25c M14.25 12.25 C14.25,12.25 2.25,12.25 2.25,12.25 C2.25,12.25 2.25,2.25 2.25,2.25 C2.25,2.25 3.75,2.25 3.75,2.25 C3.75,2.25 12.75,2.25 12.75,2.25 C12.75,2.25 14.25,2.25 14.25,2.25 C14.25,2.25 14.25,12.25 14.25,12.25c "/></group></group><group android:name="_R_G_L_1_G_N_5_T_1" android:translateX="12" android:translateY="15"><group android:name="_R_G_L_1_G_N_5_T_0" android:translateX="-8.25" android:translateY="-7.25"><group android:name="_R_G_L_1_G" android:translateX="6" android:translateY="5" android:pivotX="2.25" android:pivotY="2.25" android:scaleX="1" android:scaleY="1"><path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/textColor" android:fillAlpha="1" android:fillType="nonZero" android:pathData=" M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c "/></group></group></group><group android:name="_R_G_L_0_G_N_5_T_1" android:translateX="12" android:translateY="15"><group android:name="_R_G_L_0_G_N_5_T_0" android:translateX="-8.25" android:translateY="-7.25"><group android:name="_R_G_L_0_G" android:translateX="-16.219" android:translateY="32.25" android:pivotX="27.965" android:pivotY="-32" android:scaleX="0.125" android:scaleY="0.125"><path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#ff0000" android:fillAlpha="0" android:fillType="nonZero" android:pathData=" M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 "/><path android:name="_R_G_L_0_G_D_1_P_0" android:strokeColor="?attr/textColor" android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="16" android:strokeAlpha="1" android:pathData=" M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 "/></group></group></group></group><group android:name="time_group"/></vector></aapt:attr><target android:name="_R_G_L_2_G_T_1"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="translateXY" android:duration="400" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 12,15C 12,15.09895833581686 12,15 12,15"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="translateXY" android:duration="67" android:startOffset="400" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 12,15C 12,15.09895833581686 12,15.594 12,15.594"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="translateXY" android:duration="83" android:startOffset="467" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 12,15.594C 12,15.594 12,15.09895833581686 12,15"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator></set></aapt:attr></target><target android:name="_R_G_L_1_G"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="scaleX" android:duration="450" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="scaleY" android:duration="450" android:startOffset="0" android:valueFrom="1" android:valueTo="1" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="scaleX" android:duration="67" android:startOffset="450" android:valueFrom="1" android:valueTo="1.1" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="scaleY" android:duration="67" android:startOffset="450" android:valueFrom="1" android:valueTo="1.1" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="scaleX" android:duration="183" android:startOffset="517" android:valueFrom="1.1" android:valueTo="1" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="scaleY" android:duration="183" android:startOffset="517" android:valueFrom="1.1" android:valueTo="1" android:valueType="floatType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator></set></aapt:attr></target><target android:name="_R_G_L_1_G_N_5_T_1"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="translateXY" android:duration="400" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 12,15C 12,15.09895833581686 12,15 12,15"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="translateXY" android:duration="67" android:startOffset="400" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 12,15C 12,15.09895833581686 12,15.594 12,15.594"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="translateXY" android:duration="83" android:startOffset="467" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 12,15.594C 12,15.594 12,15.09895833581686 12,15"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator></set></aapt:attr></target><target android:name="_R_G_L_0_G_D_0_P_0"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="pathData" android:duration="317" android:startOffset="0" android:valueFrom="M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 " android:valueTo="M-27.97 -55.05 C-27.97,-55.05 -28,-60.25 -27.97,-61.98 C-27.92,-64.13 -23.5,-86.37 -0.75,-86.32 C22.77,-86.26 27.75,-65.87 27.72,-64.77 C27.55,-59.38 27.97,-31.67 27.97,-31.67 " android:valueType="pathType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.974,0 0.458,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="pathData" android:duration="133" android:startOffset="317" android:valueFrom="M-27.97 -55.05 C-27.97,-55.05 -28,-60.25 -27.97,-61.98 C-27.92,-64.13 -23.5,-86.37 -0.75,-86.32 C22.77,-86.26 27.75,-65.87 27.72,-64.77 C27.55,-59.38 27.97,-31.67 27.97,-31.67 " android:valueTo="M-28.21 -28.42 C-28.21,-28.42 -27.85,-44.88 -27.97,-51.98 C-28,-54.13 -23.5,-76.37 -0.75,-76.32 C22.77,-76.26 27.75,-55.87 27.72,-54.77 C27.55,-49.38 27.97,-28.17 27.97,-28.17 " android:valueType="pathType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="pathData" android:duration="250" android:startOffset="450" android:valueFrom="M-28.21 -28.42 C-28.21,-28.42 -27.85,-44.88 -27.97,-51.98 C-28,-54.13 -23.5,-76.37 -0.75,-76.32 C22.77,-76.26 27.75,-55.87 27.72,-54.77 C27.55,-49.38 27.97,-28.17 27.97,-28.17 " android:valueTo="M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 " android:valueType="pathType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.414,0 0.647,1 1.0,1.0"/></aapt:attr></objectAnimator></set></aapt:attr></target><target android:name="_R_G_L_0_G_D_1_P_0"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="pathData" android:duration="317" android:startOffset="0" android:valueFrom="M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 " android:valueTo="M-27.97 -55.05 C-27.97,-55.05 -28,-60.25 -27.97,-61.98 C-27.92,-64.13 -23.5,-86.37 -0.75,-86.32 C22.77,-86.26 27.75,-65.87 27.72,-64.77 C27.55,-59.38 27.97,-31.67 27.97,-31.67 " android:valueType="pathType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.974,0 0.458,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="pathData" android:duration="133" android:startOffset="317" android:valueFrom="M-27.97 -55.05 C-27.97,-55.05 -28,-60.25 -27.97,-61.98 C-27.92,-64.13 -23.5,-86.37 -0.75,-86.32 C22.77,-86.26 27.75,-65.87 27.72,-64.77 C27.55,-59.38 27.97,-31.67 27.97,-31.67 " android:valueTo="M-28.21 -28.42 C-28.21,-28.42 -27.85,-44.88 -27.97,-51.98 C-28,-54.13 -23.5,-76.37 -0.75,-76.32 C22.77,-76.26 27.75,-55.87 27.72,-54.77 C27.55,-49.38 27.97,-28.17 27.97,-28.17 " android:valueType="pathType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="pathData" android:duration="250" android:startOffset="450" android:valueFrom="M-28.21 -28.42 C-28.21,-28.42 -27.85,-44.88 -27.97,-51.98 C-28,-54.13 -23.5,-76.37 -0.75,-76.32 C22.77,-76.26 27.75,-55.87 27.72,-54.77 C27.55,-49.38 27.97,-28.17 27.97,-28.17 " android:valueTo="M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 " android:valueType="pathType"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.414,0 0.647,1 1.0,1.0"/></aapt:attr></objectAnimator></set></aapt:attr></target><target android:name="_R_G_L_0_G_N_5_T_1"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="translateXY" android:duration="400" android:startOffset="0" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 12,15C 12,15.09895833581686 12,15 12,15"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="translateXY" android:duration="67" android:startOffset="400" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 12,15C 12,15.09895833581686 12,15.594 12,15.594"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator><objectAnimator android:propertyName="translateXY" android:duration="83" android:startOffset="467" android:propertyXName="translateX" android:propertyYName="translateY" android:pathData="M 12,15.594C 12,15.594 12,15.09895833581686 12,15"><aapt:attr name="android:interpolator"><pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/></aapt:attr></objectAnimator></set></aapt:attr></target><target android:name="time_group"><aapt:attr name="android:animation"><set android:ordering="together"><objectAnimator android:propertyName="translateX" android:duration="717" android:startOffset="0" android:valueFrom="0" android:valueTo="1" android:valueType="floatType"/></set></aapt:attr></target></animated-vector>
\ No newline at end of file
diff --git a/core/res/res/anim/lock_out.xml b/core/res/res/anim/lock_out.xml
new file mode 100755
index 0000000..2543d47
--- /dev/null
+++ b/core/res/res/anim/lock_out.xml
@@ -0,0 +1,277 @@
+<!--
+ Copyright (C) 2019 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.
+-->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt">
+ <aapt:attr name="android:drawable">
+ <vector
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <group android:name="_R_G">
+ <group android:name="_R_G_L_2_G_N_4_T_0_M">
+ <group
+ android:name="_R_G_L_2_G_N_4_T_0"
+ android:pivotX="8.25"
+ android:pivotY="7.25"
+ android:scaleX="1"
+ android:scaleY="1"
+ android:translateX="3.75"
+ android:translateY="7.75">
+ <group
+ android:name="_R_G_L_2_G"
+ android:pivotY="-32"
+ android:scaleX="0.125"
+ android:scaleY="0.125"
+ android:translateX="8.25"
+ android:translateY="32.267">
+ <path
+ android:name="_R_G_L_2_G_D_0_P_0"
+ android:fillAlpha="0"
+ android:fillColor="#ff0000"
+ android:fillType="nonZero"
+ android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:trimPathStart="0"
+ android:trimPathEnd="1"
+ android:trimPathOffset="0" />
+ <path
+ android:name="_R_G_L_2_G_D_1_P_0"
+ android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:strokeWidth="16"
+ android:strokeAlpha="1"
+ android:strokeColor="?attr/textColor"
+ android:trimPathStart="0"
+ android:trimPathEnd="1"
+ android:trimPathOffset="0" />
+ </group>
+ </group>
+ </group>
+ <group
+ android:name="_R_G_L_1_G"
+ android:pivotX="8.25"
+ android:pivotY="7.25"
+ android:scaleX="1"
+ android:scaleY="1"
+ android:translateX="3.75"
+ android:translateY="7.75">
+ <path
+ android:name="_R_G_L_1_G_D_0_P_0"
+ android:fillAlpha="1"
+ android:fillColor="?attr/textColor"
+ android:fillType="nonZero"
+ android:pathData=" M14.25 0.25 C14.25,0.25 12.75,0.25 12.75,0.25 C12.75,0.25 10.75,0.25 10.75,0.25 C10.75,0.25 5.75,0.25 5.75,0.25 C5.75,0.25 3.75,0.25 3.75,0.25 C3.75,0.25 2.25,0.25 2.25,0.25 C1.15,0.25 0.25,1.15 0.25,2.25 C0.25,2.25 0.25,12.25 0.25,12.25 C0.25,13.35 1.15,14.25 2.25,14.25 C2.25,14.25 14.25,14.25 14.25,14.25 C15.35,14.25 16.25,13.35 16.25,12.25 C16.25,12.25 16.25,2.25 16.25,2.25 C16.25,1.15 15.35,0.25 14.25,0.25c M14.25 12.25 C14.25,12.25 2.25,12.25 2.25,12.25 C2.25,12.25 2.25,2.25 2.25,2.25 C2.25,2.25 3.75,2.25 3.75,2.25 C3.75,2.25 12.75,2.25 12.75,2.25 C12.75,2.25 14.25,2.25 14.25,2.25 C14.25,2.25 14.25,12.25 14.25,12.25c " />
+ </group>
+ <group android:name="_R_G_L_0_G_N_4_T_0_M">
+ <group
+ android:name="_R_G_L_0_G_N_4_T_0"
+ android:pivotX="8.25"
+ android:pivotY="7.25"
+ android:scaleX="1"
+ android:scaleY="1"
+ android:translateX="3.75"
+ android:translateY="7.75">
+ <group
+ android:name="_R_G_L_0_G"
+ android:translateX="6"
+ android:translateY="5">
+ <path
+ android:name="_R_G_L_0_G_D_0_P_0"
+ android:fillAlpha="1"
+ android:fillColor="?attr/textColor"
+ android:fillType="nonZero"
+ android:pathData=" M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c " />
+ </group>
+ </group>
+ </group>
+ </group>
+ <group android:name="time_group" />
+ </vector>
+ </aapt:attr>
+ <target android:name="_R_G_L_2_G_D_1_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="150"
+ android:propertyName="strokeAlpha"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_N_4_T_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleX"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0.09375"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.521,0 0.942,0.896 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleY"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0.09375"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.521,0 0.942,0.896 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_N_4_T_0_M">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="0"
+ android:propertyName="scaleY"
+ android:startOffset="350"
+ android:valueFrom="1"
+ android:valueTo="0"
+ android:valueType="floatType" />
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_1_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="150"
+ android:propertyName="fillAlpha"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0.02"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_1_G">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleX"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0.09375"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.521,0 0.942,0.896 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleY"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0.09375"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.521,0 0.942,0.896 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_0_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="83"
+ android:propertyName="fillAlpha"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_0_G_N_4_T_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleX"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0.09375"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.521,0 0.942,0.896 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="200"
+ android:propertyName="scaleY"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0.09375"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.521,0 0.942,0.896 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_0_G_N_4_T_0_M">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="0"
+ android:propertyName="scaleY"
+ android:startOffset="367"
+ android:valueFrom="1"
+ android:valueTo="0"
+ android:valueType="floatType" />
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="time_group">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="500"
+ android:propertyName="translateX"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="1"
+ android:valueType="floatType" />
+ </set>
+ </aapt:attr>
+ </target>
+</animated-vector>
\ No newline at end of file
diff --git a/core/res/res/anim/lock_to_error.xml b/core/res/res/anim/lock_to_error.xml
new file mode 100755
index 0000000..29b4964
--- /dev/null
+++ b/core/res/res/anim/lock_to_error.xml
@@ -0,0 +1,574 @@
+<!--
+ Copyright (C) 2019 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.
+-->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt">
+ <aapt:attr name="android:drawable">
+ <vector
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <group android:name="_R_G">
+ <group
+ android:name="_R_G_L_3_G"
+ android:pivotY="-32"
+ android:scaleX="0.12762"
+ android:scaleY="0.12762"
+ android:translateX="12"
+ android:translateY="39.871">
+ <path
+ android:name="_R_G_L_3_G_D_0_P_0"
+ android:fillAlpha="0"
+ android:fillColor="#ff0000"
+ android:fillType="nonZero"
+ android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:trimPathStart="0"
+ android:trimPathEnd="1"
+ android:trimPathOffset="0" />
+ <path
+ android:name="_R_G_L_3_G_D_1_P_0"
+ android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:strokeWidth="16"
+ android:strokeAlpha="1"
+ android:strokeColor="?attr/textColor"
+ android:trimPathStart="0"
+ android:trimPathEnd="1"
+ android:trimPathOffset="0" />
+ </group>
+ <group
+ android:name="_R_G_L_2_G_T_1"
+ android:rotation="45"
+ android:scaleX="1"
+ android:scaleY="1"
+ android:translateX="12"
+ android:translateY="15">
+ <group
+ android:name="_R_G_L_2_G"
+ android:translateX="-2.25"
+ android:translateY="-2.25">
+ <path
+ android:name="_R_G_L_2_G_D_0_P_0"
+ android:fillAlpha="1"
+ android:fillColor="?attr/textColor"
+ android:fillType="nonZero"
+ android:pathData=" M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c " />
+ </group>
+ </group>
+ <group
+ android:name="_R_G_L_1_G_T_1"
+ android:scaleX="0.125"
+ android:scaleY="0.125"
+ android:translateX="12.023"
+ android:translateY="1.281">
+ <group
+ android:name="_R_G_L_1_G"
+ android:translateX="0.317"
+ android:translateY="45.25">
+ <path
+ android:name="_R_G_L_1_G_D_0_P_0"
+ android:fillAlpha="0"
+ android:fillColor="#EA4335"
+ android:fillType="nonZero"
+ android:pathData=" M4.21 -42.01 C4.21,-42.01 4.21,-32 4.21,-32 C4.21,-32 -5.25,-32 -5.25,-32 C-5.25,-32 -5.25,-42.01 -5.25,-42.01 C-5.25,-42.01 4.21,-42.01 4.21,-42.01c " />
+ </group>
+ </group>
+ <group
+ android:name="_R_G_L_0_G"
+ android:pivotY="21"
+ android:scaleX="0.14286"
+ android:scaleY="0.14286"
+ android:translateX="12"
+ android:translateY="-6">
+ <path
+ android:name="_R_G_L_0_G_D_0_P_0"
+ android:fillAlpha="0"
+ android:fillColor="#ffffff"
+ android:fillType="nonZero"
+ android:pathData=" M49.24 -12.32 C49.24,-12.32 49.24,52.91 49.24,52.91 C49.24,58.95 44.34,63.85 38.3,63.85 C38.3,63.85 -37.8,63.85 -37.8,63.85 C-43.84,63.85 -48.74,58.95 -48.74,52.91 C-48.74,52.91 -48.74,-12.32 -48.74,-12.32 C-48.74,-18.37 -43.84,-23.27 -37.8,-23.27 C-37.8,-23.27 38.3,-23.27 38.3,-23.27 C44.34,-23.27 49.24,-18.37 49.24,-12.32c " />
+ <path
+ android:name="_R_G_L_0_G_D_1_P_0"
+ android:pathData=" M49.24 -12.32 C49.24,-12.32 49.24,52.91 49.24,52.91 C49.24,58.95 44.34,63.85 38.3,63.85 C38.3,63.85 -37.8,63.85 -37.8,63.85 C-43.84,63.85 -48.74,58.95 -48.74,52.91 C-48.74,52.91 -48.74,-12.32 -48.74,-12.32 C-48.74,-18.37 -43.84,-23.27 -37.8,-23.27 C-37.8,-23.27 38.3,-23.27 38.3,-23.27 C44.34,-23.27 49.24,-18.37 49.24,-12.32c "
+ android:strokeWidth="14"
+ android:strokeAlpha="1"
+ android:strokeColor="?attr/textColor"
+ android:strokeLineCap="round"
+ android:strokeLineJoin="round" />
+ </group>
+ </group>
+ <group android:name="time_group" />
+ </vector>
+ </aapt:attr>
+ <target android:name="_R_G_L_3_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="250"
+ android:propertyName="trimPathStart"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="0.5"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_3_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="250"
+ android:propertyName="trimPathEnd"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0.5"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_3_G_D_1_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="117"
+ android:propertyName="strokeColor"
+ android:startOffset="0"
+ android:valueFrom="#fff"
+ android:valueTo="#fff"
+ android:valueType="colorType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="17"
+ android:propertyName="strokeColor"
+ android:startOffset="117"
+ android:valueFrom="#fff"
+ android:valueTo="#EA4335"
+ android:valueType="colorType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_3_G_D_1_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="133"
+ android:propertyName="strokeWidth"
+ android:startOffset="0"
+ android:valueFrom="16"
+ android:valueTo="8"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_3_G_D_1_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="250"
+ android:propertyName="trimPathStart"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="0.5"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_3_G_D_1_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="250"
+ android:propertyName="trimPathEnd"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0.5"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_3_G">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="0"
+ android:propertyName="scaleY"
+ android:startOffset="183"
+ android:valueFrom="0.12762"
+ android:valueTo="0"
+ android:valueType="floatType" />
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="117"
+ android:propertyName="fillColor"
+ android:startOffset="0"
+ android:valueFrom="#fff"
+ android:valueTo="#fff"
+ android:valueType="colorType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="17"
+ android:propertyName="fillColor"
+ android:startOffset="117"
+ android:valueFrom="#fff"
+ android:valueTo="#EA4335"
+ android:valueType="colorType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="133"
+ android:propertyName="pathData"
+ android:startOffset="0"
+ android:valueFrom="M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c "
+ android:valueTo="M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="133"
+ android:propertyName="pathData"
+ android:startOffset="133"
+ android:valueFrom="M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c "
+ android:valueTo="M2.25 0.25 C2.25,0.25 4.25,2.25 4.25,2.25 C4.25,2.25 2.25,4.25 2.25,4.25 C2.25,4.25 0.25,2.25 0.25,2.25 C0.25,2.25 2.25,0.25 2.25,0.25c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_T_1">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="17"
+ android:pathData="M 12,15C 12,15.171875 12,14.828125 12,15"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="0">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="333"
+ android:pathData="M 12,15C 12,15.171875 12,15.859124999999999 12,16.031"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="17">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_2_G_T_1">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="17"
+ android:propertyName="scaleX"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="17"
+ android:propertyName="scaleY"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="333"
+ android:propertyName="scaleX"
+ android:startOffset="17"
+ android:valueFrom="1"
+ android:valueTo="0.4325"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="333"
+ android:propertyName="scaleY"
+ android:startOffset="17"
+ android:valueFrom="1"
+ android:valueTo="0.4325"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_1_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="150"
+ android:propertyName="fillAlpha"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="0"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="17"
+ android:propertyName="fillAlpha"
+ android:startOffset="150"
+ android:valueFrom="0"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_1_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="167"
+ android:propertyName="pathData"
+ android:startOffset="0"
+ android:valueFrom="M4.21 -42.01 C4.21,-42.01 4.21,-32 4.21,-32 C4.21,-32 -5.25,-32 -5.25,-32 C-5.25,-32 -5.25,-42.01 -5.25,-42.01 C-5.25,-42.01 4.21,-42.01 4.21,-42.01c "
+ android:valueTo="M4.21 -42.01 C4.21,-42.01 4.21,-32 4.21,-32 C4.21,-32 -5.25,-32 -5.25,-32 C-5.25,-32 -5.25,-42.01 -5.25,-42.01 C-5.25,-42.01 4.21,-42.01 4.21,-42.01c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="183"
+ android:propertyName="pathData"
+ android:startOffset="167"
+ android:valueFrom="M4.21 -42.01 C4.21,-42.01 4.21,-32 4.21,-32 C4.21,-32 -5.25,-32 -5.25,-32 C-5.25,-32 -5.25,-42.01 -5.25,-42.01 C-5.25,-42.01 4.21,-42.01 4.21,-42.01c "
+ android:valueTo="M4.21 -42.01 C4.21,-42.01 4.16,33 4.16,33 C4.16,33 -5.3,33 -5.3,33 C-5.3,33 -5.25,-42.01 -5.25,-42.01 C-5.25,-42.01 4.21,-42.01 4.21,-42.01c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="50"
+ android:propertyName="pathData"
+ android:startOffset="350"
+ android:valueFrom="M4.21 -42.01 C4.21,-42.01 4.16,33 4.16,33 C4.16,33 -5.3,33 -5.3,33 C-5.3,33 -5.25,-42.01 -5.25,-42.01 C-5.25,-42.01 4.21,-42.01 4.21,-42.01c "
+ android:valueTo="M4.21 -42.01 C4.21,-42.01 4.19,30.81 4.19,30.81 C4.19,30.81 -5.27,30.81 -5.27,30.81 C-5.27,30.81 -5.25,-42.01 -5.25,-42.01 C-5.25,-42.01 4.21,-42.01 4.21,-42.01c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_1_G_T_1">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="167"
+ android:pathData="M 12.023,1.281C 12.023,1.656 12.023,0.9059999999999999 12.023,1.281"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="0">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="183"
+ android:pathData="M 12.023,1.281C 12.023,1.656 12.023,3.156 12.023,3.531"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="167">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_1_G_T_1">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="0"
+ android:propertyName="scaleX"
+ android:startOffset="167"
+ android:valueFrom="0"
+ android:valueTo="0.125"
+ android:valueType="floatType" />
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_0_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="267"
+ android:propertyName="pathData"
+ android:startOffset="0"
+ android:valueFrom="M49.24 -12.32 C49.24,-12.32 49.24,52.91 49.24,52.91 C49.24,58.95 44.34,63.85 38.3,63.85 C38.3,63.85 -37.8,63.85 -37.8,63.85 C-43.84,63.85 -48.74,58.95 -48.74,52.91 C-48.74,52.91 -48.74,-12.32 -48.74,-12.32 C-48.74,-18.37 -43.84,-23.27 -37.8,-23.27 C-37.8,-23.27 38.3,-23.27 38.3,-23.27 C44.34,-23.27 49.24,-18.37 49.24,-12.32c "
+ android:valueTo="M75.1 -1.1 C75.1,19.57 66.72,38.28 53.18,51.83 C39.63,65.37 20.92,73.75 0.25,73.75 C-20.42,73.75 -39.13,65.37 -52.68,51.83 C-66.22,38.28 -74.6,19.57 -74.6,-1.1 C-74.6,-21.77 -66.22,-40.48 -52.68,-54.02 C-39.13,-67.57 -20.42,-75.95 0.25,-75.95 C20.92,-75.95 39.63,-67.57 53.18,-54.02 C66.72,-40.48 75.1,-21.77 75.1,-1.1c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_0_G_D_1_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="117"
+ android:propertyName="strokeColor"
+ android:startOffset="0"
+ android:valueFrom="#fff"
+ android:valueTo="#fff"
+ android:valueType="colorType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="17"
+ android:propertyName="strokeColor"
+ android:startOffset="117"
+ android:valueFrom="#fff"
+ android:valueTo="#EA4335"
+ android:valueType="colorType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_0_G_D_1_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="267"
+ android:propertyName="strokeWidth"
+ android:startOffset="0"
+ android:valueFrom="14"
+ android:valueTo="12"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_0_G_D_1_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="267"
+ android:propertyName="pathData"
+ android:startOffset="0"
+ android:valueFrom="M49.24 -12.32 C49.24,-12.32 49.24,52.91 49.24,52.91 C49.24,58.95 44.34,63.85 38.3,63.85 C38.3,63.85 -37.8,63.85 -37.8,63.85 C-43.84,63.85 -48.74,58.95 -48.74,52.91 C-48.74,52.91 -48.74,-12.32 -48.74,-12.32 C-48.74,-18.37 -43.84,-23.27 -37.8,-23.27 C-37.8,-23.27 38.3,-23.27 38.3,-23.27 C44.34,-23.27 49.24,-18.37 49.24,-12.32c "
+ android:valueTo="M75.1 -1.1 C75.1,19.57 66.72,38.28 53.18,51.83 C39.63,65.37 20.92,73.75 0.25,73.75 C-20.42,73.75 -39.13,65.37 -52.68,51.83 C-66.22,38.28 -74.6,19.57 -74.6,-1.1 C-74.6,-21.77 -66.22,-40.48 -52.68,-54.02 C-39.13,-67.57 -20.42,-75.95 0.25,-75.95 C20.92,-75.95 39.63,-67.57 53.18,-54.02 C66.72,-40.48 75.1,-21.77 75.1,-1.1c "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="time_group">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="1017"
+ android:propertyName="translateX"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="1"
+ android:valueType="floatType" />
+ </set>
+ </aapt:attr>
+ </target>
+</animated-vector>
\ No newline at end of file
diff --git a/core/res/res/anim/lock_unlock.xml b/core/res/res/anim/lock_unlock.xml
new file mode 100755
index 0000000..9cc31a0
--- /dev/null
+++ b/core/res/res/anim/lock_unlock.xml
@@ -0,0 +1,337 @@
+<!--
+ Copyright (C) 2019 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.
+-->
+<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt">
+ <aapt:attr name="android:drawable">
+ <vector
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+ <group android:name="_R_G">
+ <group
+ android:name="_R_G_L_2_G_T_1"
+ android:translateX="12"
+ android:translateY="15">
+ <group
+ android:name="_R_G_L_2_G"
+ android:translateX="-8.25"
+ android:translateY="-7.25">
+ <path
+ android:name="_R_G_L_2_G_D_0_P_0"
+ android:fillAlpha="1"
+ android:fillColor="?attr/textColor"
+ android:fillType="nonZero"
+ android:pathData=" M14.25 0.25 C14.25,0.25 12.75,0.25 12.75,0.25 C12.75,0.25 10.75,0.25 10.75,0.25 C10.75,0.25 5.75,0.25 5.75,0.25 C5.75,0.25 3.75,0.25 3.75,0.25 C3.75,0.25 2.25,0.25 2.25,0.25 C1.15,0.25 0.25,1.15 0.25,2.25 C0.25,2.25 0.25,12.25 0.25,12.25 C0.25,13.35 1.15,14.25 2.25,14.25 C2.25,14.25 14.25,14.25 14.25,14.25 C15.35,14.25 16.25,13.35 16.25,12.25 C16.25,12.25 16.25,2.25 16.25,2.25 C16.25,1.15 15.35,0.25 14.25,0.25c M14.25 12.25 C14.25,12.25 2.25,12.25 2.25,12.25 C2.25,12.25 2.25,2.25 2.25,2.25 C2.25,2.25 3.75,2.25 3.75,2.25 C3.75,2.25 12.75,2.25 12.75,2.25 C12.75,2.25 14.25,2.25 14.25,2.25 C14.25,2.25 14.25,12.25 14.25,12.25c " />
+ </group>
+ </group>
+ <group
+ android:name="_R_G_L_1_G_N_5_T_1"
+ android:translateX="12"
+ android:translateY="15">
+ <group
+ android:name="_R_G_L_1_G_N_5_T_0"
+ android:translateX="-8.25"
+ android:translateY="-7.25">
+ <group
+ android:name="_R_G_L_1_G"
+ android:pivotX="2.25"
+ android:pivotY="2.25"
+ android:scaleX="1"
+ android:scaleY="1"
+ android:translateX="6"
+ android:translateY="5">
+ <path
+ android:name="_R_G_L_1_G_D_0_P_0"
+ android:fillAlpha="1"
+ android:fillColor="?attr/textColor"
+ android:fillType="nonZero"
+ android:pathData=" M2.25 0.25 C3.35,0.25 4.25,1.15 4.25,2.25 C4.25,3.35 3.35,4.25 2.25,4.25 C1.15,4.25 0.25,3.35 0.25,2.25 C0.25,1.15 1.15,0.25 2.25,0.25c " />
+ </group>
+ </group>
+ </group>
+ <group
+ android:name="_R_G_L_0_G_N_5_T_1"
+ android:translateX="12"
+ android:translateY="15">
+ <group
+ android:name="_R_G_L_0_G_N_5_T_0"
+ android:translateX="-8.25"
+ android:translateY="-7.25">
+ <group
+ android:name="_R_G_L_0_G"
+ android:pivotX="27.965"
+ android:pivotY="-32"
+ android:scaleX="0.125"
+ android:scaleY="0.125"
+ android:translateX="-16.219"
+ android:translateY="32.25">
+ <path
+ android:name="_R_G_L_0_G_D_0_P_0"
+ android:fillAlpha="0"
+ android:fillColor="#ff0000"
+ android:fillType="nonZero"
+ android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 " />
+ <path
+ android:name="_R_G_L_0_G_D_1_P_0"
+ android:pathData=" M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:strokeWidth="16"
+ android:strokeAlpha="1"
+ android:strokeColor="?attr/textColor"/>
+ </group>
+ </group>
+ </group>
+ </group>
+ <group android:name="time_group" />
+ </vector>
+ </aapt:attr>
+ <target android:name="_R_G_L_2_G_T_1">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="133"
+ android:pathData="M 12,15C 12,14.85416667163372 12,14.125 12,14.125"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="0">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="133"
+ android:pathData="M 12,14.125C 12,14.125 12,15.05870145463943 12,15.324"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="133">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="100"
+ android:pathData="M 12,15.324C 12,15.40252217555046 12,14.96669441461563 12,15"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="267">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_1_G">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="100"
+ android:propertyName="scaleX"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0.85"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="100"
+ android:propertyName="scaleY"
+ android:startOffset="0"
+ android:valueFrom="1"
+ android:valueTo="0.85"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="283"
+ android:propertyName="scaleX"
+ android:startOffset="100"
+ android:valueFrom="0.85"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="283"
+ android:propertyName="scaleY"
+ android:startOffset="100"
+ android:valueFrom="0.85"
+ android:valueTo="1"
+ android:valueType="floatType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.4,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_1_G_N_5_T_1">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="133"
+ android:pathData="M 12,15C 12,14.85416667163372 12,14.125 12,14.125"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="0">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="133"
+ android:pathData="M 12,14.125C 12,14.125 12,15.05870145463943 12,15.324"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="133">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="100"
+ android:pathData="M 12,15.324C 12,15.40252217555046 12,14.96669441461563 12,15"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="267">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_0_G_D_0_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="67"
+ android:propertyName="pathData"
+ android:startOffset="0"
+ android:valueFrom="M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:valueTo="M-27.97 -48.55 C-27.97,-48.55 -28,-53.75 -27.97,-55.48 C-27.92,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.353,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="333"
+ android:propertyName="pathData"
+ android:startOffset="67"
+ android:valueFrom="M-27.97 -48.55 C-27.97,-48.55 -28,-53.75 -27.97,-55.48 C-27.92,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:valueTo="M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.542,0 0.026,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_0_G_D_1_P_0">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="67"
+ android:propertyName="pathData"
+ android:startOffset="0"
+ android:valueFrom="M-28.21 -31.92 C-28.21,-31.92 -27.85,-48.38 -27.97,-55.48 C-28,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:valueTo="M-27.97 -48.55 C-27.97,-48.55 -28,-53.75 -27.97,-55.48 C-27.92,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.353,0 0.2,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="333"
+ android:propertyName="pathData"
+ android:startOffset="67"
+ android:valueFrom="M-27.97 -48.55 C-27.97,-48.55 -28,-53.75 -27.97,-55.48 C-27.92,-57.63 -23.5,-79.87 -0.75,-79.82 C22.77,-79.76 27.75,-59.37 27.72,-58.27 C27.55,-52.88 27.97,-31.67 27.97,-31.67 "
+ android:valueTo="M79.79 -48.55 C79.79,-48.55 79.75,-53.75 79.78,-55.48 C79.83,-57.62 79.08,-78.36 53.07,-78.83 C29.5,-79.25 25.2,-59.38 25.22,-58.27 C25.25,-56.25 24.97,-31.17 24.97,-31.17 "
+ android:valueType="pathType">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.542,0 0.026,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="_R_G_L_0_G_N_5_T_1">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="133"
+ android:pathData="M 12,15C 12,14.85416667163372 12,14.125 12,14.125"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="0">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="133"
+ android:pathData="M 12,14.125C 12,14.125 12,15.05870145463943 12,15.324"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="133">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ <objectAnimator
+ android:duration="100"
+ android:pathData="M 12,15.324C 12,15.40252217555046 12,14.96669441461563 12,15"
+ android:propertyName="translateXY"
+ android:propertyXName="translateX"
+ android:propertyYName="translateY"
+ android:startOffset="267">
+ <aapt:attr name="android:interpolator">
+ <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0" />
+ </aapt:attr>
+ </objectAnimator>
+ </set>
+ </aapt:attr>
+ </target>
+ <target android:name="time_group">
+ <aapt:attr name="android:animation">
+ <set android:ordering="together">
+ <objectAnimator
+ android:duration="717"
+ android:propertyName="translateX"
+ android:startOffset="0"
+ android:valueFrom="0"
+ android:valueTo="1"
+ android:valueType="floatType" />
+ </set>
+ </aapt:attr>
+ </target>
+</animated-vector>
\ No newline at end of file
diff --git a/core/res/res/drawable/ic_auth_error.xml b/core/res/res/drawable/ic_auth_error.xml
new file mode 100644
index 0000000..ea5f572
--- /dev/null
+++ b/core/res/res/drawable/ic_auth_error.xml
@@ -0,0 +1,23 @@
+<!--
+ Copyright (C) 2019 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.
+-->
+<vector android:height="24dp" android:viewportHeight="60"
+ android:viewportWidth="60" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+ <path android:fillColor="?attr/colorError" android:pathData="M28.8,37.5l2.4,0l0,2.5l-2.4,0z"/>
+ <path android:fillColor="?attr/colorError" android:pathData="M28.8,17.5l2.4,0l0,15l-2.4,0z"/>
+ <path android:fillColor="#00000000"
+ android:pathData="M30,6.2c-13.1,0 -23.7,10.6 -23.7,23.8S16.9,53.8 30,53.8c13.1,0 23.8,-10.6 23.8,-23.8S43.1,6.2 30,6.2z"
+ android:strokeColor="?android:attr/colorError" android:strokeWidth="2.5"/>
+</vector>
diff --git a/core/res/res/drawable/ic_lock_24dp.xml b/core/res/res/drawable/ic_lock_24dp.xml
new file mode 100644
index 0000000..d848426
--- /dev/null
+++ b/core/res/res/drawable/ic_lock_24dp.xml
@@ -0,0 +1,30 @@
+<!--
+Copyright (C) 2014 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="?attr/textColor"
+ android:pathData="M12.0,15.0m-2.0,0.0a2.0,2.0 0.0,1.0 1.0,4.0 0.0a2.0,2.0 0.0,1.0 1.0,-4.0 0.0"/>
+ <path
+ android:pathData="M0,0h24v24H0V0z"
+ android:fillColor="#00000000"/>
+ <path
+ android:fillColor="?attr/textColor"
+ android:pathData="M18.0,8.0l-1.5,0.0L16.5,5.5C16.5,3.01 14.49,1.0 12.0,1.0S7.5,3.01 7.5,5.5L7.5,8.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0C20.0,8.9 19.1,8.0 18.0,8.0zM9.5,5.5C9.5,4.12 10.62,3.0 12.0,3.0c1.38,0.0 2.5,1.12 2.5,2.5L14.5,8.0l-5.0,0.0L9.5,5.5zM18.0,20.0L6.0,20.0L6.0,10.0l1.5,0.0l9.0,0.0L18.0,10.0L18.0,20.0z"/>
+</vector>
diff --git a/core/res/res/drawable/ic_lock_open_24dp.xml b/core/res/res/drawable/ic_lock_open_24dp.xml
new file mode 100644
index 0000000..94eecad
--- /dev/null
+++ b/core/res/res/drawable/ic_lock_open_24dp.xml
@@ -0,0 +1,30 @@
+<!--
+Copyright (C) 2014 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24.0dp"
+ android:height="24.0dp"
+ android:viewportWidth="24.0"
+ android:viewportHeight="24.0">
+ <path
+ android:fillColor="?attr/textColor"
+ android:pathData="M12.0,15.0m-2.0,0.0a2.0,2.0 0.0,1.0 1.0,4.0 0.0a2.0,2.0 0.0,1.0 1.0,-4.0 0.0"/>
+ <path
+ android:fillColor="?attr/textColor"
+ android:pathData="M18.5,1.0C16.01,1.0 14.0,3.01 14.0,5.5L14.0,8.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.1 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0l-2.0,0.0L16.0,5.5C16.0,4.12 17.12,3.0 18.5,3.0C19.88,3.0 21.0,4.12 21.0,5.5L21.0,6.0l2.0,0.0L23.0,5.5C23.0,3.01 20.99,1.0 18.5,1.0zM18.0,10.0l0.0,10.0L6.0,20.0L6.0,10.0L18.0,10.0z"/>
+ <path
+ android:pathData="M0,0h24v24H0V0z"
+ android:fillColor="#00000000"/>
+</vector>
diff --git a/core/res/res/values-af/strings.xml b/core/res/res/values-af/strings.xml
index 26aa99b..d2056a4 100644
--- a/core/res/res/values-af/strings.xml
+++ b/core/res/res/values-af/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nooit"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Jy hoef nie toestemming te hê om hierdie bladsy oop te maak nie."</string>
<string name="text_copied" msgid="4985729524670131385">"Teks na knipbord gekopieër."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Meer"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Kieslys+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Redigeer met"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Redigeer met %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Wysig"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Deel met"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Deel"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Deel met %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Deel"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Stuur met"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tik om alle netwerke te sien"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Koppel"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Alle netwerke"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"\'n Wi‑Fi-netwerk voorgestel deur <xliff:g id="NAME">%s</xliff:g> is beskikbaar"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Wil jy koppel aan netwerke wat <xliff:g id="NAME">%s</xliff:g> voorgestel het?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ja"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Nee"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi-Fi sal outomaties aanskakel"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi‑Fi het geen internettoegang nie"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Tik vir opsies"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Gekoppel"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Veranderings aan jou warmkolinstellings"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Jou warmkolband het verander."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Hierdie toestel steun nie jou voorkeur vir net 5 GHz nie. Hierdie toestel sal in plaas daarvan die 5 GHz-band gebruik wanneer dit beskikbaar is."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB-ontfouter gekoppel"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Tik om USB-ontfouting af te skakel"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Kies om USB-ontfouting te deaktiveer."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Vloeistof of vuilgoed in USB-poort"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-poort is outomaties gedeaktiveer. Tik om meer te wete te kom."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Veilig om USB-poort te gebruik"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Foon bespeur nie meer vloeistowwe of vuilgoed nie."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Neem tans foutverslag …"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Deel foutverslag?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Deel tans foutverslag …"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Stel op"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Haal uit"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Verken"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> ontbreek"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Sit toestel weer in"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Skuif tans <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-am/strings.xml b/core/res/res/values-am/strings.xml
index b049be7..2c4700ed 100644
--- a/core/res/res/values-am/strings.xml
+++ b/core/res/res/values-am/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"በፍፁም"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"ይህን ገጽ ለመክፈት ፈቃድ የለህም።"</string>
<string name="text_copied" msgid="4985729524670131385">"ፅሁፍ ወደ ቅንጥብ ሰሌዳ ተገልብጧል።"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"ተጨማሪ"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"ምናሌ+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"ያርትዑ በ"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"ያርትዑ በ%1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"ያርትዑ"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"በሚከተለው ያጋሩ፦"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"አጋራ"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"በ%1$s ያጋሩ"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"አጋራ"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ይላኩ በ፦"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"ሁሉንም አውታረ መረቦችን ለማየት መታ ያድርጉ"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"አገናኝ"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"ሁሉም አውታረ መረቦች"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"በ<xliff:g id="NAME">%s</xliff:g> የተጠቆመ የWi-Fi አውታረ መረብ ይገኛል"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"በ<xliff:g id="NAME">%s</xliff:g> ከተጠቆሙ አውታረ መረቦች ጋር መገናኘት ይፈልጋሉ?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"አዎ"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"አይ"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi በራስ-ሰር ይበራል"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi በይነመረብ መዳረሻ የለውም"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"ለአማራጮች መታ ያድርጉ"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"ተገናኝቷል"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"በእርስዎ ሆትስፖት ቅንብሮች ላይ ለውጦች"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"የእርስዎ ሆትስፖት ባንድ ተለውጧል።"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"ይህ መሣሪያ የእርስዎን ምርጫ ለ5GHz ብቻ አይደግፍም። በምትኩ፣ ይህ መሣሪያ ሲገኝ 5GHz ባንድ ይጠቀማል።"</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB አድስ ተያይዟል"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"የዩኤስቢ ማረሚያን ለማጥፋት መታ ያድርጉ"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ማረሚያ ላለማንቃት ምረጥ።"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"በዩኤስቢ ወደብ ውስጥ ፈሳሽ ወይም ፍርስራሽ"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"የዩኤስቢ ወደብ በራስ-ሰር ተሰናክሏል። የበለጠ ለመረዳት መታ ያድርጉ።"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"የዩኤስቢ ወደቡን መጠቀም አደጋ የለውም"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ስልክ ከእንግዲህ ፈሳሽ ወይም ፍርስራሽ አላገኘም።"</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> ይጎድላል"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"መሣሪያን እንደገና ያስገቡ"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g>ን በመውሰድ ላይ"</string>
diff --git a/core/res/res/values-ar/strings.xml b/core/res/res/values-ar/strings.xml
index 815cec2..b54d9fc 100644
--- a/core/res/res/values-ar/strings.xml
+++ b/core/res/res/values-ar/strings.xml
@@ -959,6 +959,8 @@
<string name="save_password_never" msgid="8274330296785855105">"مطلقًا"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"ليس لديك إذن بفتح هذه الصفحة."</string>
<string name="text_copied" msgid="4985729524670131385">"تم نسخ النص إلى الحافظة."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"المزيد"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"القائمة+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1212,7 +1214,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"تعديل باستخدام"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"تعديل باستخدام %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"تعديل"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"مشاركة مع"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"مشاركة"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"مشاركة مع %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"مشاركة"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"إرسال باستخدام"</string>
@@ -1333,10 +1335,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"انقر للاطلاع على جميع الشبكات"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"اتصال"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"جميع الشبكات"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"تتوفَّر شبكة Wi‑Fi مقترَحة من قِبَل <xliff:g id="NAME">%s</xliff:g>."</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"هل ترغب في الاتصال بالشبكات المقترَحة من <xliff:g id="NAME">%s</xliff:g>؟"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"نعم"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"لا"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"سيتم تشغيل شبكة Wi-Fi تلقائيًا."</string>
@@ -1350,8 +1350,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"شبكة Wi-Fi غير متصلة بالإنترنت"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"انقر للحصول على الخيارات."</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"تمّ الاتصال."</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"التغييرات التي طرأت على إعدادات نقطة الاتصال"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"تمّ تغيير نطاق نقطة الاتصال الخاصة بك."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"لا يتوافق هذا الجهاز مع إعدادك المفضّل الخاص باستخدام النطاق 5 غيغاهرتز فقط. وسيستخدم الجهاز بدلاً من ذلك النطاق 5 غيغاهرتز عندما يكون متاحًا."</string>
@@ -1436,14 +1435,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"تم توصيل تصحيح أخطاء USB"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"انقر لإيقاف تصحيح أخطاء USB."</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"اختيار إيقاف تصحيح أخطاء USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"السوائل والشوائب في منفذ USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"تمّ إيقاف منفذ USB تلقائيًا. انقُر لمعرفة المزيد من المعلومات."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"الأمان في استخدام منفذ USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"لم يَعُد الهاتف يكتشف سوائل أو شوائب."</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>
@@ -1482,6 +1477,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> مفقود"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"إدخال الجهاز مرة أخرى"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"جارٍ نقل <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-as/strings.xml b/core/res/res/values-as/strings.xml
index c69706c..2c06379 100644
--- a/core/res/res/values-as/strings.xml
+++ b/core/res/res/values-as/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"কেতিয়াও মনত নাৰাখিব"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"এই পৃষ্ঠাটো খুলিবলৈ আপোনাৰ অনুমতি নাই।"</string>
<string name="text_copied" msgid="4985729524670131385">"ক্লিপব\'র্ডলৈ বাৰ্তা প্ৰতিলিপি কৰা হ’ল।"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"অধিক"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"মেনু+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"মেটা+"</string>
@@ -1132,7 +1134,8 @@
<string name="whichEditApplication" msgid="144727838241402655">"ইয়াৰ দ্বাৰা সম্পাদনা কৰক"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$sৰদ্বাৰা সম্পাদনা কৰক"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"সম্পাদনা কৰক"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"ইয়াৰ জৰিয়তে শ্বেয়াৰ কৰক"</string>
+ <!-- no translation found for whichSendApplication (5803792421724377602) -->
+ <skip />
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$sৰ জৰিয়তে শ্বেয়াৰ কৰক"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"শ্বেয়াৰ কৰক"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ইয়াৰ মাধ্য়মেৰে প্ৰেৰণ কৰক"</string>
@@ -1245,10 +1248,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"সকলো নেটৱৰ্ক চাবলৈ টিপক"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"সংযোগ কৰক"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"সকলো নেটৱৰ্ক"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g>এ প্ৰস্তাৱ কৰা এটা ৱাই-ফাই নেটৱৰ্ক উপলব্ধ হৈছে"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"আপুনি <xliff:g id="NAME">%s</xliff:g>এ প্ৰস্তাৱ কৰা নেটৱৰ্ককেইটাৰ সৈতে সংযোগ কৰিবনে?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"হয়"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"নহয়"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"ৱাই-ফাই স্বয়ংক্ৰিয়ভাৱে অন হ\'ব"</string>
@@ -1262,8 +1263,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"ৱাই-ফাইত ইণ্টাৰনেট নাই"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"অধিক বিকল্পৰ বাবে টিপক"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"সংযোগ কৰা হ’ল"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"আপোনাৰ হটস্পট ছেটিংসমূহত কৰা সালসলনি"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"আপোনাৰ হটস্পটৰ বেণ্ড সলনি কৰা হ’ল।"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"আপোনাৰ কেৱল ৫গিগাহাৰ্টজৰ প্ৰতি অগ্ৰাধিকাৰ এই ডিভাচইচটোৱে সমৰ্থন নকৰে। ইয়াৰ পৰিৱৰ্তে, ডিভাচইচটোৱে যেতিয়া ৫গিগাহাৰ্টজ বেণ্ড উপলব্ধ হ’ব তেতিয়া সেইয়া ব্যৱহাৰ কৰিব।"</string>
@@ -1348,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"ইউএছবি ডিবাগিং সংযোগ কৰা হ’ল"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"ইউএছবি ডিবাগিং বন্ধ কৰিবলৈ টিপক"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"ইউএছবি ডিবাগিং অক্ষম কৰিবলৈ বাছনি কৰক।"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"ইউএছবি প’ৰ্টত তৰল বা ধূলি-মাকতি আছে"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"ইউএছবি প’ৰ্ট স্বয়ংক্ৰিয়ভাৱে অক্ষম কৰা হয়। অধিক জানিবৰ বাবে টিপক।"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"ইউএছবি প’ৰ্ট ব্যৱহাৰ কৰিব পৰাকৈ নিৰাপদ"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ফ’নটোৱে তৰল বা ধূলি-মাকতি আৰু চিনাক্ত নকৰে।"</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>
@@ -1395,6 +1391,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> উপলব্ধ নহয়"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"ডিভাইচ আকৌ ভৰাওক"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g>ক স্থানান্তৰ কৰি থকা হৈছে"</string>
diff --git a/core/res/res/values-az/strings.xml b/core/res/res/values-az/strings.xml
index ecb9b19e..b851a23 100644
--- a/core/res/res/values-az/strings.xml
+++ b/core/res/res/values-az/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Heç vaxt"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Bu səhifəni açmaq üçün icazəniz yoxdur."</string>
<string name="text_copied" msgid="4985729524670131385">"Mətn panoya kopyalandı."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Digər"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menyu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Bununla düzəliş edin:"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ilə düzəliş edin"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Redaktə edin"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Bununla paylaşın"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Paylaşın"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ilə paylaşın"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Paylaşın"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"İstifadə edərək göndərin"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Bütün şəbəkələri görmək üçün klikləyin"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Qoşulun"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Bütün şəbəkələr"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> tərəfindən təklif edilən Wi‑Fi şəbəkəsi əlçatandır"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g> tərəfindən təklif edilən şəbəkələrə qoşulmaq istəyirsiniz?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Bəli"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Xeyr"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi avtomatik olaraq aktiv ediləcək"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi şəbəkəsinin internetə girişi yoxdur"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Seçimlər üçün tıklayın"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Qoşuldu"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Hotspot ayarlarınızda dəyişiklik"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Hotspot qrupu dəyişdi."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Bu cihaz yalnız 5GHz üçün tərcihinizi dəstəkləmir. Əvəzinə əlçatan olduqda bu cihaz 5GHz qrupundan istifadə edəcək."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB sazlama qoşuludur"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB sazlamanı deaktiv etmək üçün klikləyin"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USb debaqı deaktivasiya etməyi seçin."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB portuna maye sızıb və ya qırılıb"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB portu avtomatik deaktiv edildi. Ətraflı məlumat üçün klikləyin."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB portundan istifadə təhlükəsizdir"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefon artıq maye və ya nasazlığı aşkarlamayacaq."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Baq hesabatı verilir..."</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Baq hesabatı paylaşılsın?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Baq hesabatı paylaşılır..."</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Quraşdırın"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Çıxarın"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Araşdır"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> yoxdur"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Cihazı yenidən daxil edin"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> daşınır"</string>
diff --git a/core/res/res/values-b+sr+Latn/strings.xml b/core/res/res/values-b+sr+Latn/strings.xml
index 571b74d..6287d0f 100644
--- a/core/res/res/values-b+sr+Latn/strings.xml
+++ b/core/res/res/values-b+sr+Latn/strings.xml
@@ -950,6 +950,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nikad"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Nemate dozvolu da otvorite ovu stranicu."</string>
<string name="text_copied" msgid="4985729524670131385">"Tekst je kopiran u privremenu memoriju."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Još"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Meni+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1152,7 +1154,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Izmenite pomoću"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Izmenite pomoću aplikacije %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Izmeni"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Delite pomoću"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Deljenje"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Delite pomoću aplikacije %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Deli"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Pošaljite pomoću:"</string>
@@ -1267,10 +1269,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Dodirnite da biste videli sve mreže"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Poveži"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Sve mreže"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Wi‑Fi mreža koju predlaže <xliff:g id="NAME">%s</xliff:g> je dostupna"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Želite li da se povežete na mreže koje predlaže <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Da"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Ne"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi će se automatski uključiti"</string>
@@ -1284,8 +1284,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi nema pristup internetu"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Dodirnite za opcije"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Povezano je"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Promene podešavanja za hotspot"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Opseg hotspota je promenjen."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Ovaj uređaj ne podržava podešavanje samo za 5 GHz. Uređaj će koristiti opseg od 5 GHz kada bude dostupan."</string>
@@ -1370,14 +1369,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Otklanjanje grešaka sa USB-a je omogućeno"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Dodirnite da biste isključili otklanjanje grešaka sa USB-a"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Izaberite da biste onemogućili otklanjanja grešaka sa USB-a."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Tečnost ili nečistoća u USB portu"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB port je automatski isključen. Dodirnite da biste saznali više."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Korišćenje USB porta je bezbedno"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefon više ne otkriva tečnost ili nečistoću."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Izveštaj o grešci se generiše…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Želite li da podelite izveštaj o grešci?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Deli se izveštaj o grešci…"</string>
@@ -1416,6 +1411,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Aktiviraj"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Izbaci"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Istraži"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> nedostaje"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Ponovo umetnite uređaj"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Prenosi se <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-be/strings.xml b/core/res/res/values-be/strings.xml
index 4c40491..70ee23f 100644
--- a/core/res/res/values-be/strings.xml
+++ b/core/res/res/values-be/strings.xml
@@ -953,6 +953,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Ніколі"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"У вас няма дазволу на адкрыццё гэтай старонкі."</string>
<string name="text_copied" msgid="4985729524670131385">"Тэкст скапіяваны ў буфер абмену."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Больш"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Меню+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta +"</string>
@@ -1172,7 +1174,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Рэдагаваць з дапамогай"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Рэдагаваць з дапамогай %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Рэдагаваць"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Падзяліцца праз"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Абагуліць"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Падзяліцца праз %s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Абагуліць"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Адправіць з дапамогай"</string>
@@ -1289,10 +1291,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Дакраніцеся, каб убачыць усе сеткі"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Падключыцца"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Усе сеткі"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Даступная сетка Wi‑Fi, прапанаваная праграмай <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Падключыцца да сетак, прапанаваных праграмай <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Так"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Не"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi уключыцца аўтаматычна"</string>
@@ -1306,8 +1306,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"У Wi-Fi няма доступу да інтэрнэту"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Дакраніцеся, каб убачыць параметры"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Падключана"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Змяненні ў наладах хот-спота"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Частата хот-спота змянілася."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Прылада не можа працаваць толькі на частаце 5 ГГц. Гэта частата будзе выкарыстоўвацца, калі гэта магчыма."</string>
@@ -1392,14 +1391,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Адладка па USB падключана"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Націсніце, каб адключыць адладку па USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Выберыце, каб адключыць адладку USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Вадкасць або смецце ў порце USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Порт USB аўтаматычна адключаны. Каб даведацца больш, націсніце тут."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Можна бяспечна выкарыстоўваць порт USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Тэлефон выявіў, што вадкасці і смецця больш няма."</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>
@@ -1438,6 +1433,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> адсутнічае"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Устаўце прыладу яшчэ раз"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Перамяшчэнне <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-bg/strings.xml b/core/res/res/values-bg/strings.xml
index a476d23..4eea9c9 100644
--- a/core/res/res/values-bg/strings.xml
+++ b/core/res/res/values-bg/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Никога"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Нямате разрешение да отворите тази страница."</string>
<string name="text_copied" msgid="4985729524670131385">"Текстът е копиран в буферната памет."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Още"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Меню+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Редактиране чрез"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Редактиране чрез %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Редактиране"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Споделяне чрез"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Споделяне"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Споделяне чрез %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Споделяне"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Изпращане посредством"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Докоснете, за да видите всички мрежи"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Свързване"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Всички мрежи"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Налице е Wi‑Fi мрежа, предложена от <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Искате ли да се свържете с мрежите, предложени от <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Да"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Не"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi ще се включи автоматично"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi мрежата няма достъп до интернет"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Докоснете за опции"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Установена е връзка"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Промени в настройките ви за точка за достъп"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Честотната лента на точката ви за достъп е променена."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Това устройство не поддържа предпочитанието ви за използване само на честотната лента от 5 ГХц. Вместо това то ще я ползва, когато е възможно."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Отстраняване на грешки през USB"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Докоснете, за да изключите отстраняването на грешки през USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Изберете, за да деактивирате отстраняването на грешки през USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Течност или замърсяване в USB порта"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB портът е деактивиран автоматично. Докоснете, за да научите повече."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Безопасно е да използвате USB порта"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Телефонът вече не открива течности или замърсяване."</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Липсва <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Поставете отново устройството"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> се премества"</string>
diff --git a/core/res/res/values-bn/strings.xml b/core/res/res/values-bn/strings.xml
index 602a3c5..836d5c4 100644
--- a/core/res/res/values-bn/strings.xml
+++ b/core/res/res/values-bn/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"কখনই নয়"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"এই পৃষ্ঠাটি খোলার জন্য আপনার কাছে অনুমতি নেই৷"</string>
<string name="text_copied" msgid="4985729524670131385">"ক্লিপবোর্ডে পাঠ্য অনুলিপি করা হয়েছে৷"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"আরও"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"মেনু+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,8 @@
<string name="whichEditApplication" msgid="144727838241402655">"এর মাধ্যমে সম্পাদনা করুন"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s দিয়ে সম্পাদনা করুন"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"সম্পাদনা করুন"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"এর সাথে শেয়ার করুন"</string>
+ <!-- no translation found for whichSendApplication (5803792421724377602) -->
+ <skip />
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s এর সাথে শেয়ার করুন"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"শেয়ার করুন"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"এটি ব্যবহার করে পাঠান"</string>
@@ -1245,10 +1248,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"সমস্ত নেটওয়ার্ক দেখতে ট্যাপ করুন"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"সংযুক্ত করুন"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"সব নেটওয়ার্ক"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g>-এর সাজেস্ট করা ওয়াই-ফাই নেটওয়ার্ক এখন উপলভ্য"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"আপনি কি <xliff:g id="NAME">%s</xliff:g>-এর সাজেস্ট করা নেটওয়ার্ক দিয়ে কানেক্ট করতে চান?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"হ্যাঁ"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"না"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"ওয়াই-ফাই অটোমেটিক চালু হবে"</string>
@@ -1262,8 +1263,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"ওয়াই-ফাই এ ইন্টারনেট অ্যাক্সেস নেই"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"বিকল্পগুলির জন্য আলতো চাপুন"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"কানেক্ট করা হয়েছে"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"আপনার হটস্পট সেটিংসে পরিবর্তনগুলি"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"আপনার হটস্পট ব্যান্ড পরিবর্তন করা হয়েছে।"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"এই ডিভাইসটি শুধুমাত্র 5GHz এর জন্য আপনার পছন্দ সমর্থন করে না। পরিবর্তে, এই ডিভাইসটি 5GHz ব্যান্ড ব্যবহার করবে।"</string>
@@ -1349,14 +1349,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB ডিবাগিং সংযুক্ত হয়েছে"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"ইউএসবি ডিবাগিং বন্ধ করতে ট্যাপ করুন"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ডিবাগিং অক্ষম করতে বেছে নিন।"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"ইউএসবি পোর্টে তরল পদার্থ অথবা ধুলো কণা"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"ইউএসবি পোর্ট নিজে থেকে বন্ধ করা হবে। আরও জানতে ট্যাপ করুন।"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"ইউএসবি পোর্ট এখন ব্যবহার করতে পারবেন"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ফোন আর তরল পদার্থ এবং ধুলো কণা শনাক্ত করবে না।"</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>
@@ -1395,6 +1391,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> অনুপস্থিত"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"ডিভাইসটি আবার ঢোকান"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> সরানো হচ্ছে"</string>
diff --git a/core/res/res/values-bs/strings.xml b/core/res/res/values-bs/strings.xml
index 1a4bd0c..b51022b 100644
--- a/core/res/res/values-bs/strings.xml
+++ b/core/res/res/values-bs/strings.xml
@@ -950,6 +950,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nikad"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Nemate odobrenje za otvaranje ove stranice."</string>
<string name="text_copied" msgid="4985729524670131385">"Tekst kopiran u međuspremnik."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Više"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Meni+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1152,7 +1154,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Uredi koristeći"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Uredi koristeći %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Uredi"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Dijeli koristeći"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Dijeli"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Dijeli koristeći %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Dijeli"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Pošalji koristeći"</string>
@@ -1269,10 +1271,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Dodirnite da vidite sve mreže"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Povežite se"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Sve mreže"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"WiFi mreža koju je predložila aplikacija <xliff:g id="NAME">%s</xliff:g> je dostupna"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Želite li se povezati na mreže koje je predložila aplikacija <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Da"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Ne"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi veza će se automatski uključiti"</string>
@@ -1286,8 +1286,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"WiFi nema pristup internetu"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Dodirnite za opcije"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Povezano"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Promjene postavki vaše pristupne tačke"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Opseg vaše pristupne tačke je promijenjen."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Ovaj uređaj ne podržava vašu postavku za mreže od isključivo 5GHz. Uređaj će koristiti opseg of 5GHz kada je dostupan."</string>
@@ -1372,14 +1371,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Otklanjanje grešaka putem uređaja spojenog na USB je uspostavljeno"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Dodirnite da isključite otklanjanje grešaka putem USB-a"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Odaberite da onemogućite ispravljanje grešaka koristeći USB"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Tečnost ili nečistoće u USB priključku"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB priključak je automatski onemogućen. Dodirnite da saznate više."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB priključak je sada sigurno koristiti"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefon više ne detektira tečnost ili nečistoće."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Prijem izvještaja o grešci..."</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Podijeliti izvještaj o grešci?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Dijeljenje izvještaja o grešci..."</string>
@@ -1418,6 +1413,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Postavi"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Izbaci"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Istraži"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> nedostaje"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Ponovo ubacite uređaj"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Premješta se <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-ca/strings.xml b/core/res/res/values-ca/strings.xml
index 76fc7fe..bcb900f 100644
--- a/core/res/res/values-ca/strings.xml
+++ b/core/res/res/values-ca/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Mai"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"No tens permís per obrir aquesta pàgina."</string>
<string name="text_copied" msgid="4985729524670131385">"Text copiat al Porta-retalls."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Més"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menú+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Edita amb"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edita amb %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edita"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Comparteix amb"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Comparteix"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Comparteix amb %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Comparteix"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Envia mitjançant"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Toca per veure totes les xarxes"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Connecta"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Totes les xarxes"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Hi ha disponible una xarxa Wi‑Fi proposada per <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Vols connectar-te a les xarxes proposades per <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Sí"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"No"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"La Wi-Fi s\'activarà automàticament"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"La Wi-Fi no té accés a Internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Toca per veure les opcions"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"S\'ha establert la connexió"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Canvis en la configuració del punt d\'accés Wi-Fi"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Ha canviat la teva banda del punt d\'accés Wi-Fi."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Aquest dispositiu no admet utilitzar exclusivament una banda de 5 GHz. El dispositiu utilitzarà una banda de 5 GHz quan estigui disponible."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Depuració per USB activada"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Toca per desactivar la depuració per USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Selecciona per desactivar la depuració per USB"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Hi ha líquid o pols al port USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"El port USB es desactiva automàticament. Toca per obtenir més informació."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"És segur utilitzar el port USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"El telèfon ja no detecta líquids ni pols."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"S\'està creant l\'informe d\'errors…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Vols compartir l\'informe d\'errors?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"S\'està compartint l\'informe d\'errors…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Configura"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Expulsa"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Explora"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"No es detecta <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Torna a inserir el dispositiu"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"S\'està desplaçant l\'aplicació <xliff:g id="NAME">%s</xliff:g>"</string>
@@ -1533,7 +1530,7 @@
<string name="content_description_sliding_handle" msgid="415975056159262248">"Llisca el dit. Mantén premut."</string>
<string name="description_target_unlock_tablet" msgid="3833195335629795055">"Llisca per desbloquejar."</string>
<string name="action_bar_home_description" msgid="5293600496601490216">"Torna a la pàgina d\'inici"</string>
- <string name="action_bar_up_description" msgid="2237496562952152589">"Mou cap a dalt"</string>
+ <string name="action_bar_up_description" msgid="2237496562952152589">"Navega cap amunt"</string>
<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>
diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml
index 2283778..053bad6 100644
--- a/core/res/res/values-cs/strings.xml
+++ b/core/res/res/values-cs/strings.xml
@@ -953,6 +953,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nikdy"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Nemáte povolení otevřít tuto stránku."</string>
<string name="text_copied" msgid="4985729524670131385">"Text byl zkopírován do schránky."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Více"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1172,7 +1174,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Upravit v aplikaci"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Upravit v aplikaci %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Upravit"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Sdílet v aplikaci"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Sdílet"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Sdílet v aplikaci %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Sdílet"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Odeslat pomocí aplikace"</string>
@@ -1289,10 +1291,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Klepnutím zobrazíte všechny sítě"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Připojit"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Všechny sítě"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Je k dispozici síť Wi‑Fi navrhovaná aplikací <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Chcete se připojit k sítím, které navrhuje aplikace <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ano"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Ne"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi se zapne automaticky"</string>
@@ -1306,8 +1306,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi nemá přístup k internetu"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Klepnutím zobrazíte možnosti"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Připojeno"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Změny nastavení hotspotu"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Pásmo hotspotu se změnilo."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Toto zařízení nepodporuje vaše nastavení jen 5GHz pásma. Zařízení použije pásmo 5 GHz, jen když bude dostupné."</string>
@@ -1392,14 +1391,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Ladění přes USB připojeno"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Klepnutím vypnete ladění přes USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Vyberte, chcete-li zakázat ladění přes USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Kapalina nebo nečistota v portu USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Port USB byl automaticky deaktivován. Klepnutím zobrazíte další informace."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Port USB lze bezpečně použít"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefon již nedetekuje kapaliny ani nečistoty."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Vytváření zprávy o chybě…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Sdílet zprávu o chybě?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Sdílení zprávy o chybě…"</string>
@@ -1438,6 +1433,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Nastavit"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Odpojit"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Otevřít"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> chybí"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Znovu vložte zařízení"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Přesouvání aplikace <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml
index b64418c..e7e40d8 100644
--- a/core/res/res/values-da/strings.xml
+++ b/core/res/res/values-da/strings.xml
@@ -87,7 +87,7 @@
<string name="NetworkPreferenceSwitchSummary" msgid="509327194863482733">"Prøv at skifte dit foretrukne netværk. Tryk for skifte."</string>
<string name="EmergencyCallWarningTitle" msgid="813380189532491336">"Det er ikke muligt at foretage nødopkald"</string>
<string name="EmergencyCallWarningSummary" msgid="1899692069750260619">"Det er ikke muligt at foretage nødopkald via Wi‑Fi"</string>
- <string name="notification_channel_network_alert" msgid="4427736684338074967">"Notifikationer"</string>
+ <string name="notification_channel_network_alert" msgid="4427736684338074967">"Underretninger"</string>
<string name="notification_channel_call_forward" msgid="2419697808481833249">"Viderestilling af opkald"</string>
<string name="notification_channel_emergency_callback" msgid="6686166232265733921">"Nødtilbagekaldstilstand"</string>
<string name="notification_channel_mobile_data_status" msgid="4575131690860945836">"Status for mobildata"</string>
@@ -262,7 +262,7 @@
<string name="notification_channel_network_available" msgid="4531717914138179517">"Tilgængeligt netværk"</string>
<string name="notification_channel_vpn" msgid="8330103431055860618">"VPN-status"</string>
<string name="notification_channel_device_admin" msgid="1568154104368069249">"Enhedsadministration"</string>
- <string name="notification_channel_alerts" msgid="4496839309318519037">"Notifikationer"</string>
+ <string name="notification_channel_alerts" msgid="4496839309318519037">"Underretninger"</string>
<string name="notification_channel_retail_mode" msgid="6088920674914038779">"Demo til udstilling i butik"</string>
<string name="notification_channel_usb" msgid="9006850475328924681">"USB-forbindelse"</string>
<string name="notification_channel_heavy_weight_app" msgid="6218742927792852607">"Appen kører"</string>
@@ -348,7 +348,7 @@
<string name="permlab_receiveMms" msgid="1821317344668257098">"modtage tekstbeskeder (mms)"</string>
<string name="permdesc_receiveMms" msgid="533019437263212260">"Tillader, at appen kan modtage og behandle mms-beskeder. Det betyder, at appen kan overvåge eller slette de beskeder, der sendes til din enhed, uden at vise dem til dig."</string>
<string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"læse Cell Broadcast-meddelelser"</string>
- <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Tillader, at appen læser Cell Broadcast-meddelelser, der modtages af din enhed. I nogle områder sendes der Cell Broadcast-meddelelser for at advare om nødsituationer. Ondsindede apps kan forstyrre ydelsen eller driften af din enhed, når der modtages en Cell Broadcast-meddelelse om en nødsituation."</string>
+ <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Tillader, at appen læser Cell Broadcast-underretninger, der modtages af din enhed. I nogle områder sendes der Cell Broadcast-underretninger for at advare om nødsituationer. Ondsindede apps kan forstyrre ydelsen eller driften af din enhed, når der modtages en Cell Broadcast-meddelelse om en nødsituation."</string>
<string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"læse feeds, jeg abonnerer på"</string>
<string name="permdesc_subscribedFeedsRead" msgid="5557058907906144505">"Tillader, at appen kan hente oplysninger om de feeds, der synkroniseres."</string>
<string name="permlab_sendSms" msgid="7544599214260982981">"Send og se sms-beskeder"</string>
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Aldrig"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Du har ikke tilladelse til at åbne denne side."</string>
<string name="text_copied" msgid="4985729524670131385">"Teksten er kopieret til udklipsholderen."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Mere"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Rediger med"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Rediger med %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Rediger"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Del med"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Del"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Del med %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Del"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Send via"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tryk for at se alle netværk"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Opret forbindelse"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Alle netværk"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> har foreslået et tilgængeligt Wi-Fi-netværk"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Vil du oprette forbindelse til netværk, som <xliff:g id="NAME">%s</xliff:g> foreslår?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ja"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Nej"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi aktiveres automatisk"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi-netværket har ikke internetadgang"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Tryk for at se valgmuligheder"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Der er oprettet forbindelse"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Ændringer af dine indstillinger for hotspot"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Dit hotspotbånd er ændret."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Denne enhed understøtter ikke din præference om kun 5 GHz. Denne enhed vil i stedet bruge 5 GHz-båndet, når det er muligt."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB-fejlretning er tilsluttet"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Tryk for at deaktivere USB-fejlretning"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Vælg for at deaktivere USB-fejlretning."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Væske eller snavs i USB-porten"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-porten deaktiveres automatisk. Tryk for at få flere oplysninger."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Det er sikkert at bruge USB-porten"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefonen registrerer ikke længere væske og snavs."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Opretter fejlrapport…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Vil du dele fejlrapporten?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Deler fejlrapport…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Konfigurer"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Skub ud"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Udforsk"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> er ikke til stede"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Indsæt enheden igen"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Flytter <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml
index 5caa12a..f3cca71 100644
--- a/core/res/res/values-de/strings.xml
+++ b/core/res/res/values-de/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nie"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Du bist nicht zum Öffnen dieser Seite berechtigt."</string>
<string name="text_copied" msgid="4985729524670131385">"Text in Zwischenablage kopiert."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Mehr"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menü+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta-Taste +"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Bearbeiten mit"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Mit %1$s bearbeiten"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Bearbeiten"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Freigeben über"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Teilen"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Für %1$s freigeben"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Teilen"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Senden via"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tippen, um alle Netzwerke zu sehen"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Verbinden"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Alle Netzwerke"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Ein von <xliff:g id="NAME">%s</xliff:g> vorgeschlagenes WLAN-Netzwerk ist verfügbar"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Möchtest du eine Verbindung zu den von <xliff:g id="NAME">%s</xliff:g> vorgeschlagenen Netzwerken herstellen?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ja"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Nein"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"WLAN wird automatisch aktiviert"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"WLAN hat keinen Internetzugriff"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Für Optionen tippen"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Verbunden"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Änderungen an deinen Hotspot-Einstellungen"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Dein Hotspot-Band hat sich geändert."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Dieses Gerät unterstützt die ausschließliche Nutzung von 5 GHz nicht. Es greift aber immer auf das 5-GHz-Band zurück, wenn dieses verfügbar ist."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB-Debugging aktiviert"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Zum Deaktivieren von USB-Debugging tippen"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB-Debugging deaktivieren: auswählen"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Flüssigkeiten oder Fremdkörper im USB-Port"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Der USB-Port wird automatisch deaktiviert. Für weitere Informationen tippen."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB-Ports kann wieder sicher verwendet werden"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Das Smartphone erkennt keine Flüssigkeiten oder Fremdkörper mehr."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Fehlerbericht wird abgerufen…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Fehlerbericht teilen?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Fehlerbericht wird geteilt…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Einrichten"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Auswerfen"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Ansehen"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> fehlt"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Gerät wieder einlegen"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> wird verschoben"</string>
diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml
index 320bf27..ea17448 100644
--- a/core/res/res/values-el/strings.xml
+++ b/core/res/res/values-el/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Ποτέ"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Δεν έχετε άδεια για να ανοίξετε αυτήν τη σελίδα."</string>
<string name="text_copied" msgid="4985729524670131385">"Το κείμενο αντιγράφηκε στο πρόχειρο."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Περισσότερα"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Πλήκτρο Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Επεξεργασία με"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Επεξεργασία με %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Επεξεργασία"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Κοινή χρήση με"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Κοινοποίηση"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Κοινή χρήση με %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Κοινοποίηση"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Αποστολή μέσω"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Πατήστε για να δείτε όλα τα δίκτυα"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Σύνδεση"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Όλα τα δίκτυα"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Είναι διαθέσιμο ένα δίκτυο Wi‑Fi που προτείνεται από <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Θέλετε να συνδέσετε τα δίκτυα που προτείνονται από <xliff:g id="NAME">%s</xliff:g>;"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ναι"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Όχι"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Το Wi‑Fi θα ενεργοποιηθεί αυτόματα"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Το Wi-Fi δεν έχει πρόσβαση στο διαδίκτυο"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Πατήστε για να δείτε τις επιλογές"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Συνδέθηκε"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Αλλαγές στις ρυθμίσεις σημείου πρόσβασης Wi-Fi"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Το εύρος σημείου πρόσβασης Wi-Fi άλλαξε."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Αυτή η συσκευή δεν υποστηρίζει την προτίμησή σας για τη ζώνη 5 GHz μόνο. Αντ\' αυτού, αυτή η συσκευή θα χρησιμοποιεί τη ζώνη 5 GHz όταν είναι διαθέσιμη."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Συνδέθηκε ο εντοπισμός σφαλμάτων USB"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Πατήστε για να απενεργοποιήσετε τον εντοπισμό και τη διόρθωση σφαλμάτων USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Επιλογή για απενεργοποίηση του εντοπισμού σφαλμάτων USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Υγρασία ή ακαθαρσίες στη θύρα USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Η θύρα USB απενεργοποιείται αυτόματα. Πατήστε για να μάθετε περισσότερα."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Μπορείτε να χρησιμοποιήσετε με ασφάλεια τη θύρα USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Το τηλέφωνο δεν εντοπίζει πλέον υγρασία ή ακαθαρσίες."</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Λείπει το μέσο <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Τοποθετήστε ξανά τη συσκευή"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Μετακίνηση <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-en-rAU/strings.xml b/core/res/res/values-en-rAU/strings.xml
index 4d2155b..e233524 100644
--- a/core/res/res/values-en-rAU/strings.xml
+++ b/core/res/res/values-en-rAU/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Never"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"You don\'t have permission to open this page."</string>
<string name="text_copied" msgid="4985729524670131385">"Text copied to clipboard."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"More"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Edit with"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit with %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Share"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Share"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Send using"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tap to see all networks"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Connect"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"All networks"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"A Wi‑Fi network proposed by <xliff:g id="NAME">%s</xliff:g> is available"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Do you want to connect to networks proposed by <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Yes"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"No"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi will turn on automatically"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi has no Internet access"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Tap for options"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Connected"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Changes to your hotspot settings"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Your hotspot band has changed."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"This device doesn’t support your preference for 5 GHz only. Instead, this device will use the 5 GHz band when available."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB debugging connected"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Tap to turn off USB debugging"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Select to disable USB debugging."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Liquid or debris in USB port"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB port is automatically disabled. Tap to learn more."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Safe to use USB port"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Phone no longer detects liquid or debris."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Taking bug report…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Share bug report?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Sharing bug report…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Set-up"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Eject"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Explore"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> missing"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Insert device again"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Moving <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-en-rCA/strings.xml b/core/res/res/values-en-rCA/strings.xml
index ab1fcaa..7eb594d 100644
--- a/core/res/res/values-en-rCA/strings.xml
+++ b/core/res/res/values-en-rCA/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Never"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"You don\'t have permission to open this page."</string>
<string name="text_copied" msgid="4985729524670131385">"Text copied to clipboard."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"More"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Edit with"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit with %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Share"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Share"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Send using"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tap to see all networks"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Connect"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"All networks"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"A Wi‑Fi network proposed by <xliff:g id="NAME">%s</xliff:g> is available"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Do you want to connect to networks proposed by <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Yes"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"No"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi will turn on automatically"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi has no Internet access"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Tap for options"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Connected"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Changes to your hotspot settings"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Your hotspot band has changed."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"This device doesn’t support your preference for 5 GHz only. Instead, this device will use the 5 GHz band when available."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB debugging connected"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Tap to turn off USB debugging"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Select to disable USB debugging."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Liquid or debris in USB port"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB port is automatically disabled. Tap to learn more."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Safe to use USB port"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Phone no longer detects liquid or debris."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Taking bug report…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Share bug report?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Sharing bug report…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Set-up"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Eject"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Explore"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> missing"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Insert device again"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Moving <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-en-rGB/strings.xml b/core/res/res/values-en-rGB/strings.xml
index 4d2155b..e233524 100644
--- a/core/res/res/values-en-rGB/strings.xml
+++ b/core/res/res/values-en-rGB/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Never"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"You don\'t have permission to open this page."</string>
<string name="text_copied" msgid="4985729524670131385">"Text copied to clipboard."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"More"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Edit with"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit with %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Share"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Share"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Send using"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tap to see all networks"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Connect"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"All networks"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"A Wi‑Fi network proposed by <xliff:g id="NAME">%s</xliff:g> is available"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Do you want to connect to networks proposed by <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Yes"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"No"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi will turn on automatically"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi has no Internet access"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Tap for options"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Connected"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Changes to your hotspot settings"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Your hotspot band has changed."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"This device doesn’t support your preference for 5 GHz only. Instead, this device will use the 5 GHz band when available."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB debugging connected"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Tap to turn off USB debugging"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Select to disable USB debugging."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Liquid or debris in USB port"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB port is automatically disabled. Tap to learn more."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Safe to use USB port"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Phone no longer detects liquid or debris."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Taking bug report…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Share bug report?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Sharing bug report…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Set-up"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Eject"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Explore"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> missing"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Insert device again"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Moving <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-en-rIN/strings.xml b/core/res/res/values-en-rIN/strings.xml
index 4d2155b..e233524 100644
--- a/core/res/res/values-en-rIN/strings.xml
+++ b/core/res/res/values-en-rIN/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Never"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"You don\'t have permission to open this page."</string>
<string name="text_copied" msgid="4985729524670131385">"Text copied to clipboard."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"More"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Edit with"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit with %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Share"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Share"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Send using"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tap to see all networks"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Connect"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"All networks"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"A Wi‑Fi network proposed by <xliff:g id="NAME">%s</xliff:g> is available"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Do you want to connect to networks proposed by <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Yes"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"No"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi will turn on automatically"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi has no Internet access"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Tap for options"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Connected"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Changes to your hotspot settings"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Your hotspot band has changed."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"This device doesn’t support your preference for 5 GHz only. Instead, this device will use the 5 GHz band when available."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB debugging connected"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Tap to turn off USB debugging"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Select to disable USB debugging."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Liquid or debris in USB port"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB port is automatically disabled. Tap to learn more."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Safe to use USB port"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Phone no longer detects liquid or debris."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Taking bug report…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Share bug report?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Sharing bug report…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Set-up"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Eject"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Explore"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> missing"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Insert device again"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Moving <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-en-rXC-watch/strings.xml b/core/res/res/values-en-rXC-watch/strings.xml
index 0287c52..a4f99ff 100644
--- a/core/res/res/values-en-rXC-watch/strings.xml
+++ b/core/res/res/values-en-rXC-watch/strings.xml
@@ -20,6 +20,6 @@
<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">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensors"</string>
+ <string name="android_upgrading_apk" msgid="1090732262010398759">"App <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
+ <string name="permgrouplab_sensors" msgid="202675452368612754">"Sensors"</string>
</resources>
diff --git a/core/res/res/values-en-rXC/strings.xml b/core/res/res/values-en-rXC/strings.xml
index bcc4c6c..e16aa80 100644
--- a/core/res/res/values-en-rXC/strings.xml
+++ b/core/res/res/values-en-rXC/strings.xml
@@ -20,1970 +20,1974 @@
<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="7542884022844556968">"kB"</string>
- <string name="megabyteShort" msgid="6355851576770428922">"MB"</string>
- <string name="gigabyteShort" msgid="3259882455212193214">"GB"</string>
- <string name="terabyteShort" msgid="231613018159186962">"TB"</string>
- <string name="petabyteShort" msgid="5637816680144990219">"PB"</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="untitled" msgid="4638956954852782576">"<Untitled>"</string>
- <string name="emptyPhoneNumber" msgid="7694063042079676517">"(No phone number)"</string>
- <string name="unknownName" msgid="6867811765370350269">"Unknown"</string>
- <string name="defaultVoiceMailAlphaTag" msgid="2660020990097733077">"Voicemail"</string>
- <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string>
- <string name="mmiError" msgid="5154499457739052907">"Connection problem or invalid MMI code."</string>
- <string name="mmiFdnError" msgid="5224398216385316471">"Operation is restricted to fixed dialing numbers only."</string>
- <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Can not change call forwarding settings from your phone while you are roaming."</string>
- <string name="serviceEnabled" msgid="8147278346414714315">"Service was enabled."</string>
- <string name="serviceEnabledFor" msgid="6856228140453471041">"Service was enabled for:"</string>
- <string name="serviceDisabled" msgid="1937553226592516411">"Service has been disabled."</string>
- <string name="serviceRegistered" msgid="6275019082598102493">"Registration was successful."</string>
- <string name="serviceErased" msgid="1288584695297200972">"Erasure was successful."</string>
- <string name="passwordIncorrect" msgid="7612208839450128715">"Incorrect password."</string>
- <string name="mmiComplete" msgid="8232527495411698359">"MMI complete."</string>
- <string name="badPin" msgid="9015277645546710014">"The old PIN you typed isn\'t correct."</string>
- <string name="badPuk" msgid="5487257647081132201">"The PUK you typed isn\'t correct."</string>
- <string name="mismatchPin" msgid="609379054496863419">"The PINs you typed don\'t match."</string>
- <string name="invalidPin" msgid="3850018445187475377">"Type a PIN that is 4 to 8 numbers."</string>
- <string name="invalidPuk" msgid="8761456210898036513">"Type a PUK that is 8 numbers or longer."</string>
- <string name="needPuk" msgid="919668385956251611">"Your SIM card is PUK-locked. Type the PUK code to unlock it."</string>
- <string name="needPuk2" msgid="4526033371987193070">"Type PUK2 to unblock SIM card."</string>
- <string name="enablePin" msgid="209412020907207950">"Unsuccessful, enable SIM/RUIM Lock."</string>
+ <string name="byteShort" msgid="8340973892742019101">"B"</string>
+ <string name="kilobyteShort" msgid="7542884022844556968">"kB"</string>
+ <string name="megabyteShort" msgid="6355851576770428922">"MB"</string>
+ <string name="gigabyteShort" msgid="3259882455212193214">"GB"</string>
+ <string name="terabyteShort" msgid="231613018159186962">"TB"</string>
+ <string name="petabyteShort" msgid="5637816680144990219">"PB"</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="untitled" msgid="4638956954852782576">"<Untitled>"</string>
+ <string name="emptyPhoneNumber" msgid="7694063042079676517">"(No phone number)"</string>
+ <string name="unknownName" msgid="6867811765370350269">"Unknown"</string>
+ <string name="defaultVoiceMailAlphaTag" msgid="2660020990097733077">"Voicemail"</string>
+ <string name="defaultMsisdnAlphaTag" msgid="2850889754919584674">"MSISDN1"</string>
+ <string name="mmiError" msgid="5154499457739052907">"Connection problem or invalid MMI code."</string>
+ <string name="mmiFdnError" msgid="5224398216385316471">"Operation is restricted to fixed dialing numbers only."</string>
+ <string name="mmiErrorWhileRoaming" msgid="762488890299284230">"Can not change call forwarding settings from your phone while you are roaming."</string>
+ <string name="serviceEnabled" msgid="8147278346414714315">"Service was enabled."</string>
+ <string name="serviceEnabledFor" msgid="6856228140453471041">"Service was enabled for:"</string>
+ <string name="serviceDisabled" msgid="1937553226592516411">"Service has been disabled."</string>
+ <string name="serviceRegistered" msgid="6275019082598102493">"Registration was successful."</string>
+ <string name="serviceErased" msgid="1288584695297200972">"Erasure was successful."</string>
+ <string name="passwordIncorrect" msgid="7612208839450128715">"Incorrect password."</string>
+ <string name="mmiComplete" msgid="8232527495411698359">"MMI complete."</string>
+ <string name="badPin" msgid="9015277645546710014">"The old PIN you typed isn\'t correct."</string>
+ <string name="badPuk" msgid="5487257647081132201">"The PUK you typed isn\'t correct."</string>
+ <string name="mismatchPin" msgid="609379054496863419">"The PINs you typed don\'t match."</string>
+ <string name="invalidPin" msgid="3850018445187475377">"Type a PIN that is 4 to 8 numbers."</string>
+ <string name="invalidPuk" msgid="8761456210898036513">"Type a PUK that is 8 numbers or longer."</string>
+ <string name="needPuk" msgid="919668385956251611">"Your SIM card is PUK-locked. Type the PUK code to unlock it."</string>
+ <string name="needPuk2" msgid="4526033371987193070">"Type PUK2 to unblock SIM card."</string>
+ <string name="enablePin" msgid="209412020907207950">"Unsuccessful, enable SIM/RUIM Lock."</string>
<plurals name="pinpuk_attempts" formatted="false" msgid="1251012001539225582">
- <item quantity="other">You have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts before SIM is locked.</item>
- <item quantity="one">You have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before SIM is locked.</item>
+ <item quantity="other">You have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts before SIM is locked.</item>
+ <item quantity="one">You have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before SIM is locked.</item>
</plurals>
- <string name="imei" msgid="2625429890869005782">"IMEI"</string>
- <string name="meid" msgid="4841221237681254195">"MEID"</string>
- <string name="ClipMmi" msgid="6952821216480289285">"Incoming Caller ID"</string>
- <string name="ClirMmi" msgid="7784673673446833091">"Outgoing Caller ID"</string>
- <string name="ColpMmi" msgid="3065121483740183974">"Connected Line ID"</string>
- <string name="ColrMmi" msgid="4996540314421889589">"Connected Line ID Restriction"</string>
- <string name="CfMmi" msgid="5123218989141573515">"Call forwarding"</string>
- <string name="CwMmi" msgid="9129678056795016867">"Call waiting"</string>
- <string name="BaMmi" msgid="455193067926770581">"Call barring"</string>
- <string name="PwdMmi" msgid="7043715687905254199">"Password change"</string>
- <string name="PinMmi" msgid="3113117780361190304">"PIN change"</string>
- <string name="CnipMmi" msgid="3110534680557857162">"Calling number present"</string>
- <string name="CnirMmi" msgid="3062102121430548731">"Calling number restricted"</string>
- <string name="ThreeWCMmi" msgid="9051047170321190368">"Three way calling"</string>
- <string name="RuacMmi" msgid="7827887459138308886">"Rejection of undesired annoying calls"</string>
- <string name="CndMmi" msgid="3116446237081575808">"Calling number delivery"</string>
- <string name="DndMmi" msgid="1265478932418334331">"Do not disturb"</string>
- <string name="CLIRDefaultOnNextCallOn" msgid="429415409145781923">"Caller ID defaults to restricted. Next call: Restricted"</string>
- <string name="CLIRDefaultOnNextCallOff" msgid="3092918006077864624">"Caller ID defaults to restricted. Next call: Not restricted"</string>
- <string name="CLIRDefaultOffNextCallOn" msgid="6179425182856418465">"Caller ID defaults to not restricted. Next call: Restricted"</string>
- <string name="CLIRDefaultOffNextCallOff" msgid="2567998633124408552">"Caller ID defaults to not restricted. Next call: Not restricted"</string>
- <string name="serviceNotProvisioned" msgid="8614830180508686666">"Service not provisioned."</string>
- <string name="CLIRPermanent" msgid="3377371145926835671">"You can\'t change the caller ID setting."</string>
- <string name="RestrictedOnDataTitle" msgid="5221736429761078014">"No mobile data service"</string>
- <string name="RestrictedOnEmergencyTitle" msgid="6855466023161191166">"Emergency calling unavailable"</string>
- <string name="RestrictedOnNormalTitle" msgid="3179574012752700984">"No voice service"</string>
- <string name="RestrictedOnAllVoiceTitle" msgid="8037246983606545202">"No voice service or emergency calling"</string>
- <string name="RestrictedStateContent" msgid="6538703255570997248">"Temporarily turned off by your carrier"</string>
- <string name="RestrictedStateContentMsimTemplate" msgid="673416791370248176">"Temporarily turned off by your carrier for SIM <xliff:g id="SIMNUMBER">%d</xliff:g>"</string>
- <string name="NetworkPreferenceSwitchTitle" msgid="6982395015324165258">"Can’t reach mobile network"</string>
- <string name="NetworkPreferenceSwitchSummary" msgid="509327194863482733">"Try changing preferred network. Tap to change."</string>
- <string name="EmergencyCallWarningTitle" msgid="813380189532491336">"Emergency calling unavailable"</string>
- <string name="EmergencyCallWarningSummary" msgid="1899692069750260619">"Can’t make emergency calls over Wi‑Fi"</string>
- <string name="notification_channel_network_alert" msgid="4427736684338074967">"Alerts"</string>
- <string name="notification_channel_call_forward" msgid="2419697808481833249">"Call forwarding"</string>
- <string name="notification_channel_emergency_callback" msgid="6686166232265733921">"Emergency callback mode"</string>
- <string name="notification_channel_mobile_data_status" msgid="4575131690860945836">"Mobile data status"</string>
- <string name="notification_channel_sms" msgid="3441746047346135073">"SMS messages"</string>
- <string name="notification_channel_voice_mail" msgid="3954099424160511919">"Voicemail messages"</string>
- <string name="notification_channel_wfc" msgid="2130802501654254801">"Wi-Fi calling"</string>
- <string name="notification_channel_sim" msgid="4052095493875188564">"SIM status"</string>
- <string name="peerTtyModeFull" msgid="6165351790010341421">"Peer requested TTY Mode FULL"</string>
- <string name="peerTtyModeHco" msgid="5728602160669216784">"Peer requested TTY Mode HCO"</string>
- <string name="peerTtyModeVco" msgid="1742404978686538049">"Peer requested TTY Mode VCO"</string>
- <string name="peerTtyModeOff" msgid="3280819717850602205">"Peer requested TTY Mode OFF"</string>
- <string name="serviceClassVoice" msgid="1258393812335258019">"Voice"</string>
- <string name="serviceClassData" msgid="872456782077937893">"Data"</string>
- <string name="serviceClassFAX" msgid="5566624998840486475">"FAX"</string>
- <string name="serviceClassSMS" msgid="2015460373701527489">"SMS"</string>
- <string name="serviceClassDataAsync" msgid="4523454783498551468">"Async"</string>
- <string name="serviceClassDataSync" msgid="7530000519646054776">"Sync"</string>
- <string name="serviceClassPacket" msgid="6991006557993423453">"Packet"</string>
- <string name="serviceClassPAD" msgid="3235259085648271037">"PAD"</string>
- <string name="roamingText0" msgid="7170335472198694945">"Roaming Indicator On"</string>
- <string name="roamingText1" msgid="5314861519752538922">"Roaming Indicator Off"</string>
- <string name="roamingText2" msgid="8969929049081268115">"Roaming Indicator Flashing"</string>
- <string name="roamingText3" msgid="5148255027043943317">"Out of Neighborhood"</string>
- <string name="roamingText4" msgid="8808456682550796530">"Out of Building"</string>
- <string name="roamingText5" msgid="7604063252850354350">"Roaming - Preferred System"</string>
- <string name="roamingText6" msgid="2059440825782871513">"Roaming - Available System"</string>
- <string name="roamingText7" msgid="7112078724097233605">"Roaming - Alliance Partner"</string>
- <string name="roamingText8" msgid="5989569778604089291">"Roaming - Premium Partner"</string>
- <string name="roamingText9" msgid="7969296811355152491">"Roaming - Full Service Functionality"</string>
- <string name="roamingText10" msgid="3992906999815316417">"Roaming - Partial Service Functionality"</string>
- <string name="roamingText11" msgid="4154476854426920970">"Roaming Banner On"</string>
- <string name="roamingText12" msgid="1189071119992726320">"Roaming Banner Off"</string>
- <string name="roamingTextSearching" msgid="8360141885972279963">"Searching for Service"</string>
- <string name="wfcRegErrorTitle" msgid="3855061241207182194">"Couldn’t set up Wi‑Fi calling"</string>
+ <string name="imei" msgid="2625429890869005782">"IMEI"</string>
+ <string name="meid" msgid="4841221237681254195">"MEID"</string>
+ <string name="ClipMmi" msgid="6952821216480289285">"Incoming Caller ID"</string>
+ <string name="ClirMmi" msgid="7784673673446833091">"Outgoing Caller ID"</string>
+ <string name="ColpMmi" msgid="3065121483740183974">"Connected Line ID"</string>
+ <string name="ColrMmi" msgid="4996540314421889589">"Connected Line ID Restriction"</string>
+ <string name="CfMmi" msgid="5123218989141573515">"Call forwarding"</string>
+ <string name="CwMmi" msgid="9129678056795016867">"Call waiting"</string>
+ <string name="BaMmi" msgid="455193067926770581">"Call barring"</string>
+ <string name="PwdMmi" msgid="7043715687905254199">"Password change"</string>
+ <string name="PinMmi" msgid="3113117780361190304">"PIN change"</string>
+ <string name="CnipMmi" msgid="3110534680557857162">"Calling number present"</string>
+ <string name="CnirMmi" msgid="3062102121430548731">"Calling number restricted"</string>
+ <string name="ThreeWCMmi" msgid="9051047170321190368">"Three way calling"</string>
+ <string name="RuacMmi" msgid="7827887459138308886">"Rejection of undesired annoying calls"</string>
+ <string name="CndMmi" msgid="3116446237081575808">"Calling number delivery"</string>
+ <string name="DndMmi" msgid="1265478932418334331">"Do not disturb"</string>
+ <string name="CLIRDefaultOnNextCallOn" msgid="429415409145781923">"Caller ID defaults to restricted. Next call: Restricted"</string>
+ <string name="CLIRDefaultOnNextCallOff" msgid="3092918006077864624">"Caller ID defaults to restricted. Next call: Not restricted"</string>
+ <string name="CLIRDefaultOffNextCallOn" msgid="6179425182856418465">"Caller ID defaults to not restricted. Next call: Restricted"</string>
+ <string name="CLIRDefaultOffNextCallOff" msgid="2567998633124408552">"Caller ID defaults to not restricted. Next call: Not restricted"</string>
+ <string name="serviceNotProvisioned" msgid="8614830180508686666">"Service not provisioned."</string>
+ <string name="CLIRPermanent" msgid="3377371145926835671">"You can\'t change the caller ID setting."</string>
+ <string name="RestrictedOnDataTitle" msgid="5221736429761078014">"No mobile data service"</string>
+ <string name="RestrictedOnEmergencyTitle" msgid="6855466023161191166">"Emergency calling unavailable"</string>
+ <string name="RestrictedOnNormalTitle" msgid="3179574012752700984">"No voice service"</string>
+ <string name="RestrictedOnAllVoiceTitle" msgid="8037246983606545202">"No voice service or emergency calling"</string>
+ <string name="RestrictedStateContent" msgid="6538703255570997248">"Temporarily turned off by your carrier"</string>
+ <string name="RestrictedStateContentMsimTemplate" msgid="673416791370248176">"Temporarily turned off by your carrier for SIM <xliff:g id="SIMNUMBER">%d</xliff:g>"</string>
+ <string name="NetworkPreferenceSwitchTitle" msgid="6982395015324165258">"Can’t reach mobile network"</string>
+ <string name="NetworkPreferenceSwitchSummary" msgid="509327194863482733">"Try changing preferred network. Tap to change."</string>
+ <string name="EmergencyCallWarningTitle" msgid="813380189532491336">"Emergency calling unavailable"</string>
+ <string name="EmergencyCallWarningSummary" msgid="1899692069750260619">"Can’t make emergency calls over Wi‑Fi"</string>
+ <string name="notification_channel_network_alert" msgid="4427736684338074967">"Alerts"</string>
+ <string name="notification_channel_call_forward" msgid="2419697808481833249">"Call forwarding"</string>
+ <string name="notification_channel_emergency_callback" msgid="6686166232265733921">"Emergency callback mode"</string>
+ <string name="notification_channel_mobile_data_status" msgid="4575131690860945836">"Mobile data status"</string>
+ <string name="notification_channel_sms" msgid="3441746047346135073">"SMS messages"</string>
+ <string name="notification_channel_voice_mail" msgid="3954099424160511919">"Voicemail messages"</string>
+ <string name="notification_channel_wfc" msgid="2130802501654254801">"Wi-Fi calling"</string>
+ <string name="notification_channel_sim" msgid="4052095493875188564">"SIM status"</string>
+ <string name="peerTtyModeFull" msgid="6165351790010341421">"Peer requested TTY Mode FULL"</string>
+ <string name="peerTtyModeHco" msgid="5728602160669216784">"Peer requested TTY Mode HCO"</string>
+ <string name="peerTtyModeVco" msgid="1742404978686538049">"Peer requested TTY Mode VCO"</string>
+ <string name="peerTtyModeOff" msgid="3280819717850602205">"Peer requested TTY Mode OFF"</string>
+ <string name="serviceClassVoice" msgid="1258393812335258019">"Voice"</string>
+ <string name="serviceClassData" msgid="872456782077937893">"Data"</string>
+ <string name="serviceClassFAX" msgid="5566624998840486475">"FAX"</string>
+ <string name="serviceClassSMS" msgid="2015460373701527489">"SMS"</string>
+ <string name="serviceClassDataAsync" msgid="4523454783498551468">"Async"</string>
+ <string name="serviceClassDataSync" msgid="7530000519646054776">"Sync"</string>
+ <string name="serviceClassPacket" msgid="6991006557993423453">"Packet"</string>
+ <string name="serviceClassPAD" msgid="3235259085648271037">"PAD"</string>
+ <string name="roamingText0" msgid="7170335472198694945">"Roaming Indicator On"</string>
+ <string name="roamingText1" msgid="5314861519752538922">"Roaming Indicator Off"</string>
+ <string name="roamingText2" msgid="8969929049081268115">"Roaming Indicator Flashing"</string>
+ <string name="roamingText3" msgid="5148255027043943317">"Out of Neighborhood"</string>
+ <string name="roamingText4" msgid="8808456682550796530">"Out of Building"</string>
+ <string name="roamingText5" msgid="7604063252850354350">"Roaming - Preferred System"</string>
+ <string name="roamingText6" msgid="2059440825782871513">"Roaming - Available System"</string>
+ <string name="roamingText7" msgid="7112078724097233605">"Roaming - Alliance Partner"</string>
+ <string name="roamingText8" msgid="5989569778604089291">"Roaming - Premium Partner"</string>
+ <string name="roamingText9" msgid="7969296811355152491">"Roaming - Full Service Functionality"</string>
+ <string name="roamingText10" msgid="3992906999815316417">"Roaming - Partial Service Functionality"</string>
+ <string name="roamingText11" msgid="4154476854426920970">"Roaming Banner On"</string>
+ <string name="roamingText12" msgid="1189071119992726320">"Roaming Banner Off"</string>
+ <string name="roamingTextSearching" msgid="8360141885972279963">"Searching for Service"</string>
+ <string name="wfcRegErrorTitle" msgid="3855061241207182194">"Couldn’t set up Wi‑Fi calling"</string>
<string-array name="wfcOperatorErrorAlertMessages">
- <item msgid="3910386316304772394">"To make calls and send messages over Wi-Fi, first ask your carrier to set up this service. Then turn on Wi-Fi calling again from Settings. (Error code: <xliff:g id="CODE">%1$s</xliff:g>)"</item>
+ <item msgid="3910386316304772394">"To make calls and send messages over Wi-Fi, first ask your carrier to set up this service. Then turn on Wi-Fi calling again from Settings. (Error code: <xliff:g id="CODE">%1$s</xliff:g>)"</item>
</string-array>
<string-array name="wfcOperatorErrorNotificationMessages">
- <item msgid="7372514042696663278">"Issue registering Wi‑Fi calling with your carrier: <xliff:g id="CODE">%1$s</xliff:g>"</item>
+ <item msgid="7372514042696663278">"Issue registering Wi‑Fi calling with your carrier: <xliff:g id="CODE">%1$s</xliff:g>"</item>
</string-array>
<!-- no translation found for wfcSpnFormat_spn (4998685024207291232) -->
<skip />
- <string name="wfcSpnFormat_spn_wifi_calling" msgid="136001023263502280">"<xliff:g id="SPN">%s</xliff:g> Wi-Fi Calling"</string>
- <string name="wfcSpnFormat_wlan_call" msgid="2533371081782489793">"WLAN Call"</string>
- <string name="wfcSpnFormat_spn_wlan_call" msgid="2315240198303197168">"<xliff:g id="SPN">%s</xliff:g> WLAN Call"</string>
- <string name="wfcSpnFormat_spn_wifi" msgid="6546481665561961938">"<xliff:g id="SPN">%s</xliff:g> Wi-Fi"</string>
- <string name="wfcSpnFormat_wifi_calling_bar_spn" msgid="1726178784338466265">"WiFi Calling | <xliff:g id="SPN">%s</xliff:g>"</string>
- <string name="wfcSpnFormat_spn_vowifi" msgid="4444638298656953681">"<xliff:g id="SPN">%s</xliff:g> VoWifi"</string>
- <string name="wfcSpnFormat_wifi_calling" msgid="4990486735013125329">"Wi-Fi Calling"</string>
- <string name="wfcSpnFormat_wifi" msgid="1892673884655959773">"Wi-Fi"</string>
- <string name="wfcSpnFormat_wifi_calling_wo_hyphen" msgid="1336669776254502831">"WiFi Calling"</string>
- <string name="wfcSpnFormat_vowifi" msgid="1765176406171272629">"VoWifi"</string>
- <string name="wifi_calling_off_summary" msgid="8720659586041656098">"Off"</string>
- <string name="wfc_mode_wifi_preferred_summary" msgid="1994113411286935263">"Wi-Fi preferred"</string>
- <string name="wfc_mode_cellular_preferred_summary" msgid="1988279625335345908">"Mobile preferred"</string>
- <string name="wfc_mode_wifi_only_summary" msgid="2379919155237869320">"Wi-Fi only"</string>
- <string name="cfTemplateNotForwarded" msgid="1683685883841272560">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Not forwarded"</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> after <xliff:g id="TIME_DELAY">{2}</xliff:g> seconds"</string>
- <string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Not forwarded"</string>
- <string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Not forwarded"</string>
- <string name="fcComplete" msgid="3118848230966886575">"Feature code complete."</string>
- <string name="fcError" msgid="3327560126588500777">"Connection problem or invalid feature code."</string>
- <string name="httpErrorOk" msgid="1191919378083472204">"OK"</string>
- <string name="httpError" msgid="7956392511146698522">"There was a network error."</string>
- <string name="httpErrorLookup" msgid="4711687456111963163">"Couldn\'t find the URL."</string>
- <string name="httpErrorUnsupportedAuthScheme" msgid="6299980280442076799">"The site authentication scheme isn\'t supported."</string>
- <string name="httpErrorAuth" msgid="1435065629438044534">"Couldn\'t authenticate."</string>
- <string name="httpErrorProxyAuth" msgid="1788207010559081331">"Authentication via the proxy server was unsuccessful."</string>
- <string name="httpErrorConnect" msgid="8714273236364640549">"Couldn\'t connect to the server."</string>
- <string name="httpErrorIO" msgid="2340558197489302188">"Couldn\'t communicate with the server. Try again later."</string>
- <string name="httpErrorTimeout" msgid="4743403703762883954">"The connection to the server timed out."</string>
- <string name="httpErrorRedirectLoop" msgid="8679596090392779516">"The page contains too many server redirects."</string>
- <string name="httpErrorUnsupportedScheme" msgid="5015730812906192208">"The protocol isn\'t supported."</string>
- <string name="httpErrorFailedSslHandshake" msgid="96549606000658641">"Couldn\'t establish a secure connection."</string>
- <string name="httpErrorBadUrl" msgid="3636929722728881972">"Couldn\'t open the page because the URL is invalid."</string>
- <string name="httpErrorFile" msgid="2170788515052558676">"Couldn\'t access the file."</string>
- <string name="httpErrorFileNotFound" msgid="6203856612042655084">"Couldn\'t find the requested file."</string>
- <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Too many requests are being processed. Try again later."</string>
- <string name="notification_title" msgid="8967710025036163822">"Signin error for <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
- <string name="contentServiceSync" msgid="8353523060269335667">"Sync"</string>
- <string name="contentServiceSyncNotificationTitle" msgid="7036196943673524858">"Can\'t sync"</string>
- <string name="contentServiceTooManyDeletesNotificationDesc" msgid="4884451152168188763">"Attempted to delete too many <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string>
- <string name="low_memory" product="tablet" msgid="6494019234102154896">"Tablet storage is full. Delete some files to free space."</string>
- <string name="low_memory" product="watch" msgid="4415914910770005166">"Watch storage is full. Delete some files to free space."</string>
- <string name="low_memory" product="tv" msgid="516619861191025923">"TV storage is full. Delete some files to free space."</string>
- <string name="low_memory" product="default" msgid="3475999286680000541">"Phone storage is full. Delete some files to free space."</string>
+ <string name="wfcSpnFormat_spn_wifi_calling" msgid="136001023263502280">"<xliff:g id="SPN">%s</xliff:g> Wi-Fi Calling"</string>
+ <string name="wfcSpnFormat_wlan_call" msgid="2533371081782489793">"WLAN Call"</string>
+ <string name="wfcSpnFormat_spn_wlan_call" msgid="2315240198303197168">"<xliff:g id="SPN">%s</xliff:g> WLAN Call"</string>
+ <string name="wfcSpnFormat_spn_wifi" msgid="6546481665561961938">"<xliff:g id="SPN">%s</xliff:g> Wi-Fi"</string>
+ <string name="wfcSpnFormat_wifi_calling_bar_spn" msgid="1726178784338466265">"WiFi Calling | <xliff:g id="SPN">%s</xliff:g>"</string>
+ <string name="wfcSpnFormat_spn_vowifi" msgid="4444638298656953681">"<xliff:g id="SPN">%s</xliff:g> VoWifi"</string>
+ <string name="wfcSpnFormat_wifi_calling" msgid="4990486735013125329">"Wi-Fi Calling"</string>
+ <string name="wfcSpnFormat_wifi" msgid="1892673884655959773">"Wi-Fi"</string>
+ <string name="wfcSpnFormat_wifi_calling_wo_hyphen" msgid="1336669776254502831">"WiFi Calling"</string>
+ <string name="wfcSpnFormat_vowifi" msgid="1765176406171272629">"VoWifi"</string>
+ <string name="wifi_calling_off_summary" msgid="8720659586041656098">"Off"</string>
+ <string name="wfc_mode_wifi_preferred_summary" msgid="1994113411286935263">"Wi-Fi preferred"</string>
+ <string name="wfc_mode_cellular_preferred_summary" msgid="1988279625335345908">"Mobile preferred"</string>
+ <string name="wfc_mode_wifi_only_summary" msgid="2379919155237869320">"Wi-Fi only"</string>
+ <string name="cfTemplateNotForwarded" msgid="1683685883841272560">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Not forwarded"</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> after <xliff:g id="TIME_DELAY">{2}</xliff:g> seconds"</string>
+ <string name="cfTemplateRegistered" msgid="5073237827620166285">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Not forwarded"</string>
+ <string name="cfTemplateRegisteredTime" msgid="6781621964320635172">"<xliff:g id="BEARER_SERVICE_CODE">{0}</xliff:g>: Not forwarded"</string>
+ <string name="fcComplete" msgid="3118848230966886575">"Feature code complete."</string>
+ <string name="fcError" msgid="3327560126588500777">"Connection problem or invalid feature code."</string>
+ <string name="httpErrorOk" msgid="1191919378083472204">"OK"</string>
+ <string name="httpError" msgid="7956392511146698522">"There was a network error."</string>
+ <string name="httpErrorLookup" msgid="4711687456111963163">"Couldn\'t find the URL."</string>
+ <string name="httpErrorUnsupportedAuthScheme" msgid="6299980280442076799">"The site authentication scheme isn\'t supported."</string>
+ <string name="httpErrorAuth" msgid="1435065629438044534">"Couldn\'t authenticate."</string>
+ <string name="httpErrorProxyAuth" msgid="1788207010559081331">"Authentication via the proxy server was unsuccessful."</string>
+ <string name="httpErrorConnect" msgid="8714273236364640549">"Couldn\'t connect to the server."</string>
+ <string name="httpErrorIO" msgid="2340558197489302188">"Couldn\'t communicate with the server. Try again later."</string>
+ <string name="httpErrorTimeout" msgid="4743403703762883954">"The connection to the server timed out."</string>
+ <string name="httpErrorRedirectLoop" msgid="8679596090392779516">"The page contains too many server redirects."</string>
+ <string name="httpErrorUnsupportedScheme" msgid="5015730812906192208">"The protocol isn\'t supported."</string>
+ <string name="httpErrorFailedSslHandshake" msgid="96549606000658641">"Couldn\'t establish a secure connection."</string>
+ <string name="httpErrorBadUrl" msgid="3636929722728881972">"Couldn\'t open the page because the URL is invalid."</string>
+ <string name="httpErrorFile" msgid="2170788515052558676">"Couldn\'t access the file."</string>
+ <string name="httpErrorFileNotFound" msgid="6203856612042655084">"Couldn\'t find the requested file."</string>
+ <string name="httpErrorTooManyRequests" msgid="1235396927087188253">"Too many requests are being processed. Try again later."</string>
+ <string name="notification_title" msgid="8967710025036163822">"Signin error for <xliff:g id="ACCOUNT">%1$s</xliff:g>"</string>
+ <string name="contentServiceSync" msgid="8353523060269335667">"Sync"</string>
+ <string name="contentServiceSyncNotificationTitle" msgid="7036196943673524858">"Can\'t sync"</string>
+ <string name="contentServiceTooManyDeletesNotificationDesc" msgid="4884451152168188763">"Attempted to delete too many <xliff:g id="CONTENT_TYPE">%s</xliff:g>."</string>
+ <string name="low_memory" product="tablet" msgid="6494019234102154896">"Tablet storage is full. Delete some files to free space."</string>
+ <string name="low_memory" product="watch" msgid="4415914910770005166">"Watch storage is full. Delete some files to free space."</string>
+ <string name="low_memory" product="tv" msgid="516619861191025923">"TV storage is full. Delete some files to free space."</string>
+ <string name="low_memory" product="default" msgid="3475999286680000541">"Phone storage is full. Delete some files to free space."</string>
<plurals name="ssl_ca_cert_warning" formatted="false" msgid="5106721205300213569">
- <item quantity="other">Certificate authorities installed</item>
- <item quantity="one">Certificate authority installed</item>
+ <item quantity="other">Certificate authorities installed</item>
+ <item quantity="one">Certificate authority installed</item>
</plurals>
- <string name="ssl_ca_cert_noti_by_unknown" msgid="4475437862189850602">"By an unknown third party"</string>
- <string name="ssl_ca_cert_noti_by_administrator" msgid="3541729986326153557">"By your work profile admin"</string>
- <string name="ssl_ca_cert_noti_managed" msgid="4030263497686867141">"By <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>"</string>
- <string name="work_profile_deleted" msgid="5005572078641980632">"Work profile deleted"</string>
- <string name="work_profile_deleted_details" msgid="6307630639269092360">"The work profile admin app is either missing or corrupted. As a result, your work profile and related data have been deleted. Contact your admin for assistance."</string>
- <string name="work_profile_deleted_description_dpm_wipe" msgid="8823792115612348820">"Your work profile is no longer available on this device"</string>
- <string name="work_profile_deleted_reason_maximum_password_failure" msgid="8986903510053359694">"Too many password attempts"</string>
- <string name="network_logging_notification_title" msgid="6399790108123704477">"Device is managed"</string>
- <string name="network_logging_notification_text" msgid="7930089249949354026">"Your organization manages this device and may monitor network traffic. Tap for details."</string>
- <string name="factory_reset_warning" msgid="5423253125642394387">"Your device will be erased"</string>
- <string name="factory_reset_message" msgid="9024647691106150160">"The admin app can\'t be used. Your device will now be erased.\n\nIf you have questions, contact your organization\'s admin."</string>
- <string name="printing_disabled_by" msgid="8936832919072486965">"Printing disabled by <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
- <string name="me" msgid="6545696007631404292">"Me"</string>
- <string name="power_dialog" product="tablet" msgid="8545351420865202853">"Tablet options"</string>
- <string name="power_dialog" product="tv" msgid="6153888706430556356">"TV options"</string>
- <string name="power_dialog" product="default" msgid="1319919075463988638">"Phone options"</string>
- <string name="silent_mode" msgid="7167703389802618663">"Silent mode"</string>
- <string name="turn_on_radio" msgid="3912793092339962371">"Turn on wireless"</string>
- <string name="turn_off_radio" msgid="8198784949987062346">"Turn off wireless"</string>
- <string name="screen_lock" msgid="799094655496098153">"Screen lock"</string>
- <string name="power_off" msgid="4266614107412865048">"Power off"</string>
- <string name="silent_mode_silent" msgid="319298163018473078">"Ringer off"</string>
- <string name="silent_mode_vibrate" msgid="7072043388581551395">"Ringer vibrate"</string>
- <string name="silent_mode_ring" msgid="8592241816194074353">"Ringer on"</string>
- <string name="reboot_to_update_title" msgid="6212636802536823850">"Android system update"</string>
- <string name="reboot_to_update_prepare" msgid="6305853831955310890">"Preparing to update…"</string>
- <string name="reboot_to_update_package" msgid="3871302324500927291">"Processing the update package…"</string>
- <string name="reboot_to_update_reboot" msgid="6428441000951565185">"Restarting…"</string>
- <string name="reboot_to_reset_title" msgid="4142355915340627490">"Factory data reset"</string>
- <string name="reboot_to_reset_message" msgid="2432077491101416345">"Restarting…"</string>
- <string name="shutdown_progress" msgid="2281079257329981203">"Shutting down…"</string>
- <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Your tablet will shut down."</string>
- <string name="shutdown_confirm" product="tv" msgid="476672373995075359">"Your TV will shut down."</string>
- <string name="shutdown_confirm" product="watch" msgid="3490275567476369184">"Your watch will shut down."</string>
- <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Your phone will shut down."</string>
- <string name="shutdown_confirm_question" msgid="2906544768881136183">"Do you want to shut down?"</string>
- <string name="reboot_safemode_title" msgid="7054509914500140361">"Reboot to safe mode"</string>
- <string name="reboot_safemode_confirm" msgid="55293944502784668">"Do you want to reboot into safe mode? This will disable all third party applications you have installed. They will be restored when you reboot again."</string>
- <string name="recent_tasks_title" msgid="3691764623638127888">"Recent"</string>
- <string name="no_recent_tasks" msgid="8794906658732193473">"No recent apps."</string>
- <string name="global_actions" product="tablet" msgid="408477140088053665">"Tablet options"</string>
- <string name="global_actions" product="tv" msgid="7240386462508182976">"TV options"</string>
- <string name="global_actions" product="default" msgid="2406416831541615258">"Phone options"</string>
- <string name="global_action_lock" msgid="2844945191792119712">"Screen lock"</string>
- <string name="global_action_power_off" msgid="4471879440839879722">"Power off"</string>
- <string name="global_action_emergency" msgid="7112311161137421166">"Emergency"</string>
- <string name="global_action_bug_report" msgid="7934010578922304799">"Bug report"</string>
- <string name="global_action_logout" msgid="935179188218826050">"End session"</string>
- <string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
- <string name="bugreport_title" msgid="2667494803742548533">"Take bug report"</string>
- <string name="bugreport_message" msgid="398447048750350456">"This will collect information about your current device state, to send as an e-mail message. It will take a little time from starting the bug report until it is ready to be sent; please be patient."</string>
- <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interactive report"</string>
- <string name="bugreport_option_interactive_summary" msgid="229299488536107968">"Use this under most circumstances. It allows you to track progress of the report, enter more details about the problem, and take screenshots. It might omit some less-used sections that take a long time to report."</string>
- <string name="bugreport_option_full_title" msgid="6354382025840076439">"Full report"</string>
- <string name="bugreport_option_full_summary" msgid="7210859858969115745">"Use this option for minimal system interference when your device is unresponsive or too slow, or when you need all report sections. Does not allow you to enter more details or take additional screenshots."</string>
+ <string name="ssl_ca_cert_noti_by_unknown" msgid="4475437862189850602">"By an unknown third party"</string>
+ <string name="ssl_ca_cert_noti_by_administrator" msgid="3541729986326153557">"By your work profile admin"</string>
+ <string name="ssl_ca_cert_noti_managed" msgid="4030263497686867141">"By <xliff:g id="MANAGING_DOMAIN">%s</xliff:g>"</string>
+ <string name="work_profile_deleted" msgid="5005572078641980632">"Work profile deleted"</string>
+ <string name="work_profile_deleted_details" msgid="6307630639269092360">"The work profile admin app is either missing or corrupted. As a result, your work profile and related data have been deleted. Contact your admin for assistance."</string>
+ <string name="work_profile_deleted_description_dpm_wipe" msgid="8823792115612348820">"Your work profile is no longer available on this device"</string>
+ <string name="work_profile_deleted_reason_maximum_password_failure" msgid="8986903510053359694">"Too many password attempts"</string>
+ <string name="network_logging_notification_title" msgid="6399790108123704477">"Device is managed"</string>
+ <string name="network_logging_notification_text" msgid="7930089249949354026">"Your organization manages this device and may monitor network traffic. Tap for details."</string>
+ <string name="factory_reset_warning" msgid="5423253125642394387">"Your device will be erased"</string>
+ <string name="factory_reset_message" msgid="9024647691106150160">"The admin app can\'t be used. Your device will now be erased.\n\nIf you have questions, contact your organization\'s admin."</string>
+ <string name="printing_disabled_by" msgid="8936832919072486965">"Printing disabled by <xliff:g id="OWNER_APP">%s</xliff:g>."</string>
+ <string name="me" msgid="6545696007631404292">"Me"</string>
+ <string name="power_dialog" product="tablet" msgid="8545351420865202853">"Tablet options"</string>
+ <string name="power_dialog" product="tv" msgid="6153888706430556356">"TV options"</string>
+ <string name="power_dialog" product="default" msgid="1319919075463988638">"Phone options"</string>
+ <string name="silent_mode" msgid="7167703389802618663">"Silent mode"</string>
+ <string name="turn_on_radio" msgid="3912793092339962371">"Turn on wireless"</string>
+ <string name="turn_off_radio" msgid="8198784949987062346">"Turn off wireless"</string>
+ <string name="screen_lock" msgid="799094655496098153">"Screen lock"</string>
+ <string name="power_off" msgid="4266614107412865048">"Power off"</string>
+ <string name="silent_mode_silent" msgid="319298163018473078">"Ringer off"</string>
+ <string name="silent_mode_vibrate" msgid="7072043388581551395">"Ringer vibrate"</string>
+ <string name="silent_mode_ring" msgid="8592241816194074353">"Ringer on"</string>
+ <string name="reboot_to_update_title" msgid="6212636802536823850">"Android system update"</string>
+ <string name="reboot_to_update_prepare" msgid="6305853831955310890">"Preparing to update…"</string>
+ <string name="reboot_to_update_package" msgid="3871302324500927291">"Processing the update package…"</string>
+ <string name="reboot_to_update_reboot" msgid="6428441000951565185">"Restarting…"</string>
+ <string name="reboot_to_reset_title" msgid="4142355915340627490">"Factory data reset"</string>
+ <string name="reboot_to_reset_message" msgid="2432077491101416345">"Restarting…"</string>
+ <string name="shutdown_progress" msgid="2281079257329981203">"Shutting down…"</string>
+ <string name="shutdown_confirm" product="tablet" msgid="3385745179555731470">"Your tablet will shut down."</string>
+ <string name="shutdown_confirm" product="tv" msgid="476672373995075359">"Your TV will shut down."</string>
+ <string name="shutdown_confirm" product="watch" msgid="3490275567476369184">"Your watch will shut down."</string>
+ <string name="shutdown_confirm" product="default" msgid="649792175242821353">"Your phone will shut down."</string>
+ <string name="shutdown_confirm_question" msgid="2906544768881136183">"Do you want to shut down?"</string>
+ <string name="reboot_safemode_title" msgid="7054509914500140361">"Reboot to safe mode"</string>
+ <string name="reboot_safemode_confirm" msgid="55293944502784668">"Do you want to reboot into safe mode? This will disable all third party applications you have installed. They will be restored when you reboot again."</string>
+ <string name="recent_tasks_title" msgid="3691764623638127888">"Recent"</string>
+ <string name="no_recent_tasks" msgid="8794906658732193473">"No recent apps."</string>
+ <string name="global_actions" product="tablet" msgid="408477140088053665">"Tablet options"</string>
+ <string name="global_actions" product="tv" msgid="7240386462508182976">"TV options"</string>
+ <string name="global_actions" product="default" msgid="2406416831541615258">"Phone options"</string>
+ <string name="global_action_lock" msgid="2844945191792119712">"Screen lock"</string>
+ <string name="global_action_power_off" msgid="4471879440839879722">"Power off"</string>
+ <string name="global_action_emergency" msgid="7112311161137421166">"Emergency"</string>
+ <string name="global_action_bug_report" msgid="7934010578922304799">"Bug report"</string>
+ <string name="global_action_logout" msgid="935179188218826050">"End session"</string>
+ <string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
+ <string name="bugreport_title" msgid="2667494803742548533">"Take bug report"</string>
+ <string name="bugreport_message" msgid="398447048750350456">"This will collect information about your current device state, to send as an e-mail message. It will take a little time from starting the bug report until it is ready to be sent; please be patient."</string>
+ <string name="bugreport_option_interactive_title" msgid="8635056131768862479">"Interactive report"</string>
+ <string name="bugreport_option_interactive_summary" msgid="229299488536107968">"Use this under most circumstances. It allows you to track progress of the report, enter more details about the problem, and take screenshots. It might omit some less-used sections that take a long time to report."</string>
+ <string name="bugreport_option_full_title" msgid="6354382025840076439">"Full report"</string>
+ <string name="bugreport_option_full_summary" msgid="7210859858969115745">"Use this option for minimal system interference when your device is unresponsive or too slow, or when you need all report sections. Does not allow you to enter more details or take additional screenshots."</string>
<plurals name="bugreport_countdown" formatted="false" msgid="6878900193900090368">
- <item quantity="other">Taking screenshot for bug report in <xliff:g id="NUMBER_1">%d</xliff:g> seconds.</item>
- <item quantity="one">Taking screenshot for bug report in <xliff:g id="NUMBER_0">%d</xliff:g> second.</item>
+ <item quantity="other">Taking screenshot for bug report in <xliff:g id="NUMBER_1">%d</xliff:g> seconds.</item>
+ <item quantity="one">Taking screenshot for bug report in <xliff:g id="NUMBER_0">%d</xliff:g> second.</item>
</plurals>
- <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Silent mode"</string>
- <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Sound is OFF"</string>
- <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"Sound is ON"</string>
- <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Airplane mode"</string>
- <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Airplane mode is ON"</string>
- <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Airplane mode is OFF"</string>
- <string name="global_action_settings" msgid="1756531602592545966">"Settings"</string>
- <string name="global_action_assist" msgid="3892832961594295030">"Assist"</string>
- <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string>
- <string name="global_action_lockdown" msgid="1099326950891078929">"Lockdown"</string>
- <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
- <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string>
- <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string>
- <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Physical keyboard"</string>
- <string name="notification_channel_security" msgid="7345516133431326347">"Security"</string>
- <string name="notification_channel_car_mode" msgid="3553380307619874564">"Car mode"</string>
- <string name="notification_channel_account" msgid="7577959168463122027">"Account status"</string>
- <string name="notification_channel_developer" msgid="7579606426860206060">"Developer messages"</string>
- <string name="notification_channel_updates" msgid="4794517569035110397">"Updates"</string>
- <string name="notification_channel_network_status" msgid="5025648583129035447">"Network status"</string>
- <string name="notification_channel_network_alerts" msgid="2895141221414156525">"Network alerts"</string>
- <string name="notification_channel_network_available" msgid="4531717914138179517">"Network available"</string>
- <string name="notification_channel_vpn" msgid="8330103431055860618">"VPN status"</string>
- <string name="notification_channel_device_admin" msgid="1568154104368069249">"Device administration"</string>
- <string name="notification_channel_alerts" msgid="4496839309318519037">"Alerts"</string>
- <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Retail demo"</string>
- <string name="notification_channel_usb" msgid="9006850475328924681">"USB connection"</string>
- <string name="notification_channel_heavy_weight_app" msgid="6218742927792852607">"App running"</string>
- <string name="notification_channel_foreground_service" msgid="3931987440602669158">"Apps consuming battery"</string>
- <string name="foreground_service_app_in_background" msgid="1060198778219731292">"<xliff:g id="APP_NAME">%1$s</xliff:g> is using battery"</string>
- <string name="foreground_service_apps_in_background" msgid="7175032677643332242">"<xliff:g id="NUMBER">%1$d</xliff:g> apps are using battery"</string>
- <string name="foreground_service_tap_for_details" msgid="372046743534354644">"Tap for details on battery and data usage"</string>
- <string name="foreground_service_multiple_separator" msgid="4021901567939866542">"<xliff:g id="LEFT_SIDE">%1$s</xliff:g>, <xliff:g id="RIGHT_SIDE">%2$s</xliff:g>"</string>
- <string name="safeMode" msgid="2788228061547930246">"Safe mode"</string>
- <string name="android_system_label" msgid="6577375335728551336">"Android System"</string>
- <string name="user_owner_label" msgid="8836124313744349203">"Switch to personal profile"</string>
- <string name="managed_profile_label" msgid="8947929265267690522">"Switch to work profile"</string>
- <string name="permgrouplab_contacts" msgid="3657758145679177612">"Contacts"</string>
- <string name="permgroupdesc_contacts" msgid="6951499528303668046">"access your contacts"</string>
- <string name="permgrouprequest_contacts" msgid="6032805601881764300">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access your contacts?"</string>
- <string name="permgrouplab_location" msgid="7275582855722310164">"Location"</string>
- <string name="permgroupdesc_location" msgid="1346617465127855033">"access this device\'s location"</string>
- <string name="permgrouprequest_location" msgid="3788275734953323491">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access this device\'s location?"</string>
- <string name="permgrouprequestdetail_location" msgid="1113400215566814664">"The app will only have access to the location while you’re using the app."</string>
- <string name="permgroupbackgroundrequest_location" msgid="8461841153030844390">"Always allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access this device’s location?"</string>
- <string name="permgroupbackgroundrequestdetail_location" msgid="1715668276378108654">"The app will always have access to the location, even when you’re not using the app."</string>
- <string name="permgrouplab_calendar" msgid="5863508437783683902">"Calendar"</string>
- <string name="permgroupdesc_calendar" msgid="3889615280211184106">"access your calendar"</string>
- <string name="permgrouprequest_calendar" msgid="289900767793189421">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access your calendar?"</string>
- <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string>
- <string name="permgroupdesc_sms" msgid="4656988620100940350">"send and view SMS messages"</string>
- <string name="permgrouprequest_sms" msgid="7168124215838204719">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to send and view SMS messages?"</string>
- <string name="permgrouplab_storage" msgid="1971118770546336966">"Storage"</string>
- <string name="permgroupdesc_storage" msgid="637758554581589203">"access photos, media, and files on your device"</string>
- <string name="permgrouprequest_storage" msgid="7885942926944299560">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access photos, media, and files on your device?"</string>
- <string name="permgrouplab_microphone" msgid="171539900250043464">"Microphone"</string>
- <string name="permgroupdesc_microphone" msgid="4988812113943554584">"record audio"</string>
- <string name="permgrouprequest_microphone" msgid="9167492350681916038">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to record audio?"</string>
- <string name="permgrouplab_activityRecognition" msgid="2838596644535616493">"Activity recognition"</string>
- <string name="permgroupdesc_activityRecognition" msgid="7672248027571522602">"recognize activity"</string>
- <string name="permgrouprequest_activityRecognition" msgid="8121253142311250055">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to recognize your physical activity?"</string>
- <string name="permgrouplab_camera" msgid="4820372495894586615">"Camera"</string>
- <string name="permgroupdesc_camera" msgid="3250611594678347720">"take pictures and record video"</string>
- <string name="permgrouprequest_camera" msgid="1299833592069671756">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to take pictures and record video?"</string>
- <string name="permgrouplab_calllog" msgid="8798646184930388160">"Call logs"</string>
- <string name="permgroupdesc_calllog" msgid="3006237336748283775">"read and write phone call log"</string>
- <string name="permgrouprequest_calllog" msgid="8487355309583773267">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access your phone call logs?"</string>
- <string name="permgrouplab_phone" msgid="5229115638567440675">"Phone"</string>
- <string name="permgroupdesc_phone" msgid="6234224354060641055">"make and manage phone calls"</string>
- <string name="permgrouprequest_phone" msgid="9166979577750581037">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to make and manage phone calls?"</string>
- <string name="permgrouplab_sensors" msgid="416037179223226722">"Body Sensors"</string>
- <string name="permgroupdesc_sensors" msgid="7147968539346634043">"access sensor data about your vital signs"</string>
- <string name="permgrouprequest_sensors" msgid="6349806962814556786">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access sensor data about your vital signs?"</string>
- <string name="permgrouplab_aural" msgid="965607064083134896">"Music"</string>
- <string name="permgroupdesc_aural" msgid="4870189506255958055">"access your music"</string>
- <string name="permgrouprequest_aural" msgid="6787926123071735620">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access your music?"</string>
- <string name="permgrouplab_visual" msgid="8030190588123857921">"Photos & Videos"</string>
- <string name="permgroupdesc_visual" msgid="3415827902566663546">"access your photos & videos"</string>
- <string name="permgrouprequest_visual" msgid="6907523945030290376">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access your photos & videos?"</string>
- <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Retrieve window content"</string>
- <string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"Inspect the content of a window you\'re interacting with."</string>
- <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Turn on Explore by Touch"</string>
- <string name="capability_desc_canRequestTouchExploration" msgid="7543249041581408313">"Tapped items will be spoken aloud and the screen can be explored using gestures."</string>
- <string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observe text you type"</string>
- <string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Includes personal data such as credit card numbers and passwords."</string>
- <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Control display magnification"</string>
- <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Control the display\'s zoom level and positioning."</string>
- <string name="capability_title_canPerformGestures" msgid="7418984730362576862">"Perform gestures"</string>
- <string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"Can tap, swipe, pinch, and perform other gestures."</string>
- <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"Fingerprint gestures"</string>
- <string name="capability_desc_canCaptureFingerprintGestures" msgid="4386487962402228670">"Can capture gestures performed on the device\'s fingerprint sensor."</string>
- <string name="permlab_statusBar" msgid="7417192629601890791">"disable or modify status bar"</string>
- <string name="permdesc_statusBar" msgid="8434669549504290975">"Allows the app to disable the status bar or add and remove system icons."</string>
- <string name="permlab_statusBarService" msgid="4826835508226139688">"be the status bar"</string>
- <string name="permdesc_statusBarService" msgid="716113660795976060">"Allows the app to be the status bar."</string>
- <string name="permlab_expandStatusBar" msgid="1148198785937489264">"expand/collapse status bar"</string>
- <string name="permdesc_expandStatusBar" msgid="6917549437129401132">"Allows the app to expand or collapse the status bar."</string>
- <string name="permlab_install_shortcut" msgid="4279070216371564234">"install shortcuts"</string>
- <string name="permdesc_install_shortcut" msgid="8341295916286736996">"Allows an application to add Homescreen shortcuts without user intervention."</string>
- <string name="permlab_uninstall_shortcut" msgid="4729634524044003699">"uninstall shortcuts"</string>
- <string name="permdesc_uninstall_shortcut" msgid="6745743474265057975">"Allows the application to remove Homescreen shortcuts without user intervention."</string>
- <string name="permlab_processOutgoingCalls" msgid="3906007831192990946">"reroute outgoing calls"</string>
- <string name="permdesc_processOutgoingCalls" msgid="5156385005547315876">"Allows the app to see the number being dialed during an outgoing call with the option to redirect the call to a different number or abort the call altogether."</string>
- <string name="permlab_answerPhoneCalls" msgid="4077162841226223337">"answer phone calls"</string>
- <string name="permdesc_answerPhoneCalls" msgid="2901889867993572266">"Allows the app to answer an incoming phone call."</string>
- <string name="permlab_receiveSms" msgid="8673471768947895082">"receive text messages (SMS)"</string>
- <string name="permdesc_receiveSms" msgid="6424387754228766939">"Allows the app to receive and process SMS messages. This means the app could monitor or delete messages sent to your device without showing them to you."</string>
- <string name="permlab_receiveMms" msgid="1821317344668257098">"receive text messages (MMS)"</string>
- <string name="permdesc_receiveMms" msgid="533019437263212260">"Allows the app to receive and process MMS messages. This means the app could monitor or delete messages sent to your device without showing them to you."</string>
- <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"read cell broadcast messages"</string>
- <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Allows the app to read cell broadcast messages received by your device. Cell broadcast alerts are delivered in some locations to warn you of emergency situations. Malicious apps may interfere with the performance or operation of your device when an emergency cell broadcast is received."</string>
- <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"read subscribed feeds"</string>
- <string name="permdesc_subscribedFeedsRead" msgid="5557058907906144505">"Allows the app to get details about the currently synced feeds."</string>
- <string name="permlab_sendSms" msgid="7544599214260982981">"send and view SMS messages"</string>
- <string name="permdesc_sendSms" msgid="7094729298204937667">"Allows the app to send SMS messages. This may result in unexpected charges. Malicious apps may cost you money by sending messages without your confirmation."</string>
- <string name="permlab_readSms" msgid="8745086572213270480">"read your text messages (SMS or MMS)"</string>
- <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"This app can read all SMS (text) messages stored on your tablet."</string>
- <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"This app can read all SMS (text) messages stored on your TV."</string>
- <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"This app can read all SMS (text) messages stored on your phone."</string>
- <string name="permlab_receiveWapPush" msgid="5991398711936590410">"receive text messages (WAP)"</string>
- <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Allows the app to receive and process WAP messages. This permission includes the ability to monitor or delete messages sent to you without showing them to you."</string>
- <string name="permlab_getTasks" msgid="6466095396623933906">"retrieve running apps"</string>
- <string name="permdesc_getTasks" msgid="7454215995847658102">"Allows the app to retrieve information about currently and recently running tasks. This may allow the app to discover information about which applications are used on the device."</string>
- <string name="permlab_manageProfileAndDeviceOwners" msgid="7918181259098220004">"manage profile and device owners"</string>
- <string name="permdesc_manageProfileAndDeviceOwners" msgid="106894851498657169">"Allows apps to set the profile owners and the device owner."</string>
- <string name="permlab_reorderTasks" msgid="2018575526934422779">"reorder running apps"</string>
- <string name="permdesc_reorderTasks" msgid="7734217754877439351">"Allows the app to move tasks to the foreground and background. The app may do this without your input."</string>
- <string name="permlab_enableCarMode" msgid="5684504058192921098">"enable car mode"</string>
- <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Allows the app to enable the car mode."</string>
- <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"close other apps"</string>
- <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Allows the app to end background processes of other apps. This may cause other apps to stop running."</string>
- <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"This app can appear on top of other apps"</string>
- <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"This app can appear on top of other apps or other parts of the screen. This may interfere with normal app usage and change the way that other apps appear."</string>
- <string name="permlab_runInBackground" msgid="7365290743781858803">"run in the background"</string>
- <string name="permdesc_runInBackground" msgid="7370142232209999824">"This app can run in the background. This may drain battery faster."</string>
- <string name="permlab_useDataInBackground" msgid="8694951340794341809">"use data in the background"</string>
- <string name="permdesc_useDataInBackground" msgid="6049514223791806027">"This app can use data in the background. This may increase data usage."</string>
- <string name="permlab_persistentActivity" msgid="8841113627955563938">"make app always run"</string>
- <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the tablet."</string>
- <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the TV."</string>
- <string name="permdesc_persistentActivity" product="default" msgid="4384760047508278272">"Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the phone."</string>
- <string name="permlab_foregroundService" msgid="3310786367649133115">"run foreground service"</string>
- <string name="permdesc_foregroundService" msgid="6471634326171344622">"Allows the app to make use of foreground services."</string>
- <string name="permlab_getPackageSize" msgid="7472921768357981986">"measure app storage space"</string>
- <string name="permdesc_getPackageSize" msgid="3921068154420738296">"Allows the app to retrieve its code, data, and cache sizes"</string>
- <string name="permlab_writeSettings" msgid="2226195290955224730">"modify system settings"</string>
- <string name="permdesc_writeSettings" msgid="7775723441558907181">"Allows the app to modify the system\'s settings data. Malicious apps may corrupt your system\'s configuration."</string>
- <string name="permlab_receiveBootCompleted" msgid="5312965565987800025">"run at startup"</string>
- <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"Allows the app to have itself started as soon as the system has finished booting. This can make it take longer to start the tablet and allow the app to slow down the overall tablet by always running."</string>
- <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"Allows the app to have itself started as soon as the system has finished booting. This can make it take longer to start the TV and allow the app to slow down the overall tablet by always running."</string>
- <string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"Allows the app to have itself started as soon as the system has finished booting. This can make it take longer to start the phone and allow the app to slow down the overall phone by always running."</string>
- <string name="permlab_broadcastSticky" msgid="7919126372606881614">"send sticky broadcast"</string>
- <string name="permdesc_broadcastSticky" product="tablet" msgid="7749760494399915651">"Allows the app to send sticky broadcasts, which remain after the broadcast ends. Excessive use may make the tablet slow or unstable by causing it to use too much memory."</string>
- <string name="permdesc_broadcastSticky" product="tv" msgid="6839285697565389467">"Allows the app to send sticky broadcasts, which remain after the broadcast ends. Excessive use may make the TV slow or unstable by causing it to use too much memory."</string>
- <string name="permdesc_broadcastSticky" product="default" msgid="2825803764232445091">"Allows the app to send sticky broadcasts, which remain after the broadcast ends. Excessive use may make the phone slow or unstable by causing it to use too much memory."</string>
- <string name="permlab_readContacts" msgid="8348481131899886131">"read your contacts"</string>
- <string name="permdesc_readContacts" product="tablet" msgid="5294866856941149639">"Allows the app to read data about your contacts stored on your tablet, including the frequency with which you\'ve called, emailed, or communicated in other ways with specific individuals. This permission allows apps to save your contact data, and malicious apps may share contact data without your knowledge."</string>
- <string name="permdesc_readContacts" product="tv" msgid="1839238344654834087">"Allows the app to read data about your contacts stored on your TV, including the frequency with which you\'ve called, emailed, or communicated in other ways with specific individuals. This permission allows apps to save your contact data, and malicious apps may share contact data without your knowledge."</string>
- <string name="permdesc_readContacts" product="default" msgid="8440654152457300662">"Allows the app to read data about your contacts stored on your phone, including the frequency with which you\'ve called, emailed, or communicated in other ways with specific individuals. This permission allows apps to save your contact data, and malicious apps may share contact data without your knowledge."</string>
- <string name="permlab_writeContacts" msgid="5107492086416793544">"modify your contacts"</string>
- <string name="permdesc_writeContacts" product="tablet" msgid="897243932521953602">"Allows the app to modify the data about your contacts stored on your tablet, including the frequency with which you\'ve called, emailed, or communicated in other ways with specific contacts. This permission allows apps to delete contact data."</string>
- <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Allows the app to modify the data about your contacts stored on your TV, including the frequency with which you\'ve called, emailed, or communicated in other ways with specific contacts. This permission allows apps to delete contact data."</string>
- <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Allows the app to modify the data about your contacts stored on your phone, including the frequency with which you\'ve called, emailed, or communicated in other ways with specific contacts. This permission allows apps to delete contact data."</string>
- <string name="permlab_readCallLog" msgid="3478133184624102739">"read call log"</string>
- <string name="permdesc_readCallLog" msgid="3204122446463552146">"This app can read your call history."</string>
- <string name="permlab_writeCallLog" msgid="8552045664743499354">"write call log"</string>
- <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Allows the app to modify your tablet\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string>
- <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Allows the app to modify your TV\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string>
- <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Allows the app to modify your phone\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string>
- <string name="permlab_bodySensors" msgid="4683341291818520277">"access body sensors (like heart rate monitors)"</string>
- <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Allows the app to access data from sensors that monitor your physical condition, such as your heart rate."</string>
- <string name="permlab_readCalendar" msgid="6716116972752441641">"Read calendar events and details"</string>
- <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"This app can read all calendar events stored on your tablet and share or save your calendar data."</string>
- <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"This app can read all calendar events stored on your TV and share or save your calendar data."</string>
- <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"This app can read all calendar events stored on your phone and share or save your calendar data."</string>
- <string name="permlab_writeCalendar" msgid="8438874755193825647">"add or modify calendar events and send email to guests without owners\' knowledge"</string>
- <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"This app can add, remove, or change calendar events on your tablet. This app can send messages that may appear to come from calendar owners, or change events without notifying their owners."</string>
- <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"This app can add, remove, or change calendar events on your TV. This app can send messages that may appear to come from calendar owners, or change events without notifying their owners."</string>
- <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"This app can add, remove, or change calendar events on your phone. This app can send messages that may appear to come from calendar owners, or change events without notifying their owners."</string>
- <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"access extra location provider commands"</string>
- <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Allows the app to access extra location provider commands. This may allow the app to interfere with the operation of the GPS or other location sources."</string>
- <string name="permlab_accessFineLocation" msgid="6265109654698562427">"access precise location only in the foreground"</string>
- <string name="permdesc_accessFineLocation" msgid="3520508381065331098">"This app can get your exact location only when it is in the foreground. These location services must be turned on and available on your phone for the app to be able to use them. This may increase battery consumption."</string>
- <string name="permlab_accessCoarseLocation" msgid="3707180371693213469">"access approximate location (network-based) only in the foreground"</string>
- <string name="permdesc_accessCoarseLocation" product="tablet" msgid="8594719010575779120">"This app can get your location based on network sources such as cell towers and Wi-Fi networks, but only when when the app is in the foreground. These location services must be turned on and available on your tablet for the app to be able to use them."</string>
- <string name="permdesc_accessCoarseLocation" product="tv" msgid="3027871910200890806">"This app can get your location based on network sources such as cell towers and Wi-Fi networks, but only when when the app is in the foreground. These location services must be turned on and available on your TV for the app to be able to use them."</string>
- <string name="permdesc_accessCoarseLocation" product="default" msgid="854896049371048754">"This app can get your location based on network sources such as cell towers and Wi-Fi networks, but only when the app is in the foreground. These location services must be turned on and available on your phone for the app to be able to use them."</string>
- <string name="permlab_accessBackgroundLocation" msgid="3965397804300661062">"access location in the background"</string>
- <string name="permdesc_accessBackgroundLocation" msgid="1096394429579210251">"If this is granted additionally to the approximate or precise location access the app can access the location while running in the background."</string>
- <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"change your audio settings"</string>
- <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Allows the app to modify global audio settings such as volume and which speaker is used for output."</string>
- <string name="permlab_recordAudio" msgid="3876049771427466323">"record audio"</string>
- <string name="permdesc_recordAudio" msgid="4245930455135321433">"This app can record audio using the microphone at any time."</string>
- <string name="permlab_sim_communication" msgid="2935852302216852065">"send commands to the SIM"</string>
- <string name="permdesc_sim_communication" msgid="5725159654279639498">"Allows the app to send commands to the SIM. This is very dangerous."</string>
- <string name="permlab_activityRecognition" msgid="3634590230567608356">"recognize physical activity"</string>
- <string name="permdesc_activityRecognition" msgid="3143453925156552894">"This app can recognize your physical activity."</string>
- <string name="permlab_camera" msgid="3616391919559751192">"take pictures and videos"</string>
- <string name="permdesc_camera" msgid="5392231870049240670">"This app can take pictures and record videos using the camera at any time."</string>
- <string name="permlab_vibrate" msgid="7696427026057705834">"control vibration"</string>
- <string name="permdesc_vibrate" msgid="6284989245902300945">"Allows the app to control the vibrator."</string>
- <string name="permlab_callPhone" msgid="3925836347681847954">"directly call phone numbers"</string>
- <string name="permdesc_callPhone" msgid="3740797576113760827">"Allows the app to call phone numbers without your intervention. This may result in unexpected charges or calls. Note that this doesn\'t allow the app to call emergency numbers. Malicious apps may cost you money by making calls without your confirmation."</string>
- <string name="permlab_accessImsCallService" msgid="3574943847181793918">"access IMS call service"</string>
- <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"Allows the app to use the IMS service to make calls without your intervention."</string>
- <string name="permlab_readPhoneState" msgid="9178228524507610486">"read phone status and identity"</string>
- <string name="permdesc_readPhoneState" msgid="1639212771826125528">"Allows the app to access the phone features of the device. This permission allows the app to determine the phone number and device IDs, whether a call is active, and the remote number connected by a call."</string>
- <string name="permlab_manageOwnCalls" msgid="1503034913274622244">"route calls through the system"</string>
- <string name="permdesc_manageOwnCalls" msgid="6552974537554717418">"Allows the app to route its calls through the system in order to improve the calling experience."</string>
- <string name="permlab_callCompanionApp" msgid="3599252979411970473">"see and control calls through the system."</string>
- <string name="permdesc_callCompanionApp" msgid="4567344683275099090">"Allows the app to see and control ongoing calls on the device. This includes information such as call numbers for calls and the state of the calls."</string>
- <string name="permlab_acceptHandover" msgid="2661534649736022409">"continue a call from another app"</string>
- <string name="permdesc_acceptHandovers" msgid="4570660484220539698">"Allows the app to continue a call which was started in another app."</string>
- <string name="permlab_readPhoneNumbers" msgid="6108163940932852440">"read phone numbers"</string>
- <string name="permdesc_readPhoneNumbers" msgid="8559488833662272354">"Allows the app to access the phone numbers of the device."</string>
- <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"prevent tablet from sleeping"</string>
- <string name="permlab_wakeLock" product="tv" msgid="2601193288949154131">"prevent TV from sleeping"</string>
- <string name="permlab_wakeLock" product="default" msgid="573480187941496130">"prevent phone from sleeping"</string>
- <string name="permdesc_wakeLock" product="tablet" msgid="7311319824400447868">"Allows the app to prevent the tablet from going to sleep."</string>
- <string name="permdesc_wakeLock" product="tv" msgid="3208534859208996974">"Allows the app to prevent the TV from going to sleep."</string>
- <string name="permdesc_wakeLock" product="default" msgid="8559100677372928754">"Allows the app to prevent the phone from going to sleep."</string>
- <string name="permlab_transmitIr" msgid="7545858504238530105">"transmit infrared"</string>
- <string name="permdesc_transmitIr" product="tablet" msgid="5358308854306529170">"Allows the app to use the tablet\'s infrared transmitter."</string>
- <string name="permdesc_transmitIr" product="tv" msgid="3926790828514867101">"Allows the app to use the TV\'s infrared transmitter."</string>
- <string name="permdesc_transmitIr" product="default" msgid="7957763745020300725">"Allows the app to use the phone\'s infrared transmitter."</string>
- <string name="permlab_setWallpaper" msgid="6627192333373465143">"set wallpaper"</string>
- <string name="permdesc_setWallpaper" msgid="7373447920977624745">"Allows the app to set the system wallpaper."</string>
- <string name="permlab_setWallpaperHints" msgid="3278608165977736538">"adjust your wallpaper size"</string>
- <string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"Allows the app to set the system wallpaper size hints."</string>
- <string name="permlab_setTimeZone" msgid="2945079801013077340">"set time zone"</string>
- <string name="permdesc_setTimeZone" product="tablet" msgid="1676983712315827645">"Allows the app to change the tablet\'s time zone."</string>
- <string name="permdesc_setTimeZone" product="tv" msgid="888864653946175955">"Allows the app to change the TV\'s time zone."</string>
- <string name="permdesc_setTimeZone" product="default" msgid="4499943488436633398">"Allows the app to change the phone\'s time zone."</string>
- <string name="permlab_getAccounts" msgid="1086795467760122114">"find accounts on the device"</string>
- <string name="permdesc_getAccounts" product="tablet" msgid="2741496534769660027">"Allows the app to get the list of accounts known by the tablet. This may include any accounts created by applications you have installed."</string>
- <string name="permdesc_getAccounts" product="tv" msgid="4190633395633907543">"Allows the app to get the list of accounts known by the TV. This may include any accounts created by applications you have installed."</string>
- <string name="permdesc_getAccounts" product="default" msgid="3448316822451807382">"Allows the app to get the list of accounts known by the phone. This may include any accounts created by applications you have installed."</string>
- <string name="permlab_accessNetworkState" msgid="4951027964348974773">"view network connections"</string>
- <string name="permdesc_accessNetworkState" msgid="8318964424675960975">"Allows the app to view information about network connections such as which networks exist and are connected."</string>
- <string name="permlab_createNetworkSockets" msgid="7934516631384168107">"have full network access"</string>
- <string name="permdesc_createNetworkSockets" msgid="3403062187779724185">"Allows the app to create network sockets and use custom network protocols. The browser and other applications provide means to send data to the internet, so this permission is not required to send data to the internet."</string>
- <string name="permlab_changeNetworkState" msgid="958884291454327309">"change network connectivity"</string>
- <string name="permdesc_changeNetworkState" msgid="6789123912476416214">"Allows the app to change the state of network connectivity."</string>
- <string name="permlab_changeTetherState" msgid="5952584964373017960">"change tethered connectivity"</string>
- <string name="permdesc_changeTetherState" msgid="1524441344412319780">"Allows the app to change the state of tethered network connectivity."</string>
- <string name="permlab_accessWifiState" msgid="5202012949247040011">"view Wi-Fi connections"</string>
- <string name="permdesc_accessWifiState" msgid="5002798077387803726">"Allows the app to view information about Wi-Fi networking, such as whether Wi-Fi is enabled and name of connected Wi-Fi devices."</string>
- <string name="permlab_changeWifiState" msgid="6550641188749128035">"connect and disconnect from Wi-Fi"</string>
- <string name="permdesc_changeWifiState" msgid="7137950297386127533">"Allows the app to connect to and disconnect from Wi-Fi access points and to make changes to device configuration for Wi-Fi networks."</string>
- <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"allow Wi-Fi Multicast reception"</string>
- <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"Allows the app to receive packets sent to all devices on a Wi-Fi network using multicast addresses, not just your tablet. It uses more power than the non-multicast mode."</string>
- <string name="permdesc_changeWifiMulticastState" product="tv" msgid="9031975661145014160">"Allows the app to receive packets sent to all devices on a Wi-Fi network using multicast addresses, not just your TV. It uses more power than the non-multicast mode."</string>
- <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"Allows the app to receive packets sent to all devices on a Wi-Fi network using multicast addresses, not just your phone. It uses more power than the non-multicast mode."</string>
- <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"access Bluetooth settings"</string>
- <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"Allows the app to configure the local Bluetooth tablet, and to discover and pair with remote devices."</string>
- <string name="permdesc_bluetoothAdmin" product="tv" msgid="3373125682645601429">"Allows the app to configure the local Bluetooth TV, and to discover and pair with remote devices."</string>
- <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"Allows the app to configure the local Bluetooth phone, and to discover and pair with remote devices."</string>
- <string name="permlab_accessWimaxState" msgid="4195907010610205703">"connect and disconnect from WiMAX"</string>
- <string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Allows the app to determine whether WiMAX is enabled and information about any WiMAX networks that are connected."</string>
- <string name="permlab_changeWimaxState" msgid="340465839241528618">"change WiMAX state"</string>
- <string name="permdesc_changeWimaxState" product="tablet" msgid="3156456504084201805">"Allows the app to connect the tablet to and disconnect the tablet from WiMAX networks."</string>
- <string name="permdesc_changeWimaxState" product="tv" msgid="6022307083934827718">"Allows the app to connect the TV to and disconnect the TV from WiMAX networks."</string>
- <string name="permdesc_changeWimaxState" product="default" msgid="697025043004923798">"Allows the app to connect the phone to and disconnect the phone from WiMAX networks."</string>
- <string name="permlab_bluetooth" msgid="6127769336339276828">"pair with Bluetooth devices"</string>
- <string name="permdesc_bluetooth" product="tablet" msgid="3480722181852438628">"Allows the app to view the configuration of Bluetooth on the tablet, and to make and accept connections with paired devices."</string>
- <string name="permdesc_bluetooth" product="tv" msgid="3974124940101104206">"Allows the app to view the configuration of Bluetooth on the TV, and to make and accept connections with paired devices."</string>
- <string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"Allows the app to view the configuration of the Bluetooth on the phone, and to make and accept connections with paired devices."</string>
- <string name="permlab_nfc" msgid="4423351274757876953">"control Near Field Communication"</string>
- <string name="permdesc_nfc" msgid="7120611819401789907">"Allows the app to communicate with Near Field Communication (NFC) tags, cards, and readers."</string>
- <string name="permlab_disableKeyguard" msgid="3598496301486439258">"disable your screen lock"</string>
- <string name="permdesc_disableKeyguard" msgid="6034203065077122992">"Allows the app to disable the keylock and any associated password security. For example, the phone disables the keylock when receiving an incoming phone call, then re-enables the keylock when the call is finished."</string>
- <string name="permlab_getAndRequestScreenLockComplexity" msgid="3911592334192005424">"get and request screen lock complexity"</string>
- <string name="permdesc_getAndRequestScreenLockComplexity" msgid="9045202063228854873">"Allows the app to learn the screen lock complexity level (high, medium, low or none), which indicates the possible range of length and type of the screen lock. The app can also suggest to users that they update the screen lock to a certain level but users can freely ignore and navigate away. Note that the screen lock is not stored in plaintext so the app does not know the exact password."</string>
- <string name="permlab_useBiometric" msgid="8837753668509919318">"use biometric hardware"</string>
- <string name="permdesc_useBiometric" msgid="8389855232721612926">"Allows the app to use biometric hardware for authentication"</string>
- <string name="permlab_manageFingerprint" msgid="5640858826254575638">"manage fingerprint hardware"</string>
- <string name="permdesc_manageFingerprint" msgid="178208705828055464">"Allows the app to invoke methods to add and delete fingerprint templates for use."</string>
- <string name="permlab_useFingerprint" msgid="3150478619915124905">"use fingerprint hardware"</string>
- <string name="permdesc_useFingerprint" msgid="9165097460730684114">"Allows the app to use fingerprint hardware for authentication"</string>
- <string name="permlab_audioRead" msgid="6617225220728465565">"read your music collection"</string>
- <string name="permdesc_audioRead" msgid="5034032570243484805">"Allows the app to read your music collection."</string>
- <string name="permlab_audioWrite" msgid="2661772059799779292">"modify your music collection"</string>
- <string name="permdesc_audioWrite" msgid="8888544708166230494">"Allows the app to modify your music collection."</string>
- <string name="permlab_videoRead" msgid="9182618678674737229">"read your video collection"</string>
- <string name="permdesc_videoRead" msgid="7045676429859396194">"Allows the app to read your video collection."</string>
- <string name="permlab_videoWrite" msgid="128769316366746446">"modify your video collection"</string>
- <string name="permdesc_videoWrite" msgid="5448565757490640841">"Allows the app to modify your video collection."</string>
- <string name="permlab_imagesRead" msgid="3015078545742665304">"read your photo collection"</string>
- <string name="permdesc_imagesRead" msgid="3144263806038695580">"Allows the app to read your photo collection."</string>
- <string name="permlab_imagesWrite" msgid="3391306186247235510">"modify your photo collection"</string>
- <string name="permdesc_imagesWrite" msgid="7073662756617474375">"Allows the app to modify your photo collection."</string>
- <string name="permlab_mediaLocation" msgid="8675148183726247864">"read locations from your media collection"</string>
- <string name="permdesc_mediaLocation" msgid="2237023389178865130">"Allows the app to read locations from your media collection."</string>
- <string name="biometric_dialog_default_title" msgid="4229778503907743328">"Application <xliff:g id="APP">%s</xliff:g> wants to authenticate."</string>
- <string name="biometric_error_hw_unavailable" msgid="645781226537551036">"Biometric hardware unavailable"</string>
- <string name="biometric_error_user_canceled" msgid="2260175018114348727">"Authentication canceled"</string>
- <string name="biometric_not_recognized" msgid="5770511773560736082">"Not recognized"</string>
- <string name="biometric_error_canceled" msgid="349665227864885880">"Authentication canceled"</string>
- <string name="fingerprint_acquired_partial" msgid="735082772341716043">"Partial fingerprint detected. Please try again."</string>
- <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"Couldn\'t process fingerprint. Please try again."</string>
- <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"Fingerprint sensor is dirty. Please clean and try again."</string>
- <string name="fingerprint_acquired_too_fast" msgid="6470642383109155969">"Finger moved too fast. Please try again."</string>
- <string name="fingerprint_acquired_too_slow" msgid="59250885689661653">"Finger moved too slow. Please try again."</string>
+ <string name="global_action_toggle_silent_mode" msgid="8219525344246810925">"Silent mode"</string>
+ <string name="global_action_silent_mode_on_status" msgid="3289841937003758806">"Sound is OFF"</string>
+ <string name="global_action_silent_mode_off_status" msgid="1506046579177066419">"Sound is ON"</string>
+ <string name="global_actions_toggle_airplane_mode" msgid="5884330306926307456">"Airplane mode"</string>
+ <string name="global_actions_airplane_mode_on_status" msgid="2719557982608919750">"Airplane mode is ON"</string>
+ <string name="global_actions_airplane_mode_off_status" msgid="5075070442854490296">"Airplane mode is OFF"</string>
+ <string name="global_action_settings" msgid="1756531602592545966">"Settings"</string>
+ <string name="global_action_assist" msgid="3892832961594295030">"Assist"</string>
+ <string name="global_action_voice_assist" msgid="7751191495200504480">"Voice Assist"</string>
+ <string name="global_action_lockdown" msgid="1099326950891078929">"Lockdown"</string>
+ <string name="status_bar_notification_info_overflow" msgid="5301981741705354993">"999+"</string>
+ <string name="notification_hidden_text" msgid="6351207030447943784">"New notification"</string>
+ <string name="notification_channel_virtual_keyboard" msgid="6969925135507955575">"Virtual keyboard"</string>
+ <string name="notification_channel_physical_keyboard" msgid="7297661826966861459">"Physical keyboard"</string>
+ <string name="notification_channel_security" msgid="7345516133431326347">"Security"</string>
+ <string name="notification_channel_car_mode" msgid="3553380307619874564">"Car mode"</string>
+ <string name="notification_channel_account" msgid="7577959168463122027">"Account status"</string>
+ <string name="notification_channel_developer" msgid="7579606426860206060">"Developer messages"</string>
+ <string name="notification_channel_updates" msgid="4794517569035110397">"Updates"</string>
+ <string name="notification_channel_network_status" msgid="5025648583129035447">"Network status"</string>
+ <string name="notification_channel_network_alerts" msgid="2895141221414156525">"Network alerts"</string>
+ <string name="notification_channel_network_available" msgid="4531717914138179517">"Network available"</string>
+ <string name="notification_channel_vpn" msgid="8330103431055860618">"VPN status"</string>
+ <string name="notification_channel_device_admin" msgid="1568154104368069249">"Device administration"</string>
+ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alerts"</string>
+ <string name="notification_channel_retail_mode" msgid="6088920674914038779">"Retail demo"</string>
+ <string name="notification_channel_usb" msgid="9006850475328924681">"USB connection"</string>
+ <string name="notification_channel_heavy_weight_app" msgid="6218742927792852607">"App running"</string>
+ <string name="notification_channel_foreground_service" msgid="3931987440602669158">"Apps consuming battery"</string>
+ <string name="foreground_service_app_in_background" msgid="1060198778219731292">"<xliff:g id="APP_NAME">%1$s</xliff:g> is using battery"</string>
+ <string name="foreground_service_apps_in_background" msgid="7175032677643332242">"<xliff:g id="NUMBER">%1$d</xliff:g> apps are using battery"</string>
+ <string name="foreground_service_tap_for_details" msgid="372046743534354644">"Tap for details on battery and data usage"</string>
+ <string name="foreground_service_multiple_separator" msgid="4021901567939866542">"<xliff:g id="LEFT_SIDE">%1$s</xliff:g>, <xliff:g id="RIGHT_SIDE">%2$s</xliff:g>"</string>
+ <string name="safeMode" msgid="2788228061547930246">"Safe mode"</string>
+ <string name="android_system_label" msgid="6577375335728551336">"Android System"</string>
+ <string name="user_owner_label" msgid="8836124313744349203">"Switch to personal profile"</string>
+ <string name="managed_profile_label" msgid="8947929265267690522">"Switch to work profile"</string>
+ <string name="permgrouplab_contacts" msgid="3657758145679177612">"Contacts"</string>
+ <string name="permgroupdesc_contacts" msgid="6951499528303668046">"access your contacts"</string>
+ <string name="permgrouprequest_contacts" msgid="6032805601881764300">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access your contacts?"</string>
+ <string name="permgrouplab_location" msgid="7275582855722310164">"Location"</string>
+ <string name="permgroupdesc_location" msgid="1346617465127855033">"access this device\'s location"</string>
+ <string name="permgrouprequest_location" msgid="3788275734953323491">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access this device\'s location?"</string>
+ <string name="permgrouprequestdetail_location" msgid="1113400215566814664">"The app will only have access to the location while you’re using the app."</string>
+ <string name="permgroupbackgroundrequest_location" msgid="8461841153030844390">"Always allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access this device’s location?"</string>
+ <string name="permgroupbackgroundrequestdetail_location" msgid="1715668276378108654">"The app will always have access to the location, even when you’re not using the app."</string>
+ <string name="permgrouplab_calendar" msgid="5863508437783683902">"Calendar"</string>
+ <string name="permgroupdesc_calendar" msgid="3889615280211184106">"access your calendar"</string>
+ <string name="permgrouprequest_calendar" msgid="289900767793189421">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access your calendar?"</string>
+ <string name="permgrouplab_sms" msgid="228308803364967808">"SMS"</string>
+ <string name="permgroupdesc_sms" msgid="4656988620100940350">"send and view SMS messages"</string>
+ <string name="permgrouprequest_sms" msgid="7168124215838204719">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to send and view SMS messages?"</string>
+ <string name="permgrouplab_storage" msgid="1971118770546336966">"Storage"</string>
+ <string name="permgroupdesc_storage" msgid="637758554581589203">"access photos, media, and files on your device"</string>
+ <string name="permgrouprequest_storage" msgid="7885942926944299560">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access photos, media, and files on your device?"</string>
+ <string name="permgrouplab_microphone" msgid="171539900250043464">"Microphone"</string>
+ <string name="permgroupdesc_microphone" msgid="4988812113943554584">"record audio"</string>
+ <string name="permgrouprequest_microphone" msgid="9167492350681916038">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to record audio?"</string>
+ <string name="permgrouplab_activityRecognition" msgid="2838596644535616493">"Activity recognition"</string>
+ <string name="permgroupdesc_activityRecognition" msgid="7672248027571522602">"recognize activity"</string>
+ <string name="permgrouprequest_activityRecognition" msgid="8121253142311250055">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to recognize your physical activity?"</string>
+ <string name="permgrouplab_camera" msgid="4820372495894586615">"Camera"</string>
+ <string name="permgroupdesc_camera" msgid="3250611594678347720">"take pictures and record video"</string>
+ <string name="permgrouprequest_camera" msgid="1299833592069671756">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to take pictures and record video?"</string>
+ <string name="permgrouplab_calllog" msgid="8798646184930388160">"Call logs"</string>
+ <string name="permgroupdesc_calllog" msgid="3006237336748283775">"read and write phone call log"</string>
+ <string name="permgrouprequest_calllog" msgid="8487355309583773267">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access your phone call logs?"</string>
+ <string name="permgrouplab_phone" msgid="5229115638567440675">"Phone"</string>
+ <string name="permgroupdesc_phone" msgid="6234224354060641055">"make and manage phone calls"</string>
+ <string name="permgrouprequest_phone" msgid="9166979577750581037">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to make and manage phone calls?"</string>
+ <string name="permgrouplab_sensors" msgid="416037179223226722">"Body Sensors"</string>
+ <string name="permgroupdesc_sensors" msgid="7147968539346634043">"access sensor data about your vital signs"</string>
+ <string name="permgrouprequest_sensors" msgid="6349806962814556786">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access sensor data about your vital signs?"</string>
+ <string name="permgrouplab_aural" msgid="965607064083134896">"Music"</string>
+ <string name="permgroupdesc_aural" msgid="4870189506255958055">"access your music"</string>
+ <string name="permgrouprequest_aural" msgid="6787926123071735620">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access your music?"</string>
+ <string name="permgrouplab_visual" msgid="8030190588123857921">"Photos & Videos"</string>
+ <string name="permgroupdesc_visual" msgid="3415827902566663546">"access your photos & videos"</string>
+ <string name="permgrouprequest_visual" msgid="6907523945030290376">"Allow <b><xliff:g id="APP_NAME">%1$s</xliff:g></b> to access your photos & videos?"</string>
+ <string name="capability_title_canRetrieveWindowContent" msgid="3901717936930170320">"Retrieve window content"</string>
+ <string name="capability_desc_canRetrieveWindowContent" msgid="3772225008605310672">"Inspect the content of a window you\'re interacting with."</string>
+ <string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"Turn on Explore by Touch"</string>
+ <string name="capability_desc_canRequestTouchExploration" msgid="7543249041581408313">"Tapped items will be spoken aloud and the screen can be explored using gestures."</string>
+ <string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Observe text you type"</string>
+ <string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Includes personal data such as credit card numbers and passwords."</string>
+ <string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Control display magnification"</string>
+ <string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Control the display\'s zoom level and positioning."</string>
+ <string name="capability_title_canPerformGestures" msgid="7418984730362576862">"Perform gestures"</string>
+ <string name="capability_desc_canPerformGestures" msgid="8296373021636981249">"Can tap, swipe, pinch, and perform other gestures."</string>
+ <string name="capability_title_canCaptureFingerprintGestures" msgid="6309568287512278670">"Fingerprint gestures"</string>
+ <string name="capability_desc_canCaptureFingerprintGestures" msgid="4386487962402228670">"Can capture gestures performed on the device\'s fingerprint sensor."</string>
+ <string name="permlab_statusBar" msgid="7417192629601890791">"disable or modify status bar"</string>
+ <string name="permdesc_statusBar" msgid="8434669549504290975">"Allows the app to disable the status bar or add and remove system icons."</string>
+ <string name="permlab_statusBarService" msgid="4826835508226139688">"be the status bar"</string>
+ <string name="permdesc_statusBarService" msgid="716113660795976060">"Allows the app to be the status bar."</string>
+ <string name="permlab_expandStatusBar" msgid="1148198785937489264">"expand/collapse status bar"</string>
+ <string name="permdesc_expandStatusBar" msgid="6917549437129401132">"Allows the app to expand or collapse the status bar."</string>
+ <string name="permlab_install_shortcut" msgid="4279070216371564234">"install shortcuts"</string>
+ <string name="permdesc_install_shortcut" msgid="8341295916286736996">"Allows an application to add Homescreen shortcuts without user intervention."</string>
+ <string name="permlab_uninstall_shortcut" msgid="4729634524044003699">"uninstall shortcuts"</string>
+ <string name="permdesc_uninstall_shortcut" msgid="6745743474265057975">"Allows the application to remove Homescreen shortcuts without user intervention."</string>
+ <string name="permlab_processOutgoingCalls" msgid="3906007831192990946">"reroute outgoing calls"</string>
+ <string name="permdesc_processOutgoingCalls" msgid="5156385005547315876">"Allows the app to see the number being dialed during an outgoing call with the option to redirect the call to a different number or abort the call altogether."</string>
+ <string name="permlab_answerPhoneCalls" msgid="4077162841226223337">"answer phone calls"</string>
+ <string name="permdesc_answerPhoneCalls" msgid="2901889867993572266">"Allows the app to answer an incoming phone call."</string>
+ <string name="permlab_receiveSms" msgid="8673471768947895082">"receive text messages (SMS)"</string>
+ <string name="permdesc_receiveSms" msgid="6424387754228766939">"Allows the app to receive and process SMS messages. This means the app could monitor or delete messages sent to your device without showing them to you."</string>
+ <string name="permlab_receiveMms" msgid="1821317344668257098">"receive text messages (MMS)"</string>
+ <string name="permdesc_receiveMms" msgid="533019437263212260">"Allows the app to receive and process MMS messages. This means the app could monitor or delete messages sent to your device without showing them to you."</string>
+ <string name="permlab_readCellBroadcasts" msgid="1598328843619646166">"read cell broadcast messages"</string>
+ <string name="permdesc_readCellBroadcasts" msgid="6361972776080458979">"Allows the app to read cell broadcast messages received by your device. Cell broadcast alerts are delivered in some locations to warn you of emergency situations. Malicious apps may interfere with the performance or operation of your device when an emergency cell broadcast is received."</string>
+ <string name="permlab_subscribedFeedsRead" msgid="4756609637053353318">"read subscribed feeds"</string>
+ <string name="permdesc_subscribedFeedsRead" msgid="5557058907906144505">"Allows the app to get details about the currently synced feeds."</string>
+ <string name="permlab_sendSms" msgid="7544599214260982981">"send and view SMS messages"</string>
+ <string name="permdesc_sendSms" msgid="7094729298204937667">"Allows the app to send SMS messages. This may result in unexpected charges. Malicious apps may cost you money by sending messages without your confirmation."</string>
+ <string name="permlab_readSms" msgid="8745086572213270480">"read your text messages (SMS or MMS)"</string>
+ <string name="permdesc_readSms" product="tablet" msgid="4741697454888074891">"This app can read all SMS (text) messages stored on your tablet."</string>
+ <string name="permdesc_readSms" product="tv" msgid="5796670395641116592">"This app can read all SMS (text) messages stored on your TV."</string>
+ <string name="permdesc_readSms" product="default" msgid="6826832415656437652">"This app can read all SMS (text) messages stored on your phone."</string>
+ <string name="permlab_receiveWapPush" msgid="5991398711936590410">"receive text messages (WAP)"</string>
+ <string name="permdesc_receiveWapPush" msgid="748232190220583385">"Allows the app to receive and process WAP messages. This permission includes the ability to monitor or delete messages sent to you without showing them to you."</string>
+ <string name="permlab_getTasks" msgid="6466095396623933906">"retrieve running apps"</string>
+ <string name="permdesc_getTasks" msgid="7454215995847658102">"Allows the app to retrieve information about currently and recently running tasks. This may allow the app to discover information about which applications are used on the device."</string>
+ <string name="permlab_manageProfileAndDeviceOwners" msgid="7918181259098220004">"manage profile and device owners"</string>
+ <string name="permdesc_manageProfileAndDeviceOwners" msgid="106894851498657169">"Allows apps to set the profile owners and the device owner."</string>
+ <string name="permlab_reorderTasks" msgid="2018575526934422779">"reorder running apps"</string>
+ <string name="permdesc_reorderTasks" msgid="7734217754877439351">"Allows the app to move tasks to the foreground and background. The app may do this without your input."</string>
+ <string name="permlab_enableCarMode" msgid="5684504058192921098">"enable car mode"</string>
+ <string name="permdesc_enableCarMode" msgid="4853187425751419467">"Allows the app to enable the car mode."</string>
+ <string name="permlab_killBackgroundProcesses" msgid="3914026687420177202">"close other apps"</string>
+ <string name="permdesc_killBackgroundProcesses" msgid="4593353235959733119">"Allows the app to end background processes of other apps. This may cause other apps to stop running."</string>
+ <string name="permlab_systemAlertWindow" msgid="7238805243128138690">"This app can appear on top of other apps"</string>
+ <string name="permdesc_systemAlertWindow" msgid="2393776099672266188">"This app can appear on top of other apps or other parts of the screen. This may interfere with normal app usage and change the way that other apps appear."</string>
+ <string name="permlab_runInBackground" msgid="7365290743781858803">"run in the background"</string>
+ <string name="permdesc_runInBackground" msgid="7370142232209999824">"This app can run in the background. This may drain battery faster."</string>
+ <string name="permlab_useDataInBackground" msgid="8694951340794341809">"use data in the background"</string>
+ <string name="permdesc_useDataInBackground" msgid="6049514223791806027">"This app can use data in the background. This may increase data usage."</string>
+ <string name="permlab_persistentActivity" msgid="8841113627955563938">"make app always run"</string>
+ <string name="permdesc_persistentActivity" product="tablet" msgid="8525189272329086137">"Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the tablet."</string>
+ <string name="permdesc_persistentActivity" product="tv" msgid="5086862529499103587">"Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the TV."</string>
+ <string name="permdesc_persistentActivity" product="default" msgid="4384760047508278272">"Allows the app to make parts of itself persistent in memory. This can limit memory available to other apps slowing down the phone."</string>
+ <string name="permlab_foregroundService" msgid="3310786367649133115">"run foreground service"</string>
+ <string name="permdesc_foregroundService" msgid="6471634326171344622">"Allows the app to make use of foreground services."</string>
+ <string name="permlab_getPackageSize" msgid="7472921768357981986">"measure app storage space"</string>
+ <string name="permdesc_getPackageSize" msgid="3921068154420738296">"Allows the app to retrieve its code, data, and cache sizes"</string>
+ <string name="permlab_writeSettings" msgid="2226195290955224730">"modify system settings"</string>
+ <string name="permdesc_writeSettings" msgid="7775723441558907181">"Allows the app to modify the system\'s settings data. Malicious apps may corrupt your system\'s configuration."</string>
+ <string name="permlab_receiveBootCompleted" msgid="5312965565987800025">"run at startup"</string>
+ <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7390304664116880704">"Allows the app to have itself started as soon as the system has finished booting. This can make it take longer to start the tablet and allow the app to slow down the overall tablet by always running."</string>
+ <string name="permdesc_receiveBootCompleted" product="tv" msgid="4525890122209673621">"Allows the app to have itself started as soon as the system has finished booting. This can make it take longer to start the TV and allow the app to slow down the overall tablet by always running."</string>
+ <string name="permdesc_receiveBootCompleted" product="default" msgid="513950589102617504">"Allows the app to have itself started as soon as the system has finished booting. This can make it take longer to start the phone and allow the app to slow down the overall phone by always running."</string>
+ <string name="permlab_broadcastSticky" msgid="7919126372606881614">"send sticky broadcast"</string>
+ <string name="permdesc_broadcastSticky" product="tablet" msgid="7749760494399915651">"Allows the app to send sticky broadcasts, which remain after the broadcast ends. Excessive use may make the tablet slow or unstable by causing it to use too much memory."</string>
+ <string name="permdesc_broadcastSticky" product="tv" msgid="6839285697565389467">"Allows the app to send sticky broadcasts, which remain after the broadcast ends. Excessive use may make the TV slow or unstable by causing it to use too much memory."</string>
+ <string name="permdesc_broadcastSticky" product="default" msgid="2825803764232445091">"Allows the app to send sticky broadcasts, which remain after the broadcast ends. Excessive use may make the phone slow or unstable by causing it to use too much memory."</string>
+ <string name="permlab_readContacts" msgid="8348481131899886131">"read your contacts"</string>
+ <string name="permdesc_readContacts" product="tablet" msgid="5294866856941149639">"Allows the app to read data about your contacts stored on your tablet, including the frequency with which you\'ve called, emailed, or communicated in other ways with specific individuals. This permission allows apps to save your contact data, and malicious apps may share contact data without your knowledge."</string>
+ <string name="permdesc_readContacts" product="tv" msgid="1839238344654834087">"Allows the app to read data about your contacts stored on your TV, including the frequency with which you\'ve called, emailed, or communicated in other ways with specific individuals. This permission allows apps to save your contact data, and malicious apps may share contact data without your knowledge."</string>
+ <string name="permdesc_readContacts" product="default" msgid="8440654152457300662">"Allows the app to read data about your contacts stored on your phone, including the frequency with which you\'ve called, emailed, or communicated in other ways with specific individuals. This permission allows apps to save your contact data, and malicious apps may share contact data without your knowledge."</string>
+ <string name="permlab_writeContacts" msgid="5107492086416793544">"modify your contacts"</string>
+ <string name="permdesc_writeContacts" product="tablet" msgid="897243932521953602">"Allows the app to modify the data about your contacts stored on your tablet, including the frequency with which you\'ve called, emailed, or communicated in other ways with specific contacts. This permission allows apps to delete contact data."</string>
+ <string name="permdesc_writeContacts" product="tv" msgid="5438230957000018959">"Allows the app to modify the data about your contacts stored on your TV, including the frequency with which you\'ve called, emailed, or communicated in other ways with specific contacts. This permission allows apps to delete contact data."</string>
+ <string name="permdesc_writeContacts" product="default" msgid="589869224625163558">"Allows the app to modify the data about your contacts stored on your phone, including the frequency with which you\'ve called, emailed, or communicated in other ways with specific contacts. This permission allows apps to delete contact data."</string>
+ <string name="permlab_readCallLog" msgid="3478133184624102739">"read call log"</string>
+ <string name="permdesc_readCallLog" msgid="3204122446463552146">"This app can read your call history."</string>
+ <string name="permlab_writeCallLog" msgid="8552045664743499354">"write call log"</string>
+ <string name="permdesc_writeCallLog" product="tablet" msgid="6661806062274119245">"Allows the app to modify your tablet\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string>
+ <string name="permdesc_writeCallLog" product="tv" msgid="4225034892248398019">"Allows the app to modify your TV\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string>
+ <string name="permdesc_writeCallLog" product="default" msgid="683941736352787842">"Allows the app to modify your phone\'s call log, including data about incoming and outgoing calls. Malicious apps may use this to erase or modify your call log."</string>
+ <string name="permlab_bodySensors" msgid="4683341291818520277">"access body sensors (like heart rate monitors)"</string>
+ <string name="permdesc_bodySensors" product="default" msgid="4380015021754180431">"Allows the app to access data from sensors that monitor your physical condition, such as your heart rate."</string>
+ <string name="permlab_readCalendar" msgid="6716116972752441641">"Read calendar events and details"</string>
+ <string name="permdesc_readCalendar" product="tablet" msgid="4993979255403945892">"This app can read all calendar events stored on your tablet and share or save your calendar data."</string>
+ <string name="permdesc_readCalendar" product="tv" msgid="8837931557573064315">"This app can read all calendar events stored on your TV and share or save your calendar data."</string>
+ <string name="permdesc_readCalendar" product="default" msgid="4373978642145196715">"This app can read all calendar events stored on your phone and share or save your calendar data."</string>
+ <string name="permlab_writeCalendar" msgid="8438874755193825647">"add or modify calendar events and send email to guests without owners\' knowledge"</string>
+ <string name="permdesc_writeCalendar" product="tablet" msgid="1675270619903625982">"This app can add, remove, or change calendar events on your tablet. This app can send messages that may appear to come from calendar owners, or change events without notifying their owners."</string>
+ <string name="permdesc_writeCalendar" product="tv" msgid="9017809326268135866">"This app can add, remove, or change calendar events on your TV. This app can send messages that may appear to come from calendar owners, or change events without notifying their owners."</string>
+ <string name="permdesc_writeCalendar" product="default" msgid="7592791790516943173">"This app can add, remove, or change calendar events on your phone. This app can send messages that may appear to come from calendar owners, or change events without notifying their owners."</string>
+ <string name="permlab_accessLocationExtraCommands" msgid="2836308076720553837">"access extra location provider commands"</string>
+ <string name="permdesc_accessLocationExtraCommands" msgid="6078307221056649927">"Allows the app to access extra location provider commands. This may allow the app to interfere with the operation of the GPS or other location sources."</string>
+ <string name="permlab_accessFineLocation" msgid="6265109654698562427">"access precise location only in the foreground"</string>
+ <string name="permdesc_accessFineLocation" msgid="3520508381065331098">"This app can get your exact location only when it is in the foreground. These location services must be turned on and available on your phone for the app to be able to use them. This may increase battery consumption."</string>
+ <string name="permlab_accessCoarseLocation" msgid="3707180371693213469">"access approximate location (network-based) only in the foreground"</string>
+ <string name="permdesc_accessCoarseLocation" product="tablet" msgid="8594719010575779120">"This app can get your location based on network sources such as cell towers and Wi-Fi networks, but only when when the app is in the foreground. These location services must be turned on and available on your tablet for the app to be able to use them."</string>
+ <string name="permdesc_accessCoarseLocation" product="tv" msgid="3027871910200890806">"This app can get your location based on network sources such as cell towers and Wi-Fi networks, but only when when the app is in the foreground. These location services must be turned on and available on your TV for the app to be able to use them."</string>
+ <string name="permdesc_accessCoarseLocation" product="default" msgid="854896049371048754">"This app can get your location based on network sources such as cell towers and Wi-Fi networks, but only when the app is in the foreground. These location services must be turned on and available on your phone for the app to be able to use them."</string>
+ <string name="permlab_accessBackgroundLocation" msgid="3965397804300661062">"access location in the background"</string>
+ <string name="permdesc_accessBackgroundLocation" msgid="1096394429579210251">"If this is granted additionally to the approximate or precise location access the app can access the location while running in the background."</string>
+ <string name="permlab_modifyAudioSettings" msgid="6095859937069146086">"change your audio settings"</string>
+ <string name="permdesc_modifyAudioSettings" msgid="3522565366806248517">"Allows the app to modify global audio settings such as volume and which speaker is used for output."</string>
+ <string name="permlab_recordAudio" msgid="3876049771427466323">"record audio"</string>
+ <string name="permdesc_recordAudio" msgid="4245930455135321433">"This app can record audio using the microphone at any time."</string>
+ <string name="permlab_sim_communication" msgid="2935852302216852065">"send commands to the SIM"</string>
+ <string name="permdesc_sim_communication" msgid="5725159654279639498">"Allows the app to send commands to the SIM. This is very dangerous."</string>
+ <string name="permlab_activityRecognition" msgid="3634590230567608356">"recognize physical activity"</string>
+ <string name="permdesc_activityRecognition" msgid="3143453925156552894">"This app can recognize your physical activity."</string>
+ <string name="permlab_camera" msgid="3616391919559751192">"take pictures and videos"</string>
+ <string name="permdesc_camera" msgid="5392231870049240670">"This app can take pictures and record videos using the camera at any time."</string>
+ <string name="permlab_vibrate" msgid="7696427026057705834">"control vibration"</string>
+ <string name="permdesc_vibrate" msgid="6284989245902300945">"Allows the app to control the vibrator."</string>
+ <string name="permlab_callPhone" msgid="3925836347681847954">"directly call phone numbers"</string>
+ <string name="permdesc_callPhone" msgid="3740797576113760827">"Allows the app to call phone numbers without your intervention. This may result in unexpected charges or calls. Note that this doesn\'t allow the app to call emergency numbers. Malicious apps may cost you money by making calls without your confirmation."</string>
+ <string name="permlab_accessImsCallService" msgid="3574943847181793918">"access IMS call service"</string>
+ <string name="permdesc_accessImsCallService" msgid="8992884015198298775">"Allows the app to use the IMS service to make calls without your intervention."</string>
+ <string name="permlab_readPhoneState" msgid="9178228524507610486">"read phone status and identity"</string>
+ <string name="permdesc_readPhoneState" msgid="1639212771826125528">"Allows the app to access the phone features of the device. This permission allows the app to determine the phone number and device IDs, whether a call is active, and the remote number connected by a call."</string>
+ <string name="permlab_manageOwnCalls" msgid="1503034913274622244">"route calls through the system"</string>
+ <string name="permdesc_manageOwnCalls" msgid="6552974537554717418">"Allows the app to route its calls through the system in order to improve the calling experience."</string>
+ <string name="permlab_callCompanionApp" msgid="3599252979411970473">"see and control calls through the system."</string>
+ <string name="permdesc_callCompanionApp" msgid="4567344683275099090">"Allows the app to see and control ongoing calls on the device. This includes information such as call numbers for calls and the state of the calls."</string>
+ <string name="permlab_acceptHandover" msgid="2661534649736022409">"continue a call from another app"</string>
+ <string name="permdesc_acceptHandovers" msgid="4570660484220539698">"Allows the app to continue a call which was started in another app."</string>
+ <string name="permlab_readPhoneNumbers" msgid="6108163940932852440">"read phone numbers"</string>
+ <string name="permdesc_readPhoneNumbers" msgid="8559488833662272354">"Allows the app to access the phone numbers of the device."</string>
+ <string name="permlab_wakeLock" product="tablet" msgid="1531731435011495015">"prevent tablet from sleeping"</string>
+ <string name="permlab_wakeLock" product="tv" msgid="2601193288949154131">"prevent TV from sleeping"</string>
+ <string name="permlab_wakeLock" product="default" msgid="573480187941496130">"prevent phone from sleeping"</string>
+ <string name="permdesc_wakeLock" product="tablet" msgid="7311319824400447868">"Allows the app to prevent the tablet from going to sleep."</string>
+ <string name="permdesc_wakeLock" product="tv" msgid="3208534859208996974">"Allows the app to prevent the TV from going to sleep."</string>
+ <string name="permdesc_wakeLock" product="default" msgid="8559100677372928754">"Allows the app to prevent the phone from going to sleep."</string>
+ <string name="permlab_transmitIr" msgid="7545858504238530105">"transmit infrared"</string>
+ <string name="permdesc_transmitIr" product="tablet" msgid="5358308854306529170">"Allows the app to use the tablet\'s infrared transmitter."</string>
+ <string name="permdesc_transmitIr" product="tv" msgid="3926790828514867101">"Allows the app to use the TV\'s infrared transmitter."</string>
+ <string name="permdesc_transmitIr" product="default" msgid="7957763745020300725">"Allows the app to use the phone\'s infrared transmitter."</string>
+ <string name="permlab_setWallpaper" msgid="6627192333373465143">"set wallpaper"</string>
+ <string name="permdesc_setWallpaper" msgid="7373447920977624745">"Allows the app to set the system wallpaper."</string>
+ <string name="permlab_setWallpaperHints" msgid="3278608165977736538">"adjust your wallpaper size"</string>
+ <string name="permdesc_setWallpaperHints" msgid="8235784384223730091">"Allows the app to set the system wallpaper size hints."</string>
+ <string name="permlab_setTimeZone" msgid="2945079801013077340">"set time zone"</string>
+ <string name="permdesc_setTimeZone" product="tablet" msgid="1676983712315827645">"Allows the app to change the tablet\'s time zone."</string>
+ <string name="permdesc_setTimeZone" product="tv" msgid="888864653946175955">"Allows the app to change the TV\'s time zone."</string>
+ <string name="permdesc_setTimeZone" product="default" msgid="4499943488436633398">"Allows the app to change the phone\'s time zone."</string>
+ <string name="permlab_getAccounts" msgid="1086795467760122114">"find accounts on the device"</string>
+ <string name="permdesc_getAccounts" product="tablet" msgid="2741496534769660027">"Allows the app to get the list of accounts known by the tablet. This may include any accounts created by applications you have installed."</string>
+ <string name="permdesc_getAccounts" product="tv" msgid="4190633395633907543">"Allows the app to get the list of accounts known by the TV. This may include any accounts created by applications you have installed."</string>
+ <string name="permdesc_getAccounts" product="default" msgid="3448316822451807382">"Allows the app to get the list of accounts known by the phone. This may include any accounts created by applications you have installed."</string>
+ <string name="permlab_accessNetworkState" msgid="4951027964348974773">"view network connections"</string>
+ <string name="permdesc_accessNetworkState" msgid="8318964424675960975">"Allows the app to view information about network connections such as which networks exist and are connected."</string>
+ <string name="permlab_createNetworkSockets" msgid="7934516631384168107">"have full network access"</string>
+ <string name="permdesc_createNetworkSockets" msgid="3403062187779724185">"Allows the app to create network sockets and use custom network protocols. The browser and other applications provide means to send data to the internet, so this permission is not required to send data to the internet."</string>
+ <string name="permlab_changeNetworkState" msgid="958884291454327309">"change network connectivity"</string>
+ <string name="permdesc_changeNetworkState" msgid="6789123912476416214">"Allows the app to change the state of network connectivity."</string>
+ <string name="permlab_changeTetherState" msgid="5952584964373017960">"change tethered connectivity"</string>
+ <string name="permdesc_changeTetherState" msgid="1524441344412319780">"Allows the app to change the state of tethered network connectivity."</string>
+ <string name="permlab_accessWifiState" msgid="5202012949247040011">"view Wi-Fi connections"</string>
+ <string name="permdesc_accessWifiState" msgid="5002798077387803726">"Allows the app to view information about Wi-Fi networking, such as whether Wi-Fi is enabled and name of connected Wi-Fi devices."</string>
+ <string name="permlab_changeWifiState" msgid="6550641188749128035">"connect and disconnect from Wi-Fi"</string>
+ <string name="permdesc_changeWifiState" msgid="7137950297386127533">"Allows the app to connect to and disconnect from Wi-Fi access points and to make changes to device configuration for Wi-Fi networks."</string>
+ <string name="permlab_changeWifiMulticastState" msgid="1368253871483254784">"allow Wi-Fi Multicast reception"</string>
+ <string name="permdesc_changeWifiMulticastState" product="tablet" msgid="7969774021256336548">"Allows the app to receive packets sent to all devices on a Wi-Fi network using multicast addresses, not just your tablet. It uses more power than the non-multicast mode."</string>
+ <string name="permdesc_changeWifiMulticastState" product="tv" msgid="9031975661145014160">"Allows the app to receive packets sent to all devices on a Wi-Fi network using multicast addresses, not just your TV. It uses more power than the non-multicast mode."</string>
+ <string name="permdesc_changeWifiMulticastState" product="default" msgid="6851949706025349926">"Allows the app to receive packets sent to all devices on a Wi-Fi network using multicast addresses, not just your phone. It uses more power than the non-multicast mode."</string>
+ <string name="permlab_bluetoothAdmin" msgid="6006967373935926659">"access Bluetooth settings"</string>
+ <string name="permdesc_bluetoothAdmin" product="tablet" msgid="6921177471748882137">"Allows the app to configure the local Bluetooth tablet, and to discover and pair with remote devices."</string>
+ <string name="permdesc_bluetoothAdmin" product="tv" msgid="3373125682645601429">"Allows the app to configure the local Bluetooth TV, and to discover and pair with remote devices."</string>
+ <string name="permdesc_bluetoothAdmin" product="default" msgid="8931682159331542137">"Allows the app to configure the local Bluetooth phone, and to discover and pair with remote devices."</string>
+ <string name="permlab_accessWimaxState" msgid="4195907010610205703">"connect and disconnect from WiMAX"</string>
+ <string name="permdesc_accessWimaxState" msgid="6360102877261978887">"Allows the app to determine whether WiMAX is enabled and information about any WiMAX networks that are connected."</string>
+ <string name="permlab_changeWimaxState" msgid="340465839241528618">"change WiMAX state"</string>
+ <string name="permdesc_changeWimaxState" product="tablet" msgid="3156456504084201805">"Allows the app to connect the tablet to and disconnect the tablet from WiMAX networks."</string>
+ <string name="permdesc_changeWimaxState" product="tv" msgid="6022307083934827718">"Allows the app to connect the TV to and disconnect the TV from WiMAX networks."</string>
+ <string name="permdesc_changeWimaxState" product="default" msgid="697025043004923798">"Allows the app to connect the phone to and disconnect the phone from WiMAX networks."</string>
+ <string name="permlab_bluetooth" msgid="6127769336339276828">"pair with Bluetooth devices"</string>
+ <string name="permdesc_bluetooth" product="tablet" msgid="3480722181852438628">"Allows the app to view the configuration of Bluetooth on the tablet, and to make and accept connections with paired devices."</string>
+ <string name="permdesc_bluetooth" product="tv" msgid="3974124940101104206">"Allows the app to view the configuration of Bluetooth on the TV, and to make and accept connections with paired devices."</string>
+ <string name="permdesc_bluetooth" product="default" msgid="3207106324452312739">"Allows the app to view the configuration of the Bluetooth on the phone, and to make and accept connections with paired devices."</string>
+ <string name="permlab_nfc" msgid="4423351274757876953">"control Near Field Communication"</string>
+ <string name="permdesc_nfc" msgid="7120611819401789907">"Allows the app to communicate with Near Field Communication (NFC) tags, cards, and readers."</string>
+ <string name="permlab_disableKeyguard" msgid="3598496301486439258">"disable your screen lock"</string>
+ <string name="permdesc_disableKeyguard" msgid="6034203065077122992">"Allows the app to disable the keylock and any associated password security. For example, the phone disables the keylock when receiving an incoming phone call, then re-enables the keylock when the call is finished."</string>
+ <string name="permlab_getAndRequestScreenLockComplexity" msgid="3911592334192005424">"get and request screen lock complexity"</string>
+ <string name="permdesc_getAndRequestScreenLockComplexity" msgid="9045202063228854873">"Allows the app to learn the screen lock complexity level (high, medium, low or none), which indicates the possible range of length and type of the screen lock. The app can also suggest to users that they update the screen lock to a certain level but users can freely ignore and navigate away. Note that the screen lock is not stored in plaintext so the app does not know the exact password."</string>
+ <string name="permlab_useBiometric" msgid="8837753668509919318">"use biometric hardware"</string>
+ <string name="permdesc_useBiometric" msgid="8389855232721612926">"Allows the app to use biometric hardware for authentication"</string>
+ <string name="permlab_manageFingerprint" msgid="5640858826254575638">"manage fingerprint hardware"</string>
+ <string name="permdesc_manageFingerprint" msgid="178208705828055464">"Allows the app to invoke methods to add and delete fingerprint templates for use."</string>
+ <string name="permlab_useFingerprint" msgid="3150478619915124905">"use fingerprint hardware"</string>
+ <string name="permdesc_useFingerprint" msgid="9165097460730684114">"Allows the app to use fingerprint hardware for authentication"</string>
+ <string name="permlab_audioRead" msgid="6617225220728465565">"read your music collection"</string>
+ <string name="permdesc_audioRead" msgid="5034032570243484805">"Allows the app to read your music collection."</string>
+ <string name="permlab_audioWrite" msgid="2661772059799779292">"modify your music collection"</string>
+ <string name="permdesc_audioWrite" msgid="8888544708166230494">"Allows the app to modify your music collection."</string>
+ <string name="permlab_videoRead" msgid="9182618678674737229">"read your video collection"</string>
+ <string name="permdesc_videoRead" msgid="7045676429859396194">"Allows the app to read your video collection."</string>
+ <string name="permlab_videoWrite" msgid="128769316366746446">"modify your video collection"</string>
+ <string name="permdesc_videoWrite" msgid="5448565757490640841">"Allows the app to modify your video collection."</string>
+ <string name="permlab_imagesRead" msgid="3015078545742665304">"read your photo collection"</string>
+ <string name="permdesc_imagesRead" msgid="3144263806038695580">"Allows the app to read your photo collection."</string>
+ <string name="permlab_imagesWrite" msgid="3391306186247235510">"modify your photo collection"</string>
+ <string name="permdesc_imagesWrite" msgid="7073662756617474375">"Allows the app to modify your photo collection."</string>
+ <string name="permlab_mediaLocation" msgid="8675148183726247864">"read locations from your media collection"</string>
+ <string name="permdesc_mediaLocation" msgid="2237023389178865130">"Allows the app to read locations from your media collection."</string>
+ <string name="biometric_dialog_default_title" msgid="4229778503907743328">"Application <xliff:g id="APP">%s</xliff:g> wants to authenticate."</string>
+ <string name="biometric_error_hw_unavailable" msgid="645781226537551036">"Biometric hardware unavailable"</string>
+ <string name="biometric_error_user_canceled" msgid="2260175018114348727">"Authentication canceled"</string>
+ <string name="biometric_not_recognized" msgid="5770511773560736082">"Not recognized"</string>
+ <string name="biometric_error_canceled" msgid="349665227864885880">"Authentication canceled"</string>
+ <string name="fingerprint_acquired_partial" msgid="735082772341716043">"Partial fingerprint detected. Please try again."</string>
+ <string name="fingerprint_acquired_insufficient" msgid="4596546021310923214">"Couldn\'t process fingerprint. Please try again."</string>
+ <string name="fingerprint_acquired_imager_dirty" msgid="1087209702421076105">"Fingerprint sensor is dirty. Please clean and try again."</string>
+ <string name="fingerprint_acquired_too_fast" msgid="6470642383109155969">"Finger moved too fast. Please try again."</string>
+ <string name="fingerprint_acquired_too_slow" msgid="59250885689661653">"Finger moved too slow. Please try again."</string>
<string-array name="fingerprint_acquired_vendor">
</string-array>
- <string name="fingerprint_authenticated" msgid="5309333983002526448">"Fingerprint authenticated"</string>
- <string name="face_authenticated_no_confirmation_required" msgid="4018680978348659031">"Face authenticated"</string>
- <string name="face_authenticated_confirmation_required" msgid="8778347003507633610">"Face authenticated, please press confirm"</string>
- <string name="fingerprint_error_hw_not_available" msgid="7955921658939936596">"Fingerprint hardware not available."</string>
- <string name="fingerprint_error_no_space" msgid="1055819001126053318">"Fingerprint can\'t be stored. Please remove an existing fingerprint."</string>
- <string name="fingerprint_error_timeout" msgid="3927186043737732875">"Fingerprint time out reached. Try again."</string>
- <string name="fingerprint_error_canceled" msgid="4402024612660774395">"Fingerprint operation canceled."</string>
- <string name="fingerprint_error_user_canceled" msgid="7999639584615291494">"Fingerprint operation canceled by user."</string>
- <string name="fingerprint_error_lockout" msgid="5536934748136933450">"Too many attempts. Try again later."</string>
- <string name="fingerprint_error_lockout_permanent" msgid="5033251797919508137">"Too many attempts. Fingerprint sensor disabled."</string>
- <string name="fingerprint_error_unable_to_process" msgid="6107816084103552441">"Try again."</string>
- <string name="fingerprint_error_no_fingerprints" msgid="7654382120628334248">"No fingerprints enrolled."</string>
- <string name="fingerprint_error_hw_not_present" msgid="5729436878065119329">"This device does not have a fingerprint sensor"</string>
- <string name="fingerprint_name_template" msgid="5870957565512716938">"Finger <xliff:g id="FINGERID">%d</xliff:g>"</string>
+ <string name="fingerprint_authenticated" msgid="5309333983002526448">"Fingerprint authenticated"</string>
+ <string name="face_authenticated_no_confirmation_required" msgid="4018680978348659031">"Face authenticated"</string>
+ <string name="face_authenticated_confirmation_required" msgid="8778347003507633610">"Face authenticated, please press confirm"</string>
+ <string name="fingerprint_error_hw_not_available" msgid="7955921658939936596">"Fingerprint hardware not available."</string>
+ <string name="fingerprint_error_no_space" msgid="1055819001126053318">"Fingerprint can\'t be stored. Please remove an existing fingerprint."</string>
+ <string name="fingerprint_error_timeout" msgid="3927186043737732875">"Fingerprint time out reached. Try again."</string>
+ <string name="fingerprint_error_canceled" msgid="4402024612660774395">"Fingerprint operation canceled."</string>
+ <string name="fingerprint_error_user_canceled" msgid="7999639584615291494">"Fingerprint operation canceled by user."</string>
+ <string name="fingerprint_error_lockout" msgid="5536934748136933450">"Too many attempts. Try again later."</string>
+ <string name="fingerprint_error_lockout_permanent" msgid="5033251797919508137">"Too many attempts. Fingerprint sensor disabled."</string>
+ <string name="fingerprint_error_unable_to_process" msgid="6107816084103552441">"Try again."</string>
+ <string name="fingerprint_error_no_fingerprints" msgid="7654382120628334248">"No fingerprints enrolled."</string>
+ <string name="fingerprint_error_hw_not_present" msgid="5729436878065119329">"This device does not have a fingerprint sensor"</string>
+ <string name="fingerprint_name_template" msgid="5870957565512716938">"Finger <xliff:g id="FINGERID">%d</xliff:g>"</string>
<string-array name="fingerprint_error_vendor">
</string-array>
- <string name="fingerprint_icon_content_description" msgid="2340202869968465936">"Fingerprint icon"</string>
- <string name="permlab_manageFace" msgid="2137540986007309781">"manage face authentication hardware"</string>
- <string name="permdesc_manageFace" msgid="8919637120670185330">"Allows the app to invoke methods to add and delete facial templates for use."</string>
- <string name="permlab_useFaceAuthentication" msgid="8996134460546804535">"use face authentication hardware"</string>
- <string name="permdesc_useFaceAuthentication" msgid="5011118722951833089">"Allows the app to use face authentication hardware for authentication"</string>
- <string name="face_acquired_insufficient" msgid="5901287247766106330">"Couldn’t process face. Please try again."</string>
- <string name="face_acquired_too_bright" msgid="610606792381297174">"Face is too bright. Please try in lower light."</string>
- <string name="face_acquired_too_dark" msgid="7229162716976778371">"Face is too dark. Please uncover light source."</string>
- <string name="face_acquired_too_close" msgid="1980310037427755293">"Please move sensor farther from face."</string>
- <string name="face_acquired_too_far" msgid="4494571381828850007">"Please bring sensor closer to face."</string>
- <string name="face_acquired_too_high" msgid="228411096134808372">"Please move sensor higher."</string>
- <string name="face_acquired_too_low" msgid="4539774649296349109">"Please move sensor lower."</string>
- <string name="face_acquired_too_right" msgid="1650292067226118760">"Please move sensor to the right."</string>
- <string name="face_acquired_too_left" msgid="2712489669456176505">"Please move sensor to the left."</string>
- <string name="face_acquired_poor_gaze" msgid="8344973502980415859">"Please look at the sensor."</string>
- <string name="face_acquired_not_detected" msgid="5707782294589511391">"No face detected."</string>
- <string name="face_acquired_not_steady" msgid="3722829465011040042">"Keep face steady infront of device."</string>
+ <string name="fingerprint_icon_content_description" msgid="2340202869968465936">"Fingerprint icon"</string>
+ <string name="permlab_manageFace" msgid="2137540986007309781">"manage face authentication hardware"</string>
+ <string name="permdesc_manageFace" msgid="8919637120670185330">"Allows the app to invoke methods to add and delete facial templates for use."</string>
+ <string name="permlab_useFaceAuthentication" msgid="8996134460546804535">"use face authentication hardware"</string>
+ <string name="permdesc_useFaceAuthentication" msgid="5011118722951833089">"Allows the app to use face authentication hardware for authentication"</string>
+ <string name="face_acquired_insufficient" msgid="5901287247766106330">"Couldn’t process face. Please try again."</string>
+ <string name="face_acquired_too_bright" msgid="610606792381297174">"Face is too bright. Please try in lower light."</string>
+ <string name="face_acquired_too_dark" msgid="7229162716976778371">"Face is too dark. Please uncover light source."</string>
+ <string name="face_acquired_too_close" msgid="1980310037427755293">"Please move sensor farther from face."</string>
+ <string name="face_acquired_too_far" msgid="4494571381828850007">"Please bring sensor closer to face."</string>
+ <string name="face_acquired_too_high" msgid="228411096134808372">"Please move sensor higher."</string>
+ <string name="face_acquired_too_low" msgid="4539774649296349109">"Please move sensor lower."</string>
+ <string name="face_acquired_too_right" msgid="1650292067226118760">"Please move sensor to the right."</string>
+ <string name="face_acquired_too_left" msgid="2712489669456176505">"Please move sensor to the left."</string>
+ <string name="face_acquired_poor_gaze" msgid="8344973502980415859">"Please look at the sensor."</string>
+ <string name="face_acquired_not_detected" msgid="5707782294589511391">"No face detected."</string>
+ <string name="face_acquired_not_steady" msgid="3722829465011040042">"Keep face steady infront of device."</string>
<string-array name="face_acquired_vendor">
</string-array>
- <string name="face_error_hw_not_available" msgid="6255891785768984615">"Face hardware not available."</string>
- <string name="face_error_timeout" msgid="4014326147867150054">"Face time out reached. Try again."</string>
- <string name="face_error_no_space" msgid="8224993703466381314">"Face can’t be stored."</string>
- <string name="face_error_canceled" msgid="283945501061931023">"Face operation canceled."</string>
- <string name="face_error_user_canceled" msgid="8943921120862164539">"Face authentication canceled by user."</string>
- <string name="face_error_lockout" msgid="3407426963155388504">"Too many attempts. Try again later."</string>
- <string name="face_error_lockout_permanent" msgid="8198354656746088890">"Too many attempts. Facial authentication disabled."</string>
- <string name="face_error_unable_to_process" msgid="238761109287767270">"Try again."</string>
- <string name="face_error_not_enrolled" msgid="9166792142679691323">"No face enrolled."</string>
- <string name="face_error_hw_not_present" msgid="4737289254517095671">"This device does not have a face authentication sensor"</string>
- <string name="face_name_template" msgid="7004562145809595384">"Face <xliff:g id="FACEID">%d</xliff:g>"</string>
+ <string name="face_error_hw_not_available" msgid="6255891785768984615">"Face hardware not available."</string>
+ <string name="face_error_timeout" msgid="4014326147867150054">"Face time out reached. Try again."</string>
+ <string name="face_error_no_space" msgid="8224993703466381314">"Face can’t be stored."</string>
+ <string name="face_error_canceled" msgid="283945501061931023">"Face operation canceled."</string>
+ <string name="face_error_user_canceled" msgid="8943921120862164539">"Face authentication canceled by user."</string>
+ <string name="face_error_lockout" msgid="3407426963155388504">"Too many attempts. Try again later."</string>
+ <string name="face_error_lockout_permanent" msgid="8198354656746088890">"Too many attempts. Facial authentication disabled."</string>
+ <string name="face_error_unable_to_process" msgid="238761109287767270">"Try again."</string>
+ <string name="face_error_not_enrolled" msgid="9166792142679691323">"No face enrolled."</string>
+ <string name="face_error_hw_not_present" msgid="4737289254517095671">"This device does not have a face authentication sensor"</string>
+ <string name="face_name_template" msgid="7004562145809595384">"Face <xliff:g id="FACEID">%d</xliff:g>"</string>
<string-array name="face_error_vendor">
</string-array>
- <string name="face_icon_content_description" msgid="4024817159806482191">"Face icon"</string>
- <string name="permlab_readSyncSettings" msgid="6201810008230503052">"read sync settings"</string>
- <string name="permdesc_readSyncSettings" msgid="2706745674569678644">"Allows the app to read the sync settings for an account. For example, this can determine whether the People app is synced with an account."</string>
- <string name="permlab_writeSyncSettings" msgid="5408694875793945314">"toggle sync on and off"</string>
- <string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"Allows an app to modify the sync settings for an account. For example, this can be used to enable sync of the People app with an account."</string>
- <string name="permlab_readSyncStats" msgid="7396577451360202448">"read sync statistics"</string>
- <string name="permdesc_readSyncStats" msgid="1510143761757606156">"Allows an app to read the sync stats for an account, including the history of sync events and how much data is synced."</string>
- <string name="permlab_sdcardRead" msgid="1438933556581438863">"read the contents of your shared storage"</string>
- <string name="permdesc_sdcardRead" msgid="1804941689051236391">"Allows the app to read the contents of your shared storage."</string>
- <string name="permlab_sdcardWrite" msgid="9220937740184960897">"modify or delete the contents of your shared storage"</string>
- <string name="permdesc_sdcardWrite" msgid="2834431057338203959">"Allows the app to write the contents of your shared storage."</string>
- <string name="permlab_use_sip" msgid="2052499390128979920">"make/receive SIP calls"</string>
- <string name="permdesc_use_sip" msgid="2297804849860225257">"Allows the app to make and receive SIP calls."</string>
- <string name="permlab_register_sim_subscription" msgid="3166535485877549177">"register new telecom SIM connections"</string>
- <string name="permdesc_register_sim_subscription" msgid="2138909035926222911">"Allows the app to register new telecom SIM connections."</string>
- <string name="permlab_register_call_provider" msgid="108102120289029841">"register new telecom connections"</string>
- <string name="permdesc_register_call_provider" msgid="7034310263521081388">"Allows the app to register new telecom connections."</string>
- <string name="permlab_connection_manager" msgid="1116193254522105375">"manage telecom connections"</string>
- <string name="permdesc_connection_manager" msgid="5925480810356483565">"Allows the app to manage telecom connections."</string>
- <string name="permlab_bind_incall_service" msgid="6773648341975287125">"interact with in-call screen"</string>
- <string name="permdesc_bind_incall_service" msgid="8343471381323215005">"Allows the app to control when and how the user sees the in-call screen."</string>
- <string name="permlab_bind_connection_service" msgid="3557341439297014940">"interact with telephony services"</string>
- <string name="permdesc_bind_connection_service" msgid="4008754499822478114">"Allows the app to interact with telephony services to make/receive calls."</string>
- <string name="permlab_control_incall_experience" msgid="9061024437607777619">"provide an in-call user experience"</string>
- <string name="permdesc_control_incall_experience" msgid="915159066039828124">"Allows the app to provide an in-call user experience."</string>
- <string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"read historical network usage"</string>
- <string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Allows the app to read historical network usage for specific networks and apps."</string>
- <string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"manage network policy"</string>
- <string name="permdesc_manageNetworkPolicy" msgid="7537586771559370668">"Allows the app to manage network policies and define app-specific rules."</string>
- <string name="permlab_modifyNetworkAccounting" msgid="5088217309088729650">"modify network usage accounting"</string>
- <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Allows the app to modify how network usage is accounted against apps. Not for use by normal apps."</string>
- <string name="permlab_accessNotifications" msgid="7673416487873432268">"access notifications"</string>
- <string name="permdesc_accessNotifications" msgid="458457742683431387">"Allows the app to retrieve, examine, and clear notifications, including those posted by other apps."</string>
- <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"bind to a notification listener service"</string>
- <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Allows the holder to bind to the top-level interface of a notification listener service. Should never be needed for normal apps."</string>
- <string name="permlab_bindConditionProviderService" msgid="1180107672332704641">"bind to a condition provider service"</string>
- <string name="permdesc_bindConditionProviderService" msgid="1680513931165058425">"Allows the holder to bind to the top-level interface of a condition provider service. Should never be needed for normal apps."</string>
- <string name="permlab_bindDreamService" msgid="4153646965978563462">"bind to a dream service"</string>
- <string name="permdesc_bindDreamService" msgid="7325825272223347863">"Allows the holder to bind to the top-level interface of a dream service. Should never be needed for normal apps."</string>
- <string name="permlab_invokeCarrierSetup" msgid="3699600833975117478">"invoke the carrier-provided configuration app"</string>
- <string name="permdesc_invokeCarrierSetup" msgid="4159549152529111920">"Allows the holder to invoke the carrier-provided configuration app. Should never be needed for normal apps."</string>
- <string name="permlab_accessNetworkConditions" msgid="8206077447838909516">"listen for observations on network conditions"</string>
- <string name="permdesc_accessNetworkConditions" msgid="6899102075825272211">"Allows an application to listen for observations on network conditions. Should never be needed for normal apps."</string>
- <string name="permlab_setInputCalibration" msgid="4902620118878467615">"change input device calibration"</string>
- <string name="permdesc_setInputCalibration" msgid="4527511047549456929">"Allows the app to modify the calibration parameters of the touch screen. Should never be needed for normal apps."</string>
- <string name="permlab_accessDrmCertificates" msgid="7436886640723203615">"access DRM certificates"</string>
- <string name="permdesc_accessDrmCertificates" msgid="8073288354426159089">"Allows an application to provision and use DRM certficates. Should never be needed for normal apps."</string>
- <string name="permlab_handoverStatus" msgid="7820353257219300883">"receive Android Beam transfer status"</string>
- <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Allows this application to receive information about current Android Beam transfers"</string>
- <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"remove DRM certificates"</string>
- <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Allows an application to remove DRM certficates. Should never be needed for normal apps."</string>
- <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"bind to a carrier messaging service"</string>
- <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Allows the holder to bind to the top-level interface of a carrier messaging service. Should never be needed for normal apps."</string>
- <string name="permlab_bindCarrierServices" msgid="3233108656245526783">"bind to carrier services"</string>
- <string name="permdesc_bindCarrierServices" msgid="1391552602551084192">"Allows the holder to bind to carrier services. Should never be needed for normal apps."</string>
- <string name="permlab_access_notification_policy" msgid="4247510821662059671">"access Do Not Disturb"</string>
- <string name="permdesc_access_notification_policy" msgid="3296832375218749580">"Allows the app to read and write Do Not Disturb configuration."</string>
- <string name="policylab_limitPassword" msgid="4497420728857585791">"Set password rules"</string>
- <string name="policydesc_limitPassword" msgid="2502021457917874968">"Control the length and the characters allowed in screen lock passwords and PINs."</string>
- <string name="policylab_watchLogin" msgid="5091404125971980158">"Monitor screen unlock attempts"</string>
- <string name="policydesc_watchLogin" product="tablet" msgid="3215729294215070072">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the tablet or erase all the tablet\'s data if too many incorrect passwords are typed."</string>
- <string name="policydesc_watchLogin" product="TV" msgid="2707817988309890256">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the TV or erase all the TV\'s data if too many incorrect passwords are typed."</string>
- <string name="policydesc_watchLogin" product="default" msgid="5712323091846761073">"Monitor the number of incorrect passwords typed. when unlocking the screen, and lock the phone or erase all the phone\'s data if too many incorrect passwords are typed."</string>
- <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="4280246270601044505">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the tablet or erase all this user\'s data if too many incorrect passwords are typed."</string>
- <string name="policydesc_watchLogin_secondaryUser" product="TV" msgid="3484832653564483250">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the TV or erase all this user\'s data if too many incorrect passwords are typed."</string>
- <string name="policydesc_watchLogin_secondaryUser" product="default" msgid="2185480427217127147">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the phone or erase all this user\'s data if too many incorrect passwords are typed."</string>
- <string name="policylab_resetPassword" msgid="4934707632423915395">"Change the screen lock"</string>
- <string name="policydesc_resetPassword" msgid="1278323891710619128">"Change the screen lock."</string>
- <string name="policylab_forceLock" msgid="2274085384704248431">"Lock the screen"</string>
- <string name="policydesc_forceLock" msgid="1141797588403827138">"Control how and when the screen locks."</string>
- <string name="policylab_wipeData" msgid="3910545446758639713">"Erase all data"</string>
- <string name="policydesc_wipeData" product="tablet" msgid="4306184096067756876">"Erase the tablet\'s data without warning by performing a factory data reset."</string>
- <string name="policydesc_wipeData" product="tv" msgid="5816221315214527028">"Erase the TV\'s data without warning by performing a factory data reset."</string>
- <string name="policydesc_wipeData" product="default" msgid="5096895604574188391">"Erase the phone\'s data without warning by performing a factory data reset."</string>
- <string name="policylab_wipeData_secondaryUser" msgid="8362863289455531813">"Erase user data"</string>
- <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="6336255514635308054">"Erase this user\'s data on this tablet without warning."</string>
- <string name="policydesc_wipeData_secondaryUser" product="tv" msgid="2086473496848351810">"Erase this user\'s data on this TV without warning."</string>
- <string name="policydesc_wipeData_secondaryUser" product="default" msgid="6787904546711590238">"Erase this user\'s data on this phone without warning."</string>
- <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Set the device global proxy"</string>
- <string name="policydesc_setGlobalProxy" msgid="8459859731153370499">"Set the device global proxy to be used while policy is enabled. Only the device owner can set the global proxy."</string>
- <string name="policylab_expirePassword" msgid="5610055012328825874">"Set screen lock password expiration"</string>
- <string name="policydesc_expirePassword" msgid="5367525762204416046">"Change how frequently the screen lock password, PIN, or pattern must be changed."</string>
- <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Set storage encryption"</string>
- <string name="policydesc_encryptedStorage" msgid="2637732115325316992">"Require that stored app data be encrypted."</string>
- <string name="policylab_disableCamera" msgid="6395301023152297826">"Disable cameras"</string>
- <string name="policydesc_disableCamera" msgid="2306349042834754597">"Prevent use of all device cameras."</string>
- <string name="policylab_disableKeyguardFeatures" msgid="8552277871075367771">"Disable some screen lock features"</string>
- <string name="policydesc_disableKeyguardFeatures" msgid="2044755691354158439">"Prevent use of some screen lock features."</string>
+ <string name="face_icon_content_description" msgid="4024817159806482191">"Face icon"</string>
+ <string name="permlab_readSyncSettings" msgid="6201810008230503052">"read sync settings"</string>
+ <string name="permdesc_readSyncSettings" msgid="2706745674569678644">"Allows the app to read the sync settings for an account. For example, this can determine whether the People app is synced with an account."</string>
+ <string name="permlab_writeSyncSettings" msgid="5408694875793945314">"toggle sync on and off"</string>
+ <string name="permdesc_writeSyncSettings" msgid="8956262591306369868">"Allows an app to modify the sync settings for an account. For example, this can be used to enable sync of the People app with an account."</string>
+ <string name="permlab_readSyncStats" msgid="7396577451360202448">"read sync statistics"</string>
+ <string name="permdesc_readSyncStats" msgid="1510143761757606156">"Allows an app to read the sync stats for an account, including the history of sync events and how much data is synced."</string>
+ <string name="permlab_sdcardRead" msgid="1438933556581438863">"read the contents of your shared storage"</string>
+ <string name="permdesc_sdcardRead" msgid="1804941689051236391">"Allows the app to read the contents of your shared storage."</string>
+ <string name="permlab_sdcardWrite" msgid="9220937740184960897">"modify or delete the contents of your shared storage"</string>
+ <string name="permdesc_sdcardWrite" msgid="2834431057338203959">"Allows the app to write the contents of your shared storage."</string>
+ <string name="permlab_use_sip" msgid="2052499390128979920">"make/receive SIP calls"</string>
+ <string name="permdesc_use_sip" msgid="2297804849860225257">"Allows the app to make and receive SIP calls."</string>
+ <string name="permlab_register_sim_subscription" msgid="3166535485877549177">"register new telecom SIM connections"</string>
+ <string name="permdesc_register_sim_subscription" msgid="2138909035926222911">"Allows the app to register new telecom SIM connections."</string>
+ <string name="permlab_register_call_provider" msgid="108102120289029841">"register new telecom connections"</string>
+ <string name="permdesc_register_call_provider" msgid="7034310263521081388">"Allows the app to register new telecom connections."</string>
+ <string name="permlab_connection_manager" msgid="1116193254522105375">"manage telecom connections"</string>
+ <string name="permdesc_connection_manager" msgid="5925480810356483565">"Allows the app to manage telecom connections."</string>
+ <string name="permlab_bind_incall_service" msgid="6773648341975287125">"interact with in-call screen"</string>
+ <string name="permdesc_bind_incall_service" msgid="8343471381323215005">"Allows the app to control when and how the user sees the in-call screen."</string>
+ <string name="permlab_bind_connection_service" msgid="3557341439297014940">"interact with telephony services"</string>
+ <string name="permdesc_bind_connection_service" msgid="4008754499822478114">"Allows the app to interact with telephony services to make/receive calls."</string>
+ <string name="permlab_control_incall_experience" msgid="9061024437607777619">"provide an in-call user experience"</string>
+ <string name="permdesc_control_incall_experience" msgid="915159066039828124">"Allows the app to provide an in-call user experience."</string>
+ <string name="permlab_readNetworkUsageHistory" msgid="7862593283611493232">"read historical network usage"</string>
+ <string name="permdesc_readNetworkUsageHistory" msgid="7689060749819126472">"Allows the app to read historical network usage for specific networks and apps."</string>
+ <string name="permlab_manageNetworkPolicy" msgid="2562053592339859990">"manage network policy"</string>
+ <string name="permdesc_manageNetworkPolicy" msgid="7537586771559370668">"Allows the app to manage network policies and define app-specific rules."</string>
+ <string name="permlab_modifyNetworkAccounting" msgid="5088217309088729650">"modify network usage accounting"</string>
+ <string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"Allows the app to modify how network usage is accounted against apps. Not for use by normal apps."</string>
+ <string name="permlab_accessNotifications" msgid="7673416487873432268">"access notifications"</string>
+ <string name="permdesc_accessNotifications" msgid="458457742683431387">"Allows the app to retrieve, examine, and clear notifications, including those posted by other apps."</string>
+ <string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"bind to a notification listener service"</string>
+ <string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"Allows the holder to bind to the top-level interface of a notification listener service. Should never be needed for normal apps."</string>
+ <string name="permlab_bindConditionProviderService" msgid="1180107672332704641">"bind to a condition provider service"</string>
+ <string name="permdesc_bindConditionProviderService" msgid="1680513931165058425">"Allows the holder to bind to the top-level interface of a condition provider service. Should never be needed for normal apps."</string>
+ <string name="permlab_bindDreamService" msgid="4153646965978563462">"bind to a dream service"</string>
+ <string name="permdesc_bindDreamService" msgid="7325825272223347863">"Allows the holder to bind to the top-level interface of a dream service. Should never be needed for normal apps."</string>
+ <string name="permlab_invokeCarrierSetup" msgid="3699600833975117478">"invoke the carrier-provided configuration app"</string>
+ <string name="permdesc_invokeCarrierSetup" msgid="4159549152529111920">"Allows the holder to invoke the carrier-provided configuration app. Should never be needed for normal apps."</string>
+ <string name="permlab_accessNetworkConditions" msgid="8206077447838909516">"listen for observations on network conditions"</string>
+ <string name="permdesc_accessNetworkConditions" msgid="6899102075825272211">"Allows an application to listen for observations on network conditions. Should never be needed for normal apps."</string>
+ <string name="permlab_setInputCalibration" msgid="4902620118878467615">"change input device calibration"</string>
+ <string name="permdesc_setInputCalibration" msgid="4527511047549456929">"Allows the app to modify the calibration parameters of the touch screen. Should never be needed for normal apps."</string>
+ <string name="permlab_accessDrmCertificates" msgid="7436886640723203615">"access DRM certificates"</string>
+ <string name="permdesc_accessDrmCertificates" msgid="8073288354426159089">"Allows an application to provision and use DRM certficates. Should never be needed for normal apps."</string>
+ <string name="permlab_handoverStatus" msgid="7820353257219300883">"receive Android Beam transfer status"</string>
+ <string name="permdesc_handoverStatus" msgid="4788144087245714948">"Allows this application to receive information about current Android Beam transfers"</string>
+ <string name="permlab_removeDrmCertificates" msgid="7044888287209892751">"remove DRM certificates"</string>
+ <string name="permdesc_removeDrmCertificates" msgid="7272999075113400993">"Allows an application to remove DRM certficates. Should never be needed for normal apps."</string>
+ <string name="permlab_bindCarrierMessagingService" msgid="1490229371796969158">"bind to a carrier messaging service"</string>
+ <string name="permdesc_bindCarrierMessagingService" msgid="2762882888502113944">"Allows the holder to bind to the top-level interface of a carrier messaging service. Should never be needed for normal apps."</string>
+ <string name="permlab_bindCarrierServices" msgid="3233108656245526783">"bind to carrier services"</string>
+ <string name="permdesc_bindCarrierServices" msgid="1391552602551084192">"Allows the holder to bind to carrier services. Should never be needed for normal apps."</string>
+ <string name="permlab_access_notification_policy" msgid="4247510821662059671">"access Do Not Disturb"</string>
+ <string name="permdesc_access_notification_policy" msgid="3296832375218749580">"Allows the app to read and write Do Not Disturb configuration."</string>
+ <string name="policylab_limitPassword" msgid="4497420728857585791">"Set password rules"</string>
+ <string name="policydesc_limitPassword" msgid="2502021457917874968">"Control the length and the characters allowed in screen lock passwords and PINs."</string>
+ <string name="policylab_watchLogin" msgid="5091404125971980158">"Monitor screen unlock attempts"</string>
+ <string name="policydesc_watchLogin" product="tablet" msgid="3215729294215070072">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the tablet or erase all the tablet\'s data if too many incorrect passwords are typed."</string>
+ <string name="policydesc_watchLogin" product="TV" msgid="2707817988309890256">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the TV or erase all the TV\'s data if too many incorrect passwords are typed."</string>
+ <string name="policydesc_watchLogin" product="default" msgid="5712323091846761073">"Monitor the number of incorrect passwords typed. when unlocking the screen, and lock the phone or erase all the phone\'s data if too many incorrect passwords are typed."</string>
+ <string name="policydesc_watchLogin_secondaryUser" product="tablet" msgid="4280246270601044505">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the tablet or erase all this user\'s data if too many incorrect passwords are typed."</string>
+ <string name="policydesc_watchLogin_secondaryUser" product="TV" msgid="3484832653564483250">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the TV or erase all this user\'s data if too many incorrect passwords are typed."</string>
+ <string name="policydesc_watchLogin_secondaryUser" product="default" msgid="2185480427217127147">"Monitor the number of incorrect passwords typed when unlocking the screen, and lock the phone or erase all this user\'s data if too many incorrect passwords are typed."</string>
+ <string name="policylab_resetPassword" msgid="4934707632423915395">"Change the screen lock"</string>
+ <string name="policydesc_resetPassword" msgid="1278323891710619128">"Change the screen lock."</string>
+ <string name="policylab_forceLock" msgid="2274085384704248431">"Lock the screen"</string>
+ <string name="policydesc_forceLock" msgid="1141797588403827138">"Control how and when the screen locks."</string>
+ <string name="policylab_wipeData" msgid="3910545446758639713">"Erase all data"</string>
+ <string name="policydesc_wipeData" product="tablet" msgid="4306184096067756876">"Erase the tablet\'s data without warning by performing a factory data reset."</string>
+ <string name="policydesc_wipeData" product="tv" msgid="5816221315214527028">"Erase the TV\'s data without warning by performing a factory data reset."</string>
+ <string name="policydesc_wipeData" product="default" msgid="5096895604574188391">"Erase the phone\'s data without warning by performing a factory data reset."</string>
+ <string name="policylab_wipeData_secondaryUser" msgid="8362863289455531813">"Erase user data"</string>
+ <string name="policydesc_wipeData_secondaryUser" product="tablet" msgid="6336255514635308054">"Erase this user\'s data on this tablet without warning."</string>
+ <string name="policydesc_wipeData_secondaryUser" product="tv" msgid="2086473496848351810">"Erase this user\'s data on this TV without warning."</string>
+ <string name="policydesc_wipeData_secondaryUser" product="default" msgid="6787904546711590238">"Erase this user\'s data on this phone without warning."</string>
+ <string name="policylab_setGlobalProxy" msgid="2784828293747791446">"Set the device global proxy"</string>
+ <string name="policydesc_setGlobalProxy" msgid="8459859731153370499">"Set the device global proxy to be used while policy is enabled. Only the device owner can set the global proxy."</string>
+ <string name="policylab_expirePassword" msgid="5610055012328825874">"Set screen lock password expiration"</string>
+ <string name="policydesc_expirePassword" msgid="5367525762204416046">"Change how frequently the screen lock password, PIN, or pattern must be changed."</string>
+ <string name="policylab_encryptedStorage" msgid="8901326199909132915">"Set storage encryption"</string>
+ <string name="policydesc_encryptedStorage" msgid="2637732115325316992">"Require that stored app data be encrypted."</string>
+ <string name="policylab_disableCamera" msgid="6395301023152297826">"Disable cameras"</string>
+ <string name="policydesc_disableCamera" msgid="2306349042834754597">"Prevent use of all device cameras."</string>
+ <string name="policylab_disableKeyguardFeatures" msgid="8552277871075367771">"Disable some screen lock features"</string>
+ <string name="policydesc_disableKeyguardFeatures" msgid="2044755691354158439">"Prevent use of some screen lock features."</string>
<string-array name="phoneTypes">
- <item msgid="8901098336658710359">"Home"</item>
- <item msgid="869923650527136615">"Mobile"</item>
- <item msgid="7897544654242874543">"Work"</item>
- <item msgid="1103601433382158155">"Work Fax"</item>
- <item msgid="1735177144948329370">"Home Fax"</item>
- <item msgid="603878674477207394">"Pager"</item>
- <item msgid="1650824275177931637">"Other"</item>
- <item msgid="9192514806975898961">"Custom"</item>
+ <item msgid="8901098336658710359">"Home"</item>
+ <item msgid="869923650527136615">"Mobile"</item>
+ <item msgid="7897544654242874543">"Work"</item>
+ <item msgid="1103601433382158155">"Work Fax"</item>
+ <item msgid="1735177144948329370">"Home Fax"</item>
+ <item msgid="603878674477207394">"Pager"</item>
+ <item msgid="1650824275177931637">"Other"</item>
+ <item msgid="9192514806975898961">"Custom"</item>
</string-array>
<string-array name="emailAddressTypes">
- <item msgid="8073994352956129127">"Home"</item>
- <item msgid="7084237356602625604">"Work"</item>
- <item msgid="1112044410659011023">"Other"</item>
- <item msgid="2374913952870110618">"Custom"</item>
+ <item msgid="8073994352956129127">"Home"</item>
+ <item msgid="7084237356602625604">"Work"</item>
+ <item msgid="1112044410659011023">"Other"</item>
+ <item msgid="2374913952870110618">"Custom"</item>
</string-array>
<string-array name="postalAddressTypes">
- <item msgid="6880257626740047286">"Home"</item>
- <item msgid="5629153956045109251">"Work"</item>
- <item msgid="4966604264500343469">"Other"</item>
- <item msgid="4932682847595299369">"Custom"</item>
+ <item msgid="6880257626740047286">"Home"</item>
+ <item msgid="5629153956045109251">"Work"</item>
+ <item msgid="4966604264500343469">"Other"</item>
+ <item msgid="4932682847595299369">"Custom"</item>
</string-array>
<string-array name="imAddressTypes">
- <item msgid="1738585194601476694">"Home"</item>
- <item msgid="1359644565647383708">"Work"</item>
- <item msgid="7868549401053615677">"Other"</item>
- <item msgid="3145118944639869809">"Custom"</item>
+ <item msgid="1738585194601476694">"Home"</item>
+ <item msgid="1359644565647383708">"Work"</item>
+ <item msgid="7868549401053615677">"Other"</item>
+ <item msgid="3145118944639869809">"Custom"</item>
</string-array>
<string-array name="organizationTypes">
- <item msgid="7546335612189115615">"Work"</item>
- <item msgid="4378074129049520373">"Other"</item>
- <item msgid="3455047468583965104">"Custom"</item>
+ <item msgid="7546335612189115615">"Work"</item>
+ <item msgid="4378074129049520373">"Other"</item>
+ <item msgid="3455047468583965104">"Custom"</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>
+ <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">"Custom"</string>
- <string name="phoneTypeHome" msgid="2570923463033985887">"Home"</string>
- <string name="phoneTypeMobile" msgid="6501463557754751037">"Mobile"</string>
- <string name="phoneTypeWork" msgid="8863939667059911633">"Work"</string>
- <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Work Fax"</string>
- <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Home Fax"</string>
- <string name="phoneTypePager" msgid="7582359955394921732">"Pager"</string>
- <string name="phoneTypeOther" msgid="1544425847868765990">"Other"</string>
- <string name="phoneTypeCallback" msgid="2712175203065678206">"Callback"</string>
- <string name="phoneTypeCar" msgid="8738360689616716982">"Car"</string>
- <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Company Main"</string>
- <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string>
- <string name="phoneTypeMain" msgid="6766137010628326916">"Main"</string>
- <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Other Fax"</string>
- <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string>
- <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string>
- <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string>
- <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Work Mobile"</string>
- <string name="phoneTypeWorkPager" msgid="649938731231157056">"Work Pager"</string>
- <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistant"</string>
- <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string>
- <string name="eventTypeCustom" msgid="7837586198458073404">"Custom"</string>
- <string name="eventTypeBirthday" msgid="2813379844211390740">"Birthday"</string>
- <string name="eventTypeAnniversary" msgid="3876779744518284000">"Anniversary"</string>
- <string name="eventTypeOther" msgid="7388178939010143077">"Other"</string>
- <string name="emailTypeCustom" msgid="8525960257804213846">"Custom"</string>
- <string name="emailTypeHome" msgid="449227236140433919">"Home"</string>
- <string name="emailTypeWork" msgid="3548058059601149973">"Work"</string>
- <string name="emailTypeOther" msgid="2923008695272639549">"Other"</string>
- <string name="emailTypeMobile" msgid="119919005321166205">"Mobile"</string>
- <string name="postalTypeCustom" msgid="8903206903060479902">"Custom"</string>
- <string name="postalTypeHome" msgid="8165756977184483097">"Home"</string>
- <string name="postalTypeWork" msgid="5268172772387694495">"Work"</string>
- <string name="postalTypeOther" msgid="2726111966623584341">"Other"</string>
- <string name="imTypeCustom" msgid="2074028755527826046">"Custom"</string>
- <string name="imTypeHome" msgid="6241181032954263892">"Home"</string>
- <string name="imTypeWork" msgid="1371489290242433090">"Work"</string>
- <string name="imTypeOther" msgid="5377007495735915478">"Other"</string>
- <string name="imProtocolCustom" msgid="6919453836618749992">"Custom"</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">"Work"</string>
- <string name="orgTypeOther" msgid="3951781131570124082">"Other"</string>
- <string name="orgTypeCustom" msgid="225523415372088322">"Custom"</string>
- <string name="relationTypeCustom" msgid="3542403679827297300">"Custom"</string>
- <string name="relationTypeAssistant" msgid="6274334825195379076">"Assistant"</string>
- <string name="relationTypeBrother" msgid="8757913506784067713">"Brother"</string>
- <string name="relationTypeChild" msgid="1890746277276881626">"Child"</string>
- <string name="relationTypeDomesticPartner" msgid="6904807112121122133">"Domestic Partner"</string>
- <string name="relationTypeFather" msgid="5228034687082050725">"Father"</string>
- <string name="relationTypeFriend" msgid="7313106762483391262">"Friend"</string>
- <string name="relationTypeManager" msgid="6365677861610137895">"Manager"</string>
- <string name="relationTypeMother" msgid="4578571352962758304">"Mother"</string>
- <string name="relationTypeParent" msgid="4755635567562925226">"Parent"</string>
- <string name="relationTypePartner" msgid="7266490285120262781">"Partner"</string>
- <string name="relationTypeReferredBy" msgid="101573059844135524">"Referred by"</string>
- <string name="relationTypeRelative" msgid="1799819930085610271">"Relative"</string>
- <string name="relationTypeSister" msgid="1735983554479076481">"Sister"</string>
- <string name="relationTypeSpouse" msgid="394136939428698117">"Spouse"</string>
- <string name="sipAddressTypeCustom" msgid="2473580593111590945">"Custom"</string>
- <string name="sipAddressTypeHome" msgid="6093598181069359295">"Home"</string>
- <string name="sipAddressTypeWork" msgid="6920725730797099047">"Work"</string>
- <string name="sipAddressTypeOther" msgid="4408436162950119849">"Other"</string>
- <string name="quick_contacts_not_available" msgid="746098007828579688">"No application found to view this contact."</string>
- <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"Type PIN code"</string>
- <string name="keyguard_password_enter_puk_code" msgid="4800725266925845333">"Type PUK and new PIN code"</string>
- <string name="keyguard_password_enter_puk_prompt" msgid="1341112146710087048">"PUK code"</string>
- <string name="keyguard_password_enter_pin_prompt" msgid="8027680321614196258">"New PIN code"</string>
- <string name="keyguard_password_entry_touch_hint" msgid="2644215452200037944">""<font size="17">"Tap to type password"</font>""</string>
- <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"Type password to unlock"</string>
- <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"Type PIN to unlock"</string>
- <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"Incorrect PIN code."</string>
- <string name="keyguard_label_text" msgid="861796461028298424">"To unlock, press Menu then 0."</string>
- <string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"Emergency number"</string>
- <string name="lockscreen_carrier_default" msgid="6169005837238288522">"No service"</string>
- <string name="lockscreen_screen_locked" msgid="7288443074806832904">"Screen locked."</string>
- <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Press Menu to unlock or place emergency call."</string>
- <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Press Menu to unlock."</string>
- <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Draw pattern to unlock"</string>
- <string name="lockscreen_emergency_call" msgid="5298642613417801888">"Emergency"</string>
- <string name="lockscreen_return_to_call" msgid="5244259785500040021">"Return to call"</string>
- <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Correct!"</string>
- <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Try again"</string>
- <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Try again"</string>
- <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Unlock for all features and data"</string>
- <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Maximum Face Unlock attempts exceeded"</string>
- <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"No SIM card"</string>
- <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"No SIM card in tablet."</string>
- <string name="lockscreen_missing_sim_message" product="tv" msgid="1943633865476989599">"No SIM card in TV."</string>
- <string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"No SIM card in phone."</string>
- <string name="lockscreen_missing_sim_instructions" msgid="5372787138023272615">"Insert a SIM card."</string>
- <string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"The SIM card is missing or not readable. Insert a SIM card."</string>
- <string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"Unusable SIM card."</string>
- <string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"Your SIM card has been permanently disabled.\n Contact your wireless service provider for another SIM card."</string>
- <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"Previous track"</string>
- <string name="lockscreen_transport_next_description" msgid="573285210424377338">"Next track"</string>
- <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"Pause"</string>
- <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"Play"</string>
- <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"Stop"</string>
- <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"Rewind"</string>
- <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"Fast forward"</string>
- <string name="emergency_calls_only" msgid="6733978304386365407">"Emergency calls only"</string>
- <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Network locked"</string>
- <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM card is PUK-locked."</string>
- <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"See the User Guide or contact Customer Care."</string>
- <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"SIM card is locked."</string>
- <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"Unlocking SIM card…"</string>
- <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
- <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="2725973286239344555">"You have incorrectly typed your password <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
- <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="6216672706545696955">"You have incorrectly typed your PIN <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
- <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="9191611984625460820">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your tablet using your Google signin.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
- <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="5316664559603394684">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your TV using your Google signin.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
- <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="2590227559763762751">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using your Google signin.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
- <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="6128106399745755604">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the tablet will be reset to factory default and all user data will be lost."</string>
- <string name="lockscreen_failed_attempts_almost_at_wipe" product="tv" msgid="950408382418270260">"You have incorrectly attempted to unlock the TV <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the TV will be reset to factory default and all user data will be lost."</string>
- <string name="lockscreen_failed_attempts_almost_at_wipe" product="default" msgid="8603565142156826565">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the phone will be reset to factory default and all user data will be lost."</string>
- <string name="lockscreen_failed_attempts_now_wiping" product="tablet" msgid="280873516493934365">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER">%d</xliff:g> times. The tablet will now be reset to factory default."</string>
- <string name="lockscreen_failed_attempts_now_wiping" product="tv" msgid="3195755534096192191">"You have incorrectly attempted to unlock the TV <xliff:g id="NUMBER">%d</xliff:g> times. The TV will now be reset to factory default."</string>
- <string name="lockscreen_failed_attempts_now_wiping" product="default" msgid="3025504721764922246">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER">%d</xliff:g> times. The phone will now be reset to factory default."</string>
- <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6251480343394389665">"Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string>
- <string name="lockscreen_forgot_pattern_button_text" msgid="2626999449610695930">"Forgot pattern?"</string>
- <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"Account unlock"</string>
- <string name="lockscreen_glogin_too_many_attempts" msgid="2751368605287288808">"Too many pattern attempts"</string>
- <string name="lockscreen_glogin_instructions" msgid="3931816256100707784">"To unlock, sign in with your Google account."</string>
- <string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"Username (email)"</string>
- <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Password"</string>
- <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Sign in"</string>
- <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Invalid username or password."</string>
- <string name="lockscreen_glogin_account_recovery_hint" msgid="1696924763690379073">"Forgot your username or password?\nVisit "<b>"google.com/accounts/recovery"</b>"."</string>
- <string name="lockscreen_glogin_checking_password" msgid="7114627351286933867">"Checking…"</string>
- <string name="lockscreen_unlock_label" msgid="737440483220667054">"Unlock"</string>
- <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Sound on"</string>
- <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Sound off"</string>
- <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"Pattern started"</string>
- <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Pattern cleared"</string>
- <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Cell added"</string>
- <string name="lockscreen_access_pattern_cell_added_verbose" msgid="7264580781744026939">"Cell <xliff:g id="CELL_INDEX">%1$s</xliff:g> added"</string>
- <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Pattern completed"</string>
- <string name="lockscreen_access_pattern_area" msgid="400813207572953209">"Pattern area."</string>
- <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. Widget %2$d of %3$d."</string>
- <string name="keyguard_accessibility_add_widget" msgid="8273277058724924654">"Add widget."</string>
- <string name="keyguard_accessibility_widget_empty_slot" msgid="1281505703307930757">"Empty"</string>
- <string name="keyguard_accessibility_unlock_area_expanded" msgid="2278106022311170299">"Unlock area expanded."</string>
- <string name="keyguard_accessibility_unlock_area_collapsed" msgid="6366992066936076396">"Unlock area collapsed."</string>
- <string name="keyguard_accessibility_widget" msgid="6527131039741808240">"<xliff:g id="WIDGET_INDEX">%1$s</xliff:g> widget."</string>
- <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"User selector"</string>
- <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Status"</string>
- <string name="keyguard_accessibility_camera" msgid="8904231194181114603">"Camera"</string>
- <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Media controls"</string>
- <string name="keyguard_accessibility_widget_reorder_start" msgid="8736853615588828197">"Widget reordering started."</string>
- <string name="keyguard_accessibility_widget_reorder_end" msgid="7170190950870468320">"Widget reordering ended."</string>
- <string name="keyguard_accessibility_widget_deleted" msgid="4426204263929224434">"Widget <xliff:g id="WIDGET_INDEX">%1$s</xliff:g> deleted."</string>
- <string name="keyguard_accessibility_expand_lock_area" msgid="519859720934178024">"Expand unlock area."</string>
- <string name="keyguard_accessibility_slide_unlock" msgid="2959928478764697254">"Slide unlock."</string>
- <string name="keyguard_accessibility_pattern_unlock" msgid="1490840706075246612">"Pattern unlock."</string>
- <string name="keyguard_accessibility_face_unlock" msgid="4817282543351718535">"Face unlock."</string>
- <string name="keyguard_accessibility_pin_unlock" msgid="2469687111784035046">"Pin unlock."</string>
- <string name="keyguard_accessibility_sim_pin_unlock" msgid="9149698847116962307">"Sim Pin unlock."</string>
- <string name="keyguard_accessibility_sim_puk_unlock" msgid="9106899279724723341">"Sim Puk unlock."</string>
- <string name="keyguard_accessibility_password_unlock" msgid="7675777623912155089">"Password unlock."</string>
- <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">"Pattern area."</string>
- <string name="keyguard_accessibility_slide_area" msgid="6736064494019979544">"Slide area."</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">"character"</string>
- <string name="granularity_label_word" msgid="7075570328374918660">"word"</string>
- <string name="granularity_label_link" msgid="5815508880782488267">"link"</string>
- <string name="granularity_label_line" msgid="5764267235026120888">"line"</string>
- <string name="factorytest_failed" msgid="5410270329114212041">"Factory test failed"</string>
- <string name="factorytest_not_system" msgid="4435201656767276723">"The FACTORY_TEST action is only supported for packages installed in /system/app."</string>
- <string name="factorytest_no_action" msgid="872991874799998561">"No package was found that provides the FACTORY_TEST action."</string>
- <string name="factorytest_reboot" msgid="6320168203050791643">"Reboot"</string>
- <string name="js_dialog_title" msgid="1987483977834603872">"The page at \"<xliff:g id="TITLE">%s</xliff:g>\" says:"</string>
- <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string>
- <string name="js_dialog_before_unload_title" msgid="2619376555525116593">"Confirm Navigation"</string>
- <string name="js_dialog_before_unload_positive_button" msgid="3112752010600484130">"Leave this Page"</string>
- <string name="js_dialog_before_unload_negative_button" msgid="5614861293026099715">"Stay on this Page"</string>
- <string name="js_dialog_before_unload" msgid="3468816357095378590">"<xliff:g id="MESSAGE">%s</xliff:g>\n\nAre you sure you want to navigate away from this page?"</string>
- <string name="save_password_label" msgid="6860261758665825069">"Confirm"</string>
- <string name="double_tap_toast" msgid="4595046515400268881">"Tip: Double-tap to zoom in and out."</string>
- <string name="autofill_this_form" msgid="4616758841157816676">"Autofill"</string>
- <string name="setup_autofill" msgid="7103495070180590814">"Set up Autofill"</string>
- <string name="autofill_window_title" msgid="4107745526909284887">"Autofill with <xliff:g id="SERVICENAME">%1$s</xliff:g>"</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">"Province"</string>
- <string name="autofill_postal_code" msgid="4696430407689377108">"Postal code"</string>
- <string name="autofill_state" msgid="6988894195520044613">"State"</string>
- <string name="autofill_zip_code" msgid="8697544592627322946">"ZIP code"</string>
- <string name="autofill_county" msgid="237073771020362891">"County"</string>
- <string name="autofill_island" msgid="4020100875984667025">"Island"</string>
- <string name="autofill_district" msgid="8400735073392267672">"District"</string>
- <string name="autofill_department" msgid="5343279462564453309">"Department"</string>
- <string name="autofill_prefecture" msgid="2028499485065800419">"Prefecture"</string>
- <string name="autofill_parish" msgid="8202206105468820057">"Parish"</string>
- <string name="autofill_area" msgid="3547409050889952423">"Area"</string>
- <string name="autofill_emirate" msgid="2893880978835698818">"Emirate"</string>
- <string name="permlab_readHistoryBookmarks" msgid="3775265775405106983">"read your Web bookmarks and history"</string>
- <string name="permdesc_readHistoryBookmarks" msgid="8462378226600439658">"Allows the app to read the history of all URLs that the Browser has visited, and all of the Browser\'s bookmarks. Note: this permission may not be enforced by third-party browsers or other applications with web browsing capabilities."</string>
- <string name="permlab_writeHistoryBookmarks" msgid="3714785165273314490">"write web bookmarks and history"</string>
- <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="6825527469145760922">"Allows the app to modify the Browser\'s history or bookmarks stored on your tablet. This may allow the app to erase or modify Browser data. Note: this permission may note be enforced by third-party browsers or other applications with web browsing capabilities."</string>
- <string name="permdesc_writeHistoryBookmarks" product="tv" msgid="7007393823197766548">"Allows the app to modify the Browser\'s history or bookmarks stored on your TV. This may allow the app to erase or modify Browser data. Note: this permission may note be enforced by third-party browsers or other applications with web browsing capabilities."</string>
- <string name="permdesc_writeHistoryBookmarks" product="default" msgid="8497389531014185509">"Allows the app to modify the Browser\'s history or bookmarks stored on your phone. This may allow the app to erase or modify Browser data. Note: this permission may note be enforced by third-party browsers or other applications with web browsing capabilities."</string>
- <string name="permlab_setAlarm" msgid="1379294556362091814">"set an alarm"</string>
- <string name="permdesc_setAlarm" msgid="316392039157473848">"Allows the app to set an alarm in an installed alarm clock app. Some alarm clock apps may not implement this feature."</string>
- <string name="permlab_addVoicemail" msgid="5525660026090959044">"add voicemail"</string>
- <string name="permdesc_addVoicemail" msgid="6604508651428252437">"Allows the app to add messages to your voicemail inbox."</string>
- <string name="permlab_writeGeolocationPermissions" msgid="5962224158955273932">"modify Browser geolocation permissions"</string>
- <string name="permdesc_writeGeolocationPermissions" msgid="1083743234522638747">"Allows the app to modify the Browser\'s geolocation permissions. Malicious apps may use this to allow sending location information to arbitrary web sites."</string>
- <string name="save_password_message" msgid="767344687139195790">"Do you want the browser to remember this password?"</string>
- <string name="save_password_notnow" msgid="6389675316706699758">"Not now"</string>
- <string name="save_password_remember" msgid="6491879678996749466">"Remember"</string>
- <string name="save_password_never" msgid="8274330296785855105">"Never"</string>
- <string name="open_permission_deny" msgid="7374036708316629800">"You don\'t have permission to open this page."</string>
- <string name="text_copied" msgid="4985729524670131385">"Text copied to clipboard."</string>
- <string name="more_item_label" msgid="4650918923083320495">"More"</string>
- <string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
- <string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
- <string name="menu_ctrl_shortcut_label" msgid="3917070091228880941">"Ctrl+"</string>
- <string name="menu_alt_shortcut_label" msgid="6249849492641218944">"Alt+"</string>
- <string name="menu_shift_shortcut_label" msgid="6773890288720306380">"Shift+"</string>
- <string name="menu_sym_shortcut_label" msgid="4019695553731017933">"Sym+"</string>
- <string name="menu_function_shortcut_label" msgid="1984053777418162618">"Function+"</string>
- <string name="menu_space_shortcut_label" msgid="2410328639272162537">"space"</string>
- <string name="menu_enter_shortcut_label" msgid="2743362785111309668">"enter"</string>
- <string name="menu_delete_shortcut_label" msgid="3658178007202748164">"delete"</string>
- <string name="search_go" msgid="8298016669822141719">"Search"</string>
- <string name="search_hint" msgid="1733947260773056054">"Search…"</string>
- <string name="searchview_description_search" msgid="6749826639098512120">"Search"</string>
- <string name="searchview_description_query" msgid="5911778593125355124">"Search query"</string>
- <string name="searchview_description_clear" msgid="1330281990951833033">"Clear query"</string>
- <string name="searchview_description_submit" msgid="2688450133297983542">"Submit query"</string>
- <string name="searchview_description_voice" msgid="2453203695674994440">"Voice search"</string>
- <string name="enable_explore_by_touch_warning_title" msgid="7460694070309730149">"Enable 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> wants to enable Explore by Touch. When Explore by Touch is turned on, you can hear or see descriptions of what\'s under your finger or perform gestures to interact with the tablet."</string>
- <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> wants to enable Explore by Touch. When Explore by Touch is turned on, you can hear or see descriptions of what\'s under your finger or perform gestures to interact with the phone."</string>
- <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 month ago"</string>
- <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Before 1 month ago"</string>
+ <string name="phoneTypeCustom" msgid="1644738059053355820">"Custom"</string>
+ <string name="phoneTypeHome" msgid="2570923463033985887">"Home"</string>
+ <string name="phoneTypeMobile" msgid="6501463557754751037">"Mobile"</string>
+ <string name="phoneTypeWork" msgid="8863939667059911633">"Work"</string>
+ <string name="phoneTypeFaxWork" msgid="3517792160008890912">"Work Fax"</string>
+ <string name="phoneTypeFaxHome" msgid="2067265972322971467">"Home Fax"</string>
+ <string name="phoneTypePager" msgid="7582359955394921732">"Pager"</string>
+ <string name="phoneTypeOther" msgid="1544425847868765990">"Other"</string>
+ <string name="phoneTypeCallback" msgid="2712175203065678206">"Callback"</string>
+ <string name="phoneTypeCar" msgid="8738360689616716982">"Car"</string>
+ <string name="phoneTypeCompanyMain" msgid="540434356461478916">"Company Main"</string>
+ <string name="phoneTypeIsdn" msgid="8022453193171370337">"ISDN"</string>
+ <string name="phoneTypeMain" msgid="6766137010628326916">"Main"</string>
+ <string name="phoneTypeOtherFax" msgid="8587657145072446565">"Other Fax"</string>
+ <string name="phoneTypeRadio" msgid="4093738079908667513">"Radio"</string>
+ <string name="phoneTypeTelex" msgid="3367879952476250512">"Telex"</string>
+ <string name="phoneTypeTtyTdd" msgid="8606514378585000044">"TTY TDD"</string>
+ <string name="phoneTypeWorkMobile" msgid="1311426989184065709">"Work Mobile"</string>
+ <string name="phoneTypeWorkPager" msgid="649938731231157056">"Work Pager"</string>
+ <string name="phoneTypeAssistant" msgid="5596772636128562884">"Assistant"</string>
+ <string name="phoneTypeMms" msgid="7254492275502768992">"MMS"</string>
+ <string name="eventTypeCustom" msgid="7837586198458073404">"Custom"</string>
+ <string name="eventTypeBirthday" msgid="2813379844211390740">"Birthday"</string>
+ <string name="eventTypeAnniversary" msgid="3876779744518284000">"Anniversary"</string>
+ <string name="eventTypeOther" msgid="7388178939010143077">"Other"</string>
+ <string name="emailTypeCustom" msgid="8525960257804213846">"Custom"</string>
+ <string name="emailTypeHome" msgid="449227236140433919">"Home"</string>
+ <string name="emailTypeWork" msgid="3548058059601149973">"Work"</string>
+ <string name="emailTypeOther" msgid="2923008695272639549">"Other"</string>
+ <string name="emailTypeMobile" msgid="119919005321166205">"Mobile"</string>
+ <string name="postalTypeCustom" msgid="8903206903060479902">"Custom"</string>
+ <string name="postalTypeHome" msgid="8165756977184483097">"Home"</string>
+ <string name="postalTypeWork" msgid="5268172772387694495">"Work"</string>
+ <string name="postalTypeOther" msgid="2726111966623584341">"Other"</string>
+ <string name="imTypeCustom" msgid="2074028755527826046">"Custom"</string>
+ <string name="imTypeHome" msgid="6241181032954263892">"Home"</string>
+ <string name="imTypeWork" msgid="1371489290242433090">"Work"</string>
+ <string name="imTypeOther" msgid="5377007495735915478">"Other"</string>
+ <string name="imProtocolCustom" msgid="6919453836618749992">"Custom"</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">"Work"</string>
+ <string name="orgTypeOther" msgid="3951781131570124082">"Other"</string>
+ <string name="orgTypeCustom" msgid="225523415372088322">"Custom"</string>
+ <string name="relationTypeCustom" msgid="3542403679827297300">"Custom"</string>
+ <string name="relationTypeAssistant" msgid="6274334825195379076">"Assistant"</string>
+ <string name="relationTypeBrother" msgid="8757913506784067713">"Brother"</string>
+ <string name="relationTypeChild" msgid="1890746277276881626">"Child"</string>
+ <string name="relationTypeDomesticPartner" msgid="6904807112121122133">"Domestic Partner"</string>
+ <string name="relationTypeFather" msgid="5228034687082050725">"Father"</string>
+ <string name="relationTypeFriend" msgid="7313106762483391262">"Friend"</string>
+ <string name="relationTypeManager" msgid="6365677861610137895">"Manager"</string>
+ <string name="relationTypeMother" msgid="4578571352962758304">"Mother"</string>
+ <string name="relationTypeParent" msgid="4755635567562925226">"Parent"</string>
+ <string name="relationTypePartner" msgid="7266490285120262781">"Partner"</string>
+ <string name="relationTypeReferredBy" msgid="101573059844135524">"Referred by"</string>
+ <string name="relationTypeRelative" msgid="1799819930085610271">"Relative"</string>
+ <string name="relationTypeSister" msgid="1735983554479076481">"Sister"</string>
+ <string name="relationTypeSpouse" msgid="394136939428698117">"Spouse"</string>
+ <string name="sipAddressTypeCustom" msgid="2473580593111590945">"Custom"</string>
+ <string name="sipAddressTypeHome" msgid="6093598181069359295">"Home"</string>
+ <string name="sipAddressTypeWork" msgid="6920725730797099047">"Work"</string>
+ <string name="sipAddressTypeOther" msgid="4408436162950119849">"Other"</string>
+ <string name="quick_contacts_not_available" msgid="746098007828579688">"No application found to view this contact."</string>
+ <string name="keyguard_password_enter_pin_code" msgid="3037685796058495017">"Type PIN code"</string>
+ <string name="keyguard_password_enter_puk_code" msgid="4800725266925845333">"Type PUK and new PIN code"</string>
+ <string name="keyguard_password_enter_puk_prompt" msgid="1341112146710087048">"PUK code"</string>
+ <string name="keyguard_password_enter_pin_prompt" msgid="8027680321614196258">"New PIN code"</string>
+ <string name="keyguard_password_entry_touch_hint" msgid="2644215452200037944">""<font size="17">"Tap to type password"</font>""</string>
+ <string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"Type password to unlock"</string>
+ <string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"Type PIN to unlock"</string>
+ <string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"Incorrect PIN code."</string>
+ <string name="keyguard_label_text" msgid="861796461028298424">"To unlock, press Menu then 0."</string>
+ <string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"Emergency number"</string>
+ <string name="lockscreen_carrier_default" msgid="6169005837238288522">"No service"</string>
+ <string name="lockscreen_screen_locked" msgid="7288443074806832904">"Screen locked."</string>
+ <string name="lockscreen_instructions_when_pattern_enabled" msgid="46154051614126049">"Press Menu to unlock or place emergency call."</string>
+ <string name="lockscreen_instructions_when_pattern_disabled" msgid="686260028797158364">"Press Menu to unlock."</string>
+ <string name="lockscreen_pattern_instructions" msgid="7478703254964810302">"Draw pattern to unlock"</string>
+ <string name="lockscreen_emergency_call" msgid="5298642613417801888">"Emergency"</string>
+ <string name="lockscreen_return_to_call" msgid="5244259785500040021">"Return to call"</string>
+ <string name="lockscreen_pattern_correct" msgid="9039008650362261237">"Correct!"</string>
+ <string name="lockscreen_pattern_wrong" msgid="4317955014948108794">"Try again"</string>
+ <string name="lockscreen_password_wrong" msgid="5737815393253165301">"Try again"</string>
+ <string name="lockscreen_storage_locked" msgid="9167551160010625200">"Unlock for all features and data"</string>
+ <string name="faceunlock_multiple_failures" msgid="754137583022792429">"Maximum Face Unlock attempts exceeded"</string>
+ <string name="lockscreen_missing_sim_message_short" msgid="5099439277819215399">"No SIM card"</string>
+ <string name="lockscreen_missing_sim_message" product="tablet" msgid="151659196095791474">"No SIM card in tablet."</string>
+ <string name="lockscreen_missing_sim_message" product="tv" msgid="1943633865476989599">"No SIM card in TV."</string>
+ <string name="lockscreen_missing_sim_message" product="default" msgid="2186920585695169078">"No SIM card in phone."</string>
+ <string name="lockscreen_missing_sim_instructions" msgid="5372787138023272615">"Insert a SIM card."</string>
+ <string name="lockscreen_missing_sim_instructions_long" msgid="3526573099019319472">"The SIM card is missing or not readable. Insert a SIM card."</string>
+ <string name="lockscreen_permanent_disabled_sim_message_short" msgid="5096149665138916184">"Unusable SIM card."</string>
+ <string name="lockscreen_permanent_disabled_sim_instructions" msgid="910904643433151371">"Your SIM card has been permanently disabled.\n Contact your wireless service provider for another SIM card."</string>
+ <string name="lockscreen_transport_prev_description" msgid="6300840251218161534">"Previous track"</string>
+ <string name="lockscreen_transport_next_description" msgid="573285210424377338">"Next track"</string>
+ <string name="lockscreen_transport_pause_description" msgid="3980308465056173363">"Pause"</string>
+ <string name="lockscreen_transport_play_description" msgid="1901258823643886401">"Play"</string>
+ <string name="lockscreen_transport_stop_description" msgid="5907083260651210034">"Stop"</string>
+ <string name="lockscreen_transport_rew_description" msgid="6944412838651990410">"Rewind"</string>
+ <string name="lockscreen_transport_ffw_description" msgid="42987149870928985">"Fast forward"</string>
+ <string name="emergency_calls_only" msgid="6733978304386365407">"Emergency calls only"</string>
+ <string name="lockscreen_network_locked_message" msgid="143389224986028501">"Network locked"</string>
+ <string name="lockscreen_sim_puk_locked_message" msgid="7441797339976230">"SIM card is PUK-locked."</string>
+ <string name="lockscreen_sim_puk_locked_instructions" msgid="8127916255245181063">"See the User Guide or contact Customer Care."</string>
+ <string name="lockscreen_sim_locked_message" msgid="8066660129206001039">"SIM card is locked."</string>
+ <string name="lockscreen_sim_unlock_progress_dialog_message" msgid="595323214052881264">"Unlocking SIM card…"</string>
+ <string name="lockscreen_too_many_failed_attempts_dialog_message" msgid="6481623830344107222">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
+ <string name="lockscreen_too_many_failed_password_attempts_dialog_message" msgid="2725973286239344555">"You have incorrectly typed your password <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
+ <string name="lockscreen_too_many_failed_pin_attempts_dialog_message" msgid="6216672706545696955">"You have incorrectly typed your PIN <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
+ <string name="lockscreen_failed_attempts_almost_glogin" product="tablet" msgid="9191611984625460820">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your tablet using your Google signin.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
+ <string name="lockscreen_failed_attempts_almost_glogin" product="tv" msgid="5316664559603394684">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your TV using your Google signin.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
+ <string name="lockscreen_failed_attempts_almost_glogin" product="default" msgid="2590227559763762751">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using your Google signin.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
+ <string name="lockscreen_failed_attempts_almost_at_wipe" product="tablet" msgid="6128106399745755604">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the tablet will be reset to factory default and all user data will be lost."</string>
+ <string name="lockscreen_failed_attempts_almost_at_wipe" product="tv" msgid="950408382418270260">"You have incorrectly attempted to unlock the TV <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the TV will be reset to factory default and all user data will be lost."</string>
+ <string name="lockscreen_failed_attempts_almost_at_wipe" product="default" msgid="8603565142156826565">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the phone will be reset to factory default and all user data will be lost."</string>
+ <string name="lockscreen_failed_attempts_now_wiping" product="tablet" msgid="280873516493934365">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER">%d</xliff:g> times. The tablet will now be reset to factory default."</string>
+ <string name="lockscreen_failed_attempts_now_wiping" product="tv" msgid="3195755534096192191">"You have incorrectly attempted to unlock the TV <xliff:g id="NUMBER">%d</xliff:g> times. The TV will now be reset to factory default."</string>
+ <string name="lockscreen_failed_attempts_now_wiping" product="default" msgid="3025504721764922246">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER">%d</xliff:g> times. The phone will now be reset to factory default."</string>
+ <string name="lockscreen_too_many_failed_attempts_countdown" msgid="6251480343394389665">"Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds."</string>
+ <string name="lockscreen_forgot_pattern_button_text" msgid="2626999449610695930">"Forgot pattern?"</string>
+ <string name="lockscreen_glogin_forgot_pattern" msgid="2588521501166032747">"Account unlock"</string>
+ <string name="lockscreen_glogin_too_many_attempts" msgid="2751368605287288808">"Too many pattern attempts"</string>
+ <string name="lockscreen_glogin_instructions" msgid="3931816256100707784">"To unlock, sign in with your Google account."</string>
+ <string name="lockscreen_glogin_username_hint" msgid="8846881424106484447">"Username (email)"</string>
+ <string name="lockscreen_glogin_password_hint" msgid="5958028383954738528">"Password"</string>
+ <string name="lockscreen_glogin_submit_button" msgid="7130893694795786300">"Sign in"</string>
+ <string name="lockscreen_glogin_invalid_input" msgid="1364051473347485908">"Invalid username or password."</string>
+ <string name="lockscreen_glogin_account_recovery_hint" msgid="1696924763690379073">"Forgot your username or password?\nVisit "<b>"google.com/accounts/recovery"</b>"."</string>
+ <string name="lockscreen_glogin_checking_password" msgid="7114627351286933867">"Checking…"</string>
+ <string name="lockscreen_unlock_label" msgid="737440483220667054">"Unlock"</string>
+ <string name="lockscreen_sound_on_label" msgid="9068877576513425970">"Sound on"</string>
+ <string name="lockscreen_sound_off_label" msgid="996822825154319026">"Sound off"</string>
+ <string name="lockscreen_access_pattern_start" msgid="3941045502933142847">"Pattern started"</string>
+ <string name="lockscreen_access_pattern_cleared" msgid="5583479721001639579">"Pattern cleared"</string>
+ <string name="lockscreen_access_pattern_cell_added" msgid="6756031208359292487">"Cell added"</string>
+ <string name="lockscreen_access_pattern_cell_added_verbose" msgid="7264580781744026939">"Cell <xliff:g id="CELL_INDEX">%1$s</xliff:g> added"</string>
+ <string name="lockscreen_access_pattern_detected" msgid="4988730895554057058">"Pattern completed"</string>
+ <string name="lockscreen_access_pattern_area" msgid="400813207572953209">"Pattern area."</string>
+ <string name="keyguard_accessibility_widget_changed" msgid="5678624624681400191">"%1$s. Widget %2$d of %3$d."</string>
+ <string name="keyguard_accessibility_add_widget" msgid="8273277058724924654">"Add widget."</string>
+ <string name="keyguard_accessibility_widget_empty_slot" msgid="1281505703307930757">"Empty"</string>
+ <string name="keyguard_accessibility_unlock_area_expanded" msgid="2278106022311170299">"Unlock area expanded."</string>
+ <string name="keyguard_accessibility_unlock_area_collapsed" msgid="6366992066936076396">"Unlock area collapsed."</string>
+ <string name="keyguard_accessibility_widget" msgid="6527131039741808240">"<xliff:g id="WIDGET_INDEX">%1$s</xliff:g> widget."</string>
+ <string name="keyguard_accessibility_user_selector" msgid="1226798370913698896">"User selector"</string>
+ <string name="keyguard_accessibility_status" msgid="8008264603935930611">"Status"</string>
+ <string name="keyguard_accessibility_camera" msgid="8904231194181114603">"Camera"</string>
+ <string name="keygaurd_accessibility_media_controls" msgid="262209654292161806">"Media controls"</string>
+ <string name="keyguard_accessibility_widget_reorder_start" msgid="8736853615588828197">"Widget reordering started."</string>
+ <string name="keyguard_accessibility_widget_reorder_end" msgid="7170190950870468320">"Widget reordering ended."</string>
+ <string name="keyguard_accessibility_widget_deleted" msgid="4426204263929224434">"Widget <xliff:g id="WIDGET_INDEX">%1$s</xliff:g> deleted."</string>
+ <string name="keyguard_accessibility_expand_lock_area" msgid="519859720934178024">"Expand unlock area."</string>
+ <string name="keyguard_accessibility_slide_unlock" msgid="2959928478764697254">"Slide unlock."</string>
+ <string name="keyguard_accessibility_pattern_unlock" msgid="1490840706075246612">"Pattern unlock."</string>
+ <string name="keyguard_accessibility_face_unlock" msgid="4817282543351718535">"Face unlock."</string>
+ <string name="keyguard_accessibility_pin_unlock" msgid="2469687111784035046">"Pin unlock."</string>
+ <string name="keyguard_accessibility_sim_pin_unlock" msgid="9149698847116962307">"Sim Pin unlock."</string>
+ <string name="keyguard_accessibility_sim_puk_unlock" msgid="9106899279724723341">"Sim Puk unlock."</string>
+ <string name="keyguard_accessibility_password_unlock" msgid="7675777623912155089">"Password unlock."</string>
+ <string name="keyguard_accessibility_pattern_area" msgid="7679891324509597904">"Pattern area."</string>
+ <string name="keyguard_accessibility_slide_area" msgid="6736064494019979544">"Slide area."</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">"character"</string>
+ <string name="granularity_label_word" msgid="7075570328374918660">"word"</string>
+ <string name="granularity_label_link" msgid="5815508880782488267">"link"</string>
+ <string name="granularity_label_line" msgid="5764267235026120888">"line"</string>
+ <string name="factorytest_failed" msgid="5410270329114212041">"Factory test failed"</string>
+ <string name="factorytest_not_system" msgid="4435201656767276723">"The FACTORY_TEST action is only supported for packages installed in /system/app."</string>
+ <string name="factorytest_no_action" msgid="872991874799998561">"No package was found that provides the FACTORY_TEST action."</string>
+ <string name="factorytest_reboot" msgid="6320168203050791643">"Reboot"</string>
+ <string name="js_dialog_title" msgid="1987483977834603872">"The page at \"<xliff:g id="TITLE">%s</xliff:g>\" says:"</string>
+ <string name="js_dialog_title_default" msgid="6961903213729667573">"JavaScript"</string>
+ <string name="js_dialog_before_unload_title" msgid="2619376555525116593">"Confirm Navigation"</string>
+ <string name="js_dialog_before_unload_positive_button" msgid="3112752010600484130">"Leave this Page"</string>
+ <string name="js_dialog_before_unload_negative_button" msgid="5614861293026099715">"Stay on this Page"</string>
+ <string name="js_dialog_before_unload" msgid="3468816357095378590">"<xliff:g id="MESSAGE">%s</xliff:g>\n\nAre you sure you want to navigate away from this page?"</string>
+ <string name="save_password_label" msgid="6860261758665825069">"Confirm"</string>
+ <string name="double_tap_toast" msgid="4595046515400268881">"Tip: Double-tap to zoom in and out."</string>
+ <string name="autofill_this_form" msgid="4616758841157816676">"Autofill"</string>
+ <string name="setup_autofill" msgid="7103495070180590814">"Set up Autofill"</string>
+ <string name="autofill_window_title" msgid="4107745526909284887">"Autofill with <xliff:g id="SERVICENAME">%1$s</xliff:g>"</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">"Province"</string>
+ <string name="autofill_postal_code" msgid="4696430407689377108">"Postal code"</string>
+ <string name="autofill_state" msgid="6988894195520044613">"State"</string>
+ <string name="autofill_zip_code" msgid="8697544592627322946">"ZIP code"</string>
+ <string name="autofill_county" msgid="237073771020362891">"County"</string>
+ <string name="autofill_island" msgid="4020100875984667025">"Island"</string>
+ <string name="autofill_district" msgid="8400735073392267672">"District"</string>
+ <string name="autofill_department" msgid="5343279462564453309">"Department"</string>
+ <string name="autofill_prefecture" msgid="2028499485065800419">"Prefecture"</string>
+ <string name="autofill_parish" msgid="8202206105468820057">"Parish"</string>
+ <string name="autofill_area" msgid="3547409050889952423">"Area"</string>
+ <string name="autofill_emirate" msgid="2893880978835698818">"Emirate"</string>
+ <string name="permlab_readHistoryBookmarks" msgid="3775265775405106983">"read your Web bookmarks and history"</string>
+ <string name="permdesc_readHistoryBookmarks" msgid="8462378226600439658">"Allows the app to read the history of all URLs that the Browser has visited, and all of the Browser\'s bookmarks. Note: this permission may not be enforced by third-party browsers or other applications with web browsing capabilities."</string>
+ <string name="permlab_writeHistoryBookmarks" msgid="3714785165273314490">"write web bookmarks and history"</string>
+ <string name="permdesc_writeHistoryBookmarks" product="tablet" msgid="6825527469145760922">"Allows the app to modify the Browser\'s history or bookmarks stored on your tablet. This may allow the app to erase or modify Browser data. Note: this permission may note be enforced by third-party browsers or other applications with web browsing capabilities."</string>
+ <string name="permdesc_writeHistoryBookmarks" product="tv" msgid="7007393823197766548">"Allows the app to modify the Browser\'s history or bookmarks stored on your TV. This may allow the app to erase or modify Browser data. Note: this permission may note be enforced by third-party browsers or other applications with web browsing capabilities."</string>
+ <string name="permdesc_writeHistoryBookmarks" product="default" msgid="8497389531014185509">"Allows the app to modify the Browser\'s history or bookmarks stored on your phone. This may allow the app to erase or modify Browser data. Note: this permission may note be enforced by third-party browsers or other applications with web browsing capabilities."</string>
+ <string name="permlab_setAlarm" msgid="1379294556362091814">"set an alarm"</string>
+ <string name="permdesc_setAlarm" msgid="316392039157473848">"Allows the app to set an alarm in an installed alarm clock app. Some alarm clock apps may not implement this feature."</string>
+ <string name="permlab_addVoicemail" msgid="5525660026090959044">"add voicemail"</string>
+ <string name="permdesc_addVoicemail" msgid="6604508651428252437">"Allows the app to add messages to your voicemail inbox."</string>
+ <string name="permlab_writeGeolocationPermissions" msgid="5962224158955273932">"modify Browser geolocation permissions"</string>
+ <string name="permdesc_writeGeolocationPermissions" msgid="1083743234522638747">"Allows the app to modify the Browser\'s geolocation permissions. Malicious apps may use this to allow sending location information to arbitrary web sites."</string>
+ <string name="save_password_message" msgid="767344687139195790">"Do you want the browser to remember this password?"</string>
+ <string name="save_password_notnow" msgid="6389675316706699758">"Not now"</string>
+ <string name="save_password_remember" msgid="6491879678996749466">"Remember"</string>
+ <string name="save_password_never" msgid="8274330296785855105">"Never"</string>
+ <string name="open_permission_deny" msgid="7374036708316629800">"You don\'t have permission to open this page."</string>
+ <string name="text_copied" msgid="4985729524670131385">"Text copied to clipboard."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
+ <string name="more_item_label" msgid="4650918923083320495">"More"</string>
+ <string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
+ <string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
+ <string name="menu_ctrl_shortcut_label" msgid="3917070091228880941">"Ctrl+"</string>
+ <string name="menu_alt_shortcut_label" msgid="6249849492641218944">"Alt+"</string>
+ <string name="menu_shift_shortcut_label" msgid="6773890288720306380">"Shift+"</string>
+ <string name="menu_sym_shortcut_label" msgid="4019695553731017933">"Sym+"</string>
+ <string name="menu_function_shortcut_label" msgid="1984053777418162618">"Function+"</string>
+ <string name="menu_space_shortcut_label" msgid="2410328639272162537">"space"</string>
+ <string name="menu_enter_shortcut_label" msgid="2743362785111309668">"enter"</string>
+ <string name="menu_delete_shortcut_label" msgid="3658178007202748164">"delete"</string>
+ <string name="search_go" msgid="8298016669822141719">"Search"</string>
+ <string name="search_hint" msgid="1733947260773056054">"Search…"</string>
+ <string name="searchview_description_search" msgid="6749826639098512120">"Search"</string>
+ <string name="searchview_description_query" msgid="5911778593125355124">"Search query"</string>
+ <string name="searchview_description_clear" msgid="1330281990951833033">"Clear query"</string>
+ <string name="searchview_description_submit" msgid="2688450133297983542">"Submit query"</string>
+ <string name="searchview_description_voice" msgid="2453203695674994440">"Voice search"</string>
+ <string name="enable_explore_by_touch_warning_title" msgid="7460694070309730149">"Enable 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> wants to enable Explore by Touch. When Explore by Touch is turned on, you can hear or see descriptions of what\'s under your finger or perform gestures to interact with the tablet."</string>
+ <string name="enable_explore_by_touch_warning_message" product="default" msgid="2708199672852373195">"<xliff:g id="ACCESSIBILITY_SERVICE_NAME">%1$s</xliff:g> wants to enable Explore by Touch. When Explore by Touch is turned on, you can hear or see descriptions of what\'s under your finger or perform gestures to interact with the phone."</string>
+ <string name="oneMonthDurationPast" msgid="7396384508953779925">"1 month ago"</string>
+ <string name="beforeOneMonthDurationPast" msgid="909134546836499826">"Before 1 month ago"</string>
<plurals name="last_num_days" formatted="false" msgid="5104533550723932025">
- <item quantity="other">Last <xliff:g id="COUNT_1">%d</xliff:g> days</item>
- <item quantity="one">Last <xliff:g id="COUNT_0">%d</xliff:g> day</item>
+ <item quantity="other">Last <xliff:g id="COUNT_1">%d</xliff:g> days</item>
+ <item quantity="one">Last <xliff:g id="COUNT_0">%d</xliff:g> day</item>
</plurals>
- <string name="last_month" msgid="3959346739979055432">"Last month"</string>
- <string name="older" msgid="5211975022815554840">"Older"</string>
- <string name="preposition_for_date" msgid="9093949757757445117">"on <xliff:g id="DATE">%s</xliff:g>"</string>
- <string name="preposition_for_time" msgid="5506831244263083793">"at <xliff:g id="TIME">%s</xliff:g>"</string>
- <string name="preposition_for_year" msgid="5040395640711867177">"in <xliff:g id="YEAR">%s</xliff:g>"</string>
- <string name="day" msgid="8144195776058119424">"day"</string>
- <string name="days" msgid="4774547661021344602">"days"</string>
- <string name="hour" msgid="2126771916426189481">"hour"</string>
- <string name="hours" msgid="894424005266852993">"hours"</string>
- <string name="minute" msgid="9148878657703769868">"min"</string>
- <string name="minutes" msgid="5646001005827034509">"mins"</string>
- <string name="second" msgid="3184235808021478">"sec"</string>
- <string name="seconds" msgid="3161515347216589235">"secs"</string>
- <string name="week" msgid="5617961537173061583">"week"</string>
- <string name="weeks" msgid="6509623834583944518">"weeks"</string>
- <string name="year" msgid="4001118221013892076">"year"</string>
- <string name="years" msgid="6881577717993213522">"years"</string>
- <string name="now_string_shortest" msgid="8912796667087856402">"now"</string>
+ <string name="last_month" msgid="3959346739979055432">"Last month"</string>
+ <string name="older" msgid="5211975022815554840">"Older"</string>
+ <string name="preposition_for_date" msgid="9093949757757445117">"on <xliff:g id="DATE">%s</xliff:g>"</string>
+ <string name="preposition_for_time" msgid="5506831244263083793">"at <xliff:g id="TIME">%s</xliff:g>"</string>
+ <string name="preposition_for_year" msgid="5040395640711867177">"in <xliff:g id="YEAR">%s</xliff:g>"</string>
+ <string name="day" msgid="8144195776058119424">"day"</string>
+ <string name="days" msgid="4774547661021344602">"days"</string>
+ <string name="hour" msgid="2126771916426189481">"hour"</string>
+ <string name="hours" msgid="894424005266852993">"hours"</string>
+ <string name="minute" msgid="9148878657703769868">"min"</string>
+ <string name="minutes" msgid="5646001005827034509">"mins"</string>
+ <string name="second" msgid="3184235808021478">"sec"</string>
+ <string name="seconds" msgid="3161515347216589235">"secs"</string>
+ <string name="week" msgid="5617961537173061583">"week"</string>
+ <string name="weeks" msgid="6509623834583944518">"weeks"</string>
+ <string name="year" msgid="4001118221013892076">"year"</string>
+ <string name="years" msgid="6881577717993213522">"years"</string>
+ <string name="now_string_shortest" msgid="8912796667087856402">"now"</string>
<plurals name="duration_minutes_shortest" formatted="false" msgid="3957499975064245495">
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>m</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>m</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>m</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>m</item>
</plurals>
<plurals name="duration_hours_shortest" formatted="false" msgid="3552182110578602356">
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>h</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>h</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>h</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>h</item>
</plurals>
<plurals name="duration_days_shortest" formatted="false" msgid="5213655532597081640">
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>d</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>d</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>d</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>d</item>
</plurals>
<plurals name="duration_years_shortest" formatted="false" msgid="7848711145196397042">
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>y</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>y</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g>y</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g>y</item>
</plurals>
<plurals name="duration_minutes_shortest_future" formatted="false" msgid="3277614521231489951">
- <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g>m</item>
- <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g>m</item>
+ <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g>m</item>
+ <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g>m</item>
</plurals>
<plurals name="duration_hours_shortest_future" formatted="false" msgid="2152452368397489370">
- <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g>h</item>
- <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g>h</item>
+ <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g>h</item>
+ <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g>h</item>
</plurals>
<plurals name="duration_days_shortest_future" formatted="false" msgid="8088331502820295701">
- <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g>d</item>
- <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g>d</item>
+ <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g>d</item>
+ <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g>d</item>
</plurals>
<plurals name="duration_years_shortest_future" formatted="false" msgid="2317006667145250301">
- <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g>y</item>
- <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g>y</item>
+ <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g>y</item>
+ <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g>y</item>
</plurals>
<plurals name="duration_minutes_relative" formatted="false" msgid="3178131706192980192">
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes ago</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minute ago</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> minutes ago</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> minute ago</item>
</plurals>
<plurals name="duration_hours_relative" formatted="false" msgid="676894109982008411">
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hours ago</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hour ago</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> hours ago</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> hour ago</item>
</plurals>
<plurals name="duration_days_relative" formatted="false" msgid="2203515825765397130">
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> days ago</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> day ago</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> days ago</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> day ago</item>
</plurals>
<plurals name="duration_years_relative" formatted="false" msgid="4820062134188885734">
- <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> years ago</item>
- <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> year ago</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%d</xliff:g> years ago</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%d</xliff:g> year ago</item>
</plurals>
<plurals name="duration_minutes_relative_future" formatted="false" msgid="4655043589817680966">
- <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
- <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> minute</item>
+ <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> minutes</item>
+ <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> minute</item>
</plurals>
<plurals name="duration_hours_relative_future" formatted="false" msgid="8084579714205223891">
- <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> hours</item>
- <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> hour</item>
+ <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> hours</item>
+ <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> hour</item>
</plurals>
<plurals name="duration_days_relative_future" formatted="false" msgid="333215369363433992">
- <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> days</item>
- <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> day</item>
+ <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> days</item>
+ <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> day</item>
</plurals>
<plurals name="duration_years_relative_future" formatted="false" msgid="8644862986413104011">
- <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> years</item>
- <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> year</item>
+ <item quantity="other">in <xliff:g id="COUNT_1">%d</xliff:g> years</item>
+ <item quantity="one">in <xliff:g id="COUNT_0">%d</xliff:g> year</item>
</plurals>
- <string name="VideoView_error_title" msgid="3534509135438353077">"Video problem"</string>
- <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"This video isn\'t valid for streaming to this device."</string>
- <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Can\'t play this video."</string>
- <string name="VideoView_error_button" msgid="2822238215100679592">"OK"</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">"noon"</string>
- <string name="Noon" msgid="3342127745230013127">"Noon"</string>
- <string name="midnight" msgid="7166259508850457595">"midnight"</string>
- <string name="Midnight" msgid="5630806906897892201">"Midnight"</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">"Select all"</string>
- <string name="cut" msgid="3092569408438626261">"Cut"</string>
- <string name="copy" msgid="2681946229533511987">"Copy"</string>
- <string name="failed_to_copy_to_clipboard" msgid="1833662432489814471">"Failed to copy to clipboard"</string>
- <string name="paste" msgid="5629880836805036433">"Paste"</string>
- <string name="paste_as_plain_text" msgid="5427792741908010675">"Paste as plain text"</string>
- <string name="replace" msgid="5781686059063148930">"Replace…"</string>
- <string name="delete" msgid="6098684844021697789">"Delete"</string>
- <string name="copyUrl" msgid="2538211579596067402">"Copy URL"</string>
- <string name="selectTextMode" msgid="1018691815143165326">"Select text"</string>
- <string name="undo" msgid="7905788502491742328">"Undo"</string>
- <string name="redo" msgid="7759464876566803888">"Redo"</string>
- <string name="autofill" msgid="3035779615680565188">"Autofill"</string>
- <string name="textSelectionCABTitle" msgid="5236850394370820357">"Text selection"</string>
- <string name="addToDictionary" msgid="4352161534510057874">"Add to dictionary"</string>
- <string name="deleteText" msgid="6979668428458199034">"Delete"</string>
- <string name="inputMethod" msgid="1653630062304567879">"Input method"</string>
- <string name="editTextMenuTitle" msgid="4909135564941815494">"Text actions"</string>
- <string name="email" msgid="4560673117055050403">"Email"</string>
- <string name="email_desc" msgid="3638665569546416795">"Email selected address"</string>
- <string name="dial" msgid="1253998302767701559">"Call"</string>
- <string name="dial_desc" msgid="6573723404985517250">"Call selected phone number"</string>
- <string name="map" msgid="5441053548030107189">"Map"</string>
- <string name="map_desc" msgid="1836995341943772348">"Locate selected address"</string>
- <string name="browse" msgid="1245903488306147205">"Open"</string>
- <string name="browse_desc" msgid="8220976549618935044">"Open selected URL"</string>
- <string name="sms" msgid="4560537514610063430">"Message"</string>
- <string name="sms_desc" msgid="7526588350969638809">"Message selected phone number"</string>
- <string name="add_contact" msgid="7867066569670597203">"Add"</string>
- <string name="add_contact_desc" msgid="4830217847004590345">"Add to contacts"</string>
- <string name="view_calendar" msgid="979609872939597838">"View"</string>
- <string name="view_calendar_desc" msgid="5828320291870344584">"View selected time in calendar"</string>
- <string name="add_calendar_event" msgid="1953664627192056206">"Schedule"</string>
- <string name="add_calendar_event_desc" msgid="4326891793260687388">"Schedule event for selected time"</string>
- <string name="view_flight" msgid="7691640491425680214">"Track"</string>
- <string name="view_flight_desc" msgid="3876322502674253506">"Track selected flight"</string>
- <string name="translate" msgid="9218619809342576858">"Translate"</string>
- <string name="translate_desc" msgid="4502367770068777202">"Translate selected text"</string>
- <string name="define" msgid="7394820043869954211">"Define"</string>
- <string name="define_desc" msgid="7910883642444919726">"Define selected text"</string>
- <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Storage space running out"</string>
- <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Some system functions may not work"</string>
- <string name="low_internal_storage_view_text_no_boot" msgid="6935190099204693424">"Not enough storage for the system. Make sure you have 250MB of free space and restart."</string>
- <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> is running"</string>
- <string name="app_running_notification_text" msgid="1197581823314971177">"Tap for more information or to stop the app."</string>
- <string name="ok" msgid="5970060430562524910">"OK"</string>
- <string name="cancel" msgid="6442560571259935130">"Cancel"</string>
- <string name="yes" msgid="5362982303337969312">"OK"</string>
- <string name="no" msgid="5141531044935541497">"Cancel"</string>
- <string name="dialog_alert_title" msgid="2049658708609043103">"Attention"</string>
- <string name="loading" msgid="7933681260296021180">"Loading…"</string>
- <string name="capital_on" msgid="1544682755514494298">"ON"</string>
- <string name="capital_off" msgid="6815870386972805832">"OFF"</string>
- <string name="whichApplication" msgid="4533185947064773386">"Complete action using"</string>
- <string name="whichApplicationNamed" msgid="8260158865936942783">"Complete action using %1$s"</string>
- <string name="whichApplicationLabel" msgid="7425855495383818784">"Complete action"</string>
- <string name="whichViewApplication" msgid="3272778576700572102">"Open with"</string>
- <string name="whichViewApplicationNamed" msgid="2286418824011249620">"Open with %1$s"</string>
- <string name="whichViewApplicationLabel" msgid="2666774233008808473">"Open"</string>
- <string name="whichGiveAccessToApplication" msgid="8279395245414707442">"Give access to open <xliff:g id="HOST">%1$s</xliff:g> links with"</string>
- <string name="whichGiveAccessToApplicationNamed" msgid="7992388824107710849">"Give access to open <xliff:g id="HOST">%1$s</xliff:g> links with <xliff:g id="APPLICATION">%2$s</xliff:g>"</string>
- <string name="whichGiveAccessToApplicationLabel" msgid="6142688895536868827">"Give access"</string>
- <string name="whichEditApplication" msgid="144727838241402655">"Edit with"</string>
- <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit with %1$s"</string>
- <string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Share with"</string>
- <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string>
- <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Share"</string>
- <string name="whichSendToApplication" msgid="8272422260066642057">"Send using"</string>
- <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Send using %1$s"</string>
- <string name="whichSendToApplicationLabel" msgid="8878962419005813500">"Send"</string>
- <string name="whichHomeApplication" msgid="4307587691506919691">"Select a Home app"</string>
- <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Use %1$s as Home"</string>
- <string name="whichHomeApplicationLabel" msgid="809529747002918649">"Capture image"</string>
- <string name="whichImageCaptureApplication" msgid="3680261417470652882">"Capture image with"</string>
- <string name="whichImageCaptureApplicationNamed" msgid="8619384150737825003">"Capture image with %1$s"</string>
- <string name="whichImageCaptureApplicationLabel" msgid="6390303445371527066">"Capture image"</string>
- <string name="alwaysUse" msgid="4583018368000610438">"Use by default for this action."</string>
- <string name="use_a_different_app" msgid="8134926230585710243">"Use a different app"</string>
- <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Clear default in System settings > Apps > Downloaded."</string>
- <string name="chooseActivity" msgid="7486876147751803333">"Choose an action"</string>
- <string name="chooseUsbActivity" msgid="6894748416073583509">"Choose an app for the USB device"</string>
- <string name="noApplications" msgid="2991814273936504689">"No apps can perform this action."</string>
- <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> has stopped"</string>
- <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> has stopped"</string>
- <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> keeps stopping"</string>
- <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> keeps stopping"</string>
- <string name="aerr_restart" msgid="7581308074153624475">"Open app again"</string>
- <string name="aerr_report" msgid="5371800241488400617">"Send feedback"</string>
- <string name="aerr_close" msgid="2991640326563991340">"Close"</string>
- <string name="aerr_mute" msgid="1974781923723235953">"Mute until device restarts"</string>
- <string name="aerr_wait" msgid="3199956902437040261">"Wait"</string>
- <string name="aerr_close_app" msgid="3269334853724920302">"Close app"</string>
+ <string name="VideoView_error_title" msgid="3534509135438353077">"Video problem"</string>
+ <string name="VideoView_error_text_invalid_progressive_playback" msgid="3186670335938670444">"This video isn\'t valid for streaming to this device."</string>
+ <string name="VideoView_error_text_unknown" msgid="3450439155187810085">"Can\'t play this video."</string>
+ <string name="VideoView_error_button" msgid="2822238215100679592">"OK"</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">"noon"</string>
+ <string name="Noon" msgid="3342127745230013127">"Noon"</string>
+ <string name="midnight" msgid="7166259508850457595">"midnight"</string>
+ <string name="Midnight" msgid="5630806906897892201">"Midnight"</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">"Select all"</string>
+ <string name="cut" msgid="3092569408438626261">"Cut"</string>
+ <string name="copy" msgid="2681946229533511987">"Copy"</string>
+ <string name="failed_to_copy_to_clipboard" msgid="1833662432489814471">"Failed to copy to clipboard"</string>
+ <string name="paste" msgid="5629880836805036433">"Paste"</string>
+ <string name="paste_as_plain_text" msgid="5427792741908010675">"Paste as plain text"</string>
+ <string name="replace" msgid="5781686059063148930">"Replace…"</string>
+ <string name="delete" msgid="6098684844021697789">"Delete"</string>
+ <string name="copyUrl" msgid="2538211579596067402">"Copy URL"</string>
+ <string name="selectTextMode" msgid="1018691815143165326">"Select text"</string>
+ <string name="undo" msgid="7905788502491742328">"Undo"</string>
+ <string name="redo" msgid="7759464876566803888">"Redo"</string>
+ <string name="autofill" msgid="3035779615680565188">"Autofill"</string>
+ <string name="textSelectionCABTitle" msgid="5236850394370820357">"Text selection"</string>
+ <string name="addToDictionary" msgid="4352161534510057874">"Add to dictionary"</string>
+ <string name="deleteText" msgid="6979668428458199034">"Delete"</string>
+ <string name="inputMethod" msgid="1653630062304567879">"Input method"</string>
+ <string name="editTextMenuTitle" msgid="4909135564941815494">"Text actions"</string>
+ <string name="email" msgid="4560673117055050403">"Email"</string>
+ <string name="email_desc" msgid="3638665569546416795">"Email selected address"</string>
+ <string name="dial" msgid="1253998302767701559">"Call"</string>
+ <string name="dial_desc" msgid="6573723404985517250">"Call selected phone number"</string>
+ <string name="map" msgid="5441053548030107189">"Map"</string>
+ <string name="map_desc" msgid="1836995341943772348">"Locate selected address"</string>
+ <string name="browse" msgid="1245903488306147205">"Open"</string>
+ <string name="browse_desc" msgid="8220976549618935044">"Open selected URL"</string>
+ <string name="sms" msgid="4560537514610063430">"Message"</string>
+ <string name="sms_desc" msgid="7526588350969638809">"Message selected phone number"</string>
+ <string name="add_contact" msgid="7867066569670597203">"Add"</string>
+ <string name="add_contact_desc" msgid="4830217847004590345">"Add to contacts"</string>
+ <string name="view_calendar" msgid="979609872939597838">"View"</string>
+ <string name="view_calendar_desc" msgid="5828320291870344584">"View selected time in calendar"</string>
+ <string name="add_calendar_event" msgid="1953664627192056206">"Schedule"</string>
+ <string name="add_calendar_event_desc" msgid="4326891793260687388">"Schedule event for selected time"</string>
+ <string name="view_flight" msgid="7691640491425680214">"Track"</string>
+ <string name="view_flight_desc" msgid="3876322502674253506">"Track selected flight"</string>
+ <string name="translate" msgid="9218619809342576858">"Translate"</string>
+ <string name="translate_desc" msgid="4502367770068777202">"Translate selected text"</string>
+ <string name="define" msgid="7394820043869954211">"Define"</string>
+ <string name="define_desc" msgid="7910883642444919726">"Define selected text"</string>
+ <string name="low_internal_storage_view_title" msgid="5576272496365684834">"Storage space running out"</string>
+ <string name="low_internal_storage_view_text" msgid="6640505817617414371">"Some system functions may not work"</string>
+ <string name="low_internal_storage_view_text_no_boot" msgid="6935190099204693424">"Not enough storage for the system. Make sure you have 250MB of free space and restart."</string>
+ <string name="app_running_notification_title" msgid="8718335121060787914">"<xliff:g id="APP_NAME">%1$s</xliff:g> is running"</string>
+ <string name="app_running_notification_text" msgid="1197581823314971177">"Tap for more information or to stop the app."</string>
+ <string name="ok" msgid="5970060430562524910">"OK"</string>
+ <string name="cancel" msgid="6442560571259935130">"Cancel"</string>
+ <string name="yes" msgid="5362982303337969312">"OK"</string>
+ <string name="no" msgid="5141531044935541497">"Cancel"</string>
+ <string name="dialog_alert_title" msgid="2049658708609043103">"Attention"</string>
+ <string name="loading" msgid="7933681260296021180">"Loading…"</string>
+ <string name="capital_on" msgid="1544682755514494298">"ON"</string>
+ <string name="capital_off" msgid="6815870386972805832">"OFF"</string>
+ <string name="whichApplication" msgid="4533185947064773386">"Complete action using"</string>
+ <string name="whichApplicationNamed" msgid="8260158865936942783">"Complete action using %1$s"</string>
+ <string name="whichApplicationLabel" msgid="7425855495383818784">"Complete action"</string>
+ <string name="whichViewApplication" msgid="3272778576700572102">"Open with"</string>
+ <string name="whichViewApplicationNamed" msgid="2286418824011249620">"Open with %1$s"</string>
+ <string name="whichViewApplicationLabel" msgid="2666774233008808473">"Open"</string>
+ <string name="whichGiveAccessToApplication" msgid="8279395245414707442">"Give access to open <xliff:g id="HOST">%1$s</xliff:g> links with"</string>
+ <string name="whichGiveAccessToApplicationNamed" msgid="7992388824107710849">"Give access to open <xliff:g id="HOST">%1$s</xliff:g> links with <xliff:g id="APPLICATION">%2$s</xliff:g>"</string>
+ <string name="whichGiveAccessToApplicationLabel" msgid="6142688895536868827">"Give access"</string>
+ <string name="whichEditApplication" msgid="144727838241402655">"Edit with"</string>
+ <string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit with %1$s"</string>
+ <string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Share"</string>
+ <string name="whichSendApplicationNamed" msgid="2799370240005424391">"Share with %1$s"</string>
+ <string name="whichSendApplicationLabel" msgid="4579076294675975354">"Share"</string>
+ <string name="whichSendToApplication" msgid="8272422260066642057">"Send using"</string>
+ <string name="whichSendToApplicationNamed" msgid="7768387871529295325">"Send using %1$s"</string>
+ <string name="whichSendToApplicationLabel" msgid="8878962419005813500">"Send"</string>
+ <string name="whichHomeApplication" msgid="4307587691506919691">"Select a Home app"</string>
+ <string name="whichHomeApplicationNamed" msgid="4493438593214760979">"Use %1$s as Home"</string>
+ <string name="whichHomeApplicationLabel" msgid="809529747002918649">"Capture image"</string>
+ <string name="whichImageCaptureApplication" msgid="3680261417470652882">"Capture image with"</string>
+ <string name="whichImageCaptureApplicationNamed" msgid="8619384150737825003">"Capture image with %1$s"</string>
+ <string name="whichImageCaptureApplicationLabel" msgid="6390303445371527066">"Capture image"</string>
+ <string name="alwaysUse" msgid="4583018368000610438">"Use by default for this action."</string>
+ <string name="use_a_different_app" msgid="8134926230585710243">"Use a different app"</string>
+ <string name="clearDefaultHintMsg" msgid="3252584689512077257">"Clear default in System settings > Apps > Downloaded."</string>
+ <string name="chooseActivity" msgid="7486876147751803333">"Choose an action"</string>
+ <string name="chooseUsbActivity" msgid="6894748416073583509">"Choose an app for the USB device"</string>
+ <string name="noApplications" msgid="2991814273936504689">"No apps can perform this action."</string>
+ <string name="aerr_application" msgid="250320989337856518">"<xliff:g id="APPLICATION">%1$s</xliff:g> has stopped"</string>
+ <string name="aerr_process" msgid="6201597323218674729">"<xliff:g id="PROCESS">%1$s</xliff:g> has stopped"</string>
+ <string name="aerr_application_repeated" msgid="3146328699537439573">"<xliff:g id="APPLICATION">%1$s</xliff:g> keeps stopping"</string>
+ <string name="aerr_process_repeated" msgid="6235302956890402259">"<xliff:g id="PROCESS">%1$s</xliff:g> keeps stopping"</string>
+ <string name="aerr_restart" msgid="7581308074153624475">"Open app again"</string>
+ <string name="aerr_report" msgid="5371800241488400617">"Send feedback"</string>
+ <string name="aerr_close" msgid="2991640326563991340">"Close"</string>
+ <string name="aerr_mute" msgid="1974781923723235953">"Mute until device restarts"</string>
+ <string name="aerr_wait" msgid="3199956902437040261">"Wait"</string>
+ <string name="aerr_close_app" msgid="3269334853724920302">"Close app"</string>
<string name="anr_title" msgid="4351948481459135709"></string>
- <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> isn\'t responding"</string>
- <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> isn\'t responding"</string>
- <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> isn\'t responding"</string>
- <string name="anr_process" msgid="6156880875555921105">"Process <xliff:g id="PROCESS">%1$s</xliff:g> isn\'t responding"</string>
- <string name="force_close" msgid="8346072094521265605">"OK"</string>
- <string name="report" msgid="4060218260984795706">"Report"</string>
- <string name="wait" msgid="7147118217226317732">"Wait"</string>
- <string name="webpage_unresponsive" msgid="3272758351138122503">"The page has become unresponsive.\n\nDo you want to close it?"</string>
- <string name="launch_warning_title" msgid="1547997780506713581">"App redirected"</string>
- <string name="launch_warning_replace" msgid="6202498949970281412">"<xliff:g id="APP_NAME">%1$s</xliff:g> is now running."</string>
- <string name="launch_warning_original" msgid="188102023021668683">"<xliff:g id="APP_NAME">%1$s</xliff:g> was originally launched."</string>
- <string name="screen_compat_mode_scale" msgid="3202955667675944499">"Scale"</string>
- <string name="screen_compat_mode_show" msgid="4013878876486655892">"Always show"</string>
- <string name="screen_compat_mode_hint" msgid="1064524084543304459">"Re-enable this in System settings > Apps > Downloaded."</string>
- <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> does not support the current Display size setting and may behave unexpectedly."</string>
- <string name="unsupported_display_size_show" msgid="7969129195360353041">"Always show"</string>
- <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"<xliff:g id="APP_NAME">%1$s</xliff:g> was built for an incompatible version of the Android OS and may behave unexpectedly. An updated version of the app may be available."</string>
- <string name="unsupported_compile_sdk_show" msgid="2681877855260970231">"Always show"</string>
- <string name="unsupported_compile_sdk_check_update" msgid="3312723623323216101">"Check for update"</string>
- <string name="smv_application" msgid="3307209192155442829">"The app <xliff:g id="APPLICATION">%1$s</xliff:g> (process <xliff:g id="PROCESS">%2$s</xliff:g>) has violated its self-enforced StrictMode policy."</string>
- <string name="smv_process" msgid="5120397012047462446">"The process <xliff:g id="PROCESS">%1$s</xliff:g> has has violated its self-enforced StrictMode policy."</string>
- <string name="android_upgrading_title" product="default" msgid="7513829952443484438">"Phone is updating…"</string>
- <string name="android_upgrading_title" product="tablet" msgid="4503169817302593560">"Tablet is updating…"</string>
- <string name="android_upgrading_title" product="device" msgid="7009520271220804517">"Device is updating…"</string>
- <string name="android_start_title" product="default" msgid="4536778526365907780">"Phone is starting…"</string>
- <string name="android_start_title" product="automotive" msgid="8418054686415318207">"Android is starting…"</string>
- <string name="android_start_title" product="tablet" msgid="4929837533850340472">"Tablet is starting…"</string>
- <string name="android_start_title" product="device" msgid="7467484093260449437">"Device is starting…"</string>
- <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimizing storage."</string>
- <string name="android_upgrading_notification_title" product="default" msgid="1511552415039349062">"Finishing system update…"</string>
- <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> is upgrading…"</string>
- <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimizing app <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
- <string name="android_preparing_apk" msgid="8162599310274079154">"Preparing <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
- <string name="android_upgrading_starting_apps" msgid="451464516346926713">"Starting apps."</string>
- <string name="android_upgrading_complete" msgid="1405954754112999229">"Finishing boot."</string>
- <string name="heavy_weight_notification" msgid="9087063985776626166">"<xliff:g id="APP">%1$s</xliff:g> running"</string>
- <string name="heavy_weight_notification_detail" msgid="2304833848484424985">"Tap to return to game"</string>
- <string name="heavy_weight_switcher_title" msgid="387882830435195342">"Choose game"</string>
- <string name="heavy_weight_switcher_text" msgid="4176781660362912010">"For better performance, only one of these games can be open at a time."</string>
- <string name="old_app_action" msgid="3044685170829526403">"Go back to <xliff:g id="OLD_APP">%1$s</xliff:g>"</string>
- <string name="new_app_action" msgid="6694851182870774403">"Open <xliff:g id="NEW_APP">%1$s</xliff:g>"</string>
- <string name="new_app_description" msgid="5894852887817332322">"<xliff:g id="OLD_APP">%1$s</xliff:g> will close without saving"</string>
- <string name="dump_heap_notification" msgid="2618183274836056542">"<xliff:g id="PROC">%1$s</xliff:g> exceeded memory limit"</string>
- <string name="dump_heap_notification_detail" msgid="3993078784053054141">"Heap dump collected. Tap to share."</string>
- <string name="dump_heap_title" msgid="5864292264307651673">"Share heap dump?"</string>
- <string name="dump_heap_text" msgid="4809417337240334941">"The process <xliff:g id="PROC">%1$s</xliff:g> has exceeded its process memory limit of <xliff:g id="SIZE">%2$s</xliff:g>. A heap dump is available for you to share with its developer. Be careful: this heap dump can contain any of your personal information that the application has access to."</string>
- <string name="sendText" msgid="5209874571959469142">"Choose an action for text"</string>
- <string name="volume_ringtone" msgid="6885421406845734650">"Ringer volume"</string>
- <string name="volume_music" msgid="5421651157138628171">"Media volume"</string>
- <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"Playing through Bluetooth"</string>
- <string name="volume_music_hint_silent_ringtone_selected" msgid="8310739960973156272">"Silent ringtone set"</string>
- <string name="volume_call" msgid="3941680041282788711">"In-call volume"</string>
- <string name="volume_bluetooth_call" msgid="2002891926351151534">"Bluetooth in-call volume"</string>
- <string name="volume_alarm" msgid="1985191616042689100">"Alarm volume"</string>
- <string name="volume_notification" msgid="2422265656744276715">"Notification volume"</string>
- <string name="volume_unknown" msgid="1400219669770445902">"Volume"</string>
- <string name="volume_icon_description_bluetooth" msgid="6538894177255964340">"Bluetooth volume"</string>
- <string name="volume_icon_description_ringer" msgid="3326003847006162496">"Ringtone volume"</string>
- <string name="volume_icon_description_incall" msgid="8890073218154543397">"Call volume"</string>
- <string name="volume_icon_description_media" msgid="4217311719665194215">"Media volume"</string>
- <string name="volume_icon_description_notification" msgid="7044986546477282274">"Notification volume"</string>
- <string name="ringtone_default" msgid="3789758980357696936">"Default ringtone"</string>
- <string name="ringtone_default_with_actual" msgid="1767304850491060581">"Default (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string>
- <string name="ringtone_silent" msgid="7937634392408977062">"None"</string>
- <string name="ringtone_picker_title" msgid="3515143939175119094">"Ringtones"</string>
- <string name="ringtone_picker_title_alarm" msgid="6473325356070549702">"Alarm sounds"</string>
- <string name="ringtone_picker_title_notification" msgid="4837740874822788802">"Notification sounds"</string>
- <string name="ringtone_unknown" msgid="3914515995813061520">"Unknown"</string>
+ <string name="anr_activity_application" msgid="8493290105678066167">"<xliff:g id="APPLICATION">%2$s</xliff:g> isn\'t responding"</string>
+ <string name="anr_activity_process" msgid="1622382268908620314">"<xliff:g id="ACTIVITY">%1$s</xliff:g> isn\'t responding"</string>
+ <string name="anr_application_process" msgid="6417199034861140083">"<xliff:g id="APPLICATION">%1$s</xliff:g> isn\'t responding"</string>
+ <string name="anr_process" msgid="6156880875555921105">"Process <xliff:g id="PROCESS">%1$s</xliff:g> isn\'t responding"</string>
+ <string name="force_close" msgid="8346072094521265605">"OK"</string>
+ <string name="report" msgid="4060218260984795706">"Report"</string>
+ <string name="wait" msgid="7147118217226317732">"Wait"</string>
+ <string name="webpage_unresponsive" msgid="3272758351138122503">"The page has become unresponsive.\n\nDo you want to close it?"</string>
+ <string name="launch_warning_title" msgid="1547997780506713581">"App redirected"</string>
+ <string name="launch_warning_replace" msgid="6202498949970281412">"<xliff:g id="APP_NAME">%1$s</xliff:g> is now running."</string>
+ <string name="launch_warning_original" msgid="188102023021668683">"<xliff:g id="APP_NAME">%1$s</xliff:g> was originally launched."</string>
+ <string name="screen_compat_mode_scale" msgid="3202955667675944499">"Scale"</string>
+ <string name="screen_compat_mode_show" msgid="4013878876486655892">"Always show"</string>
+ <string name="screen_compat_mode_hint" msgid="1064524084543304459">"Re-enable this in System settings > Apps > Downloaded."</string>
+ <string name="unsupported_display_size_message" msgid="6545327290756295232">"<xliff:g id="APP_NAME">%1$s</xliff:g> does not support the current Display size setting and may behave unexpectedly."</string>
+ <string name="unsupported_display_size_show" msgid="7969129195360353041">"Always show"</string>
+ <string name="unsupported_compile_sdk_message" msgid="4253168368781441759">"<xliff:g id="APP_NAME">%1$s</xliff:g> was built for an incompatible version of the Android OS and may behave unexpectedly. An updated version of the app may be available."</string>
+ <string name="unsupported_compile_sdk_show" msgid="2681877855260970231">"Always show"</string>
+ <string name="unsupported_compile_sdk_check_update" msgid="3312723623323216101">"Check for update"</string>
+ <string name="smv_application" msgid="3307209192155442829">"The app <xliff:g id="APPLICATION">%1$s</xliff:g> (process <xliff:g id="PROCESS">%2$s</xliff:g>) has violated its self-enforced StrictMode policy."</string>
+ <string name="smv_process" msgid="5120397012047462446">"The process <xliff:g id="PROCESS">%1$s</xliff:g> has has violated its self-enforced StrictMode policy."</string>
+ <string name="android_upgrading_title" product="default" msgid="7513829952443484438">"Phone is updating…"</string>
+ <string name="android_upgrading_title" product="tablet" msgid="4503169817302593560">"Tablet is updating…"</string>
+ <string name="android_upgrading_title" product="device" msgid="7009520271220804517">"Device is updating…"</string>
+ <string name="android_start_title" product="default" msgid="4536778526365907780">"Phone is starting…"</string>
+ <string name="android_start_title" product="automotive" msgid="8418054686415318207">"Android is starting…"</string>
+ <string name="android_start_title" product="tablet" msgid="4929837533850340472">"Tablet is starting…"</string>
+ <string name="android_start_title" product="device" msgid="7467484093260449437">"Device is starting…"</string>
+ <string name="android_upgrading_fstrim" msgid="8036718871534640010">"Optimizing storage."</string>
+ <string name="android_upgrading_notification_title" product="default" msgid="1511552415039349062">"Finishing system update…"</string>
+ <string name="app_upgrading_toast" msgid="3008139776215597053">"<xliff:g id="APPLICATION">%1$s</xliff:g> is upgrading…"</string>
+ <string name="android_upgrading_apk" msgid="7904042682111526169">"Optimizing app <xliff:g id="NUMBER_0">%1$d</xliff:g> of <xliff:g id="NUMBER_1">%2$d</xliff:g>."</string>
+ <string name="android_preparing_apk" msgid="8162599310274079154">"Preparing <xliff:g id="APPNAME">%1$s</xliff:g>."</string>
+ <string name="android_upgrading_starting_apps" msgid="451464516346926713">"Starting apps."</string>
+ <string name="android_upgrading_complete" msgid="1405954754112999229">"Finishing boot."</string>
+ <string name="heavy_weight_notification" msgid="9087063985776626166">"<xliff:g id="APP">%1$s</xliff:g> running"</string>
+ <string name="heavy_weight_notification_detail" msgid="2304833848484424985">"Tap to return to game"</string>
+ <string name="heavy_weight_switcher_title" msgid="387882830435195342">"Choose game"</string>
+ <string name="heavy_weight_switcher_text" msgid="4176781660362912010">"For better performance, only one of these games can be open at a time."</string>
+ <string name="old_app_action" msgid="3044685170829526403">"Go back to <xliff:g id="OLD_APP">%1$s</xliff:g>"</string>
+ <string name="new_app_action" msgid="6694851182870774403">"Open <xliff:g id="NEW_APP">%1$s</xliff:g>"</string>
+ <string name="new_app_description" msgid="5894852887817332322">"<xliff:g id="OLD_APP">%1$s</xliff:g> will close without saving"</string>
+ <string name="dump_heap_notification" msgid="2618183274836056542">"<xliff:g id="PROC">%1$s</xliff:g> exceeded memory limit"</string>
+ <string name="dump_heap_notification_detail" msgid="3993078784053054141">"Heap dump collected. Tap to share."</string>
+ <string name="dump_heap_title" msgid="5864292264307651673">"Share heap dump?"</string>
+ <string name="dump_heap_text" msgid="4809417337240334941">"The process <xliff:g id="PROC">%1$s</xliff:g> has exceeded its process memory limit of <xliff:g id="SIZE">%2$s</xliff:g>. A heap dump is available for you to share with its developer. Be careful: this heap dump can contain any of your personal information that the application has access to."</string>
+ <string name="sendText" msgid="5209874571959469142">"Choose an action for text"</string>
+ <string name="volume_ringtone" msgid="6885421406845734650">"Ringer volume"</string>
+ <string name="volume_music" msgid="5421651157138628171">"Media volume"</string>
+ <string name="volume_music_hint_playing_through_bluetooth" msgid="9165984379394601533">"Playing through Bluetooth"</string>
+ <string name="volume_music_hint_silent_ringtone_selected" msgid="8310739960973156272">"Silent ringtone set"</string>
+ <string name="volume_call" msgid="3941680041282788711">"In-call volume"</string>
+ <string name="volume_bluetooth_call" msgid="2002891926351151534">"Bluetooth in-call volume"</string>
+ <string name="volume_alarm" msgid="1985191616042689100">"Alarm volume"</string>
+ <string name="volume_notification" msgid="2422265656744276715">"Notification volume"</string>
+ <string name="volume_unknown" msgid="1400219669770445902">"Volume"</string>
+ <string name="volume_icon_description_bluetooth" msgid="6538894177255964340">"Bluetooth volume"</string>
+ <string name="volume_icon_description_ringer" msgid="3326003847006162496">"Ringtone volume"</string>
+ <string name="volume_icon_description_incall" msgid="8890073218154543397">"Call volume"</string>
+ <string name="volume_icon_description_media" msgid="4217311719665194215">"Media volume"</string>
+ <string name="volume_icon_description_notification" msgid="7044986546477282274">"Notification volume"</string>
+ <string name="ringtone_default" msgid="3789758980357696936">"Default ringtone"</string>
+ <string name="ringtone_default_with_actual" msgid="1767304850491060581">"Default (<xliff:g id="ACTUAL_RINGTONE">%1$s</xliff:g>)"</string>
+ <string name="ringtone_silent" msgid="7937634392408977062">"None"</string>
+ <string name="ringtone_picker_title" msgid="3515143939175119094">"Ringtones"</string>
+ <string name="ringtone_picker_title_alarm" msgid="6473325356070549702">"Alarm sounds"</string>
+ <string name="ringtone_picker_title_notification" msgid="4837740874822788802">"Notification sounds"</string>
+ <string name="ringtone_unknown" msgid="3914515995813061520">"Unknown"</string>
<plurals name="wifi_available" formatted="false" msgid="7900333017752027322">
- <item quantity="other">Wi-Fi networks available</item>
- <item quantity="one">Wi-Fi network available</item>
+ <item quantity="other">Wi-Fi networks available</item>
+ <item quantity="one">Wi-Fi network available</item>
</plurals>
<plurals name="wifi_available_detailed" formatted="false" msgid="1140699367193975606">
- <item quantity="other">Open Wi-Fi networks available</item>
- <item quantity="one">Open Wi-Fi network available</item>
+ <item quantity="other">Open Wi-Fi networks available</item>
+ <item quantity="one">Open Wi-Fi network available</item>
</plurals>
- <string name="wifi_available_title" msgid="3817100557900599505">"Connect to open Wi‑Fi network"</string>
- <string name="wifi_available_carrier_network_title" msgid="4527932626916527897">"Connect to carrier Wi‑Fi network"</string>
- <string name="wifi_available_title_connecting" msgid="1139126673968899002">"Connecting to Wi‑Fi network"</string>
- <string name="wifi_available_title_connected" msgid="7542672851522241548">"Connected to Wi‑Fi network"</string>
- <string name="wifi_available_title_failed_to_connect" msgid="6861772233582618132">"Could not connect to Wi‑Fi network"</string>
- <string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tap to see all networks"</string>
- <string name="wifi_available_action_connect" msgid="2635699628459488788">"Connect"</string>
- <string name="wifi_available_action_all_networks" msgid="4368435796357931006">"All networks"</string>
- <string name="wifi_suggestion_title" msgid="8951405130379148709">"A Wi‑Fi network proposed by <xliff:g id="NAME">%s</xliff:g> is available"</string>
- <string name="wifi_suggestion_content" msgid="2658317015552324848">"Do you want to connect to networks proposed by <xliff:g id="NAME">%s</xliff:g>?"</string>
- <string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Yes"</string>
- <string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"No"</string>
- <string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi will turn on automatically"</string>
- <string name="wifi_wakeup_onboarding_subtext" msgid="3989697580301186973">"When you\'re near a high quality saved network"</string>
- <string name="wifi_wakeup_onboarding_action_disable" msgid="838648204200836028">"Don\'t turn back on"</string>
- <string name="wifi_wakeup_enabled_title" msgid="6534603733173085309">"Wi‑Fi turned on automatically"</string>
- <string name="wifi_wakeup_enabled_content" msgid="189330154407990583">"You\'re near a saved network: <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
- <string name="wifi_available_sign_in" msgid="9157196203958866662">"Sign in to Wi-Fi network"</string>
- <string name="network_available_sign_in" msgid="1848877297365446605">"Sign in to network"</string>
+ <string name="wifi_available_title" msgid="3817100557900599505">"Connect to open Wi‑Fi network"</string>
+ <string name="wifi_available_carrier_network_title" msgid="4527932626916527897">"Connect to carrier Wi‑Fi network"</string>
+ <string name="wifi_available_title_connecting" msgid="1139126673968899002">"Connecting to Wi‑Fi network"</string>
+ <string name="wifi_available_title_connected" msgid="7542672851522241548">"Connected to Wi‑Fi network"</string>
+ <string name="wifi_available_title_failed_to_connect" msgid="6861772233582618132">"Could not connect to Wi‑Fi network"</string>
+ <string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tap to see all networks"</string>
+ <string name="wifi_available_action_connect" msgid="2635699628459488788">"Connect"</string>
+ <string name="wifi_available_action_all_networks" msgid="4368435796357931006">"All networks"</string>
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"A Wi‑Fi network proposed by <xliff:g id="NAME">%s</xliff:g> is available"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Do you want to connect to networks proposed by <xliff:g id="NAME">%s</xliff:g>?"</string>
+ <string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Yes"</string>
+ <string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"No"</string>
+ <string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi will turn on automatically"</string>
+ <string name="wifi_wakeup_onboarding_subtext" msgid="3989697580301186973">"When you\'re near a high quality saved network"</string>
+ <string name="wifi_wakeup_onboarding_action_disable" msgid="838648204200836028">"Don\'t turn back on"</string>
+ <string name="wifi_wakeup_enabled_title" msgid="6534603733173085309">"Wi‑Fi turned on automatically"</string>
+ <string name="wifi_wakeup_enabled_content" msgid="189330154407990583">"You\'re near a saved network: <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
+ <string name="wifi_available_sign_in" msgid="9157196203958866662">"Sign in to Wi-Fi network"</string>
+ <string name="network_available_sign_in" msgid="1848877297365446605">"Sign in to network"</string>
<!-- no translation found for network_available_sign_in_detailed (8000081941447976118) -->
<skip />
- <string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi has no internet access"</string>
- <string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Tap for options"</string>
- <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Connected"</string>
- <string name="wifi_softap_config_change" msgid="8475911871165857607">"Changes to your hotspot settings"</string>
- <string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Your hotspot band has changed."</string>
- <string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"This device doesn’t support your preference for 5GHz only. Instead, this device will use the 5GHz band when available."</string>
- <string name="network_switch_metered" msgid="4671730921726992671">"Switched to <xliff:g id="NETWORK_TYPE">%1$s</xliff:g>"</string>
- <string name="network_switch_metered_detail" msgid="775163331794506615">"Device uses <xliff:g id="NEW_NETWORK">%1$s</xliff:g> when <xliff:g id="PREVIOUS_NETWORK">%2$s</xliff:g> has no internet access. Charges may apply."</string>
- <string name="network_switch_metered_toast" msgid="5779283181685974304">"Switched from <xliff:g id="PREVIOUS_NETWORK">%1$s</xliff:g> to <xliff:g id="NEW_NETWORK">%2$s</xliff:g>"</string>
+ <string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi has no internet access"</string>
+ <string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Tap for options"</string>
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Connected"</string>
+ <string name="wifi_softap_config_change" msgid="8475911871165857607">"Changes to your hotspot settings"</string>
+ <string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Your hotspot band has changed."</string>
+ <string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"This device doesn’t support your preference for 5GHz only. Instead, this device will use the 5GHz band when available."</string>
+ <string name="network_switch_metered" msgid="4671730921726992671">"Switched to <xliff:g id="NETWORK_TYPE">%1$s</xliff:g>"</string>
+ <string name="network_switch_metered_detail" msgid="775163331794506615">"Device uses <xliff:g id="NEW_NETWORK">%1$s</xliff:g> when <xliff:g id="PREVIOUS_NETWORK">%2$s</xliff:g> has no internet access. Charges may apply."</string>
+ <string name="network_switch_metered_toast" msgid="5779283181685974304">"Switched from <xliff:g id="PREVIOUS_NETWORK">%1$s</xliff:g> to <xliff:g id="NEW_NETWORK">%2$s</xliff:g>"</string>
<string-array name="network_switch_type_name">
- <item msgid="3979506840912951943">"mobile data"</item>
- <item msgid="75483255295529161">"Wi-Fi"</item>
- <item msgid="6862614801537202646">"Bluetooth"</item>
- <item msgid="5447331121797802871">"Ethernet"</item>
- <item msgid="8257233890381651999">"VPN"</item>
+ <item msgid="3979506840912951943">"mobile data"</item>
+ <item msgid="75483255295529161">"Wi-Fi"</item>
+ <item msgid="6862614801537202646">"Bluetooth"</item>
+ <item msgid="5447331121797802871">"Ethernet"</item>
+ <item msgid="8257233890381651999">"VPN"</item>
</string-array>
- <string name="network_switch_type_name_unknown" msgid="4552612897806660656">"an unknown network type"</string>
- <string name="wifi_watchdog_network_disabled" msgid="7904214231651546347">"Couldn\'t connect to Wi-Fi"</string>
- <string name="wifi_watchdog_network_disabled_detailed" msgid="4917472096696322767">" has a poor internet connection."</string>
- <string name="wifi_connect_alert_title" msgid="8455846016001810172">"Allow connection?"</string>
- <string name="wifi_connect_alert_message" msgid="6451273376815958922">"Application %1$s would like to connect to Wifi Network %2$s"</string>
- <string name="wifi_connect_default_application" msgid="7143109390475484319">"An application"</string>
- <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"Wi-Fi Direct"</string>
- <string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"Start Wi-Fi Direct. This will turn off Wi-Fi client/hotspot."</string>
- <string name="wifi_p2p_failed_message" msgid="3763669677935623084">"Couldn\'t start Wi-Fi Direct."</string>
- <string name="wifi_p2p_enabled_notification_title" msgid="2068321881673734886">"Wi-Fi Direct is on"</string>
- <string name="wifi_p2p_enabled_notification_message" msgid="8064677407830620023">"Tap for settings"</string>
- <string name="accept" msgid="1645267259272829559">"Accept"</string>
- <string name="decline" msgid="2112225451706137894">"Decline"</string>
- <string name="wifi_p2p_invitation_sent_title" msgid="1318975185112070734">"Invitation sent"</string>
- <string name="wifi_p2p_invitation_to_connect_title" msgid="4958803948658533637">"Invitation to connect"</string>
- <string name="wifi_p2p_from_message" msgid="570389174731951769">"From:"</string>
- <string name="wifi_p2p_to_message" msgid="248968974522044099">"To:"</string>
- <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Type the required PIN:"</string>
- <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string>
- <string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="8012981257742232475">"The tablet will temporarily disconnect from Wi-Fi while it\'s connected to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
- <string name="wifi_p2p_frequency_conflict_message" product="tv" msgid="3087858235069421128">"The TV will temporarily disconnect from Wi-Fi while it\'s connected to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
- <string name="wifi_p2p_frequency_conflict_message" product="default" msgid="7363907213787469151">"The phone will temporarily disconnect from Wi-Fi while it\'s connected to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
- <string name="select_character" msgid="3365550120617701745">"Insert character"</string>
- <string name="sms_control_title" msgid="7296612781128917719">"Sending SMS messages"</string>
- <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> is sending a large number of SMS messages. Do you want to allow this app to continue sending messages?"</string>
- <string name="sms_control_yes" msgid="3663725993855816807">"Allow"</string>
- <string name="sms_control_no" msgid="625438561395534982">"Deny"</string>
- <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> would like to send a message to <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string>
- <string name="sms_short_code_details" msgid="5873295990846059400">"This "<b>"may cause charges"</b>" on your mobile account."</string>
- <string name="sms_premium_short_code_details" msgid="7869234868023975">""<b>"This will cause charges on your mobile account."</b>""</string>
- <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Send"</string>
- <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Cancel"</string>
- <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Remember my choice"</string>
- <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"You can change this later in Settings > Apps"</string>
- <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Always Allow"</string>
- <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Never Allow"</string>
- <string name="sim_removed_title" msgid="6227712319223226185">"SIM card removed"</string>
- <string name="sim_removed_message" msgid="2333164559970958645">"The mobile network will be unavailable until you restart with a valid SIM card inserted."</string>
- <string name="sim_done_button" msgid="827949989369963775">"Done"</string>
- <string name="sim_added_title" msgid="3719670512889674693">"SIM card added"</string>
- <string name="sim_added_message" msgid="6599945301141050216">"Restart your device to access the mobile network."</string>
- <string name="sim_restart_button" msgid="4722407842815232347">"Restart"</string>
- <string name="install_carrier_app_notification_title" msgid="9056007111024059888">"Activate mobile service"</string>
- <string name="install_carrier_app_notification_text" msgid="3346681446158696001">"Download the carrier app to activate your new SIM"</string>
- <string name="install_carrier_app_notification_text_app_name" msgid="1196505084835248137">"Download the <xliff:g id="APP_NAME">%1$s</xliff:g> app to activate your new SIM"</string>
- <string name="install_carrier_app_notification_button" msgid="3094206295081900849">"Download app"</string>
- <string name="carrier_app_notification_title" msgid="8921767385872554621">"New SIM inserted"</string>
- <string name="carrier_app_notification_text" msgid="1132487343346050225">"Tap to set it up"</string>
- <string name="time_picker_dialog_title" msgid="8349362623068819295">"Set time"</string>
- <string name="date_picker_dialog_title" msgid="5879450659453782278">"Set date"</string>
- <string name="date_time_set" msgid="5777075614321087758">"Set"</string>
- <string name="date_time_done" msgid="2507683751759308828">"Done"</string>
- <string name="perms_new_perm_prefix" msgid="8257740710754301407">""<font size="12" fgcolor="#ff33b5e5">"NEW: "</font>""</string>
- <string name="perms_description_app" msgid="5139836143293299417">"Provided by <xliff:g id="APP_NAME">%1$s</xliff:g>."</string>
- <string name="no_permissions" msgid="7283357728219338112">"No permissions required"</string>
- <string name="perm_costs_money" msgid="4902470324142151116">"this may cost you money"</string>
- <string name="dlg_ok" msgid="7376953167039865701">"OK"</string>
- <string name="usb_charging_notification_title" msgid="1595122345358177163">"Charging this device via USB"</string>
- <string name="usb_supplying_notification_title" msgid="4631045789893086181">"Charging connected device via USB"</string>
- <string name="usb_mtp_notification_title" msgid="4238227258391151029">"USB file transfer turned on"</string>
- <string name="usb_ptp_notification_title" msgid="5425857879922006878">"PTP via USB turned on"</string>
- <string name="usb_tether_notification_title" msgid="3716143122035802501">"USB tethering turned on"</string>
- <string name="usb_midi_notification_title" msgid="5356040379749154805">"MIDI via USB turned on"</string>
- <string name="usb_accessory_notification_title" msgid="1785694450621427730">"USB accessory connected"</string>
- <string name="usb_notification_message" msgid="3370903770828407960">"Tap for more options."</string>
- <string name="usb_power_notification_message" msgid="4647527153291917218">"Charging connected device. Tap for more options."</string>
- <string name="usb_unsupported_audio_accessory_title" msgid="3529881374464628084">"Analog audio accessory detected"</string>
- <string name="usb_unsupported_audio_accessory_message" msgid="6309553946441565215">"The attached device is not compatible with this phone. Tap to learn more."</string>
- <string name="adb_active_notification_title" msgid="6729044778949189918">"USB debugging connected"</string>
- <string name="adb_active_notification_message" msgid="7463062450474107752">"Tap to turn off USB debugging"</string>
- <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Select to disable USB debugging."</string>
- <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Liquid or debris in USB port"</string>
- <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB port is automatically disabled. Tap to learn more."</string>
- <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Safe to use USB port"</string>
- <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Phone no longer detects liquid or debris."</string>
- <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Taking bug report…"</string>
- <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Share bug report?"</string>
- <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Sharing bug report…"</string>
- <string name="share_remote_bugreport_notification_message_finished" msgid="6029609949340992866">"Your admin requested a bug report to help troubleshoot this device. Apps and data may be shared."</string>
- <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="4653387336791222978">"Choose input method"</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="597189518763083494">"Configure physical keyboard"</string>
- <string name="select_keyboard_layout_notification_message" msgid="8084622969903004900">"Tap to select language and layout"</string>
- <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
- <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
- <string name="alert_windows_notification_channel_group_name" msgid="1463953341148606396">"Display over other apps"</string>
- <string name="alert_windows_notification_channel_name" msgid="3116610965549449803">"<xliff:g id="NAME">%s</xliff:g> displaying over other apps"</string>
- <string name="alert_windows_notification_title" msgid="3697657294867638947">"<xliff:g id="NAME">%s</xliff:g> is displaying over other apps"</string>
- <string name="alert_windows_notification_message" msgid="8917232109522912560">"If you don’t want <xliff:g id="NAME">%s</xliff:g> to use this feature, tap to open settings and turn it off."</string>
- <string name="alert_windows_notification_turn_off_action" msgid="2902891971380544651">"Turn off"</string>
- <string name="ext_media_checking_notification_title" msgid="4411133692439308924">"Checking <xliff:g id="NAME">%s</xliff:g>…"</string>
- <string name="ext_media_checking_notification_message" msgid="410185170877285434">"Reviewing current content"</string>
- <string name="ext_media_new_notification_title" msgid="1621805083736634077">"New <xliff:g id="NAME">%s</xliff:g>"</string>
- <string name="ext_media_new_notification_message" msgid="3673685270558405087">"Tap to set up"</string>
- <string name="ext_media_ready_notification_message" msgid="4083398150380114462">"For transferring photos and media"</string>
- <string name="ext_media_unmountable_notification_title" msgid="4179418065210797130">"Issue with <xliff:g id="NAME">%s</xliff:g>"</string>
- <string name="ext_media_unmountable_notification_message" msgid="4193858924381066522">"Tap to fix"</string>
- <string name="ext_media_unmountable_notification_message" product="tv" msgid="3941179940297874950">"<xliff:g id="NAME">%s</xliff:g> is corrupt. Select to fix."</string>
- <string name="ext_media_unsupported_notification_title" msgid="3797642322958803257">"Unsupported <xliff:g id="NAME">%s</xliff:g>"</string>
- <string name="ext_media_unsupported_notification_message" msgid="6121601473787888589">"This device doesn’t support this <xliff:g id="NAME">%s</xliff:g>. Tap to set up in a supported format."</string>
- <string name="ext_media_unsupported_notification_message" product="tv" msgid="3725436899820390906">"This device doesn’t support this <xliff:g id="NAME">%s</xliff:g>. Select to set up in a supported format."</string>
- <string name="ext_media_badremoval_notification_title" msgid="3206248947375505416">"<xliff:g id="NAME">%s</xliff:g> unexpectedly removed"</string>
- <string name="ext_media_badremoval_notification_message" msgid="8556885808951260574">"Eject media before removing to avoid losing content"</string>
- <string name="ext_media_nomedia_notification_title" msgid="6593814191061956856">"<xliff:g id="NAME">%s</xliff:g> removed"</string>
- <string name="ext_media_nomedia_notification_message" msgid="2110883356419799994">"Some functionality may not work properly. Insert new storage."</string>
- <string name="ext_media_unmounting_notification_title" msgid="5046532339291216076">"Ejecting <xliff:g id="NAME">%s</xliff:g>"</string>
- <string name="ext_media_unmounting_notification_message" msgid="1003926904442321115">"Don’t remove"</string>
- <string name="ext_media_init_action" msgid="7952885510091978278">"Set up"</string>
- <string name="ext_media_unmount_action" msgid="1121883233103278199">"Eject"</string>
- <string name="ext_media_browse_action" msgid="8322172381028546087">"Explore"</string>
- <string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> missing"</string>
- <string name="ext_media_missing_message" msgid="4012389235250987930">"Insert device again"</string>
- <string name="ext_media_move_specific_title" msgid="1471100343872375842">"Moving <xliff:g id="NAME">%s</xliff:g>"</string>
- <string name="ext_media_move_title" msgid="1022809140035962662">"Moving data"</string>
- <string name="ext_media_move_success_title" msgid="7863652232242276066">"Content transfer is done"</string>
- <string name="ext_media_move_success_message" msgid="8939137931961728009">"Content moved to <xliff:g id="NAME">%s</xliff:g>"</string>
- <string name="ext_media_move_failure_title" msgid="1604422634177382092">"Couldn’t move content"</string>
- <string name="ext_media_move_failure_message" msgid="7388950499623016135">"Try moving content again"</string>
- <string name="ext_media_status_removed" msgid="6576172423185918739">"Removed"</string>
- <string name="ext_media_status_unmounted" msgid="2551560878416417752">"Ejected"</string>
- <string name="ext_media_status_checking" msgid="6193921557423194949">"Checking…"</string>
- <string name="ext_media_status_mounted" msgid="7253821726503179202">"Ready"</string>
- <string name="ext_media_status_mounted_ro" msgid="8020978752406021015">"Read-only"</string>
- <string name="ext_media_status_bad_removal" msgid="8395398567890329422">"Removed unsafely"</string>
- <string name="ext_media_status_unmountable" msgid="805594039236667894">"Corrupted"</string>
- <string name="ext_media_status_unsupported" msgid="4691436711745681828">"Unsupported"</string>
- <string name="ext_media_status_ejecting" msgid="5463887263101234174">"Ejecting…"</string>
- <string name="ext_media_status_formatting" msgid="1085079556538644861">"Formatting…"</string>
- <string name="ext_media_status_missing" msgid="5638633895221670766">"Not inserted"</string>
- <string name="activity_list_empty" msgid="1675388330786841066">"No matching activities found."</string>
- <string name="permlab_route_media_output" msgid="6243022988998972085">"route media output"</string>
- <string name="permdesc_route_media_output" msgid="4932818749547244346">"Allows an application to route media output to other external devices."</string>
- <string name="permlab_readInstallSessions" msgid="3713753067455750349">"read install sessions"</string>
- <string name="permdesc_readInstallSessions" msgid="2049771699626019849">"Allows an application to read install sessions. This allows it to see details about active package installations."</string>
- <string name="permlab_requestInstallPackages" msgid="5782013576218172577">"request install packages"</string>
- <string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"Allows an application to request installation of packages."</string>
- <string name="permlab_requestDeletePackages" msgid="1703686454657781242">"request delete packages"</string>
- <string name="permdesc_requestDeletePackages" msgid="3406172963097595270">"Allows an application to request deletion of packages."</string>
- <string name="permlab_requestIgnoreBatteryOptimizations" msgid="8021256345643918264">"ask to ignore battery optimizations"</string>
- <string name="permdesc_requestIgnoreBatteryOptimizations" msgid="8359147856007447638">"Allows an app to ask for permission to ignore battery optimizations for that app."</string>
- <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"Tap twice for zoom control"</string>
- <string name="gadget_host_error_inflating" msgid="4882004314906466162">"Couldn\'t add widget."</string>
- <string name="ime_action_go" msgid="8320845651737369027">"Go"</string>
- <string name="ime_action_search" msgid="658110271822807811">"Search"</string>
- <string name="ime_action_send" msgid="2316166556349314424">"Send"</string>
- <string name="ime_action_next" msgid="3138843904009813834">"Next"</string>
- <string name="ime_action_done" msgid="8971516117910934605">"Done"</string>
- <string name="ime_action_previous" msgid="1443550039250105948">"Prev"</string>
- <string name="ime_action_default" msgid="2840921885558045721">"Execute"</string>
- <string name="dial_number_using" msgid="5789176425167573586">"Dial number\nusing <xliff:g id="NUMBER">%s</xliff:g>"</string>
- <string name="create_contact_using" msgid="4947405226788104538">"Create contact\nusing <xliff:g id="NUMBER">%s</xliff:g>"</string>
- <string name="grant_credentials_permission_message_header" msgid="2106103817937859662">"The following one or more apps request permission to access your account, now and in the future."</string>
- <string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"Do you want to allow this request?"</string>
- <string name="grant_permissions_header_text" msgid="6874497408201826708">"Access request"</string>
- <string name="allow" msgid="7225948811296386551">"Allow"</string>
- <string name="deny" msgid="2081879885755434506">"Deny"</string>
- <string name="permission_request_notification_title" msgid="6486759795926237907">"Permission requested"</string>
- <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"Permission requested\nfor account <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
- <string name="forward_intent_to_owner" msgid="1207197447013960896">"You\'re using this app outside of your work profile"</string>
- <string name="forward_intent_to_work" msgid="621480743856004612">"You\'re using this app in your work profile"</string>
- <string name="input_method_binding_label" msgid="1283557179944992649">"Input method"</string>
- <string name="sync_binding_label" msgid="3687969138375092423">"Sync"</string>
- <string name="accessibility_binding_label" msgid="4148120742096474641">"Accessibility"</string>
- <string name="wallpaper_binding_label" msgid="1240087844304687662">"Wallpaper"</string>
- <string name="chooser_wallpaper" msgid="7873476199295190279">"Change wallpaper"</string>
- <string name="notification_listener_binding_label" msgid="2014162835481906429">"Notification listener"</string>
- <string name="vr_listener_binding_label" msgid="4316591939343607306">"VR listener"</string>
- <string name="condition_provider_service_binding_label" msgid="1321343352906524564">"Condition provider"</string>
- <string name="notification_ranker_binding_label" msgid="774540592299064747">"Notification ranker service"</string>
- <string name="vpn_title" msgid="19615213552042827">"VPN activated"</string>
- <string name="vpn_title_long" msgid="6400714798049252294">"VPN is activated by <xliff:g id="APP">%s</xliff:g>"</string>
- <string name="vpn_text" msgid="1610714069627824309">"Tap to manage the network."</string>
- <string name="vpn_text_long" msgid="4907843483284977618">"Connected to <xliff:g id="SESSION">%s</xliff:g>. Tap to manage the network."</string>
- <string name="vpn_lockdown_connecting" msgid="6443438964440960745">"Always-on VPN connecting…"</string>
- <string name="vpn_lockdown_connected" msgid="8202679674819213931">"Always-on VPN connected"</string>
- <string name="vpn_lockdown_disconnected" msgid="735805531187559719">"Disconnected from always-on VPN"</string>
- <string name="vpn_lockdown_error" msgid="3133844445659711681">"Couldn\'t connect to always-on VPN"</string>
- <string name="vpn_lockdown_config" msgid="8151951501116759194">"Change network or VPN settings"</string>
- <string name="upload_file" msgid="2897957172366730416">"Choose file"</string>
- <string name="no_file_chosen" msgid="6363648562170759465">"No file chosen"</string>
- <string name="reset" msgid="2448168080964209908">"Reset"</string>
- <string name="submit" msgid="1602335572089911941">"Submit"</string>
- <string name="car_mode_disable_notification_title" msgid="5704265646471239078">"Driving app is running"</string>
- <string name="car_mode_disable_notification_message" msgid="7647248420931129377">"Tap to exit driving app."</string>
- <string name="tethered_notification_title" msgid="3146694234398202601">"Tethering or hotspot active"</string>
- <string name="tethered_notification_message" msgid="2113628520792055377">"Tap to set up."</string>
- <string name="disable_tether_notification_title" msgid="7526977944111313195">"Tethering is disabled"</string>
- <string name="disable_tether_notification_message" msgid="2913366428516852495">"Contact your admin for details"</string>
- <string name="back_button_label" msgid="2300470004503343439">"Back"</string>
- <string name="next_button_label" msgid="1080555104677992408">"Next"</string>
- <string name="skip_button_label" msgid="1275362299471631819">"Skip"</string>
- <string name="no_matches" msgid="8129421908915840737">"No matches"</string>
- <string name="find_on_page" msgid="1946799233822820384">"Find on page"</string>
+ <string name="network_switch_type_name_unknown" msgid="4552612897806660656">"an unknown network type"</string>
+ <string name="wifi_watchdog_network_disabled" msgid="7904214231651546347">"Couldn\'t connect to Wi-Fi"</string>
+ <string name="wifi_watchdog_network_disabled_detailed" msgid="4917472096696322767">" has a poor internet connection."</string>
+ <string name="wifi_connect_alert_title" msgid="8455846016001810172">"Allow connection?"</string>
+ <string name="wifi_connect_alert_message" msgid="6451273376815958922">"Application %1$s would like to connect to Wifi Network %2$s"</string>
+ <string name="wifi_connect_default_application" msgid="7143109390475484319">"An application"</string>
+ <string name="wifi_p2p_dialog_title" msgid="97611782659324517">"Wi-Fi Direct"</string>
+ <string name="wifi_p2p_turnon_message" msgid="2909250942299627244">"Start Wi-Fi Direct. This will turn off Wi-Fi client/hotspot."</string>
+ <string name="wifi_p2p_failed_message" msgid="3763669677935623084">"Couldn\'t start Wi-Fi Direct."</string>
+ <string name="wifi_p2p_enabled_notification_title" msgid="2068321881673734886">"Wi-Fi Direct is on"</string>
+ <string name="wifi_p2p_enabled_notification_message" msgid="8064677407830620023">"Tap for settings"</string>
+ <string name="accept" msgid="1645267259272829559">"Accept"</string>
+ <string name="decline" msgid="2112225451706137894">"Decline"</string>
+ <string name="wifi_p2p_invitation_sent_title" msgid="1318975185112070734">"Invitation sent"</string>
+ <string name="wifi_p2p_invitation_to_connect_title" msgid="4958803948658533637">"Invitation to connect"</string>
+ <string name="wifi_p2p_from_message" msgid="570389174731951769">"From:"</string>
+ <string name="wifi_p2p_to_message" msgid="248968974522044099">"To:"</string>
+ <string name="wifi_p2p_enter_pin_message" msgid="5920929550367828970">"Type the required PIN:"</string>
+ <string name="wifi_p2p_show_pin_message" msgid="8530563323880921094">"PIN:"</string>
+ <string name="wifi_p2p_frequency_conflict_message" product="tablet" msgid="8012981257742232475">"The tablet will temporarily disconnect from Wi-Fi while it\'s connected to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="wifi_p2p_frequency_conflict_message" product="tv" msgid="3087858235069421128">"The TV will temporarily disconnect from Wi-Fi while it\'s connected to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="wifi_p2p_frequency_conflict_message" product="default" msgid="7363907213787469151">"The phone will temporarily disconnect from Wi-Fi while it\'s connected to <xliff:g id="DEVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="select_character" msgid="3365550120617701745">"Insert character"</string>
+ <string name="sms_control_title" msgid="7296612781128917719">"Sending SMS messages"</string>
+ <string name="sms_control_message" msgid="3867899169651496433">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> is sending a large number of SMS messages. Do you want to allow this app to continue sending messages?"</string>
+ <string name="sms_control_yes" msgid="3663725993855816807">"Allow"</string>
+ <string name="sms_control_no" msgid="625438561395534982">"Deny"</string>
+ <string name="sms_short_code_confirm_message" msgid="1645436466285310855">"<b><xliff:g id="APP_NAME">%1$s</xliff:g></b> would like to send a message to <b><xliff:g id="DEST_ADDRESS">%2$s</xliff:g></b>."</string>
+ <string name="sms_short_code_details" msgid="5873295990846059400">"This "<b>"may cause charges"</b>" on your mobile account."</string>
+ <string name="sms_premium_short_code_details" msgid="7869234868023975">""<b>"This will cause charges on your mobile account."</b>""</string>
+ <string name="sms_short_code_confirm_allow" msgid="4458878637111023413">"Send"</string>
+ <string name="sms_short_code_confirm_deny" msgid="2927389840209170706">"Cancel"</string>
+ <string name="sms_short_code_remember_choice" msgid="5289538592272218136">"Remember my choice"</string>
+ <string name="sms_short_code_remember_undo_instruction" msgid="4960944133052287484">"You can change this later in Settings > Apps"</string>
+ <string name="sms_short_code_confirm_always_allow" msgid="3241181154869493368">"Always Allow"</string>
+ <string name="sms_short_code_confirm_never_allow" msgid="446992765774269673">"Never Allow"</string>
+ <string name="sim_removed_title" msgid="6227712319223226185">"SIM card removed"</string>
+ <string name="sim_removed_message" msgid="2333164559970958645">"The mobile network will be unavailable until you restart with a valid SIM card inserted."</string>
+ <string name="sim_done_button" msgid="827949989369963775">"Done"</string>
+ <string name="sim_added_title" msgid="3719670512889674693">"SIM card added"</string>
+ <string name="sim_added_message" msgid="6599945301141050216">"Restart your device to access the mobile network."</string>
+ <string name="sim_restart_button" msgid="4722407842815232347">"Restart"</string>
+ <string name="install_carrier_app_notification_title" msgid="9056007111024059888">"Activate mobile service"</string>
+ <string name="install_carrier_app_notification_text" msgid="3346681446158696001">"Download the carrier app to activate your new SIM"</string>
+ <string name="install_carrier_app_notification_text_app_name" msgid="1196505084835248137">"Download the <xliff:g id="APP_NAME">%1$s</xliff:g> app to activate your new SIM"</string>
+ <string name="install_carrier_app_notification_button" msgid="3094206295081900849">"Download app"</string>
+ <string name="carrier_app_notification_title" msgid="8921767385872554621">"New SIM inserted"</string>
+ <string name="carrier_app_notification_text" msgid="1132487343346050225">"Tap to set it up"</string>
+ <string name="time_picker_dialog_title" msgid="8349362623068819295">"Set time"</string>
+ <string name="date_picker_dialog_title" msgid="5879450659453782278">"Set date"</string>
+ <string name="date_time_set" msgid="5777075614321087758">"Set"</string>
+ <string name="date_time_done" msgid="2507683751759308828">"Done"</string>
+ <string name="perms_new_perm_prefix" msgid="8257740710754301407">""<font size="12" fgcolor="#ff33b5e5">"NEW: "</font>""</string>
+ <string name="perms_description_app" msgid="5139836143293299417">"Provided by <xliff:g id="APP_NAME">%1$s</xliff:g>."</string>
+ <string name="no_permissions" msgid="7283357728219338112">"No permissions required"</string>
+ <string name="perm_costs_money" msgid="4902470324142151116">"this may cost you money"</string>
+ <string name="dlg_ok" msgid="7376953167039865701">"OK"</string>
+ <string name="usb_charging_notification_title" msgid="1595122345358177163">"Charging this device via USB"</string>
+ <string name="usb_supplying_notification_title" msgid="4631045789893086181">"Charging connected device via USB"</string>
+ <string name="usb_mtp_notification_title" msgid="4238227258391151029">"USB file transfer turned on"</string>
+ <string name="usb_ptp_notification_title" msgid="5425857879922006878">"PTP via USB turned on"</string>
+ <string name="usb_tether_notification_title" msgid="3716143122035802501">"USB tethering turned on"</string>
+ <string name="usb_midi_notification_title" msgid="5356040379749154805">"MIDI via USB turned on"</string>
+ <string name="usb_accessory_notification_title" msgid="1785694450621427730">"USB accessory connected"</string>
+ <string name="usb_notification_message" msgid="3370903770828407960">"Tap for more options."</string>
+ <string name="usb_power_notification_message" msgid="4647527153291917218">"Charging connected device. Tap for more options."</string>
+ <string name="usb_unsupported_audio_accessory_title" msgid="3529881374464628084">"Analog audio accessory detected"</string>
+ <string name="usb_unsupported_audio_accessory_message" msgid="6309553946441565215">"The attached device is not compatible with this phone. Tap to learn more."</string>
+ <string name="adb_active_notification_title" msgid="6729044778949189918">"USB debugging connected"</string>
+ <string name="adb_active_notification_message" msgid="7463062450474107752">"Tap to turn off USB debugging"</string>
+ <string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Select to disable USB debugging."</string>
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Liquid or debris in USB port"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB port is automatically disabled. Tap to learn more."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Safe to use USB port"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Phone no longer detects liquid or debris."</string>
+ <string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Taking bug report…"</string>
+ <string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Share bug report?"</string>
+ <string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Sharing bug report…"</string>
+ <string name="share_remote_bugreport_notification_message_finished" msgid="6029609949340992866">"Your admin requested a bug report to help troubleshoot this device. Apps and data may be shared."</string>
+ <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="4653387336791222978">"Choose input method"</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="597189518763083494">"Configure physical keyboard"</string>
+ <string name="select_keyboard_layout_notification_message" msgid="8084622969903004900">"Tap to select language and layout"</string>
+ <string name="fast_scroll_alphabet" msgid="5433275485499039199">" ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
+ <string name="fast_scroll_numeric_alphabet" msgid="4030170524595123610">" 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"</string>
+ <string name="alert_windows_notification_channel_group_name" msgid="1463953341148606396">"Display over other apps"</string>
+ <string name="alert_windows_notification_channel_name" msgid="3116610965549449803">"<xliff:g id="NAME">%s</xliff:g> displaying over other apps"</string>
+ <string name="alert_windows_notification_title" msgid="3697657294867638947">"<xliff:g id="NAME">%s</xliff:g> is displaying over other apps"</string>
+ <string name="alert_windows_notification_message" msgid="8917232109522912560">"If you don’t want <xliff:g id="NAME">%s</xliff:g> to use this feature, tap to open settings and turn it off."</string>
+ <string name="alert_windows_notification_turn_off_action" msgid="2902891971380544651">"Turn off"</string>
+ <string name="ext_media_checking_notification_title" msgid="4411133692439308924">"Checking <xliff:g id="NAME">%s</xliff:g>…"</string>
+ <string name="ext_media_checking_notification_message" msgid="410185170877285434">"Reviewing current content"</string>
+ <string name="ext_media_new_notification_title" msgid="1621805083736634077">"New <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="ext_media_new_notification_message" msgid="3673685270558405087">"Tap to set up"</string>
+ <string name="ext_media_ready_notification_message" msgid="4083398150380114462">"For transferring photos and media"</string>
+ <string name="ext_media_unmountable_notification_title" msgid="4179418065210797130">"Issue with <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="ext_media_unmountable_notification_message" msgid="4193858924381066522">"Tap to fix"</string>
+ <string name="ext_media_unmountable_notification_message" product="tv" msgid="3941179940297874950">"<xliff:g id="NAME">%s</xliff:g> is corrupt. Select to fix."</string>
+ <string name="ext_media_unsupported_notification_title" msgid="3797642322958803257">"Unsupported <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="ext_media_unsupported_notification_message" msgid="6121601473787888589">"This device doesn’t support this <xliff:g id="NAME">%s</xliff:g>. Tap to set up in a supported format."</string>
+ <string name="ext_media_unsupported_notification_message" product="tv" msgid="3725436899820390906">"This device doesn’t support this <xliff:g id="NAME">%s</xliff:g>. Select to set up in a supported format."</string>
+ <string name="ext_media_badremoval_notification_title" msgid="3206248947375505416">"<xliff:g id="NAME">%s</xliff:g> unexpectedly removed"</string>
+ <string name="ext_media_badremoval_notification_message" msgid="8556885808951260574">"Eject media before removing to avoid losing content"</string>
+ <string name="ext_media_nomedia_notification_title" msgid="6593814191061956856">"<xliff:g id="NAME">%s</xliff:g> removed"</string>
+ <string name="ext_media_nomedia_notification_message" msgid="2110883356419799994">"Some functionality may not work properly. Insert new storage."</string>
+ <string name="ext_media_unmounting_notification_title" msgid="5046532339291216076">"Ejecting <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="ext_media_unmounting_notification_message" msgid="1003926904442321115">"Don’t remove"</string>
+ <string name="ext_media_init_action" msgid="7952885510091978278">"Set up"</string>
+ <string name="ext_media_unmount_action" msgid="1121883233103278199">"Eject"</string>
+ <string name="ext_media_browse_action" msgid="8322172381028546087">"Explore"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
+ <string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> missing"</string>
+ <string name="ext_media_missing_message" msgid="4012389235250987930">"Insert device again"</string>
+ <string name="ext_media_move_specific_title" msgid="1471100343872375842">"Moving <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="ext_media_move_title" msgid="1022809140035962662">"Moving data"</string>
+ <string name="ext_media_move_success_title" msgid="7863652232242276066">"Content transfer is done"</string>
+ <string name="ext_media_move_success_message" msgid="8939137931961728009">"Content moved to <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="ext_media_move_failure_title" msgid="1604422634177382092">"Couldn’t move content"</string>
+ <string name="ext_media_move_failure_message" msgid="7388950499623016135">"Try moving content again"</string>
+ <string name="ext_media_status_removed" msgid="6576172423185918739">"Removed"</string>
+ <string name="ext_media_status_unmounted" msgid="2551560878416417752">"Ejected"</string>
+ <string name="ext_media_status_checking" msgid="6193921557423194949">"Checking…"</string>
+ <string name="ext_media_status_mounted" msgid="7253821726503179202">"Ready"</string>
+ <string name="ext_media_status_mounted_ro" msgid="8020978752406021015">"Read-only"</string>
+ <string name="ext_media_status_bad_removal" msgid="8395398567890329422">"Removed unsafely"</string>
+ <string name="ext_media_status_unmountable" msgid="805594039236667894">"Corrupted"</string>
+ <string name="ext_media_status_unsupported" msgid="4691436711745681828">"Unsupported"</string>
+ <string name="ext_media_status_ejecting" msgid="5463887263101234174">"Ejecting…"</string>
+ <string name="ext_media_status_formatting" msgid="1085079556538644861">"Formatting…"</string>
+ <string name="ext_media_status_missing" msgid="5638633895221670766">"Not inserted"</string>
+ <string name="activity_list_empty" msgid="1675388330786841066">"No matching activities found."</string>
+ <string name="permlab_route_media_output" msgid="6243022988998972085">"route media output"</string>
+ <string name="permdesc_route_media_output" msgid="4932818749547244346">"Allows an application to route media output to other external devices."</string>
+ <string name="permlab_readInstallSessions" msgid="3713753067455750349">"read install sessions"</string>
+ <string name="permdesc_readInstallSessions" msgid="2049771699626019849">"Allows an application to read install sessions. This allows it to see details about active package installations."</string>
+ <string name="permlab_requestInstallPackages" msgid="5782013576218172577">"request install packages"</string>
+ <string name="permdesc_requestInstallPackages" msgid="5740101072486783082">"Allows an application to request installation of packages."</string>
+ <string name="permlab_requestDeletePackages" msgid="1703686454657781242">"request delete packages"</string>
+ <string name="permdesc_requestDeletePackages" msgid="3406172963097595270">"Allows an application to request deletion of packages."</string>
+ <string name="permlab_requestIgnoreBatteryOptimizations" msgid="8021256345643918264">"ask to ignore battery optimizations"</string>
+ <string name="permdesc_requestIgnoreBatteryOptimizations" msgid="8359147856007447638">"Allows an app to ask for permission to ignore battery optimizations for that app."</string>
+ <string name="tutorial_double_tap_to_zoom_message_short" msgid="1311810005957319690">"Tap twice for zoom control"</string>
+ <string name="gadget_host_error_inflating" msgid="4882004314906466162">"Couldn\'t add widget."</string>
+ <string name="ime_action_go" msgid="8320845651737369027">"Go"</string>
+ <string name="ime_action_search" msgid="658110271822807811">"Search"</string>
+ <string name="ime_action_send" msgid="2316166556349314424">"Send"</string>
+ <string name="ime_action_next" msgid="3138843904009813834">"Next"</string>
+ <string name="ime_action_done" msgid="8971516117910934605">"Done"</string>
+ <string name="ime_action_previous" msgid="1443550039250105948">"Prev"</string>
+ <string name="ime_action_default" msgid="2840921885558045721">"Execute"</string>
+ <string name="dial_number_using" msgid="5789176425167573586">"Dial number\nusing <xliff:g id="NUMBER">%s</xliff:g>"</string>
+ <string name="create_contact_using" msgid="4947405226788104538">"Create contact\nusing <xliff:g id="NUMBER">%s</xliff:g>"</string>
+ <string name="grant_credentials_permission_message_header" msgid="2106103817937859662">"The following one or more apps request permission to access your account, now and in the future."</string>
+ <string name="grant_credentials_permission_message_footer" msgid="3125211343379376561">"Do you want to allow this request?"</string>
+ <string name="grant_permissions_header_text" msgid="6874497408201826708">"Access request"</string>
+ <string name="allow" msgid="7225948811296386551">"Allow"</string>
+ <string name="deny" msgid="2081879885755434506">"Deny"</string>
+ <string name="permission_request_notification_title" msgid="6486759795926237907">"Permission requested"</string>
+ <string name="permission_request_notification_with_subtitle" msgid="8530393139639560189">"Permission requested\nfor account <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
+ <string name="forward_intent_to_owner" msgid="1207197447013960896">"You\'re using this app outside of your work profile"</string>
+ <string name="forward_intent_to_work" msgid="621480743856004612">"You\'re using this app in your work profile"</string>
+ <string name="input_method_binding_label" msgid="1283557179944992649">"Input method"</string>
+ <string name="sync_binding_label" msgid="3687969138375092423">"Sync"</string>
+ <string name="accessibility_binding_label" msgid="4148120742096474641">"Accessibility"</string>
+ <string name="wallpaper_binding_label" msgid="1240087844304687662">"Wallpaper"</string>
+ <string name="chooser_wallpaper" msgid="7873476199295190279">"Change wallpaper"</string>
+ <string name="notification_listener_binding_label" msgid="2014162835481906429">"Notification listener"</string>
+ <string name="vr_listener_binding_label" msgid="4316591939343607306">"VR listener"</string>
+ <string name="condition_provider_service_binding_label" msgid="1321343352906524564">"Condition provider"</string>
+ <string name="notification_ranker_binding_label" msgid="774540592299064747">"Notification ranker service"</string>
+ <string name="vpn_title" msgid="19615213552042827">"VPN activated"</string>
+ <string name="vpn_title_long" msgid="6400714798049252294">"VPN is activated by <xliff:g id="APP">%s</xliff:g>"</string>
+ <string name="vpn_text" msgid="1610714069627824309">"Tap to manage the network."</string>
+ <string name="vpn_text_long" msgid="4907843483284977618">"Connected to <xliff:g id="SESSION">%s</xliff:g>. Tap to manage the network."</string>
+ <string name="vpn_lockdown_connecting" msgid="6443438964440960745">"Always-on VPN connecting…"</string>
+ <string name="vpn_lockdown_connected" msgid="8202679674819213931">"Always-on VPN connected"</string>
+ <string name="vpn_lockdown_disconnected" msgid="735805531187559719">"Disconnected from always-on VPN"</string>
+ <string name="vpn_lockdown_error" msgid="3133844445659711681">"Couldn\'t connect to always-on VPN"</string>
+ <string name="vpn_lockdown_config" msgid="8151951501116759194">"Change network or VPN settings"</string>
+ <string name="upload_file" msgid="2897957172366730416">"Choose file"</string>
+ <string name="no_file_chosen" msgid="6363648562170759465">"No file chosen"</string>
+ <string name="reset" msgid="2448168080964209908">"Reset"</string>
+ <string name="submit" msgid="1602335572089911941">"Submit"</string>
+ <string name="car_mode_disable_notification_title" msgid="5704265646471239078">"Driving app is running"</string>
+ <string name="car_mode_disable_notification_message" msgid="7647248420931129377">"Tap to exit driving app."</string>
+ <string name="tethered_notification_title" msgid="3146694234398202601">"Tethering or hotspot active"</string>
+ <string name="tethered_notification_message" msgid="2113628520792055377">"Tap to set up."</string>
+ <string name="disable_tether_notification_title" msgid="7526977944111313195">"Tethering is disabled"</string>
+ <string name="disable_tether_notification_message" msgid="2913366428516852495">"Contact your admin for details"</string>
+ <string name="back_button_label" msgid="2300470004503343439">"Back"</string>
+ <string name="next_button_label" msgid="1080555104677992408">"Next"</string>
+ <string name="skip_button_label" msgid="1275362299471631819">"Skip"</string>
+ <string name="no_matches" msgid="8129421908915840737">"No matches"</string>
+ <string name="find_on_page" msgid="1946799233822820384">"Find on page"</string>
<plurals name="matches_found" formatted="false" msgid="1210884353962081884">
- <item quantity="other"><xliff:g id="INDEX">%d</xliff:g> of <xliff:g id="TOTAL">%d</xliff:g></item>
- <item quantity="one">1 match</item>
+ <item quantity="other"><xliff:g id="INDEX">%d</xliff:g> of <xliff:g id="TOTAL">%d</xliff:g></item>
+ <item quantity="one">1 match</item>
</plurals>
- <string name="action_mode_done" msgid="7217581640461922289">"Done"</string>
- <string name="progress_erasing" msgid="2569962663843586562">"Erasing shared storage…"</string>
- <string name="share" msgid="1778686618230011964">"Share"</string>
- <string name="find" msgid="4808270900322985960">"Find"</string>
- <string name="websearch" msgid="4337157977400211589">"Web Search"</string>
- <string name="find_next" msgid="5742124618942193978">"Find next"</string>
- <string name="find_previous" msgid="2196723669388360506">"Find previous"</string>
- <string name="gpsNotifTicker" msgid="5622683912616496172">"Location request from <xliff:g id="NAME">%s</xliff:g>"</string>
- <string name="gpsNotifTitle" msgid="5446858717157416839">"Location request"</string>
- <string name="gpsNotifMessage" msgid="1374718023224000702">"Requested by <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SERVICE">%2$s</xliff:g>)"</string>
- <string name="gpsVerifYes" msgid="2346566072867213563">"Yes"</string>
- <string name="gpsVerifNo" msgid="1146564937346454865">"No"</string>
- <string name="sync_too_many_deletes" msgid="5296321850662746890">"Delete limit exceeded"</string>
- <string name="sync_too_many_deletes_desc" msgid="496551671008694245">"There are <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> deleted items for <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, account <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. What do you want to do?"</string>
- <string name="sync_really_delete" msgid="2572600103122596243">"Delete the items"</string>
- <string name="sync_undo_deletes" msgid="2941317360600338602">"Undo the deletes"</string>
- <string name="sync_do_nothing" msgid="3743764740430821845">"Do nothing for now"</string>
- <string name="choose_account_label" msgid="5655203089746423927">"Choose an account"</string>
- <string name="add_account_label" msgid="2935267344849993553">"Add an account"</string>
- <string name="add_account_button_label" msgid="3611982894853435874">"Add account"</string>
- <string name="number_picker_increment_button" msgid="2412072272832284313">"Increase"</string>
- <string name="number_picker_decrement_button" msgid="476050778386779067">"Decrease"</string>
- <string name="number_picker_increment_scroll_mode" msgid="5259126567490114216">"<xliff:g id="VALUE">%s</xliff:g> touch & hold."</string>
- <string name="number_picker_increment_scroll_action" msgid="9101473045891835490">"Slide up to increase and down to decrease."</string>
- <string name="time_picker_increment_minute_button" msgid="8865885114028614321">"Increase minute"</string>
- <string name="time_picker_decrement_minute_button" msgid="6246834937080684791">"Decrease minute"</string>
- <string name="time_picker_increment_hour_button" msgid="3652056055810223139">"Increase hour"</string>
- <string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"Decrease hour"</string>
- <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Set PM"</string>
- <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Set AM"</string>
- <string name="date_picker_increment_month_button" msgid="5369998479067934110">"Increase month"</string>
- <string name="date_picker_decrement_month_button" msgid="1832698995541726019">"Decrease month"</string>
- <string name="date_picker_increment_day_button" msgid="7130465412308173903">"Increase day"</string>
- <string name="date_picker_decrement_day_button" msgid="4131881521818750031">"Decrease day"</string>
- <string name="date_picker_increment_year_button" msgid="6318697384310808899">"Increase year"</string>
- <string name="date_picker_decrement_year_button" msgid="4482021813491121717">"Decrease year"</string>
- <string name="date_picker_prev_month_button" msgid="2858244643992056505">"Previous month"</string>
- <string name="date_picker_next_month_button" msgid="5559507736887605055">"Next month"</string>
- <string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Alt"</string>
- <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"Cancel"</string>
- <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"Delete"</string>
- <string name="keyboardview_keycode_done" msgid="1992571118466679775">"Done"</string>
- <string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"Mode change"</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">"Choose an app"</string>
- <string name="activitychooserview_choose_application_error" msgid="8624618365481126668">"Couldn\'t launch <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="shareactionprovider_share_with" msgid="806688056141131819">"Share with"</string>
- <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Share with <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
- <string name="content_description_sliding_handle" msgid="415975056159262248">"Sliding handle. Touch & hold."</string>
- <string name="description_target_unlock_tablet" msgid="3833195335629795055">"Swipe to unlock."</string>
- <string name="action_bar_home_description" msgid="5293600496601490216">"Navigate home"</string>
- <string name="action_bar_up_description" msgid="2237496562952152589">"Navigate up"</string>
- <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="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>
- <string name="storage_usb_drive_label" msgid="4501418548927759953">"<xliff:g id="MANUFACTURER">%s</xliff:g> USB drive"</string>
- <string name="storage_usb" msgid="3017954059538517278">"USB storage"</string>
- <string name="extract_edit_menu_button" msgid="8940478730496610137">"Edit"</string>
- <string name="data_usage_warning_title" msgid="6499834033204801605">"Data warning"</string>
- <string name="data_usage_warning_body" msgid="7340198905103751676">"You\'ve used <xliff:g id="APP">%s</xliff:g> of data"</string>
- <string name="data_usage_mobile_limit_title" msgid="6561099244084267376">"Mobile data limit reached"</string>
- <string name="data_usage_wifi_limit_title" msgid="5803363779034792676">"Wi-Fi data limit reached"</string>
- <string name="data_usage_limit_body" msgid="2908179506560812973">"Data paused for the rest of your cycle"</string>
- <string name="data_usage_mobile_limit_snoozed_title" msgid="3171402244827034372">"Over your mobile data limit"</string>
- <string name="data_usage_wifi_limit_snoozed_title" msgid="3547771791046344188">"Over your Wi-Fi data limit"</string>
- <string name="data_usage_limit_snoozed_body" msgid="1671222777207603301">"You\'ve gone <xliff:g id="SIZE">%s</xliff:g> over your set limit"</string>
- <string name="data_usage_restricted_title" msgid="5965157361036321914">"Background data restricted"</string>
- <string name="data_usage_restricted_body" msgid="469866376337242726">"Tap to remove restriction."</string>
- <string name="data_usage_rapid_title" msgid="1809795402975261331">"High mobile data usage"</string>
- <string name="data_usage_rapid_body" msgid="6897825788682442715">"Your apps have used more data than usual"</string>
- <string name="data_usage_rapid_app_body" msgid="5396680996784142544">"<xliff:g id="APP">%s</xliff:g> has used more data than usual"</string>
- <string name="ssl_certificate" msgid="6510040486049237639">"Security certificate"</string>
- <string name="ssl_certificate_is_valid" msgid="6825263250774569373">"This certificate is valid."</string>
- <string name="issued_to" msgid="454239480274921032">"Issued to:"</string>
- <string name="common_name" msgid="2233209299434172646">"Common name:"</string>
- <string name="org_name" msgid="6973561190762085236">"Organization:"</string>
- <string name="org_unit" msgid="7265981890422070383">"Organizational unit:"</string>
- <string name="issued_by" msgid="2647584988057481566">"Issued by:"</string>
- <string name="validity_period" msgid="8818886137545983110">"Validity:"</string>
- <string name="issued_on" msgid="5895017404361397232">"Issued on:"</string>
- <string name="expires_on" msgid="3676242949915959821">"Expires on:"</string>
- <string name="serial_number" msgid="758814067660862493">"Serial number:"</string>
- <string name="fingerprints" msgid="4516019619850763049">"Fingerprints:"</string>
- <string name="sha256_fingerprint" msgid="4391271286477279263">"SHA-256 fingerprint:"</string>
- <string name="sha1_fingerprint" msgid="7930330235269404581">"SHA-1 fingerprint:"</string>
- <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"See all"</string>
- <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"Choose activity"</string>
- <string name="share_action_provider_share_with" msgid="5247684435979149216">"Share with"</string>
- <string name="sending" msgid="3245653681008218030">"Sending…"</string>
- <string name="launchBrowserDefault" msgid="2057951947297614725">"Launch Browser?"</string>
- <string name="SetupCallDefault" msgid="5834948469253758575">"Accept call?"</string>
- <string name="activity_resolver_use_always" msgid="8017770747801494933">"Always"</string>
- <string name="activity_resolver_use_once" msgid="2404644797149173758">"Just once"</string>
- <string name="activity_resolver_app_settings" msgid="8965806928986509855">"Settings"</string>
- <string name="activity_resolver_work_profiles_support" msgid="185598180676883455">"%1$s doesn\'t support work profile"</string>
- <string name="default_audio_route_name" product="tablet" msgid="4617053898167127471">"Tablet"</string>
- <string name="default_audio_route_name" product="tv" msgid="9158088547603019321">"TV"</string>
- <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Phone"</string>
- <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dock speakers"</string>
- <string name="default_audio_route_name_hdmi" msgid="1486254205617081251">"HDMI"</string>
- <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Headphones"</string>
- <string name="default_audio_route_name_usb" msgid="1234984851352637769">"USB"</string>
- <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string>
- <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth audio"</string>
- <string name="wireless_display_route_description" msgid="9070346425023979651">"Wireless display"</string>
- <string name="media_route_button_content_description" msgid="591703006349356016">"Cast"</string>
- <string name="media_route_chooser_title" msgid="1751618554539087622">"Connect to device"</string>
- <string name="media_route_chooser_title_for_remote_display" msgid="3395541745872017583">"Cast screen to device"</string>
- <string name="media_route_chooser_searching" msgid="4776236202610828706">"Searching for devices…"</string>
- <string name="media_route_chooser_extended_settings" msgid="87015534236701604">"Settings"</string>
- <string name="media_route_controller_disconnect" msgid="8966120286374158649">"Disconnect"</string>
- <string name="media_route_status_scanning" msgid="7279908761758293783">"Scanning..."</string>
- <string name="media_route_status_connecting" msgid="6422571716007825440">"Connecting..."</string>
- <string name="media_route_status_available" msgid="6983258067194649391">"Available"</string>
- <string name="media_route_status_not_available" msgid="6739899962681886401">"Not available"</string>
- <string name="media_route_status_in_use" msgid="4533786031090198063">"In use"</string>
- <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Built-in Screen"</string>
- <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI Screen"</string>
- <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Overlay #<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> dpi"</string>
- <string name="display_manager_overlay_display_secure_suffix" msgid="6022119702628572080">", secure"</string>
- <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"Forgot Pattern"</string>
- <string name="kg_wrong_pattern" msgid="1850806070801358830">"Wrong Pattern"</string>
- <string name="kg_wrong_password" msgid="2333281762128113157">"Wrong Password"</string>
- <string name="kg_wrong_pin" msgid="1131306510833563801">"Wrong PIN"</string>
+ <string name="action_mode_done" msgid="7217581640461922289">"Done"</string>
+ <string name="progress_erasing" msgid="2569962663843586562">"Erasing shared storage…"</string>
+ <string name="share" msgid="1778686618230011964">"Share"</string>
+ <string name="find" msgid="4808270900322985960">"Find"</string>
+ <string name="websearch" msgid="4337157977400211589">"Web Search"</string>
+ <string name="find_next" msgid="5742124618942193978">"Find next"</string>
+ <string name="find_previous" msgid="2196723669388360506">"Find previous"</string>
+ <string name="gpsNotifTicker" msgid="5622683912616496172">"Location request from <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="gpsNotifTitle" msgid="5446858717157416839">"Location request"</string>
+ <string name="gpsNotifMessage" msgid="1374718023224000702">"Requested by <xliff:g id="NAME">%1$s</xliff:g> (<xliff:g id="SERVICE">%2$s</xliff:g>)"</string>
+ <string name="gpsVerifYes" msgid="2346566072867213563">"Yes"</string>
+ <string name="gpsVerifNo" msgid="1146564937346454865">"No"</string>
+ <string name="sync_too_many_deletes" msgid="5296321850662746890">"Delete limit exceeded"</string>
+ <string name="sync_too_many_deletes_desc" msgid="496551671008694245">"There are <xliff:g id="NUMBER_OF_DELETED_ITEMS">%1$d</xliff:g> deleted items for <xliff:g id="TYPE_OF_SYNC">%2$s</xliff:g>, account <xliff:g id="ACCOUNT_NAME">%3$s</xliff:g>. What do you want to do?"</string>
+ <string name="sync_really_delete" msgid="2572600103122596243">"Delete the items"</string>
+ <string name="sync_undo_deletes" msgid="2941317360600338602">"Undo the deletes"</string>
+ <string name="sync_do_nothing" msgid="3743764740430821845">"Do nothing for now"</string>
+ <string name="choose_account_label" msgid="5655203089746423927">"Choose an account"</string>
+ <string name="add_account_label" msgid="2935267344849993553">"Add an account"</string>
+ <string name="add_account_button_label" msgid="3611982894853435874">"Add account"</string>
+ <string name="number_picker_increment_button" msgid="2412072272832284313">"Increase"</string>
+ <string name="number_picker_decrement_button" msgid="476050778386779067">"Decrease"</string>
+ <string name="number_picker_increment_scroll_mode" msgid="5259126567490114216">"<xliff:g id="VALUE">%s</xliff:g> touch & hold."</string>
+ <string name="number_picker_increment_scroll_action" msgid="9101473045891835490">"Slide up to increase and down to decrease."</string>
+ <string name="time_picker_increment_minute_button" msgid="8865885114028614321">"Increase minute"</string>
+ <string name="time_picker_decrement_minute_button" msgid="6246834937080684791">"Decrease minute"</string>
+ <string name="time_picker_increment_hour_button" msgid="3652056055810223139">"Increase hour"</string>
+ <string name="time_picker_decrement_hour_button" msgid="1377479863429214792">"Decrease hour"</string>
+ <string name="time_picker_increment_set_pm_button" msgid="4147590696151230863">"Set PM"</string>
+ <string name="time_picker_decrement_set_am_button" msgid="8302140353539486752">"Set AM"</string>
+ <string name="date_picker_increment_month_button" msgid="5369998479067934110">"Increase month"</string>
+ <string name="date_picker_decrement_month_button" msgid="1832698995541726019">"Decrease month"</string>
+ <string name="date_picker_increment_day_button" msgid="7130465412308173903">"Increase day"</string>
+ <string name="date_picker_decrement_day_button" msgid="4131881521818750031">"Decrease day"</string>
+ <string name="date_picker_increment_year_button" msgid="6318697384310808899">"Increase year"</string>
+ <string name="date_picker_decrement_year_button" msgid="4482021813491121717">"Decrease year"</string>
+ <string name="date_picker_prev_month_button" msgid="2858244643992056505">"Previous month"</string>
+ <string name="date_picker_next_month_button" msgid="5559507736887605055">"Next month"</string>
+ <string name="keyboardview_keycode_alt" msgid="4856868820040051939">"Alt"</string>
+ <string name="keyboardview_keycode_cancel" msgid="1203984017245783244">"Cancel"</string>
+ <string name="keyboardview_keycode_delete" msgid="3337914833206635744">"Delete"</string>
+ <string name="keyboardview_keycode_done" msgid="1992571118466679775">"Done"</string>
+ <string name="keyboardview_keycode_mode_change" msgid="4547387741906537519">"Mode change"</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">"Choose an app"</string>
+ <string name="activitychooserview_choose_application_error" msgid="8624618365481126668">"Couldn\'t launch <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+ <string name="shareactionprovider_share_with" msgid="806688056141131819">"Share with"</string>
+ <string name="shareactionprovider_share_with_application" msgid="5627411384638389738">"Share with <xliff:g id="APPLICATION_NAME">%s</xliff:g>"</string>
+ <string name="content_description_sliding_handle" msgid="415975056159262248">"Sliding handle. Touch & hold."</string>
+ <string name="description_target_unlock_tablet" msgid="3833195335629795055">"Swipe to unlock."</string>
+ <string name="action_bar_home_description" msgid="5293600496601490216">"Navigate home"</string>
+ <string name="action_bar_up_description" msgid="2237496562952152589">"Navigate up"</string>
+ <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="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>
+ <string name="storage_usb_drive_label" msgid="4501418548927759953">"<xliff:g id="MANUFACTURER">%s</xliff:g> USB drive"</string>
+ <string name="storage_usb" msgid="3017954059538517278">"USB storage"</string>
+ <string name="extract_edit_menu_button" msgid="8940478730496610137">"Edit"</string>
+ <string name="data_usage_warning_title" msgid="6499834033204801605">"Data warning"</string>
+ <string name="data_usage_warning_body" msgid="7340198905103751676">"You\'ve used <xliff:g id="APP">%s</xliff:g> of data"</string>
+ <string name="data_usage_mobile_limit_title" msgid="6561099244084267376">"Mobile data limit reached"</string>
+ <string name="data_usage_wifi_limit_title" msgid="5803363779034792676">"Wi-Fi data limit reached"</string>
+ <string name="data_usage_limit_body" msgid="2908179506560812973">"Data paused for the rest of your cycle"</string>
+ <string name="data_usage_mobile_limit_snoozed_title" msgid="3171402244827034372">"Over your mobile data limit"</string>
+ <string name="data_usage_wifi_limit_snoozed_title" msgid="3547771791046344188">"Over your Wi-Fi data limit"</string>
+ <string name="data_usage_limit_snoozed_body" msgid="1671222777207603301">"You\'ve gone <xliff:g id="SIZE">%s</xliff:g> over your set limit"</string>
+ <string name="data_usage_restricted_title" msgid="5965157361036321914">"Background data restricted"</string>
+ <string name="data_usage_restricted_body" msgid="469866376337242726">"Tap to remove restriction."</string>
+ <string name="data_usage_rapid_title" msgid="1809795402975261331">"High mobile data usage"</string>
+ <string name="data_usage_rapid_body" msgid="6897825788682442715">"Your apps have used more data than usual"</string>
+ <string name="data_usage_rapid_app_body" msgid="5396680996784142544">"<xliff:g id="APP">%s</xliff:g> has used more data than usual"</string>
+ <string name="ssl_certificate" msgid="6510040486049237639">"Security certificate"</string>
+ <string name="ssl_certificate_is_valid" msgid="6825263250774569373">"This certificate is valid."</string>
+ <string name="issued_to" msgid="454239480274921032">"Issued to:"</string>
+ <string name="common_name" msgid="2233209299434172646">"Common name:"</string>
+ <string name="org_name" msgid="6973561190762085236">"Organization:"</string>
+ <string name="org_unit" msgid="7265981890422070383">"Organizational unit:"</string>
+ <string name="issued_by" msgid="2647584988057481566">"Issued by:"</string>
+ <string name="validity_period" msgid="8818886137545983110">"Validity:"</string>
+ <string name="issued_on" msgid="5895017404361397232">"Issued on:"</string>
+ <string name="expires_on" msgid="3676242949915959821">"Expires on:"</string>
+ <string name="serial_number" msgid="758814067660862493">"Serial number:"</string>
+ <string name="fingerprints" msgid="4516019619850763049">"Fingerprints:"</string>
+ <string name="sha256_fingerprint" msgid="4391271286477279263">"SHA-256 fingerprint:"</string>
+ <string name="sha1_fingerprint" msgid="7930330235269404581">"SHA-1 fingerprint:"</string>
+ <string name="activity_chooser_view_see_all" msgid="4292569383976636200">"See all"</string>
+ <string name="activity_chooser_view_dialog_title_default" msgid="4710013864974040615">"Choose activity"</string>
+ <string name="share_action_provider_share_with" msgid="5247684435979149216">"Share with"</string>
+ <string name="sending" msgid="3245653681008218030">"Sending…"</string>
+ <string name="launchBrowserDefault" msgid="2057951947297614725">"Launch Browser?"</string>
+ <string name="SetupCallDefault" msgid="5834948469253758575">"Accept call?"</string>
+ <string name="activity_resolver_use_always" msgid="8017770747801494933">"Always"</string>
+ <string name="activity_resolver_use_once" msgid="2404644797149173758">"Just once"</string>
+ <string name="activity_resolver_app_settings" msgid="8965806928986509855">"Settings"</string>
+ <string name="activity_resolver_work_profiles_support" msgid="185598180676883455">"%1$s doesn\'t support work profile"</string>
+ <string name="default_audio_route_name" product="tablet" msgid="4617053898167127471">"Tablet"</string>
+ <string name="default_audio_route_name" product="tv" msgid="9158088547603019321">"TV"</string>
+ <string name="default_audio_route_name" product="default" msgid="4239291273420140123">"Phone"</string>
+ <string name="default_audio_route_name_dock_speakers" msgid="6240602982276591864">"Dock speakers"</string>
+ <string name="default_audio_route_name_hdmi" msgid="1486254205617081251">"HDMI"</string>
+ <string name="default_audio_route_name_headphones" msgid="8119971843803439110">"Headphones"</string>
+ <string name="default_audio_route_name_usb" msgid="1234984851352637769">"USB"</string>
+ <string name="default_audio_route_category_name" msgid="3722811174003886946">"System"</string>
+ <string name="bluetooth_a2dp_audio_route_name" msgid="8575624030406771015">"Bluetooth audio"</string>
+ <string name="wireless_display_route_description" msgid="9070346425023979651">"Wireless display"</string>
+ <string name="media_route_button_content_description" msgid="591703006349356016">"Cast"</string>
+ <string name="media_route_chooser_title" msgid="1751618554539087622">"Connect to device"</string>
+ <string name="media_route_chooser_title_for_remote_display" msgid="3395541745872017583">"Cast screen to device"</string>
+ <string name="media_route_chooser_searching" msgid="4776236202610828706">"Searching for devices…"</string>
+ <string name="media_route_chooser_extended_settings" msgid="87015534236701604">"Settings"</string>
+ <string name="media_route_controller_disconnect" msgid="8966120286374158649">"Disconnect"</string>
+ <string name="media_route_status_scanning" msgid="7279908761758293783">"Scanning..."</string>
+ <string name="media_route_status_connecting" msgid="6422571716007825440">"Connecting..."</string>
+ <string name="media_route_status_available" msgid="6983258067194649391">"Available"</string>
+ <string name="media_route_status_not_available" msgid="6739899962681886401">"Not available"</string>
+ <string name="media_route_status_in_use" msgid="4533786031090198063">"In use"</string>
+ <string name="display_manager_built_in_display_name" msgid="2583134294292563941">"Built-in Screen"</string>
+ <string name="display_manager_hdmi_display_name" msgid="1555264559227470109">"HDMI Screen"</string>
+ <string name="display_manager_overlay_display_name" msgid="5142365982271620716">"Overlay #<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> dpi"</string>
+ <string name="display_manager_overlay_display_secure_suffix" msgid="6022119702628572080">", secure"</string>
+ <string name="kg_forgot_pattern_button_text" msgid="8852021467868220608">"Forgot Pattern"</string>
+ <string name="kg_wrong_pattern" msgid="1850806070801358830">"Wrong Pattern"</string>
+ <string name="kg_wrong_password" msgid="2333281762128113157">"Wrong Password"</string>
+ <string name="kg_wrong_pin" msgid="1131306510833563801">"Wrong PIN"</string>
<plurals name="kg_too_many_failed_attempts_countdown" formatted="false" msgid="8790651267324125694">
- <item quantity="other">Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds.</item>
- <item quantity="one">Try again in 1 second.</item>
+ <item quantity="other">Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds.</item>
+ <item quantity="one">Try again in 1 second.</item>
</plurals>
- <string name="kg_pattern_instructions" msgid="398978611683075868">"Draw your pattern"</string>
- <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Enter SIM PIN"</string>
- <string name="kg_pin_instructions" msgid="2377242233495111557">"Enter PIN"</string>
- <string name="kg_password_instructions" msgid="5753646556186936819">"Enter Password"</string>
- <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string>
- <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Enter desired PIN code"</string>
- <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Confirm desired PIN code"</string>
- <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Unlocking SIM card…"</string>
- <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Incorrect PIN code."</string>
- <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Type a PIN that is 4 to 8 numbers."</string>
- <string name="kg_invalid_sim_puk_hint" msgid="6025069204539532000">"PUK code should be 8 numbers."</string>
- <string name="kg_invalid_puk" msgid="3638289409676051243">"Re-enter the correct PUK code. Repeated attempts will permanently disable the SIM."</string>
- <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN codes does not match"</string>
- <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Too many pattern attempts"</string>
- <string name="kg_login_instructions" msgid="1100551261265506448">"To unlock, sign in with your Google account."</string>
- <string name="kg_login_username_hint" msgid="5718534272070920364">"Username (email)"</string>
- <string name="kg_login_password_hint" msgid="9057289103827298549">"Password"</string>
- <string name="kg_login_submit_button" msgid="5355904582674054702">"Sign in"</string>
- <string name="kg_login_invalid_input" msgid="5754664119319872197">"Invalid username or password."</string>
- <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Forgot your username or password?\nVisit "<b>"google.com/accounts/recovery"</b>"."</string>
- <string name="kg_login_checking_password" msgid="1052685197710252395">"Checking account…"</string>
- <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"You have incorrectly typed your PIN <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
- <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"You have incorrectly typed your password <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
- <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
- <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="1575557200627128949">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the tablet will be reset to factory default and all user data will be lost."</string>
- <string name="kg_failed_attempts_almost_at_wipe" product="tv" msgid="5621231220154419413">"You have incorrectly attempted to unlock the TV <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the TV will be reset to factory default and all user data will be lost."</string>
- <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="4051015943038199910">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the phone will be reset to factory default and all user data will be lost."</string>
- <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="2072996269148483637">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER">%d</xliff:g> times. The tablet will now be reset to factory default."</string>
- <string name="kg_failed_attempts_now_wiping" product="tv" msgid="4987878286750741463">"You have incorrectly attempted to unlock the TV <xliff:g id="NUMBER">%d</xliff:g> times. The TV will now be reset to factory default."</string>
- <string name="kg_failed_attempts_now_wiping" product="default" msgid="4817627474419471518">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER">%d</xliff:g> times. The phone will now be reset to factory default."</string>
- <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your tablet using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
- <string name="kg_failed_attempts_almost_at_login" product="tv" msgid="4224651132862313471">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your TV using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
- <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
- <string name="kg_text_message_separator" product="default" msgid="4160700433287233771">" — "</string>
- <string name="kg_reordering_delete_drop_target_text" msgid="7899202978204438708">"Remove"</string>
- <string name="safe_media_volume_warning" product="default" msgid="2276318909314492312">"Raise volume above recommended level?\n\nListening at high volume for long periods may damage your hearing."</string>
- <string name="accessibility_shortcut_warning_dialog_title" msgid="8404780875025725199">"Use Accessibility Shortcut?"</string>
- <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"When the shortcut is on, pressing both volume buttons for 3 seconds will start an accessibility feature.\n\n Current accessibility feature:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n You can change the feature in Settings > Accessibility."</string>
- <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Turn off Shortcut"</string>
- <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Use Shortcut"</string>
- <string name="color_inversion_feature_name" msgid="4231186527799958644">"Color Inversion"</string>
- <string name="color_correction_feature_name" msgid="6779391426096954933">"Color Correction"</string>
- <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Accessibility Shortcut turned <xliff:g id="SERVICE_NAME">%1$s</xliff:g> on"</string>
- <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Accessibility Shortcut turned <xliff:g id="SERVICE_NAME">%1$s</xliff:g> off"</string>
- <string name="accessibility_shortcut_spoken_feedback" msgid="8376923232350078434">"Press and hold both volume keys for three seconds to use <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string>
- <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Choose a feature to use when you tap the Accessibility button:"</string>
- <string name="accessibility_button_instructional_text" msgid="6942300463612999993">"To change features, touch & hold the Accessibility button."</string>
- <string name="accessibility_magnification_chooser_text" msgid="1227146738764986237">"Magnification"</string>
- <string name="user_switched" msgid="3768006783166984410">"Current user <xliff:g id="NAME">%1$s</xliff:g>."</string>
- <string name="user_switching_message" msgid="2871009331809089783">"Switching to <xliff:g id="NAME">%1$s</xliff:g>…"</string>
- <string name="user_logging_out_message" msgid="8939524935808875155">"Logging out <xliff:g id="NAME">%1$s</xliff:g>…"</string>
- <string name="owner_name" msgid="2716755460376028154">"Owner"</string>
- <string name="error_message_title" msgid="4510373083082500195">"Error"</string>
- <string name="error_message_change_not_allowed" msgid="1238035947357923497">"This change isn\'t allowed by your admin"</string>
- <string name="app_not_found" msgid="3429141853498927379">"No application found to handle this action"</string>
- <string name="revoke" msgid="5404479185228271586">"Revoke"</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 B1"</string>
- <string name="mediasize_iso_b2" msgid="1348731852150380378">"ISO B2"</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 B6"</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 C2"</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 C8"</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 B2"</string>
- <string name="mediasize_japanese_jis_b1" msgid="4608142385457034603">"JIS B1"</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">"Unknown portrait"</string>
- <string name="mediasize_unknown_landscape" msgid="4876995327029361552">"Unknown landscape"</string>
- <string name="write_fail_reason_cancelled" msgid="7091258378121627624">"Cancelled"</string>
- <string name="write_fail_reason_cannot_write" msgid="8132505417935337724">"Error writing content"</string>
- <string name="reason_unknown" msgid="6048913880184628119">"unknown"</string>
- <string name="reason_service_unavailable" msgid="7824008732243903268">"Print service not enabled"</string>
- <string name="print_service_installed_title" msgid="2246317169444081628">"<xliff:g id="NAME">%s</xliff:g> service installed"</string>
- <string name="print_service_installed_message" msgid="5897362931070459152">"Tap to enable"</string>
- <string name="restr_pin_enter_admin_pin" msgid="8641662909467236832">"Enter admin PIN"</string>
- <string name="restr_pin_enter_pin" msgid="3395953421368476103">"Enter PIN"</string>
- <string name="restr_pin_incorrect" msgid="8571512003955077924">"Incorrect"</string>
- <string name="restr_pin_enter_old_pin" msgid="1462206225512910757">"Current PIN"</string>
- <string name="restr_pin_enter_new_pin" msgid="5959606691619959184">"New PIN"</string>
- <string name="restr_pin_confirm_pin" msgid="8501523829633146239">"Confirm new PIN"</string>
- <string name="restr_pin_create_pin" msgid="8017600000263450337">"Create a PIN for modifying restrictions"</string>
- <string name="restr_pin_error_doesnt_match" msgid="2224214190906994548">"PINs don\'t match. Try again."</string>
- <string name="restr_pin_error_too_short" msgid="8173982756265777792">"PIN is too short. Must be at least 4 digits."</string>
+ <string name="kg_pattern_instructions" msgid="398978611683075868">"Draw your pattern"</string>
+ <string name="kg_sim_pin_instructions" msgid="2319508550934557331">"Enter SIM PIN"</string>
+ <string name="kg_pin_instructions" msgid="2377242233495111557">"Enter PIN"</string>
+ <string name="kg_password_instructions" msgid="5753646556186936819">"Enter Password"</string>
+ <string name="kg_puk_enter_puk_hint" msgid="453227143861735537">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string>
+ <string name="kg_puk_enter_pin_hint" msgid="7871604527429602024">"Enter desired PIN code"</string>
+ <string name="kg_enter_confirm_pin_hint" msgid="325676184762529976">"Confirm desired PIN code"</string>
+ <string name="kg_sim_unlock_progress_dialog_message" msgid="8950398016976865762">"Unlocking SIM card…"</string>
+ <string name="kg_password_wrong_pin_code" msgid="1139324887413846912">"Incorrect PIN code."</string>
+ <string name="kg_invalid_sim_pin_hint" msgid="8795159358110620001">"Type a PIN that is 4 to 8 numbers."</string>
+ <string name="kg_invalid_sim_puk_hint" msgid="6025069204539532000">"PUK code should be 8 numbers."</string>
+ <string name="kg_invalid_puk" msgid="3638289409676051243">"Re-enter the correct PUK code. Repeated attempts will permanently disable the SIM."</string>
+ <string name="kg_invalid_confirm_pin_hint" product="default" msgid="7003469261464593516">"PIN codes does not match"</string>
+ <string name="kg_login_too_many_attempts" msgid="6486842094005698475">"Too many pattern attempts"</string>
+ <string name="kg_login_instructions" msgid="1100551261265506448">"To unlock, sign in with your Google account."</string>
+ <string name="kg_login_username_hint" msgid="5718534272070920364">"Username (email)"</string>
+ <string name="kg_login_password_hint" msgid="9057289103827298549">"Password"</string>
+ <string name="kg_login_submit_button" msgid="5355904582674054702">"Sign in"</string>
+ <string name="kg_login_invalid_input" msgid="5754664119319872197">"Invalid username or password."</string>
+ <string name="kg_login_account_recovery_hint" msgid="5690709132841752974">"Forgot your username or password?\nVisit "<b>"google.com/accounts/recovery"</b>"."</string>
+ <string name="kg_login_checking_password" msgid="1052685197710252395">"Checking account…"</string>
+ <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8276745642049502550">"You have incorrectly typed your PIN <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
+ <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7813713389422226531">"You have incorrectly typed your password <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
+ <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="74089475965050805">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
+ <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="1575557200627128949">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the tablet will be reset to factory default and all user data will be lost."</string>
+ <string name="kg_failed_attempts_almost_at_wipe" product="tv" msgid="5621231220154419413">"You have incorrectly attempted to unlock the TV <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the TV will be reset to factory default and all user data will be lost."</string>
+ <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="4051015943038199910">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the phone will be reset to factory default and all user data will be lost."</string>
+ <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="2072996269148483637">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER">%d</xliff:g> times. The tablet will now be reset to factory default."</string>
+ <string name="kg_failed_attempts_now_wiping" product="tv" msgid="4987878286750741463">"You have incorrectly attempted to unlock the TV <xliff:g id="NUMBER">%d</xliff:g> times. The TV will now be reset to factory default."</string>
+ <string name="kg_failed_attempts_now_wiping" product="default" msgid="4817627474419471518">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER">%d</xliff:g> times. The phone will now be reset to factory default."</string>
+ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="3253575572118914370">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your tablet using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
+ <string name="kg_failed_attempts_almost_at_login" product="tv" msgid="4224651132862313471">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your TV using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
+ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="1437638152015574839">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
+ <string name="kg_text_message_separator" product="default" msgid="4160700433287233771">" — "</string>
+ <string name="kg_reordering_delete_drop_target_text" msgid="7899202978204438708">"Remove"</string>
+ <string name="safe_media_volume_warning" product="default" msgid="2276318909314492312">"Raise volume above recommended level?\n\nListening at high volume for long periods may damage your hearing."</string>
+ <string name="accessibility_shortcut_warning_dialog_title" msgid="8404780875025725199">"Use Accessibility Shortcut?"</string>
+ <string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"When the shortcut is on, pressing both volume buttons for 3 seconds will start an accessibility feature.\n\n Current accessibility feature:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n You can change the feature in Settings > Accessibility."</string>
+ <string name="disable_accessibility_shortcut" msgid="627625354248453445">"Turn off Shortcut"</string>
+ <string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"Use Shortcut"</string>
+ <string name="color_inversion_feature_name" msgid="4231186527799958644">"Color Inversion"</string>
+ <string name="color_correction_feature_name" msgid="6779391426096954933">"Color Correction"</string>
+ <string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"Accessibility Shortcut turned <xliff:g id="SERVICE_NAME">%1$s</xliff:g> on"</string>
+ <string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"Accessibility Shortcut turned <xliff:g id="SERVICE_NAME">%1$s</xliff:g> off"</string>
+ <string name="accessibility_shortcut_spoken_feedback" msgid="8376923232350078434">"Press and hold both volume keys for three seconds to use <xliff:g id="SERVICE_NAME">%1$s</xliff:g>"</string>
+ <string name="accessibility_button_prompt_text" msgid="4234556536456854251">"Choose a feature to use when you tap the Accessibility button:"</string>
+ <string name="accessibility_button_instructional_text" msgid="6942300463612999993">"To change features, touch & hold the Accessibility button."</string>
+ <string name="accessibility_magnification_chooser_text" msgid="1227146738764986237">"Magnification"</string>
+ <string name="user_switched" msgid="3768006783166984410">"Current user <xliff:g id="NAME">%1$s</xliff:g>."</string>
+ <string name="user_switching_message" msgid="2871009331809089783">"Switching to <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="user_logging_out_message" msgid="8939524935808875155">"Logging out <xliff:g id="NAME">%1$s</xliff:g>…"</string>
+ <string name="owner_name" msgid="2716755460376028154">"Owner"</string>
+ <string name="error_message_title" msgid="4510373083082500195">"Error"</string>
+ <string name="error_message_change_not_allowed" msgid="1238035947357923497">"This change isn\'t allowed by your admin"</string>
+ <string name="app_not_found" msgid="3429141853498927379">"No application found to handle this action"</string>
+ <string name="revoke" msgid="5404479185228271586">"Revoke"</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 B1"</string>
+ <string name="mediasize_iso_b2" msgid="1348731852150380378">"ISO B2"</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 B6"</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 C2"</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 C8"</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 B2"</string>
+ <string name="mediasize_japanese_jis_b1" msgid="4608142385457034603">"JIS B1"</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">"Unknown portrait"</string>
+ <string name="mediasize_unknown_landscape" msgid="4876995327029361552">"Unknown landscape"</string>
+ <string name="write_fail_reason_cancelled" msgid="7091258378121627624">"Cancelled"</string>
+ <string name="write_fail_reason_cannot_write" msgid="8132505417935337724">"Error writing content"</string>
+ <string name="reason_unknown" msgid="6048913880184628119">"unknown"</string>
+ <string name="reason_service_unavailable" msgid="7824008732243903268">"Print service not enabled"</string>
+ <string name="print_service_installed_title" msgid="2246317169444081628">"<xliff:g id="NAME">%s</xliff:g> service installed"</string>
+ <string name="print_service_installed_message" msgid="5897362931070459152">"Tap to enable"</string>
+ <string name="restr_pin_enter_admin_pin" msgid="8641662909467236832">"Enter admin PIN"</string>
+ <string name="restr_pin_enter_pin" msgid="3395953421368476103">"Enter PIN"</string>
+ <string name="restr_pin_incorrect" msgid="8571512003955077924">"Incorrect"</string>
+ <string name="restr_pin_enter_old_pin" msgid="1462206225512910757">"Current PIN"</string>
+ <string name="restr_pin_enter_new_pin" msgid="5959606691619959184">"New PIN"</string>
+ <string name="restr_pin_confirm_pin" msgid="8501523829633146239">"Confirm new PIN"</string>
+ <string name="restr_pin_create_pin" msgid="8017600000263450337">"Create a PIN for modifying restrictions"</string>
+ <string name="restr_pin_error_doesnt_match" msgid="2224214190906994548">"PINs don\'t match. Try again."</string>
+ <string name="restr_pin_error_too_short" msgid="8173982756265777792">"PIN is too short. Must be at least 4 digits."</string>
<plurals name="restr_pin_countdown" formatted="false" msgid="9061246974881224688">
- <item quantity="other">Try again in <xliff:g id="COUNT">%d</xliff:g> seconds</item>
- <item quantity="one">Try again in 1 second</item>
+ <item quantity="other">Try again in <xliff:g id="COUNT">%d</xliff:g> seconds</item>
+ <item quantity="one">Try again in 1 second</item>
</plurals>
- <string name="restr_pin_try_later" msgid="973144472490532377">"Try again later"</string>
- <string name="immersive_cling_title" msgid="8394201622932303336">"Viewing full screen"</string>
- <string name="immersive_cling_description" msgid="3482371193207536040">"To exit, swipe down from the top."</string>
- <string name="immersive_cling_positive" msgid="5016839404568297683">"Got it"</string>
- <string name="done_label" msgid="2093726099505892398">"Done"</string>
- <string name="hour_picker_description" msgid="6698199186859736512">"Hours circular slider"</string>
- <string name="minute_picker_description" msgid="8606010966873791190">"Minutes circular slider"</string>
- <string name="select_hours" msgid="6043079511766008245">"Select hours"</string>
- <string name="select_minutes" msgid="3974345615920336087">"Select minutes"</string>
- <string name="select_day" msgid="7774759604701773332">"Select month and day"</string>
- <string name="select_year" msgid="7952052866994196170">"Select year"</string>
- <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> deleted"</string>
- <string name="managed_profile_label_badge" msgid="2355652472854327647">"Work <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="managed_profile_label_badge_2" msgid="5048136430082124036">"2nd Work <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="managed_profile_label_badge_3" msgid="2808305070321719040">"3rd Work <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Ask for PIN before unpinning"</string>
- <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Ask for unlock pattern before unpinning"</string>
- <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Ask for password before unpinning"</string>
- <string name="package_installed_device_owner" msgid="6875717669960212648">"Installed by your admin"</string>
- <string name="package_updated_device_owner" msgid="1847154566357862089">"Updated by your admin"</string>
- <string name="package_deleted_device_owner" msgid="2307122077550236438">"Deleted by your admin"</string>
- <string name="battery_saver_description_with_learn_more" msgid="6323937147992667707">"To extend your battery life, Battery Saver turns off some device features and restricts apps. "<annotation id="url">"Learn More"</annotation>""</string>
- <string name="battery_saver_description" msgid="769989536172631582">"To extend your battery life, Battery Saver turns off some device features and restricts apps."</string>
- <string name="data_saver_description" msgid="6015391409098303235">"To help reduce data usage, Data Saver prevents some apps from sending or receiving data in the background. An app you’re currently using can access data, but may do so less frequently. This may mean, for example, that images don’t display until you tap them."</string>
- <string name="data_saver_enable_title" msgid="4674073932722787417">"Turn on Data Saver?"</string>
- <string name="data_saver_enable_button" msgid="7147735965247211818">"Turn on"</string>
+ <string name="restr_pin_try_later" msgid="973144472490532377">"Try again later"</string>
+ <string name="immersive_cling_title" msgid="8394201622932303336">"Viewing full screen"</string>
+ <string name="immersive_cling_description" msgid="3482371193207536040">"To exit, swipe down from the top."</string>
+ <string name="immersive_cling_positive" msgid="5016839404568297683">"Got it"</string>
+ <string name="done_label" msgid="2093726099505892398">"Done"</string>
+ <string name="hour_picker_description" msgid="6698199186859736512">"Hours circular slider"</string>
+ <string name="minute_picker_description" msgid="8606010966873791190">"Minutes circular slider"</string>
+ <string name="select_hours" msgid="6043079511766008245">"Select hours"</string>
+ <string name="select_minutes" msgid="3974345615920336087">"Select minutes"</string>
+ <string name="select_day" msgid="7774759604701773332">"Select month and day"</string>
+ <string name="select_year" msgid="7952052866994196170">"Select year"</string>
+ <string name="deleted_key" msgid="7659477886625566590">"<xliff:g id="KEY">%1$s</xliff:g> deleted"</string>
+ <string name="managed_profile_label_badge" msgid="2355652472854327647">"Work <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="managed_profile_label_badge_2" msgid="5048136430082124036">"2nd Work <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="managed_profile_label_badge_3" msgid="2808305070321719040">"3rd Work <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="lock_to_app_unlock_pin" msgid="2552556656504331634">"Ask for PIN before unpinning"</string>
+ <string name="lock_to_app_unlock_pattern" msgid="4182192144797225137">"Ask for unlock pattern before unpinning"</string>
+ <string name="lock_to_app_unlock_password" msgid="6380979775916974414">"Ask for password before unpinning"</string>
+ <string name="package_installed_device_owner" msgid="6875717669960212648">"Installed by your admin"</string>
+ <string name="package_updated_device_owner" msgid="1847154566357862089">"Updated by your admin"</string>
+ <string name="package_deleted_device_owner" msgid="2307122077550236438">"Deleted by your admin"</string>
+ <string name="battery_saver_description_with_learn_more" msgid="6323937147992667707">"To extend your battery life, Battery Saver turns off some device features and restricts apps. "<annotation id="url">"Learn More"</annotation>""</string>
+ <string name="battery_saver_description" msgid="769989536172631582">"To extend your battery life, Battery Saver turns off some device features and restricts apps."</string>
+ <string name="data_saver_description" msgid="6015391409098303235">"To help reduce data usage, Data Saver prevents some apps from sending or receiving data in the background. An app you’re currently using can access data, but may do so less frequently. This may mean, for example, that images don’t display until you tap them."</string>
+ <string name="data_saver_enable_title" msgid="4674073932722787417">"Turn on Data Saver?"</string>
+ <string name="data_saver_enable_button" msgid="7147735965247211818">"Turn on"</string>
<plurals name="zen_mode_duration_minutes_summary" formatted="false" msgid="4367877408072000848">
- <item quantity="other">For %1$d minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
- <item quantity="one">For one minute (until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+ <item quantity="other">For %1$d minutes (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+ <item quantity="one">For one minute (until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
</plurals>
<plurals name="zen_mode_duration_minutes_summary_short" formatted="false" msgid="6830154222366042597">
- <item quantity="other">For %1$d min (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
- <item quantity="one">For 1 min (until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+ <item quantity="other">For %1$d min (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+ <item quantity="one">For 1 min (until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
</plurals>
<plurals name="zen_mode_duration_hours_summary" formatted="false" msgid="736789408293052283">
- <item quantity="other">For %1$d hours (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
- <item quantity="one">For 1 hour (until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+ <item quantity="other">For %1$d hours (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+ <item quantity="one">For 1 hour (until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
</plurals>
<plurals name="zen_mode_duration_hours_summary_short" formatted="false" msgid="4787552595253082371">
- <item quantity="other">For %1$d hr (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
- <item quantity="one">For 1 hr (until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
+ <item quantity="other">For %1$d hr (until <xliff:g id="FORMATTEDTIME_1">%2$s</xliff:g>)</item>
+ <item quantity="one">For 1 hr (until <xliff:g id="FORMATTEDTIME_0">%2$s</xliff:g>)</item>
</plurals>
<plurals name="zen_mode_duration_minutes" formatted="false" msgid="5127407202506485571">
- <item quantity="other">For %d minutes</item>
- <item quantity="one">For one minute</item>
+ <item quantity="other">For %d minutes</item>
+ <item quantity="one">For one minute</item>
</plurals>
<plurals name="zen_mode_duration_minutes_short" formatted="false" msgid="2199350154433426128">
- <item quantity="other">For %d min</item>
- <item quantity="one">For 1 min</item>
+ <item quantity="other">For %d min</item>
+ <item quantity="one">For 1 min</item>
</plurals>
<plurals name="zen_mode_duration_hours" formatted="false" msgid="6571961796799076730">
- <item quantity="other">For %d hours</item>
- <item quantity="one">For 1 hour</item>
+ <item quantity="other">For %d hours</item>
+ <item quantity="one">For 1 hour</item>
</plurals>
<plurals name="zen_mode_duration_hours_short" formatted="false" msgid="6748277774662434217">
- <item quantity="other">For %d hr</item>
- <item quantity="one">For 1 hr</item>
+ <item quantity="other">For %d hr</item>
+ <item quantity="one">For 1 hr</item>
</plurals>
- <string name="zen_mode_until" msgid="7336308492289875088">"Until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
- <string name="zen_mode_alarm" msgid="9128205721301330797">"Until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> (next alarm)"</string>
- <string name="zen_mode_forever" msgid="931849471004038757">"Until you turn off"</string>
- <string name="zen_mode_forever_dnd" msgid="3792132696572189081">"Until you turn off Do Not Disturb"</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">"Collapse"</string>
- <string name="zen_mode_feature_name" msgid="5254089399895895004">"Do not disturb"</string>
- <string name="zen_mode_downtime_feature_name" msgid="2626974636779860146">"Downtime"</string>
- <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Weeknight"</string>
- <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Weekend"</string>
- <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Event"</string>
- <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Sleeping"</string>
- <string name="muted_by" msgid="5942954724562097128">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> is muting some sounds"</string>
- <string name="system_error_wipe_data" msgid="6608165524785354962">"There\'s an internal problem with your device, and it may be unstable until you factory data reset."</string>
- <string name="system_error_manufacturer" msgid="8086872414744210668">"There\'s an internal problem with your device. Contact your manufacturer for details."</string>
- <string name="stk_cc_ussd_to_dial" msgid="5214333646366591205">"USSD request changed to regular call"</string>
- <string name="stk_cc_ussd_to_ss" msgid="4884994189414782605">"USSD request changed to SS request"</string>
- <string name="stk_cc_ussd_to_ussd" msgid="5728637484565449312">"Changed to new USSD request"</string>
- <string name="stk_cc_ussd_to_dial_video" msgid="4134455726513175559">"USSD request changed to video call"</string>
- <string name="stk_cc_ss_to_dial" msgid="1360775164651754978">"SS request changed to regular call"</string>
- <string name="stk_cc_ss_to_dial_video" msgid="6577956662913194947">"SS request changed to video call"</string>
- <string name="stk_cc_ss_to_ussd" msgid="5614626512855868785">"SS request changed to USSD request"</string>
- <string name="stk_cc_ss_to_ss" msgid="7716729801537709054">"Changed to new SS request"</string>
- <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Work profile"</string>
- <string name="notification_alerted_content_description" msgid="1296617716556420585">"Alerted"</string>
- <string name="expand_button_content_description_collapsed" msgid="3609784019345534652">"Expand"</string>
- <string name="expand_button_content_description_expanded" msgid="8520652707158554895">"Collapse"</string>
- <string name="expand_action_accessibility" msgid="5307730695723718254">"toggle expansion"</string>
- <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB Peripheral Port"</string>
- <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string>
- <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB Peripheral Port"</string>
- <string name="floating_toolbar_open_overflow_description" msgid="4797287862999444631">"More options"</string>
- <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Close overflow"</string>
- <string name="maximize_button_text" msgid="7543285286182446254">"Maximize"</string>
- <string name="close_button_text" msgid="3937902162644062866">"Close"</string>
- <string name="notification_messaging_title_template" msgid="3452480118762691020">"<xliff:g id="CONVERSATION_TITLE">%1$s</xliff:g>: <xliff:g id="SENDER_NAME">%2$s</xliff:g>"</string>
+ <string name="zen_mode_until" msgid="7336308492289875088">"Until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g>"</string>
+ <string name="zen_mode_alarm" msgid="9128205721301330797">"Until <xliff:g id="FORMATTEDTIME">%1$s</xliff:g> (next alarm)"</string>
+ <string name="zen_mode_forever" msgid="931849471004038757">"Until you turn off"</string>
+ <string name="zen_mode_forever_dnd" msgid="3792132696572189081">"Until you turn off Do Not Disturb"</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">"Collapse"</string>
+ <string name="zen_mode_feature_name" msgid="5254089399895895004">"Do not disturb"</string>
+ <string name="zen_mode_downtime_feature_name" msgid="2626974636779860146">"Downtime"</string>
+ <string name="zen_mode_default_weeknights_name" msgid="3081318299464998143">"Weeknight"</string>
+ <string name="zen_mode_default_weekends_name" msgid="2786495801019345244">"Weekend"</string>
+ <string name="zen_mode_default_events_name" msgid="8158334939013085363">"Event"</string>
+ <string name="zen_mode_default_every_night_name" msgid="3012363838882944175">"Sleeping"</string>
+ <string name="muted_by" msgid="5942954724562097128">"<xliff:g id="THIRD_PARTY">%1$s</xliff:g> is muting some sounds"</string>
+ <string name="system_error_wipe_data" msgid="6608165524785354962">"There\'s an internal problem with your device, and it may be unstable until you factory data reset."</string>
+ <string name="system_error_manufacturer" msgid="8086872414744210668">"There\'s an internal problem with your device. Contact your manufacturer for details."</string>
+ <string name="stk_cc_ussd_to_dial" msgid="5214333646366591205">"USSD request changed to regular call"</string>
+ <string name="stk_cc_ussd_to_ss" msgid="4884994189414782605">"USSD request changed to SS request"</string>
+ <string name="stk_cc_ussd_to_ussd" msgid="5728637484565449312">"Changed to new USSD request"</string>
+ <string name="stk_cc_ussd_to_dial_video" msgid="4134455726513175559">"USSD request changed to video call"</string>
+ <string name="stk_cc_ss_to_dial" msgid="1360775164651754978">"SS request changed to regular call"</string>
+ <string name="stk_cc_ss_to_dial_video" msgid="6577956662913194947">"SS request changed to video call"</string>
+ <string name="stk_cc_ss_to_ussd" msgid="5614626512855868785">"SS request changed to USSD request"</string>
+ <string name="stk_cc_ss_to_ss" msgid="7716729801537709054">"Changed to new SS request"</string>
+ <string name="notification_work_profile_content_description" msgid="4600554564103770764">"Work profile"</string>
+ <string name="notification_alerted_content_description" msgid="1296617716556420585">"Alerted"</string>
+ <string name="expand_button_content_description_collapsed" msgid="3609784019345534652">"Expand"</string>
+ <string name="expand_button_content_description_expanded" msgid="8520652707158554895">"Collapse"</string>
+ <string name="expand_action_accessibility" msgid="5307730695723718254">"toggle expansion"</string>
+ <string name="usb_midi_peripheral_name" msgid="7221113987741003817">"Android USB Peripheral Port"</string>
+ <string name="usb_midi_peripheral_manufacturer_name" msgid="7176526170008970168">"Android"</string>
+ <string name="usb_midi_peripheral_product_name" msgid="4971827859165280403">"USB Peripheral Port"</string>
+ <string name="floating_toolbar_open_overflow_description" msgid="4797287862999444631">"More options"</string>
+ <string name="floating_toolbar_close_overflow_description" msgid="559796923090723804">"Close overflow"</string>
+ <string name="maximize_button_text" msgid="7543285286182446254">"Maximize"</string>
+ <string name="close_button_text" msgid="3937902162644062866">"Close"</string>
+ <string name="notification_messaging_title_template" msgid="3452480118762691020">"<xliff:g id="CONVERSATION_TITLE">%1$s</xliff:g>: <xliff:g id="SENDER_NAME">%2$s</xliff:g>"</string>
<plurals name="selected_count" formatted="false" msgid="7187339492915744615">
- <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>
+ <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="default_notification_channel_label" msgid="5929663562028088222">"Uncategorized"</string>
- <string name="importance_from_user" msgid="7318955817386549931">"You set the importance of these notifications."</string>
- <string name="importance_from_person" msgid="9160133597262938296">"This is important because of the people involved."</string>
- <string name="user_creation_account_exists" msgid="1942606193570143289">"Allow <xliff:g id="APP">%1$s</xliff:g> to create a new User with <xliff:g id="ACCOUNT">%2$s</xliff:g> ?"</string>
- <string name="user_creation_adding" msgid="4482658054622099197">"Allow <xliff:g id="APP">%1$s</xliff:g> to create a new User with <xliff:g id="ACCOUNT">%2$s</xliff:g> (a User with this account already exists) ?"</string>
- <string name="language_selection_title" msgid="2680677278159281088">"Add a language"</string>
- <string name="country_selection_title" msgid="2954859441620215513">"Region preference"</string>
- <string name="search_language_hint" msgid="7042102592055108574">"Type language name"</string>
- <string name="language_picker_section_suggested" msgid="8414489646861640885">"Suggested"</string>
- <string name="language_picker_section_all" msgid="3097279199511617537">"All languages"</string>
- <string name="region_picker_section_all" msgid="8966316787153001779">"All regions"</string>
- <string name="locale_search_menu" msgid="2560710726687249178">"Search"</string>
- <string name="app_suspended_title" msgid="2075071241147969611">"App isn’t available"</string>
- <string name="app_suspended_default_message" msgid="123166680425711887">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> isn’t available right now. This is managed by <xliff:g id="APP_NAME_1">%2$s</xliff:g>."</string>
- <string name="app_suspended_more_details" msgid="1131804827776778187">"Learn more"</string>
- <string name="work_mode_off_title" msgid="1118691887588435530">"Turn on work profile?"</string>
- <string name="work_mode_off_message" msgid="5130856710614337649">"Your work apps, notifications, data, and other work profile features will be turned on"</string>
- <string name="work_mode_turn_on" msgid="2062544985670564875">"Turn on"</string>
- <string name="deprecated_target_sdk_message" msgid="1449696506742572767">"This app was built for an older version of Android and may not work properly. Try checking for updates, or contact the developer."</string>
- <string name="deprecated_target_sdk_app_store" msgid="5032340500368495077">"Check for update"</string>
- <string name="new_sms_notification_title" msgid="8442817549127555977">"You have new messages"</string>
- <string name="new_sms_notification_content" msgid="7002938807812083463">"Open SMS app to view"</string>
- <string name="user_encrypted_title" msgid="9054897468831672082">"Some functionality may be limited"</string>
- <string name="user_encrypted_message" msgid="4923292604515744267">"Tap to unlock"</string>
- <string name="user_encrypted_detail" msgid="5708447464349420392">"User data locked"</string>
- <string name="profile_encrypted_detail" msgid="3700965619978314974">"Work profile locked"</string>
- <string name="profile_encrypted_message" msgid="6964994232310195874">"Tap to unlock work profile"</string>
- <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Connected to <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string>
- <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Tap to view files"</string>
- <string name="pin_target" msgid="3052256031352291362">"Pin"</string>
- <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>
- <string name="demo_starting_message" msgid="5268556852031489931">"Starting demo…"</string>
- <string name="demo_restarting_message" msgid="952118052531642451">"Resetting device…"</string>
- <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Disabled <xliff:g id="LABEL">%1$s</xliff:g>"</string>
- <string name="conference_call" msgid="3751093130790472426">"Conference Call"</string>
- <string name="tooltip_popup_title" msgid="5253721848739260181">"Tooltip"</string>
- <string name="app_category_game" msgid="5431836943981492993">"Games"</string>
- <string name="app_category_audio" msgid="1659853108734301647">"Music & Audio"</string>
- <string name="app_category_video" msgid="2728726078629384196">"Movies & Video"</string>
- <string name="app_category_image" msgid="4867854544519846048">"Photos & Images"</string>
- <string name="app_category_social" msgid="5842783057834965912">"Social & Communication"</string>
- <string name="app_category_news" msgid="7496506240743986873">"News & Magazines"</string>
- <string name="app_category_maps" msgid="5878491404538024367">"Maps & Navigation"</string>
- <string name="app_category_productivity" msgid="3742083261781538852">"Productivity"</string>
- <string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Device storage"</string>
- <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB debugging"</string>
- <string name="time_picker_hour_label" msgid="2979075098868106450">"hour"</string>
- <string name="time_picker_minute_label" msgid="5168864173796598399">"minute"</string>
- <string name="time_picker_header_text" msgid="143536825321922567">"Set time"</string>
- <string name="time_picker_input_error" msgid="7574999942502513765">"Enter a valid time"</string>
- <string name="time_picker_prompt_label" msgid="7588093983899966783">"Type in time"</string>
- <string name="time_picker_text_input_mode_description" msgid="4148166758173708199">"Switch to text input mode for the time input."</string>
- <string name="time_picker_radial_mode_description" msgid="4953403779779557198">"Switch to clock mode for the time input."</string>
- <string name="autofill_picker_accessibility_title" msgid="8469043291648711535">"Autofill options"</string>
- <string name="autofill_save_accessibility_title" msgid="7244365268417107822">"Save for Autofill"</string>
- <string name="autofill_error_cannot_autofill" msgid="7402758580060110371">"Contents can’t be autofilled"</string>
- <string name="autofill_picker_no_suggestions" msgid="3908514303773350735">"No autofill suggestions"</string>
+ <string name="default_notification_channel_label" msgid="5929663562028088222">"Uncategorized"</string>
+ <string name="importance_from_user" msgid="7318955817386549931">"You set the importance of these notifications."</string>
+ <string name="importance_from_person" msgid="9160133597262938296">"This is important because of the people involved."</string>
+ <string name="user_creation_account_exists" msgid="1942606193570143289">"Allow <xliff:g id="APP">%1$s</xliff:g> to create a new User with <xliff:g id="ACCOUNT">%2$s</xliff:g> ?"</string>
+ <string name="user_creation_adding" msgid="4482658054622099197">"Allow <xliff:g id="APP">%1$s</xliff:g> to create a new User with <xliff:g id="ACCOUNT">%2$s</xliff:g> (a User with this account already exists) ?"</string>
+ <string name="language_selection_title" msgid="2680677278159281088">"Add a language"</string>
+ <string name="country_selection_title" msgid="2954859441620215513">"Region preference"</string>
+ <string name="search_language_hint" msgid="7042102592055108574">"Type language name"</string>
+ <string name="language_picker_section_suggested" msgid="8414489646861640885">"Suggested"</string>
+ <string name="language_picker_section_all" msgid="3097279199511617537">"All languages"</string>
+ <string name="region_picker_section_all" msgid="8966316787153001779">"All regions"</string>
+ <string name="locale_search_menu" msgid="2560710726687249178">"Search"</string>
+ <string name="app_suspended_title" msgid="2075071241147969611">"App isn’t available"</string>
+ <string name="app_suspended_default_message" msgid="123166680425711887">"<xliff:g id="APP_NAME_0">%1$s</xliff:g> isn’t available right now. This is managed by <xliff:g id="APP_NAME_1">%2$s</xliff:g>."</string>
+ <string name="app_suspended_more_details" msgid="1131804827776778187">"Learn more"</string>
+ <string name="work_mode_off_title" msgid="1118691887588435530">"Turn on work profile?"</string>
+ <string name="work_mode_off_message" msgid="5130856710614337649">"Your work apps, notifications, data, and other work profile features will be turned on"</string>
+ <string name="work_mode_turn_on" msgid="2062544985670564875">"Turn on"</string>
+ <string name="deprecated_target_sdk_message" msgid="1449696506742572767">"This app was built for an older version of Android and may not work properly. Try checking for updates, or contact the developer."</string>
+ <string name="deprecated_target_sdk_app_store" msgid="5032340500368495077">"Check for update"</string>
+ <string name="new_sms_notification_title" msgid="8442817549127555977">"You have new messages"</string>
+ <string name="new_sms_notification_content" msgid="7002938807812083463">"Open SMS app to view"</string>
+ <string name="user_encrypted_title" msgid="9054897468831672082">"Some functionality may be limited"</string>
+ <string name="user_encrypted_message" msgid="4923292604515744267">"Tap to unlock"</string>
+ <string name="user_encrypted_detail" msgid="5708447464349420392">"User data locked"</string>
+ <string name="profile_encrypted_detail" msgid="3700965619978314974">"Work profile locked"</string>
+ <string name="profile_encrypted_message" msgid="6964994232310195874">"Tap to unlock work profile"</string>
+ <string name="usb_mtp_launch_notification_title" msgid="8359219638312208932">"Connected to <xliff:g id="PRODUCT_NAME">%1$s</xliff:g>"</string>
+ <string name="usb_mtp_launch_notification_description" msgid="8541876176425411358">"Tap to view files"</string>
+ <string name="pin_target" msgid="3052256031352291362">"Pin"</string>
+ <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>
+ <string name="demo_starting_message" msgid="5268556852031489931">"Starting demo…"</string>
+ <string name="demo_restarting_message" msgid="952118052531642451">"Resetting device…"</string>
+ <string name="suspended_widget_accessibility" msgid="6712143096475264190">"Disabled <xliff:g id="LABEL">%1$s</xliff:g>"</string>
+ <string name="conference_call" msgid="3751093130790472426">"Conference Call"</string>
+ <string name="tooltip_popup_title" msgid="5253721848739260181">"Tooltip"</string>
+ <string name="app_category_game" msgid="5431836943981492993">"Games"</string>
+ <string name="app_category_audio" msgid="1659853108734301647">"Music & Audio"</string>
+ <string name="app_category_video" msgid="2728726078629384196">"Movies & Video"</string>
+ <string name="app_category_image" msgid="4867854544519846048">"Photos & Images"</string>
+ <string name="app_category_social" msgid="5842783057834965912">"Social & Communication"</string>
+ <string name="app_category_news" msgid="7496506240743986873">"News & Magazines"</string>
+ <string name="app_category_maps" msgid="5878491404538024367">"Maps & Navigation"</string>
+ <string name="app_category_productivity" msgid="3742083261781538852">"Productivity"</string>
+ <string name="device_storage_monitor_notification_channel" msgid="3295871267414816228">"Device storage"</string>
+ <string name="adb_debugging_notification_channel_tv" msgid="5537766997350092316">"USB debugging"</string>
+ <string name="time_picker_hour_label" msgid="2979075098868106450">"hour"</string>
+ <string name="time_picker_minute_label" msgid="5168864173796598399">"minute"</string>
+ <string name="time_picker_header_text" msgid="143536825321922567">"Set time"</string>
+ <string name="time_picker_input_error" msgid="7574999942502513765">"Enter a valid time"</string>
+ <string name="time_picker_prompt_label" msgid="7588093983899966783">"Type in time"</string>
+ <string name="time_picker_text_input_mode_description" msgid="4148166758173708199">"Switch to text input mode for the time input."</string>
+ <string name="time_picker_radial_mode_description" msgid="4953403779779557198">"Switch to clock mode for the time input."</string>
+ <string name="autofill_picker_accessibility_title" msgid="8469043291648711535">"Autofill options"</string>
+ <string name="autofill_save_accessibility_title" msgid="7244365268417107822">"Save for Autofill"</string>
+ <string name="autofill_error_cannot_autofill" msgid="7402758580060110371">"Contents can’t be autofilled"</string>
+ <string name="autofill_picker_no_suggestions" msgid="3908514303773350735">"No autofill suggestions"</string>
<plurals name="autofill_picker_some_suggestions" formatted="false" msgid="5506565809835815274">
- <item quantity="other"><xliff:g id="COUNT">%1$s</xliff:g> autofill suggestions</item>
- <item quantity="one">One autofill suggestion</item>
+ <item quantity="other"><xliff:g id="COUNT">%1$s</xliff:g> autofill suggestions</item>
+ <item quantity="one">One autofill suggestion</item>
</plurals>
- <string name="autofill_save_title" msgid="327541108460384555">"Save to "<b>"<xliff:g id="LABEL">%1$s</xliff:g>"</b>"?"</string>
- <string name="autofill_save_title_with_type" msgid="2339135393607143594">"Save <xliff:g id="TYPE">%1$s</xliff:g> to "<b>"<xliff:g id="LABEL">%2$s</xliff:g>"</b>"?"</string>
- <string name="autofill_save_title_with_2types" msgid="87616102361154432">"Save <xliff:g id="TYPE_0">%1$s</xliff:g> and <xliff:g id="TYPE_1">%2$s</xliff:g> to "<b>"<xliff:g id="LABEL">%3$s</xliff:g>"</b>"?"</string>
- <string name="autofill_save_title_with_3types" msgid="4108978552969604555">"Save <xliff:g id="TYPE_0">%1$s</xliff:g>, <xliff:g id="TYPE_1">%2$s</xliff:g>, and <xliff:g id="TYPE_2">%3$s</xliff:g> to "<b>"<xliff:g id="LABEL">%4$s</xliff:g>"</b>"?"</string>
- <string name="autofill_update_title" msgid="5305781141104585279">"Update in "<b>"<xliff:g id="LABEL">%1$s</xliff:g>"</b>"?"</string>
- <string name="autofill_update_title_with_type" msgid="4624181147422762233">"Update <xliff:g id="TYPE">%1$s</xliff:g> in "<b>"<xliff:g id="LABEL">%2$s</xliff:g>"</b>"?"</string>
- <string name="autofill_update_title_with_2types" msgid="2300113827053626484">"Update <xliff:g id="TYPE_0">%1$s</xliff:g> and <xliff:g id="TYPE_1">%2$s</xliff:g> in "<b>"<xliff:g id="LABEL">%3$s</xliff:g>"</b>"?"</string>
- <string name="autofill_update_title_with_3types" msgid="9089824354296211922">"Update these items in "<b>"<xliff:g id="LABEL">%4$s</xliff:g>"</b>": <xliff:g id="TYPE_0">%1$s</xliff:g>, <xliff:g id="TYPE_1">%2$s</xliff:g>, and <xliff:g id="TYPE_2">%3$s</xliff:g> ?"</string>
- <string name="autofill_save_yes" msgid="6398026094049005921">"Save"</string>
- <string name="autofill_save_no" msgid="2625132258725581787">"No thanks"</string>
- <string name="autofill_update_yes" msgid="310358413273276958">"Update"</string>
- <string name="autofill_save_type_password" msgid="5288448918465971568">"password"</string>
- <string name="autofill_save_type_address" msgid="4936707762193009542">"address"</string>
- <string name="autofill_save_type_credit_card" msgid="7127694776265563071">"credit card"</string>
- <string name="autofill_save_type_username" msgid="239040540379769562">"username"</string>
- <string name="autofill_save_type_email_address" msgid="5752949432129262174">"email address"</string>
- <string name="etws_primary_default_message_earthquake" msgid="5541962250262769193">"Stay calm and seek shelter nearby."</string>
- <string name="etws_primary_default_message_tsunami" msgid="1887685943498368548">"Evacuate immediately from coastal regions and riverside areas to a safer place such as high ground."</string>
- <string name="etws_primary_default_message_earthquake_and_tsunami" msgid="998797956848445862">"Stay calm and seek shelter nearby."</string>
- <string name="etws_primary_default_message_test" msgid="2709597093560037455">"Emergency messages test"</string>
- <string name="notification_reply_button_accessibility" msgid="3621714652387814344">"Reply"</string>
+ <string name="autofill_save_title" msgid="327541108460384555">"Save to "<b>"<xliff:g id="LABEL">%1$s</xliff:g>"</b>"?"</string>
+ <string name="autofill_save_title_with_type" msgid="2339135393607143594">"Save <xliff:g id="TYPE">%1$s</xliff:g> to "<b>"<xliff:g id="LABEL">%2$s</xliff:g>"</b>"?"</string>
+ <string name="autofill_save_title_with_2types" msgid="87616102361154432">"Save <xliff:g id="TYPE_0">%1$s</xliff:g> and <xliff:g id="TYPE_1">%2$s</xliff:g> to "<b>"<xliff:g id="LABEL">%3$s</xliff:g>"</b>"?"</string>
+ <string name="autofill_save_title_with_3types" msgid="4108978552969604555">"Save <xliff:g id="TYPE_0">%1$s</xliff:g>, <xliff:g id="TYPE_1">%2$s</xliff:g>, and <xliff:g id="TYPE_2">%3$s</xliff:g> to "<b>"<xliff:g id="LABEL">%4$s</xliff:g>"</b>"?"</string>
+ <string name="autofill_update_title" msgid="5305781141104585279">"Update in "<b>"<xliff:g id="LABEL">%1$s</xliff:g>"</b>"?"</string>
+ <string name="autofill_update_title_with_type" msgid="4624181147422762233">"Update <xliff:g id="TYPE">%1$s</xliff:g> in "<b>"<xliff:g id="LABEL">%2$s</xliff:g>"</b>"?"</string>
+ <string name="autofill_update_title_with_2types" msgid="2300113827053626484">"Update <xliff:g id="TYPE_0">%1$s</xliff:g> and <xliff:g id="TYPE_1">%2$s</xliff:g> in "<b>"<xliff:g id="LABEL">%3$s</xliff:g>"</b>"?"</string>
+ <string name="autofill_update_title_with_3types" msgid="9089824354296211922">"Update these items in "<b>"<xliff:g id="LABEL">%4$s</xliff:g>"</b>": <xliff:g id="TYPE_0">%1$s</xliff:g>, <xliff:g id="TYPE_1">%2$s</xliff:g>, and <xliff:g id="TYPE_2">%3$s</xliff:g> ?"</string>
+ <string name="autofill_save_yes" msgid="6398026094049005921">"Save"</string>
+ <string name="autofill_save_no" msgid="2625132258725581787">"No thanks"</string>
+ <string name="autofill_update_yes" msgid="310358413273276958">"Update"</string>
+ <string name="autofill_save_type_password" msgid="5288448918465971568">"password"</string>
+ <string name="autofill_save_type_address" msgid="4936707762193009542">"address"</string>
+ <string name="autofill_save_type_credit_card" msgid="7127694776265563071">"credit card"</string>
+ <string name="autofill_save_type_username" msgid="239040540379769562">"username"</string>
+ <string name="autofill_save_type_email_address" msgid="5752949432129262174">"email address"</string>
+ <string name="etws_primary_default_message_earthquake" msgid="5541962250262769193">"Stay calm and seek shelter nearby."</string>
+ <string name="etws_primary_default_message_tsunami" msgid="1887685943498368548">"Evacuate immediately from coastal regions and riverside areas to a safer place such as high ground."</string>
+ <string name="etws_primary_default_message_earthquake_and_tsunami" msgid="998797956848445862">"Stay calm and seek shelter nearby."</string>
+ <string name="etws_primary_default_message_test" msgid="2709597093560037455">"Emergency messages test"</string>
+ <string name="notification_reply_button_accessibility" msgid="3621714652387814344">"Reply"</string>
<string name="etws_primary_default_message_others" msgid="6293148756130398971"></string>
- <string name="mmcc_authentication_reject" msgid="5767701075994754356">"SIM not allowed for voice"</string>
- <string name="mmcc_imsi_unknown_in_hlr" msgid="5316658473301462825">"SIM not provisioned for voice"</string>
- <string name="mmcc_illegal_ms" msgid="807334478177362062">"SIM not allowed for voice"</string>
- <string name="mmcc_illegal_me" msgid="1950705155760872972">"Phone not allowed for voice"</string>
- <string name="mmcc_authentication_reject_msim_template" msgid="1217031195834766479">"SIM <xliff:g id="SIMNUMBER">%d</xliff:g> not allowed"</string>
- <string name="mmcc_imsi_unknown_in_hlr_msim_template" msgid="5636464607596778986">"SIM <xliff:g id="SIMNUMBER">%d</xliff:g> not provisioned"</string>
- <string name="mmcc_illegal_ms_msim_template" msgid="5994323296399913454">"SIM <xliff:g id="SIMNUMBER">%d</xliff:g> not allowed"</string>
- <string name="mmcc_illegal_me_msim_template" msgid="5550259730350571826">"SIM <xliff:g id="SIMNUMBER">%d</xliff:g> not allowed"</string>
- <string name="popup_window_default_title" msgid="4874318849712115433">"Popup Window"</string>
- <string name="slice_more_content" msgid="8504342889413274608">"+ <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
- <string name="shortcut_restored_on_lower_version" msgid="4860853725206702336">"App version downgraded, or isn’t compatible with this shortcut"</string>
- <string name="shortcut_restore_not_supported" msgid="5028808567940014190">"Couldn’t restore shortcut because app doesn’t support backup and restore"</string>
- <string name="shortcut_restore_signature_mismatch" msgid="2406209324521327518">"Couldn’t restore shortcut because of app signature mismatch"</string>
- <string name="shortcut_restore_unknown_issue" msgid="8703738064603262597">"Couldn’t restore shortcut"</string>
- <string name="shortcut_disabled_reason_unknown" msgid="5276016910284687075">"Shortcut is disabled"</string>
- <string name="harmful_app_warning_uninstall" msgid="4837672735619532931">"UNINSTALL"</string>
- <string name="harmful_app_warning_open_anyway" msgid="596432803680914321">"OPEN ANYWAY"</string>
- <string name="harmful_app_warning_title" msgid="8982527462829423432">"Harmful app detected"</string>
- <string name="slices_permission_request" msgid="8484943441501672932">"<xliff:g id="APP_0">%1$s</xliff:g> wants to show <xliff:g id="APP_2">%2$s</xliff:g> slices"</string>
- <string name="screenshot_edit" msgid="7867478911006447565">"Edit"</string>
- <string name="volume_dialog_ringer_guidance_vibrate" msgid="8902050240801159042">"Calls and notifications will vibrate"</string>
- <string name="volume_dialog_ringer_guidance_silent" msgid="2128975224280276122">"Calls and notifications will be muted"</string>
- <string name="notification_channel_system_changes" msgid="5072715579030948646">"System changes"</string>
- <string name="notification_channel_do_not_disturb" msgid="6766940333105743037">"Do Not Disturb"</string>
- <string name="zen_upgrade_notification_visd_title" msgid="3288313883409759733">"New: Do Not Disturb is hiding notifications"</string>
- <string name="zen_upgrade_notification_visd_content" msgid="5533674060311631165">"Tap to learn more and change."</string>
- <string name="zen_upgrade_notification_title" msgid="3799603322910377294">"Do Not Disturb has changed"</string>
- <string name="zen_upgrade_notification_content" msgid="1794994264692424562">"Tap to check what\'s blocked."</string>
- <string name="notification_app_name_system" msgid="4205032194610042794">"System"</string>
- <string name="notification_app_name_settings" msgid="7751445616365753381">"Settings"</string>
- <string name="notification_appops_camera_active" msgid="5050283058419699771">"Camera"</string>
- <string name="notification_appops_microphone_active" msgid="4335305527588191730">"Microphone"</string>
- <string name="notification_appops_overlay_active" msgid="633813008357934729">"displaying over other apps on your screen"</string>
- <string name="dynamic_mode_notification_channel_name" msgid="2348803891571320452">"Routine Mode info notification"</string>
- <string name="dynamic_mode_notification_title" msgid="508815255807182035">"Battery may run out before usual charge"</string>
- <string name="dynamic_mode_notification_summary" msgid="2541166298550402690">"Battery Saver activated to extend battery life"</string>
- <string name="car_loading_profile" msgid="3545132581795684027">"Loading"</string>
+ <string name="mmcc_authentication_reject" msgid="5767701075994754356">"SIM not allowed for voice"</string>
+ <string name="mmcc_imsi_unknown_in_hlr" msgid="5316658473301462825">"SIM not provisioned for voice"</string>
+ <string name="mmcc_illegal_ms" msgid="807334478177362062">"SIM not allowed for voice"</string>
+ <string name="mmcc_illegal_me" msgid="1950705155760872972">"Phone not allowed for voice"</string>
+ <string name="mmcc_authentication_reject_msim_template" msgid="1217031195834766479">"SIM <xliff:g id="SIMNUMBER">%d</xliff:g> not allowed"</string>
+ <string name="mmcc_imsi_unknown_in_hlr_msim_template" msgid="5636464607596778986">"SIM <xliff:g id="SIMNUMBER">%d</xliff:g> not provisioned"</string>
+ <string name="mmcc_illegal_ms_msim_template" msgid="5994323296399913454">"SIM <xliff:g id="SIMNUMBER">%d</xliff:g> not allowed"</string>
+ <string name="mmcc_illegal_me_msim_template" msgid="5550259730350571826">"SIM <xliff:g id="SIMNUMBER">%d</xliff:g> not allowed"</string>
+ <string name="popup_window_default_title" msgid="4874318849712115433">"Popup Window"</string>
+ <string name="slice_more_content" msgid="8504342889413274608">"+ <xliff:g id="NUMBER">%1$d</xliff:g>"</string>
+ <string name="shortcut_restored_on_lower_version" msgid="4860853725206702336">"App version downgraded, or isn’t compatible with this shortcut"</string>
+ <string name="shortcut_restore_not_supported" msgid="5028808567940014190">"Couldn’t restore shortcut because app doesn’t support backup and restore"</string>
+ <string name="shortcut_restore_signature_mismatch" msgid="2406209324521327518">"Couldn’t restore shortcut because of app signature mismatch"</string>
+ <string name="shortcut_restore_unknown_issue" msgid="8703738064603262597">"Couldn’t restore shortcut"</string>
+ <string name="shortcut_disabled_reason_unknown" msgid="5276016910284687075">"Shortcut is disabled"</string>
+ <string name="harmful_app_warning_uninstall" msgid="4837672735619532931">"UNINSTALL"</string>
+ <string name="harmful_app_warning_open_anyway" msgid="596432803680914321">"OPEN ANYWAY"</string>
+ <string name="harmful_app_warning_title" msgid="8982527462829423432">"Harmful app detected"</string>
+ <string name="slices_permission_request" msgid="8484943441501672932">"<xliff:g id="APP_0">%1$s</xliff:g> wants to show <xliff:g id="APP_2">%2$s</xliff:g> slices"</string>
+ <string name="screenshot_edit" msgid="7867478911006447565">"Edit"</string>
+ <string name="volume_dialog_ringer_guidance_vibrate" msgid="8902050240801159042">"Calls and notifications will vibrate"</string>
+ <string name="volume_dialog_ringer_guidance_silent" msgid="2128975224280276122">"Calls and notifications will be muted"</string>
+ <string name="notification_channel_system_changes" msgid="5072715579030948646">"System changes"</string>
+ <string name="notification_channel_do_not_disturb" msgid="6766940333105743037">"Do Not Disturb"</string>
+ <string name="zen_upgrade_notification_visd_title" msgid="3288313883409759733">"New: Do Not Disturb is hiding notifications"</string>
+ <string name="zen_upgrade_notification_visd_content" msgid="5533674060311631165">"Tap to learn more and change."</string>
+ <string name="zen_upgrade_notification_title" msgid="3799603322910377294">"Do Not Disturb has changed"</string>
+ <string name="zen_upgrade_notification_content" msgid="1794994264692424562">"Tap to check what\'s blocked."</string>
+ <string name="notification_app_name_system" msgid="4205032194610042794">"System"</string>
+ <string name="notification_app_name_settings" msgid="7751445616365753381">"Settings"</string>
+ <string name="notification_appops_camera_active" msgid="5050283058419699771">"Camera"</string>
+ <string name="notification_appops_microphone_active" msgid="4335305527588191730">"Microphone"</string>
+ <string name="notification_appops_overlay_active" msgid="633813008357934729">"displaying over other apps on your screen"</string>
+ <string name="dynamic_mode_notification_channel_name" msgid="2348803891571320452">"Routine Mode info notification"</string>
+ <string name="dynamic_mode_notification_title" msgid="508815255807182035">"Battery may run out before usual charge"</string>
+ <string name="dynamic_mode_notification_summary" msgid="2541166298550402690">"Battery Saver activated to extend battery life"</string>
+ <string name="car_loading_profile" msgid="3545132581795684027">"Loading"</string>
</resources>
diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml
index 9290cf7..50cce6e 100644
--- a/core/res/res/values-es-rUS/strings.xml
+++ b/core/res/res/values-es-rUS/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nunca"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"No tienes permiso para abrir esta página."</string>
<string name="text_copied" msgid="4985729524670131385">"Texto copiado en el portapapeles."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Más"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menú+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Editar con"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar con %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Editar"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Compartir con"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Compartir"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Compartir con %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Compartir"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Enviar con"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Presiona para ver todas las redes"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Conectar"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Todas las redes"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Está disponible una red Wi‑Fi sugerida por <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"¿Deseas conectarte a las redes sugeridas por <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Sí"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"No"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Se activará la conexión Wi-Fi automáticamente"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"La red Wi-Fi no tiene acceso a Internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Presiona para ver opciones"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Se estableció conexión"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Cambios en la configuración de tu hotspot"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Cambió la banda de tu hotspot."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Si bien este dispositivo no admite la opción para conectarse exclusivamente a bandas de 5 GHz, las usará cuando estén disponibles."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Depuración por USB conectada"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Presiona para desactivar la depuración USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Seleccionar para desactivar la depuración por USB"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Hay líquido o suciedad en el puerto USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"El puerto USB se inhabilitó automáticamente. Presiona para obtener más información."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Es seguro usar el puerto USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"El teléfono ya no detecta líquidos o suciedad."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Realizando un informe de errores…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"¿Compartir informe de errores?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Compartiendo informe de errores…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Configurar"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Expulsar"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Explorar"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"No se encuentra dispositivo <xliff:g id="NAME">%s</xliff:g>."</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Vuelve a insertar dispositivo"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Transfiriendo la aplicación <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml
index 851cd32..4b24dda 100644
--- a/core/res/res/values-es/strings.xml
+++ b/core/res/res/values-es/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nunca"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"No tienes permiso para abrir esta página."</string>
<string name="text_copied" msgid="4985729524670131385">"Texto copiado al portapapeles."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Más"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"MENU+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta +"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Editar con"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar con %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Cambiar"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Compartir con"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Compartir"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Compartir con %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Compartir"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Enviar con"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Toca para ver todas las redes"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Conectarse"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Todas las redes"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Hay disponible una red Wi‑Fi propuesta por <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"¿Quieres conectarte a las redes propuestas por <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Sí"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"No"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"La conexión Wi‑Fi se activará automáticamente"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"La red Wi-Fi no tiene acceso a Internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Toca para ver opciones"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Conectado"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Cambios en los ajustes de tu punto de acceso"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"La banda de tu punto de acceso ha cambiado."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Este dispositivo no admite la opción de conectarse exclusivamente a bandas de 5 GHz, pero las usará cuando estén disponibles."</string>
@@ -1334,7 +1333,7 @@
<string name="no_permissions" msgid="7283357728219338112">"No es necesario ningún permiso"</string>
<string name="perm_costs_money" msgid="4902470324142151116">"es posible que esto te cueste dinero"</string>
<string name="dlg_ok" msgid="7376953167039865701">"Aceptar"</string>
- <string name="usb_charging_notification_title" msgid="1595122345358177163">"Cargando este dispositivo por USB"</string>
+ <string name="usb_charging_notification_title" msgid="1595122345358177163">"Cargando dispositivo por USB"</string>
<string name="usb_supplying_notification_title" msgid="4631045789893086181">"Cargando dispositivo conectado por USB"</string>
<string name="usb_mtp_notification_title" msgid="4238227258391151029">"Modo de transferencia de archivos por USB activado"</string>
<string name="usb_ptp_notification_title" msgid="5425857879922006878">"Modo PTP por USB activado"</string>
@@ -1346,16 +1345,12 @@
<string name="usb_unsupported_audio_accessory_title" msgid="3529881374464628084">"Se ha detectado un accesorio de audio analógico"</string>
<string name="usb_unsupported_audio_accessory_message" msgid="6309553946441565215">"El dispositivo adjunto no es compatible con este teléfono. Toca para obtener más información."</string>
<string name="adb_active_notification_title" msgid="6729044778949189918">"Depuración USB habilitada"</string>
- <string name="adb_active_notification_message" msgid="7463062450474107752">"Toca para desactivar la depuración USB"</string>
+ <string name="adb_active_notification_message" msgid="7463062450474107752">"Toca para desactivar la depuración USB."</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Seleccionar para inhabilitar la depuración USB"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Se ha detectado líquido o suciedad en el puerto USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"El puerto USB se ha inhabilitado automáticamente. Toca para obtener más información."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Ya puedes usar el puerto USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"El teléfono ya no detecta líquidos ni suciedad."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Creando informe de errores…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"¿Compartir informe de errores?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Compartiendo informe de errores…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Configurar"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Expulsar"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Explorar"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Falta <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Introduce el dispositivo"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Moviendo <xliff:g id="NAME">%s</xliff:g>"</string>
@@ -1466,8 +1463,8 @@
<string name="no_file_chosen" msgid="6363648562170759465">"Archivo no seleccionado"</string>
<string name="reset" msgid="2448168080964209908">"Restablecer"</string>
<string name="submit" msgid="1602335572089911941">"Enviar"</string>
- <string name="car_mode_disable_notification_title" msgid="5704265646471239078">"Se está utilizando la aplicación con el modo de conducción"</string>
- <string name="car_mode_disable_notification_message" msgid="7647248420931129377">"Toca para salir de la aplicación del modo de conducción."</string>
+ <string name="car_mode_disable_notification_title" msgid="5704265646471239078">"Aplicación de conducción en uso"</string>
+ <string name="car_mode_disable_notification_message" msgid="7647248420931129377">"Toca para salir de la aplicación de conducción."</string>
<string name="tethered_notification_title" msgid="3146694234398202601">"Compartir conexión/Zona Wi-Fi activada"</string>
<string name="tethered_notification_message" msgid="2113628520792055377">"Toca para configurar."</string>
<string name="disable_tether_notification_title" msgid="7526977944111313195">"La conexión compartida está inhabilitada"</string>
diff --git a/core/res/res/values-et/strings.xml b/core/res/res/values-et/strings.xml
index c40ee10..cd48e8c 100644
--- a/core/res/res/values-et/strings.xml
+++ b/core/res/res/values-et/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Mitte kunagi"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Teil pole luba selle lehe avamiseks."</string>
<string name="text_copied" msgid="4985729524670131385">"Lõikelauale kopeeritud tekst."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Rohkem"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menüü+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta +"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Muutmine:"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Muutmine rakendusega %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Muuda"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Jagamine:"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Jagamine"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Jagamine rakendusega %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Jaga"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Saada rakendusega"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Puudutage kõikide võrkude nägemiseks"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Ühenda"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Kõik võrgud"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Rakenduse <xliff:g id="NAME">%s</xliff:g> soovitatud WiFi-võrk on saadaval"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Kas soovite ühenduse luua rakenduse <xliff:g id="NAME">%s</xliff:g> soovitatud võrkudega?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Jah"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Ei"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"WiFi lülitub sisse automaatselt"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"WiFi-võrgul pole juurdepääsu Internetile"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Puudutage valikute nägemiseks"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Ühendatud"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Muudatused teie leviala seadetes"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Teie leviala riba on muutunud."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"See seade ei toeta teie eelistatud ainult 5 GHz riba. Seade kasutab 5 GHz riba ainult siis, kui see on saadaval."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB-silumine ühendatud"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Puudutage USB silumise väljalülitamiseks"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Valige USB silumise keelamiseks"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB-pordis on vedelik või mustus"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-port on automaatselt keelatud. Puudutage lisateabe saamiseks."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB-porti on ohutu kasutada"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefon ei tuvasta enam vedelikku ega mustust."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Veaaruande võtmine …"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Kas jagada veaaruannet?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Veaaruande jagamine …"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Seadistus"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Eemaldamine"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Avastamine"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Üksust <xliff:g id="NAME">%s</xliff:g> pole"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Sisestage seade uuesti"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Seadme <xliff:g id="NAME">%s</xliff:g> teisaldamine"</string>
diff --git a/core/res/res/values-eu/strings.xml b/core/res/res/values-eu/strings.xml
index 9c10e94..ec69d7b 100644
--- a/core/res/res/values-eu/strings.xml
+++ b/core/res/res/values-eu/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Inoiz ez"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Ez duzu orri hau irekitzeko baimenik."</string>
<string name="text_copied" msgid="4985729524670131385">"Testua arbelean kopiatu da."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Gehiago"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menua+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta +"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Editatu honekin:"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editatu %1$s aplikazioarekin"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Editatu"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Partekatu hauen bidez:"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Partekatu"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Partekatu %1$s aplikazioarekin"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Partekatu"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Bidali honen bidez:"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Sakatu hau sare guztiak ikusteko"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Konektatu"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Sare guztiak"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> aplikazioak iradokitako wifi sare bat erabil daiteke"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g> aplikazioak iradokitako sareetara konektatu nahi zara?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Bai"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Ez"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi konexioa automatikoki aktibatuko da"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Ezin da konektatu Internetera Wi-Fi bidez"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Sakatu aukerak ikusteko"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Konektatuta"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Aldaketak egin dira sare publikoaren ezarpenetan"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Aldatu da sare publikoaren banda."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Gailuak ez du onartzen 5 GHz-ko banda soilik erabiltzeko hobespena. Horren ordez, erabilgarri dagoen bakoitzean erabiliko da 5 GHz-ko banda."</string>
@@ -1349,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB arazketa konektatuta"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Sakatu USB arazketa desaktibatzeko"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Hautatu USB arazketa desgaitzeko."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Likidoa edo zikinkeriak daude USB atakan"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB ataka automatikoki desgaitu da. Informazio gehiago lortzeko, sakatu hau."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Segurtasunez erabil daiteke USB ataka"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefonoak ez du hautematen likidorik edo zikinkeriarik."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Akatsen txostena sortzen…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Akatsen txostena partekatu nahi duzu?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Akatsen txostena partekatzen…"</string>
@@ -1395,6 +1390,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Konfiguratu"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Atera"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Arakatu"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Ez dago <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Sartu gailua berriro"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> mugitzen"</string>
diff --git a/core/res/res/values-fa/strings.xml b/core/res/res/values-fa/strings.xml
index 25ee1df..6672ea1 100644
--- a/core/res/res/values-fa/strings.xml
+++ b/core/res/res/values-fa/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"هیچوقت"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"شما اجازه بازکردن این صفحه را ندارید."</string>
<string name="text_copied" msgid="4985729524670131385">"متن در کلیپ بورد کپی شد."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"بیشتر"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"منو+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"ویرایش با"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"ویرایش با %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"ویرایش"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"اشتراکگذاری با"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"اشتراکگذاری"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"اشتراکگذاری با %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"اشتراکگذاری"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ارسال با استفاده از"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"برای دیدن همه شبکهها ضربه بزنید"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"اتصال"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"همه شبکهها"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"شبکه Wi-Fi پیشنهادی <xliff:g id="NAME">%s</xliff:g> دردسترس است"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"مایلید به شبکههای پیشنهادی <xliff:g id="NAME">%s</xliff:g> متصل شوید؟"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"بله"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"خیر"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi بهطور خودکار روشن خواهد شد"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi به اینترنت دسترسی ندارد"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"برای گزینهها ضربه بزنید"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"متصل"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"تغییرات در تنظیمات نقطه اتصال"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"نوار نقطه اتصال شما تغییر کرد."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"این دستگاه از اولویت فقط ۵ گیگاهرتز شما پشتیبانی نمیکند. هرزمان نوار ۵ گیگاهرتزی دردسترس باشد این دستگاه از آن استفاده خواهد کرد."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"اشکالزدایی USB متصل شد"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"برای خاموش کردن اشکالزدایی USB ضربه بزنید"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"انتخاب کنید تا رفع عیب USB غیرفعال شود."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"مایعات یا خاکروبه در درگاه USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"درگاه USB بهطور خودکار غیرفعال شده است. برای اطلاعات بیشتر، ضربه بزنید."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"ایمن برای استفاده از درگاه USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"تلفن دیگر وجود مایعات یا خاکروبه را تشخیص نمیدهد."</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> وجود ندارد"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"دستگاه را دوباره وارد کنید"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"در حال انتقال <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-fi/strings.xml b/core/res/res/values-fi/strings.xml
index fda842a..44713a3 100644
--- a/core/res/res/values-fi/strings.xml
+++ b/core/res/res/values-fi/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Ei koskaan"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Ei lupaa avata tätä sivua."</string>
<string name="text_copied" msgid="4985729524670131385">"Teksti kopioitu leikepöydälle."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Lisää"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Valikko+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Muokkaa sovelluksessa"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Muokkaa sovelluksessa %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Muokkaa"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Jaa sovelluksessa"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Jaa"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Jaa sovelluksessa %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Jaa"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Lähetä sovelluksella"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Napauta, niin näet kaikki verkot."</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Yhdistä"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Kaikki verkot"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Wi-Fi-verkko, jota <xliff:g id="NAME">%s</xliff:g> ehdotti, on käytettävissä"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Haluatko muodostaa yhteyden verkkoihin, joita <xliff:g id="NAME">%s</xliff:g> ehdottaa?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Kyllä"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Ei"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi-Fi käynnistyy automaattisesti"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi ei ole yhteydessä internetiin"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Näytä vaihtoehdot napauttamalla."</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Yhdistetty"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Hotspot-asetustesi muutokset"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Hotspot-taajuutesi on muuttunut."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Tämä laite ei tue asetustasi (vain 5 GHz). Sen sijaan laite käyttää 5 GHz:n taajuutta sen ollessa käytettävissä."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB-vianetsintä yhdistetty"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Poista USB-virheenkorjaus käytöstä napauttamalla."</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Poista USB-vianetsintä käytöstä valitsemalla tämä."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Nestettä tai likaa USB-portissa"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-portti poistetaan käytöstä automaattisesti. Napauta nähdäksesi lisätietoja."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB-portin käyttö on turvallista"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Puhelin ei enää havaitse nesteitä eikä likaa."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Luodaan virheraporttia…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Jaetaanko virheraportti?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Jaetaan virheraporttia…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Määritä asetukset"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Poista"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Tutustu"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> puuttuu."</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Liitä laite uudelleen"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Siirretään <xliff:g id="NAME">%s</xliff:g>."</string>
diff --git a/core/res/res/values-fr-rCA/strings.xml b/core/res/res/values-fr-rCA/strings.xml
index d2a2e5a..cd3e522 100644
--- a/core/res/res/values-fr-rCA/strings.xml
+++ b/core/res/res/values-fr-rCA/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Jamais"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Vous n\'êtes pas autorisé à ouvrir cette page."</string>
<string name="text_copied" msgid="4985729524670131385">"Le texte a été copié dans le presse-papiers."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Plus"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Méta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Modifier avec"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Modifier avec %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Modifier"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Partager"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Partager"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Partager avec %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Partager"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Envoyer avec"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Touchez pour afficher tous les réseaux"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Connexion"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Tous les réseaux"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Un réseau Wi‑Fi proposé par <xliff:g id="NAME">%s</xliff:g> est proposé"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Voulez-vous vous connecter aux réseaux proposés par <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Oui"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Non"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Le Wi-Fi s\'activera automatiquement"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Le réseau Wi-Fi ne dispose d\'aucun accès à Internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Touchez pour afficher les options"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Connecté"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Modifications apportées à vos paramètres de point d\'accès"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"La bande de votre point d\'accès a changé."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Cet appareil ne prend pas en charge votre préférence pour la bande de 5 GHz seulement. Au lieu de cela, cet appareil utilisera la bande de 5 GHz lorsqu\'elle sera disponible."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Débogage USB activé"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Touchez l\'écran pour désactiver le débogage USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Sélectionnez cette option pour désactiver le débogage USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Liquide ou débris dans le port USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Le port USB est désactivé automatiquement. Touchez ici pour en savoir plus."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Vous pouvez maintenant utiliser le port USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Le téléphone ne détecte plus les liquides ni les débris."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Création d\'un rapport de bogue en cours..."</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Partager le rapport de bogue?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Partage du rapport de bogue en cours..."</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Configurer"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Éjecter"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Découvrir"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Mémoire de stockage <xliff:g id="NAME">%s</xliff:g> manquante"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Insérez l\'appareil de nouveau"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Déplacement de <xliff:g id="NAME">%s</xliff:g> en cours..."</string>
diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml
index 577a188..5271e35 100644
--- a/core/res/res/values-fr/strings.xml
+++ b/core/res/res/values-fr/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Jamais"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Vous n\'êtes pas autorisé à ouvrir cette page."</string>
<string name="text_copied" msgid="4985729524670131385">"Le texte a été copié dans le presse-papier."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Plus"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Méta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Modifier avec"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Modifier avec %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Modifier"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Partager avec"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Partager"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Partager avec %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Partager"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Envoyer avec"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Appuyer pour afficher tous les réseaux"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Se connecter"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Tous les réseaux"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Un réseau Wi-Fi proposé par <xliff:g id="NAME">%s</xliff:g> est disponible"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Voulez-vous vous connecter aux réseaux proposés par <xliff:g id="NAME">%s</xliff:g> ?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Oui"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Non"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Le Wi-Fi sera activé automatiquement"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Impossible de se connecter à Internet via le réseau Wi-Fi"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Appuyez ici pour afficher des options."</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Connecté"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Modifications apportées à vos paramètres de point d\'accès"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Votre bande de point d\'accès a été modifiée."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Cet appareil n\'est pas compatible avec votre préférence d\'utilisation de la bande 5 GHz uniquement. Il utilisera la bande 5 GHz lorsqu\'elle sera disponible."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Débogage USB activé"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Appuyez pour désactiver le débogage USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Sélectionnez cette option pour désactiver le débogage USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Présence de liquide ou de saletés dans le port USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Le port USB est désactivé automatiquement. Appuyez sur cette notification pour en savoir plus."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Possibilité d\'utiliser le port USB en toute sécurité"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Le téléphone ne détecte plus les liquides ni les saletés."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Création du rapport de bug…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Partager le rapport de bug ?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Partage du rapport de bug…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Configurer"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Éjecter"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Parcourir"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Mémoire de stockage \"<xliff:g id="NAME">%s</xliff:g>\" manquante"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Insérez le périphérique"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Transfert de l\'application <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-gl/strings.xml b/core/res/res/values-gl/strings.xml
index 8196de7..e848898b 100644
--- a/core/res/res/values-gl/strings.xml
+++ b/core/res/res/values-gl/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nunca"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Non tes permiso para abrir esta páxina."</string>
<string name="text_copied" msgid="4985729524670131385">"O texto copiouse no portapapeis."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Máis"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menú+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta +"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Editar con"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar con %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Editar"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Compartir con"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Compartir"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Compartir con %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Compartir"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Enviar a través de"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Toca para ver todas as redes"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Conectarse"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Todas as redes"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Hai unha rede wifi dispoñible proposta por <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Queres conectarte ás redes propostas por <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Si"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Non"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"A wifi activarase automaticamente"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"A wifi non ten acceso a Internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Toca para ver opcións."</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Estableceuse conexión"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Cambios na configuración da zona wifi"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Modificouse a banda da zona wifi."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Este dispositivo non admite a opción de conectarse só a bandas de 5 GHz, pero usaraas se están dispoñibles."</string>
@@ -1349,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Depuración por USB conectada"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Toca para desactivar a depuración por USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Selecciona a opción para desactivar a depuración por USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Hai líquido ou residuos no porto USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"O porto USB desactivouse automaticamente. Toca para obter máis información."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"É seguro usar o porto USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"O teléfono xa non detecta líquidos nin residuos."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Creando informe de erros…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Queres compartir o informe de erros?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Compartindo informe de erros..."</string>
@@ -1395,6 +1390,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Configurar"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Expulsar"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Explorar"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Falta <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Volve inserir o dispositivo"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Migrando <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-gu/strings.xml b/core/res/res/values-gu/strings.xml
index afba6d9..ad70261 100644
--- a/core/res/res/values-gu/strings.xml
+++ b/core/res/res/values-gu/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"ક્યારેય નહીં"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"તમને આ પૃષ્ઠને ખોલવાની પરવાનગી નથી."</string>
<string name="text_copied" msgid="4985729524670131385">"ક્લિપબોર્ડ પર ટેક્સ્ટ કૉપિ કરી."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"વધુ"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"મેનૂ+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"આનાથી સંપાદિત કરો"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s સાથે સંપાદિત કરો"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"સંપાદિત કરો"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"આની સાથે શેર કરો"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"શેર કરો"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s સાથે શેર કરો"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"શેર કરો"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"આનો ઉપયોગ કરીને મોકલો"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"બધા નેટવર્ક જોવા ટૅપ કરો"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"કનેક્ટ કરો"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"બધા નેટવર્કો"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> દ્વારા સૂચિત કરવામાં આવેલ વાઇ-ફાઇ નેટવર્ક ઉપલબ્ધ છે"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"તમે <xliff:g id="NAME">%s</xliff:g> દ્વારા સૂચવવામાં આવેલાં નેટવર્ક સાથે કનેક્ટ કરવા માગો છો?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"હા"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"ના"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"વાઇ-ફાઇ આપમેળે ચાલુ થઈ જશે"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"વાઇ-ફાઇને કોઈ ઇન્ટરનેટ ઍક્સેસ નથી"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"વિકલ્પો માટે ટૅપ કરો"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"કનેક્ટેડ"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"તમારી હૉટસ્પૉટ સેટિંગને બદલે છે"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"તમારું હૉટસ્પૉટ બેન્ડ બદલાયેલ છે."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"આ ઉપકરણ તમારી ફક્ત 5GHz માટેની પસંદગીને સમર્થન આપતું નથી. તેના બદલે, જ્યારે આ ઉપકરણ જ્યારે 5GHz બેન્ડ ઉપલબ્ધ હશે ત્યારે તેનો ઉપયોગ કરશે."</string>
@@ -1349,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB ડીબગિંગ કનેક્ટ થયું."</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB ડિબગીંગ બંધ કરવા માટે ટૅપ કરો"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ડિબગીંગને અક્ષમ કરવા માટે પસંદ કરો."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB પોર્ટમાં પ્રવાહી કે ધૂળ"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB પોર્ટ ઑટોમૅટિક રીતે બંધ કરવામાં આવ્યો છે. વધુ જાણવા માટે ટૅપ કરો."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB પોર્ટનો ઉપયોગ કરવો સુરક્ષિત છે"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ફોનને હવે કોઈ પ્રવાહી કે ધૂળ હોવાનું જણાયું નથી."</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>
@@ -1395,6 +1390,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> ખૂટે છે"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"ફરીથી ઉપકરણ દાખલ કરો"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> ખસેડી રહ્યાં છીએ"</string>
diff --git a/core/res/res/values-hi/strings.xml b/core/res/res/values-hi/strings.xml
index cde9ba7..1ce6000 100644
--- a/core/res/res/values-hi/strings.xml
+++ b/core/res/res/values-hi/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"कभी नहीं"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"आपके पास इस पेज को खोलने की अनुमति नहीं है."</string>
<string name="text_copied" msgid="4985729524670131385">"लेख को क्लिपबोर्ड पर कॉपी किया गया."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"और"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"मेन्यू+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"इसके ज़रिये बदलाव करें"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s की मदद से बदलाव करें"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"बदलाव करें"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"इससे शेयर करें"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"शेयर करें"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s से शेयर करें"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"शेयर करें"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"इसका उपयोग करके भेजें"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"सभी नेटवर्क देखने के लिए यहां पर टैप करें"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"कनेक्ट करें"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"सभी नेटवर्क"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> का बताया हुआ वाई-फ़ाई नेटवर्क उपलब्ध नहीं है"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"क्या आप <xliff:g id="NAME">%s</xliff:g> के बताए हुए नेटवर्क से कनेक्ट करना चाहते हैं?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"हां"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"नहीं"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"वाई-फ़ाई अपने आप चालू हो जाएगा"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"वाई-फ़ाई के लिए इंटरनेट नहीं मिल रहा है"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"विकल्पों के लिए टैप करें"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"जुड़ गया है"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"आपकी हॉटस्पॉट सेटिंग के हिसाब से बदलाव हो गए हैं"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"आपका हॉटस्पॉट बैंड बदल गया है."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"यह डिवाइस सिर्फ़ 5 गीगाहर्ट्ज़ की आपकी पसंद की सेटिंग पर काम नहीं करता, लेकिन जब भी 5 गीगाहर्ट्ज़ बैंड मौजूद होगा, डिवाइस उसका इस्तेमाल करने लगेगा."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"डीबग करने के लिए एडीबी कनेक्ट किया गया"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"यूएसबी को डीबग करने की सुविधा बंद करने के लिए टैप करें"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB डीबग करना अक्षम करने के लिए चुनें."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"यूएसबी पोर्ट में तरल चीज़ या कचरा है"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"यूएसबी पोर्ट अपने आप बंद हो गया है. ज़्यादा जानने के लिए टैप करें."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"यूएसबी पोर्ट का इस्तेमाल करना सुरक्षित है"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"फ़ोन अब तरल चीज़ों या कचरे की पहचान नहीं करता."</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> गुम है"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"डिवाइस को दोबारा लगाएं"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> को ले जाया जा रहा है"</string>
diff --git a/core/res/res/values-hr/strings.xml b/core/res/res/values-hr/strings.xml
index 003714c..ba23aa3 100644
--- a/core/res/res/values-hr/strings.xml
+++ b/core/res/res/values-hr/strings.xml
@@ -950,6 +950,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nikad"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Nemate dozvolu za otvaranje te stranice."</string>
<string name="text_copied" msgid="4985729524670131385">"Tekst kopiran u međuspremnik."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Više"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Izbornik+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1152,7 +1154,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Uređivanje pomoću aplikacije"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Uređivanje pomoću aplikacije %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Uredi"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Dijeljenje pomoću aplikacije"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Dijeli"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Dijeljenje pomoću aplikacije %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Dijeli"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Pošalji aplikacijom"</string>
@@ -1267,10 +1269,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Dodirnite za prikaz svih mreža"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Poveži"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Sve mreže"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Dostupna je Wi‑Fi mreža koju predlaže <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Želite li se povezati s mrežama koje predlaže <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Da"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Ne"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi će se uključiti automatski"</string>
@@ -1284,8 +1284,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi nema pristup internetu"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Dodirnite za opcije"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Povezano"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Promjene postavki vaše žarišne točke"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Promijenila se frekvencija vaše žarišne točke."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Ovaj uređaj ne podržava vašu postavku za upotrebu samo 5 GHz. Upotrebljavat će frekvenciju od 5 GHz kada je dostupna."</string>
@@ -1370,14 +1369,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Priključen je alat za otklanjanje pogrešaka putem USB-a"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Dodirnite da biste isključili otklanjanje pogrešaka putem USB-a"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Odaberite da biste onemogućili rješavanje programske pogreške na USB-u."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Tekućina ili prljavština u USB priključku"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB priključak automatski je onemogućen. Dodirnite da biste saznali više."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Upotreba USB priključka ponovo je sigurna"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefon više ne otkriva tekućinu ili prljavštinu."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Izrada izvješća o programskoj pogrešci…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Želite li podijeliti izvješće o programskoj pogrešci?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Dijeljenje izvješća o programskoj pogrešci…"</string>
@@ -1416,6 +1411,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Postavljanje"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Izbaci"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Istraži"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> nedostaje"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Ponovo umetnite uređaj"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Premještanje aplikacije <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-hu/strings.xml b/core/res/res/values-hu/strings.xml
index f50748d..24ee132 100644
--- a/core/res/res/values-hu/strings.xml
+++ b/core/res/res/values-hu/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Soha"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Nincs engedélye ennek az oldalnak a megnyitására."</string>
<string name="text_copied" msgid="4985729524670131385">"A szöveg bemásolva a vágólapra."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Egyebek"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menü+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Szerkesztés a következővel:"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Szerkesztés a következővel: %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Szerkesztés"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Megosztás a következővel:"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Megosztás"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Megosztás a következővel: %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Megosztás"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Küldés a következővel:"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Koppintással megjelenítheti az összes hálózatot"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Kapcsolódás"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Összes hálózat"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Rendelkezésre áll egy <xliff:g id="NAME">%s</xliff:g> által javasolt Wi-Fi-hálózat"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Szeretne csatlakozni a(z) <xliff:g id="NAME">%s</xliff:g> által javasolt hálózatokhoz?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Igen"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Nem"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"A Wi-Fi automatikusan bekapcsol"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"A Wi-Fi-hálózaton nincs internetkapcsolat"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Koppintson a beállítások megjelenítéséhez"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Csatlakozva"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"A hotspot beállításainak módosítása"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"A hotspot sávja megváltozott."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Ez az eszköz nem támogatja a csak 5 GHz-es sávra vonatkozó beállítást. Az eszköz akkor használ 5 GHz-es sávot, ha a sáv rendelkezésre áll."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB hibakereső csatlakoztatva"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Koppintson az USB-hibakeresés kikapcsolásához"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Válassza ezt az USB hibakeresés kikapcsolásához."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Folyadék vagy szennyeződés az USB-portban"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-port automatikusan letiltva. Koppintson, ha további információra van szüksége."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Az USB-port biztonságosan használható"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"A telefon már nem észlel folyadékot vagy szennyeződést."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Hibajelentés készítése…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Megosztja a hibajelentést?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Hibajelentés megosztása…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Beállítás"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Kiadás"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Tallózás"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"A(z) <xliff:g id="NAME">%s</xliff:g> nem található"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Csatlakoztassa újra az eszközt"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> áthelyezése"</string>
diff --git a/core/res/res/values-hy/strings.xml b/core/res/res/values-hy/strings.xml
index 85bba1e..69c5678 100644
--- a/core/res/res/values-hy/strings.xml
+++ b/core/res/res/values-hy/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Երբեք"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Դուք չունեք այս էջը բացելու թույլտվություն:"</string>
<string name="text_copied" msgid="4985729524670131385">"Տեքստը պատճենված է սեղմատախտակին:"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Ավելին"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Ցանկ+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Խմբագրել հետևյալ ծրագրով՝"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Խմբագրել հետևյալով՝ %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Փոփոխել"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Կիսվել"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Կիսվել"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Կիսվել %1$s-ի միջոցով"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Տրամադրել"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Ուղարկել այս հավելվածով"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Հպեք՝ բոլոր ցանցերը տեսնելու համար"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Միանալ"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Բոլոր ցանցերը"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> հավելվածն առաջարկում է միանալ հասանելի Wi‑Fi ցանցի"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Միանա՞լ <xliff:g id="NAME">%s</xliff:g> հավելվածի առաջարկած ցանցերին:"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Այո"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Ոչ"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi-ն ավտոմատ կմիանա"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi ցանցում ինտերնետ կապ չկա"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Հպեք՝ ընտրանքները տեսնելու համար"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Միացված է"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Փոփոխություններ թեժ կետի կարգավորումներում"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Ձեր թեժ կետի հաճախականությունը փոխվել է։"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Սարքը չի կարող աշխատել միայն 5 ԳՀց հաճախականությամբ։ Այդ հաճախականությունը կօգտագործվի հնարավորության դեպքում։"</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB վրիպազերծումը միացված է"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Հպեք՝ USB-ի վրիպազերծումն անջատելու համար"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Ընտրել` USB կարգաբերումը կասեցնելու համար:"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB միացքում ջուր կամ աղտ է հայտնաբերվել"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB միացքն ավտոմատ անջատվել է: Հպեք՝ ավելին իմանալու համար:"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB միացքը կարող է օգտագործվել"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Հեռախոսում ջուր կամ աղտ չի հայտնաբերվել:"</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g>-ը տեղադրված չէ"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Նորից տեղադրեք սարքը"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g>-ի տեղափոխում"</string>
diff --git a/core/res/res/values-in/strings.xml b/core/res/res/values-in/strings.xml
index 17219cb..93e4d1e 100644
--- a/core/res/res/values-in/strings.xml
+++ b/core/res/res/values-in/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Jangan"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Anda tidak memiliki izin untuk membuka halaman ini."</string>
<string name="text_copied" msgid="4985729524670131385">"Teks disalin ke papan klip."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Lainnya"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Edit dengan"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit dengan %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Bagikan dengan"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Bagikan"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Bagikan dengan %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Bagikan"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Kirim menggunakan"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tap untuk melihat semua jaringan"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Hubungkan"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Semua jaringan"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Jaringan Wi‑Fi yang diusulkan oleh <xliff:g id="NAME">%s</xliff:g> tersedia"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Sambungkan ke jaringan yang diusulkan oleh <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ya"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Tidak"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi akan aktif otomatis"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi tidak memiliki akses internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Tap untuk melihat opsi"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Tersambung"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Perubahan pada setelan hotspot Anda"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Pita hotspot Anda telah berubah."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Perangkat ini tidak mendukung preferensi Anda, yaitu hanya 5GHz. Sebagai gantinya, perangkat ini akan menggunakan pita frekuensi 5GHz jika tersedia."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Debugging USB terhubung"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Tap untuk menonaktifkan debug USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Pilih untuk menonaktifkan debugging USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Cairan atau kotoran di port USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Port USB otomatis dinonaktifkan. Tap untuk mempelajari lebih lanjut."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Port USB aman digunakan"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Ponsel tidak lagi mendeteksi adanya cairan atau kotoran."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Mengambil laporan bug…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Bagikan laporan bug?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Membagikan laporan bug..."</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Siapkan"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Keluarkan"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Jelajahi"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Tidak ada <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Masukkan perangkat lagi"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Memindahkan <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-is/strings.xml b/core/res/res/values-is/strings.xml
index 4fd0419..5bea5646 100644
--- a/core/res/res/values-is/strings.xml
+++ b/core/res/res/values-is/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Aldrei"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Þú hefur ekki heimild til að opna þessa síðu."</string>
<string name="text_copied" msgid="4985729524670131385">"Texti afritaður á klippiborð."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Meira"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Valmynd+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Breyta með"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Breyta með %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Breyta"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Deila með"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Deila"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Deila með %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Deila"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Senda með því að nota"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Ýttu til að sjá öll netkerfi"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Tengjast"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Öll netkerfi"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Wi‑Fi net sem <xliff:g id="NAME">%s</xliff:g> stakk upp á er í boði"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Viltu tengjast netum sem <xliff:g id="NAME">%s</xliff:g> stakk upp á?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Já"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Nei"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Kveikt verður sjálfkrafa á Wi‑Fi"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi er ekki með tengingu við internetið"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Ýttu til að sjá valkosti"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Tengt"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Breytingar á stillingum heits reits"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Tíðnisvið heita reitsins hefur breyst."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Þetta tæki styður ekki val þitt fyrir aðeins 5 GHz. Í staðinn mun þetta tæki nota 5 GHz tíðnisvið þegar það er í boði."</string>
@@ -1349,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB-villuleit tengd"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Ýttu til að slökkva á USB-villuleit"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Veldu til að gera USB-villuleit óvirka."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Vökvi eða óhreinindi í USB-tengi"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-tengi er gert óvirkt sjálfkrafa. Ýttu til að fá frekari upplýsingar."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Óhætt að nota USB-tengi"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Síminn greinir ekki lengur vökva eða óhreinindi"</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Tekur við villutilkynningu…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Deila villutilkynningu?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Deilir villutilkynningu..."</string>
@@ -1395,6 +1390,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Setja upp"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Fjarlægja"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Kanna"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> vantar"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Tengdu tækið aftur"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Flytur <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml
index f1b1520..16bed69 100644
--- a/core/res/res/values-it/strings.xml
+++ b/core/res/res/values-it/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Mai"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Non sei autorizzato ad aprire questa pagina."</string>
<string name="text_copied" msgid="4985729524670131385">"Testo copiato negli appunti."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Altro"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"META +"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Modifica con"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Modifica con %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Modifica"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Condividi con"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Condividi"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Condividi con %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Condividi"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Invia tramite"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tocca per vedere tutte le reti"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Connetti"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Tutte le reti"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"È disponibile una rete Wi-Fi suggerita da <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Vuoi collegarti alle reti suggerite da <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Sì"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"No"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Il Wi‑Fi verrà attivato automaticamente"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"La rete Wi-Fi non ha accesso a Internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Tocca per le opzioni"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Connesso"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Modifiche alle tue impostazioni dell\'hotspot"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"La tua banda di hotspot è cambiata."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Questo dispositivo non supporta la tua preferenza esclusiva per 5 GHz. Utilizzerà invece la banda a 5 GHz solo quando è disponibile."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Debug USB collegato"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Tocca per disattivare il debug USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Seleziona per disattivare il debug USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Liquidi o detriti nella porta USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"La porta USB viene disattivata automaticamente. Tocca per avere ulteriori informazioni."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Puoi usare la porta USB in sicurezza"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Il telefono non rileva più liquidi o detriti."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Recupero della segnalazione di bug…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Condividere la segnalazione di bug?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Condivisione della segnalazione di bug…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Configura"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Espelli"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Apri"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> mancante"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Reinserisci il dispositivo"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Spostamento di <xliff:g id="NAME">%s</xliff:g> in corso"</string>
diff --git a/core/res/res/values-iw/strings.xml b/core/res/res/values-iw/strings.xml
index 099fdcf..f225214 100644
--- a/core/res/res/values-iw/strings.xml
+++ b/core/res/res/values-iw/strings.xml
@@ -953,6 +953,8 @@
<string name="save_password_never" msgid="8274330296785855105">"אף פעם"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"אין לך הרשאה לפתוח דף זה."</string>
<string name="text_copied" msgid="4985729524670131385">"הטקסט הועתק ללוח."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"עוד"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"תפריט+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1172,7 +1174,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"ערוך באמצעות"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"ערוך באמצעות %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"עריכה"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"שתף באמצעות"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"שיתוף"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"שתף באמצעות %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"שתף"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"שליחה באמצעות"</string>
@@ -1289,10 +1291,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"יש להקיש כדי לראות את כל הרשתות"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"התחבר"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"כל הרשתות"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"רשת ה-Wi‑Fi שהוצעה על ידי <xliff:g id="NAME">%s</xliff:g> לא זמינה"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"רוצה להתחבר לרשתות שהוצעו על ידי <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"כן"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"לא"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"ה-Wi-Fi יופעל אוטומטית"</string>
@@ -1306,8 +1306,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"לרשת ה-Wi-Fi אין גישה לאינטרנט"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"הקש לקבלת אפשרויות"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"הרשת מחוברת"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"שינויים להגדרות של הנקודה לשיתוף אינטרנט"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"התדר של הנקודה לשיתוף אינטרנט השתנה."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"מכשיר זה לא תומך בהעדפות שלך ל-5GHz בלבד. במקום זאת, מכשיר זה ישתמש בתדר 5GHz כשיהיה זמין."</string>
@@ -1392,14 +1391,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"ניפוי באגים של USB מחובר"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"יש להקיש כדי לכבות את ניפוי הבאגים ב-USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"בחר להשבית ניפוי באגים ב-USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"יש נוזלים או חלקיקים ביציאת ה-USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"יציאת ה-USB הושבתה באופן אוטומטי. יש להקיש לקבלת מידע נוסף."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"יציאת ה-USB בטוחה לשימוש"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"הטלפון לא מזהה יותר נוזלים וחלקיקים."</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>
@@ -1438,6 +1433,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> חסר"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"יש להכניס שוב את ההתקן"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"מעביר את <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml
index 30f511c..9ace45e 100644
--- a/core/res/res/values-ja/strings.xml
+++ b/core/res/res/values-ja/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"保存しない"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"このページへのアクセスは許可されていません。"</string>
<string name="text_copied" msgid="4985729524670131385">"テキストをクリップボードにコピーしました。"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"その他"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"MENU+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"編集に使用"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$sで編集"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"編集"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"共有"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"共有"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$sで共有"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"共有"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"送信に使用するアプリ"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"すべてのネットワークを表示するにはタップします"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"接続"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"すべてのネットワーク"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> でおすすめの Wi-Fi ネットワークが利用可能です"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g> でおすすめのネットワークに接続してもよろしいですか？"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"はい"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"いいえ"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi-Fi は自動的にオンになります"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi‑Fi はインターネットに接続していません"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"タップしてその他のオプションを表示"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"接続しました"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"アクセス ポイントの設定の変更"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"アクセス ポイントの帯域幅が変更されました。"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"この端末は 5 GHz のみという設定に対応していません。ただし、5 GHz 周波数帯が利用できるときには利用します。"</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USBデバッグが接続されました"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"タップして USB デバッグを無効にしてください"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USBデバッグを無効にする場合に選択します。"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB ポート内の液体やゴミ"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB ポートが自動的に無効になりました。タップして詳細をご確認ください。"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB ポートを安全に使用できます"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"液体やゴミは検出されなくなりました。"</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g>が見つかりません"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"デバイスを挿入し直してください"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g>を移動しています"</string>
diff --git a/core/res/res/values-ka/strings.xml b/core/res/res/values-ka/strings.xml
index 9f6fc50..381232c 100644
--- a/core/res/res/values-ka/strings.xml
+++ b/core/res/res/values-ka/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"არასოდეს"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"ამ გვერდის გახსნის უფლება არ გაქვთ."</string>
<string name="text_copied" msgid="4985729524670131385">"ტექსტი დაკოპირებულია გაცვლის ბუფერში."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"დამატებით"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"მენიუ+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"რედაქტირება აპით:"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"რედაქტირება %1$s-ით"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"რედაქტირება"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"გაზიარება:"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"გაზიარება"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s-თან გაზიარება"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"გაზიარება"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"გაგზავნა:"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"შეეხეთ ყველა ქსელის სანახავად"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"დაკავშირება"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"ყველა ქსელი"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"ხელმისაწვდომია <xliff:g id="NAME">%s</xliff:g>-ის მიერ შემოთავაზებული Wi‑Fi ქსელი"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"გსურთ <xliff:g id="NAME">%s</xliff:g>-ის მიერ შემოთავაზებულ ქსელებთან დაკავშირება?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"დიახ"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"არა"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi-Fi ავტომატურად ჩაირთვება"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi‑Fi ქსელს ინტერნეტზე წვდომა არ აქვს"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"შეეხეთ ვარიანტების სანახავად"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"დაკავშირებულია"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"თქვენი უსადენო ქსელის პარამეტრების ცვლილება"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"თქვენი უსადენო ქსელის დიაპაზონი შეიცვალა."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"ამ მოწყობილობას არ შეუძლია მხოლოდ 5 გჰც სიხშირეზე მუშაობა. აღნიშნული სიხშირის გამოყენება მოხდება მაშინ, როცა ეს შესაძლებელია."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB გამართვა შეერთებულია"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"შეეხეთ, რათა გამორთოთ USB შეცდომების გამართვა"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"მონიშნეთ რათა შეწყვიტოთ USB-ის გამართვა"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB პორტში აღმოჩენილია სითხე ან ჭუჭყი"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB პორტი ავტომატურად გათიშულია. შეეხეთ დამატებითი ინფორმაციისთვის."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB პორტის გამოყენება ახლა უსაფრთხოა"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ტელეფონი აღარ აღმოაჩენს სითხეს ან ჭუჭყს."</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> აკლია"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"ისევ მიუერთეთ მოწყობილობა"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"მიმდინარეობს <xliff:g id="NAME">%s</xliff:g>-ის გადატანა"</string>
diff --git a/core/res/res/values-kk/strings.xml b/core/res/res/values-kk/strings.xml
index 0436bfa..cbc354b 100644
--- a/core/res/res/values-kk/strings.xml
+++ b/core/res/res/values-kk/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Ешқашан"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Сізде осы бетті ашуға рұқсат жоқ."</string>
<string name="text_copied" msgid="4985729524670131385">"Мәтін ақпарат алмастыру қорына сақталды."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Көбірек"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Mәзір+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Келесімен өңдеу"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s көмегімен өңдеу"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Өңдеу"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Бөлісу"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Бөлісу"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s қолданбасымен бөлісу"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Бөлісу"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Келесі арқылы жіберу"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Барлық желілерді көру үшін түртіңіз"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Қосылу"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Барлық желілер"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> ұсынған Wi‑Fi желісі қолжетімді"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g> ұсынған желілерге қосылғыңыз келе ме?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Иә"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Жоқ"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi автоматты түрде қосылады"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi желісінде интернет байланысы жоқ"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Опциялар үшін түртіңіз"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Жалғанды"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Хотспот параметрлеріне өзгерістер енгізілді"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Хотспот жолағы өзгертілді."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Бұл құрылғы тек 5 ГГц жиілікте жұмыс істей алмайды. Бұл жиілік мүмкін болған жағдайда ғана қолданылады."</string>
@@ -1349,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB түзетуі қосылған"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB арқылы түзетуді өшіру үшін түртіңіз"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB түзетуін өшіру үшін таңдаңыз."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB портына сұйықтық немесе қоқыс кірді"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB порты автоматты түрде өшірілді. Толығырақ ақпарат алу үшін түртіңіз."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB портын пайдалана беруге болады"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Телефон бұдан былай сұйықтықты немесе қоқысты анықтамайды."</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>
@@ -1395,6 +1390,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> жоқ"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Құрылғыны қайта салыңыз"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> тасымалдануда"</string>
diff --git a/core/res/res/values-km/strings.xml b/core/res/res/values-km/strings.xml
index f7e038c..2f3cb41 100644
--- a/core/res/res/values-km/strings.xml
+++ b/core/res/res/values-km/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"កុំ"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"អ្នកមិនមានសិទ្ធិ ដើម្បីបើកទំព័រនេះ។"</string>
<string name="text_copied" msgid="4985729524670131385">"បានចម្លងអត្ថបទទៅក្ដារតម្បៀតខ្ទាស់។"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"ច្រើនទៀត"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"ម៉ឺនុយ +"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1134,7 +1136,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"កែសម្រួលជាមួយ"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"កែសម្រួលជាមួយ %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"កែសម្រួល"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"ចែករំលែកជាមួយ"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"ចែករំលែក"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"ចែករំលែកជាមួយ %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"ចែករំលែក"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ផ្ញើដោយប្រើ"</string>
@@ -1247,10 +1249,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"ចុចដើម្បីមើលបណ្តាញទាំងអស់"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"ភ្ជាប់"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"បណ្ដាញទាំងអស់"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"អាចប្រើបណ្ដាញ Wi‑Fi ដែលណែនាំដោយ <xliff:g id="NAME">%s</xliff:g> បាន"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"តើអ្នកចង់ភ្ជាប់ទៅកាន់បណ្ដាញដែលណែនាំដោយ <xliff:g id="NAME">%s</xliff:g> ដែរទេ?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"បាទ/ចាស"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"ទេ"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi នឹងបើកដោយស្វ័យប្រវត្តិ"</string>
@@ -1264,8 +1264,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi មិនមានការតភ្ជាប់អ៊ីនធឺណិតទេ"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"ប៉ះសម្រាប់ជម្រើស"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"បានភ្ជាប់"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"ប្ដូរទៅការកំណត់ហតស្ប៉តរបស់អ្នក"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"រលកសញ្ញាហតស្ប៉តរបស់អ្នកបានផ្លាស់ប្ដូរ។"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"ឧបករណ៍នេះមិនអាចប្រើចំណូលចិត្តរបស់អ្នកសម្រាប់តែ 5GHz ទេ។ ផ្ទុយមកវិញ ឧបករណ៍នេះនឹងប្រើរលកសញ្ញា 5GHz នៅពេលដែលអាចប្រើបាន។"</string>
@@ -1350,14 +1349,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"បានភ្ជាប់ការកែកំហុសតាម USB"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"ចុចដើម្បីបិទការកែកំហុសតាម USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"ជ្រើសរើស ដើម្បីបិទការកែកំហុសតាម USB ។"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"មានទឹក ឬកម្ទេចផ្សេងៗនៅក្នុងរន្ធ USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"រន្ធ USB ត្រូវបានបិទដោយស្វ័យប្រវត្តិ។ សូមចុចដើម្បីស្វែងយល់បន្ថែម។"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"អាចប្រើរន្ធ USB បានដោយសុវត្ថិភាព"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ទូរសព្ទរកមិនឃើញទឹក ឬកម្ទេចផ្សេងៗទេ។"</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>
@@ -1396,6 +1391,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"បាត់ <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"បញ្ចូលឧបករណ៍ម្តងទៀត"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"កំពុងផ្លាស់ទី <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-kn/strings.xml b/core/res/res/values-kn/strings.xml
index 0029f02..5100b5c 100644
--- a/core/res/res/values-kn/strings.xml
+++ b/core/res/res/values-kn/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"ಎಂದಿಗೂ ಬೇಡ"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"ಈ ಪುಟವನ್ನು ತೆರೆಯಲು ನೀವು ಅನುಮತಿಯನ್ನು ಹೊಂದಿಲ್ಲ."</string>
<string name="text_copied" msgid="4985729524670131385">"ಪಠ್ಯವನ್ನು ಕ್ಲಿಪ್ಬೋರ್ಡ್ಗೆ ನಕಲಿಸಲಾಗಿದೆ."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"ಇನ್ನಷ್ಟು"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"ಮೆನು+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,8 @@
<string name="whichEditApplication" msgid="144727838241402655">"ಇವರ ಜೊತೆಗೆ ಎಡಿಟ್ ಮಾಡಿ"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ಜೊತೆಗೆ ಎಡಿಟ್ ಮಾಡಿ"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"ಎಡಿಟ್"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
+ <!-- no translation found for whichSendApplication (5803792421724377602) -->
+ <skip />
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ಜೊತೆಗೆ ಹಂಚಿಕೊಳ್ಳಿ"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ಇದನ್ನು ಬಳಸಿಕೊಂಡು ಕಳುಹಿಸಿ"</string>
@@ -1245,10 +1248,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"ಎಲ್ಲಾ ನೆಟ್ವರ್ಕ್ಗಳನ್ನು ನೋಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"ಸಂಪರ್ಕಿಸಿ"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"ಎಲ್ಲಾ ನೆಟ್ವರ್ಕ್ಗಳು"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> ಅವರು ಪ್ರಸ್ತಾಪಿಸಿದ ವೈ-ಫೈ ನೆಟ್ವರ್ಕ್ ಲಭ್ಯವಿದೆ"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g> ಅವರು ಪ್ರಸ್ತಾಪಿಸಿದ ನೆಟ್ವರ್ಕ್ಗಳಿಗೆ ನೀವು ಸಂಪರ್ಕಿಸಲು ಬಯಸುವಿರಾ?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"ಹೌದು"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"ಇಲ್ಲ"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"ವೈ‑ಫೈ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಆನ್ ಆಗುತ್ತದೆ"</string>
@@ -1262,8 +1263,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"ವೈ ಫೈ ಯಾವುದೇ ಇಂಟರ್ನೆಟ್ ಪ್ರವೇಶವನ್ನು ಹೊಂದಿಲ್ಲ"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"ಆಯ್ಕೆಗಳಿಗೆ ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"ಸಂಪರ್ಕಿಸಲಾಗಿದೆ"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"ನಿಮ್ಮ ಹಾಟ್ಸ್ಪಾಟ್ ಸೆಟ್ಟಿಂಗ್ಗಳಿಗೆ ಬದಲಾವಣೆಗಳು"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"ನಿಮ್ಮ ಹಾಟ್ಸ್ಪಾಟ್ ಬ್ಯಾಂಡ್ ಬದಲಾಗಿದೆ."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"ಈ ಸಾಧನವು 5GHz ಗೆ ಮಾತ್ರ ನಿಮ್ಮ ಆದ್ಯತೆಯನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ. ಬದಲಿಗೆ, ಈ ಸಾಧನವು 5GHz ಬ್ಯಾಂಡ್ ಅನ್ನು ಲಭ್ಯವಿರುವಾಗ ಬಳಸುತ್ತದೆ."</string>
@@ -1349,14 +1349,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB ಡೀಬಗಿಂಗ್ ಸಂಪರ್ಕ"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯನ್ನು ಆಫ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲು ಆಯ್ಕೆ ಮಾಡಿ."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB ಪೋರ್ಟ್ನಲ್ಲಿ ದ್ರವ ಅಥವಾ ಧೂಳಿನ ಕಣಗಳಿವೆ"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB ಪೋರ್ಟ್ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ನಿಷ್ಕ್ರಿಯಗೊಂಡಿದೆ. ಇನ್ನಷ್ಟು ತಿಳಿಯಲು ಟ್ಯಾಪ್ ಮಾಡಿ"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB ಪೋರ್ಟ್ ಬಳಸಲು ಸುರಕ್ಷಿತವಾಗಿದೆ"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ಫೋನ್, ದ್ರವ ಅಥವಾ ಧೂಳಿನ ಕಣಗಳನ್ನು ಇನ್ನು ಮುಂದೆ ಪತ್ತೆಹಚ್ಚುವುದಿಲ್ಲ."</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>
@@ -1395,6 +1391,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> ಕಾಣೆಯಾಗಿದೆ"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"ಸಾಧನವನ್ನು ಪುನಃ ಸೇರಿಸಿ"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> ಸರಿಸಲಾಗುತ್ತಿದೆ"</string>
diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml
index fcbeaafe..4cc3666 100644
--- a/core/res/res/values-ko/strings.xml
+++ b/core/res/res/values-ko/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"안함"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"페이지를 열 수 있는 권한이 없습니다."</string>
<string name="text_copied" msgid="4985729524670131385">"텍스트가 클립보드에 복사되었습니다."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"더보기"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"편집 프로그램:"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s(으)로 수정"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"수정"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"공유 대상"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"공유"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s와(과) 공유"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"공유"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"전송 시 사용할 앱"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"모든 네트워크를 보려면 탭하세요."</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"연결"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"모든 네트워크"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g>에서 제안한 Wi‑Fi 네트워크를 사용할 수 있습니다"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g>이(가) 제안한 네트워크에 연결하시겠습니까?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"예"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"아니요"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi가 자동으로 사용 설정됨"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi가 인터넷에 연결되어 있지 않습니다"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"탭하여 옵션 보기"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"연결되었습니다."</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"핫스팟 설정 변경"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"핫스팟 대역이 변경되었습니다."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"이 기기에서는 5GHz 전용 환경설정이 지원되지 않습니다. 대신 가능할 때만 기기에서 5GHz 대역이 사용됩니다."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB 디버깅 연결됨"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB 디버깅을 사용 중지하려면 탭하세요."</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB 디버깅을 사용하지 않으려면 선택합니다."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB 포트에서 액체 또는 이물질 감지됨"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB 포트가 자동으로 사용 중지되었습니다. 자세한 내용을 보려면 탭하세요."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB 포트를 사용해도 좋음"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"휴대전화에서 액체나 이물질이 더 이상 감지되지 않습니다."</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> 없음"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"기기를 다시 삽입하세요."</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> 이동 중"</string>
diff --git a/core/res/res/values-ky/strings.xml b/core/res/res/values-ky/strings.xml
index c184af7..c1daf45 100644
--- a/core/res/res/values-ky/strings.xml
+++ b/core/res/res/values-ky/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Эч качан"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Бул бетти ачууга уруксат берилген эмес."</string>
<string name="text_copied" msgid="4985729524670131385">"Текст алмашуу буферине көчүрүлдү."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Дагы"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Меню+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Төмөнкү менен түзөтүү"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s менен түзөтүү"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Түзөтүү"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Төмөнкү менен бөлүшүү"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Бөлүшүү"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s менен бөлүшүү"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Бөлүшүү"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Колдонмо тандаңыз"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Бардык тармактарды көрүү үчүн басыңыз"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Туташуу"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Бардык тармактар"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> сунуштаган Wi‑Fi тармагы жеткиликтүү"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g> сунуштаган тармактарга туташкыңыз келеби?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ооба"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Жок"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi автоматтык түрдө күйөт"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi тармагы Интернетке туташпай турат"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Параметрлерди ачуу үчүн таптап коюңуз"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Туташты"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Туташуу түйүнүңүздүн жөндөөлөрүнө өзгөртүүлөр киргизилди"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Туташуу түйүнүңүздүн жыштыгы өзгөрдү."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Бул түзмөк 5ГГцти гана колдонуу жөндөөсүн колдоого албайт. Анын ордуна, бул түзмөк 5ГГц жыштыгын ал жеткиликтүү болгондо колдонот."</string>
@@ -1350,14 +1349,10 @@
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB аркылуу мүчүлүштүктөрдү оңдоону өчүрүү үчүн таптаңыз"</string>
<!-- no translation found for adb_active_notification_message (8470296818270110396) -->
<skip />
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB портунда суюктук же урандылар бар"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB порт автоматтык түрдө өчүрүлдү. Кененирээк маалымат алуу үчүн таптап коюңуз."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB портун колдонууга болот"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Телефон суюктук менен урандыларды аныктаган жок."</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>
@@ -1396,6 +1391,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> табылбай жатат"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Түзмөктү кайра салыңыз"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> сактагычына ооштурулууда"</string>
diff --git a/core/res/res/values-lo/strings.xml b/core/res/res/values-lo/strings.xml
index ff3e3f6..6009c78 100644
--- a/core/res/res/values-lo/strings.xml
+++ b/core/res/res/values-lo/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"ບໍ່ຕ້ອງຈື່"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"ທ່ານບໍ່ໄດ້ຮັບອະນຸຍາດໃຫ້ເປີດໜ້ານີ້."</string>
<string name="text_copied" msgid="4985729524670131385">"ສຳເນົາຂໍ້ຄວາມໃສ່ຄລິບບອດແລ້ວ."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"ເພີ່ມເຕີມ"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"ເມນູ+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"ແກ້ໄຂໃນ"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"ແກ້ໄຂໃນ %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"ແກ້ໄຂ"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"ແບ່ງປັນກັບ"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"ແບ່ງປັນ"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"ແບ່ງປັນກັບ %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"ແບ່ງປັນ"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ສົ່ງໂດຍໃຊ້"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"ແຕະເພື່ອເບິ່ງເຄືອຂ່າຍທັງໝົດ"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"ເຊື່ອມຕໍ່"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"ເຄືອຂ່າຍທັງໝົດ"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"ສາມາດໃຊ້ເຄືອຂ່າຍ Wi‑Fi ທີ່ <xliff:g id="NAME">%s</xliff:g> ສະເໜີໄດ້"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"ທ່ານຕ້ອງການເຊື່ອມຕໍ່ຫາເຄືອຂ່າຍທີ່ສະເໜີໂດຍ <xliff:g id="NAME">%s</xliff:g> ຫຼືບໍ່?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"ແມ່ນ"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"ບໍ່ແມ່ນ"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"ຈະມີການເປີດໃຊ້ Wi‑Fi ອັດຕະໂນມັດ"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi ບໍ່ມີສັນຍານອິນເຕີເນັດ"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"ແຕະເພື່ອເບິ່ງຕົວເລືອກ"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"ເຊື່ອມຕໍ່ແລ້ວ"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"ການປ່ຽນແປງການຕັ້ງຄ່າຮັອດສະປອດຂອງທ່ານ"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"ຄື້ນຄວາມຖີ່ຮັອດສະປອດຂອງທ່ານປ່ຽນແປງແລ້ວ."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"ອຸປະກອນນີ້ບໍ່ຮອງຮັບການຕັ້ງຄ່າຂອງທ່ານສຳລັບ 5GHz ເທົ່ານັ້ນ. ແຕ່ວ່າອຸປະກອນນີ້ຈະໃຊ້ຄື້ນຄວາມຖີ່ 5GHz ເມື່ອສາມາດໃຊ້ໄດ້."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"ເຊື່ອມຕໍ່ການດີບັກຜ່ານ USB ແລ້ວ"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"ແຕະເພື່ອປິດການດີບັກ USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"ເລືອກເພື່ອປິດການດີບັ໊ກຜ່ານ USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"ມີຂອງແຫລວ ຫຼື ເສດດິນໃນຜອດ USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"ປິດຜອດ USB ໂດຍອັດຕະໂນມັດແລ້ວ. ແຕະເພື່ອສຶກສາເພີ່ມເຕີມ."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"ປອດໄພທີ່ຈະໃຊ້ຜອດ USB ແລ້ວ"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ໂທລະສັບຈະບໍ່ກວດຫາຂອງແຫລວ ຫຼື ເສດດິນອີກຕໍ່ໄປ."</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> ຂາດໄປ"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"ໃສ່ອຸປະກອນອີກຄັ້ງ"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"ກຳລັງຍ້າຍ <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-lt/strings.xml b/core/res/res/values-lt/strings.xml
index 2bd19a5..5af8361 100644
--- a/core/res/res/values-lt/strings.xml
+++ b/core/res/res/values-lt/strings.xml
@@ -953,6 +953,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Niekada"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Neturite leidimo atidaryti šį puslapį."</string>
<string name="text_copied" msgid="4985729524670131385">"Tekstas nukopijuotas į iškarpinę."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Daugiau"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Meniu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"„Meta“ +"</string>
@@ -1172,7 +1174,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Redaguoti naudojant"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Redaguoti naudojant %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Redaguoti"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Bendrinti naudojant"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Bendrinti"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Bendrinti naudojant %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Bendrinti"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Siųsti naudojant"</string>
@@ -1289,10 +1291,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Palieskite, jei norite matyti visus tinklus"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Prisijungti"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Visi tinklai"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Pasiekiamas „<xliff:g id="NAME">%s</xliff:g>“ siūlomas „Wi‑Fi“ tinklas"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Ar norite prisijungti prie „<xliff:g id="NAME">%s</xliff:g>“ siūlomų tinklų?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Taip"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Ne"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"„Wi‑Fi“ bus įjungtas automatiškai"</string>
@@ -1306,8 +1306,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"„Wi‑Fi“ tinkle nėra interneto ryšio"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Palieskite, kad būtų rodomos parinktys."</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Prisijungta"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Viešosios interneto prieigos taško nustatymų pakeitimai"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Viešosios prieigos taško dažnio juosta pasikeitė."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Šiame įrenginyje nepalaikoma tik 5 GHz nuostata. Vietoj to šiame įrenginyje bus naudojama 5 GHz dažnio juosta, kai bus pasiekiama."</string>
@@ -1392,14 +1391,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB derinimas prijungtas"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Palieskite, kad išjungtumėte USB derinimą"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Pasirinkite, kas išjungtumėte USB derinimą."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB prievade yra skysčių ar smulkių dalelių"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB prievadas automatiškai išjungtas. Palieskite, kad sužinotumėte daugiau."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Saugu naudoti USB prievadą"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefonas nebeaptinka skysčių ar smulkių dalelių."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Pateikiamas pranešimas apie riktą…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Bendrinti pranešimą apie riktą?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Bendrinamas pranešimas apie riktą..."</string>
@@ -1438,6 +1433,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Nustatyti"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Pašalinti"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Naršyti"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Trūksta <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Įdėkite įrenginį dar kartą"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Perkeliama programa „<xliff:g id="NAME">%s</xliff:g>“"</string>
diff --git a/core/res/res/values-lv/strings.xml b/core/res/res/values-lv/strings.xml
index c8c1c9e..84f7178 100644
--- a/core/res/res/values-lv/strings.xml
+++ b/core/res/res/values-lv/strings.xml
@@ -950,6 +950,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nekad"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Jums nav atļaujas atvērt šo lapu."</string>
<string name="text_copied" msgid="4985729524670131385">"Teksts ir kopēts uz starpliktuvi."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Vairāk"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Izvēlne+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta taustiņš +"</string>
@@ -1152,7 +1154,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Rediģēt, izmantojot"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Rediģēt, izmantojot %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Rediģēt"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Kopīgot, izmantojot"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Kopīgot"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Kopīgot, izmantojot %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Kopīgot"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Sūtīšana, izmantojot..."</string>
@@ -1267,10 +1269,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Pieskarieties, lai skatītu visus tīklus"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Izveidot savienojumu"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Visi tīkli"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Ir pieejams Wi‑Fi tīkls, ko ieteica <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Vai vēlaties izveidot savienojumu ar tīkliem, ko ieteica <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Jā"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Nē"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi tiks automātiski ieslēgts"</string>
@@ -1284,8 +1284,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi tīklā nav piekļuves internetam."</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Pieskarieties, lai skatītu iespējas."</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Izveidots savienojums"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Izmaiņas tīklāja iestatījumos"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Ir mainīts tīklāja joslas platums."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Šajā ierīcē netiek atbalstīta jūsu preference par tikai 5 GHz joslu. 5 GHz josla ierīcē tiks izmantota, kad tā būs pieejama."</string>
@@ -1370,14 +1369,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB atkļūdošana ir pievienota."</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Pieskarieties, lai izslēgtu USB atkļūdošanu"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Atlasiet, lai atspējotu USB atkļūdošanu."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB pieslēgvietā ir šķidrums vai daļiņas"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB pieslēgvieta ir automātiski atspējota. Pieskarieties, lai uzzinātu vairāk."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB pieslēgvietas izmantošana ir droša"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Tālrunī vairs netiek konstatēts šķidrums vai gruži."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Notiek kļūdas pārskata izveide…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Vai kopīgot kļūdas pārskatu?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Notiek kļūdas pārskata kopīgošana…"</string>
@@ -1416,6 +1411,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Iestatīt"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Izstumt"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Izpētīt"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Nav ierīces <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Vēlreiz pievienojiet ierīci."</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Notiek lietotnes <xliff:g id="NAME">%s</xliff:g> pārvietošana"</string>
diff --git a/core/res/res/values-mcc001-mnc01-en-rXC/strings.xml b/core/res/res/values-mcc001-mnc01-en-rXC/strings.xml
index 00e7813..16b897f 100644
--- a/core/res/res/values-mcc001-mnc01-en-rXC/strings.xml
+++ b/core/res/res/values-mcc001-mnc01-en-rXC/strings.xml
@@ -20,5 +20,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="mmcc_illegal_me" msgid="2238090225563073546">"Phone not allowed MM#6"</string>
+ <string name="mmcc_illegal_me" msgid="2238090225563073546">"Phone not allowed MM#6"</string>
</resources>
diff --git a/core/res/res/values-mcc310-mnc030-en-rXC/strings.xml b/core/res/res/values-mcc310-mnc030-en-rXC/strings.xml
index 6fbbcb7..0d5df4e 100644
--- a/core/res/res/values-mcc310-mnc030-en-rXC/strings.xml
+++ b/core/res/res/values-mcc310-mnc030-en-rXC/strings.xml
@@ -20,7 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="mmcc_imsi_unknown_in_hlr" msgid="6575159319460304530">"SIM not provisioned MM#2"</string>
- <string name="mmcc_illegal_ms" msgid="1930079814544869756">"SIM not allowed MM#3"</string>
- <string name="mmcc_illegal_me" msgid="2995576894416087107">"Phone not allowed MM#6"</string>
+ <string name="mmcc_imsi_unknown_in_hlr" msgid="6575159319460304530">"SIM not provisioned MM#2"</string>
+ <string name="mmcc_illegal_ms" msgid="1930079814544869756">"SIM not allowed MM#3"</string>
+ <string name="mmcc_illegal_me" msgid="2995576894416087107">"Phone not allowed MM#6"</string>
</resources>
diff --git a/core/res/res/values-mcc310-mnc150-en-rXC/strings.xml b/core/res/res/values-mcc310-mnc150-en-rXC/strings.xml
index c3d43d9..dfd4de1 100644
--- a/core/res/res/values-mcc310-mnc150-en-rXC/strings.xml
+++ b/core/res/res/values-mcc310-mnc150-en-rXC/strings.xml
@@ -20,5 +20,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="mmcc_illegal_me" msgid="5207603948149789531">"Phone not allowed MM#6"</string>
+ <string name="mmcc_illegal_me" msgid="5207603948149789531">"Phone not allowed MM#6"</string>
</resources>
diff --git a/core/res/res/values-mcc310-mnc170-en-rXC/strings.xml b/core/res/res/values-mcc310-mnc170-en-rXC/strings.xml
index 054db20..835b181 100644
--- a/core/res/res/values-mcc310-mnc170-en-rXC/strings.xml
+++ b/core/res/res/values-mcc310-mnc170-en-rXC/strings.xml
@@ -20,7 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="mmcc_imsi_unknown_in_hlr" msgid="210168420192421012">"SIM not provisioned MM#2"</string>
- <string name="mmcc_illegal_ms" msgid="1130721094178658338">"SIM not allowed MM#3"</string>
- <string name="mmcc_illegal_me" msgid="3173546391131606065">"Phone not allowed MM#6"</string>
+ <string name="mmcc_imsi_unknown_in_hlr" msgid="210168420192421012">"SIM not provisioned MM#2"</string>
+ <string name="mmcc_illegal_ms" msgid="1130721094178658338">"SIM not allowed MM#3"</string>
+ <string name="mmcc_illegal_me" msgid="3173546391131606065">"Phone not allowed MM#6"</string>
</resources>
diff --git a/core/res/res/values-mcc310-mnc280-en-rXC/strings.xml b/core/res/res/values-mcc310-mnc280-en-rXC/strings.xml
index 7200c69..bbe4344 100644
--- a/core/res/res/values-mcc310-mnc280-en-rXC/strings.xml
+++ b/core/res/res/values-mcc310-mnc280-en-rXC/strings.xml
@@ -20,7 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="mmcc_imsi_unknown_in_hlr" msgid="6638755728961013003">"SIM not provisioned MM#2"</string>
- <string name="mmcc_illegal_ms" msgid="5562215652599183258">"SIM not allowed MM#3"</string>
- <string name="mmcc_illegal_me" msgid="822496463303720579">"Phone not allowed MM#6"</string>
+ <string name="mmcc_imsi_unknown_in_hlr" msgid="6638755728961013003">"SIM not provisioned MM#2"</string>
+ <string name="mmcc_illegal_ms" msgid="5562215652599183258">"SIM not allowed MM#3"</string>
+ <string name="mmcc_illegal_me" msgid="822496463303720579">"Phone not allowed MM#6"</string>
</resources>
diff --git a/core/res/res/values-mcc310-mnc380-en-rXC/strings.xml b/core/res/res/values-mcc310-mnc380-en-rXC/strings.xml
index a6ef732..9841e30 100644
--- a/core/res/res/values-mcc310-mnc380-en-rXC/strings.xml
+++ b/core/res/res/values-mcc310-mnc380-en-rXC/strings.xml
@@ -20,6 +20,6 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="mmcc_imsi_unknown_in_hlr" msgid="6933439408719203102">"SIM not provisioned MM#2"</string>
- <string name="mmcc_illegal_ms" msgid="6367773216941648568">"SIM not allowed MM#3"</string>
+ <string name="mmcc_imsi_unknown_in_hlr" msgid="6933439408719203102">"SIM not provisioned MM#2"</string>
+ <string name="mmcc_illegal_ms" msgid="6367773216941648568">"SIM not allowed MM#3"</string>
</resources>
diff --git a/core/res/res/values-mcc310-mnc410-en-rXC/strings.xml b/core/res/res/values-mcc310-mnc410-en-rXC/strings.xml
index 32a723f..c3a34f2 100644
--- a/core/res/res/values-mcc310-mnc410-en-rXC/strings.xml
+++ b/core/res/res/values-mcc310-mnc410-en-rXC/strings.xml
@@ -20,7 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="mmcc_imsi_unknown_in_hlr" msgid="376893116792604964">"SIM not provisioned MM#2"</string>
- <string name="mmcc_illegal_ms" msgid="1593063035884873292">"SIM not allowed MM#3"</string>
- <string name="mmcc_illegal_me" msgid="4477688981805467729">"Phone not allowed MM#6"</string>
+ <string name="mmcc_imsi_unknown_in_hlr" msgid="376893116792604964">"SIM not provisioned MM#2"</string>
+ <string name="mmcc_illegal_ms" msgid="1593063035884873292">"SIM not allowed MM#3"</string>
+ <string name="mmcc_illegal_me" msgid="4477688981805467729">"Phone not allowed MM#6"</string>
</resources>
diff --git a/core/res/res/values-mcc310-mnc560-en-rXC/strings.xml b/core/res/res/values-mcc310-mnc560-en-rXC/strings.xml
index 694aa31..7865369 100644
--- a/core/res/res/values-mcc310-mnc560-en-rXC/strings.xml
+++ b/core/res/res/values-mcc310-mnc560-en-rXC/strings.xml
@@ -20,7 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="mmcc_imsi_unknown_in_hlr" msgid="2976453378311251765">"SIM not provisioned MM#2"</string>
- <string name="mmcc_illegal_ms" msgid="2519618694918727742">"SIM not allowed MM#3"</string>
- <string name="mmcc_illegal_me" msgid="7030488670186895244">"Phone not allowed MM#6"</string>
+ <string name="mmcc_imsi_unknown_in_hlr" msgid="2976453378311251765">"SIM not provisioned MM#2"</string>
+ <string name="mmcc_illegal_ms" msgid="2519618694918727742">"SIM not allowed MM#3"</string>
+ <string name="mmcc_illegal_me" msgid="7030488670186895244">"Phone not allowed MM#6"</string>
</resources>
diff --git a/core/res/res/values-mcc310-mnc950-en-rXC/strings.xml b/core/res/res/values-mcc310-mnc950-en-rXC/strings.xml
index 89619c4..6435fcb 100644
--- a/core/res/res/values-mcc310-mnc950-en-rXC/strings.xml
+++ b/core/res/res/values-mcc310-mnc950-en-rXC/strings.xml
@@ -20,7 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="mmcc_imsi_unknown_in_hlr" msgid="94675382531896663">"SIM not provisioned MM#2"</string>
- <string name="mmcc_illegal_ms" msgid="2418195136279399212">"SIM not allowed MM#3"</string>
- <string name="mmcc_illegal_me" msgid="8920048244573695129">"Phone not allowed MM#6"</string>
+ <string name="mmcc_imsi_unknown_in_hlr" msgid="94675382531896663">"SIM not provisioned MM#2"</string>
+ <string name="mmcc_illegal_ms" msgid="2418195136279399212">"SIM not allowed MM#3"</string>
+ <string name="mmcc_illegal_me" msgid="8920048244573695129">"Phone not allowed MM#6"</string>
</resources>
diff --git a/core/res/res/values-mcc311-mnc180-en-rXC/strings.xml b/core/res/res/values-mcc311-mnc180-en-rXC/strings.xml
index 53832df..8f36078 100644
--- a/core/res/res/values-mcc311-mnc180-en-rXC/strings.xml
+++ b/core/res/res/values-mcc311-mnc180-en-rXC/strings.xml
@@ -20,7 +20,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="mmcc_imsi_unknown_in_hlr" msgid="531930017979728896">"SIM not provisioned MM#2"</string>
- <string name="mmcc_illegal_ms" msgid="97745044956236881">"SIM not allowed MM#3"</string>
- <string name="mmcc_illegal_me" msgid="5766888847785331904">"Phone not allowed MM#6"</string>
+ <string name="mmcc_imsi_unknown_in_hlr" msgid="531930017979728896">"SIM not provisioned MM#2"</string>
+ <string name="mmcc_illegal_ms" msgid="97745044956236881">"SIM not allowed MM#3"</string>
+ <string name="mmcc_illegal_me" msgid="5766888847785331904">"Phone not allowed MM#6"</string>
</resources>
diff --git a/core/res/res/values-mcc312-mnc670-en-rXC/strings.xml b/core/res/res/values-mcc312-mnc670-en-rXC/strings.xml
index be68f41..5583659 100644
--- a/core/res/res/values-mcc312-mnc670-en-rXC/strings.xml
+++ b/core/res/res/values-mcc312-mnc670-en-rXC/strings.xml
@@ -20,5 +20,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="mmcc_illegal_me" msgid="3649306773478362802">"Phone not allowed MM#6"</string>
+ <string name="mmcc_illegal_me" msgid="3649306773478362802">"Phone not allowed MM#6"</string>
</resources>
diff --git a/core/res/res/values-mcc313-mnc100-en-rXC/strings.xml b/core/res/res/values-mcc313-mnc100-en-rXC/strings.xml
index 8a8bf7e..e8bec32 100644
--- a/core/res/res/values-mcc313-mnc100-en-rXC/strings.xml
+++ b/core/res/res/values-mcc313-mnc100-en-rXC/strings.xml
@@ -20,5 +20,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="mmcc_illegal_me" msgid="7320955531336937252">"Phone not allowed MM#6"</string>
+ <string name="mmcc_illegal_me" msgid="7320955531336937252">"Phone not allowed MM#6"</string>
</resources>
diff --git a/core/res/res/values-mk/strings.xml b/core/res/res/values-mk/strings.xml
index b72ede5..a2995d4 100644
--- a/core/res/res/values-mk/strings.xml
+++ b/core/res/res/values-mk/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Никогаш"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Немате дозвола да ја отворите страницава."</string>
<string name="text_copied" msgid="4985729524670131385">"Текстот е копиран на таблата со исечоци."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Повеќе"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Мени+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"копче Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Измени со"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Измени со %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Измени"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Сподели со"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Сподели"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Сподели со %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Сподели"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Испрати преку"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Допрете за да ги видите сите мрежи"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Поврзете се"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Сите мрежи"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Wi‑Fi мрежата предложена од <xliff:g id="NAME">%s</xliff:g> е достапна"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Дали сакате да се поврзувате на мрежите што ги предлага <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Да"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Не"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi ќе се вклучи автоматски"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi нема пристап до интернет"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Допрете за опции"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Поврзано"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Промени на поставките за точка на пристап"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Појасот за точка на пристап е променет."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Уредов не ги поддржува вашите поставки за само 5 GHz. Наместо тоа, ќе го користи појасот од 5 GHz кога е достапен."</string>
@@ -1349,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Поврзано е отстранување грешки преку USB"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Допрете за да го исклучите отстранувањето грешки преку USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Изберете за да се оневозможи отстранување грешки на USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Течност или нечистотија во USB-портата"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-портата е автоматски оневозможена. Допрете за да дознаете повеќе."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Безбедно е да се користи USB-портата"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Телефонот веќе не открива течност или нечистотија."</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>
@@ -1395,6 +1390,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> недостасува"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Вметнете го уредот повторно"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Се преместува <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-ml/strings.xml b/core/res/res/values-ml/strings.xml
index 9a35ff5..a309a98 100644
--- a/core/res/res/values-ml/strings.xml
+++ b/core/res/res/values-ml/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"ഒരിക്കലും"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"ഈ പേജ് തുറക്കുന്നതിന് നിങ്ങൾക്ക് അനുമതിയില്ല."</string>
<string name="text_copied" msgid="4985729524670131385">"ടെക്സ്റ്റ് ക്ലിപ്ബോർഡിലേക്ക് പകർത്തി."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"കൂടുതൽ"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"മെനു+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"മെറ്റ+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"ഇത് ഉപയോഗിച്ച് എഡിറ്റുചെയ്യുക"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ഉപയോഗിച്ച് എഡിറ്റുചെയ്യുക"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"എഡിറ്റുചെയ്യുക"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"ഇതുമായി പങ്കിടുക"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"പങ്കിടുക"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s എന്നതുമായി പങ്കിടുക"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"പങ്കിടുക"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ഇനിപ്പറയുന്നത് ഉപയോഗിച്ച് അയയ്ക്കുക"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"എല്ലാ നെറ്റ്വർക്കുകളും കാണാൻ ടാപ്പുചെയ്യുക"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"കണക്റ്റുചെയ്യുക"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"എല്ലാ നെറ്റ്വർക്കുകളും"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> നിർദ്ദേശിച്ച വൈഫൈ നെറ്റ്വർക്ക് ലഭ്യമാണ്"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g> നിർദ്ദേശിച്ച നെറ്റ്വർക്കുകളിലേക്ക് കണക്റ്റ് ചെയ്യണോ?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"ഉവ്വ്"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"ഇല്ല"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"വൈഫൈ സ്വമേധയാ ഓണാകും"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"വൈഫൈയ്ക്ക് ഇന്റർനെറ്റ് ആക്സസ് ഇല്ല"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"ഓപ്ഷനുകൾക്ക് ടാപ്പുചെയ്യുക"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"കണക്റ്റ് ചെയ്തു"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"നിങ്ങളുടെ ഹോട്ട്സ്പോട്ട് ക്രമീകരണത്തിൽ വരുത്തിയ മാറ്റങ്ങൾ"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"നിങ്ങളുടെ ഹോട്ട്സ്പോട്ട് ബാൻഡ് മാറി."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"നിങ്ങളുടെ മുൻഗണനയനുസരിച്ചുള്ള, 5GHz മാത്രം എന്നത് ഈ ഉപകരണം പിന്തുണയ്ക്കുന്നില്ല. പകരം, 5GHz ബാൻഡ് ലഭ്യമാകുമ്പോൾ അത് ഉപയോഗിക്കും."</string>
@@ -1349,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB ഡീബഗ്ഗിംഗ് കണക്റ്റ് ചെയ്തു"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB ഡീബഗ്ഗിംഗ് ഓഫാക്കാൻ ടാപ്പ് ചെയ്യുക"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ഡീബഗ്ഗുചെയ്യൽ പ്രവർത്തനരഹിതമാക്കാൻ തിരഞ്ഞെടുക്കുക."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB പോർട്ടിൽ ദ്രാവകമോ പൊടിയോ കണ്ടെത്തി"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB പോർട്ടർ സ്വയമേവ പ്രവർത്തനരഹിതമായി. കൂടുതലറിയാൻ ടാപ്പ് ചെയ്യുക."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB പോർട്ട് ഇപ്പോൾ സുരക്ഷിതമായി ഉപയോഗിക്കാം"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"നിലവിൽ ദ്രാവകമോ പൊടിയോ ഉള്ളതായി ഫോൺ കണ്ടെത്തുന്നില്ല."</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>
@@ -1395,6 +1390,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> കാണുന്നില്ല"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"ഉപകരണത്തിലേക്ക് വീണ്ടും ഇടുക"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> നീക്കുന്നു"</string>
diff --git a/core/res/res/values-mn/strings.xml b/core/res/res/values-mn/strings.xml
index 8ed5692..c678370 100644
--- a/core/res/res/values-mn/strings.xml
+++ b/core/res/res/values-mn/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Хэзээ ч үгүй"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Танд энэ хуудсыг нээх зөвшөөрөл байхгүй."</string>
<string name="text_copied" msgid="4985729524670131385">"Текст хуулагдав."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Илүү"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Цэс+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Мета+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Засварлах"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ашиглан засварлах"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Засах"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Хуваалцах"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Хуваалцах"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ашиглан хуваалцах"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Хуваалцах"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Ашиглан илгээх"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Бүх сүлжээг харахын тулд товшино уу"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Холбогдох"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Бүх сүлжээ"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g>-н санал болгож буй Wi-Fi сүлжээ боломжтой байна"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Та <xliff:g id="NAME">%s</xliff:g>-н санал болгож буй сүлжээнд холбогдох уу?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Тийм"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Үгүй"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi автоматаар асна"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi-д интернет хандалт алга"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Сонголт хийхийн тулд товшино уу"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Холбогдсон"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Таны сүлжээний цэгийн тохиргооны өөрчлөлт"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Таны сүлжээний цэгийн зурвасыг өөрчилсөн."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Энэ төхөөрөмж таны \"зөвхөн 5Гц\" гэсэн давуу сонголтыг дэмждэггүй. Үүний оронд энэ төхөөрөмж 5Гц зурвасыг боломжтой үед нь ашиглах болно."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB дебаг холбогдсон"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB дебаг хийхийг унтраахын тулд товшино уу"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB дебаг хийхийг идэвхгүй болгох бол сонгоно уу."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB порт дээрх шингэн зүйл эсвэл бохирдол"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB портыг автоматаар идэвхгүй болгосон байна. Дэлгэрэнгүй мэдээлэл авахын тулд товшино уу."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB портыг ашиглахад аюулгүй байна"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Утас шингэн зүйл эсвэл бохирдлыг илрүүлсэнгүй."</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> байхгүй байна"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Tөхөөрөмжийг дахин оруулна уу"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g>-ыг зөөж байна"</string>
diff --git a/core/res/res/values-mr/strings.xml b/core/res/res/values-mr/strings.xml
index de422ec..4aad838 100644
--- a/core/res/res/values-mr/strings.xml
+++ b/core/res/res/values-mr/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"कधीही नाही"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"तुम्हाला हे पृष्ठ उघडण्याची परवानगी नाही."</string>
<string name="text_copied" msgid="4985729524670131385">"मजकूर क्लिपबोर्डवर कॉपी केला."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"अधिक"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"मेनू+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"सह संपादित करा"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s सह संपादित करा"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"संपादित करा"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"यांच्यासह शेअर करा"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"शेअर करा"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s सह शेअर करा"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"शेअर करा"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"वापरून पाठवा"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"सर्व नेटवर्क पाहण्यासाठी टॅप करा"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"कनेक्ट करा"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"सर्व नेटवर्क"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> ने प्रस्तावित केलेले वाय-फाय नेटवर्क उपलब्ध आहे"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g> द्वारे प्रस्तावित नेटवर्कशी कनेक्ट करायचे आहे का?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"होय"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"नाही"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"वाय-फाय आपोआप चालू होईल"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"वाय-फाय ला इंटरनेटचा अॅक्सेस नाही"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"पर्यायांसाठी टॅप करा"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"कनेक्ट केले"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"तुमच्या हॉटस्पॉट सेटिंग्जमधील बदल"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"तुमचा हॉटस्पॉट बँड बदलला आहे."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"हे डिव्हाइस तुमच्या फक्त ५GHz साठी प्राधान्याला सपोर्ट करत नाही. त्याऐवजी, हे डिव्हाइस ५GHz बँड उपलब्ध असताना वापरेल."</string>
@@ -1349,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB डीबग करणे कनेक्ट केले"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB डीबगिंग बंद करण्यासाठी टॅप करा"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB डीबगिंग बंद करण्यासाठी निवडा."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB पोर्ट मध्ये ओलावा किंवा धूळ आहे"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB पोर्ट आपोआप बंद होईल. अधिक जाणून घेण्यासाठी टॅप करा."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB फोर्ट वापरण्यासाठी सुरक्षित आहे"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"फोनला धूळ किंवा ओलावा आढळला नाही."</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>
@@ -1395,6 +1390,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> गहाळ आहे"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"डिव्हाइस पुन्हा घाला"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> हलवित आहे"</string>
diff --git a/core/res/res/values-ms/strings.xml b/core/res/res/values-ms/strings.xml
index 4b62e7b..f53d327 100644
--- a/core/res/res/values-ms/strings.xml
+++ b/core/res/res/values-ms/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Jangan sekali-kali"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Anda tidak mempunyai kebenaran untuk membuka laman ini."</string>
<string name="text_copied" msgid="4985729524670131385">"Teks disalin ke papan keratan"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Lagi"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Edit dengan"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edit dengan %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edit"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Kongsi dengan"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Kongsi"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Kongsi dengan %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Kongsi"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Hantar menggunakan"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Ketik untuk melihat semua rangkaian"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Sambung"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Semua rangkaian"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Rangkaian Wi‑Fi yang dicadangkan oleh <xliff:g id="NAME">%s</xliff:g> tersedia"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Adakah anda mahu menyambung ke rangkaian yang dicadangkan oleh <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ya"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Tidak"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi akan dihidupkan secara automatik"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi tiada akses Internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Ketik untuk mendapatkan pilihan"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Disambungkan"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Perubahan kepada tetapan tempat liputan anda"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Jalur tempat liputan anda telah berubah."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Peranti ini tidak menyokong pilihan anda untuk 5GHz sahaja. Sebaliknya, peranti ini akan menggunakan jalur 5GHz apabila tersedia."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Penyahpepijatan USB disambungkan"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Ketik untuk mematikan penyahpepijatan USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Pilih untuk melumpuhkan penyahpepijatan USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Cecair atau serpihan dalam port USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Port USB dilumpuhkan secara automatik. Ketik untuk mengetahui lebih lanjut."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Selamat untuk menggunakan port USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefon tidak lagi mengesan cecair atau serpihan."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Mengambil laporan pepijat…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Kongsi laporan pepijat?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Berkongsi laporan pepijat…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Sediakan"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Tanggalkan"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Teroka"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> tiada"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Masukkan peranti sekali lagi"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Mengalihkan <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-my/strings.xml b/core/res/res/values-my/strings.xml
index 0e772e4..e051d43 100644
--- a/core/res/res/values-my/strings.xml
+++ b/core/res/res/values-my/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"လုံးဝ မလုပ်ပါ"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"သင့်ဆီမှာ ဒီစာမျက်နှာကို ဖွင့်ရန် ခွင့်ပြုချက် မရှိပါ။"</string>
<string name="text_copied" msgid="4985729524670131385">"clipboardထံ စာသားအားကူးယူမည်"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"နောက်ထပ်"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"...နှင့် တည်းဖြတ်ရန်"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s နှင့် တည်းဖြတ်ရန်"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"တည်းဖြတ်ပါ"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"...နှင့် မျှဝေရန်"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"မျှဝေပါ"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$sနှင့် မျှဝေရန်"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"မျှဝေပါ"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ကိုအသုံးပြု၍ ပို့ပါ"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"ကွန်ရက်အားလုံးကို ကြည့်ရန် တို့ပါ"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"ချိတ်ဆက်ရန်"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"ကွန်ရက်အားလုံး"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> အကြံပြုထားသော Wi‑Fi ကွန်ရက်ကို ရရှိနိုင်ပါသည်"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g> အဆိုပြုထားသော ကွန်ရက်များသို့ ချိတ်ဆက်လိုပါသလား။"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Yes"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"No"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi ကို အလိုအလျောက် ပြန်ဖွင့်ပေးလိမ့်ပါမည်"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi တွင် အင်တာနက်ချိတ်ဆက်မှု မရှိပါ"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"အခြားရွေးချယ်စရာများကိုကြည့်ရန် တို့ပါ"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"ချိတ်ဆက်ထားသည်"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"သင်၏ဟော့စပေါ့ ဆက်တင်များ ပြောင်းလဲမှု"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"သင်၏ ဟော့စပေါ့လိုင်း ပြောင်းသွားပါပြီ။"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"ဤစက်ပစ္စည်းသည် သင်၏ 5GHz သီးသန့်ရွေးချယ်မှုအတွက် ပံ့ပိုးမထားပါ။ ၎င်းအစား ဤစက်ပစ္စည်းသည် ရနိုင်သည့်အခါ 5GHz လိုင်းကို သုံးသွားပါမည်။"</string>
@@ -1349,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB အမှားရှာပြင်စနစ် ချိတ်ဆက်ထားသည်"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB အမှားရှာပြင်ခြင်းကို ပိတ်ရန် တို့ပါ"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ဖြင့် အမှားရှာပြင်ခြင်းကို ပိတ်ရန် ရွေးပါ။"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB ပို့တ်တွင် အရည် သို့မဟုတ် အမှိုက်စ ရှိနေသည်"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB ပို့တ်ကို အလိုအလျောက် ပိတ်ထားသည်။ ပိုမိုလေ့လာရန် တို့ပါ။"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB ပို့တ်ကို စိတ်ချစွာ သုံးနိုင်ပါပြီ"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ဖုန်းသည် အရည် သို့မဟုတ် အမှိုက်စတို့ကို အာရုံခံသိရှိနိုင်တော့မည် မဟုတ်ပါ။"</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>
@@ -1395,6 +1390,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> ပျောက်နေသည်"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"စက်ပစ္စည်းကို ထပ်မံထည့်သွင်းပါ"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> ရွှေ့နေစဉ်"</string>
diff --git a/core/res/res/values-nb/strings.xml b/core/res/res/values-nb/strings.xml
index 12cc8f2..3550e19 100644
--- a/core/res/res/values-nb/strings.xml
+++ b/core/res/res/values-nb/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Aldri"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Du har ikke tillatelse til å åpne denne siden."</string>
<string name="text_copied" msgid="4985729524670131385">"Kopierte tekst til utklippstavlen."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Mer"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"menyknapp+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Rediger med"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Rediger med %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Endre"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Del med"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Del"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Del med %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Del"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Send via"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Trykk for å se alle nettverkene"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Koble til"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Alle nettverk"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Et Wi‑Fi-nettverkt som ble foreslått av <xliff:g id="NAME">%s</xliff:g>, er tilgjengelig"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Vil du koble til nettverkene som foreslås av <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ja"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Nei"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi slås på automatisk"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi har ikke Internett-tilgang"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Trykk for å få alternativer"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Tilkoblet"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Endres til innstillingene dine for Wi-Fi-soner"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Båndet ditt for Wi-Fi-sone er endret."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Denne enheten støtter ikke innstillingen din for bare 5 GHz. I stedet bruker enheten 5 GHz-båndet når det er tilgjengelig."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB-feilsøking tilkoblet"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Trykk for å slå av USB-feilsøking"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Velg for å deaktivere USB-debugging."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Væske eller rusk i USB-porten"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-porten deaktiveres automatisk. Trykk for å finne ut mer."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Trygt å bruke USB-porten"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefonen oppdager ikke væsker eller rusk lenger."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Kjører feilrapport …"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Vil du dele feilrapporten?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Deler feilrapporten …"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Konfigurer"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Løs ut"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Utforsk"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> mangler"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Sett inn enheten på nytt"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Flytter <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-ne/strings.xml b/core/res/res/values-ne/strings.xml
index 93e6aa6..5ea2474 100644
--- a/core/res/res/values-ne/strings.xml
+++ b/core/res/res/values-ne/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"कहिल्यै पनि होइन"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"यो पृष्ठ खोल्न तपाईँलाई अनुमति छैन।"</string>
<string name="text_copied" msgid="4985729524670131385">"क्लिपबोर्डमा प्रतिलिप गरिएको पाठ।"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"बढी"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"मेनु+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1138,7 +1140,8 @@
<!-- no translation found for whichEditApplicationNamed (1775815530156447790) -->
<skip />
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"सम्पादन गर्नुहोस्"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"साझेदारी गर्नुहोस्..."</string>
+ <!-- no translation found for whichSendApplication (5803792421724377602) -->
+ <skip />
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s सँग साझेदारी गर्नुहोस्"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"साझेदारी गर्नुहोस्"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"यसको प्रयोग गरी पठाउनुहोस्"</string>
@@ -1251,10 +1254,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"सबै नेटवर्कहरू हेर्न ट्याप गर्नुहोस्"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"जडान गर्नुहोस्"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"सबै नेटवर्कहरू"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> ले प्रस्ताव गरेको Wi‑Fi नेटवर्क उपलब्ध छ"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"तपाईं <xliff:g id="NAME">%s</xliff:g> ले प्रस्ताव गरेका नेटवर्कहरूमा जोडिन चाहनुहुन्छ?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"हो"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"होइन"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi स्वतः सक्रिय हुनेछ"</string>
@@ -1268,8 +1269,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi मार्फत इन्टरनेटमाथि पहुँच राख्न सकिँदैन"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"विकल्पहरूका लागि ट्याप गर्नुहोस्"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"जोडियो"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"तपाईंको हटस्पट सेटिङहरूमा परिवर्तन हुन्छ"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"तपाईंको हटस्पट ब्यान्ड परिवर्तन भएको छ।"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"यो यन्त्रले तपाईंको 5GHz मात्रको प्राथमिकतालाई समर्थन गर्दैन। बरु, उपलब्ध भएको खण्डमा यो यन्त्रले 5GHz ब्यान्ड प्रयोग गर्छ।"</string>
@@ -1354,14 +1354,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB डिबग गर्ने सुविधा सुचारू छ"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB डिबग प्रक्रिया निष्क्रिय पार्न ट्याप गर्नुहोस्"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB डिबगिङलाई असक्षम पार्न ट्याप गर्नुहोस्।"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB पोर्टमा तरल पदार्थ वा धुलो भएको कुरा पत्ता लाग्यो"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB पोर्ट स्वतः असक्षम पारियो। थप जान्न ट्याप गर्नुहोस्।"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB पोर्ट प्रयोग गर्न सुरक्षित छ"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"फोनले अब उप्रान्त तरल पदार्थ वा धुलो नभएको पत्ता लगायो"</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>
@@ -1400,6 +1396,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> हराइरहेको"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"यन्त्र फेरि घुसाउनुहोस्"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> सार्दै"</string>
diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml
index c2bafaf..dad237e 100644
--- a/core/res/res/values-nl/strings.xml
+++ b/core/res/res/values-nl/strings.xml
@@ -322,7 +322,7 @@
<string name="capability_title_canRequestTouchExploration" msgid="3108723364676667320">"\'Verkennen via aanraking\' inschakelen"</string>
<string name="capability_desc_canRequestTouchExploration" msgid="7543249041581408313">"Aangetikte items worden hardop benoemd en het scherm kan worden verkend via gebaren."</string>
<string name="capability_title_canRequestFilterKeyEvents" msgid="2103440391902412174">"Tekst observeren die je typt"</string>
- <string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Omvat persoonlijke gegevens zoals creditcardnummers en wachtwoorden."</string>
+ <string name="capability_desc_canRequestFilterKeyEvents" msgid="7463135292204152818">"Omvat persoonsgegevens zoals creditcardnummers en wachtwoorden."</string>
<string name="capability_title_canControlMagnification" msgid="3593493281059424855">"Schermvergroting bedienen"</string>
<string name="capability_desc_canControlMagnification" msgid="4791858203568383773">"Het zoomniveau en de positionering van het scherm bedienen."</string>
<string name="capability_title_canPerformGestures" msgid="7418984730362576862">"Gebaren uitvoeren"</string>
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nooit"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Je hebt geen toestemming om deze pagina te openen."</string>
<string name="text_copied" msgid="4985729524670131385">"Tekst naar klembord gekopieerd."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Meer"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta +"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Bewerken met"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Bewerken met %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Bewerken"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Delen met"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Delen"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Delen met %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Delen"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Verzenden met"</string>
@@ -1206,7 +1208,7 @@
<string name="dump_heap_notification" msgid="2618183274836056542">"<xliff:g id="PROC">%1$s</xliff:g> heeft geheugenlimiet overschreden"</string>
<string name="dump_heap_notification_detail" msgid="3993078784053054141">"Heap dump verzameld. Tik om te delen."</string>
<string name="dump_heap_title" msgid="5864292264307651673">"Heap dump delen?"</string>
- <string name="dump_heap_text" msgid="4809417337240334941">"Het proces <xliff:g id="PROC">%1$s</xliff:g> heeft de procesgeheugenlimiet overschreden met <xliff:g id="SIZE">%2$s</xliff:g>. Een heap dump is voor u beschikbaar om te delen met de betreffende ontwikkelaar. Let op: Deze heap dump kan persoonlijke gegevens bevatten waartoe de app toegang heeft."</string>
+ <string name="dump_heap_text" msgid="4809417337240334941">"Het proces <xliff:g id="PROC">%1$s</xliff:g> heeft de procesgeheugenlimiet overschreden met <xliff:g id="SIZE">%2$s</xliff:g>. Een heap dump is voor u beschikbaar om te delen met de betreffende ontwikkelaar. Let op: Deze heap dump kan persoonsgegevens bevatten waartoe de app toegang heeft."</string>
<string name="sendText" msgid="5209874571959469142">"Een actie voor tekst selecteren"</string>
<string name="volume_ringtone" msgid="6885421406845734650">"Belvolume"</string>
<string name="volume_music" msgid="5421651157138628171">"Mediavolume"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tik om alle netwerken te bekijken"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Verbinding maken"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Alle netwerken"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Er is een wifi-netwerk beschikbaar dat is voorgesteld door <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Wil je verbinding maken met netwerken die worden voorgesteld door <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ja"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Nee"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wifi wordt automatisch ingeschakeld"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wifi-netwerk heeft geen internettoegang"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Tik voor opties"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Verbonden"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Wijzigingen in je hotspot-instellingen"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Je hotspot-band is gewijzigd."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Dit apparaat biedt geen ondersteuning voor je voorkeur voor alleen 5 GHz. In plaats daarvan gebruikt dit apparaat de 5-GHz-band wanneer deze beschikbaar is."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB-foutopsporing verbonden"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Tik om USB-foutopsporing uit te schakelen"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Selecteer deze optie om USB-foutopsporing uit te schakelen."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Vloeistof of vuil in USB-poort"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-poort is automatisch uitgeschakeld. Tik voor meer informatie."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Veilig om USB-poort te gebruiken"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"De telefoon detecteert geen vloeistof of vuil meer."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Bugrapport genereren…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Bugrapport delen?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Bugrapport delen…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Configureren"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Uitwerpen"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Verkennen"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> ontbreekt"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Voer apparaat opnieuw in"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> verplaatsen"</string>
diff --git a/core/res/res/values-or/strings.xml b/core/res/res/values-or/strings.xml
index 9ad58cf..4223e15 100644
--- a/core/res/res/values-or/strings.xml
+++ b/core/res/res/values-or/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"କଦାପି ନୁହେଁ"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"ଏହି ପୃଷ୍ଠା ଖୋଲିବାକୁ ଆପଣଙ୍କ ପାଖରେ ଅନୁମତି ନାହିଁ।"</string>
<string name="text_copied" msgid="4985729524670131385">"ଟେକ୍ସଟ୍ କ୍ଲିପବୋର୍ଡକୁ କପୀ ହୋଇଯାଇଛି"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"ଅଧିକ"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"ମେନୁ"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,8 @@
<string name="whichEditApplication" msgid="144727838241402655">"ସହିତ ଏଡିଟ୍ କରନ୍ତୁ"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$sରେ ସଂଶୋଧନ କରନ୍ତୁ"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"ଏଡିଟ୍ କରନ୍ତୁ"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"ଏହାଙ୍କ ସହ ଶେୟାର୍ କରନ୍ତୁ"</string>
+ <!-- no translation found for whichSendApplication (5803792421724377602) -->
+ <skip />
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ସହିତ ଶେୟାର୍ କରନ୍ତୁ"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"ଶେୟାର୍ କରନ୍ତୁ"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ଏହା ଜରିଆରେ ପଠାନ୍ତୁ"</string>
@@ -1245,10 +1248,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"ସମସ୍ତ ନେଟ୍ୱର୍କ ଦେଖିବାକୁ ଟାପ୍ କରନ୍ତୁ"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"କନେକ୍ଟ କରନ୍ତୁ"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"ସମସ୍ତ ନେଟ୍ୱର୍କ"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g>ଙ୍କ ଦ୍ୱାରା ପ୍ରସ୍ତାବିତ ଏକ ୱାଇ-ଫାଇ ନେଟ୍ୱର୍କ ଉପଲବ୍ଧ ଅଛି"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g>ଙ୍କ ଦ୍ବାରା ପ୍ରସ୍ତାବିତ ନେଟ୍ୱର୍କ ସହ ସଂଯୋଗ କରିବାକୁ ଚାହାନ୍ତି କି?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"ହଁ"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"ନାହିଁ"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"ୱାଇ-ଫାଇ ସ୍ୱଚାଳିତ ଭାବେ ଅନ୍ ହେବ"</string>
@@ -1262,8 +1263,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"ୱାଇ-ଫାଇର କୌଣସି ଇଣ୍ଟରନେଟ୍ ଆକ୍ସେସ୍ ନାହିଁ"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"ବିକଳ୍ପ ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"ସଂଯୁକ୍ତ ହୋଇଛି"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"ଆପଣଙ୍କର ହଟ୍ସ୍ପଟ୍ ସେଟିଙ୍ଗକୁ ବଦଳିଯାଇଛି"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"ଆପଣଙ୍କର ହଟ୍ସ୍ପଟ୍ ପରିବର୍ତ୍ତନ କରାଯାଇଛି"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"କେବଳ 5GHz ପାଇଁ, ଏହି ଡିଭାଇସ୍ ଆପଣଙ୍କର ପସନ୍ଦକୁ ସପୋର୍ଟ କରେନାହିଁ। ଏହା ପରିବର୍ତ୍ତେ, ଏହି ଡିଭାଇସ୍ 5GHz ବ୍ୟାଣ୍ଡ ବ୍ୟବହାର କରିବ।"</string>
@@ -1348,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB ଡିବଗିଙ୍ଗ ସଂଯୁକ୍ତ ହୋଇଛି"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USBର ଡିବଗିଙ୍ଗ ସୁବିଧାକୁ ବନ୍ଦ କରିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ଡିବଗିଙ୍ଗକୁ ଅକ୍ଷମ କରିବା ପାଇଁ ଚୟନ କରନ୍ତୁ।"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB ପୋର୍ଟରେ ତରଳ ପଦାର୍ଥ ବା ଧୂଳି"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB ପୋର୍ଟ ସ୍ୱଚାଳିତ ଭାବେ ଅକ୍ଷମ ହୋଇଛି। ଅଧିକ ଜାଣିବା ପାଇଁ ଟାପ୍ କରନ୍ତୁ।"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB ପୋର୍ଟ ବ୍ୟବହାର କରିବା ପାଇଁ ସୁରକ୍ଷିତ ଅଟେ"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ଫୋନ୍ ଆଉ ତରଳ ପଦାର୍ଥ କିମ୍ବା ଧୂଳିର ଚିହ୍ନଟ କରୁନାହିଁ।"</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>
@@ -1395,6 +1391,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> ନାହିଁ"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"ଡିଭାଇସ୍କୁ ପୁଣି ଭର୍ତ୍ତି କରନ୍ତୁ"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> ନିଆଯାଉଛି"</string>
diff --git a/core/res/res/values-pa/strings.xml b/core/res/res/values-pa/strings.xml
index 7de2be7..ba42bc2 100644
--- a/core/res/res/values-pa/strings.xml
+++ b/core/res/res/values-pa/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"ਕਦੇ ਵੀ ਨਹੀਂ"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"ਤੁਹਾਨੂੰ ਇਸ ਸਫ਼ੇ ਨੂੰ ਖੋਲ੍ਹਣ ਦੀ ਅਨੁਮਤੀ ਨਹੀਂ ਹੈ।"</string>
<string name="text_copied" msgid="4985729524670131385">"ਟੈਕਸਟ ਕਲਿਪਬੋਰਡ ਤੇ ਕਾਪੀ ਕੀਤਾ।"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"ਹੋਰ"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"ਮੀਨੂ+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,8 @@
<string name="whichEditApplication" msgid="144727838241402655">"ਇਸ ਨਾਲ ਸੰਪਾਦਨ ਕਰੋ"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ਨਾਲ ਸੰਪਾਦਨ ਕਰੋ"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"ਸੰਪਾਦਨ ਕਰੋ"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"ਇਸ ਨਾਲ ਸਾਂਝਾ ਕਰੋ"</string>
+ <!-- no translation found for whichSendApplication (5803792421724377602) -->
+ <skip />
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ਨਾਲ ਸਾਂਝਾ ਕਰੋ"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"ਸਾਂਝਾ ਕਰੋ"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ਇਸ ਦੀ ਵਰਤੋਂ ਨਾਲ ਭੇਜੋ"</string>
@@ -1245,10 +1248,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"ਸਾਰੇ ਨੈੱਟਵਰਕਾਂ ਨੂੰ ਦੇਖਣ ਲਈ ਟੈਪ ਕਰੋ"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"ਕਨੈਕਟ ਕਰੋ"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"ਸਾਰੇ ਨੈੱਟਵਰਕ"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> ਵੱਲੋਂ ਸੁਝਾਇਆ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਉਪਲਬਧ ਹੈ"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"ਕੀ ਤੁਸੀਂ <xliff:g id="NAME">%s</xliff:g> ਵੱਲੋਂ ਸੁਝਾਏ ਨੈੱਟਵਰਕਾਂ ਨਾਲ ਕਨੈਕਟ ਹੋਣਾ ਚਾਹੁੰਦੇ ਹੋ?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"ਹਾਂ"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"ਨਹੀਂ"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"ਵਾਈ‑ਫਾਈ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਚੱਲ ਪਵੇਗਾ"</string>
@@ -1262,8 +1263,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"ਵਾਈ-ਫਾਈ ਦੀ ਕੋਈ ਇੰਟਰਨੈੱਟ ਪਹੁੰਚ ਨਹੀਂ ਹੈ"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"ਵਿਕਲਪਾਂ ਲਈ ਟੈਪ ਕਰੋ"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"ਕਨੈਕਟ ਹੋਏ"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"ਤੁਹਾਡੀਆਂ ਹੌਟਸਪੌਟ ਸੈਟਿੰਗਾਂ ਵਿੱਚ ਬਦਲਾਅ"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"ਤੁਹਾਡਾ ਹੌਟਸਪੌਟ ਬੈਂਡ ਬਦਲ ਗਿਆ ਹੈ।"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"ਇਹ ਡੀਵਾਈਸ ਸਿਰਫ਼ 5GHz ਦੀ ਤੁਹਾਡੀ ਤਰਜੀਹ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦਾ ਹੈ। ਇਸਦੀ ਬਜਾਏ, ਇਹ ਡੀਵਾਈਸ ਉਪਲਬਧ ਹੋਣ \'ਤੇ 5GHz ਬੈਂਡ ਵਰਤੇਗਾ।"</string>
@@ -1349,14 +1349,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB ਡੀਬਗਿੰਗ ਕਨੈਕਟ ਕੀਤੀ"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB ਡੀਬੱਗਿੰਗ ਬੰਦ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ਡੀਬੱਗਿੰਗ ਅਯੋਗ ਬਣਾਉਣ ਲਈ ਚੁਣੋ।"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB ਪੋਰਟ ਵਿੱਚ ਪਾਣੀ ਜਾਂ ਧੂੜ-ਮਿੱਟੀ"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB ਪੋਰਟ ਸਵੈਚਲਿਤ ਤੌਰ \'ਤੇ ਬੰਦ ਕੀਤਾ ਗਿਆ। ਹੋਰ ਜਾਣਨ ਲਈ ਟੈਪ ਕਰੋ।"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB ਪੋਰਟ ਵਰਤਣਾ ਸੁਰੱਖਿਅਤ ਹੈ"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ਫ਼ੋਨ ਹੁਣ ਪਾਣੀ ਜਾਂ ਧੂੜ-ਮਿੱਟੀ ਦਾ ਪਤਾ ਨਹੀਂ ਲਗਾਉਂਦਾ ਹੈ।"</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>
@@ -1395,6 +1391,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> ਲਾਪਤਾ"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"ਦੁਬਾਰਾ ਡੀਵਾਈਸ ਸ਼ਾਮਲ ਕਰੋ"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> ਮੂਵ ਕਰ ਰਿਹਾ ਹੈ"</string>
diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml
index 48dcdb5..68cd684 100644
--- a/core/res/res/values-pl/strings.xml
+++ b/core/res/res/values-pl/strings.xml
@@ -953,6 +953,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nigdy"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Nie masz pozwolenia na otwarcie tej strony."</string>
<string name="text_copied" msgid="4985729524670131385">"Tekst został skopiowany do schowka."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Więcej"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1172,7 +1174,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Edytuj w aplikacji"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Edytuj w aplikacji %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Edytuj"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Udostępnij przez:"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Udostępnianie"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Udostępnij przez %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Udostępnij"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Wyślij za pomocą"</string>
@@ -1289,10 +1291,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Kliknij, by zobaczyć wszystkie sieci"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Połącz"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Wszystkie sieci"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Sieć Wi‑Fi sugerowana przez użytkownika <xliff:g id="NAME">%s</xliff:g> jest dostępna"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Czy chcesz połączyć się z sieciami sugerowanymi przez użytkownika <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Tak"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Nie"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi włączy się automatycznie"</string>
@@ -1306,8 +1306,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Sieć Wi-Fi nie ma dostępu do internetu"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Kliknij, by wyświetlić opcje"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Połączono"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Zmieniono ustawienia hotspotu"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Zmieniono pasmo hotspotu."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"To urządzenie nie może korzystać tylko z częstotliwości 5 GHz. Będzie korzystać z tego pasma, jeśli będzie ono dostępne."</string>
@@ -1392,14 +1391,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Podłączono moduł debugowania USB"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Kliknij, by wyłączyć debugowanie USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Wybierz, aby wyłączyć debugowanie USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Wilgoć lub brud w porcie USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Port USB został automatycznie wyłączony. Kliknij, by dowiedzieć się więcej."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Możesz bezpiecznie korzystać z portu USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefon nie wykrywa już wilgoci ani zanieczyszczeń."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Zgłaszam błąd…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Udostępnić raport o błędzie?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Udostępniam raport o błędzie…"</string>
@@ -1438,6 +1433,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Skonfiguruj"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Odłącz"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Przeglądaj"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Brak: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Włóż nośnik ponownie"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Przenoszę <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-pt-rBR/strings.xml b/core/res/res/values-pt-rBR/strings.xml
index c501699..37757a0 100644
--- a/core/res/res/values-pt-rBR/strings.xml
+++ b/core/res/res/values-pt-rBR/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nunca"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Você não tem permissão para abrir esta página."</string>
<string name="text_copied" msgid="4985729524670131385">"Texto copiado para a área de transferência."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Mais"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Editar com"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar com %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Editar"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Compartilhar com"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Compartilhar"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Compartilhar com %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Compartilhar"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Enviar usando"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Toque para ver todas as redes"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Conectar"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Todas as redes"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Uma rede Wi‑Fi sugerida por <xliff:g id="NAME">%s</xliff:g> está disponível"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Você quer se conectar às redes sugeridas por <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Sim"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Não"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"O Wi‑Fi será ativado automaticamente"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"O Wi‑Fi não tem acesso à Internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Toque para ver opções"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Conectado"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Mudanças nas suas configurações de ponto de acesso"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Sua banda de ponto de acesso foi alterada."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Este dispositivo não é compatível com sua preferência apenas por 5 GHz. Em vez disso, o dispositivo usará a banda de 5 GHz quando ela estiver disponível."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Depuração USB conectada"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Toque para desativar a depuração USB."</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Selecione para desativar a depuração USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Líquido ou detrito na porta USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"A porta USB é desativada automaticamente. Toque para saber mais."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"É seguro usar a porta USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Não há mais líquidos ou detritos detectados no smartphone."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Gerando relatório do bug..."</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Compartilhar relatório do bug?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Compartilhando relatório do bug…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Configurar"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Ejetar"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Explorar"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> ausente"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Insira o dispositivo novamente"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Movendo <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml
index dece770..33f399e0 100644
--- a/core/res/res/values-pt-rPT/strings.xml
+++ b/core/res/res/values-pt-rPT/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nunca"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Não tem autorização para abrir esta página."</string>
<string name="text_copied" msgid="4985729524670131385">"Texto copiado para a área de transferência."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Mais"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta +"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Editar com"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar com %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Editar"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Partilhar com"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Partilhar"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Partilhar com %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Partilhar"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Enviar com"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Toque para ver todas as redes"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Ligar"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Todas as redes"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Está disponível uma rede Wi-Fi proposta por <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Pretende estabelecer ligação às redes propostas por <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Sim"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Não"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"O Wi‑Fi será ativado automaticamente"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"O Wi-Fi não tem acesso à Internet."</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Toque para obter mais opções"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Ligado"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Alterações às definições de zona Wi-Fi"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"A banda da sua zona Wi-Fi foi alterada."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Este dispositivo não suporta a sua preferência apenas para 5 GHz. Em alternativa, este dispositivo vai utilizar a banda de 5 GHz quando estiver disponível."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Depuração USB ligada"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Toque para desativar a depuração USB."</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Selecione para desativar a depuração por USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Líquido ou resíduos na porta USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"A porta USB é automaticamente desativada. Toque para saber mais."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"É seguro utilizar a porta USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"O telemóvel já não deteta líquidos nem resíduos."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"A criar relatório de erro…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Pretende partilhar o relatório de erro?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"A partilhar relatório de erro…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Configurar"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Ejetar"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Explorar"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> em falta"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Volte a inserir o dispositivo."</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"A mover <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml
index c501699..37757a0 100644
--- a/core/res/res/values-pt/strings.xml
+++ b/core/res/res/values-pt/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nunca"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Você não tem permissão para abrir esta página."</string>
<string name="text_copied" msgid="4985729524670131385">"Texto copiado para a área de transferência."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Mais"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Editar com"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editar com %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Editar"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Compartilhar com"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Compartilhar"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Compartilhar com %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Compartilhar"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Enviar usando"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Toque para ver todas as redes"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Conectar"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Todas as redes"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Uma rede Wi‑Fi sugerida por <xliff:g id="NAME">%s</xliff:g> está disponível"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Você quer se conectar às redes sugeridas por <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Sim"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Não"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"O Wi‑Fi será ativado automaticamente"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"O Wi‑Fi não tem acesso à Internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Toque para ver opções"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Conectado"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Mudanças nas suas configurações de ponto de acesso"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Sua banda de ponto de acesso foi alterada."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Este dispositivo não é compatível com sua preferência apenas por 5 GHz. Em vez disso, o dispositivo usará a banda de 5 GHz quando ela estiver disponível."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Depuração USB conectada"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Toque para desativar a depuração USB."</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Selecione para desativar a depuração USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Líquido ou detrito na porta USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"A porta USB é desativada automaticamente. Toque para saber mais."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"É seguro usar a porta USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Não há mais líquidos ou detritos detectados no smartphone."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Gerando relatório do bug..."</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Compartilhar relatório do bug?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Compartilhando relatório do bug…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Configurar"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Ejetar"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Explorar"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> ausente"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Insira o dispositivo novamente"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Movendo <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-ro/strings.xml b/core/res/res/values-ro/strings.xml
index 9a72d5c..3f408fe 100644
--- a/core/res/res/values-ro/strings.xml
+++ b/core/res/res/values-ro/strings.xml
@@ -950,6 +950,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Niciodată"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Nu aveți permisiunea de a deschide această pagină."</string>
<string name="text_copied" msgid="4985729524670131385">"Text copiat în clipboard."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Mai multe"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Meniu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1152,7 +1154,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Editați cu"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Editați cu %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Editați"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Trimiteți prin"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Trimiteți"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Distribuiți cu %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Trimiteți"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Trimiteți folosind"</string>
@@ -1267,10 +1269,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Atingeți pentru a vedea toate rețelele"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Conectați-vă"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Toate rețelele"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Este disponibilă o rețea propusă de <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Doriți să vă conectați la rețelele propuse de <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Da"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Nu"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi se va activa automat"</string>
@@ -1284,8 +1284,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Rețeaua Wi-Fi nu are acces la internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Atingeți pentru opțiuni"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Conectat"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Modificări aduse setărilor pentru hotspot"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"S-a schimbat banda de frecvență a hotspotului."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Dispozitivul nu acceptă doar preferința pentru 5 GHz. Dispozitivul va folosi banda de 5 GHz când este disponibilă."</string>
@@ -1370,14 +1369,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Remedierea erorilor prin USB este conectată"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Atingeți pentru a dezactiva remedierea erorilor prin USB."</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Selectați pentru a dezactiva remedierea erorilor prin USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Lichide sau reziduuri în portul USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Portul USB este dezactivat automat. Atingeți ca să aflați mai multe."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Portul USB poate fi folosit în siguranță"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefonul nu mai detectează lichide sau reziduuri."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Se creează un raport de eroare…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Trimiteți raportul de eroare?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Se trimite raportul de eroare…"</string>
@@ -1416,6 +1411,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Configurați"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Scoateți"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Explorați"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> lipsește"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Reintroduceți dispozitivul"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Se mută <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml
index bbd5d20..757aa87 100644
--- a/core/res/res/values-ru/strings.xml
+++ b/core/res/res/values-ru/strings.xml
@@ -953,6 +953,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Никогда"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"У вас нет доступа к этой странице."</string>
<string name="text_copied" msgid="4985729524670131385">"Текст скопирован в буфер обмена."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Ещё"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Меню+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta +"</string>
@@ -1172,7 +1174,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Редактировать с помощью приложения:"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Редактировать с помощью приложения \"%1$s\""</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Изменить"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Поделиться с помощью:"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Отправка данных"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Поделиться через %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Поделиться"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Выберите приложение"</string>
@@ -1289,10 +1291,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Нажмите, чтобы увидеть список сетей"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Подключиться"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Все сети"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Доступна сеть Wi-Fi, найденная приложением \"<xliff:g id="NAME">%s</xliff:g>\""</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Подключиться к сетям, найденным приложением \"<xliff:g id="NAME">%s</xliff:g>\"?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Да"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Нет"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi-Fi включится автоматически"</string>
@@ -1306,8 +1306,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Сеть Wi-Fi не подключена к Интернету"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Нажмите, чтобы показать варианты."</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Подключено"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Изменения в настройках точки доступа"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Частота точки доступа изменена."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Устройство не может работать только на частоте 5 ГГц. Эта частота будет использоваться, когда это возможно."</string>
@@ -1392,14 +1391,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Отладка по USB разрешена"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Нажмите, чтобы отключить отладку по USB."</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Нажмите, чтобы отключить отладку по USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"В USB-порт попала вода или грязь"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-порт был автоматически отключен. Нажмите, чтобы узнать подробности."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Можно использовать USB-порт"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Вода или грязь внутри не обнаружена."</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>
@@ -1438,6 +1433,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> не найден"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Подключите накопитель снова."</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Перенос приложения <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-si/strings.xml b/core/res/res/values-si/strings.xml
index aac3052..a1d6a92 100644
--- a/core/res/res/values-si/strings.xml
+++ b/core/res/res/values-si/strings.xml
@@ -949,6 +949,8 @@
<string name="save_password_never" msgid="8274330296785855105">"කවදාවත් නොවේ"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"මෙම පිටුව විවෘත කිරීමට ඔබට අවසර නැත."</string>
<string name="text_copied" msgid="4985729524670131385">"පෙළ පසුරු පුවරුවට පිටපත් කරන ලදි."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"තව"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"මෙනුව+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1134,7 +1136,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"සමඟ සංස්කරණය කරන්න"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s සමඟ සංස්කරණය කරන්න"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"සංස්කරණය"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"සමඟ බෙදාගන්න"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"බෙදා ගන්න"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%s සමඟ බෙදාගන්න"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"බෙදා ගන්න"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"මෙය භාවිතයෙන් යවන්න"</string>
@@ -1247,10 +1249,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"සියලු ජාල බැලීමට තට්ටු කරන්න"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"සම්බන්ධ කරන්න"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"සියලු ජාල"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> විසින් යෝජිත Wi-Fi ජාලයක් ලැබේ"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"ඔබට <xliff:g id="NAME">%s</xliff:g> විසින් යෝජනා කරනු ලබන ජාල වෙත සම්බන්ධ කිරීමට අවශ්යද?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"ඔව්"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"නැත"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi ස්වයංක්රියව ක්රියාත්මක වනු ඇත"</string>
@@ -1264,8 +1264,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi සඳහා අන්තර්ජාල ප්රවේශය නැත"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"විකල්ප සඳහා තට්ටු කරන්න"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"සම්බන්ධයි"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"ඔබගේ හොට්ස්පොට් සැකසීම්වලට වෙනස් කිරීම්"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"ඔබගේ හොට්ස්පොට් කලාපය වෙනස් වී ඇත."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"මෙම උපාංගය 5GHz සඳහා ඔබේ මනාපවලට සහාය නොදක්වයි. ඒ වෙනුවට, මෙම උපාංගය ලබා ගත හැකි විට 5GHz කලාපය භාවිතා කරනු ඇත."</string>
@@ -1350,14 +1349,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB නිදොස්කරණය සම්බන්ධිතයි"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB නිදොස් කිරීම ක්රියාවිරහිත කිරීමට තට්ටු කරන්න"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB නිදොස්කරණය අබල කිරීමට තෝරන්න."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB තොට තුළ ද්රව හෝ කුණු"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB තොට ස්වයංක්රීයව අබල කෙරේ. තවත් දැන ගැනීමට තට්ටු කරන්න."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB තොට භාවිත කිරීම ආරක්ෂිතයි"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"දුරකථනය තවදුරටත් ද්රව හෝ කුණු අනාවරණ නොකරයි."</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>
@@ -1396,6 +1391,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> අස්ථානගතයි"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"නැවත උපාංගය ඇතුළු කරන්න"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> ගෙන යමින්"</string>
diff --git a/core/res/res/values-sk/strings.xml b/core/res/res/values-sk/strings.xml
index 5ecf2b8..c84d3c4 100644
--- a/core/res/res/values-sk/strings.xml
+++ b/core/res/res/values-sk/strings.xml
@@ -953,6 +953,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nikdy"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Nemáte povolenie na otvorenie tejto stránky."</string>
<string name="text_copied" msgid="4985729524670131385">"Text bol skopírovaný do schránky."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Viac"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1172,7 +1174,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Upraviť pomocou"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Upraviť v aplikácii %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Upraviť"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Zdieľať"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Zdieľať"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Zdieľať v aplikácii %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Zdieľať"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Odoslať pomocou aplikácie"</string>
@@ -1289,10 +1291,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Klepnutím zobrazíte všetky siete"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Pripojiť"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Všetky siete"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"K dispozícii je sieť Wi-Fi, ktorú navrhla aplikácia <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Chcete sa pripájať k sieťam navrhnutým aplikáciou <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Áno"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Nie"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi sa zapne automaticky"</string>
@@ -1306,8 +1306,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Sieť Wi‑Fi nemá prístup k internetu"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Klepnutím získate možnosti"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Pripojené"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Zmeny nastavení hotspotu"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Pásmo vášho hotspotu sa zmenilo."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Toto zariadenie nepodporuje vašu predvoľbu používať iba 5 GHz. Namiesto toho bude pásmo 5 GHz používať vtedy, keď bude k dispozícii."</string>
@@ -1392,14 +1391,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Ladenie cez USB pripojené"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Klepnutím vypnite ladenie cez USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Vyberte, ak chcete zakázať ladenie cez USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Tekutina alebo nečistoty v porte USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Port USB je automaticky deaktivovaný. Ďalšie informácie zobrazíte klepnutím."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Port USB môžete bezpečne používať"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefón už nerozpoznáva tekutinu ani nečistoty."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Preberá sa hlásenie chyby…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Chcete zdieľať hlásenie chyby?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Zdieľa sa hlásenie chyby…"</string>
@@ -1438,6 +1433,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Nastaviť"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Odpojiť"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Preskúmať"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Chýba: <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Zariadenie vložte znova"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Presúva sa aplikácia <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-sl/strings.xml b/core/res/res/values-sl/strings.xml
index ecd4e91..ff954e0 100644
--- a/core/res/res/values-sl/strings.xml
+++ b/core/res/res/values-sl/strings.xml
@@ -953,6 +953,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Nikoli"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Nimate dovoljenja za odpiranje te strani."</string>
<string name="text_copied" msgid="4985729524670131385">"Besedilo, kopirano v odložišče."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Več"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Meni+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta +"</string>
@@ -1172,7 +1174,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Urejanje z aplikacijo"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Urejanje z aplikacijo %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Urejanje"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Skupna raba z aplikacijo"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Deljenje z drugimi"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Skupna raba z aplikacijo %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Skupna raba"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Pošiljanje z aplikacijo"</string>
@@ -1289,10 +1291,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Dotaknite se, če si želite ogledati vsa omrežja"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Vzpostavi povezavo"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Vsa omrežja"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Na voljo je omrežje Wi-Fi po predlogu aplikacije <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Želite vzpostaviti povezavo z omrežji, ki jih predlaga aplikacija <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Da"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Ne"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Povezava Wi‑Fi se bo samodejno vklopila"</string>
@@ -1306,8 +1306,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Omrežje Wi-Fi nima dostopa do interneta"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Dotaknite se za možnosti"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Povezava je vzpostavljena"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Spremembe nastavitev dostopne točke"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Pas dostopne točke je spremenjen."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Ta naprava ne podpira prednostne nastavitve samo za 5-GHz pas. Namesto tega bo ta naprava uporabljala 5-GHz pas, ko bo na voljo."</string>
@@ -1392,14 +1391,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Iskanje napak prek USB je povezano"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Dotaknite se, če želite izklopiti odpravljanje napak prek USB-ja"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Izberite, če želite onemogočiti iskanje in odpravljanje napak prek vrat USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"V vratih USB je tekočina ali umazanija"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Vrata USB so samodejno onemogočena. Dotaknite se, če želite izvedeti več."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Vrata USB so varna za uporabo"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefon ne zaznava več tekočine ali umazanije."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Zajemanje poročila o napakah …"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Želite poslati poročilo o napakah?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Pošiljanje poročila o napakah …"</string>
@@ -1438,6 +1433,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Nastavi"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Izvrzite"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Raziščite"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Ni shrambe <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Znova vstavite napravo"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Premikanje aplikacije <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-sq/strings.xml b/core/res/res/values-sq/strings.xml
index 54ae5de..75e2625 100644
--- a/core/res/res/values-sq/strings.xml
+++ b/core/res/res/values-sq/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Asnjëherë"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Nuk ke leje për ta hapur këtë faqe."</string>
<string name="text_copied" msgid="4985729524670131385">"Teksti u kopjua në kujtesën e fragmenteve."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Më shumë"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menyja+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Redakto me"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Redakto me %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Redakto"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Shpërnda publikisht me"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Ndaj"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Shpërnda publikisht me %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Ndaj"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Dërgo me"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Trokit për të parë të gjitha rrjetet"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Lidhu"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Të gjitha rrjetet"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Ofrohet një rrjet Wi‑Fi i propozuar nga <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Dëshiron të lidhesh me rrjetet e propozuara nga <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Po"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Jo"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi do të aktivizohet automatikisht"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi nuk ka qasje në internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Trokit për opsionet"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Lidhur"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Ndryshimet në cilësimet e zonës së qasjes për internet"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Brezi yt i zonës së qasjes për internet ka ndryshuar."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Kjo pajisje nuk e mbështet preferencën për vetëm 5 GHz. Përkundrazi, pajisja do të përdorë brezin 5 GHz nëse ka."</string>
@@ -1349,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Korrigjuesi i USB-së i lidhur"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Trokit për të çaktivizuar korrigjimin e USB-së"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Përzgjidhe për të çaktivizuar korrigjimin e gabimeve të USB-së"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Lëngje ose papastërti në portën e USB-së"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Porta e USB-së është çaktivizuar automatikisht. Trokit për të mësuar më shumë."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Nuk ka rrezik të përdoret porta e USB-së"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefoni nuk i dallon më lëngjet apo papastërtitë."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Po merret raporti i defekteve në kod…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Të ndahet raporti i defektit në kod?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Po ndan raportin e defekteve në kod..."</string>
@@ -1395,6 +1390,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Konfiguro"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Nxirr"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Eksploro"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> mungon"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Fut përsëri pajisjen"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Po zhvendos <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-sr/strings.xml b/core/res/res/values-sr/strings.xml
index b1a1dc7..edc9b67 100644
--- a/core/res/res/values-sr/strings.xml
+++ b/core/res/res/values-sr/strings.xml
@@ -950,6 +950,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Никад"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Немате дозволу да отворите ову страницу."</string>
<string name="text_copied" msgid="4985729524670131385">"Текст је копиран у привремену меморију."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Још"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Мени+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1152,7 +1154,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Измените помоћу"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Измените помоћу апликације %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Измени"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Делите помоћу"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Дељење"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Делите помоћу апликације %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Дели"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Пошаљите помоћу:"</string>
@@ -1267,10 +1269,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Додирните да бисте видели све мреже"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Повежи"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Све мреже"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Wi‑Fi мрежа коју предлаже <xliff:g id="NAME">%s</xliff:g> је доступна"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Желите ли да се повежете на мреже које предлаже <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Да"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Не"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi ће се аутоматски укључити"</string>
@@ -1284,8 +1284,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi нема приступ интернету"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Додирните за опције"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Повезано је"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Промене подешавања за хотспот"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Опсег хотспота је промењен."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Овај уређај не подржава подешавање само за 5 GHz. Уређај ће користити опсег од 5 GHz када буде доступан."</string>
@@ -1370,14 +1369,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Отклањање грешака са USB-а је омогућено"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Додирните да бисте искључили отклањање грешака са USB-а"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Изаберите да бисте онемогућили отклањања грешака са USB-а."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Течност или нечистоћа у USB порту"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB порт је аутоматски искључен. Додирните да бисте сазнали више."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Коришћење USB порта је безбедно"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Телефон више не открива течност или нечистоћу."</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>
@@ -1416,6 +1411,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> недостаје"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Поново уметните уређај"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Преноси се <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml
index e81aaa2..b778a81 100644
--- a/core/res/res/values-sv/strings.xml
+++ b/core/res/res/values-sv/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Aldrig"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Du har inte behörighet att öppna den här sidan."</string>
<string name="text_copied" msgid="4985729524670131385">"Text har kopierats till urklipp."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Mer"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta + "</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Redigera med"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Redigera med %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Redigera"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Dela med"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Dela"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Dela med %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Dela"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Skicka med"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tryck för att visa alla nätverk"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Anslut"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Alla nätverk"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Det finns ett tillgängligt Wi‑Fi-nätverk som föreslås av <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Vill du ansluta till nätverk som föreslås av <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ja"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Nej"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi-Fi aktiveras automatiskt"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi-nätverket är inte anslutet till internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Tryck för alternativ"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Ansluten"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Ändringar i inställningarna för surfzon"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Frekvensbandet för surfzonen har ändrats."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Den här enheten har inte stöd för inställningen för att endast använda 5 GHz. I stället används 5 GHz när det är möjligt."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB-felsökning ansluten"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Tryck för att inaktivera USB-felsökning"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Välj för att inaktivera USB-felsökning."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Vätska eller smuts i USB-porten"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-porten har inaktiverats automatiskt. Tryck för att läsa mer."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Nu kan du använda USB-porten igen"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Mobilen känner inte längre av någon vätska eller smuts."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Felrapporten överförs …"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Vill du dela felrapporten?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Felrapporten delas …"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Konfigurera"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Mata ut"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Utforska"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> saknas"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Sätt i enheten igen"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Flyttar <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-sw/strings.xml b/core/res/res/values-sw/strings.xml
index db4c26b..8ec7a97 100644
--- a/core/res/res/values-sw/strings.xml
+++ b/core/res/res/values-sw/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Katu"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Hauna idhini ya kufungua ukurasa huu."</string>
<string name="text_copied" msgid="4985729524670131385">"Maandishi yamenakiliwa kwenye ubao wa kunakili."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Zaidi"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menyu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Badilisha kwa"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Badilisha kwa %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Badilisha"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Shiriki na"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Shiriki"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Shiriki na %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Shiriki"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Tuma kwa kutumia"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Gusa ili uone mitandao yote"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Unganisha"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Mitandao yote"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Mtandao wa Wi‑Fi uliopendekezwa na <xliff:g id="NAME">%s</xliff:g> unapatikana"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Je, ungependa kuunganisha kwenye mitandao inayopendekezwa na <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ndiyo"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Hapana"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi itawashwa kiotomatiki"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi haina muunganisho wa intaneti"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Gusa ili upate chaguo"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Imeunganisha"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Mabadiliko kwenye mipangilio ya mtandao pepe"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Bendi ya mtandao pepe wako imebadilika."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Kifaa hiki hakitumii mapendeleo yako ya GHz 5 pekee. Badala yake, kifaa hiki kitatumia bendi ya GHz 5 itakapopatikana."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Utatuaji wa USB umeunganishwa"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Gusa ili uzime utatuzi wa USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Chagua ili kulemaza utatuaji USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Unyevu au uchafu katika mlango wa USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Mlango wa USB umezimwa kiotomatiki. Gusa ili upate maelezo zaidi."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Ni salama kutumia mlango wa USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Simu haitambui tena unyevu au uchafu."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Inatayarisha ripoti ya hitilafu…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Ungependa kushiriki ripoti ya hitilafu?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Inashiriki ripoti ya hitilafu…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Weka mipangilio"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Ondoa"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Chunguza"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> haipo"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Weka kifaa tena"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Inahamisha <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-ta/strings.xml b/core/res/res/values-ta/strings.xml
index 3b91cb0..f5e2174 100644
--- a/core/res/res/values-ta/strings.xml
+++ b/core/res/res/values-ta/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"ஒருபோதும் வேண்டாம்"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"இந்தப் பக்கத்தைத் திறக்க, உங்களிடம் அனுமதி இல்லை."</string>
<string name="text_copied" msgid="4985729524670131385">"உரை கிளிப்போர்டிற்கு நகலெடுக்கப்பட்டது."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"மேலும்"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"மெனு+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"மெட்டா மற்றும்"</string>
@@ -1132,7 +1134,8 @@
<string name="whichEditApplication" msgid="144727838241402655">"இதன் மூலம் திருத்து"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s மூலம் திருத்து"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"மாற்று"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"இதன் மூலம் பகிர்"</string>
+ <!-- no translation found for whichSendApplication (5803792421724377602) -->
+ <skip />
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s மூலம் பகிர்"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"பகிர்"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"இதைப் பயன்படுத்தி அனுப்பு:"</string>
@@ -1245,10 +1248,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"எல்லா நெட்வொர்க்குகளையும் பார்க்க, தட்டவும்"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"இணை"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"எல்லா நெட்வொர்க்குகளும்"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> பரிந்துரைத்த வைஃபை நெட்வொர்க் கிடைக்கிறது"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g> பரிந்துரைத்த நெட்வொர்க்குகளுடன் இணைக்க வேண்டுமா?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"சரி"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"வேண்டாம்"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"வைஃபை தானாக ஆன் ஆகும்"</string>
@@ -1262,8 +1263,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"வைஃபையில் இண்டர்நெட் அணுகல் இல்லை"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"விருப்பங்களுக்கு, தட்டவும்"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"இணைக்கப்பட்டது"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"உங்கள் ஹாட்ஸ்பாட் அமைப்புகளில் செய்யப்பட்டுள்ள மாற்றங்கள்"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"உங்கள் ஹாட்ஸ்பாட்டின் அலைவரிசை மாறிவிட்டது."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"இந்தச் சாதனத்தில், ’5GHz மட்டும்’ எனும் முன்னுரிமைத் தேர்வு ஆதரிக்கப்படவில்லை. எனினும் 5GHz அலைவரிசை கிடைக்கும்போது, சாதனம் அதைப் பயன்படுத்திக்கொள்ளும்."</string>
@@ -1349,14 +1349,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB பிழைத் திருத்தம் இணைக்கப்பட்டது"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB பிழைத் திருத்தத்தை ஆஃப் செய்ய, தட்டவும்"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB பிழைத்திருத்தத்தை முடக்க, தேர்ந்தெடுக்கவும்."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB போர்ட்டில் சேதம் உள்ளது"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB போர்ட் தானாகவே முடக்கப்பட்டது மேலும் அறிய, தட்டவும்."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB போர்ட்டைப் பாதுகாப்பாகப் பயன்படுத்தலாம்"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"மொபைலில் எந்தச் சேதாரமும் கண்டறியப்படவில்லை."</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>
@@ -1395,6 +1391,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> இல்லை"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"மீண்டும் சாதனத்தைச் செருகவும்"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g>ஐ நகர்த்துகிறது"</string>
diff --git a/core/res/res/values-te/strings.xml b/core/res/res/values-te/strings.xml
index 6e9e607..30112d7 100644
--- a/core/res/res/values-te/strings.xml
+++ b/core/res/res/values-te/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"ఎప్పుడూ వద్దు"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"ఈ పేజీని తెరవడానికి మీకు అనుమతి లేదు."</string>
<string name="text_copied" msgid="4985729524670131385">"వచనం క్లిప్బోర్డ్కు కాపీ చేయబడింది."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"ఎక్కువ"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"మెను+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"దీనితో సవరించు"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$sతో సవరించు"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"సవరించు"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"దీనితో భాగస్వామ్యం చేయి"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"షేర్ చేయి"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$sతో భాగస్వామ్యం చేయి"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"భాగస్వామ్యం చేయి"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"దీన్ని ఉపయోగించి పంపండి"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"అన్ని నెట్వర్క్లు చూడటానికి నొక్కండి"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"కనెక్ట్ చేయి"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"అన్ని నెట్వర్క్లు"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> సూచించిన ఒక Wi-Fi నెట్వర్క్ ఇప్పుడు అందుబాటులో ఉంది"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"మీరు <xliff:g id="NAME">%s</xliff:g> సూచించిన నెట్వర్క్లతో కనెక్ట్ చేయాలనుకుంటున్నారా?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"అవును"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"లేదు"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi స్వయంచాలకంగా ఆన్ అవుతుంది"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fiకి ఇంటర్నెట్ యాక్సెస్ లేదు"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"ఎంపికల కోసం నొక్కండి"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"కనెక్ట్ చేయబడింది"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"మీ హాట్స్పాట్ సెట్టింగ్లకు మార్పులు"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"మీ హాట్స్పాట్ బ్యాండ్ మార్చబడింది."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"ఈ పరికరం 5GHz కోసం మాత్రమే మీ ప్రాధాన్యతకు మద్దతు ఇవ్వదు. బదులుగా, ఈ పరికరం అందుబాటులో ఉన్నప్పుడు 5GHz బ్యాండ్ను ఉపయోగిస్తుంది."</string>
@@ -1349,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB డీబగ్గింగ్ కనెక్ట్ చేయబడింది"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB డీబగ్గింగ్ను ఆఫ్ చేయడానికి నొక్కండి"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"డీబగ్గింగ్ని నిలిపివేయడానికి ఎంచుకోండి."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB పోర్ట్లో ద్రవ లేదా వ్యర్థ పదార్థాలు ఉన్నాయి"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB పోర్ట్ ఆటోమేటిక్గా నిలిపివేయబడింది. మరింత తెలుసుకోవడానికి నొక్కండి."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"ఇప్పుడు సురక్షితంగా USB పోర్ట్ని ఉపయోగించుకోవచ్చు"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ఫోన్ ఇకపై ద్రవ లేదా వ్యర్థ పదార్థాలను గుర్తించదు."</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>
@@ -1395,6 +1390,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> కనుగొనబడటం లేదు"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"పరికరాన్ని మళ్లీ చొప్పించండి"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g>ని తరలిస్తోంది"</string>
diff --git a/core/res/res/values-th/strings.xml b/core/res/res/values-th/strings.xml
index ac84c9b..0a5e21d 100644
--- a/core/res/res/values-th/strings.xml
+++ b/core/res/res/values-th/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"ไม่ต้องเลย"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"คุณไม่ได้รับอนุญาตให้เปิดหน้าเว็บนี้"</string>
<string name="text_copied" msgid="4985729524670131385">"คัดลอกข้อความไปยังคลิปบอร์ด"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"เพิ่มเติม"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"เมนู+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"แก้ไขด้วย"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"แก้ไขด้วย %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"แก้ไข"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"แชร์กับ"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"แชร์"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"แชร์กับ %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"แชร์"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"ส่งโดยใช้"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"แตะเพื่อดูเครือข่ายทั้งหมด"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"เชื่อมต่อ"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"เครือข่ายทั้งหมด"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"เครือข่าย Wi-Fi ที่ <xliff:g id="NAME">%s</xliff:g> เสนอใช้งานได้"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"ต้องการเชื่อมต่อเครือข่ายที่ <xliff:g id="NAME">%s</xliff:g> เสนอไหม"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"ใช่"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"ไม่"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi จะเปิดโดยอัตโนมัติ"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi เชื่อมต่ออินเทอร์เน็ตไม่ได้"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"แตะเพื่อดูตัวเลือก"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"เชื่อมต่อแล้ว"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"มีการเปลี่ยนแปลงการตั้งค่าฮอตสปอต"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"ย่านความถี่ฮอตสปอตมีการเปลี่ยนแปลง"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"อุปกรณ์นี้ไม่รองรับค่ากำหนดของคุณเฉพาะสำหรับ 5 GHz เท่านั้น และจะใช้ย่านความถี่ 5 GHz แทน เมื่อใช้ได้"</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"เชื่อมต่อการแก้ไขข้อบกพร่องผ่าน USB แล้ว"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"แตะเพื่อปิดการแก้ไขข้อบกพร่อง USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"เลือกเพื่อปิดใช้งานการแก้ไขข้อบกพร่อง USB"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"มีของเหลวหรือฝุ่นละอองในพอร์ต USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"พอร์ต USB ปิดใช้โดยอัตโนมัติ แตะเพื่อดูข้อมูลเพิ่มเติม"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"ใช้พอร์ต USB ได้อย่างปลอดภัย"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"โทรศัพท์ไม่ได้ตรวจจับของเหลวและฝุ่นละอองแล้ว"</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"ไม่มี <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"ใส่อุปกรณ์อีกครั้ง"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"กำลังย้าย <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-tl/strings.xml b/core/res/res/values-tl/strings.xml
index df403f7..6f70d3f 100644
--- a/core/res/res/values-tl/strings.xml
+++ b/core/res/res/values-tl/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Hindi Kailanman"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Wala kang pahintulot na buksan ang pahinang ito."</string>
<string name="text_copied" msgid="4985729524670131385">"Nakopya ang teksto sa clipboard."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Higit pa"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"I-edit gamit ang"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"I-edit gamit ang %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"I-edit"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Ibahagi gamit ang"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Ibahagi"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Ibahagi gamit ang %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Ibahagi"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Ipadala gamit ang"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"I-tap upang makita ang lahat ng network"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Kumonekta"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Lahat ng network"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"May available na Wi‑Fi network na iminumungkahi ng <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Gusto mo bang kumonekta sa mga network na iminumungkahi ng <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Oo"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Hindi"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Awtomatikong mag-o-on ang Wi‑Fi"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Walang access sa internet ang Wi-Fi"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"I-tap para sa mga opsyon"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Nakakonekta"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Mga pagbabago sa mga setting ng iyong hotspot"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Nagbago ang band ng iyong hotspot."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Hindi sinusuportahan ng device na ito ang kagustuhan mong gumamit lang ng 5GHz. Sa halip, gagamitin ng device na ito ang 5GHz na band kapag available."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Nakakonekta ang pag-debug ng USB"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"I-tap para i-off ang pag-debug ng USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Piliin upang i-disable ang debugging ng USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Liquid o debris sa USB port"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Awtomatikong na-disable ang USB port. Mag-tap para matuto pa."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Ligtas na gamitin ang USB port"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Hindi na nakaka-detect ang telepono ng liquid o debris."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Kinukuha ang ulat ng bug…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Gusto mo bang ibahagi ang ulat ng bug?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Ibinabahagi ang ulat ng bug…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"I-set up"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"I-eject"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"I-explore"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Nawawala ang <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Ikabit muli ang device"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Inililipat ang <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml
index bff115d..052c184 100644
--- a/core/res/res/values-tr/strings.xml
+++ b/core/res/res/values-tr/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Hiçbir zaman"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Bu sayfayı açma izniniz yok."</string>
<string name="text_copied" msgid="4985729524670131385">"Metin panoya kopyalandı."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Diğer"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menü+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Şununla düzenle:"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s ile düzenle"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Düzenle"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Şununla paylaş:"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Paylaş"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s ile paylaş"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Paylaş"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Göndermek için kullanılacak uygulama"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Tüm ağları görmek için dokunun"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Bağlan"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Tüm ağlar"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> tarafından önerilen bir kablosuz ağ kullanılabilir"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g> tarafından önerilen ağlara bağlanmak istiyor musunuz?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Evet"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Hayır"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Kablosuz özelliği otomatik olarak açılacak"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Kablosuz bağlantının internet erişimi yok"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Seçenekler için dokunun"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Bağlandı"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Hotspot ayarlarınız değişti"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Hotspot bandı değişti."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Bu cihaz yalnızca 5 GHz bandının kullanılmasına yönelik tercihinizi desteklemiyor. Bunun yerine, bu cihaz 5 GHz bandını mevcut olduğunda kullanacak."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB hata ayıklaması bağlandı"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB hata ayıklama işlevini kapatmak için dokunun"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB hata ayıklamasını devre dışı bırakmak için seçin."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB bağlantı noktasında sıvı veya toz var"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB bağlantı noktası otomatik olarak devre dışı bırakıldı. Daha fazla bilgi için dokunun."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB bağlantı noktası güvenli bir şekilde kullanılabilir"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefon artık sıvıları veya tozları algılamıyor."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Hata raporu alınıyor…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Hata raporu paylaşılsın mı?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Hata raporu paylaşılıyor..."</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Kur"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Çıkar"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Keşfet"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> bulunamıyor"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Cihazı tekrar takın"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> taşınıyor"</string>
diff --git a/core/res/res/values-uk/strings.xml b/core/res/res/values-uk/strings.xml
index b534466..12ca903 100644
--- a/core/res/res/values-uk/strings.xml
+++ b/core/res/res/values-uk/strings.xml
@@ -953,6 +953,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Ніколи"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"У вас немає дозволу на відкривання цієї сторінки."</string>
<string name="text_copied" msgid="4985729524670131385">"Текст скопійов. в буф. обм."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Більше"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Меню+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1172,7 +1174,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Редагувати за допомогою"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Редагувати за допомогою %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Редагувати"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Надіслати через"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Поділитися"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Надіслати через %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Поділитися"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Надіслати через додаток"</string>
@@ -1289,10 +1291,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Торкніться, щоб побачити всі мережі"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Під’єднатися"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Усі мережі"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Доступна мережа Wi‑Fi, запропонована додатком <xliff:g id="NAME">%s</xliff:g>"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Підключатися до мереж, які пропонує <xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Так"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Ні"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi-Fi вмикатиметься автоматично"</string>
@@ -1306,8 +1306,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Мережа Wi-Fi не має доступу до Інтернету"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Торкніться, щоб відкрити опції"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Підключено"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Зміни в налаштуваннях точки доступу"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Діапазон точки доступу змінено."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"На цьому пристрої не підтримується налаштування лише 5 ГГц. Замість цього буде використовуватися діапазон 5 ГГц, якщо доступно."</string>
@@ -1392,14 +1391,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Налагодження USB завершено"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Торкніться, щоб вимкнути налагоджувач USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Виберіть, щоб вимкнути налагодження за USB"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Рідина або сміття в USB-порту"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-порт автоматично вимкнено. Торкніться, щоб дізнатися більше."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Можна безпечно використовувати USB-порт"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Телефон уже не виявляє рідини або сміття."</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>
@@ -1438,6 +1433,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"Немає пристрою <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Вставте пристрій знову"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Переміщення додатка <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-ur/strings.xml b/core/res/res/values-ur/strings.xml
index 425c936..d7362ba 100644
--- a/core/res/res/values-ur/strings.xml
+++ b/core/res/res/values-ur/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"کبھی نہیں"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"آپ کے پاس یہ صفحہ کھولنے کی اجازت نہیں ہے۔"</string>
<string name="text_copied" msgid="4985729524670131385">"متن کو کلپ بورڈ پر کاپی کیا گیا۔"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"مزید"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"مینو+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,8 @@
<string name="whichEditApplication" msgid="144727838241402655">"اس کے ساتھ ترمیم کریں"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"%1$s کے ساتھ ترمیم کریں"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"ترمیم کریں"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"اس کے ساتھ اشتراک کریں"</string>
+ <!-- no translation found for whichSendApplication (5803792421724377602) -->
+ <skip />
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"%1$s کے ساتھ اشتراک کریں"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"اشتراک کریں"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"بھیجیں بذریعہ"</string>
@@ -1245,10 +1248,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"تمام نیٹ ورکس دیکھنے کیلئے تھپتھپائيں"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"منسلک کریں"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"سبھی نیٹ ورکس"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> کا تجویز کردہ ایک Wi‑Fi نیٹ ورک دستیاب ہے"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"کیا آپ <xliff:g id="NAME">%s</xliff:g> کے تجویز کردہ نیٹ ورکس سے منسلک ہونا چاہتے ہیں؟"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"ہاں"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"نہیں"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi از خود آن ہو جائے گا"</string>
@@ -1262,8 +1263,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi کو انٹرنیٹ تک رسائی نہیں ہے"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"اختیارات کیلئے تھپتھپائیں"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"منسلک ہے"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"اپنے ہاٹ اسپاٹ کی ترتیبات میں تبدیلیاں"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"آپ کا ہاٹ اسپات بینڈ تبدیل ہو گیا۔"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"یہ آلہ صرف 5GHz کے لئے آپ کی ترجیح کا تعاون نہیں کرے گا۔ بلکہ 5GHz بینڈ کے دستیاب ہونے پر اس کا استعمال کرے گا۔"</string>
@@ -1349,14 +1349,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB ڈیبگ کرنا مربوط ہو گیا"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB ڈیبگنگ آف کرنے کے لیے تھپتھپائیں"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB ڈیبگ کرنے کو غیر فعال کرنے کیلئے منتخب کریں۔"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB پورٹ میں سیال یا دھول ہے"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB پورٹ خودکار طور پر غیر فعال کر دیا گیا۔ مزید جاننے کیلئے تھپتھپائیں۔"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB پورٹ کا استعمال محفوظ ہے"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"فون مزید سیال یا دھول کا پتہ نہیں لگاتا۔"</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>
@@ -1395,6 +1391,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> غائب ہے"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"آلہ دوبارہ داخل کریں"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> کو منتقل کیا جا رہا ہے"</string>
diff --git a/core/res/res/values-uz/strings.xml b/core/res/res/values-uz/strings.xml
index 21bc853..b5cc9cc 100644
--- a/core/res/res/values-uz/strings.xml
+++ b/core/res/res/values-uz/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Hech qachon"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Sizda ushbu sahifani ochish uchun vakolat yo‘q."</string>
<string name="text_copied" msgid="4985729524670131385">"Matn klipboardga nusxa olindi."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Yana"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Menyu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Tahrirlash…"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"“%1$s” yordamida tahrirlash"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Tahrirlash"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Ulashish"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Ulashish"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"“%1$s” orqali ulashish"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Ulashish"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Ilovani tanlang"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Barcha tarmoqlarni ko‘rish uchun bosing"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Ulanish"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Barcha tarmoqlar"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g> topgan Wi‑Fi tarmoq mavjud"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"<xliff:g id="NAME">%s</xliff:g> topgan tarmoqqa ulanishni xohlaysizmi?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Ha"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Yoʻq"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi avtomatik ravishda yoqiladi"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi tarmoqda internet aloqasi yo‘q"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Variantlarni ko‘rsatish uchun bosing"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Ulandi"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Hotspot sozlamalari o‘zgartirildi"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Hotspot chastotasi o‘zgartirildi."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Qurilma faqat 5 GGs chastotada ishlay olmaydi. Bu chastotadan imkoniyatga qarab foydalaniladi."</string>
@@ -1349,14 +1348,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"USB orqali nosozliklarni tuzatish"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"USB orqali nosozliklarni aniqlashni faolsizlantirish uchun bosing"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"USB orqali nosozliklarni tuzatishni o‘chirib qo‘yish uchun bosing."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB portda suyuqlik yoki parcha bor"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB port avtomatik tarzda faolsizlashtirildi. Batafsil axborot olish uchun bosing."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB portdan foydalanish xavfsiz"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Telefon endi suyuqlik yoki turli parchalarni aniqlay olmaydi."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Xatoliklar hisoboti olinmoqda…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Xatoliklar hisoboti yuborilsinmi?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Xatoliklar hisoboti yuborilmoqda…"</string>
@@ -1395,6 +1390,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Sozlash"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Chiqarish"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"O‘rganish"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> topilmadi"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Qurilmani yana ulang"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"<xliff:g id="NAME">%s</xliff:g> ko‘chirib o‘tkazilmoqda"</string>
diff --git a/core/res/res/values-vi/strings.xml b/core/res/res/values-vi/strings.xml
index dc2a788..91d0794 100644
--- a/core/res/res/values-vi/strings.xml
+++ b/core/res/res/values-vi/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Chưa bao giờ"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Bạn không được phép mở trang này."</string>
<string name="text_copied" msgid="4985729524670131385">"Đã sao chép văn bản vào khay nhớ tạm thời."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Thêm"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Trình đơn+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Chỉnh sửa bằng"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Chỉnh sửa bằng %1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Chỉnh sửa"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Chia sẻ với"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Chia sẻ"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Chia sẻ với %1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Chia sẻ"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Gửi bằng"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Nhấn để xem tất cả các mạng"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Kết nối"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Tất cả các mạng"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Hiện có thể kết nối với mạng Wi‑Fi do <xliff:g id="NAME">%s</xliff:g> đề xuất"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Bạn có muốn kết nối với các mạng do <xliff:g id="NAME">%s</xliff:g> đề xuất không?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Có"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Không"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi-Fi sẽ tự động bật"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi không có quyền truy cập Internet"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Nhấn để biết tùy chọn"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Đã kết nối"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Những thay đổi trong mục cài đặt điểm phát sóng của bạn"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Bằng tần của điểm phát sóng đã thay đổi."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Thiết bị này không hỗ trợ tùy chọn chỉ sử dụng băng tần 5 GHz. Thay vào đó, thiết bị này sẽ sử dụng băng tần 5 GHz khi có thể."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Đã kết nối gỡ lỗi USB"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Nhấn để tắt tính năng gỡ lỗi USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Chọn để vô hiệu hóa gỡ lỗi USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Có chất lỏng hoặc mảnh vỡ trong cổng USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Cổng USB đã tự động tắt. Nhấn để tìm hiểu thêm."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Có thể sử dụng cổng USB một cách an toàn"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Điện thoại không còn phát hiện chất lỏng hay mảnh vỡ nữa."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Đang thu thập báo cáo lỗi…"</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Chia sẻ báo cáo lỗi?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Đang chia sẻ báo cáo lỗi…"</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Thiết lập"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Tháo"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Khám phá"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> bị thiếu"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Hãy lắp lại thiết bị"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Di chuyển <xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml
index 4fc4bff..668bb44 100644
--- a/core/res/res/values-zh-rCN/strings.xml
+++ b/core/res/res/values-zh-rCN/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"永不"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"您无权打开此网页。"</string>
<string name="text_copied" msgid="4985729524670131385">"文本已复制到剪贴板。"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"更多"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"MENU+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"编辑方式"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"使用%1$s编辑"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"编辑"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"分享方式"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"分享"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"使用%1$s分享"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"分享"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"通过以下应用发送"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"点按即可查看所有网络"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"连接"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"所有网络"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g>建议的 WLAN 网络可以使用"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"要连接到<xliff:g id="NAME">%s</xliff:g>建议的网络吗？"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"是"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"否"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"WLAN 将自动开启"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"此 WLAN 网络无法访问互联网"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"点按即可查看相关选项"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"已连接"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"您的热点设置已变更"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"您的热点频段已变更。"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"此设备不支持您的偏好设置（仅限 5GHz），而且会在 5GHz 频段可用时使用该频段。"</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"已连接到 USB 调试"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"点按即可关闭 USB 调试"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"选择即可停用 USB 调试功能。"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB 端口中有液体或碎屑"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB 端口已自动停用。点按即可了解详情。"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"现在可安全使用 USB 端口"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"手机不再检测到液体或碎屑。"</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"缺少<xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"请再次插入设备"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"正在移动<xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-zh-rHK/strings.xml b/core/res/res/values-zh-rHK/strings.xml
index 0db520d..d12f346 100644
--- a/core/res/res/values-zh-rHK/strings.xml
+++ b/core/res/res/values-zh-rHK/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"永遠不要"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"您沒有開啟這個頁面的權限。"</string>
<string name="text_copied" msgid="4985729524670131385">"文字已複製到剪貼簿。"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"更多"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"選單鍵 +"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta +"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"使用以下選擇器編輯："</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"使用 %1$s 編輯"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"編輯"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"分享對象"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"分享"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"與 %1$s 分享"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"分享"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"使用以下應用程式傳送："</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"輕按即可查看所有網絡"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"連線"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"所有網絡"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"<xliff:g id="NAME">%s</xliff:g>建議的 Wi‑Fi 網絡現已可用"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"要連線至「<xliff:g id="NAME">%s</xliff:g>」建議的網絡嗎？"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"是"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"否"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi-Fi 將會自動開啟"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi 並未連接互聯網"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"輕按即可查看選項"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"已連接"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"您的熱點設定變更"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"您的熱點頻段已變更。"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"此裝置不支援只限 5 GHz 的偏好設定，但會在 5 GHz 頻段可用時採用。"</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"已連接 USB 偵錯工具"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"輕按即可關閉 USB 偵錯功能"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"選取即可停用 USB 偵錯。"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB 連接埠中有液體或碎片"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB 連接埠已自動停用。輕按即可瞭解詳情。"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"USB 連接埠可安全使用"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"手機不再偵測到液體或碎片。"</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"找不到<xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"請再插入裝置"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"正在轉移<xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml
index ea4f148..0e0d90b 100644
--- a/core/res/res/values-zh-rTW/strings.xml
+++ b/core/res/res/values-zh-rTW/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"永不"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"你沒有開啟這個頁面的權限。"</string>
<string name="text_copied" msgid="4985729524670131385">"文字已複製到剪貼簿。"</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"更多"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"[Menu] +"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta +"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"選擇編輯工具"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"使用 %1$s 編輯"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"編輯"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"選擇分享工具"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"分享"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"透過 %1$s 分享"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"分享"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"透過以下應用程式傳送："</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"輕觸即可查看所有網路"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"連線"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"所有網路"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"「<xliff:g id="NAME">%s</xliff:g>」建議的 Wi‑Fi 網路可以使用"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"確定要連上「<xliff:g id="NAME">%s</xliff:g>」建議的網路嗎？"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"是"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"否"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"Wi‑Fi 將自動開啟"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"Wi-Fi 沒有網際網路連線"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"輕觸即可查看選項"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"已連線"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"無線基地台設定變更"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"你的無線基地台頻帶已變更。"</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"這個裝置不支援你的偏好設定 (僅限 5GHz)，而是會在 5GHz 可用時使用該頻帶。"</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"已連接 USB 偵錯工具"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"輕觸即可關閉 USB 偵錯功能"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"選取這個選項以停用 USB 偵錯功能。"</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"USB 連接埠中有液體或灰塵"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"系統已自動停用 USB 連接埠。輕觸即可瞭解詳情。"</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"現在可安全使用 USB 連接埠"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"手機目前無法偵測液體或灰塵。"</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>
@@ -1394,6 +1389,8 @@
<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>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"找不到 <xliff:g id="NAME">%s</xliff:g>"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"請再次插入裝置"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"正在移動「<xliff:g id="NAME">%s</xliff:g>」"</string>
diff --git a/core/res/res/values-zu/strings.xml b/core/res/res/values-zu/strings.xml
index 48f56f8..06ecc60 100644
--- a/core/res/res/values-zu/strings.xml
+++ b/core/res/res/values-zu/strings.xml
@@ -947,6 +947,8 @@
<string name="save_password_never" msgid="8274330296785855105">"Akusoze"</string>
<string name="open_permission_deny" msgid="7374036708316629800">"Awunayo imvume yokuvula leli khasi."</string>
<string name="text_copied" msgid="4985729524670131385">"Umbhalo ukopishwe ebhodini lokunamathisela."</string>
+ <!-- no translation found for copied (8564151838171791598) -->
+ <skip />
<string name="more_item_label" msgid="4650918923083320495">"Okuningi"</string>
<string name="prepend_shortcut_label" msgid="2572214461676015642">"Imenyu+"</string>
<string name="menu_meta_shortcut_label" msgid="4647153495550313570">"Meta+"</string>
@@ -1132,7 +1134,7 @@
<string name="whichEditApplication" msgid="144727838241402655">"Hlela nge-"</string>
<string name="whichEditApplicationNamed" msgid="1775815530156447790">"Hlela nge-%1$s"</string>
<string name="whichEditApplicationLabel" msgid="7183524181625290300">"Hlela"</string>
- <string name="whichSendApplication" msgid="6902512414057341668">"Yabelana no-"</string>
+ <string name="whichSendApplication" msgid="5803792421724377602">"Yabelana"</string>
<string name="whichSendApplicationNamed" msgid="2799370240005424391">"Yabelana no-%1$s"</string>
<string name="whichSendApplicationLabel" msgid="4579076294675975354">"Yabelana"</string>
<string name="whichSendToApplication" msgid="8272422260066642057">"Thumela usebenzisa"</string>
@@ -1245,10 +1247,8 @@
<string name="wifi_available_content_failed_to_connect" msgid="3377406637062802645">"Thepha ukuze ubone onke amanethiwekhi"</string>
<string name="wifi_available_action_connect" msgid="2635699628459488788">"Xhuma"</string>
<string name="wifi_available_action_all_networks" msgid="4368435796357931006">"Onke amanethiwekhi"</string>
- <!-- no translation found for wifi_suggestion_title (8951405130379148709) -->
- <skip />
- <!-- no translation found for wifi_suggestion_content (2658317015552324848) -->
- <skip />
+ <string name="wifi_suggestion_title" msgid="8951405130379148709">"Inethiwekhi ye-Wi-Fi ephakanyiswe u-<xliff:g id="NAME">%s</xliff:g> iyatholakala"</string>
+ <string name="wifi_suggestion_content" msgid="2658317015552324848">"Uyafuna ukuxhumeka kumanethiwekhi aphakanyiswe u-<xliff:g id="NAME">%s</xliff:g>?"</string>
<string name="wifi_suggestion_action_allow_app" msgid="3689946344485394085">"Yebo"</string>
<string name="wifi_suggestion_action_disallow_app" msgid="7977918905605931385">"Cha"</string>
<string name="wifi_wakeup_onboarding_title" msgid="228772560195634292">"I-Wi-Fi izovuleka ngokuzenzakalela"</string>
@@ -1262,8 +1262,7 @@
<skip />
<string name="wifi_no_internet" msgid="8938267198124654938">"I-Wi-Fi ayinakho ukufinyelela kwe-inthanethi"</string>
<string name="wifi_no_internet_detailed" msgid="8083079241212301741">"Thepha ukuze uthole izinketho"</string>
- <!-- no translation found for captive_portal_logged_in_detailed (8489345381637456021) -->
- <skip />
+ <string name="captive_portal_logged_in_detailed" msgid="8489345381637456021">"Kuxhunyiwe"</string>
<string name="wifi_softap_config_change" msgid="8475911871165857607">"Ushintsho kuzilungiselelo zakho ze-hotspot"</string>
<string name="wifi_softap_config_change_summary" msgid="7601233252456548891">"Ibhendi yakho ye-hotspot ishintshile."</string>
<string name="wifi_softap_config_change_detailed" msgid="8022936822860678033">"Le divayisi ayisekeli okuncamelayo kwe-5GHz kuphela. Kunalokho, le divayisi izosebenzisa ibhendi ye-5GHz uma itholakala."</string>
@@ -1348,14 +1347,10 @@
<string name="adb_active_notification_title" msgid="6729044778949189918">"Ukulungisa iphutha le-USB kuxhunyiwe"</string>
<string name="adb_active_notification_message" msgid="7463062450474107752">"Thepha ukuze uvale ukulungisa amaphutha kwe-USB"</string>
<string name="adb_active_notification_message" product="tv" msgid="8470296818270110396">"Khetha ukuvimbela ukulungisa iphutha le-USB."</string>
- <!-- no translation found for usb_contaminant_detected_title (7136400633704058349) -->
- <skip />
- <!-- no translation found for usb_contaminant_detected_message (832337061059487250) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_title (4202417484434906086) -->
- <skip />
- <!-- no translation found for usb_contaminant_not_detected_message (2415791798244545292) -->
- <skip />
+ <string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Uketshezi noma ama-debris kumbobo ye-USB"</string>
+ <string name="usb_contaminant_detected_message" msgid="832337061059487250">"Imbobo ye-USB inqanyulwa ngokuzenzakalela. Thepha ukuze ufunde kabanzi."</string>
+ <string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Kuphephile ukusebenzisa imbobo ye-USB"</string>
+ <string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Ifoni ayisatholi uketshezi noma ama-debris."</string>
<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Ithatha umbiko wesiphazamisi..."</string>
<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Yabelana ngombiko wesiphazamisi?"</string>
<string name="sharing_remote_bugreport_notification_title" msgid="7572089031496651372">"Yabelana ngombiko wesiphazamisi..."</string>
@@ -1394,6 +1389,8 @@
<string name="ext_media_init_action" msgid="7952885510091978278">"Setha"</string>
<string name="ext_media_unmount_action" msgid="1121883233103278199">"Khipha"</string>
<string name="ext_media_browse_action" msgid="8322172381028546087">"Hlola"</string>
+ <!-- no translation found for ext_media_seamless_action (5356508985817068711) -->
+ <skip />
<string name="ext_media_missing_title" msgid="620980315821543904">"<xliff:g id="NAME">%s</xliff:g> okulahlekile"</string>
<string name="ext_media_missing_message" msgid="4012389235250987930">"Faka idivayisi futhi"</string>
<string name="ext_media_move_specific_title" msgid="1471100343872375842">"Ihambisa i-<xliff:g id="NAME">%s</xliff:g>"</string>
diff --git a/core/res/res/values/attrs_manifest.xml b/core/res/res/values/attrs_manifest.xml
index 7219d5c..759fc12 100644
--- a/core/res/res/values/attrs_manifest.xml
+++ b/core/res/res/values/attrs_manifest.xml
@@ -280,6 +280,9 @@
<!-- Additional flag from base permission type: this permission designates the app
that will approve the sharing of incident reports. -->
<flag name="incidentReportApprover" value="0x100000" />
+ <!-- Additional flag from base permission type: this permission can be automatically
+ granted to the system app predictor -->
+ <flag name="appPredictor" value="0x200000" />
</attr>
<!-- Flags indicating more context for a permission group. -->
diff --git a/core/res/res/values/colors_car.xml b/core/res/res/values/colors_car.xml
index f4aeff7..82caa26 100644
--- a/core/res/res/values/colors_car.xml
+++ b/core/res/res/values/colors_car.xml
@@ -137,8 +137,8 @@
<color name="car_toast_background">#E6282a2d</color>
<!-- Misc colors -->
- <color name="car_highlight_light">@color/car_teal_200</color>
- <color name="car_highlight_dark">@color/car_teal_200</color>
+ <color name="car_highlight_light">#ff66b5ff</color>
+ <color name="car_highlight_dark">#ff60a8f0</color>
<color name="car_highlight">@color/car_highlight_dark</color>
<color name="car_accent_light">@color/car_highlight_light</color>
<color name="car_accent_dark">@color/car_highlight_dark</color>
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml
index df20f85..ef59d13 100644
--- a/core/res/res/values/config.xml
+++ b/core/res/res/values/config.xml
@@ -1933,14 +1933,6 @@
the platform will search for an SMS app and use that (if there is one)-->
<string name="default_sms_application" translatable="false">com.android.messaging</string>
- <!-- Default web browser. This is the package name of the application that will
- be the default browser when the device first boots. Afterwards the user
- can select whatever browser app they wish to use as the default.
-
- If this string is empty or the specified package does not exist, then
- the behavior will be as though no app was named as an explicit default. -->
- <string name="default_browser" translatable="false"></string>
-
<!-- Default role holders. This will be an array of roles and package names of their default
holders, with each item in the format of "ROLE_NAME: PACKAGE_NAME_1, PACKAGE_NAME_2". -->
<string-array name="config_defaultRoleHolders" translatable="false">
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index b5266e2..e7d8102 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2937,6 +2937,7 @@
<!-- @hide @SystemApi -->
<public name="inheritShowWhenLocked" />
<public name="zygotePreloadName" />
+ <public name="useEmbeddedDex" />
</public-group>
<public-group type="drawable" first-id="0x010800b4">
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index ca8fa82..a06222c 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1023,7 +1023,6 @@
<java-symbol type="string" name="sipAddressTypeOther" />
<java-symbol type="string" name="sipAddressTypeWork" />
<java-symbol type="string" name="default_sms_application" />
- <java-symbol type="string" name="default_browser" />
<java-symbol type="string" name="sms_control_message" />
<java-symbol type="string" name="sms_control_title" />
<java-symbol type="string" name="sms_control_no" />
@@ -1358,6 +1357,9 @@
<java-symbol type="drawable" name="ic_text_dot" />
<java-symbol type="drawable" name="ic_print" />
<java-symbol type="drawable" name="ic_print_error" />
+ <java-symbol type="drawable" name="ic_lock_24dp" />
+ <java-symbol type="drawable" name="ic_lock_open_24dp" />
+ <java-symbol type="drawable" name="ic_auth_error" />
<java-symbol type="drawable" name="jog_dial_arrow_long_left_green" />
<java-symbol type="drawable" name="jog_dial_arrow_long_right_red" />
<java-symbol type="drawable" name="jog_dial_arrow_short_left_and_right" />
@@ -2219,6 +2221,10 @@
<java-symbol type="anim" name="lock_screen_wallpaper_exit" />
<java-symbol type="anim" name="launch_task_behind_source" />
<java-symbol type="anim" name="wallpaper_open_exit" />
+ <java-symbol type="anim" name="lock_to_error" />
+ <java-symbol type="anim" name="lock_lock" />
+ <java-symbol type="anim" name="lock_unlock" />
+ <java-symbol type="anim" name="lock_in" />
<java-symbol type="bool" name="config_alwaysUseCdmaRssi" />
<java-symbol type="dimen" name="status_bar_icon_size" />
diff --git a/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java b/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java
index bdf3aa2..a5ea441 100644
--- a/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java
+++ b/core/tests/coretests/src/android/app/servertransaction/TransactionParcelTests.java
@@ -465,12 +465,12 @@
@Override
public void scheduleCreateBackupAgent(ApplicationInfo applicationInfo,
- CompatibilityInfo compatibilityInfo, int i) throws RemoteException {
+ CompatibilityInfo compatibilityInfo, int i, int userId) throws RemoteException {
}
@Override
public void scheduleDestroyBackupAgent(ApplicationInfo applicationInfo,
- CompatibilityInfo compatibilityInfo) throws RemoteException {
+ CompatibilityInfo compatibilityInfo, int userId) throws RemoteException {
}
@Override
diff --git a/core/tests/coretests/src/android/os/BinderWorkSourceService.java b/core/tests/coretests/src/android/os/BinderWorkSourceService.java
index 3bca5fb..46bd67d 100644
--- a/core/tests/coretests/src/android/os/BinderWorkSourceService.java
+++ b/core/tests/coretests/src/android/os/BinderWorkSourceService.java
@@ -38,11 +38,11 @@
}
public void setWorkSourceProvider(int uid) {
- Binder.setWorkSourceProvider(() -> uid);
+ Binder.setWorkSourceProvider((x) -> uid);
}
public void clearWorkSourceProvider() {
- Binder.setWorkSourceProvider(Binder::getCallingUid);
+ Binder.setWorkSourceProvider((x) -> Binder.getCallingUid());
}
};
diff --git a/core/tests/coretests/src/android/os/BinderWorkSourceTest.java b/core/tests/coretests/src/android/os/BinderWorkSourceTest.java
index e16a3db..b14c88f 100644
--- a/core/tests/coretests/src/android/os/BinderWorkSourceTest.java
+++ b/core/tests/coretests/src/android/os/BinderWorkSourceTest.java
@@ -27,6 +27,7 @@
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.LargeTest;
+import androidx.test.filters.Suppress;
import androidx.test.runner.AndroidJUnit4;
import org.junit.After;
@@ -97,6 +98,8 @@
public void tearDown() throws Exception {
sContext.unbindService(mConnection);
sContext.unbindService(mNestedConnection);
+ Binder.setProxyTransactListener(null);
+ ThreadLocalWorkSource.clear();
}
@Test
@@ -124,6 +127,28 @@
}
@Test
+ public void setWorkSource_propagatedFromBinderProxyListener() throws Exception {
+ Binder.setProxyTransactListener(new Binder.PropagateWorkSourceTransactListener());
+ Binder.clearCallingWorkSource();
+ ThreadLocalWorkSource.setUid(UID);
+ assertEquals(UID, mService.getIncomingWorkSourceUid());
+ }
+
+ @Test
+ public void threadWorkSourceNotPropagated() throws Exception {
+ Binder.clearCallingWorkSource();
+ ThreadLocalWorkSource.setUid(UID);
+ assertEquals(UID_NONE, mService.getIncomingWorkSourceUid());
+ }
+
+ @Test
+ public void setWorkSource_propagatedFromBinderProxyListener_unset() throws Exception {
+ Binder.setProxyTransactListener(new Binder.PropagateWorkSourceTransactListener());
+ Binder.clearCallingWorkSource();
+ assertEquals(UID_NONE, mService.getIncomingWorkSourceUid());
+ }
+
+ @Test
public void restoreWorkSource() throws Exception {
Binder.setCallingWorkSourceUid(UID);
long token = Binder.clearCallingWorkSource();
@@ -158,18 +183,6 @@
}
@Test
- public void nestedSetWorkSouceNotPropagated() throws Exception {
- Binder.setCallingWorkSourceUid(UID);
-
- int[] workSources = mNestedService.nestedCall();
- assertEquals(UID, workSources[0]);
- // No UID propagated.
- assertEquals(UID_NONE, workSources[1]);
- // Initial work source restored.
- assertEquals(UID, Binder.getCallingWorkSourceUid());
- }
-
- @Test
public void workSourceProvider_default() throws Exception {
Binder.clearCallingWorkSource();
mService.clearWorkSourceProvider();
@@ -177,6 +190,7 @@
}
@Test
+ @Suppress // WorkSourceProvider is currently invoked only at the end of the binder call.
public void workSourceProvider_customProvider() throws Exception {
Binder.clearCallingWorkSource();
mService.clearWorkSourceProvider();
@@ -188,4 +202,16 @@
mService.clearWorkSourceProvider();
}
}
+
+ @Test
+ public void nestedSetWorkSouceNotPropagated() throws Exception {
+ Binder.setCallingWorkSourceUid(UID);
+
+ int[] workSources = mNestedService.nestedCall();
+ assertEquals(UID, workSources[0]);
+ // No UID propagated.
+ assertEquals(UID_NONE, workSources[1]);
+ // Initial work source restored.
+ assertEquals(UID, Binder.getCallingWorkSourceUid());
+ }
}
diff --git a/core/tests/coretests/src/android/os/ParcelTest.java b/core/tests/coretests/src/android/os/ParcelTest.java
new file mode 100644
index 0000000..0eba2ed
--- /dev/null
+++ b/core/tests/coretests/src/android/os/ParcelTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2019 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.os;
+
+import static org.junit.Assert.assertEquals;
+
+import android.platform.test.annotations.Presubmit;
+
+import androidx.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+@Presubmit
+@RunWith(AndroidJUnit4.class)
+public class ParcelTest {
+ private static final int WORK_SOURCE_1 = 1000;
+ private static final int WORK_SOURCE_2 = 1002;
+ private static final String INTERFACE_TOKEN_1 = "IBinder interface token";
+ private static final String INTERFACE_TOKEN_2 = "Another IBinder interface token";
+
+ @Test
+ public void testCallingWorkSourceUidAfterWrite() {
+ Parcel p = Parcel.obtain();
+ // Method does not throw if replaceCallingWorkSourceUid is called before requests headers
+ // are added.
+ assertEquals(false, p.replaceCallingWorkSourceUid(WORK_SOURCE_1));
+ assertEquals(Binder.UNSET_WORKSOURCE, p.readCallingWorkSourceUid());
+
+ // WorkSource can be updated.
+ p.writeInterfaceToken(INTERFACE_TOKEN_1);
+ assertEquals(true, p.replaceCallingWorkSourceUid(WORK_SOURCE_1));
+ assertEquals(WORK_SOURCE_1, p.readCallingWorkSourceUid());
+
+ // WorkSource can be updated to unset value.
+ assertEquals(true, p.replaceCallingWorkSourceUid(Binder.UNSET_WORKSOURCE));
+ assertEquals(Binder.UNSET_WORKSOURCE, p.readCallingWorkSourceUid());
+
+ p.recycle();
+ }
+
+ @Test
+ public void testCallingWorkSourceUidAfterEnforce() {
+ Parcel p = Parcel.obtain();
+ // Write headers manually so that we do not invoke #writeInterfaceToken.
+ p.writeInt(1); // strict mode header
+ p.writeInt(WORK_SOURCE_1); // worksource header.
+ p.writeString(INTERFACE_TOKEN_1); // interface token.
+ p.setDataPosition(0);
+
+ p.enforceInterface(INTERFACE_TOKEN_1);
+ assertEquals(WORK_SOURCE_1, p.readCallingWorkSourceUid());
+
+ // WorkSource can be updated.
+ assertEquals(true, p.replaceCallingWorkSourceUid(WORK_SOURCE_1));
+ assertEquals(WORK_SOURCE_1, p.readCallingWorkSourceUid());
+
+ p.recycle();
+ }
+
+ @Test
+ public void testParcelWithMultipleHeaders() {
+ Parcel p = Parcel.obtain();
+ Binder.setCallingWorkSourceUid(WORK_SOURCE_1);
+ p.writeInterfaceToken(INTERFACE_TOKEN_1);
+ Binder.setCallingWorkSourceUid(WORK_SOURCE_2);
+ p.writeInterfaceToken(INTERFACE_TOKEN_2);
+ p.setDataPosition(0);
+
+ // WorkSource is from the first header.
+ p.enforceInterface(INTERFACE_TOKEN_1);
+ assertEquals(WORK_SOURCE_1, p.readCallingWorkSourceUid());
+ p.enforceInterface(INTERFACE_TOKEN_2);
+ assertEquals(WORK_SOURCE_1, p.readCallingWorkSourceUid());
+
+ p.recycle();
+ }
+}
diff --git a/core/tests/coretests/src/android/provider/SettingsBackupTest.java b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
index f420033..2cb925a 100644
--- a/core/tests/coretests/src/android/provider/SettingsBackupTest.java
+++ b/core/tests/coretests/src/android/provider/SettingsBackupTest.java
@@ -297,6 +297,7 @@
Settings.Global.INTENT_FIREWALL_UPDATE_METADATA_URL,
Settings.Global.JOB_SCHEDULER_CONSTANTS,
Settings.Global.KEEP_PROFILE_IN_BACKGROUND,
+ Settings.Global.KERNEL_CPU_THREAD_READER,
Settings.Global.LANG_ID_UPDATE_CONTENT_URL,
Settings.Global.LANG_ID_UPDATE_METADATA_URL,
Settings.Global.LAST_ACTIVE_USER_ID,
diff --git a/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderEndToEndTest.java b/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderEndToEndTest.java
index c03d1f3..3ddd8aa 100644
--- a/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderEndToEndTest.java
+++ b/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderEndToEndTest.java
@@ -20,6 +20,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import android.os.Process;
import android.os.SystemClock;
import android.support.test.filters.LargeTest;
import android.support.test.runner.AndroidJUnit4;
@@ -121,7 +122,8 @@
workFinishedLatch.await();
// Get thread data from KernelCpuThreadReader
- final KernelCpuThreadReader kernelCpuThreadReader = KernelCpuThreadReader.create();
+ final KernelCpuThreadReader kernelCpuThreadReader =
+ KernelCpuThreadReader.create(8, uid -> uid == Process.myUid());
assertNotNull(kernelCpuThreadReader);
final ProcessCpuUsage currentProcessCpuUsage =
kernelCpuThreadReader.getCurrentProcessCpuUsage();
diff --git a/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java b/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java
index 0c56b8a..b9744f5 100644
--- a/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java
+++ b/core/tests/coretests/src/com/android/internal/os/KernelCpuThreadReaderTest.java
@@ -18,8 +18,10 @@
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
+import static org.testng.Assert.assertThrows;
import android.content.Context;
import android.os.FileUtils;
@@ -99,6 +101,8 @@
THREAD_NAMES, THREAD_CPU_FREQUENCIES, THREAD_CPU_TIMES);
final KernelCpuThreadReader kernelCpuThreadReader = new KernelCpuThreadReader(
+ 8,
+ uid -> 1000 <= uid && uid < 2000,
mProcDirectory.toPath(),
mProcDirectory.toPath().resolve("self/task/" + THREAD_IDS[0] + "/time_in_state"),
processUtils);
@@ -138,11 +142,13 @@
new int[][]{{uid}});
}
final KernelCpuThreadReader kernelCpuThreadReader = new KernelCpuThreadReader(
+ 8,
+ uidPredicate,
mProcDirectory.toPath(),
mProcDirectory.toPath().resolve(uids[0] + "/task/" + uids[0] + "/time_in_state"),
processUtils);
ArrayList<KernelCpuThreadReader.ProcessCpuUsage> processCpuUsageByUids =
- kernelCpuThreadReader.getProcessCpuUsageByUids(uidPredicate);
+ kernelCpuThreadReader.getProcessCpuUsageByUids();
processCpuUsageByUids.sort(Comparator.comparing(usage -> usage.processId));
assertEquals(expectedUids.length, processCpuUsageByUids.size());
@@ -350,4 +356,106 @@
4, KernelCpuThreadReader.FrequencyBucketCreator.getBigFrequenciesStartIndex(
new long[]{1, 2, 3, 4}));
}
+
+ @Test
+ public void testUidPredicate_singleRange() {
+ KernelCpuThreadReaderSettingsObserver.UidPredicate uidPredicate =
+ KernelCpuThreadReaderSettingsObserver.UidPredicate.fromString("1000-1999");
+ assertTrue(uidPredicate.test(1000));
+ assertTrue(uidPredicate.test(1050));
+ assertTrue(uidPredicate.test(1999));
+ assertFalse(uidPredicate.test(2000));
+ assertFalse(uidPredicate.test(0));
+ assertFalse(uidPredicate.test(10000));
+ assertFalse(uidPredicate.test(-100));
+ }
+
+ @Test
+ public void testUidPredicate_singleUid() {
+ KernelCpuThreadReaderSettingsObserver.UidPredicate uidPredicate =
+ KernelCpuThreadReaderSettingsObserver.UidPredicate.fromString("1234-1234");
+ assertTrue(uidPredicate.test(1234));
+ assertFalse(uidPredicate.test(1235));
+ assertFalse(uidPredicate.test(1232));
+ assertFalse(uidPredicate.test(0));
+ assertFalse(uidPredicate.test(-1234));
+ }
+
+ @Test
+ public void testUidPredicate_uidAndRange() {
+ KernelCpuThreadReaderSettingsObserver.UidPredicate uidPredicate =
+ KernelCpuThreadReaderSettingsObserver.UidPredicate.fromString(
+ "1000-1000;1050-1060");
+ assertTrue(uidPredicate.test(1000));
+ assertTrue(uidPredicate.test(1050));
+ assertTrue(uidPredicate.test(1054));
+ assertTrue(uidPredicate.test(1060));
+ assertFalse(uidPredicate.test(1040));
+ assertFalse(uidPredicate.test(1001));
+ assertFalse(uidPredicate.test(0));
+ assertFalse(uidPredicate.test(-1000));
+ }
+
+ @Test
+ public void testUidPredicate_multiple() {
+ KernelCpuThreadReaderSettingsObserver.UidPredicate uidPredicate =
+ KernelCpuThreadReaderSettingsObserver.UidPredicate.fromString(
+ "1000-1000;1050-1060;1001-1001;2000-3000");
+ assertTrue(uidPredicate.test(1000));
+ assertTrue(uidPredicate.test(1001));
+ assertTrue(uidPredicate.test(1050));
+ assertTrue(uidPredicate.test(1054));
+ assertTrue(uidPredicate.test(1060));
+ assertTrue(uidPredicate.test(1001));
+ assertTrue(uidPredicate.test(2000));
+ assertTrue(uidPredicate.test(2444));
+ assertTrue(uidPredicate.test(3000));
+ assertFalse(uidPredicate.test(0));
+ assertFalse(uidPredicate.test(1040));
+ assertFalse(uidPredicate.test(3001));
+ assertFalse(uidPredicate.test(1999));
+ }
+
+ @Test
+ public void testUidPredicate_emptyRangeString() {
+ assertThrows(
+ NumberFormatException.class,
+ () -> KernelCpuThreadReaderSettingsObserver.UidPredicate.fromString(""));
+ }
+
+ @Test
+ public void testUidPredicate_singleNumber() {
+ assertThrows(
+ NumberFormatException.class,
+ () -> KernelCpuThreadReaderSettingsObserver.UidPredicate.fromString("1000"));
+ }
+
+ @Test
+ public void testUidPredicate_lettersInRange() {
+ assertThrows(
+ NumberFormatException.class,
+ () -> KernelCpuThreadReaderSettingsObserver.UidPredicate.fromString(
+ "0-0;1-1;a;3-3"));
+ }
+
+ @Test
+ public void testUidPredicate_onlyLetters() {
+ assertThrows(
+ NumberFormatException.class,
+ () -> KernelCpuThreadReaderSettingsObserver.UidPredicate.fromString("abc"));
+ }
+
+ @Test
+ public void testUidPredicate_backwardsRange() {
+ assertThrows(
+ IllegalArgumentException.class,
+ () -> KernelCpuThreadReaderSettingsObserver.UidPredicate.fromString("20-10"));
+ }
+
+ @Test
+ public void testUidPredicate_comma() {
+ assertThrows(
+ NumberFormatException.class,
+ () -> KernelCpuThreadReaderSettingsObserver.UidPredicate.fromString("1-1,2-2,3-3"));
+ }
}
diff --git a/core/tests/coretests/src/com/android/internal/os/LooperStatsTest.java b/core/tests/coretests/src/com/android/internal/os/LooperStatsTest.java
index 2c597b1..79b8477 100644
--- a/core/tests/coretests/src/com/android/internal/os/LooperStatsTest.java
+++ b/core/tests/coretests/src/com/android/internal/os/LooperStatsTest.java
@@ -138,6 +138,26 @@
}
@Test
+ public void testThrewException_notSampled() {
+ TestableLooperStats looperStats = new TestableLooperStats(2, 100);
+
+ Object token = looperStats.messageDispatchStarting();
+ looperStats.tickRealtime(10);
+ looperStats.tickThreadTime(10);
+ looperStats.messageDispatched(token, mHandlerFirst.obtainMessage(0));
+ assertThat(looperStats.getEntries()).hasSize(1);
+
+ // Will not be sampled so does not contribute to any entries.
+ Object token2 = looperStats.messageDispatchStarting();
+ looperStats.tickRealtime(100);
+ looperStats.tickThreadTime(10);
+ looperStats.dispatchingThrewException(
+ token2, mHandlerSecond.obtainMessage(7), new ArithmeticException());
+ assertThat(looperStats.getEntries()).hasSize(1);
+ assertThat(looperStats.getEntries().get(0).messageCount).isEqualTo(1);
+ }
+
+ @Test
public void testMultipleMessagesDispatched() {
TestableLooperStats looperStats = new TestableLooperStats(2, 100);
diff --git a/core/tests/hdmitests/src/android/hardware/hdmi/HdmiAudioSystemClientTest.java b/core/tests/hdmitests/src/android/hardware/hdmi/HdmiAudioSystemClientTest.java
index 28a8afe..0a729a9 100644
--- a/core/tests/hdmitests/src/android/hardware/hdmi/HdmiAudioSystemClientTest.java
+++ b/core/tests/hdmitests/src/android/hardware/hdmi/HdmiAudioSystemClientTest.java
@@ -181,6 +181,11 @@
}
@Override
+ public void sendVolumeKeyEvent(
+ final int deviceType, final int keyCode, final boolean isPressed) {
+ }
+
+ @Override
public void oneTouchPlay(final IHdmiControlCallback callback) {
}
diff --git a/data/etc/privapp-permissions-platform.xml b/data/etc/privapp-permissions-platform.xml
index bcac5fd..2e7b998 100644
--- a/data/etc/privapp-permissions-platform.xml
+++ b/data/etc/privapp-permissions-platform.xml
@@ -22,6 +22,7 @@
<permissions>
<privapp-permissions package="android.ext.services">
<permission name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE" />
+ <permission name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE" />
</privapp-permissions>
<privapp-permissions package="com.android.apps.tag">
diff --git a/graphics/java/android/graphics/HardwareRenderer.java b/graphics/java/android/graphics/HardwareRenderer.java
index c4ddd50..7ec76d7 100644
--- a/graphics/java/android/graphics/HardwareRenderer.java
+++ b/graphics/java/android/graphics/HardwareRenderer.java
@@ -154,6 +154,7 @@
private boolean mOpaque = true;
private boolean mForceDark = false;
private FrameInfo mScratchInfo;
+ private boolean mIsWideGamut = false;
/**
* Creates a new instance of a HardwareRenderer. The HardwareRenderer will default
@@ -498,6 +499,7 @@
* @hide
*/
public void setWideGamut(boolean wideGamut) {
+ mIsWideGamut = wideGamut;
nSetWideGamut(mNativeProxy, wideGamut);
}
@@ -673,6 +675,11 @@
nSetPictureCaptureCallback(mNativeProxy, callback);
}
+ /** @hide */
+ public boolean isWideGamut() {
+ return mIsWideGamut;
+ }
+
/** called by native */
static void invokePictureCapturedCallback(long picturePtr, PictureCapturedCallback callback) {
Picture picture = new Picture(picturePtr);
diff --git a/graphics/java/android/graphics/PixelFormat.java b/graphics/java/android/graphics/PixelFormat.java
index 96d6eee..dde757b 100644
--- a/graphics/java/android/graphics/PixelFormat.java
+++ b/graphics/java/android/graphics/PixelFormat.java
@@ -90,6 +90,9 @@
public static final int RGBA_F16 = 0x16;
public static final int RGBA_1010102 = 0x2B;
+ /** @hide */
+ public static final int HSV_888 = 0x37;
+
/**
* @deprecated use {@link android.graphics.ImageFormat#JPEG
* ImageFormat.JPEG} instead.
@@ -109,6 +112,7 @@
info.bytesPerPixel = 4;
break;
case RGB_888:
+ case HSV_888:
info.bitsPerPixel = 24;
info.bytesPerPixel = 3;
break;
@@ -227,6 +231,8 @@
return "RGBA_F16";
case RGBA_1010102:
return "RGBA_1010102";
+ case HSV_888:
+ return "HSV_888";
case JPEG:
return "JPEG";
default:
diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java
index 09d0a58..49d3530 100644
--- a/graphics/java/android/graphics/drawable/Drawable.java
+++ b/graphics/java/android/graphics/drawable/Drawable.java
@@ -1245,6 +1245,9 @@
return ImageDecoder.decodeDrawable(source, (decoder, info, src) -> {
decoder.setAllocator(ImageDecoder.ALLOCATOR_SOFTWARE);
+ decoder.setOnPartialImageListener((e) -> {
+ return e.getError() == ImageDecoder.DecodeException.SOURCE_INCOMPLETE;
+ });
});
} catch (IOException e) {
/* do nothing.
diff --git a/keystore/java/android/security/OWNERS b/keystore/java/android/security/OWNERS
new file mode 100644
index 0000000..ed30587
--- /dev/null
+++ b/keystore/java/android/security/OWNERS
@@ -0,0 +1 @@
+per-file *.java,*.aidl = eranm@google.com,pgrafov@google.com,rubinxu@google.com
diff --git a/keystore/tests/OWNERS b/keystore/tests/OWNERS
new file mode 100644
index 0000000..9e65f88
--- /dev/null
+++ b/keystore/tests/OWNERS
@@ -0,0 +1,5 @@
+# Android Enterprise security team
+eranm@google.com
+irinaid@google.com
+pgrafov@google.com
+rubinxu@google.com
diff --git a/libs/androidfw/AttributeResolution.cpp b/libs/androidfw/AttributeResolution.cpp
index 18d74ef..cc177af 100644
--- a/libs/androidfw/AttributeResolution.cpp
+++ b/libs/androidfw/AttributeResolution.cpp
@@ -286,7 +286,7 @@
value.dataType = Res_value::TYPE_NULL;
value.data = Res_value::DATA_NULL_UNDEFINED;
config.density = 0;
- uint32_t source_style_resid = 0;
+ uint32_t value_source_resid = 0;
// Try to find a value for this attribute... we prioritize values
// coming from, first XML attributes, then XML style, then default
@@ -300,6 +300,7 @@
if (kDebugStyles) {
ALOGI("-> From XML: type=0x%x, data=0x%08x", value.dataType, value.data);
}
+ value_source_resid = xml_parser->getSourceResourceId();
}
if (value.dataType == Res_value::TYPE_NULL && value.data != Res_value::DATA_NULL_EMPTY) {
@@ -310,7 +311,7 @@
cookie = entry->cookie;
type_set_flags = style_flags;
value = entry->value;
- source_style_resid = entry->style;
+ value_source_resid = entry->style;
if (kDebugStyles) {
ALOGI("-> From style: type=0x%x, data=0x%08x, style=0x%08x", value.dataType, value.data,
entry->style);
@@ -330,7 +331,7 @@
ALOGI("-> From def style: type=0x%x, data=0x%08x, style=0x%08x", value.dataType, value.data,
entry->style);
}
- source_style_resid = entry->style;
+ value_source_resid = entry->style;
}
}
@@ -349,6 +350,7 @@
} else if (value.data != Res_value::DATA_NULL_EMPTY) {
// If we still don't have a value for this attribute, try to find it in the theme!
ApkAssetsCookie new_cookie = theme->GetAttribute(cur_ident, &value, &type_set_flags);
+ // TODO: set value_source_resid for the style in the theme that was used.
if (new_cookie != kInvalidCookie) {
if (kDebugStyles) {
ALOGI("-> From theme: type=0x%x, data=0x%08x", value.dataType, value.data);
@@ -386,7 +388,7 @@
out_values[STYLE_RESOURCE_ID] = resid;
out_values[STYLE_CHANGING_CONFIGURATIONS] = type_set_flags;
out_values[STYLE_DENSITY] = config.density;
- out_values[SYTLE_SOURCE_STYLE] = source_style_resid;
+ out_values[SYTLE_SOURCE_RESOURCE_ID] = value_source_resid;
if (value.dataType != Res_value::TYPE_NULL || value.data == Res_value::DATA_NULL_EMPTY) {
indices_idx++;
diff --git a/libs/androidfw/ResourceTypes.cpp b/libs/androidfw/ResourceTypes.cpp
index 63b2527..11e4cb8 100644
--- a/libs/androidfw/ResourceTypes.cpp
+++ b/libs/androidfw/ResourceTypes.cpp
@@ -1594,6 +1594,16 @@
mCurExt = pos.curExt;
}
+void ResXMLParser::setSourceResourceId(const uint32_t resId)
+{
+ mSourceResourceId = resId;
+}
+
+uint32_t ResXMLParser::getSourceResourceId() const
+{
+ return mSourceResourceId;
+}
+
// --------------------------------------------------------------------
static volatile int32_t gCount = 0;
diff --git a/libs/androidfw/include/androidfw/AttributeResolution.h b/libs/androidfw/include/androidfw/AttributeResolution.h
index c88004c..0cc1d3c 100644
--- a/libs/androidfw/include/androidfw/AttributeResolution.h
+++ b/libs/androidfw/include/androidfw/AttributeResolution.h
@@ -33,7 +33,7 @@
STYLE_RESOURCE_ID = 3,
STYLE_CHANGING_CONFIGURATIONS = 4,
STYLE_DENSITY = 5,
- SYTLE_SOURCE_STYLE = 6
+ SYTLE_SOURCE_RESOURCE_ID = 6
};
// These are all variations of the same method. They each perform the exact same operation,
diff --git a/libs/androidfw/include/androidfw/ResourceTypes.h b/libs/androidfw/include/androidfw/ResourceTypes.h
index 1655e89..742813e 100644
--- a/libs/androidfw/include/androidfw/ResourceTypes.h
+++ b/libs/androidfw/include/androidfw/ResourceTypes.h
@@ -782,6 +782,9 @@
void getPosition(ResXMLPosition* pos) const;
void setPosition(const ResXMLPosition& pos);
+ void setSourceResourceId(const uint32_t resId);
+ uint32_t getSourceResourceId() const;
+
private:
friend class ResXMLTree;
@@ -791,6 +794,7 @@
event_code_t mEventCode;
const ResXMLTree_node* mCurNode;
const void* mCurExt;
+ uint32_t mSourceResourceId;
};
class DynamicRefTable;
diff --git a/libs/hwui/Android.bp b/libs/hwui/Android.bp
index 96798f9..0335a7c 100644
--- a/libs/hwui/Android.bp
+++ b/libs/hwui/Android.bp
@@ -28,10 +28,6 @@
// clang's warning is broken, see: https://llvm.org/bugs/show_bug.cgi?id=21629
"-Wno-missing-braces",
-
- // TODO: Linear blending should be enabled by default, but we are
- // TODO: making it an opt-in while it's a work in progress
- //"-DANDROID_ENABLE_LINEAR_BLENDING",
],
include_dirs: [
diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp
index 6b7ec97..aeeb32c 100644
--- a/libs/hwui/HardwareBitmapUploader.cpp
+++ b/libs/hwui/HardwareBitmapUploader.cpp
@@ -116,7 +116,6 @@
static FormatInfo determineFormat(const SkBitmap& skBitmap) {
FormatInfo formatInfo;
- // TODO: add support for linear blending (when ANDROID_ENABLE_LINEAR_BLENDING is defined)
switch (skBitmap.info().colorType()) {
case kRGBA_8888_SkColorType:
formatInfo.isSupported = true;
diff --git a/libs/hwui/VectorDrawable.cpp b/libs/hwui/VectorDrawable.cpp
index 7265692..da905cf 100644
--- a/libs/hwui/VectorDrawable.cpp
+++ b/libs/hwui/VectorDrawable.cpp
@@ -606,12 +606,7 @@
bool Tree::allocateBitmapIfNeeded(Cache& cache, int width, int height) {
if (!canReuseBitmap(cache.bitmap.get(), width, height)) {
-#ifndef ANDROID_ENABLE_LINEAR_BLENDING
- sk_sp<SkColorSpace> colorSpace = nullptr;
-#else
- sk_sp<SkColorSpace> colorSpace = SkColorSpace::MakeSRGB();
-#endif
- SkImageInfo info = SkImageInfo::MakeN32(width, height, kPremul_SkAlphaType, colorSpace);
+ SkImageInfo info = SkImageInfo::MakeN32(width, height, kPremul_SkAlphaType);
cache.bitmap = Bitmap::allocateHeapBitmap(info);
return true;
}
diff --git a/libs/hwui/hwui/Canvas.cpp b/libs/hwui/hwui/Canvas.cpp
index 5231486..68aa737 100644
--- a/libs/hwui/hwui/Canvas.cpp
+++ b/libs/hwui/hwui/Canvas.cpp
@@ -25,6 +25,8 @@
#include "hwui/PaintFilter.h"
+#include <SkFontMetrics.h>
+
namespace android {
Canvas* Canvas::create_recording_canvas(int width, int height, uirenderer::RenderNode* renderNode) {
diff --git a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp
index d0fe022..15f53f2 100644
--- a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp
+++ b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.cpp
@@ -42,7 +42,13 @@
namespace skiapipeline {
SkiaVulkanPipeline::SkiaVulkanPipeline(renderthread::RenderThread& thread)
- : SkiaPipeline(thread), mVkManager(thread.vulkanManager()) {}
+ : SkiaPipeline(thread), mVkManager(thread.vulkanManager()) {
+ thread.renderState().registerContextCallback(this);
+}
+
+SkiaVulkanPipeline::~SkiaVulkanPipeline() {
+ mRenderThread.renderState().removeContextCallback(this);
+}
MakeCurrentResult SkiaVulkanPipeline::makeCurrent() {
return MakeCurrentResult::AlreadyCurrent;
@@ -53,6 +59,8 @@
"drawRenderNode called on a context with no surface!");
SkSurface* backBuffer = mVkManager.getBackbufferSurface(&mVkSurface);
+ LOG_ALWAYS_FATAL_IF(mVkSurface == nullptr,
+ "drawRenderNode called on a context with an invalid surface");
if (backBuffer == nullptr) {
SkDebugf("failed to get backbuffer");
return Frame(-1, -1, 0);
@@ -153,6 +161,13 @@
return nullptr;
}
+void SkiaVulkanPipeline::onContextDestroyed() {
+ if (mVkSurface) {
+ mVkManager.destroySurface(mVkSurface);
+ mVkSurface = nullptr;
+ }
+}
+
} /* namespace skiapipeline */
} /* namespace uirenderer */
} /* namespace android */
diff --git a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.h b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.h
index 9343076..2c24edd 100644
--- a/libs/hwui/pipeline/skia/SkiaVulkanPipeline.h
+++ b/libs/hwui/pipeline/skia/SkiaVulkanPipeline.h
@@ -19,14 +19,16 @@
#include "SkiaPipeline.h"
#include "renderthread/VulkanManager.h"
+#include "renderstate/RenderState.h"
+
namespace android {
namespace uirenderer {
namespace skiapipeline {
-class SkiaVulkanPipeline : public SkiaPipeline {
+class SkiaVulkanPipeline : public SkiaPipeline, public IGpuContextCallback {
public:
explicit SkiaVulkanPipeline(renderthread::RenderThread& thread);
- virtual ~SkiaVulkanPipeline() {}
+ virtual ~SkiaVulkanPipeline();
renderthread::MakeCurrentResult makeCurrent() override;
renderthread::Frame getFrame() override;
@@ -49,6 +51,9 @@
static sk_sp<Bitmap> allocateHardwareBitmap(renderthread::RenderThread& thread,
SkBitmap& skBitmap);
+protected:
+ void onContextDestroyed() override;
+
private:
renderthread::VulkanManager& mVkManager;
renderthread::VulkanSurface* mVkSurface = nullptr;
diff --git a/libs/hwui/pipeline/skia/VectorDrawableAtlas.cpp b/libs/hwui/pipeline/skia/VectorDrawableAtlas.cpp
index 8fb621d..e783f38 100644
--- a/libs/hwui/pipeline/skia/VectorDrawableAtlas.cpp
+++ b/libs/hwui/pipeline/skia/VectorDrawableAtlas.cpp
@@ -262,12 +262,7 @@
}
sk_sp<SkSurface> VectorDrawableAtlas::createSurface(int width, int height, GrContext* context) {
-#ifndef ANDROID_ENABLE_LINEAR_BLENDING
- sk_sp<SkColorSpace> colorSpace = nullptr;
-#else
- sk_sp<SkColorSpace> colorSpace = SkColorSpace::MakeSRGB();
-#endif
- SkImageInfo info = SkImageInfo::MakeN32(width, height, kPremul_SkAlphaType, colorSpace);
+ SkImageInfo info = SkImageInfo::MakeN32(width, height, kPremul_SkAlphaType);
// This must have a top-left origin so that calls to surface->canvas->writePixels
// performs a basic texture upload instead of a more complex drawing operation
return SkSurface::MakeRenderTarget(context, SkBudgeted::kYes, info, 0, kTopLeft_GrSurfaceOrigin,
diff --git a/libs/hwui/renderthread/RenderThread.cpp b/libs/hwui/renderthread/RenderThread.cpp
index 8bef359..3b37c83 100644
--- a/libs/hwui/renderthread/RenderThread.cpp
+++ b/libs/hwui/renderthread/RenderThread.cpp
@@ -203,11 +203,17 @@
void RenderThread::destroyRenderingContext() {
mFunctorManager.onContextDestroyed();
- if (mEglManager->hasEglContext()) {
- setGrContext(nullptr);
- mEglManager->destroy();
+ if (Properties::getRenderPipelineType() == RenderPipelineType::SkiaGL) {
+ if (mEglManager->hasEglContext()) {
+ setGrContext(nullptr);
+ mEglManager->destroy();
+ }
+ } else {
+ if (vulkanManager().hasVkContext()) {
+ setGrContext(nullptr);
+ vulkanManager().destroy();
+ }
}
- vulkanManager().destroy();
}
void RenderThread::dumpGraphicsMemory(int fd) {
diff --git a/libs/hwui/renderthread/VulkanManager.cpp b/libs/hwui/renderthread/VulkanManager.cpp
index 582d51e..90397fd 100644
--- a/libs/hwui/renderthread/VulkanManager.cpp
+++ b/libs/hwui/renderthread/VulkanManager.cpp
@@ -89,7 +89,7 @@
mPhysicalDeviceFeatures2 = {};
}
-bool VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFeatures2& features) {
+void VulkanManager::setupDevice(GrVkExtensions& grExtensions, VkPhysicalDeviceFeatures2& features) {
VkResult err;
constexpr VkApplicationInfo app_info = {
@@ -107,15 +107,11 @@
uint32_t extensionCount = 0;
err = mEnumerateInstanceExtensionProperties(nullptr, &extensionCount, nullptr);
- if (VK_SUCCESS != err) {
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(VK_SUCCESS != err);
std::unique_ptr<VkExtensionProperties[]> extensions(
new VkExtensionProperties[extensionCount]);
err = mEnumerateInstanceExtensionProperties(nullptr, &extensionCount, extensions.get());
- if (VK_SUCCESS != err) {
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(VK_SUCCESS != err);
bool hasKHRSurfaceExtension = false;
bool hasKHRAndroidSurfaceExtension = false;
for (uint32_t i = 0; i < extensionCount; ++i) {
@@ -127,10 +123,7 @@
hasKHRAndroidSurfaceExtension = true;
}
}
- if (!hasKHRSurfaceExtension || !hasKHRAndroidSurfaceExtension) {
- this->destroy();
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(!hasKHRSurfaceExtension || !hasKHRAndroidSurfaceExtension);
}
const VkInstanceCreateInfo instance_create = {
@@ -146,10 +139,7 @@
GET_PROC(CreateInstance);
err = mCreateInstance(&instance_create, nullptr, &mInstance);
- if (err < 0) {
- this->destroy();
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(err < 0);
GET_INST_PROC(DestroyInstance);
GET_INST_PROC(EnumeratePhysicalDevices);
@@ -166,39 +156,23 @@
GET_INST_PROC(GetPhysicalDeviceSurfacePresentModesKHR);
uint32_t gpuCount;
- err = mEnumeratePhysicalDevices(mInstance, &gpuCount, nullptr);
- if (err) {
- this->destroy();
- return false;
- }
- if (!gpuCount) {
- this->destroy();
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(mEnumeratePhysicalDevices(mInstance, &gpuCount, nullptr));
+ LOG_ALWAYS_FATAL_IF(!gpuCount);
// Just returning the first physical device instead of getting the whole array. Since there
// should only be one device on android.
gpuCount = 1;
err = mEnumeratePhysicalDevices(mInstance, &gpuCount, &mPhysicalDevice);
// VK_INCOMPLETE is returned when the count we provide is less than the total device count.
- if (err && VK_INCOMPLETE != err) {
- this->destroy();
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(err && VK_INCOMPLETE != err);
VkPhysicalDeviceProperties physDeviceProperties;
mGetPhysicalDeviceProperties(mPhysicalDevice, &physDeviceProperties);
- if (physDeviceProperties.apiVersion < VK_MAKE_VERSION(1, 1, 0)) {
- this->destroy();
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(physDeviceProperties.apiVersion < VK_MAKE_VERSION(1, 1, 0));
// query to get the initial queue props size
uint32_t queueCount;
mGetPhysicalDeviceQueueFamilyProperties(mPhysicalDevice, &queueCount, nullptr);
- if (!queueCount) {
- this->destroy();
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(!queueCount);
// now get the actual queue props
std::unique_ptr<VkQueueFamilyProperties[]> queueProps(new VkQueueFamilyProperties[queueCount]);
@@ -212,10 +186,7 @@
break;
}
}
- if (mGraphicsQueueIndex == queueCount) {
- this->destroy();
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(mGraphicsQueueIndex == queueCount);
// All physical devices and queue families on Android must be capable of
// presentation with any native window. So just use the first one.
@@ -225,18 +196,12 @@
uint32_t extensionCount = 0;
err = mEnumerateDeviceExtensionProperties(mPhysicalDevice, nullptr, &extensionCount,
nullptr);
- if (VK_SUCCESS != err) {
- this->destroy();
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(VK_SUCCESS != err);
std::unique_ptr<VkExtensionProperties[]> extensions(
new VkExtensionProperties[extensionCount]);
err = mEnumerateDeviceExtensionProperties(mPhysicalDevice, nullptr, &extensionCount,
extensions.get());
- if (VK_SUCCESS != err) {
- this->destroy();
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(VK_SUCCESS != err);
bool hasKHRSwapchainExtension = false;
for (uint32_t i = 0; i < extensionCount; ++i) {
mDeviceExtensions.push_back(extensions[i].extensionName);
@@ -244,10 +209,7 @@
hasKHRSwapchainExtension = true;
}
}
- if (!hasKHRSwapchainExtension) {
- this->destroy();
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(!hasKHRSwapchainExtension);
}
auto getProc = [] (const char* proc_name, VkInstance instance, VkDevice device) {
@@ -259,10 +221,7 @@
grExtensions.init(getProc, mInstance, mPhysicalDevice, mInstanceExtensions.size(),
mInstanceExtensions.data(), mDeviceExtensions.size(), mDeviceExtensions.data());
- if (!grExtensions.hasExtension(VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME, 1)) {
- this->destroy();
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(!grExtensions.hasExtension(VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME, 1));
memset(&features, 0, sizeof(VkPhysicalDeviceFeatures2));
features.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2;
@@ -332,11 +291,7 @@
nullptr, // ppEnabledFeatures
};
- err = mCreateDevice(mPhysicalDevice, &deviceInfo, nullptr, &mDevice);
- if (err) {
- this->destroy();
- return false;
- }
+ LOG_ALWAYS_FATAL_IF(mCreateDevice(mPhysicalDevice, &deviceInfo, nullptr, &mDevice));
GET_DEV_PROC(GetDeviceQueue);
GET_DEV_PROC(DeviceWaitIdle);
@@ -366,8 +321,6 @@
GET_DEV_PROC(DestroyFence);
GET_DEV_PROC(WaitForFences);
GET_DEV_PROC(ResetFences);
-
- return true;
}
void VulkanManager::initialize() {
@@ -381,7 +334,7 @@
LOG_ALWAYS_FATAL_IF(instanceVersion < VK_MAKE_VERSION(1, 1, 0));
GrVkExtensions extensions;
- LOG_ALWAYS_FATAL_IF(!this->setupDevice(extensions, mPhysicalDeviceFeatures2));
+ this->setupDevice(extensions, mPhysicalDeviceFeatures2);
mGetDeviceQueue(mDevice, mGraphicsQueueIndex, 0, &mGraphicsQueue);
@@ -419,7 +372,7 @@
if (!setupDummyCommandBuffer()) {
this->destroy();
- return;
+ // Pass through will crash on next line.
}
LOG_ALWAYS_FATAL_IF(mDummyCB == VK_NULL_HANDLE);
@@ -520,6 +473,9 @@
destroySurface(surface);
*surfaceOut = createSurface(window, colorMode, colorSpace, colorType);
surface = *surfaceOut;
+ if (!surface) {
+ return nullptr;
+ }
}
VulkanSurface::BackbufferInfo* backbuffer = getAvailableBackbuffer(surface);
diff --git a/libs/hwui/renderthread/VulkanManager.h b/libs/hwui/renderthread/VulkanManager.h
index 6426fe2..1fe6c65 100644
--- a/libs/hwui/renderthread/VulkanManager.h
+++ b/libs/hwui/renderthread/VulkanManager.h
@@ -151,7 +151,7 @@
// Sets up the VkInstance and VkDevice objects. Also fills out the passed in
// VkPhysicalDeviceFeatures struct.
- bool setupDevice(GrVkExtensions&, VkPhysicalDeviceFeatures2&);
+ void setupDevice(GrVkExtensions&, VkPhysicalDeviceFeatures2&);
void destroyBuffers(VulkanSurface* surface);
diff --git a/libs/hwui/surfacetexture/ImageConsumer.cpp b/libs/hwui/surfacetexture/ImageConsumer.cpp
index 4a2f57e..624c290 100644
--- a/libs/hwui/surfacetexture/ImageConsumer.cpp
+++ b/libs/hwui/surfacetexture/ImageConsumer.cpp
@@ -46,8 +46,8 @@
}
void ImageConsumer::ImageSlot::createIfNeeded(sp<GraphicBuffer> graphicBuffer,
- android_dataspace dataspace) {
- if (!mImage.get() || dataspace != mDataspace) {
+ android_dataspace dataspace, bool forceCreate) {
+ if (!mImage.get() || dataspace != mDataspace || forceCreate) {
mImage = graphicBuffer.get()
? SkImage::MakeFromAHardwareBuffer(
reinterpret_cast<AHardwareBuffer*>(graphicBuffer.get()),
@@ -71,7 +71,7 @@
if (slot != BufferItem::INVALID_BUFFER_SLOT) {
*queueEmpty = true;
mImageSlots[slot].createIfNeeded(st.mSlots[slot].mGraphicBuffer,
- st.mCurrentDataSpace);
+ st.mCurrentDataSpace, false);
return mImageSlots[slot].mImage;
}
}
@@ -150,7 +150,7 @@
st.computeCurrentTransformMatrixLocked();
*queueEmpty = false;
- mImageSlots[slot].createIfNeeded(st.mSlots[slot].mGraphicBuffer, item.mDataSpace);
+ mImageSlots[slot].createIfNeeded(st.mSlots[slot].mGraphicBuffer, item.mDataSpace, true);
return mImageSlots[slot].mImage;
}
diff --git a/libs/hwui/surfacetexture/ImageConsumer.h b/libs/hwui/surfacetexture/ImageConsumer.h
index f0e55bb..5c41903 100644
--- a/libs/hwui/surfacetexture/ImageConsumer.h
+++ b/libs/hwui/surfacetexture/ImageConsumer.h
@@ -82,7 +82,8 @@
*/
EGLSyncKHR mEglFence;
- void createIfNeeded(sp<GraphicBuffer> graphicBuffer, android_dataspace dataspace);
+ void createIfNeeded(sp<GraphicBuffer> graphicBuffer, android_dataspace dataspace,
+ bool forceCreate);
};
/**
diff --git a/libs/hwui/utils/Color.h b/libs/hwui/utils/Color.h
index b67d10d..79400de 100644
--- a/libs/hwui/utils/Color.h
+++ b/libs/hwui/utils/Color.h
@@ -82,17 +82,6 @@
return linear <= 0.0031308f ? linear * 12.92f : (powf(linear, 1.0f / 2.4f) * 1.055f) - 0.055f;
}
-// Opto-electronic conversion function for the sRGB color space
-// Takes a linear sRGB value and converts it to a gamma-encoded sRGB value
-// This function returns the input unmodified if linear blending is not enabled
-static constexpr float OECF(float linear) {
-#ifdef ANDROID_ENABLE_LINEAR_BLENDING
- return OECF_sRGB(linear);
-#else
- return linear;
-#endif
-}
-
// Electro-optical conversion function for the sRGB color space
// Takes a gamma-encoded sRGB value and converts it to a linear sRGB value
static constexpr float EOCF_sRGB(float srgb) {
@@ -100,17 +89,6 @@
return srgb <= 0.04045f ? srgb / 12.92f : powf((srgb + 0.055f) / 1.055f, 2.4f);
}
-// Electro-optical conversion function for the sRGB color space
-// Takes a gamma-encoded sRGB value and converts it to a linear sRGB value
-// This function returns the input unmodified if linear blending is not enabled
-static constexpr float EOCF(float srgb) {
-#ifdef ANDROID_ENABLE_LINEAR_BLENDING
- return EOCF_sRGB(srgb);
-#else
- return srgb;
-#endif
-}
-
android::PixelFormat ColorTypeToPixelFormat(SkColorType colorType);
ANDROID_API SkColorType PixelFormatToColorType(android::PixelFormat format);
diff --git a/location/java/android/location/ILocationManager.aidl b/location/java/android/location/ILocationManager.aidl
index e795b81..e91012f 100644
--- a/location/java/android/location/ILocationManager.aidl
+++ b/location/java/android/location/ILocationManager.aidl
@@ -85,12 +85,13 @@
boolean stopGnssBatch();
boolean injectLocation(in Location location);
- // --- deprecated ---
List<String> getAllProviders();
List<String> getProviders(in Criteria criteria, boolean enabledOnly);
String getBestProvider(in Criteria criteria, boolean enabledOnly);
ProviderProperties getProviderProperties(String provider);
String getNetworkProviderPackage();
+ boolean isProviderPackage(String packageName);
+
void setLocationControllerExtraPackage(String packageName);
String getLocationControllerExtraPackage();
void setLocationControllerExtraPackageEnabled(boolean enabled);
diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java
index 63b57d1..5aba22f 100644
--- a/location/java/android/location/LocationManager.java
+++ b/location/java/android/location/LocationManager.java
@@ -2425,6 +2425,22 @@
}
/**
+ * Returns true if the given package name matches a location provider package, and false
+ * otherwise.
+ *
+ * @hide
+ */
+ @SystemApi
+ public boolean isProviderPackage(String packageName) {
+ try {
+ return mService.isProviderPackage(packageName);
+ } catch (RemoteException e) {
+ e.rethrowFromSystemServer();
+ return false;
+ }
+ }
+
+ /**
* Set the extra location controller package for location services on the device.
*
* @hide
diff --git a/location/java/com/android/internal/location/ILocationProviderManager.aidl b/location/java/com/android/internal/location/ILocationProviderManager.aidl
index b1b8f0c..79166ae 100644
--- a/location/java/com/android/internal/location/ILocationProviderManager.aidl
+++ b/location/java/com/android/internal/location/ILocationProviderManager.aidl
@@ -26,6 +26,8 @@
*/
interface ILocationProviderManager {
+ void onSetAdditionalProviderPackages(in List<String> packageNames);
+
void onSetEnabled(boolean enabled);
void onSetProperties(in ProviderProperties properties);
diff --git a/location/lib/api/current.txt b/location/lib/api/current.txt
index c721218..67d6496 100644
--- a/location/lib/api/current.txt
+++ b/location/lib/api/current.txt
@@ -19,6 +19,7 @@
method protected boolean onSendExtraCommand(@Nullable String, @Nullable android.os.Bundle);
method protected abstract void onSetRequest(com.android.location.provider.ProviderRequestUnbundled, android.os.WorkSource);
method public void reportLocation(android.location.Location);
+ method public void setAdditionalProviderPackages(java.util.List<java.lang.String>);
method public void setEnabled(boolean);
method public void setProperties(com.android.location.provider.ProviderPropertiesUnbundled);
field public static final String EXTRA_NO_GPS_LOCATION = "noGPSLocation";
diff --git a/location/lib/java/com/android/location/provider/LocationProviderBase.java b/location/lib/java/com/android/location/provider/LocationProviderBase.java
index 5bcec92..7cd7207 100644
--- a/location/lib/java/com/android/location/provider/LocationProviderBase.java
+++ b/location/lib/java/com/android/location/provider/LocationProviderBase.java
@@ -36,6 +36,8 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
/**
* Base class for location providers implemented as unbundled services.
@@ -88,6 +90,7 @@
@Nullable private volatile ILocationProviderManager mManager;
private volatile ProviderProperties mProperties;
private volatile boolean mEnabled;
+ private final ArrayList<String> mAdditionalProviderPackages;
public LocationProviderBase(String tag, ProviderPropertiesUnbundled properties) {
mTag = tag;
@@ -99,6 +102,7 @@
mManager = null;
mProperties = properties.getProviderProperties();
mEnabled = true;
+ mAdditionalProviderPackages = new ArrayList<>(0);
}
public IBinder getBinder() {
@@ -160,6 +164,29 @@
}
/**
+ * Sets a list of additional packages that should be considered as part of this location
+ * provider for the purposes of generating locations. This should generally only be used when
+ * another package may issue location requests on behalf of this package in the course of
+ * providing location. This will inform location services to treat the other packages as
+ * location providers as well.
+ */
+ public void setAdditionalProviderPackages(List<String> packageNames) {
+ synchronized (mBinder) {
+ mAdditionalProviderPackages.clear();
+ mAdditionalProviderPackages.addAll(packageNames);
+ }
+
+ ILocationProviderManager manager = mManager;
+ if (manager != null) {
+ try {
+ manager.onSetAdditionalProviderPackages(mAdditionalProviderPackages);
+ } catch (RemoteException | RuntimeException e) {
+ Log.w(mTag, e);
+ }
+ }
+ }
+
+ /**
* Returns true if this provider has been set as enabled. This will be true unless explicitly
* set otherwise.
*/
@@ -275,6 +302,9 @@
public void setLocationProviderManager(ILocationProviderManager manager) {
synchronized (mBinder) {
try {
+ if (!mAdditionalProviderPackages.isEmpty()) {
+ manager.onSetAdditionalProviderPackages(mAdditionalProviderPackages);
+ }
manager.onSetProperties(mProperties);
manager.onSetEnabled(mEnabled);
} catch (RemoteException e) {
diff --git a/media/Android.bp b/media/Android.bp
index c7d5ace..1aefebe 100644
--- a/media/Android.bp
+++ b/media/Android.bp
@@ -2,8 +2,7 @@
name: "updatable-media",
srcs: [
- ":mediaplayer2-srcs",
- ":mediasession2-srcs",
+ ":updatable-media-srcs",
":framework-media-annotation-srcs",
],
@@ -12,8 +11,12 @@
"apex/java",
],
+ // It would be great if we don't need to add include_dirs for public
+ // parcelable classes. Find a better way.
include_dirs: [
- // For the usage of android.os.Bundle and android.os.ResultReceiver in aidl files
+ // To refer:
+ // android.os.Bundle
+ // android.os.ResultReceiver
"frameworks/base/core/java",
],
},
@@ -29,7 +32,15 @@
}
filegroup {
- name: "media-srcs-without-aidls",
+ name: "updatable-media-srcs",
+ srcs: [
+ ":mediasession2-srcs",
+ ":mediaplayer2-srcs",
+ ],
+}
+
+filegroup {
+ name: "updatable-media-srcs-without-aidls",
srcs : [
":mediasession2-srcs-without-aidls",
":mediaplayer2-srcs",
@@ -51,6 +62,7 @@
"apex/java/android/media/Session2Command.java",
"apex/java/android/media/Session2CommandGroup.java",
"apex/java/android/media/Session2Link.java",
+ "apex/java/android/media/Session2Token.java",
],
}
@@ -84,3 +96,32 @@
"apex/java/android/media/BufferingParams.java",
],
}
+
+metalava_updatable_media_args = " --error UnhiddenSystemApi " +
+ "--hide RequiresPermission " +
+ "--hide MissingPermission --hide BroadcastBehavior " +
+ "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " +
+ "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " +
+ "--hide HiddenTypedefConstant "
+
+droidstubs {
+ name: "updatable-media-stubs",
+ srcs: [
+ ":updatable-media-srcs-without-aidls",
+ ":framework-media-annotation-srcs",
+ ],
+ args: metalava_updatable_media_args + " --show-annotation android.annotation.SystemApi " +
+ " --show-annotation android.annotation.TestApi ",
+ // Ideally, sdk_version here should be "current_system", but "current - 1" is used
+ // to avoid dependency cycle with framework.
+ sdk_version: "28",
+}
+
+java_library {
+ name: "updatable_media_stubs",
+ srcs: [":updatable-media-stubs"],
+ // Ideally, sdk_version here should be "current_system", but "current - 1" is used
+ // to avoid dependency cycle with framework.
+ sdk_version: "28",
+}
+
diff --git a/media/apex/java/android/media/MediaConstants.java b/media/apex/java/android/media/MediaConstants.java
index 45ea826..65b6f55 100644
--- a/media/apex/java/android/media/MediaConstants.java
+++ b/media/apex/java/android/media/MediaConstants.java
@@ -24,8 +24,7 @@
static final String KEY_PACKAGE_NAME = "android.media.key.PACKAGE_NAME";
// Bundle key for Parcelable
- static final String KEY_SESSION2_TOKEN = "android.media.key.SESSION2_TOKEN";
- static final String KEY_SESSION2_LINK = "android.media.key.SESSION2_LINK";
+ static final String KEY_SESSION2LINK = "android.media.key.SESSION2LINK";
static final String KEY_ALLOWED_COMMANDS = "android.media.key.ALLOWED_COMMANDS";
static final String KEY_PLAYBACK_ACTIVE = "android.media.key.PLAYBACK_ACTIVE";
diff --git a/media/apex/java/android/media/MediaController2.java b/media/apex/java/android/media/MediaController2.java
index 41721f3..887b447 100644
--- a/media/apex/java/android/media/MediaController2.java
+++ b/media/apex/java/android/media/MediaController2.java
@@ -20,11 +20,9 @@
import static android.media.MediaConstants.KEY_PACKAGE_NAME;
import static android.media.MediaConstants.KEY_PID;
import static android.media.MediaConstants.KEY_PLAYBACK_ACTIVE;
-import static android.media.MediaConstants.KEY_SESSION2_LINK;
-import static android.media.MediaConstants.KEY_SESSION2_TOKEN;
+import static android.media.MediaConstants.KEY_SESSION2LINK;
import static android.media.Session2Command.RESULT_ERROR_UNKNOWN_ERROR;
import static android.media.Session2Command.RESULT_INFO_SKIPPED;
-import static android.media.Session2Token.SESSION_SERVICE_INTERFACE;
import static android.media.Session2Token.TYPE_SESSION;
import android.annotation.NonNull;
@@ -262,8 +260,7 @@
// Called by Controller2Link.onConnected
void onConnected(int seq, Bundle connectionResult) {
- Session2Token token = connectionResult.getParcelable(KEY_SESSION2_TOKEN);
- Session2Link sessionBinder = token.getExtras().getParcelable(KEY_SESSION2_LINK);
+ Session2Link sessionBinder = connectionResult.getParcelable(KEY_SESSION2LINK);
Session2CommandGroup allowedCommands =
connectionResult.getParcelable(KEY_ALLOWED_COMMANDS);
boolean playbackActive = connectionResult.getBoolean(KEY_PLAYBACK_ACTIVE);
@@ -284,7 +281,8 @@
// Implementation for the local binder is no-op,
// so can be used without worrying about deadlock.
sessionBinder.linkToDeath(mDeathRecipient, 0);
- mConnectedToken = token;
+ mConnectedToken = new Session2Token(mSessionToken.getUid(), TYPE_SESSION,
+ mSessionToken.getPackageName(), sessionBinder);
}
mCallbackExecutor.execute(() -> {
mCallback.onConnected(MediaController2.this, allowedCommands);
@@ -355,7 +353,7 @@
}
private boolean requestConnectToSession() {
- Session2Link sessionBinder = mSessionToken.getExtras().getParcelable(KEY_SESSION2_LINK);
+ Session2Link sessionBinder = mSessionToken.getSessionLink();
Bundle connectionRequest = createConnectionRequest();
try {
sessionBinder.connect(mControllerStub, getNextSeqNumber(), connectionRequest);
@@ -368,7 +366,7 @@
private boolean requestConnectToService() {
// Service. Needs to get fresh binder whenever connection is needed.
- final Intent intent = new Intent(SESSION_SERVICE_INTERFACE);
+ final Intent intent = new Intent(MediaSession2Service.SERVICE_INTERFACE);
intent.setClassName(mSessionToken.getPackageName(), mSessionToken.getServiceName());
// Use bindService() instead of startForegroundService() to start session service for three
diff --git a/media/apex/java/android/media/MediaSession2.java b/media/apex/java/android/media/MediaSession2.java
index 80c91cc..fdd07fd 100644
--- a/media/apex/java/android/media/MediaSession2.java
+++ b/media/apex/java/android/media/MediaSession2.java
@@ -20,10 +20,10 @@
import static android.media.MediaConstants.KEY_PACKAGE_NAME;
import static android.media.MediaConstants.KEY_PID;
import static android.media.MediaConstants.KEY_PLAYBACK_ACTIVE;
-import static android.media.MediaConstants.KEY_SESSION2_LINK;
-import static android.media.MediaConstants.KEY_SESSION2_TOKEN;
+import static android.media.MediaConstants.KEY_SESSION2LINK;
import static android.media.Session2Command.RESULT_ERROR_UNKNOWN_ERROR;
import static android.media.Session2Command.RESULT_INFO_SKIPPED;
+import static android.media.Session2Token.TYPE_SESSION;
import android.annotation.NonNull;
import android.annotation.Nullable;
@@ -34,6 +34,7 @@
import android.media.session.MediaSessionManager.RemoteUserInfo;
import android.os.Bundle;
import android.os.Handler;
+import android.os.Process;
import android.os.ResultReceiver;
import android.util.ArrayMap;
import android.util.ArraySet;
@@ -107,10 +108,8 @@
mCallbackExecutor = callbackExecutor;
mCallback = callback;
mSessionStub = new Session2Link(this);
-
- Bundle extras = new Bundle();
- extras.putParcelable(KEY_SESSION2_LINK, mSessionStub);
- mSessionToken = new Session2Token(context, id, extras);
+ mSessionToken = new Session2Token(Process.myUid(), TYPE_SESSION, context.getPackageName(),
+ mSessionStub);
mSessionManager = (MediaSessionManager) mContext.getSystemService(
Context.MEDIA_SESSION_SERVICE);
// NOTE: mResultHandler uses main looper, so this MUST NOT be blocked.
@@ -142,8 +141,6 @@
for (ControllerInfo info : controllerInfos) {
info.notifyDisconnected();
}
- mSessionToken.destroy();
- mSessionManager.notifySession2Destroyed(mSessionToken);
} catch (Exception e) {
// Should not be here.
}
@@ -331,7 +328,7 @@
// It's needed because we cannot call synchronous calls between
// session/controller.
Bundle connectionResult = new Bundle();
- connectionResult.putParcelable(KEY_SESSION2_TOKEN, mSessionToken);
+ connectionResult.putParcelable(KEY_SESSION2LINK, mSessionStub);
connectionResult.putParcelable(KEY_ALLOWED_COMMANDS,
controllerInfo.mAllowedCommands);
connectionResult.putBoolean(KEY_PLAYBACK_ACTIVE, isPlaybackActive());
diff --git a/media/apex/java/android/media/MediaSession2Service.java b/media/apex/java/android/media/MediaSession2Service.java
index 54d0ed2..5bb746a 100644
--- a/media/apex/java/android/media/MediaSession2Service.java
+++ b/media/apex/java/android/media/MediaSession2Service.java
@@ -48,7 +48,7 @@
/**
* The {@link Intent} that must be declared as handled by the service.
*/
- public static final String SERVICE_INTERFACE = Session2Token.SESSION_SERVICE_INTERFACE;
+ public static final String SERVICE_INTERFACE = "android.media.MediaSession2Service";
private static final String TAG = "MediaSession2Service";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
diff --git a/media/java/android/media/Session2Token.java b/media/apex/java/android/media/Session2Token.java
similarity index 70%
rename from media/java/android/media/Session2Token.java
rename to media/apex/java/android/media/Session2Token.java
index 80494ad..238cc2b 100644
--- a/media/java/android/media/Session2Token.java
+++ b/media/apex/java/android/media/Session2Token.java
@@ -19,17 +19,13 @@
import android.annotation.IntDef;
import android.annotation.NonNull;
import android.annotation.Nullable;
-import android.annotation.SystemApi;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import android.media.session.MediaSessionManager;
-import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
-import android.os.Process;
import android.text.TextUtils;
import android.util.Log;
@@ -39,7 +35,7 @@
import java.util.Objects;
/**
- * Represents an ongoing MediaSession2 or a MediaSession2Service.
+ * Represents an ongoing {@link MediaSession2} or a {@link MediaSession2Service}.
* If it's representing a session service, it may not be ongoing.
* <p>
* This API is not generally intended for third party application developers.
@@ -48,7 +44,7 @@
* for consistent behavior across all devices.
* <p>
* This may be passed to apps by the session owner to allow them to create a
- * MediaController2 to communicate with the session.
+ * {@link MediaController2} to communicate with the session.
* <p>
* It can be also obtained by {@link android.media.session.MediaSessionManager}.
*/
@@ -68,13 +64,6 @@
};
/**
- * The {@link Intent} that must be declared for the session service.
- * @hide
- */
- @SystemApi
- public static final String SESSION_SERVICE_INTERFACE = "android.media.MediaSession2Service";
-
- /**
* @hide
*/
@Retention(RetentionPolicy.SOURCE)
@@ -83,26 +72,22 @@
}
/**
- * Type for MediaSession2.
+ * Type for {@link MediaSession2}.
*/
public static final int TYPE_SESSION = 0;
/**
- * Type for MediaSession2Service.
+ * Type for {@link MediaSession2Service}.
*/
public static final int TYPE_SESSION_SERVICE = 1;
- private final String mSessionId;
- private final int mPid;
private final int mUid;
@TokenType
private final int mType;
private final String mPackageName;
private final String mServiceName;
+ private final Session2Link mSessionLink;
private final ComponentName mComponentName;
- private final Bundle mExtras;
-
- private boolean mDestroyed = false;
/**
* Constructor for the token with type {@link #TYPE_SESSION_SERVICE}.
@@ -121,67 +106,44 @@
final PackageManager manager = context.getPackageManager();
final int uid = getUid(manager, serviceComponent.getPackageName());
- if (!isInterfaceDeclared(manager, SESSION_SERVICE_INTERFACE, serviceComponent)) {
+ if (!isInterfaceDeclared(manager, MediaSession2Service.SERVICE_INTERFACE,
+ serviceComponent)) {
Log.w(TAG, serviceComponent + " doesn't implement MediaSession2Service.");
}
- mSessionId = null;
mComponentName = serviceComponent;
mPackageName = serviceComponent.getPackageName();
mServiceName = serviceComponent.getClassName();
- mPid = -1;
mUid = uid;
mType = TYPE_SESSION_SERVICE;
- mExtras = null;
+ mSessionLink = null;
}
- /**
- * Constructor for the token with type {@link #TYPE_SESSION}.
- *
- * @param context The context.
- * @param sessionId The ID of the session. Should be unique.
- * @param extras The extras.
- * @hide
- */
- @SystemApi
- public Session2Token(@NonNull Context context, @NonNull String sessionId,
- @Nullable Bundle extras) {
- if (sessionId == null) {
- throw new IllegalArgumentException("sessionId shouldn't be null");
- }
- if (context == null) {
- throw new IllegalArgumentException("context shouldn't be null");
- }
- mSessionId = sessionId;
- mPid = Process.myPid();
- mUid = Process.myUid();
- mType = TYPE_SESSION;
- mPackageName = context.getPackageName();
- mExtras = extras;
+ Session2Token(int uid, int type, String packageName, Session2Link sessionLink) {
+ mUid = uid;
+ mType = type;
+ mPackageName = packageName;
mServiceName = null;
mComponentName = null;
+ mSessionLink = sessionLink;
}
Session2Token(Parcel in) {
- mSessionId = in.readString();
- mPid = in.readInt();
mUid = in.readInt();
mType = in.readInt();
mPackageName = in.readString();
mServiceName = in.readString();
+ mSessionLink = in.readParcelable(null);
mComponentName = ComponentName.unflattenFromString(in.readString());
- mExtras = in.readParcelable(null);
}
@Override
public void writeToParcel(Parcel dest, int flags) {
- dest.writeString(mSessionId);
- dest.writeInt(mPid);
dest.writeInt(mUid);
dest.writeInt(mType);
dest.writeString(mPackageName);
dest.writeString(mServiceName);
+ dest.writeParcelable(mSessionLink, flags);
dest.writeString(mComponentName == null ? "" : mComponentName.flattenToString());
- dest.writeParcelable(mExtras, flags);
}
@Override
@@ -191,7 +153,7 @@
@Override
public int hashCode() {
- return Objects.hash(mSessionId, mPid, mUid, mType, mPackageName, mServiceName);
+ return Objects.hash(mType, mUid, mPackageName, mServiceName, mSessionLink);
}
@Override
@@ -200,27 +162,17 @@
return false;
}
Session2Token other = (Session2Token) obj;
- return TextUtils.equals(mSessionId, other.mSessionId)
- && mPid == other.mPid
- && mUid == other.mUid
- && mType == other.mType
+ return mUid == other.mUid
&& TextUtils.equals(mPackageName, other.mPackageName)
- && TextUtils.equals(mServiceName, other.mServiceName);
+ && TextUtils.equals(mServiceName, other.mServiceName)
+ && mType == other.mType
+ && Objects.equals(mSessionLink, other.mSessionLink);
}
@Override
public String toString() {
return "Session2Token {pkg=" + mPackageName + " type=" + mType
- + " service=" + mServiceName + "}";
- }
-
- /**
- * @return pid of the session
- * @hide
- */
- @SystemApi
- public int getPid() {
- return mPid;
+ + " service=" + mServiceName + " Session2Link=" + mSessionLink + "}";
}
/**
@@ -255,36 +207,8 @@
return mType;
}
- /**
- * @return extras
- * @hide
- */
- @SystemApi
- @NonNull
- public Bundle getExtras() {
- return mExtras == null ? new Bundle() : new Bundle(mExtras);
- }
-
- /**
- * Destroys this session token. After this method is called,
- * {@link MediaSessionManager#notifySession2Created(Session2Token)} should not be called
- * with this token.
- *
- * @see MediaSessionManager#notifySession2Created(Session2Token)
- * @hide
- */
- @SystemApi
- public void destroy() {
- mDestroyed = true;
- }
-
- /**
- * @return whether this token is destroyed
- * @hide
- */
- @SystemApi
- public boolean isDestroyed() {
- return mDestroyed;
+ Session2Link getSessionLink() {
+ return mSessionLink;
}
private static boolean isInterfaceDeclared(PackageManager manager, String serviceInterface,
diff --git a/media/java/android/media/AudioSystem.java b/media/java/android/media/AudioSystem.java
index ffa3b24..9218e92 100644
--- a/media/java/android/media/AudioSystem.java
+++ b/media/java/android/media/AudioSystem.java
@@ -17,6 +17,7 @@
package android.media;
import android.annotation.NonNull;
+import android.annotation.TestApi;
import android.annotation.UnsupportedAppUsage;
import android.bluetooth.BluetoothCodecConfig;
import android.content.Context;
@@ -933,6 +934,13 @@
/** @hide enables or disables the master mono mode. */
public static native int setMasterMono(boolean mono);
+ /** @hide returns master balance value in range -1.f -> 1.f, where 0.f is dead center. */
+ @TestApi
+ public static native float getMasterBalance();
+ /** @hide changes the audio balance of the device. */
+ @TestApi
+ public static native int setMasterBalance(float balance);
+
// helpers for android.media.AudioManager.getProperty(), see description there for meaning
@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 112561552)
public static native int getPrimaryOutputSamplingRate();
diff --git a/media/java/android/media/CamcorderProfile.java b/media/java/android/media/CamcorderProfile.java
index 4f74ec9..963b1d1 100644
--- a/media/java/android/media/CamcorderProfile.java
+++ b/media/java/android/media/CamcorderProfile.java
@@ -97,9 +97,33 @@
*/
public static final int QUALITY_2160P = 8;
+ /**
+ * Quality level corresponding to the VGA (640 x 480) resolution.
+ * @hide
+ */
+ public static final int QUALITY_VGA = 9;
+
+ /**
+ * Quality level corresponding to 4k-DCI (4096 x 2160) resolution.
+ * @hide
+ */
+ public static final int QUALITY_4KDCI = 10;
+
+ /**
+ * Quality level corresponding to QHD (2560 x 1440) resolution
+ * @hide
+ */
+ public static final int QUALITY_QHD = 11;
+
+ /**
+ * Quality level corresponding to 2K (2048 x 1080) resolution
+ * @hide
+ */
+ public static final int QUALITY_2K = 12;
+
// Start and end of quality list
private static final int QUALITY_LIST_START = QUALITY_LOW;
- private static final int QUALITY_LIST_END = QUALITY_2160P;
+ private static final int QUALITY_LIST_END = QUALITY_2K;
/**
* Time lapse quality level corresponding to the lowest available resolution.
@@ -146,9 +170,34 @@
*/
public static final int QUALITY_TIME_LAPSE_2160P = 1008;
+ /**
+ * Time lapse quality level corresponding to the VGA (640 x 480) resolution.
+ * @hide
+ */
+ public static final int QUALITY_TIME_LAPSE_VGA = 1009;
+
+ /**
+ * Time lapse quality level corresponding to the 4k-DCI (4096 x 2160) resolution.
+ * @hide
+ */
+ public static final int QUALITY_TIME_LAPSE_4KDCI = 1010;
+
+ /**
+ * Time lapse quality level corresponding to the QHD (2560 x 1440) resolution.
+ * @hide
+ */
+ public static final int QUALITY_TIME_LAPSE_QHD = 1011;
+
+ /**
+ * Time lapse quality level corresponding to the 2K (2048 x 1080) resolution.
+ * @hide
+ */
+ public static final int QUALITY_TIME_LAPSE_2K = 1012;
+
+
// Start and end of timelapse quality list
private static final int QUALITY_TIME_LAPSE_LIST_START = QUALITY_TIME_LAPSE_LOW;
- private static final int QUALITY_TIME_LAPSE_LIST_END = QUALITY_TIME_LAPSE_2160P;
+ private static final int QUALITY_TIME_LAPSE_LIST_END = QUALITY_TIME_LAPSE_2K;
/**
* High speed ( >= 100fps) quality level corresponding to the lowest available resolution.
@@ -204,9 +253,27 @@
*/
public static final int QUALITY_HIGH_SPEED_2160P = 2005;
+ /**
+ * High speed ( >= 100fps) quality level corresponding to the CIF (352 x 288)
+ * @hide
+ */
+ public static final int QUALITY_HIGH_SPEED_CIF = 2006;
+
+ /**
+ * High speed ( >= 100fps) quality level corresponding to the VGA (640 x 480)
+ * @hide
+ */
+ public static final int QUALITY_HIGH_SPEED_VGA = 2007;
+
+ /**
+ * High speed ( >= 100fps) quality level corresponding to the 4K-DCI (4096 x 2160)
+ * @hide
+ */
+ public static final int QUALITY_HIGH_SPEED_4KDCI = 2008;
+
// Start and end of high speed quality list
private static final int QUALITY_HIGH_SPEED_LIST_START = QUALITY_HIGH_SPEED_LOW;
- private static final int QUALITY_HIGH_SPEED_LIST_END = QUALITY_HIGH_SPEED_2160P;
+ private static final int QUALITY_HIGH_SPEED_LIST_END = QUALITY_HIGH_SPEED_4KDCI;
/**
* Default recording duration in seconds before the session is terminated.
diff --git a/media/java/android/media/MediaCas.java b/media/java/android/media/MediaCas.java
index ce631a433..cf5711d 100644
--- a/media/java/android/media/MediaCas.java
+++ b/media/java/android/media/MediaCas.java
@@ -18,8 +18,12 @@
import android.annotation.NonNull;
import android.annotation.Nullable;
-import android.hardware.cas.V1_0.*;
+import android.hardware.cas.V1_0.HidlCasPluginDescriptor;
+import android.hardware.cas.V1_1.ICas;
+import android.hardware.cas.V1_1.ICasListener;
+import android.hardware.cas.V1_1.IMediaCasService;
import android.media.MediaCasException.*;
+import android.os.Bundle;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.IHwBinder;
@@ -128,6 +132,9 @@
private class EventHandler extends Handler
{
private static final int MSG_CAS_EVENT = 0;
+ private static final int MSG_CAS_SESSION_EVENT = 1;
+ private static final String SESSION_KEY = "sessionId";
+ private static final String DATA_KEY = "data";
public EventHandler(Looper looper) {
super(looper);
@@ -138,6 +145,12 @@
if (msg.what == MSG_CAS_EVENT) {
mListener.onEvent(MediaCas.this, msg.arg1, msg.arg2,
toBytes((ArrayList<Byte>) msg.obj));
+ } else if (msg.what == MSG_CAS_SESSION_EVENT) {
+ Bundle bundle = msg.getData();
+ ArrayList<Byte> sessionId = toByteArray(bundle.getByteArray(SESSION_KEY));
+ mListener.onSessionEvent(MediaCas.this,
+ createFromSessionId(sessionId), msg.arg1, msg.arg2,
+ bundle.getByteArray(DATA_KEY));
}
}
}
@@ -149,6 +162,20 @@
mEventHandler.sendMessage(mEventHandler.obtainMessage(
EventHandler.MSG_CAS_EVENT, event, arg, data));
}
+ @Override
+ public void onSessionEvent(@NonNull ArrayList<Byte> sessionId,
+ int event, int arg, @Nullable ArrayList<Byte> data)
+ throws RemoteException {
+ Message msg = mEventHandler.obtainMessage();
+ msg.what = EventHandler.MSG_CAS_SESSION_EVENT;
+ msg.arg1 = event;
+ msg.arg2 = arg;
+ Bundle bundle = new Bundle();
+ bundle.putByteArray(EventHandler.SESSION_KEY, toBytes(sessionId));
+ bundle.putByteArray(EventHandler.DATA_KEY, toBytes(data));
+ msg.setData(bundle);
+ mEventHandler.sendMessage(msg);
+ }
};
/**
@@ -222,6 +249,20 @@
}
/**
+ * Query if an object equal current Session object.
+ *
+ * @param obj an object to compare to current Session object.
+ *
+ * @return Whether input object equal current Session object.
+ */
+ public boolean equals(Object obj) {
+ if (obj instanceof Session) {
+ return mSessionId.equals(((Session) obj).mSessionId);
+ }
+ return false;
+ }
+
+ /**
* Set the private data for a session.
*
* @param data byte array of the private data.
@@ -282,6 +323,30 @@
}
/**
+ * Send a session event to a CA system. The format of the event is
+ * scheme-specific and is opaque to the framework.
+ *
+ * @param event an integer denoting a scheme-specific event to be sent.
+ * @param arg a scheme-specific integer argument for the event.
+ * @param data a byte array containing scheme-specific data for the event.
+ *
+ * @throws IllegalStateException if the MediaCas instance is not valid.
+ * @throws MediaCasException for CAS-specific errors.
+ * @throws MediaCasStateException for CAS-specific state exceptions.
+ */
+ public void sendSessionEvent(int event, int arg, @Nullable byte[] data)
+ throws MediaCasException {
+ validateInternalStates();
+
+ try {
+ MediaCasException.throwExceptionIfNeeded(
+ mICas.sendSessionEvent(mSessionId, event, arg, toByteArray(data)));
+ } catch (RemoteException e) {
+ cleanupAndRethrowIllegalState();
+ }
+ }
+
+ /**
* Close the session.
*
* @throws IllegalStateException if the MediaCas instance is not valid.
@@ -362,7 +427,7 @@
*/
public MediaCas(int CA_system_id) throws UnsupportedCasException {
try {
- mICas = getService().createPlugin(CA_system_id, mBinder);
+ mICas = getService().createPluginExt(CA_system_id, mBinder);
} catch(Exception e) {
Log.e(TAG, "Failed to create plugin: " + e);
mICas = null;
@@ -388,13 +453,28 @@
/**
* Notify the listener of a scheme-specific event from the CA system.
*
- * @param MediaCas the MediaCas object to receive this event.
+ * @param mediaCas the MediaCas object to receive this event.
* @param event an integer whose meaning is scheme-specific.
* @param arg an integer whose meaning is scheme-specific.
* @param data a byte array of data whose format and meaning are
* scheme-specific.
*/
- void onEvent(MediaCas MediaCas, int event, int arg, @Nullable byte[] data);
+ void onEvent(@NonNull MediaCas mediaCas, int event, int arg, @Nullable byte[] data);
+
+ /**
+ * Notify the listener of a scheme-specific session event from CA system.
+ *
+ * @param mediaCas the MediaCas object to receive this event.
+ * @param session session object which the event is for.
+ * @param event an integer whose meaning is scheme-specific.
+ * @param arg an integer whose meaning is scheme-specific.
+ * @param data a byte array of data whose format and meaning are
+ * scheme-specific.
+ */
+ default void onSessionEvent(@NonNull MediaCas mediaCas, @NonNull Session session,
+ int event, int arg, @Nullable byte[] data) {
+ Log.d(TAG, "Received MediaCas Session event");
+ }
}
/**
@@ -543,7 +623,7 @@
}
}
- /**
+ /**
* Initiate a provisioning operation for a CA system.
*
* @param provisionString string containing information needed for the
@@ -603,4 +683,4 @@
protected void finalize() {
close();
}
-}
\ No newline at end of file
+}
diff --git a/media/java/android/media/session/ISessionManager.aidl b/media/java/android/media/session/ISessionManager.aidl
index edaa55d..8143bfa 100644
--- a/media/java/android/media/session/ISessionManager.aidl
+++ b/media/java/android/media/session/ISessionManager.aidl
@@ -37,7 +37,6 @@
SessionLink createSession(String packageName, in SessionCallbackLink sessionCb, String tag,
int userId);
void notifySession2Created(in Session2Token sessionToken);
- void notifySession2Destroyed(in Session2Token sessionToken);
List<MediaSession.Token> getSessions(in ComponentName compName, int userId);
List<Session2Token> getSession2Tokens(int userId);
void dispatchMediaKeyEvent(String packageName, boolean asSystemService, in KeyEvent keyEvent,
diff --git a/media/java/android/media/session/MediaSessionManager.java b/media/java/android/media/session/MediaSessionManager.java
index bd8eadd..46f6c71 100644
--- a/media/java/android/media/session/MediaSessionManager.java
+++ b/media/java/android/media/session/MediaSessionManager.java
@@ -26,6 +26,7 @@
import android.content.Context;
import android.media.AudioManager;
import android.media.IRemoteVolumeController;
+import android.media.MediaSession2;
import android.media.Session2Token;
import android.os.Handler;
import android.os.IBinder;
@@ -114,11 +115,11 @@
}
/**
- * Notifies that a new MediaSession2 with type {@link Session2Token#TYPE_SESSION} is
+ * Notifies that a new {@link MediaSession2} with type {@link Session2Token#TYPE_SESSION} is
* created.
* <p>
* Do not use this API directly, but create a new instance through the
- * MediaSession2.Builder instead.
+ * {@link MediaSession2.Builder} instead.
*
* @param token newly created session2 token
*/
@@ -129,9 +130,6 @@
if (token.getType() != Session2Token.TYPE_SESSION) {
throw new IllegalArgumentException("token's type should be TYPE_SESSION");
}
- if (token.isDestroyed()) {
- throw new IllegalArgumentException("token is already destroyed");
- }
try {
mService.notifySession2Created(token);
} catch (RemoteException e) {
@@ -140,31 +138,6 @@
}
/**
- * Notifies that a new MediaSession2 with type {@link Session2Token#TYPE_SESSION} is
- * destroyed.
- * <p>
- * Do not use this API directly, but close a session with MediaSession2#close() instead.
- *
- * @param token destroyed session2 token
- */
- public void notifySession2Destroyed(@NonNull Session2Token token) {
- if (token == null) {
- throw new IllegalArgumentException("token shouldn't be null");
- }
- if (token.getType() != Session2Token.TYPE_SESSION) {
- throw new IllegalArgumentException("token's type should be TYPE_SESSION");
- }
- if (!token.isDestroyed()) {
- throw new IllegalArgumentException("token should have been destroyed");
- }
- try {
- mService.notifySession2Destroyed(token);
- } catch (RemoteException e) {
- e.rethrowFromSystemServer();
- }
- }
-
- /**
* Get a list of controllers for all ongoing sessions. The controllers will
* be provided in priority order with the most important controller at index
* 0.
@@ -219,7 +192,7 @@
* current user.
* <p>
* Although this API can be used without any restriction, each session owners can accept or
- * reject your uses of MediaSession2.
+ * reject your uses of {@link MediaSession2}.
*
* @return A list of {@link Session2Token}.
*/
diff --git a/media/jni/Android.bp b/media/jni/Android.bp
index f1bb13d..8ed265d 100644
--- a/media/jni/Android.bp
+++ b/media/jni/Android.bp
@@ -48,6 +48,7 @@
"libmtp",
"libexif",
"libpiex",
+ "libprocessgroup",
"libandroidfw",
"libhidlallocatorutils",
"libhidlbase",
@@ -123,6 +124,7 @@
"libbase",
"libcrypto",
"libcutils",
+ "libjsoncpp",
"libmedia_helper",
"libmedia_player2_util",
"libmediaplayer2",
diff --git a/media/native/midi/include/Doxyfile b/media/native/midi/include/Doxyfile
new file mode 100644
index 0000000..2828f48
--- /dev/null
+++ b/media/native/midi/include/Doxyfile
@@ -0,0 +1,2494 @@
+# Doxyfile 1.8.13
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME = "Android Native MIDI API (AMidi)"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF =" Android Native MIDI API (AMidi)"
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY =
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF = "The $name class" \
+ "The $name widget" \
+ "The $name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET = YES
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT = "midi.h"
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+
+FILE_PATTERNS = *.c \
+ *.cc \
+ *.cxx \
+ *.cpp \
+ *.c++ \
+ *.java \
+ *.ii \
+ *.ixx \
+ *.ipp \
+ *.i++ \
+ *.inl \
+ *.idl \
+ *.ddl \
+ *.odl \
+ *.h \
+ *.hh \
+ *.hxx \
+ *.hpp \
+ *.h++ \
+ *.cs \
+ *.d \
+ *.php \
+ *.php4 \
+ *.php5 \
+ *.phtml \
+ *.inc \
+ *.m \
+ *.markdown \
+ *.md \
+ *.mm \
+ *.dox \
+ *.py \
+ *.pyw \
+ *.f90 \
+ *.f95 \
+ *.f03 \
+ *.f08 \
+ *.f \
+ *.for \
+ *.tcl \
+ *.vhd \
+ *.vhdl \
+ *.ucf \
+ *.qsf
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS = NO
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse-libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE = NO
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: YES.
+
+HAVE_DOT = YES
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH = NO
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP = YES
diff --git a/media/native/midi/include/Doxyfile.orig b/media/native/midi/include/Doxyfile.orig
new file mode 100644
index 0000000..e56fb18
--- /dev/null
+++ b/media/native/midi/include/Doxyfile.orig
@@ -0,0 +1,2494 @@
+# Doxyfile 1.8.13
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME = "My Project"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY =
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF = "The $name class" \
+ "The $name widget" \
+ "The $name file" \
+ is \
+ provides \
+ specifies \
+ contains \
+ represents \
+ a \
+ an \
+ the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT =
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+
+FILE_PATTERNS = *.c \
+ *.cc \
+ *.cxx \
+ *.cpp \
+ *.c++ \
+ *.java \
+ *.ii \
+ *.ixx \
+ *.ipp \
+ *.i++ \
+ *.inl \
+ *.idl \
+ *.ddl \
+ *.odl \
+ *.h \
+ *.hh \
+ *.hxx \
+ *.hpp \
+ *.h++ \
+ *.cs \
+ *.d \
+ *.php \
+ *.php4 \
+ *.php5 \
+ *.phtml \
+ *.inc \
+ *.m \
+ *.markdown \
+ *.md \
+ *.mm \
+ *.dox \
+ *.py \
+ *.pyw \
+ *.f90 \
+ *.f95 \
+ *.f03 \
+ *.f08 \
+ *.f \
+ *.for \
+ *.tcl \
+ *.vhd \
+ *.vhdl \
+ *.ucf \
+ *.qsf
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS = YES
+
+# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the
+# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the
+# cost of reduced performance. This can be particularly helpful with template
+# rich C++ code for which doxygen's built-in parser lacks the necessary type
+# information.
+# Note: The availability of this option depends on whether or not doxygen was
+# generated with the -Duse-libclang=ON option for CMake.
+# The default value is: NO.
+
+CLANG_ASSISTED_PARSING = NO
+
+# If clang assisted parsing is enabled you can provide the compiler with command
+# line options that you would normally use when invoking the compiler. Note that
+# the include paths will already be set by doxygen for the files and directories
+# specified with INPUT and INCLUDE_PATH.
+# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES.
+
+CLANG_OPTIONS =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP = NO
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sf.net) file that captures the
+# structure of the code including all documentation. Note that this feature is
+# still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: YES.
+
+HAVE_DOT = YES
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd,
+# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo,
+# gif:cairo:gd, gif:gd, gif:gd:gd, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP = YES
diff --git a/native/android/surface_control.cpp b/native/android/surface_control.cpp
index 3156732..416ef42 100644
--- a/native/android/surface_control.cpp
+++ b/native/android/surface_control.cpp
@@ -499,7 +499,5 @@
color.g = g;
color.b = b;
- transaction->setColor(surfaceControl, color)
- .setColorAlpha(surfaceControl, alpha)
- .setColorDataspace(surfaceControl, static_cast<ui::Dataspace>(dataspace));
+ transaction->setBackgroundColor(surfaceControl, color, alpha, static_cast<ui::Dataspace>(dataspace));
}
diff --git a/packages/BackupRestoreConfirmation/res/values-en-rXC/strings.xml b/packages/BackupRestoreConfirmation/res/values-en-rXC/strings.xml
index c42abe4..1db4a2a 100644
--- a/packages/BackupRestoreConfirmation/res/values-en-rXC/strings.xml
+++ b/packages/BackupRestoreConfirmation/res/values-en-rXC/strings.xml
@@ -16,24 +16,24 @@
<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">"Full backup"</string>
- <string name="restore_confirm_title" msgid="5469365809567486602">"Full restore"</string>
- <string name="backup_confirm_text" msgid="1878021282758896593">"A full backup of all data to a connected desktop computer has been requested. Do you want to allow this to happen?\n\nIf you did not request the backup yourself, do not allow the operation to proceed."</string>
- <string name="allow_backup_button_label" msgid="4217228747769644068">"Back up my data"</string>
- <string name="deny_backup_button_label" msgid="6009119115581097708">"Do not back up"</string>
- <string name="restore_confirm_text" msgid="7499866728030461776">"A full restore of all data from a connected desktop computer has been requested. Do you want to allow this to happen?\n\nIf you did not request the restore yourself, do not allow the operation to proceed. This will replace any data currently on the device!"</string>
- <string name="allow_restore_button_label" msgid="3081286752277127827">"Restore my data"</string>
- <string name="deny_restore_button_label" msgid="1724367334453104378">"Do not restore"</string>
- <string name="current_password_text" msgid="8268189555578298067">"Please enter your current backup password below:"</string>
- <string name="device_encryption_restore_text" msgid="1570864916855208992">"Please enter your device encryption password below."</string>
- <string name="device_encryption_backup_text" msgid="5866590762672844664">"Please enter your device encryption password below. This will also be used to encrypt the backup archive."</string>
- <string name="backup_enc_password_text" msgid="4981585714795233099">"Please enter a password to use for encrypting the full backup data. If this is left blank, your current backup password will be used:"</string>
- <string name="backup_enc_password_optional" msgid="1350137345907579306">"If you wish to encrypt the full backup data, enter a password below:"</string>
- <string name="backup_enc_password_required" msgid="7889652203371654149">"Since your device is encrypted, you are required to encrypt your backup. Please enter a password below:"</string>
- <string name="restore_enc_password_text" msgid="6140898525580710823">"If the restore data is encrypted, please enter the password below:"</string>
- <string name="toast_backup_started" msgid="550354281452756121">"Backup starting..."</string>
- <string name="toast_backup_ended" msgid="3818080769548726424">"Backup finished"</string>
- <string name="toast_restore_started" msgid="7881679218971277385">"Restore starting..."</string>
- <string name="toast_restore_ended" msgid="1764041639199696132">"Restore ended"</string>
- <string name="toast_timeout" msgid="5276598587087626877">"Operation timed out"</string>
+ <string name="backup_confirm_title" msgid="827563724209303345">"Full backup"</string>
+ <string name="restore_confirm_title" msgid="5469365809567486602">"Full restore"</string>
+ <string name="backup_confirm_text" msgid="1878021282758896593">"A full backup of all data to a connected desktop computer has been requested. Do you want to allow this to happen?\n\nIf you did not request the backup yourself, do not allow the operation to proceed."</string>
+ <string name="allow_backup_button_label" msgid="4217228747769644068">"Back up my data"</string>
+ <string name="deny_backup_button_label" msgid="6009119115581097708">"Do not back up"</string>
+ <string name="restore_confirm_text" msgid="7499866728030461776">"A full restore of all data from a connected desktop computer has been requested. Do you want to allow this to happen?\n\nIf you did not request the restore yourself, do not allow the operation to proceed. This will replace any data currently on the device!"</string>
+ <string name="allow_restore_button_label" msgid="3081286752277127827">"Restore my data"</string>
+ <string name="deny_restore_button_label" msgid="1724367334453104378">"Do not restore"</string>
+ <string name="current_password_text" msgid="8268189555578298067">"Please enter your current backup password below:"</string>
+ <string name="device_encryption_restore_text" msgid="1570864916855208992">"Please enter your device encryption password below."</string>
+ <string name="device_encryption_backup_text" msgid="5866590762672844664">"Please enter your device encryption password below. This will also be used to encrypt the backup archive."</string>
+ <string name="backup_enc_password_text" msgid="4981585714795233099">"Please enter a password to use for encrypting the full backup data. If this is left blank, your current backup password will be used:"</string>
+ <string name="backup_enc_password_optional" msgid="1350137345907579306">"If you wish to encrypt the full backup data, enter a password below:"</string>
+ <string name="backup_enc_password_required" msgid="7889652203371654149">"Since your device is encrypted, you are required to encrypt your backup. Please enter a password below:"</string>
+ <string name="restore_enc_password_text" msgid="6140898525580710823">"If the restore data is encrypted, please enter the password below:"</string>
+ <string name="toast_backup_started" msgid="550354281452756121">"Backup starting..."</string>
+ <string name="toast_backup_ended" msgid="3818080769548726424">"Backup finished"</string>
+ <string name="toast_restore_started" msgid="7881679218971277385">"Restore starting..."</string>
+ <string name="toast_restore_ended" msgid="1764041639199696132">"Restore ended"</string>
+ <string name="toast_timeout" msgid="5276598587087626877">"Operation timed out"</string>
</resources>
diff --git a/packages/CaptivePortalLogin/res/values-en-rXC/strings.xml b/packages/CaptivePortalLogin/res/values-en-rXC/strings.xml
index b9cc419..8b3ca29 100644
--- a/packages/CaptivePortalLogin/res/values-en-rXC/strings.xml
+++ b/packages/CaptivePortalLogin/res/values-en-rXC/strings.xml
@@ -1,24 +1,24 @@
<?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">"Use this network as is"</string>
- <string name="action_do_not_use_network" msgid="4577366536956516683">"Do not use this network"</string>
- <string name="action_bar_label" msgid="917235635415966620">"Sign in to network"</string>
- <string name="action_bar_title" msgid="5645564790486983117">"Sign in to %1$s"</string>
- <string name="ssl_error_warning" msgid="6653188881418638872">"The network you’re trying to join has security issues."</string>
- <string name="ssl_error_example" msgid="647898534624078900">"For example, the login page may not belong to the organization shown."</string>
- <string name="ssl_error_continue" msgid="6492718244923937110">"Continue anyway via browser"</string>
- <string name="ssl_error_untrusted" msgid="1496280318271264520">"This certificate isn\'t from a trusted authority."</string>
- <string name="ssl_error_mismatch" msgid="3060364165934822383">"The name of the site doesn\'t match the name on the certificate."</string>
- <string name="ssl_error_expired" msgid="1501588340716182495">"This certificate has expired."</string>
- <string name="ssl_error_not_yet_valid" msgid="8648649030525886924">"This certificate isn\'t valid yet."</string>
- <string name="ssl_error_date_invalid" msgid="88425990680059223">"This certificate has an invalid date."</string>
- <string name="ssl_error_invalid" msgid="2540546515565633432">"This certificate is invalid."</string>
- <string name="ssl_error_unknown" msgid="4405203446079465859">"Unknown certificate error."</string>
- <string name="ssl_security_warning_title" msgid="8768539813847504404">"Security warning"</string>
- <string name="ssl_error_view_certificate" msgid="5722652540168339333">"View certificate"</string>
- <string name="ok" msgid="2817931639040794018">"OK"</string>
- <string name="page_info_address" msgid="1261481517455692363">"Address:"</string>
- <string name="page_info" msgid="4416941086705172545">"Page info"</string>
+ <string name="app_name" msgid="5934709770924185752">"CaptivePortalLogin"</string>
+ <string name="action_use_network" msgid="6076184727448466030">"Use this network as is"</string>
+ <string name="action_do_not_use_network" msgid="4577366536956516683">"Do not use this network"</string>
+ <string name="action_bar_label" msgid="917235635415966620">"Sign in to network"</string>
+ <string name="action_bar_title" msgid="5645564790486983117">"Sign in to %1$s"</string>
+ <string name="ssl_error_warning" msgid="6653188881418638872">"The network you’re trying to join has security issues."</string>
+ <string name="ssl_error_example" msgid="647898534624078900">"For example, the login page may not belong to the organization shown."</string>
+ <string name="ssl_error_continue" msgid="6492718244923937110">"Continue anyway via browser"</string>
+ <string name="ssl_error_untrusted" msgid="1496280318271264520">"This certificate isn\'t from a trusted authority."</string>
+ <string name="ssl_error_mismatch" msgid="3060364165934822383">"The name of the site doesn\'t match the name on the certificate."</string>
+ <string name="ssl_error_expired" msgid="1501588340716182495">"This certificate has expired."</string>
+ <string name="ssl_error_not_yet_valid" msgid="8648649030525886924">"This certificate isn\'t valid yet."</string>
+ <string name="ssl_error_date_invalid" msgid="88425990680059223">"This certificate has an invalid date."</string>
+ <string name="ssl_error_invalid" msgid="2540546515565633432">"This certificate is invalid."</string>
+ <string name="ssl_error_unknown" msgid="4405203446079465859">"Unknown certificate error."</string>
+ <string name="ssl_security_warning_title" msgid="8768539813847504404">"Security warning"</string>
+ <string name="ssl_error_view_certificate" msgid="5722652540168339333">"View certificate"</string>
+ <string name="ok" msgid="2817931639040794018">"OK"</string>
+ <string name="page_info_address" msgid="1261481517455692363">"Address:"</string>
+ <string name="page_info" msgid="4416941086705172545">"Page info"</string>
</resources>
diff --git a/packages/CarSystemUI/res/values/colors.xml b/packages/CarSystemUI/res/values/colors.xml
index 1e38f26..7b4e32b 100644
--- a/packages/CarSystemUI/res/values/colors.xml
+++ b/packages/CarSystemUI/res/values/colors.xml
@@ -16,22 +16,18 @@
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<color name="nav_bar_ripple_background_color">#40ffffff</color>
- <color name="car_accent">#356FE5</color>
<!-- colors for user switcher -->
<color name="car_user_switcher_background_color">#000000</color>
- <color name="car_user_switcher_name_text_color">@color/car_body1_light</color>
+ <color name="car_user_switcher_name_text_color">@*android:color/car_body1_light</color>
<color name="car_user_switcher_add_user_background_color">#131313</color>
- <color name="car_nav_icon_fill_color">@color/car_grey_50</color>
+ <color name="car_nav_icon_fill_color">@*android:color/car_grey_50</color>
<!-- colors for seekbar -->
<color name="car_seekbar_track_background">#131315</color>
- <color name="car_seekbar_track_secondary_progress">@color/car_accent</color>
+ <color name="car_seekbar_track_secondary_progress">@*android:color/car_accent</color>
<!-- colors for volume dialog tint -->
- <color name="car_volume_dialog_tint">@color/car_tint_light</color>
+ <color name="car_volume_dialog_tint">@*android:color/car_tint</color>
- <!-- System ui can't depend on car libs so redefine. -->
- <color name="car_grey_50">#fffafafa</color>
-
- <color name="docked_divider_background">@color/car_grey_50</color>
+ <color name="docked_divider_background">@*android:color/car_grey_50</color>
<color name="system_bar_background_opaque">#ff172026</color>
<color name="status_bar_background_color">#33000000</color>
@@ -46,10 +42,6 @@
<!-- The color of the ripples on the untinted notifications -->
<color name="notification_ripple_untinted_color">@color/ripple_material_light</color>
- <color name="car_teal_700">#ff00796b</color>
- <color name="car_grey_300">#ffe0e0e0</color>
- <color name="car_grey_900">#ff212121</color>
-
<color name="keyguard_button_text_color">@android:color/black</color>
<color name="list_divider_color">@*android:color/car_list_divider_light</color>
diff --git a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
index e66a4624..2dba1d5b 100644
--- a/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
+++ b/packages/CarSystemUI/src/com/android/systemui/statusbar/car/CarStatusBar.java
@@ -105,8 +105,6 @@
mHvacController.connectToCarService();
CarSystemUIFactory factory = SystemUIFactory.getInstance();
- mCarFacetButtonController = factory.getCarDependencyComponent()
- .getCarFacetButtonController();
mDeviceProvisionedController = Dependency.get(DeviceProvisionedController.class);
mDeviceIsProvisioned = mDeviceProvisionedController.isDeviceProvisioned();
if (!mDeviceIsProvisioned) {
@@ -137,7 +135,7 @@
/**
* Remove all content from navbars and rebuild them. Used to allow for different nav bars
- * before and after the device is provisioned
+ * before and after the device is provisioned. . Also for change of density and font size.
*/
private void restartNavBars() {
// remove and reattach all hvac components such that we don't keep a reference to unused
@@ -253,6 +251,9 @@
super.makeStatusBarView();
mHvacController = new HvacController(mContext);
+ CarSystemUIFactory factory = SystemUIFactory.getInstance();
+ mCarFacetButtonController = factory.getCarDependencyComponent()
+ .getCarFacetButtonController();
mNotificationPanelBackground = getDefaultWallpaper();
mScrimController.setScrimBehindDrawable(mNotificationPanelBackground);
@@ -589,6 +590,7 @@
@Override
public void onDensityOrFontScaleChanged() {
super.onDensityOrFontScaleChanged();
+ restartNavBars();
// Need to update the background on density changed in case the change was due to night
// mode.
mNotificationPanelBackground = getDefaultWallpaper();
diff --git a/packages/CarrierDefaultApp/res/values-en-rXC/strings.xml b/packages/CarrierDefaultApp/res/values-en-rXC/strings.xml
index e30795d..d7ae1ce 100644
--- a/packages/CarrierDefaultApp/res/values-en-rXC/strings.xml
+++ b/packages/CarrierDefaultApp/res/values-en-rXC/strings.xml
@@ -1,17 +1,17 @@
<?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="5247871339820894594">"CarrierDefaultApp"</string>
- <string name="android_system_label" msgid="2797790869522345065">"Mobile Carrier"</string>
- <string name="portal_notification_id" msgid="5155057562457079297">"Mobile data has run out"</string>
- <string name="no_data_notification_id" msgid="668400731803969521">"Your mobile data has been deactivated"</string>
- <string name="portal_notification_detail" msgid="2295729385924660881">"Tap to visit the %s website"</string>
- <string name="no_data_notification_detail" msgid="3112125343857014825">"Please contact your service provider %s"</string>
- <string name="no_mobile_data_connection_title" msgid="7449525772416200578">"No mobile data connection"</string>
- <string name="no_mobile_data_connection" msgid="544980465184147010">"Add data or roaming plan through %s"</string>
- <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"Mobile data status"</string>
- <string name="action_bar_label" msgid="4290345990334377177">"Sign in to mobile network"</string>
- <string name="ssl_error_warning" msgid="3127935140338254180">"The network you’re trying to join has security issues."</string>
- <string name="ssl_error_example" msgid="6188711843183058764">"For example, the login page may not belong to the organization shown."</string>
- <string name="ssl_error_continue" msgid="1138548463994095584">"Continue anyway via browser"</string>
+ <string name="app_name" msgid="5247871339820894594">"CarrierDefaultApp"</string>
+ <string name="android_system_label" msgid="2797790869522345065">"Mobile Carrier"</string>
+ <string name="portal_notification_id" msgid="5155057562457079297">"Mobile data has run out"</string>
+ <string name="no_data_notification_id" msgid="668400731803969521">"Your mobile data has been deactivated"</string>
+ <string name="portal_notification_detail" msgid="2295729385924660881">"Tap to visit the %s website"</string>
+ <string name="no_data_notification_detail" msgid="3112125343857014825">"Please contact your service provider %s"</string>
+ <string name="no_mobile_data_connection_title" msgid="7449525772416200578">"No mobile data connection"</string>
+ <string name="no_mobile_data_connection" msgid="544980465184147010">"Add data or roaming plan through %s"</string>
+ <string name="mobile_data_status_notification_channel_name" msgid="833999690121305708">"Mobile data status"</string>
+ <string name="action_bar_label" msgid="4290345990334377177">"Sign in to mobile network"</string>
+ <string name="ssl_error_warning" msgid="3127935140338254180">"The network you’re trying to join has security issues."</string>
+ <string name="ssl_error_example" msgid="6188711843183058764">"For example, the login page may not belong to the organization shown."</string>
+ <string name="ssl_error_continue" msgid="1138548463994095584">"Continue anyway via browser"</string>
</resources>
diff --git a/packages/DefaultContainerService/res/values-en-rXC/strings.xml b/packages/DefaultContainerService/res/values-en-rXC/strings.xml
index d062fa8..913f4bd 100644
--- a/packages/DefaultContainerService/res/values-en-rXC/strings.xml
+++ b/packages/DefaultContainerService/res/values-en-rXC/strings.xml
@@ -20,5 +20,5 @@
<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">"Package Access Helper"</string>
+ <string name="service_name" msgid="4841491635055379553">"Package Access Helper"</string>
</resources>
diff --git a/packages/ExtServices/AndroidManifest.xml b/packages/ExtServices/AndroidManifest.xml
index 7fb51b9..fe6581b 100644
--- a/packages/ExtServices/AndroidManifest.xml
+++ b/packages/ExtServices/AndroidManifest.xml
@@ -24,6 +24,8 @@
<uses-permission android:name="android.permission.PROVIDE_RESOLVER_RANKER_SERVICE" />
<uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />
+ <uses-permission android:name="android.permission.MONITOR_DEFAULT_SMS_PACKAGE" />
+
<application android:label="@string/app_name"
android:defaultToDeviceProtectedStorage="true"
android:directBootAware="true">
diff --git a/packages/ExtServices/src/android/ext/services/notification/Assistant.java b/packages/ExtServices/src/android/ext/services/notification/Assistant.java
index fe931ff..b7d8492 100644
--- a/packages/ExtServices/src/android/ext/services/notification/Assistant.java
+++ b/packages/ExtServices/src/android/ext/services/notification/Assistant.java
@@ -214,7 +214,8 @@
if (!isForCurrentUser(sbn)) {
return null;
}
- NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel);
+ NotificationEntry entry =
+ new NotificationEntry(mPackageManager, sbn, channel, SmsHelper.getInstance(this));
SmartActionsHelper.SmartSuggestions suggestions = mSmartActionsHelper.suggest(entry);
return createEnqueuedNotificationAdjustment(
entry, suggestions.actions, suggestions.replies);
@@ -261,7 +262,7 @@
Ranking ranking = getRanking(sbn.getKey(), rankingMap);
if (ranking != null && ranking.getChannel() != null) {
NotificationEntry entry = new NotificationEntry(mPackageManager,
- sbn, ranking.getChannel());
+ sbn, ranking.getChannel(), SmsHelper.getInstance(this));
String key = getKey(
sbn.getPackageName(), sbn.getUserId(), ranking.getChannel().getId());
ChannelImpressions ci = mkeyToImpressions.getOrDefault(key,
@@ -397,6 +398,7 @@
@Override
public void onListenerConnected() {
if (DEBUG) Log.i(TAG, "CONNECTED");
+ SmsHelper.getInstance(this).initialize();
try {
mFile = new AtomicFile(new File(new File(
Environment.getDataUserCePackageDirectory(
@@ -413,6 +415,7 @@
@Override
public void onListenerDisconnected() {
+ SmsHelper.getInstance(this).destroy();
if (mAgingHelper != null) {
mAgingHelper.onDestroy();
}
diff --git a/packages/ExtServices/src/android/ext/services/notification/NotificationEntry.java b/packages/ExtServices/src/android/ext/services/notification/NotificationEntry.java
index ce2c409..546bec2 100644
--- a/packages/ExtServices/src/android/ext/services/notification/NotificationEntry.java
+++ b/packages/ExtServices/src/android/ext/services/notification/NotificationEntry.java
@@ -27,6 +27,7 @@
import android.app.NotificationChannel;
import android.app.Person;
import android.app.RemoteInput;
+import android.content.ComponentName;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
import android.content.pm.PackageManager;
@@ -56,15 +57,17 @@
private boolean mSeen;
private boolean mExpanded;
private boolean mIsShowActionEventLogged;
+ private SmsHelper mSmsHelper;
public NotificationEntry(IPackageManager packageManager, StatusBarNotification sbn,
- NotificationChannel channel) {
+ NotificationChannel channel, SmsHelper smsHelper) {
mSbn = sbn;
mChannel = channel;
mPackageManager = packageManager;
mPreChannelsNotification = isPreChannelsNotification();
mAttributes = calculateAudioAttributes();
mImportance = calculateInitialImportance();
+ mSmsHelper = smsHelper;
}
private boolean isPreChannelsNotification() {
@@ -192,7 +195,16 @@
protected boolean involvesPeople() {
return isMessaging()
|| hasStyle(Notification.InboxStyle.class)
- || hasPerson();
+ || hasPerson()
+ || isDefaultSmsApp();
+ }
+
+ private boolean isDefaultSmsApp() {
+ ComponentName defaultSmsApp = mSmsHelper.getDefaultSmsApplication();
+ if (defaultSmsApp == null) {
+ return false;
+ }
+ return mSbn.getPackageName().equals(defaultSmsApp.getPackageName());
}
protected boolean isMessaging() {
diff --git a/packages/ExtServices/src/android/ext/services/notification/SmsHelper.java b/packages/ExtServices/src/android/ext/services/notification/SmsHelper.java
new file mode 100644
index 0000000..b077138
--- /dev/null
+++ b/packages/ExtServices/src/android/ext/services/notification/SmsHelper.java
@@ -0,0 +1,87 @@
+/**
+ * Copyright (C) 2019 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.ext.services.notification;
+
+import static android.provider.Telephony.Sms.Intents.ACTION_DEFAULT_SMS_PACKAGE_CHANGED_INTERNAL;
+
+import android.annotation.Nullable;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.util.Log;
+
+import com.android.internal.telephony.SmsApplication;
+
+/**
+ * A helper class for storing and retrieving the default SMS application.
+ */
+public class SmsHelper {
+ private static final String TAG = "SmsHelper";
+
+ private static SmsHelper sSmsHelper;
+ private static final Object sLock = new Object();
+
+ private final Context mContext;
+ private ComponentName mDefaultSmsApplication;
+ private BroadcastReceiver mBroadcastReceiver;
+
+ static SmsHelper getInstance(Context context) {
+ synchronized (sLock) {
+ if (sSmsHelper == null) {
+ sSmsHelper = new SmsHelper(context);
+ }
+ return sSmsHelper;
+ }
+ }
+
+ private SmsHelper(Context context) {
+ mContext = context.getApplicationContext();
+ }
+
+ void initialize() {
+ if (mBroadcastReceiver == null) {
+ mDefaultSmsApplication = SmsApplication.getDefaultSmsApplication(mContext, false);
+ mBroadcastReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (ACTION_DEFAULT_SMS_PACKAGE_CHANGED_INTERNAL.equals(intent.getAction())) {
+ mDefaultSmsApplication =
+ SmsApplication.getDefaultSmsApplication(mContext, false);
+ } else {
+ Log.w(TAG, "Unknown broadcast received: " + intent.getAction());
+ }
+ }
+ };
+ mContext.registerReceiver(
+ mBroadcastReceiver,
+ new IntentFilter(ACTION_DEFAULT_SMS_PACKAGE_CHANGED_INTERNAL));
+ }
+ }
+
+ void destroy() {
+ if (mBroadcastReceiver != null) {
+ mContext.unregisterReceiver(mBroadcastReceiver);
+ mBroadcastReceiver = null;
+ }
+ }
+
+ @Nullable
+ public ComponentName getDefaultSmsApplication() {
+ return mDefaultSmsApplication;
+ }
+}
diff --git a/packages/ExtServices/tests/src/android/ext/services/notification/AgingHelperTest.java b/packages/ExtServices/tests/src/android/ext/services/notification/AgingHelperTest.java
index b023b36..90018e5f 100644
--- a/packages/ExtServices/tests/src/android/ext/services/notification/AgingHelperTest.java
+++ b/packages/ExtServices/tests/src/android/ext/services/notification/AgingHelperTest.java
@@ -67,6 +67,8 @@
private IPackageManager mPackageManager;
@Mock
private AgingHelper.Callback mCallback;
+ @Mock
+ private SmsHelper mSmsHelper;
private AgingHelper mAgingHelper;
@@ -99,7 +101,7 @@
public void testNoSnoozingOnPost() {
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH);
StatusBarNotification sbn = generateSbn(channel.getId());
- NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel);
+ NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel, mSmsHelper);
mAgingHelper.onNotificationPosted(entry);
@@ -110,7 +112,7 @@
public void testPostResetsSnooze() {
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH);
StatusBarNotification sbn = generateSbn(channel.getId());
- NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel);
+ NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel, mSmsHelper);
mAgingHelper.onNotificationPosted(entry);
@@ -121,7 +123,7 @@
public void testSnoozingOnSeen() {
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH);
StatusBarNotification sbn = generateSbn(channel.getId());
- NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel);
+ NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel, mSmsHelper);
entry.setSeen();
when(mCategorizer.getCategory(entry)).thenReturn(NotificationCategorizer.CATEGORY_PEOPLE);
@@ -134,7 +136,7 @@
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH);
channel.lockFields(NotificationChannel.USER_LOCKED_IMPORTANCE);
StatusBarNotification sbn = generateSbn(channel.getId());
- NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel);
+ NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel, mSmsHelper);
when(mCategorizer.getCategory(entry)).thenReturn(NotificationCategorizer.CATEGORY_PEOPLE);
mAgingHelper.onNotificationSeen(entry);
diff --git a/packages/ExtServices/tests/src/android/ext/services/notification/AssistantTest.java b/packages/ExtServices/tests/src/android/ext/services/notification/AssistantTest.java
index 0a95b83..f632814 100644
--- a/packages/ExtServices/tests/src/android/ext/services/notification/AssistantTest.java
+++ b/packages/ExtServices/tests/src/android/ext/services/notification/AssistantTest.java
@@ -85,6 +85,7 @@
@Mock INotificationManager mNoMan;
@Mock AtomicFile mFile;
@Mock IPackageManager mPackageManager;
+ @Mock SmsHelper mSmsHelper;
Assistant mAssistant;
Application mApplication;
@@ -467,7 +468,7 @@
public void testAssistantNeverIncreasesImportanceWhenSuggestingSilent() throws Exception {
StatusBarNotification sbn = generateSbn(PKG1, UID1, P1C3, "min notif!", null);
Adjustment adjust = mAssistant.createEnqueuedNotificationAdjustment(new NotificationEntry(
- mPackageManager, sbn, P1C3), new ArrayList<>(), new ArrayList<>());
+ mPackageManager, sbn, P1C3, mSmsHelper), new ArrayList<>(), new ArrayList<>());
assertEquals(IMPORTANCE_MIN, adjust.getSignals().getInt(Adjustment.KEY_IMPORTANCE));
}
}
diff --git a/packages/ExtServices/tests/src/android/ext/services/notification/NotificationEntryTest.java b/packages/ExtServices/tests/src/android/ext/services/notification/NotificationEntryTest.java
index 9223c3d..2d44e79 100644
--- a/packages/ExtServices/tests/src/android/ext/services/notification/NotificationEntryTest.java
+++ b/packages/ExtServices/tests/src/android/ext/services/notification/NotificationEntryTest.java
@@ -31,6 +31,7 @@
import android.app.Notification;
import android.app.NotificationChannel;
import android.app.Person;
+import android.content.ComponentName;
import android.content.pm.ApplicationInfo;
import android.content.pm.IPackageManager;
import android.media.AudioAttributes;
@@ -59,6 +60,10 @@
private IPackageManager mPackageManager;
@Mock
private ApplicationInfo mAppInfo;
+ @Mock
+ private SmsHelper mSmsHelper;
+
+ private static final String DEFAULT_SMS_PACKAGE_NAME = "foo";
@Rule
public final TestableContext mContext =
@@ -73,6 +78,15 @@
UserHandle.SYSTEM, null, 0);
}
+ private StatusBarNotification generateSbn(String channelId, String packageName) {
+ Notification n = new Notification.Builder(mContext, channelId)
+ .setContentTitle("foo")
+ .build();
+
+ return new StatusBarNotification(packageName, packageName, 0, "tag", mUid, mUid, n,
+ UserHandle.SYSTEM, null, 0);
+ }
+
private StatusBarNotification generateSbn(Notification n) {
return new StatusBarNotification(mPkg, mPkg, 0, "tag", mUid, mUid, n,
UserHandle.SYSTEM, null, 0);
@@ -86,6 +100,8 @@
when(mPackageManager.getApplicationInfo(anyString(), anyInt(), anyInt()))
.thenReturn(mAppInfo);
mAppInfo.targetSdkVersion = Build.VERSION_CODES.P;
+ when(mSmsHelper.getDefaultSmsApplication())
+ .thenReturn(new ComponentName(DEFAULT_SMS_PACKAGE_NAME, "bar"));
}
@Test
@@ -96,7 +112,7 @@
people.add(new Person.Builder().setKey("mailto:testing@android.com").build());
sbn.getNotification().extras.putParcelableArrayList(Notification.EXTRA_PEOPLE_LIST, people);
- NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel);
+ NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel, mSmsHelper);
assertTrue(entry.involvesPeople());
}
@@ -104,7 +120,23 @@
public void testNotPerson() {
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH);
StatusBarNotification sbn = generateSbn(channel.getId());
- NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel);
+ NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel, mSmsHelper);
+ assertFalse(entry.involvesPeople());
+ }
+
+ @Test
+ public void testHasPerson_matchesDefaultSmsApp() {
+ NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH);
+ StatusBarNotification sbn = generateSbn(channel.getId(), DEFAULT_SMS_PACKAGE_NAME);
+ NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel, mSmsHelper);
+ assertTrue(entry.involvesPeople());
+ }
+
+ @Test
+ public void testHasPerson_doesntMatchDefaultSmsApp() {
+ NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH);
+ StatusBarNotification sbn = generateSbn(channel.getId(), "abc");
+ NotificationEntry entry = new NotificationEntry(mPackageManager, sbn, channel, mSmsHelper);
assertFalse(entry.involvesPeople());
}
@@ -115,7 +147,8 @@
Notification n = new Notification.Builder(mContext, channel.getId())
.setStyle(new Notification.InboxStyle())
.build();
- NotificationEntry entry = new NotificationEntry(mPackageManager, generateSbn(n), channel);
+ NotificationEntry entry =
+ new NotificationEntry(mPackageManager, generateSbn(n), channel, mSmsHelper);
assertTrue(entry.hasStyle(Notification.InboxStyle.class));
}
@@ -126,7 +159,8 @@
Notification n = new Notification.Builder(mContext, channel.getId())
.setStyle(new Notification.MessagingStyle(""))
.build();
- NotificationEntry entry = new NotificationEntry(mPackageManager, generateSbn(n), channel);
+ NotificationEntry entry =
+ new NotificationEntry(mPackageManager, generateSbn(n), channel, mSmsHelper);
assertTrue(entry.hasStyle(Notification.MessagingStyle.class));
}
@@ -137,7 +171,8 @@
Notification n = new Notification.Builder(mContext, channel.getId())
.setStyle(new Notification.BigPictureStyle())
.build();
- NotificationEntry entry = new NotificationEntry(mPackageManager, generateSbn(n), channel);
+ NotificationEntry entry =
+ new NotificationEntry(mPackageManager, generateSbn(n), channel, mSmsHelper);
assertFalse(entry.hasStyle(Notification.InboxStyle.class));
assertFalse(entry.hasStyle(Notification.MessagingStyle.class));
}
@@ -148,7 +183,7 @@
channel.setSound(null, new AudioAttributes.Builder().setUsage(USAGE_ALARM).build());
NotificationEntry entry = new NotificationEntry(
- mPackageManager, generateSbn(channel.getId()), channel);
+ mPackageManager, generateSbn(channel.getId()), channel, mSmsHelper);
assertTrue(entry.isAudioAttributesUsage(USAGE_ALARM));
}
@@ -157,7 +192,7 @@
public void testIsNotAudioAttributes() {
NotificationChannel channel = new NotificationChannel("", "", IMPORTANCE_HIGH);
NotificationEntry entry = new NotificationEntry(
- mPackageManager, generateSbn(channel.getId()), channel);
+ mPackageManager, generateSbn(channel.getId()), channel, mSmsHelper);
assertFalse(entry.isAudioAttributesUsage(USAGE_ALARM));
}
@@ -169,7 +204,8 @@
Notification n = new Notification.Builder(mContext, channel.getId())
.setCategory(Notification.CATEGORY_EMAIL)
.build();
- NotificationEntry entry = new NotificationEntry(mPackageManager, generateSbn(n), channel);
+ NotificationEntry entry =
+ new NotificationEntry(mPackageManager, generateSbn(n), channel, mSmsHelper);
assertTrue(entry.isCategory(Notification.CATEGORY_EMAIL));
assertFalse(entry.isCategory(Notification.CATEGORY_MESSAGE));
@@ -182,7 +218,8 @@
Notification n = new Notification.Builder(mContext, channel.getId())
.setFlag(FLAG_FOREGROUND_SERVICE, true)
.build();
- NotificationEntry entry = new NotificationEntry(mPackageManager, generateSbn(n), channel);
+ NotificationEntry entry =
+ new NotificationEntry(mPackageManager, generateSbn(n), channel, mSmsHelper);
assertTrue(entry.isOngoing());
}
@@ -194,7 +231,8 @@
Notification n = new Notification.Builder(mContext, channel.getId())
.setFlag(FLAG_CAN_COLORIZE, true)
.build();
- NotificationEntry entry = new NotificationEntry(mPackageManager, generateSbn(n), channel);
+ NotificationEntry entry =
+ new NotificationEntry(mPackageManager, generateSbn(n), channel, mSmsHelper);
assertFalse(entry.isOngoing());
}
diff --git a/packages/ExternalStorageProvider/res/values-en-rXC/strings.xml b/packages/ExternalStorageProvider/res/values-en-rXC/strings.xml
index e4f1b35..5034d21 100644
--- a/packages/ExternalStorageProvider/res/values-en-rXC/strings.xml
+++ b/packages/ExternalStorageProvider/res/values-en-rXC/strings.xml
@@ -16,8 +16,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="7123375275748530234">"External Storage"</string>
- <string name="storage_description" msgid="8541974407321172792">"Local storage"</string>
- <string name="root_internal_storage" msgid="827844243068584127">"Internal storage"</string>
- <string name="root_documents" msgid="4051252304075469250">"Documents"</string>
+ <string name="app_label" msgid="7123375275748530234">"External Storage"</string>
+ <string name="storage_description" msgid="8541974407321172792">"Local storage"</string>
+ <string name="root_internal_storage" msgid="827844243068584127">"Internal storage"</string>
+ <string name="root_documents" msgid="4051252304075469250">"Documents"</string>
</resources>
diff --git a/packages/FusedLocation/res/values-en-rXC/strings.xml b/packages/FusedLocation/res/values-en-rXC/strings.xml
index b085aba..43d0ac3 100644
--- a/packages/FusedLocation/res/values-en-rXC/strings.xml
+++ b/packages/FusedLocation/res/values-en-rXC/strings.xml
@@ -1,5 +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>
+ <string name="app_label" msgid="5379477904423203699">"Fused Location"</string>
</resources>
diff --git a/packages/InputDevices/res/values-en-rXC/strings.xml b/packages/InputDevices/res/values-en-rXC/strings.xml
index 4bbc17e..d3e41c1c 100644
--- a/packages/InputDevices/res/values-en-rXC/strings.xml
+++ b/packages/InputDevices/res/values-en-rXC/strings.xml
@@ -1,47 +1,47 @@
<?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 keyboard"</string>
- <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"English (UK)"</string>
- <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"English (US)"</string>
- <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"English (US), International style"</string>
- <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"English (US), Colemak style"</string>
- <string name="keyboard_layout_english_us_dvorak_label" msgid="793528923171145202">"English (US), Dvorak style"</string>
- <string name="keyboard_layout_english_us_workman_label" msgid="2944541595262173111">"English (US), Workman style"</string>
- <string name="keyboard_layout_german_label" msgid="8451565865467909999">"German"</string>
- <string name="keyboard_layout_french_label" msgid="813450119589383723">"French"</string>
- <string name="keyboard_layout_french_ca_label" msgid="365352601060604832">"French (Canada)"</string>
- <string name="keyboard_layout_russian_label" msgid="8724879775815042968">"Russian"</string>
- <string name="keyboard_layout_russian_mac_label" msgid="3795866869038264796">"Russian, Mac style"</string>
- <string name="keyboard_layout_spanish_label" msgid="7091555148131908240">"Spanish"</string>
- <string name="keyboard_layout_swiss_french_label" msgid="4659191025396371684">"Swiss French"</string>
- <string name="keyboard_layout_swiss_german_label" msgid="2305520941993314258">"Swiss German"</string>
- <string name="keyboard_layout_belgian" msgid="2011984572838651558">"Belgian"</string>
- <string name="keyboard_layout_bulgarian" msgid="8951224309972028398">"Bulgarian"</string>
- <string name="keyboard_layout_italian" msgid="6497079660449781213">"Italian"</string>
- <string name="keyboard_layout_danish" msgid="8036432066627127851">"Danish"</string>
- <string name="keyboard_layout_norwegian" msgid="9090097917011040937">"Norwegian"</string>
- <string name="keyboard_layout_swedish" msgid="732959109088479351">"Swedish"</string>
- <string name="keyboard_layout_finnish" msgid="5585659438924315466">"Finnish"</string>
- <string name="keyboard_layout_croatian" msgid="4172229471079281138">"Croatian"</string>
- <string name="keyboard_layout_czech" msgid="1349256901452975343">"Czech"</string>
- <string name="keyboard_layout_estonian" msgid="8775830985185665274">"Estonian"</string>
- <string name="keyboard_layout_hungarian" msgid="4154963661406035109">"Hungarian"</string>
- <string name="keyboard_layout_icelandic" msgid="5836645650912489642">"Icelandic"</string>
- <string name="keyboard_layout_brazilian" msgid="5117896443147781939">"Brazilian"</string>
- <string name="keyboard_layout_portuguese" msgid="2888198587329660305">"Portuguese"</string>
- <string name="keyboard_layout_slovak" msgid="2469379934672837296">"Slovak"</string>
- <string name="keyboard_layout_slovenian" msgid="1735933028924982368">"Slovenian"</string>
- <string name="keyboard_layout_turkish" msgid="7736163250907964898">"Turkish"</string>
- <string name="keyboard_layout_ukrainian" msgid="8176637744389480417">"Ukrainian"</string>
- <string name="keyboard_layout_arabic" msgid="5671970465174968712">"Arabic"</string>
- <string name="keyboard_layout_greek" msgid="7289253560162386040">"Greek"</string>
- <string name="keyboard_layout_hebrew" msgid="7241473985890173812">"Hebrew"</string>
- <string name="keyboard_layout_lithuanian" msgid="6943110873053106534">"Lithuanian"</string>
- <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spanish (Latin)"</string>
- <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Latvian"</string>
- <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persian"</string>
- <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbaijani"</string>
- <string name="keyboard_layout_polish" msgid="1121588624094925325">"Polish"</string>
+ <string name="app_label" msgid="8016145283189546017">"Input Devices"</string>
+ <string name="keyboard_layouts_label" msgid="6688773268302087545">"Android keyboard"</string>
+ <string name="keyboard_layout_english_uk_label" msgid="6664258463319999632">"English (UK)"</string>
+ <string name="keyboard_layout_english_us_label" msgid="8994890249649106291">"English (US)"</string>
+ <string name="keyboard_layout_english_us_intl" msgid="3705168594034233583">"English (US), International style"</string>
+ <string name="keyboard_layout_english_us_colemak_label" msgid="4194969610343455380">"English (US), Colemak style"</string>
+ <string name="keyboard_layout_english_us_dvorak_label" msgid="793528923171145202">"English (US), Dvorak style"</string>
+ <string name="keyboard_layout_english_us_workman_label" msgid="2944541595262173111">"English (US), Workman style"</string>
+ <string name="keyboard_layout_german_label" msgid="8451565865467909999">"German"</string>
+ <string name="keyboard_layout_french_label" msgid="813450119589383723">"French"</string>
+ <string name="keyboard_layout_french_ca_label" msgid="365352601060604832">"French (Canada)"</string>
+ <string name="keyboard_layout_russian_label" msgid="8724879775815042968">"Russian"</string>
+ <string name="keyboard_layout_russian_mac_label" msgid="3795866869038264796">"Russian, Mac style"</string>
+ <string name="keyboard_layout_spanish_label" msgid="7091555148131908240">"Spanish"</string>
+ <string name="keyboard_layout_swiss_french_label" msgid="4659191025396371684">"Swiss French"</string>
+ <string name="keyboard_layout_swiss_german_label" msgid="2305520941993314258">"Swiss German"</string>
+ <string name="keyboard_layout_belgian" msgid="2011984572838651558">"Belgian"</string>
+ <string name="keyboard_layout_bulgarian" msgid="8951224309972028398">"Bulgarian"</string>
+ <string name="keyboard_layout_italian" msgid="6497079660449781213">"Italian"</string>
+ <string name="keyboard_layout_danish" msgid="8036432066627127851">"Danish"</string>
+ <string name="keyboard_layout_norwegian" msgid="9090097917011040937">"Norwegian"</string>
+ <string name="keyboard_layout_swedish" msgid="732959109088479351">"Swedish"</string>
+ <string name="keyboard_layout_finnish" msgid="5585659438924315466">"Finnish"</string>
+ <string name="keyboard_layout_croatian" msgid="4172229471079281138">"Croatian"</string>
+ <string name="keyboard_layout_czech" msgid="1349256901452975343">"Czech"</string>
+ <string name="keyboard_layout_estonian" msgid="8775830985185665274">"Estonian"</string>
+ <string name="keyboard_layout_hungarian" msgid="4154963661406035109">"Hungarian"</string>
+ <string name="keyboard_layout_icelandic" msgid="5836645650912489642">"Icelandic"</string>
+ <string name="keyboard_layout_brazilian" msgid="5117896443147781939">"Brazilian"</string>
+ <string name="keyboard_layout_portuguese" msgid="2888198587329660305">"Portuguese"</string>
+ <string name="keyboard_layout_slovak" msgid="2469379934672837296">"Slovak"</string>
+ <string name="keyboard_layout_slovenian" msgid="1735933028924982368">"Slovenian"</string>
+ <string name="keyboard_layout_turkish" msgid="7736163250907964898">"Turkish"</string>
+ <string name="keyboard_layout_ukrainian" msgid="8176637744389480417">"Ukrainian"</string>
+ <string name="keyboard_layout_arabic" msgid="5671970465174968712">"Arabic"</string>
+ <string name="keyboard_layout_greek" msgid="7289253560162386040">"Greek"</string>
+ <string name="keyboard_layout_hebrew" msgid="7241473985890173812">"Hebrew"</string>
+ <string name="keyboard_layout_lithuanian" msgid="6943110873053106534">"Lithuanian"</string>
+ <string name="keyboard_layout_spanish_latin" msgid="5690539836069535697">"Spanish (Latin)"</string>
+ <string name="keyboard_layout_latvian" msgid="4405417142306250595">"Latvian"</string>
+ <string name="keyboard_layout_persian" msgid="3920643161015888527">"Persian"</string>
+ <string name="keyboard_layout_azerbaijani" msgid="7315895417176467567">"Azerbaijani"</string>
+ <string name="keyboard_layout_polish" msgid="1121588624094925325">"Polish"</string>
</resources>
diff --git a/packages/MtpDocumentsProvider/res/values-en-rXC/strings.xml b/packages/MtpDocumentsProvider/res/values-en-rXC/strings.xml
index 370cca5..e968a55 100644
--- a/packages/MtpDocumentsProvider/res/values-en-rXC/strings.xml
+++ b/packages/MtpDocumentsProvider/res/values-en-rXC/strings.xml
@@ -16,10 +16,10 @@
<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="6271216747302322594">"MTP Host"</string>
- <string name="downloads_app_label" msgid="7120690641874849726">"Downloads"</string>
- <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
- <string name="accessing_notification_title" msgid="3030133609230917944">"Accessing files from <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
- <string name="error_busy_device" msgid="3997316850357386589">"The other device is busy. You can\'t transfer files until it\'s available."</string>
- <string name="error_locked_device" msgid="7557872102188356147">"No files found. The other device may be locked. If so, unlock it and try again."</string>
+ <string name="app_label" msgid="6271216747302322594">"MTP Host"</string>
+ <string name="downloads_app_label" msgid="7120690641874849726">"Downloads"</string>
+ <string name="root_name" msgid="5819495383921089536">"<xliff:g id="DEVICE_MODEL">%1$s</xliff:g> <xliff:g id="STORAGE_NAME">%2$s</xliff:g>"</string>
+ <string name="accessing_notification_title" msgid="3030133609230917944">"Accessing files from <xliff:g id="DEVICE_MODEL">%1$s</xliff:g>"</string>
+ <string name="error_busy_device" msgid="3997316850357386589">"The other device is busy. You can\'t transfer files until it\'s available."</string>
+ <string name="error_locked_device" msgid="7557872102188356147">"No files found. The other device may be locked. If so, unlock it and try again."</string>
</resources>
diff --git a/packages/PackageInstaller/res/values-en-rXC/strings.xml b/packages/PackageInstaller/res/values-en-rXC/strings.xml
index de4b31e..d49df98 100644
--- a/packages/PackageInstaller/res/values-en-rXC/strings.xml
+++ b/packages/PackageInstaller/res/values-en-rXC/strings.xml
@@ -16,81 +16,81 @@
<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="7488448184431507488">"Package installer"</string>
- <string name="install" msgid="711829760615509273">"Install"</string>
- <string name="done" msgid="6632441120016885253">"Done"</string>
- <string name="cancel" msgid="1018267193425558088">"Cancel"</string>
- <string name="installing" msgid="4921993079741206516">"Installing…"</string>
- <string name="installing_app" msgid="1165095864863849422">"Installing <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>…"</string>
- <string name="install_done" msgid="5987363587661783896">"App installed."</string>
- <string name="install_confirm_question" msgid="8176284075816604590">"Do you want to install this application?"</string>
- <string name="install_confirm_question_update" msgid="7942235418781274635">"Do you want to install an update to this existing application? Your existing data will not be lost."</string>
- <string name="install_confirm_question_update_system" msgid="4713001702777910263">"Do you want to install an update to this built-in application? Your existing data will not be lost."</string>
- <string name="install_failed" msgid="5777824004474125469">"App not installed."</string>
- <string name="install_failed_blocked" msgid="8512284352994752094">"The package was blocked from being installed."</string>
- <string name="install_failed_conflict" msgid="3493184212162521426">"App not installed as package conflicts with an existing package."</string>
- <string name="install_failed_incompatible" product="tablet" msgid="6019021440094927928">"App not installed as app isn\'t compatible with your tablet."</string>
- <string name="install_failed_incompatible" product="tv" msgid="2890001324362291683">"This app isn\'t compatible with your TV."</string>
- <string name="install_failed_incompatible" product="default" msgid="7254630419511645826">"App not installed as app isn\'t compatible with your phone."</string>
- <string name="install_failed_invalid_apk" msgid="8581007676422623930">"App not installed as package appears to be invalid."</string>
- <string name="install_failed_msg" product="tablet" msgid="6298387264270562442">"<xliff:g id="APP_NAME">%1$s</xliff:g> couldn\'t be installed on your tablet."</string>
- <string name="install_failed_msg" product="tv" msgid="1920009940048975221">"<xliff:g id="APP_NAME">%1$s</xliff:g> couldn\'t be installed on your TV."</string>
- <string name="install_failed_msg" product="default" msgid="6484461562647915707">"<xliff:g id="APP_NAME">%1$s</xliff:g> couldn\'t be installed on your phone."</string>
- <string name="launch" msgid="3952550563999890101">"Open"</string>
- <string name="unknown_apps_admin_dlg_text" msgid="4456572224020176095">"Your admin doesn\'t allow installation of apps obtained from unknown sources"</string>
- <string name="unknown_apps_user_restriction_dlg_text" msgid="151020786933988344">"Unknown apps can\'t be installed by this user"</string>
- <string name="install_apps_user_restriction_dlg_text" msgid="2154119597001074022">"This user is not allowed to install apps"</string>
- <string name="ok" msgid="7871959885003339302">"OK"</string>
- <string name="manage_applications" msgid="5400164782453975580">"Manage apps"</string>
- <string name="out_of_space_dlg_title" msgid="4156690013884649502">"Out of space"</string>
- <string name="out_of_space_dlg_text" msgid="8727714096031856231">"<xliff:g id="APP_NAME">%1$s</xliff:g> couldn\'t be installed. Free up some space and try again."</string>
- <string name="app_not_found_dlg_title" msgid="5107924008597470285">"App not found"</string>
- <string name="app_not_found_dlg_text" msgid="5219983779377811611">"The app wasn\'t found in the list of installed apps."</string>
- <string name="user_is_not_allowed_dlg_title" msgid="6915293433252210232">"Not allowed"</string>
- <string name="user_is_not_allowed_dlg_text" msgid="3468447791330611681">"The current user is not allowed to perform this uninstallation."</string>
- <string name="generic_error_dlg_title" msgid="5863195085927067752">"Error"</string>
- <string name="generic_error_dlg_text" msgid="5287861443265795232">"App could not be uninstalled."</string>
- <string name="uninstall_application_title" msgid="4045420072401428123">"Uninstall app"</string>
- <string name="uninstall_update_title" msgid="824411791011583031">"Uninstall update"</string>
- <string name="uninstall_activity_text" msgid="1928194674397770771">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> is part of the following app:"</string>
- <string name="uninstall_application_text" msgid="3816830743706143980">"Do you want to uninstall this app?"</string>
- <string name="uninstall_application_text_all_users" msgid="575491774380227119">"Do you want to uninstall this app for "<b>"all"</b>" users? The application and its data will be removed from "<b>"all"</b>" users on the device."</string>
- <string name="uninstall_application_text_user" msgid="498072714173920526">"Do you want to uninstall this app for the user <xliff:g id="USERNAME">%1$s</xliff:g>?"</string>
- <string name="uninstall_update_text" msgid="863648314632448705">"Replace this app with the factory version? All data will be removed."</string>
- <string name="uninstall_update_text_multiuser" msgid="8992883151333057227">"Replace this app with the factory version? All data will be removed. This affects all users of this device, including those with work profiles."</string>
- <string name="uninstall_remove_contributed_files" msgid="2048594420923203453">"Also remove <xliff:g id="SIZE">%1$s</xliff:g> of associated media files."</string>
- <string name="uninstall_keep_data" msgid="7002379587465487550">"Keep <xliff:g id="SIZE">%1$s</xliff:g> of app data."</string>
- <string name="uninstalling_notification_channel" msgid="840153394325714653">"Running uninstalls"</string>
- <string name="uninstall_failure_notification_channel" msgid="1136405866767576588">"Failed uninstalls"</string>
- <string name="uninstalling" msgid="8709566347688966845">"Uninstalling…"</string>
- <string name="uninstalling_app" msgid="8866082646836981397">"Uninstalling <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>…"</string>
- <string name="uninstall_done" msgid="439354138387969269">"Uninstall finished."</string>
- <string name="uninstall_done_app" msgid="4588850984473605768">"Uninstalled <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>"</string>
- <string name="uninstall_failed" msgid="1847750968168364332">"Uninstall unsuccessful."</string>
- <string name="uninstall_failed_app" msgid="5506028705017601412">"Uninstalling <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> unsuccessful."</string>
- <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"Can\'t uninstall active device admin app"</string>
- <string name="uninstall_failed_device_policy_manager_of_user" msgid="4813104025494168064">"Can\'t uninstall active device admin app for <xliff:g id="USERNAME">%1$s</xliff:g>"</string>
- <string name="uninstall_all_blocked_profile_owner" msgid="2009393666026751501">"This app is required for some users or profiles and was uninstalled for others"</string>
- <string name="uninstall_blocked_profile_owner" msgid="6373897407002404848">"This app is needed for your profile and can\'t be uninstalled."</string>
- <string name="uninstall_blocked_device_owner" msgid="6724602931761073901">"This app is required by your device administrator and can\'t be uninstalled."</string>
- <string name="manage_device_administrators" msgid="3092696419363842816">"Manage device admin apps"</string>
- <string name="manage_users" msgid="1243995386982560813">"Manage users"</string>
- <string name="uninstall_failed_msg" msgid="2176744834786696012">"<xliff:g id="APP_NAME">%1$s</xliff:g> couldn\'t be uninstalled."</string>
- <string name="Parse_error_dlg_text" msgid="1661404001063076789">"There was a problem parsing the package."</string>
- <string name="wear_not_allowed_dlg_title" msgid="8664785993465117517">"Android Wear"</string>
- <string name="wear_not_allowed_dlg_text" msgid="704615521550939237">"Install/Uninstall actions not supported on Wear."</string>
- <string name="message_staging" msgid="8032722385658438567">"Staging app…"</string>
- <string name="app_name_unknown" msgid="6881210203354323926">"Unknown"</string>
- <string name="untrusted_external_source_warning" product="tablet" msgid="6539403649459942547">"For your security, your tablet is not allowed to install unknown apps from this source."</string>
- <string name="untrusted_external_source_warning" product="tv" msgid="1206648674551321364">"For your security, your TV is not allowed to install unknown apps from this source."</string>
- <string name="untrusted_external_source_warning" product="default" msgid="7279739265754475165">"For your security, your phone is not allowed to install unknown apps from this source."</string>
- <string name="anonymous_source_warning" product="default" msgid="2784902545920822500">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing this app, you agree that you are responsible for any damage to your phone or loss of data that may result from its use."</string>
- <string name="anonymous_source_warning" product="tablet" msgid="3939101621438855516">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing this app, you agree that you are responsible for any damage to your tablet or loss of data that may result from its use."</string>
- <string name="anonymous_source_warning" product="tv" msgid="5599483539528168566">"Your TV and personal data are more vulnerable to attack by unknown apps. By installing this app, you agree that you are responsible for any damage to your TV or loss of data that may result from its use."</string>
- <string name="anonymous_source_continue" msgid="4375745439457209366">"Continue"</string>
- <string name="external_sources_settings" msgid="4046964413071713807">"Settings"</string>
- <string name="wear_app_channel" msgid="1960809674709107850">"Installing/uninstalling wear apps"</string>
- <string name="app_installed_notification_channel_description" msgid="2695385797601574123">"App installed notification"</string>
- <string name="notification_installation_success_message" msgid="6450467996056038442">"Successfully installed"</string>
- <string name="notification_installation_success_status" msgid="3172502643504323321">"Successfully installed “<xliff:g id="APPNAME">%1$s</xliff:g>”"</string>
+ <string name="app_name" msgid="7488448184431507488">"Package installer"</string>
+ <string name="install" msgid="711829760615509273">"Install"</string>
+ <string name="done" msgid="6632441120016885253">"Done"</string>
+ <string name="cancel" msgid="1018267193425558088">"Cancel"</string>
+ <string name="installing" msgid="4921993079741206516">"Installing…"</string>
+ <string name="installing_app" msgid="1165095864863849422">"Installing <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>…"</string>
+ <string name="install_done" msgid="5987363587661783896">"App installed."</string>
+ <string name="install_confirm_question" msgid="8176284075816604590">"Do you want to install this application?"</string>
+ <string name="install_confirm_question_update" msgid="7942235418781274635">"Do you want to install an update to this existing application? Your existing data will not be lost."</string>
+ <string name="install_confirm_question_update_system" msgid="4713001702777910263">"Do you want to install an update to this built-in application? Your existing data will not be lost."</string>
+ <string name="install_failed" msgid="5777824004474125469">"App not installed."</string>
+ <string name="install_failed_blocked" msgid="8512284352994752094">"The package was blocked from being installed."</string>
+ <string name="install_failed_conflict" msgid="3493184212162521426">"App not installed as package conflicts with an existing package."</string>
+ <string name="install_failed_incompatible" product="tablet" msgid="6019021440094927928">"App not installed as app isn\'t compatible with your tablet."</string>
+ <string name="install_failed_incompatible" product="tv" msgid="2890001324362291683">"This app isn\'t compatible with your TV."</string>
+ <string name="install_failed_incompatible" product="default" msgid="7254630419511645826">"App not installed as app isn\'t compatible with your phone."</string>
+ <string name="install_failed_invalid_apk" msgid="8581007676422623930">"App not installed as package appears to be invalid."</string>
+ <string name="install_failed_msg" product="tablet" msgid="6298387264270562442">"<xliff:g id="APP_NAME">%1$s</xliff:g> couldn\'t be installed on your tablet."</string>
+ <string name="install_failed_msg" product="tv" msgid="1920009940048975221">"<xliff:g id="APP_NAME">%1$s</xliff:g> couldn\'t be installed on your TV."</string>
+ <string name="install_failed_msg" product="default" msgid="6484461562647915707">"<xliff:g id="APP_NAME">%1$s</xliff:g> couldn\'t be installed on your phone."</string>
+ <string name="launch" msgid="3952550563999890101">"Open"</string>
+ <string name="unknown_apps_admin_dlg_text" msgid="4456572224020176095">"Your admin doesn\'t allow installation of apps obtained from unknown sources"</string>
+ <string name="unknown_apps_user_restriction_dlg_text" msgid="151020786933988344">"Unknown apps can\'t be installed by this user"</string>
+ <string name="install_apps_user_restriction_dlg_text" msgid="2154119597001074022">"This user is not allowed to install apps"</string>
+ <string name="ok" msgid="7871959885003339302">"OK"</string>
+ <string name="manage_applications" msgid="5400164782453975580">"Manage apps"</string>
+ <string name="out_of_space_dlg_title" msgid="4156690013884649502">"Out of space"</string>
+ <string name="out_of_space_dlg_text" msgid="8727714096031856231">"<xliff:g id="APP_NAME">%1$s</xliff:g> couldn\'t be installed. Free up some space and try again."</string>
+ <string name="app_not_found_dlg_title" msgid="5107924008597470285">"App not found"</string>
+ <string name="app_not_found_dlg_text" msgid="5219983779377811611">"The app wasn\'t found in the list of installed apps."</string>
+ <string name="user_is_not_allowed_dlg_title" msgid="6915293433252210232">"Not allowed"</string>
+ <string name="user_is_not_allowed_dlg_text" msgid="3468447791330611681">"The current user is not allowed to perform this uninstallation."</string>
+ <string name="generic_error_dlg_title" msgid="5863195085927067752">"Error"</string>
+ <string name="generic_error_dlg_text" msgid="5287861443265795232">"App could not be uninstalled."</string>
+ <string name="uninstall_application_title" msgid="4045420072401428123">"Uninstall app"</string>
+ <string name="uninstall_update_title" msgid="824411791011583031">"Uninstall update"</string>
+ <string name="uninstall_activity_text" msgid="1928194674397770771">"<xliff:g id="ACTIVITY_NAME">%1$s</xliff:g> is part of the following app:"</string>
+ <string name="uninstall_application_text" msgid="3816830743706143980">"Do you want to uninstall this app?"</string>
+ <string name="uninstall_application_text_all_users" msgid="575491774380227119">"Do you want to uninstall this app for "<b>"all"</b>" users? The application and its data will be removed from "<b>"all"</b>" users on the device."</string>
+ <string name="uninstall_application_text_user" msgid="498072714173920526">"Do you want to uninstall this app for the user <xliff:g id="USERNAME">%1$s</xliff:g>?"</string>
+ <string name="uninstall_update_text" msgid="863648314632448705">"Replace this app with the factory version? All data will be removed."</string>
+ <string name="uninstall_update_text_multiuser" msgid="8992883151333057227">"Replace this app with the factory version? All data will be removed. This affects all users of this device, including those with work profiles."</string>
+ <string name="uninstall_remove_contributed_files" msgid="2048594420923203453">"Also remove <xliff:g id="SIZE">%1$s</xliff:g> of associated media files."</string>
+ <string name="uninstall_keep_data" msgid="7002379587465487550">"Keep <xliff:g id="SIZE">%1$s</xliff:g> of app data."</string>
+ <string name="uninstalling_notification_channel" msgid="840153394325714653">"Running uninstalls"</string>
+ <string name="uninstall_failure_notification_channel" msgid="1136405866767576588">"Failed uninstalls"</string>
+ <string name="uninstalling" msgid="8709566347688966845">"Uninstalling…"</string>
+ <string name="uninstalling_app" msgid="8866082646836981397">"Uninstalling <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>…"</string>
+ <string name="uninstall_done" msgid="439354138387969269">"Uninstall finished."</string>
+ <string name="uninstall_done_app" msgid="4588850984473605768">"Uninstalled <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g>"</string>
+ <string name="uninstall_failed" msgid="1847750968168364332">"Uninstall unsuccessful."</string>
+ <string name="uninstall_failed_app" msgid="5506028705017601412">"Uninstalling <xliff:g id="PACKAGE_LABEL">%1$s</xliff:g> unsuccessful."</string>
+ <string name="uninstall_failed_device_policy_manager" msgid="785293813665540305">"Can\'t uninstall active device admin app"</string>
+ <string name="uninstall_failed_device_policy_manager_of_user" msgid="4813104025494168064">"Can\'t uninstall active device admin app for <xliff:g id="USERNAME">%1$s</xliff:g>"</string>
+ <string name="uninstall_all_blocked_profile_owner" msgid="2009393666026751501">"This app is required for some users or profiles and was uninstalled for others"</string>
+ <string name="uninstall_blocked_profile_owner" msgid="6373897407002404848">"This app is needed for your profile and can\'t be uninstalled."</string>
+ <string name="uninstall_blocked_device_owner" msgid="6724602931761073901">"This app is required by your device administrator and can\'t be uninstalled."</string>
+ <string name="manage_device_administrators" msgid="3092696419363842816">"Manage device admin apps"</string>
+ <string name="manage_users" msgid="1243995386982560813">"Manage users"</string>
+ <string name="uninstall_failed_msg" msgid="2176744834786696012">"<xliff:g id="APP_NAME">%1$s</xliff:g> couldn\'t be uninstalled."</string>
+ <string name="Parse_error_dlg_text" msgid="1661404001063076789">"There was a problem parsing the package."</string>
+ <string name="wear_not_allowed_dlg_title" msgid="8664785993465117517">"Android Wear"</string>
+ <string name="wear_not_allowed_dlg_text" msgid="704615521550939237">"Install/Uninstall actions not supported on Wear."</string>
+ <string name="message_staging" msgid="8032722385658438567">"Staging app…"</string>
+ <string name="app_name_unknown" msgid="6881210203354323926">"Unknown"</string>
+ <string name="untrusted_external_source_warning" product="tablet" msgid="6539403649459942547">"For your security, your tablet is not allowed to install unknown apps from this source."</string>
+ <string name="untrusted_external_source_warning" product="tv" msgid="1206648674551321364">"For your security, your TV is not allowed to install unknown apps from this source."</string>
+ <string name="untrusted_external_source_warning" product="default" msgid="7279739265754475165">"For your security, your phone is not allowed to install unknown apps from this source."</string>
+ <string name="anonymous_source_warning" product="default" msgid="2784902545920822500">"Your phone and personal data are more vulnerable to attack by unknown apps. By installing this app, you agree that you are responsible for any damage to your phone or loss of data that may result from its use."</string>
+ <string name="anonymous_source_warning" product="tablet" msgid="3939101621438855516">"Your tablet and personal data are more vulnerable to attack by unknown apps. By installing this app, you agree that you are responsible for any damage to your tablet or loss of data that may result from its use."</string>
+ <string name="anonymous_source_warning" product="tv" msgid="5599483539528168566">"Your TV and personal data are more vulnerable to attack by unknown apps. By installing this app, you agree that you are responsible for any damage to your TV or loss of data that may result from its use."</string>
+ <string name="anonymous_source_continue" msgid="4375745439457209366">"Continue"</string>
+ <string name="external_sources_settings" msgid="4046964413071713807">"Settings"</string>
+ <string name="wear_app_channel" msgid="1960809674709107850">"Installing/uninstalling wear apps"</string>
+ <string name="app_installed_notification_channel_description" msgid="2695385797601574123">"App installed notification"</string>
+ <string name="notification_installation_success_message" msgid="6450467996056038442">"Successfully installed"</string>
+ <string name="notification_installation_success_status" msgid="3172502643504323321">"Successfully installed “<xliff:g id="APPNAME">%1$s</xliff:g>”"</string>
</resources>
diff --git a/packages/PackageInstaller/res/values-nl/strings.xml b/packages/PackageInstaller/res/values-nl/strings.xml
index 8423fda..c2a3b49 100644
--- a/packages/PackageInstaller/res/values-nl/strings.xml
+++ b/packages/PackageInstaller/res/values-nl/strings.xml
@@ -84,9 +84,9 @@
<string name="untrusted_external_source_warning" product="tablet" msgid="6539403649459942547">"Uit veiligheidsoverwegingen heeft je tablet geen toestemming om onbekende apps van deze bron te installeren."</string>
<string name="untrusted_external_source_warning" product="tv" msgid="1206648674551321364">"Uit veiligheidsoverwegingen heeft je tv geen toestemming om onbekende apps van deze bron te installeren."</string>
<string name="untrusted_external_source_warning" product="default" msgid="7279739265754475165">"Uit veiligheidsoverwegingen heeft je telefoon geen toestemming om onbekende apps van deze bron te installeren."</string>
- <string name="anonymous_source_warning" product="default" msgid="2784902545920822500">"Je telefoon en persoonlijke gegevens zijn kwetsbaarder voor aanvallen door onbekende apps. Als je deze app installeert, ga je ermee akkoord dat je verantwoordelijk bent voor eventuele schade aan je telefoon of gegevensverlies als gevolg van het gebruik van de app."</string>
- <string name="anonymous_source_warning" product="tablet" msgid="3939101621438855516">"Je tablet en persoonlijke gegevens zijn kwetsbaarder voor aanvallen door onbekende apps. Als je deze app installeert, ga je ermee akkoord dat je verantwoordelijk bent voor eventuele schade aan je tablet of gegevensverlies als gevolg van het gebruik van de app."</string>
- <string name="anonymous_source_warning" product="tv" msgid="5599483539528168566">"Je tv en persoonlijke gegevens zijn kwetsbaarder voor aanvallen door onbekende apps. Als je deze app installeert, ga je ermee akkoord dat je verantwoordelijk bent voor eventuele schade aan je tv of gegevensverlies als gevolg van het gebruik van de app."</string>
+ <string name="anonymous_source_warning" product="default" msgid="2784902545920822500">"Je telefoon en persoonsgegevens zijn kwetsbaarder voor aanvallen door onbekende apps. Als je deze app installeert, ga je ermee akkoord dat je verantwoordelijk bent voor eventuele schade aan je telefoon of gegevensverlies als gevolg van het gebruik van de app."</string>
+ <string name="anonymous_source_warning" product="tablet" msgid="3939101621438855516">"Je tablet en persoonsgegevens zijn kwetsbaarder voor aanvallen door onbekende apps. Als je deze app installeert, ga je ermee akkoord dat je verantwoordelijk bent voor eventuele schade aan je tablet of gegevensverlies als gevolg van het gebruik van de app."</string>
+ <string name="anonymous_source_warning" product="tv" msgid="5599483539528168566">"Je tv en persoonsgegevens zijn kwetsbaarder voor aanvallen door onbekende apps. Als je deze app installeert, ga je ermee akkoord dat je verantwoordelijk bent voor eventuele schade aan je tv of gegevensverlies als gevolg van het gebruik van de app."</string>
<string name="anonymous_source_continue" msgid="4375745439457209366">"Doorgaan"</string>
<string name="external_sources_settings" msgid="4046964413071713807">"Instellingen"</string>
<string name="wear_app_channel" msgid="1960809674709107850">"Wear-apps installeren/verwijderen"</string>
diff --git a/packages/PrintSpooler/res/values-en-rXC/strings.xml b/packages/PrintSpooler/res/values-en-rXC/strings.xml
index 2063889..491ebe6 100644
--- a/packages/PrintSpooler/res/values-en-rXC/strings.xml
+++ b/packages/PrintSpooler/res/values-en-rXC/strings.xml
@@ -16,96 +16,96 @@
<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">"Print Spooler"</string>
- <string name="more_options_button" msgid="2243228396432556771">"More options"</string>
- <string name="label_destination" msgid="9132510997381599275">"Destination"</string>
- <string name="label_copies" msgid="3634531042822968308">"Copies"</string>
- <string name="label_copies_summary" msgid="3861966063536529540">"Copies:"</string>
- <string name="label_paper_size" msgid="908654383827777759">"Paper size"</string>
- <string name="label_paper_size_summary" msgid="5668204981332138168">"Paper size:"</string>
- <string name="label_color" msgid="1108690305218188969">"Color"</string>
- <string name="label_duplex" msgid="5370037254347072243">"Two-sided"</string>
- <string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
- <string name="label_pages" msgid="7768589729282182230">"Pages"</string>
- <string name="destination_default_text" msgid="5422708056807065710">"Select a printer"</string>
- <string name="template_all_pages" msgid="3322235982020148762">"All <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
- <string name="template_page_range" msgid="428638530038286328">"Range of <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
- <string name="pages_range_example" msgid="8558694453556945172">"e.g. 1—5,8,11—13"</string>
- <string name="print_preview" msgid="8010217796057763343">"Print preview"</string>
- <string name="install_for_print_preview" msgid="6366303997385509332">"Install PDF viewer for preview"</string>
- <string name="printing_app_crashed" msgid="854477616686566398">"Printing app crashed"</string>
- <string name="generating_print_job" msgid="3119608742651698916">"Generating print job"</string>
- <string name="save_as_pdf" msgid="5718454119847596853">"Save as PDF"</string>
- <string name="all_printers" msgid="5018829726861876202">"All printers…"</string>
- <string name="print_dialog" msgid="32628687461331979">"Print dialog"</string>
- <string name="current_page_template" msgid="5145005201131935302">"<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">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
- <string name="summary_template" msgid="8899734908625669193">"Summary, copies <xliff:g id="COPIES">%1$s</xliff:g>, paper size <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
- <string name="expand_handle" msgid="7282974448109280522">"Expand handle"</string>
- <string name="collapse_handle" msgid="6886637989442507451">"Collapse handle"</string>
- <string name="print_button" msgid="645164566271246268">"Print"</string>
- <string name="savetopdf_button" msgid="2976186791686924743">"Save to PDF"</string>
- <string name="print_options_expanded" msgid="6944679157471691859">"Print options expanded"</string>
- <string name="print_options_collapsed" msgid="7455930445670414332">"Print options collapsed"</string>
- <string name="search" msgid="5421724265322228497">"Search"</string>
- <string name="all_printers_label" msgid="3178848870161526399">"All printers"</string>
- <string name="add_print_service_label" msgid="5356702546188981940">"Add service"</string>
- <string name="print_search_box_shown_utterance" msgid="7967404953901376090">"Search box shown"</string>
- <string name="print_search_box_hidden_utterance" msgid="5727755169343113351">"Search box hidden"</string>
- <string name="print_add_printer" msgid="1088656468360653455">"Add printer"</string>
- <string name="print_select_printer" msgid="7388760939873368698">"Select printer"</string>
- <string name="print_forget_printer" msgid="5035287497291910766">"Forget printer"</string>
+ <string name="app_label" msgid="4469836075319831821">"Print Spooler"</string>
+ <string name="more_options_button" msgid="2243228396432556771">"More options"</string>
+ <string name="label_destination" msgid="9132510997381599275">"Destination"</string>
+ <string name="label_copies" msgid="3634531042822968308">"Copies"</string>
+ <string name="label_copies_summary" msgid="3861966063536529540">"Copies:"</string>
+ <string name="label_paper_size" msgid="908654383827777759">"Paper size"</string>
+ <string name="label_paper_size_summary" msgid="5668204981332138168">"Paper size:"</string>
+ <string name="label_color" msgid="1108690305218188969">"Color"</string>
+ <string name="label_duplex" msgid="5370037254347072243">"Two-sided"</string>
+ <string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
+ <string name="label_pages" msgid="7768589729282182230">"Pages"</string>
+ <string name="destination_default_text" msgid="5422708056807065710">"Select a printer"</string>
+ <string name="template_all_pages" msgid="3322235982020148762">"All <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
+ <string name="template_page_range" msgid="428638530038286328">"Range of <xliff:g id="PAGE_COUNT">%1$s</xliff:g>"</string>
+ <string name="pages_range_example" msgid="8558694453556945172">"e.g. 1—5,8,11—13"</string>
+ <string name="print_preview" msgid="8010217796057763343">"Print preview"</string>
+ <string name="install_for_print_preview" msgid="6366303997385509332">"Install PDF viewer for preview"</string>
+ <string name="printing_app_crashed" msgid="854477616686566398">"Printing app crashed"</string>
+ <string name="generating_print_job" msgid="3119608742651698916">"Generating print job"</string>
+ <string name="save_as_pdf" msgid="5718454119847596853">"Save as PDF"</string>
+ <string name="all_printers" msgid="5018829726861876202">"All printers…"</string>
+ <string name="print_dialog" msgid="32628687461331979">"Print dialog"</string>
+ <string name="current_page_template" msgid="5145005201131935302">"<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">"Page <xliff:g id="CURRENT_PAGE">%1$d</xliff:g> of <xliff:g id="PAGE_COUNT">%2$d</xliff:g>"</string>
+ <string name="summary_template" msgid="8899734908625669193">"Summary, copies <xliff:g id="COPIES">%1$s</xliff:g>, paper size <xliff:g id="PAPER_SIZE">%2$s</xliff:g>"</string>
+ <string name="expand_handle" msgid="7282974448109280522">"Expand handle"</string>
+ <string name="collapse_handle" msgid="6886637989442507451">"Collapse handle"</string>
+ <string name="print_button" msgid="645164566271246268">"Print"</string>
+ <string name="savetopdf_button" msgid="2976186791686924743">"Save to PDF"</string>
+ <string name="print_options_expanded" msgid="6944679157471691859">"Print options expanded"</string>
+ <string name="print_options_collapsed" msgid="7455930445670414332">"Print options collapsed"</string>
+ <string name="search" msgid="5421724265322228497">"Search"</string>
+ <string name="all_printers_label" msgid="3178848870161526399">"All printers"</string>
+ <string name="add_print_service_label" msgid="5356702546188981940">"Add service"</string>
+ <string name="print_search_box_shown_utterance" msgid="7967404953901376090">"Search box shown"</string>
+ <string name="print_search_box_hidden_utterance" msgid="5727755169343113351">"Search box hidden"</string>
+ <string name="print_add_printer" msgid="1088656468360653455">"Add printer"</string>
+ <string name="print_select_printer" msgid="7388760939873368698">"Select printer"</string>
+ <string name="print_forget_printer" msgid="5035287497291910766">"Forget printer"</string>
<plurals name="print_search_result_count_utterance" formatted="false" msgid="6997663738361080868">
- <item quantity="other"><xliff:g id="COUNT_1">%1$s</xliff:g> printers found</item>
- <item quantity="one"><xliff:g id="COUNT_0">%1$s</xliff:g> printer found</item>
+ <item quantity="other"><xliff:g id="COUNT_1">%1$s</xliff:g> printers found</item>
+ <item quantity="one"><xliff:g id="COUNT_0">%1$s</xliff:g> printer found</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">"More information about this printer"</string>
- <string name="notification_channel_progress" msgid="872788690775721436">"Running print jobs"</string>
- <string name="notification_channel_failure" msgid="9042250774797916414">"Failed print jobs"</string>
- <string name="could_not_create_file" msgid="3425025039427448443">"Could not create file"</string>
- <string name="print_services_disabled_toast" msgid="9089060734685174685">"Some print services are disabled"</string>
- <string name="print_searching_for_printers" msgid="6550424555079932867">"Searching for printers"</string>
- <string name="print_no_print_services" msgid="8561247706423327966">"No print services enabled"</string>
- <string name="print_no_printers" msgid="4869403323900054866">"No printers found"</string>
- <string name="cannot_add_printer" msgid="7840348733668023106">"Cannot add printers"</string>
- <string name="select_to_add_printers" msgid="3800709038689830974">"Select to add printer"</string>
- <string name="enable_print_service" msgid="3482815747043533842">"Select to enable"</string>
- <string name="enabled_services_title" msgid="7036986099096582296">"Enabled services"</string>
- <string name="recommended_services_title" msgid="3799434882937956924">"Recommended services"</string>
- <string name="disabled_services_title" msgid="7313253167968363211">"Disabled services"</string>
- <string name="all_services_title" msgid="5578662754874906455">"All services"</string>
+ <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">"More information about this printer"</string>
+ <string name="notification_channel_progress" msgid="872788690775721436">"Running print jobs"</string>
+ <string name="notification_channel_failure" msgid="9042250774797916414">"Failed print jobs"</string>
+ <string name="could_not_create_file" msgid="3425025039427448443">"Could not create file"</string>
+ <string name="print_services_disabled_toast" msgid="9089060734685174685">"Some print services are disabled"</string>
+ <string name="print_searching_for_printers" msgid="6550424555079932867">"Searching for printers"</string>
+ <string name="print_no_print_services" msgid="8561247706423327966">"No print services enabled"</string>
+ <string name="print_no_printers" msgid="4869403323900054866">"No printers found"</string>
+ <string name="cannot_add_printer" msgid="7840348733668023106">"Cannot add printers"</string>
+ <string name="select_to_add_printers" msgid="3800709038689830974">"Select to add printer"</string>
+ <string name="enable_print_service" msgid="3482815747043533842">"Select to enable"</string>
+ <string name="enabled_services_title" msgid="7036986099096582296">"Enabled services"</string>
+ <string name="recommended_services_title" msgid="3799434882937956924">"Recommended services"</string>
+ <string name="disabled_services_title" msgid="7313253167968363211">"Disabled services"</string>
+ <string name="all_services_title" msgid="5578662754874906455">"All services"</string>
<plurals name="print_services_recommendation_subtitle" formatted="false" msgid="5678487708807185138">
- <item quantity="other">Install to discover <xliff:g id="COUNT_1">%1$s</xliff:g> printers</item>
- <item quantity="one">Install to discover <xliff:g id="COUNT_0">%1$s</xliff:g> printer</item>
+ <item quantity="other">Install to discover <xliff:g id="COUNT_1">%1$s</xliff:g> printers</item>
+ <item quantity="one">Install to discover <xliff:g id="COUNT_0">%1$s</xliff:g> printer</item>
</plurals>
- <string name="printing_notification_title_template" msgid="295903957762447362">"Printing <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
- <string name="cancelling_notification_title_template" msgid="1821759594704703197">"Cancelling <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
- <string name="failed_notification_title_template" msgid="2256217208186530973">"Printer error <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
- <string name="blocked_notification_title_template" msgid="1175435827331588646">"Printer blocked <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
- <string name="cancel" msgid="4373674107267141885">"Cancel"</string>
- <string name="restart" msgid="2472034227037808749">"Restart"</string>
- <string name="no_connection_to_printer" msgid="2159246915977282728">"No connection to printer"</string>
- <string name="reason_unknown" msgid="5507940196503246139">"unknown"</string>
- <string name="print_service_security_warning_title" msgid="2160752291246775320">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
- <string name="print_service_security_warning_summary" msgid="1427434625361692006">"Your document may pass through one or more servers on its way to the printer."</string>
+ <string name="printing_notification_title_template" msgid="295903957762447362">"Printing <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+ <string name="cancelling_notification_title_template" msgid="1821759594704703197">"Cancelling <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+ <string name="failed_notification_title_template" msgid="2256217208186530973">"Printer error <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+ <string name="blocked_notification_title_template" msgid="1175435827331588646">"Printer blocked <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+ <string name="cancel" msgid="4373674107267141885">"Cancel"</string>
+ <string name="restart" msgid="2472034227037808749">"Restart"</string>
+ <string name="no_connection_to_printer" msgid="2159246915977282728">"No connection to printer"</string>
+ <string name="reason_unknown" msgid="5507940196503246139">"unknown"</string>
+ <string name="print_service_security_warning_title" msgid="2160752291246775320">"Use <xliff:g id="SERVICE">%1$s</xliff:g>?"</string>
+ <string name="print_service_security_warning_summary" msgid="1427434625361692006">"Your document may pass through one or more servers on its way to the printer."</string>
<string-array name="color_mode_labels">
- <item msgid="7602948745415174937">"Black & White"</item>
- <item msgid="2762241247228983754">"Color"</item>
+ <item msgid="7602948745415174937">"Black & White"</item>
+ <item msgid="2762241247228983754">"Color"</item>
</string-array>
<string-array name="duplex_mode_labels">
- <item msgid="3882302912790928315">"None"</item>
- <item msgid="7296563835355641719">"Long edge"</item>
- <item msgid="79513688117503758">"Short edge"</item>
+ <item msgid="3882302912790928315">"None"</item>
+ <item msgid="7296563835355641719">"Long edge"</item>
+ <item msgid="79513688117503758">"Short edge"</item>
</string-array>
<string-array name="orientation_labels">
- <item msgid="4061931020926489228">"Portrait"</item>
- <item msgid="3199660090246166812">"Landscape"</item>
+ <item msgid="4061931020926489228">"Portrait"</item>
+ <item msgid="3199660090246166812">"Landscape"</item>
</string-array>
- <string name="print_write_error_message" msgid="5787642615179572543">"Couldn\'t write to file"</string>
- <string name="print_error_default_message" msgid="8602678405502922346">"Sorry, that didn\'t work. Try again."</string>
- <string name="print_error_retry" msgid="1426421728784259538">"Retry"</string>
- <string name="print_error_printer_unavailable" msgid="8985614415253203381">"This printer isn\'t available right now."</string>
- <string name="print_cannot_load_page" msgid="6179560924492912009">"Can\'t display preview"</string>
- <string name="print_preparing_preview" msgid="3939930735671364712">"Preparing preview…"</string>
+ <string name="print_write_error_message" msgid="5787642615179572543">"Couldn\'t write to file"</string>
+ <string name="print_error_default_message" msgid="8602678405502922346">"Sorry, that didn\'t work. Try again."</string>
+ <string name="print_error_retry" msgid="1426421728784259538">"Retry"</string>
+ <string name="print_error_printer_unavailable" msgid="8985614415253203381">"This printer isn\'t available right now."</string>
+ <string name="print_cannot_load_page" msgid="6179560924492912009">"Can\'t display preview"</string>
+ <string name="print_preparing_preview" msgid="3939930735671364712">"Preparing preview…"</string>
</resources>
diff --git a/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java b/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java
index 68ba5fb..be3365f 100644
--- a/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java
+++ b/packages/SettingsLib/ActionBarShadow/src/com/android/settingslib/widget/ActionBarShadowController.java
@@ -27,7 +27,6 @@
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
-import androidx.recyclerview.widget.RecyclerView;
/**
* UI controller that adds a shadow appear/disappear animation to action bar scroll.
@@ -41,40 +40,36 @@
@VisibleForTesting
ScrollChangeWatcher mScrollChangeWatcher;
- private RecyclerView mRecyclerView;
+ private View mScrollView;
private boolean mIsScrollWatcherAttached;
/**
* Wire up the animation to to an {@link Activity}. Shadow will be applied to activity's
* action bar.
*/
- public static ActionBarShadowController attachToRecyclerView(
- Activity activity, Lifecycle lifecycle, RecyclerView recyclerView) {
- return new ActionBarShadowController(activity, lifecycle, recyclerView);
+ public static ActionBarShadowController attachToView(
+ Activity activity, Lifecycle lifecycle, View scrollView) {
+ return new ActionBarShadowController(activity, lifecycle, scrollView);
}
/**
* Wire up the animation to to a {@link View}. Shadow will be applied to the view.
*/
- public static ActionBarShadowController attachToRecyclerView(
- View anchorView, Lifecycle lifecycle, RecyclerView recyclerView) {
- return new ActionBarShadowController(anchorView, lifecycle, recyclerView);
+ public static ActionBarShadowController attachToView(
+ View anchorView, Lifecycle lifecycle, View scrollView) {
+ return new ActionBarShadowController(anchorView, lifecycle, scrollView);
}
- private ActionBarShadowController(Activity activity, Lifecycle lifecycle,
- RecyclerView recyclerView) {
- mScrollChangeWatcher =
- new ActionBarShadowController.ScrollChangeWatcher(activity);
- mRecyclerView = recyclerView;
+ private ActionBarShadowController(Activity activity, Lifecycle lifecycle, View scrollView) {
+ mScrollChangeWatcher = new ActionBarShadowController.ScrollChangeWatcher(activity);
+ mScrollView = scrollView;
attachScrollWatcher();
lifecycle.addObserver(this);
}
- private ActionBarShadowController(View anchorView, Lifecycle lifecycle,
- RecyclerView recyclerView) {
- mScrollChangeWatcher =
- new ActionBarShadowController.ScrollChangeWatcher(anchorView);
- mRecyclerView = recyclerView;
+ private ActionBarShadowController(View anchorView, Lifecycle lifecycle, View scrollView) {
+ mScrollChangeWatcher = new ActionBarShadowController.ScrollChangeWatcher(anchorView);
+ mScrollView = scrollView;
attachScrollWatcher();
lifecycle.addObserver(this);
}
@@ -83,21 +78,21 @@
private void attachScrollWatcher() {
if (!mIsScrollWatcherAttached) {
mIsScrollWatcherAttached = true;
- mRecyclerView.addOnScrollListener(mScrollChangeWatcher);
- mScrollChangeWatcher.updateDropShadow(mRecyclerView);
+ mScrollView.setOnScrollChangeListener(mScrollChangeWatcher);
+ mScrollChangeWatcher.updateDropShadow(mScrollView);
}
}
@OnLifecycleEvent(ON_STOP)
private void detachScrollWatcher() {
- mRecyclerView.removeOnScrollListener(mScrollChangeWatcher);
+ mScrollView.setOnScrollChangeListener(null);
mIsScrollWatcherAttached = false;
}
/**
* Update the drop shadow as the scrollable entity is scrolled.
*/
- final class ScrollChangeWatcher extends RecyclerView.OnScrollListener {
+ final class ScrollChangeWatcher implements View.OnScrollChangeListener {
private final Activity mActivity;
private final View mAnchorView;
@@ -112,9 +107,9 @@
mActivity = null;
}
- // RecyclerView scrolled.
@Override
- public void onScrolled(RecyclerView view, int dx, int dy) {
+ public void onScrollChange(View view, int scrollX, int scrollY, int oldScrollX,
+ int oldScrollY) {
updateDropShadow(view);
}
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index 191bd8f..3e904a3 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -101,8 +101,6 @@
<string name="connected_via_passpoint">Connected via %1$s</string>
<!-- Status message of Wi-Fi when it is connected by a app (via suggestion or network request). [CHAR LIMIT=NONE] -->
<string name="connected_via_app">Connected via <xliff:g id="name" example="Wifi App">%1$s</xliff:g></string>
- <!-- Status message of Wi-Fi when it is connected by Passpoint configuration. [CHAR LIMIT=NONE] -->
- <string name="ssid_by_passpoint_provider"><xliff:g id="ssid" example="Cafe Wifi">%1$s</xliff:g> by <xliff:g id="passpointProvider" example="Passpoint Provider">%2$s</xliff:g></string>
<!-- Status message of Wi-Fi when network has matching passpoint credentials. [CHAR LIMIT=NONE] -->
<string name="available_via_passpoint">Available via %1$s</string>
<!-- Status message of OSU Provider network when not connected. [CHAR LIMIT=NONE] -->
diff --git a/packages/SettingsLib/src/com/android/settingslib/Utils.java b/packages/SettingsLib/src/com/android/settingslib/Utils.java
index c751c39..d32e85f 100644
--- a/packages/SettingsLib/src/com/android/settingslib/Utils.java
+++ b/packages/SettingsLib/src/com/android/settingslib/Utils.java
@@ -56,37 +56,25 @@
public static void updateLocationEnabled(Context context, boolean enabled, int userId,
int source) {
+ LocationManager locationManager = context.getSystemService(LocationManager.class);
+
Settings.Secure.putIntForUser(
context.getContentResolver(), Settings.Secure.LOCATION_CHANGER, source,
userId);
- Intent intent = new Intent(LocationManager.MODE_CHANGING_ACTION);
- final int oldMode = Settings.Secure.getIntForUser(context.getContentResolver(),
- Settings.Secure.LOCATION_MODE, Settings.Secure.LOCATION_MODE_OFF, userId);
+ Intent intent = new Intent(LocationManager.MODE_CHANGING_ACTION);
+ final int oldMode = locationManager.isLocationEnabled()
+ ? Settings.Secure.LOCATION_MODE_ON
+ : Settings.Secure.LOCATION_MODE_OFF;
final int newMode = enabled
- ? Settings.Secure.LOCATION_MODE_HIGH_ACCURACY
+ ? Settings.Secure.LOCATION_MODE_ON
: Settings.Secure.LOCATION_MODE_OFF;
intent.putExtra(CURRENT_MODE_KEY, oldMode);
intent.putExtra(NEW_MODE_KEY, newMode);
context.sendBroadcastAsUser(
intent, UserHandle.of(userId), android.Manifest.permission.WRITE_SECURE_SETTINGS);
- LocationManager locationManager =
- (LocationManager) context.getSystemService(Context.LOCATION_SERVICE);
- locationManager.setLocationEnabledForUser(enabled, UserHandle.of(userId));
- }
- public static boolean updateLocationMode(Context context, int oldMode, int newMode, int userId,
- int source) {
- Settings.Secure.putIntForUser(
- context.getContentResolver(), Settings.Secure.LOCATION_CHANGER, source,
- userId);
- Intent intent = new Intent(LocationManager.MODE_CHANGING_ACTION);
- intent.putExtra(CURRENT_MODE_KEY, oldMode);
- intent.putExtra(NEW_MODE_KEY, newMode);
- context.sendBroadcastAsUser(
- intent, UserHandle.of(userId), android.Manifest.permission.WRITE_SECURE_SETTINGS);
- return Settings.Secure.putIntForUser(
- context.getContentResolver(), Settings.Secure.LOCATION_MODE, newMode, userId);
+ locationManager.setLocationEnabledForUser(enabled, UserHandle.of(userId));
}
/**
diff --git a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
index ed8b487..ac2c2c9 100644
--- a/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
+++ b/packages/SettingsLib/src/com/android/settingslib/wifi/AccessPoint.java
@@ -899,8 +899,9 @@
} else if (isActive()) {
if (isPasspoint()) {
// This is the active connection on passpoint
- summary.append(getSummary(mContext, ssid, getDetailedState(),
- false, null, mConfig.providerFriendlyName));
+ summary.append(getSummary(mContext, /* ssid */ null, getDetailedState(),
+ /* isEphemeral */ false,
+ /* suggestionOrSpecifierPackageName */ null));
} else if (mConfig != null && getDetailedState() == DetailedState.CONNECTED
&& mIsCarrierAp) {
// This is the active connection on a carrier AP
@@ -908,7 +909,7 @@
mCarrierName));
} else {
// This is the active connection on non-passpoint network
- summary.append(getSummary(mContext, getDetailedState(),
+ summary.append(getSummary(mContext, /* ssid */ null, getDetailedState(),
mInfo != null && mInfo.isEphemeral(),
mInfo != null ? mInfo.getNetworkSuggestionOrSpecifierPackageName() : null));
}
@@ -1340,14 +1341,9 @@
}
public static String getSummary(Context context, String ssid, DetailedState state,
- boolean isEphemeral, String suggestionOrSpecifierPackageName,
- String passpointProvider) {
+ boolean isEphemeral, String suggestionOrSpecifierPackageName) {
if (state == DetailedState.CONNECTED) {
- if (!TextUtils.isEmpty(passpointProvider)) {
- // Special case for connected + passpoint networks.
- String format = context.getString(R.string.ssid_by_passpoint_provider);
- return String.format(format, ssid, passpointProvider);
- } else if (isEphemeral && !TextUtils.isEmpty(suggestionOrSpecifierPackageName)) {
+ if (isEphemeral && !TextUtils.isEmpty(suggestionOrSpecifierPackageName)) {
CharSequence appLabel =
getAppLabel(suggestionOrSpecifierPackageName, context.getPackageManager());
return context.getString(R.string.connected_via_app, appLabel);
@@ -1401,19 +1397,6 @@
return String.format(formats[index], ssid);
}
- public static String getSummary(Context context, DetailedState state, boolean isEphemeral,
- String suggestionOrSpecifierPackageName) {
- return getSummary(context, null, state, isEphemeral, suggestionOrSpecifierPackageName,
- null);
- }
-
- public static String getSummary(Context context, DetailedState state, boolean isEphemeral,
- String suggestionOrSpecifierPackageName,
- String passpointProvider) {
- return getSummary(context, null, state, false, suggestionOrSpecifierPackageName,
- passpointProvider);
- }
-
public static String convertToQuotedString(String string) {
return "\"" + string + "\"";
}
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java
index 92ebe44..4d76e44 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/UtilsTest.java
@@ -38,7 +38,6 @@
import android.os.SystemProperties;
import android.os.UserHandle;
import android.provider.Settings;
-import android.provider.Settings.Secure;
import android.telephony.ServiceState;
import android.text.TextUtils;
@@ -86,25 +85,6 @@
}
@Test
- public void testUpdateLocationMode_sendBroadcast() {
- int currentUserId = ActivityManager.getCurrentUser();
- Utils.updateLocationMode(
- mContext,
- Secure.LOCATION_MODE_OFF,
- Secure.LOCATION_MODE_HIGH_ACCURACY,
- currentUserId,
- Settings.Secure.LOCATION_CHANGER_QUICK_SETTINGS);
-
- verify(mContext).sendBroadcastAsUser(
- argThat(actionMatches(LocationManager.MODE_CHANGING_ACTION)),
- ArgumentMatchers.eq(UserHandle.of(currentUserId)),
- ArgumentMatchers.eq(WRITE_SECURE_SETTINGS));
- assertThat(Settings.Secure.getInt(mContext.getContentResolver(),
- Settings.Secure.LOCATION_CHANGER, Settings.Secure.LOCATION_CHANGER_UNKNOWN))
- .isEqualTo(Settings.Secure.LOCATION_CHANGER_QUICK_SETTINGS);
- }
-
- @Test
public void testUpdateLocationEnabled_sendBroadcast() {
int currentUserId = ActivityManager.getCurrentUser();
Utils.updateLocationEnabled(mContext, true, currentUserId,
diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ActionBarShadowControllerTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ActionBarShadowControllerTest.java
index a25b512..4e00ab5 100644
--- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ActionBarShadowControllerTest.java
+++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ActionBarShadowControllerTest.java
@@ -22,6 +22,7 @@
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.isNull;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -49,6 +50,8 @@
@Mock
private RecyclerView mRecyclerView;
@Mock
+ private View mScrollView;
+ @Mock
private Activity mActivity;
@Mock
private ActionBar mActionBar;
@@ -66,51 +69,60 @@
}
@Test
- public void attachToRecyclerView_shouldAddScrollWatcherAndUpdateActionBar() {
+ public void attachToView_shouldAddScrollWatcherAndUpdateActionBar() {
when(mRecyclerView.canScrollVertically(-1)).thenReturn(false);
- ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
+ ActionBarShadowController.attachToView(mActivity, mLifecycle, mRecyclerView);
verify(mActionBar).setElevation(ActionBarShadowController.ELEVATION_LOW);
}
@Test
- public void attachToRecyclerView_customViewAsActionBar_shouldUpdateElevationOnScroll() {
+ public void attachToView_scrollView_shouldAddScrollWatcherAndUpdateActionBar() {
+ when(mScrollView.canScrollVertically(-1)).thenReturn(false);
+
+ ActionBarShadowController.attachToView(mActivity, mLifecycle, mScrollView);
+
+ verify(mActionBar).setElevation(ActionBarShadowController.ELEVATION_LOW);
+ }
+
+ @Test
+ public void attachToView_customViewAsActionBar_shouldUpdateElevationOnScroll() {
// Setup
mView.setElevation(50);
when(mRecyclerView.canScrollVertically(-1)).thenReturn(false);
final ActionBarShadowController controller =
- ActionBarShadowController.attachToRecyclerView(mView, mLifecycle, mRecyclerView);
+ ActionBarShadowController.attachToView(mView, mLifecycle, mRecyclerView);
assertThat(mView.getElevation()).isEqualTo(ActionBarShadowController.ELEVATION_LOW);
// Scroll
when(mRecyclerView.canScrollVertically(-1)).thenReturn(true);
- controller.mScrollChangeWatcher.onScrolled(mRecyclerView, 10 /* dx */, 10 /* dy */);
+ controller.mScrollChangeWatcher.onScrollChange(mRecyclerView, 10, 10, 0, 0);
assertThat(mView.getElevation()).isEqualTo(ActionBarShadowController.ELEVATION_HIGH);
}
@Test
- public void attachToRecyclerView_lifecycleChange_shouldAttachDetach() {
- ActionBarShadowController.attachToRecyclerView(mActivity, mLifecycle, mRecyclerView);
+ public void attachToView_lifecycleChange_shouldAttachDetach() {
+ ActionBarShadowController.attachToView(mActivity, mLifecycle, mRecyclerView);
- verify(mRecyclerView).addOnScrollListener(any());
+ verify(mRecyclerView).setOnScrollChangeListener(any());
mLifecycle.handleLifecycleEvent(ON_START);
mLifecycle.handleLifecycleEvent(ON_STOP);
- verify(mRecyclerView).removeOnScrollListener(any());
+ verify(mRecyclerView).setOnScrollChangeListener(isNull());
mLifecycle.handleLifecycleEvent(ON_START);
- verify(mRecyclerView, times(2)).addOnScrollListener(any());
+ verify(mRecyclerView, times(3)).setOnScrollChangeListener(any());
}
@Test
public void onScrolled_nullAnchorViewAndActivity_shouldNotCrash() {
final Activity activity = null;
final ActionBarShadowController controller =
- ActionBarShadowController.attachToRecyclerView(activity, mLifecycle, mRecyclerView);
+ ActionBarShadowController.attachToView(activity, mLifecycle, mRecyclerView);
// Scroll
- controller.mScrollChangeWatcher.onScrolled(mRecyclerView, 10 /* dx */, 10 /* dy */);
+ controller.mScrollChangeWatcher.onScrollChange(mRecyclerView, 10, 10, 0, 0);
// no crash
}
}
diff --git a/packages/SettingsProvider/res/values-en-rXC/defaults.xml b/packages/SettingsProvider/res/values-en-rXC/defaults.xml
index 1f62695..2edf08d 100644
--- a/packages/SettingsProvider/res/values-en-rXC/defaults.xml
+++ b/packages/SettingsProvider/res/values-en-rXC/defaults.xml
@@ -19,8 +19,8 @@
<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_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>
<string name="def_backup_manager_constants" msgid="75273734665044867"></string>
<string name="def_backup_local_transport_parameters" msgid="303005414813191641"></string>
diff --git a/packages/SettingsProvider/res/values-en-rXC/strings.xml b/packages/SettingsProvider/res/values-en-rXC/strings.xml
index e7abd48..9b18e2b 100644
--- a/packages/SettingsProvider/res/values-en-rXC/strings.xml
+++ b/packages/SettingsProvider/res/values-en-rXC/strings.xml
@@ -19,5 +19,5 @@
<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">"Settings Storage"</string>
+ <string name="app_label" msgid="4567566098528588863">"Settings Storage"</string>
</resources>
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
index 6ca8261..479c964 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProtoDumpUtil.java
@@ -2712,6 +2712,9 @@
dumpSetting(s, p,
Settings.System.MUTE_STREAMS_AFFECTED,
SystemSettingsProto.Volume.MUTE_STREAMS_AFFECTED);
+ dumpSetting(s, p,
+ Settings.System.MASTER_BALANCE,
+ SystemSettingsProto.Volume.MASTER_BALANCE);
p.end(volumeToken);
dumpSetting(s, p,
diff --git a/packages/Shell/res/values-en-rXC/strings.xml b/packages/Shell/res/values-en-rXC/strings.xml
index 9e891f4..283e954 100644
--- a/packages/Shell/res/values-en-rXC/strings.xml
+++ b/packages/Shell/res/values-en-rXC/strings.xml
@@ -16,32 +16,32 @@
<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">"Shell"</string>
- <string name="bugreport_notification_channel" msgid="2574150205913861141">"Bug reports"</string>
- <string name="bugreport_in_progress_title" msgid="4311705936714972757">"Bug report <xliff:g id="ID">#%d</xliff:g> is being generated"</string>
- <string name="bugreport_finished_title" msgid="4429132808670114081">"Bug report <xliff:g id="ID">#%d</xliff:g> captured"</string>
- <string name="bugreport_updating_title" msgid="4423539949559634214">"Adding details to the bug report"</string>
- <string name="bugreport_updating_wait" msgid="3322151947853929470">"Please wait…"</string>
- <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"The bug report will appear on the phone shortly"</string>
- <string name="bugreport_finished_text" product="tv" msgid="5758325479058638893">"Select to share your bug report"</string>
- <string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Tap to share your bug report"</string>
- <string name="bugreport_finished_pending_screenshot_text" product="tv" msgid="2343263822812016950">"Select to share your bug report without a screenshot or wait for the screenshot to finish"</string>
- <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Tap to share your bug report without a screenshot or wait for the screenshot to finish"</string>
- <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Tap to share your bug report without a screenshot or wait for the screenshot to finish"</string>
- <string name="bugreport_confirm" msgid="5917407234515812495">"Bug reports contain data from the system\'s various log files, which may include data you consider sensitive (such as app-usage and location data). Only share bug reports with people and apps you trust."</string>
- <string name="bugreport_confirm_dont_repeat" msgid="6179945398364357318">"Don\'t show again"</string>
- <string name="bugreport_storage_title" msgid="5332488144740527109">"Bug reports"</string>
- <string name="bugreport_unreadable_text" msgid="586517851044535486">"Bug report file could not be read"</string>
- <string name="bugreport_add_details_to_zip_failed" msgid="1302931926486712371">"Couldn\'t add bug report details to zip file"</string>
- <string name="bugreport_unnamed" msgid="2800582406842092709">"unnamed"</string>
- <string name="bugreport_info_action" msgid="2158204228510576227">"Details"</string>
- <string name="bugreport_screenshot_action" msgid="8677781721940614995">"Screenshot"</string>
- <string name="bugreport_screenshot_taken" msgid="5684211273096253120">"Screenshot taken successfully."</string>
- <string name="bugreport_screenshot_failed" msgid="5853049140806834601">"Screenshot could not be taken."</string>
- <string name="bugreport_info_dialog_title" msgid="1355948594292983332">"Bug report <xliff:g id="ID">#%d</xliff:g> details"</string>
- <string name="bugreport_info_name" msgid="4414036021935139527">"Filename"</string>
- <string name="bugreport_info_title" msgid="2306030793918239804">"Bug title"</string>
- <string name="bugreport_info_description" msgid="5072835127481627722">"Bug summary"</string>
- <string name="save" msgid="4781509040564835759">"Save"</string>
- <string name="bugreport_intent_chooser_title" msgid="7605709494790894076">"Share Bug report"</string>
+ <string name="app_label" msgid="3701846017049540910">"Shell"</string>
+ <string name="bugreport_notification_channel" msgid="2574150205913861141">"Bug reports"</string>
+ <string name="bugreport_in_progress_title" msgid="4311705936714972757">"Bug report <xliff:g id="ID">#%d</xliff:g> is being generated"</string>
+ <string name="bugreport_finished_title" msgid="4429132808670114081">"Bug report <xliff:g id="ID">#%d</xliff:g> captured"</string>
+ <string name="bugreport_updating_title" msgid="4423539949559634214">"Adding details to the bug report"</string>
+ <string name="bugreport_updating_wait" msgid="3322151947853929470">"Please wait…"</string>
+ <string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"The bug report will appear on the phone shortly"</string>
+ <string name="bugreport_finished_text" product="tv" msgid="5758325479058638893">"Select to share your bug report"</string>
+ <string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"Tap to share your bug report"</string>
+ <string name="bugreport_finished_pending_screenshot_text" product="tv" msgid="2343263822812016950">"Select to share your bug report without a screenshot or wait for the screenshot to finish"</string>
+ <string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"Tap to share your bug report without a screenshot or wait for the screenshot to finish"</string>
+ <string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"Tap to share your bug report without a screenshot or wait for the screenshot to finish"</string>
+ <string name="bugreport_confirm" msgid="5917407234515812495">"Bug reports contain data from the system\'s various log files, which may include data you consider sensitive (such as app-usage and location data). Only share bug reports with people and apps you trust."</string>
+ <string name="bugreport_confirm_dont_repeat" msgid="6179945398364357318">"Don\'t show again"</string>
+ <string name="bugreport_storage_title" msgid="5332488144740527109">"Bug reports"</string>
+ <string name="bugreport_unreadable_text" msgid="586517851044535486">"Bug report file could not be read"</string>
+ <string name="bugreport_add_details_to_zip_failed" msgid="1302931926486712371">"Couldn\'t add bug report details to zip file"</string>
+ <string name="bugreport_unnamed" msgid="2800582406842092709">"unnamed"</string>
+ <string name="bugreport_info_action" msgid="2158204228510576227">"Details"</string>
+ <string name="bugreport_screenshot_action" msgid="8677781721940614995">"Screenshot"</string>
+ <string name="bugreport_screenshot_taken" msgid="5684211273096253120">"Screenshot taken successfully."</string>
+ <string name="bugreport_screenshot_failed" msgid="5853049140806834601">"Screenshot could not be taken."</string>
+ <string name="bugreport_info_dialog_title" msgid="1355948594292983332">"Bug report <xliff:g id="ID">#%d</xliff:g> details"</string>
+ <string name="bugreport_info_name" msgid="4414036021935139527">"Filename"</string>
+ <string name="bugreport_info_title" msgid="2306030793918239804">"Bug title"</string>
+ <string name="bugreport_info_description" msgid="5072835127481627722">"Bug summary"</string>
+ <string name="save" msgid="4781509040564835759">"Save"</string>
+ <string name="bugreport_intent_chooser_title" msgid="7605709494790894076">"Share Bug report"</string>
</resources>
diff --git a/packages/SystemUI/legacy/recents/res/values-en-rXC/strings.xml b/packages/SystemUI/legacy/recents/res/values-en-rXC/strings.xml
index 67477e9..ceb6b13 100644
--- a/packages/SystemUI/legacy/recents/res/values-en-rXC/strings.xml
+++ b/packages/SystemUI/legacy/recents/res/values-en-rXC/strings.xml
@@ -19,25 +19,25 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Overview."</string>
- <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Dismiss <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> dismissed."</string>
- <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"All recent applications dismissed."</string>
- <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Open <xliff:g id="APP">%s</xliff:g> application info."</string>
- <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Starting <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_empty_message" msgid="7967713254531861311">"No recent items"</string>
- <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"You\'ve cleared everything"</string>
- <string name="recents_app_info_button_label" msgid="8732926607391786762">"Application Info"</string>
- <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"screen pinning"</string>
- <string name="recents_search_bar_label" msgid="638132045925945941">"search"</string>
- <string name="recents_launch_error_message" msgid="9107963563503438012">"Could not start <xliff:g id="APP">%s</xliff:g>."</string>
- <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string>
- <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Clear all"</string>
- <string name="recents_drag_hint_message" msgid="610417221848280136">"Drag here to use split screen"</string>
- <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Split Horizontal"</string>
- <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Split Vertical"</string>
- <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Split Custom"</string>
- <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Split screen to the top"</string>
- <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Split screen to the left"</string>
- <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Split screen to the right"</string>
+ <string name="accessibility_desc_recent_apps" msgid="2427210347871321373">"Overview."</string>
+ <string name="accessibility_recents_item_will_be_dismissed" msgid="2355882496933479534">"Dismiss <xliff:g id="APP">%s</xliff:g>."</string>
+ <string name="accessibility_recents_item_dismissed" msgid="4816790842084268400">"<xliff:g id="APP">%s</xliff:g> dismissed."</string>
+ <string name="accessibility_recents_all_items_dismissed" msgid="5693205751863608046">"All recent applications dismissed."</string>
+ <string name="accessibility_recents_item_open_app_info" msgid="3406797323476801016">"Open <xliff:g id="APP">%s</xliff:g> application info."</string>
+ <string name="accessibility_recents_item_launched" msgid="4519918148638221791">"Starting <xliff:g id="APP">%s</xliff:g>."</string>
+ <string name="recents_empty_message" msgid="7967713254531861311">"No recent items"</string>
+ <string name="recents_empty_message_dismissed_all" msgid="1850214584987361375">"You\'ve cleared everything"</string>
+ <string name="recents_app_info_button_label" msgid="8732926607391786762">"Application Info"</string>
+ <string name="recents_lock_to_app_button_label" msgid="6087750201863853365">"screen pinning"</string>
+ <string name="recents_search_bar_label" msgid="638132045925945941">"search"</string>
+ <string name="recents_launch_error_message" msgid="9107963563503438012">"Could not start <xliff:g id="APP">%s</xliff:g>."</string>
+ <string name="recents_launch_disabled_message" msgid="826461671965217243">"<xliff:g id="APP">%s</xliff:g> is disabled in safe-mode."</string>
+ <string name="recents_stack_action_button_label" msgid="1974273390109881497">"Clear all"</string>
+ <string name="recents_drag_hint_message" msgid="610417221848280136">"Drag here to use split screen"</string>
+ <string name="recents_multistack_add_stack_dialog_split_horizontal" msgid="488987777874979435">"Split Horizontal"</string>
+ <string name="recents_multistack_add_stack_dialog_split_vertical" msgid="2498375296906391117">"Split Vertical"</string>
+ <string name="recents_multistack_add_stack_dialog_split_custom" msgid="7368405969130304811">"Split Custom"</string>
+ <string name="recents_accessibility_split_screen_top" msgid="8773505308411722524">"Split screen to the top"</string>
+ <string name="recents_accessibility_split_screen_left" msgid="722594718192007972">"Split screen to the left"</string>
+ <string name="recents_accessibility_split_screen_right" msgid="2479764030969301514">"Split screen to the right"</string>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-af/strings.xml b/packages/SystemUI/res-keyguard/values-af/strings.xml
index 55c822b..da11db3 100644
--- a/packages/SystemUI/res-keyguard/values-af/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-af/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM is nou gedeaktiveer. Voer PUK-kode in om voort te gaan. Jy het <xliff:g id="_NUMBER_1">%d</xliff:g> pogings oor voordat die SIM permanent onbruikbaar word. Kontak die diensverskaffer vir besonderhede.</item>
<item quantity="one">SIM is nou gedeaktiveer. Voer PUK-kode in om voort te gaan. Jy het <xliff:g id="_NUMBER_0">%d</xliff:g> poging oor voordat die SIM permanent onbruikbaar word. Kontak die diensverskaffer vir besonderhede.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Dit is"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Twaalf"</item>
+ <item msgid="7389464214252023751">"Een"</item>
+ <item msgid="8803180377002008046">"Twee"</item>
+ <item msgid="8614897059944644719">"Drie"</item>
+ <item msgid="2293058674782619556">"Vier"</item>
+ <item msgid="4815402358455041664">"Vyf"</item>
+ <item msgid="3325754778509665687">"Ses"</item>
+ <item msgid="5805551341866280575">"Sewe"</item>
+ <item msgid="203334816668238610">"Agt"</item>
+ <item msgid="4828052671464488923">"Nege"</item>
+ <item msgid="2233497913571137419">"Tien"</item>
+ <item msgid="5621554266768657830">"Elf"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"uur"</item>
+ <item msgid="8837126587669001578">"Een"</item>
+ <item msgid="4294343372940455660">"Twee"</item>
+ <item msgid="7129166637707421536">"Drie"</item>
+ <item msgid="7579404865008788673">"Vier"</item>
+ <item msgid="3873924689207380586">"Vyf"</item>
+ <item msgid="4849565597850069377">"Ses"</item>
+ <item msgid="4404219424523572364">"Sewe"</item>
+ <item msgid="8740481214764087329">"Agt"</item>
+ <item msgid="1713216865806811237">"Nege"</item>
+ <item msgid="3508406095411245038">"Tien"</item>
+ <item msgid="7161996337755311711">"Elf"</item>
+ <item msgid="4044549963329624197">"Twaalf"</item>
+ <item msgid="333373157917379088">"Dertien"</item>
+ <item msgid="2631202907124819385">"Veertien"</item>
+ <item msgid="6472396076858033453">"Vyftien"</item>
+ <item msgid="8656981856181581643">"Sestien"</item>
+ <item msgid="7289026608562030619">"Sewentien"</item>
+ <item msgid="3881477602692646573">"Agtien"</item>
+ <item msgid="3358129827772984226">"Negentien"</item>
+ <item msgid="3308575407402865807">"Twintig"</item>
+ <item msgid="5346560955382229629">"Een en\ntwintig"</item>
+ <item msgid="226750304761473436">"Twee en\ntwintig"</item>
+ <item msgid="616811325336838734">"Drie en\ntwintig"</item>
+ <item msgid="616346116869053440">"Vier en\ntwintig"</item>
+ <item msgid="4642996410384042830">"Vyf en\ntwintig"</item>
+ <item msgid="7506092849993571465">"Ses en\ntwintig"</item>
+ <item msgid="1915078191101042031">"Sewe en\ntwintig"</item>
+ <item msgid="4292378641900520252">"Agt en\ntwintig"</item>
+ <item msgid="5339513901773103696">"Nege en\ntwintig"</item>
+ <item msgid="3574673250891657607">"Dertig"</item>
+ <item msgid="5796923836589110940">"Een en\ndertig"</item>
+ <item msgid="5859323597571702052">"Twee en\ndertig"</item>
+ <item msgid="5133326723148876507">"Drie en\ndertig"</item>
+ <item msgid="2693999494655663096">"Vier en\ndertig"</item>
+ <item msgid="3316754944962836197">"Vyf en\ndertig"</item>
+ <item msgid="816891008836796723">"Ses en\ndertig"</item>
+ <item msgid="9158890488666520078">"Sewe en\ndertig"</item>
+ <item msgid="1894769703213894011">"Agt en\ndertig"</item>
+ <item msgid="5638820345598572399">"Nege en\ndertig"</item>
+ <item msgid="8838304023017895439">"Veertig"</item>
+ <item msgid="1834742948932559597">"Een en\nveertig"</item>
+ <item msgid="6573707308847773944">"Twee en\nveertig"</item>
+ <item msgid="2450149950652678001">"Drie en\nveertig"</item>
+ <item msgid="2874667401318178036">"Vier en\nveertig"</item>
+ <item msgid="3391101532763048862">"Vyf en\nveertig"</item>
+ <item msgid="1671489330863254362">"Ses en\nveertig"</item>
+ <item msgid="5916017359554531038">"Sewe en\nveertig"</item>
+ <item msgid="8205413177993059967">"Agt en\nveertig"</item>
+ <item msgid="6607867415142171302">"Nege en\nveertig"</item>
+ <item msgid="8358850748472089162">"Vyftig"</item>
+ <item msgid="3551313125255080234">"Een en\nvyftig"</item>
+ <item msgid="1559678130725716542">"Twee en\nvyftig"</item>
+ <item msgid="431441994725492377">"Drie en\nvyftig"</item>
+ <item msgid="6345774640539623024">"Vier en\nvyftig"</item>
+ <item msgid="8018192990793931120">"Vyf en\nvyftig"</item>
+ <item msgid="6187650843754604534">"Ses en\nvyftig"</item>
+ <item msgid="8727240174015993259">"Sewe en\nvyftig"</item>
+ <item msgid="848339003778952950">"Agt en\nvyftig"</item>
+ <item msgid="5798985802835423618">"Nege en\nvyftig"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-am/strings.xml b/packages/SystemUI/res-keyguard/values-am/strings.xml
index 2632db4..0d154f5 100644
--- a/packages/SystemUI/res-keyguard/values-am/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-am/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">ሲም አሁን ተሰናክሏል። ለመቀጠል የPUK ኮድ ያስገቡ። ሲም እስከመጨረሻው መጠቀም የማይቻል ከመሆኑ በፊት <xliff:g id="_NUMBER_1">%d</xliff:g> ሙከራዎች ይቀረዎታል። ዝርዝሮችን ለማግኘት የአገልግሎት አቅራቢን ያነጋግሩ።</item>
<item quantity="other">ሲም አሁን ተሰናክሏል። ለመቀጠል የPUK ኮድ ያስገቡ። ሲም እስከመጨረሻው መጠቀም የማይቻል ከመሆኑ በፊት <xliff:g id="_NUMBER_1">%d</xliff:g> ሙከራዎች ይቀረዎታል። ዝርዝሮችን ለማግኘት የአገልግሎት አቅራቢን ያነጋግሩ።</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"ነው"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"አስራ ሁለት"</item>
+ <item msgid="7389464214252023751">"አንድ"</item>
+ <item msgid="8803180377002008046">"ሁለት"</item>
+ <item msgid="8614897059944644719">"ሶስት"</item>
+ <item msgid="2293058674782619556">"አራት"</item>
+ <item msgid="4815402358455041664">"አምስት"</item>
+ <item msgid="3325754778509665687">"ስድስት"</item>
+ <item msgid="5805551341866280575">"ሰባት"</item>
+ <item msgid="203334816668238610">"ስምንት"</item>
+ <item msgid="4828052671464488923">"ዘጠኝ"</item>
+ <item msgid="2233497913571137419">"አስር"</item>
+ <item msgid="5621554266768657830">"አስራ አንድ"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"ሰዓት"</item>
+ <item msgid="8837126587669001578">"አንድ"</item>
+ <item msgid="4294343372940455660">"ሁለት"</item>
+ <item msgid="7129166637707421536">"ሶስት"</item>
+ <item msgid="7579404865008788673">"አራት"</item>
+ <item msgid="3873924689207380586">"አምስት"</item>
+ <item msgid="4849565597850069377">"ስድስት"</item>
+ <item msgid="4404219424523572364">"ሰባት"</item>
+ <item msgid="8740481214764087329">"ስምንት"</item>
+ <item msgid="1713216865806811237">"ዘጠኝ"</item>
+ <item msgid="3508406095411245038">"አስር"</item>
+ <item msgid="7161996337755311711">"አስራ አንድ"</item>
+ <item msgid="4044549963329624197">"አስራ ሁለት"</item>
+ <item msgid="333373157917379088">"አስራ ሶስት"</item>
+ <item msgid="2631202907124819385">"አስራ አራት"</item>
+ <item msgid="6472396076858033453">"አስራ አምስት"</item>
+ <item msgid="8656981856181581643">"አስራ ስድስት"</item>
+ <item msgid="7289026608562030619">"አስራ ሰባት"</item>
+ <item msgid="3881477602692646573">"አስራ ስምንት"</item>
+ <item msgid="3358129827772984226">"አስራ ዘጠኝ"</item>
+ <item msgid="3308575407402865807">"ሃያ"</item>
+ <item msgid="5346560955382229629">"ሃያ\nአንድ"</item>
+ <item msgid="226750304761473436">"ሃያ\nሁለት"</item>
+ <item msgid="616811325336838734">"ሃያ\nሶስት"</item>
+ <item msgid="616346116869053440">"ሃያ\nአራት"</item>
+ <item msgid="4642996410384042830">"ሃያ\nአምስት"</item>
+ <item msgid="7506092849993571465">"ሃያ\nስድስት"</item>
+ <item msgid="1915078191101042031">"ሃያ\nሰባት"</item>
+ <item msgid="4292378641900520252">"ሃያ\nስምንት"</item>
+ <item msgid="5339513901773103696">"ሃያ\nዘጠኝ"</item>
+ <item msgid="3574673250891657607">"ሰላሳ"</item>
+ <item msgid="5796923836589110940">"ሰላሳ\nአንድ"</item>
+ <item msgid="5859323597571702052">"ሰላሳ\nሁለት"</item>
+ <item msgid="5133326723148876507">"ሰላሳ\nሶስት"</item>
+ <item msgid="2693999494655663096">"ሰላሳ\nአራት"</item>
+ <item msgid="3316754944962836197">"ሰላሳ\nአምስት"</item>
+ <item msgid="816891008836796723">"ሰላሳ\nስድስት"</item>
+ <item msgid="9158890488666520078">"ሰላሳ\nሰባት"</item>
+ <item msgid="1894769703213894011">"ሰላሳ\nስምንት"</item>
+ <item msgid="5638820345598572399">"ሰላሳ\nዘጠኝ"</item>
+ <item msgid="8838304023017895439">"አርባ"</item>
+ <item msgid="1834742948932559597">"አርባ\nአንድ"</item>
+ <item msgid="6573707308847773944">"አርባ\nሁለት"</item>
+ <item msgid="2450149950652678001">"አርባ\nሶስት"</item>
+ <item msgid="2874667401318178036">"አርባ\nአራት"</item>
+ <item msgid="3391101532763048862">"አርባ\nአምስት"</item>
+ <item msgid="1671489330863254362">"አርባ\nስድስት"</item>
+ <item msgid="5916017359554531038">"አርባ\nሰባት"</item>
+ <item msgid="8205413177993059967">"አርባ\nስምንት"</item>
+ <item msgid="6607867415142171302">"አርባ\nዘጠኝ"</item>
+ <item msgid="8358850748472089162">"ሃምሳ"</item>
+ <item msgid="3551313125255080234">"ሃምሳ\nአንድ"</item>
+ <item msgid="1559678130725716542">"ሃምሳ\nሁለት"</item>
+ <item msgid="431441994725492377">"ሃምሳ\nሶስት"</item>
+ <item msgid="6345774640539623024">"ሃምሳ\nአራት"</item>
+ <item msgid="8018192990793931120">"ሃምሳ\nአምስት"</item>
+ <item msgid="6187650843754604534">"ሃምሳ\nስድስት"</item>
+ <item msgid="8727240174015993259">"ሃምሳ\nሰባት"</item>
+ <item msgid="848339003778952950">"ሃምሳ\nስምንት"</item>
+ <item msgid="5798985802835423618">"ሃምሳ\nዘጠኝ"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ar/strings.xml b/packages/SystemUI/res-keyguard/values-ar/strings.xml
index 9149d7e..826f2f0 100644
--- a/packages/SystemUI/res-keyguard/values-ar/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ar/strings.xml
@@ -182,78 +182,81 @@
<item quantity="other">تم إيقاف شريحة SIM الآن. أدخل رمز PUK للمتابعة، وتتبقى لديك <xliff:g id="_NUMBER_1">%d</xliff:g> محاولة قبل أن تصبح شريحة SIM غير صالحة للاستخدام نهائيًا. ويمكنك الاتصال بمشغل شبكة الجوّال لمعرفة التفاصيل.</item>
<item quantity="one">تم إيقاف شريحة SIM الآن. أدخل رمز PUK للمتابعة، وتتبقى لديك محاولة واحدة (<xliff:g id="_NUMBER_0">%d</xliff:g>) قبل أن تصبح شريحة SIM غير صالحة للاستخدام نهائيًا. ويمكنك الاتصال بمشغل شبكة الجوّال لمعرفة التفاصيل.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"الساعة"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"الثانية عشرة"</item>
+ <item msgid="7389464214252023751">"الواحدة"</item>
+ <item msgid="8803180377002008046">"الثانية"</item>
+ <item msgid="8614897059944644719">"الثالثة"</item>
+ <item msgid="2293058674782619556">"الرابعة"</item>
+ <item msgid="4815402358455041664">"الخامسة"</item>
+ <item msgid="3325754778509665687">"السادسة"</item>
+ <item msgid="5805551341866280575">"السابعة"</item>
+ <item msgid="203334816668238610">"الثامنة"</item>
+ <item msgid="4828052671464488923">"التاسعة"</item>
+ <item msgid="2233497913571137419">"العاشرة"</item>
+ <item msgid="5621554266768657830">"الحادية عشرة"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"بالضبط"</item>
+ <item msgid="8837126587669001578">"الواحدة بالضبط"</item>
+ <item msgid="4294343372940455660">"الثانية بالضبط"</item>
+ <item msgid="7129166637707421536">"الثالثة بالضبط"</item>
+ <item msgid="7579404865008788673">"الرابعة بالضبط"</item>
+ <item msgid="3873924689207380586">"الخاسة بالضبط"</item>
+ <item msgid="4849565597850069377">"السادسة بالضبط"</item>
+ <item msgid="4404219424523572364">"السابعة بالضبط"</item>
+ <item msgid="8740481214764087329">"الثامنة بالضبط"</item>
+ <item msgid="1713216865806811237">"التاسعة بالضبط"</item>
+ <item msgid="3508406095411245038">"عَشر"</item>
+ <item msgid="7161996337755311711">"إحدى عشرة"</item>
+ <item msgid="4044549963329624197">"اثنتا عشرة"</item>
+ <item msgid="333373157917379088">"ثلاث عشرة"</item>
+ <item msgid="2631202907124819385">"أربع عشرة"</item>
+ <item msgid="6472396076858033453">"خمس عشرة"</item>
+ <item msgid="8656981856181581643">"ست عشرة"</item>
+ <item msgid="7289026608562030619">"سبع عشرة"</item>
+ <item msgid="3881477602692646573">"ثمان عشرة"</item>
+ <item msgid="3358129827772984226">"تسع عشرة"</item>
+ <item msgid="3308575407402865807">"عشرون"</item>
+ <item msgid="5346560955382229629">"إحدى\nوعشرون"</item>
+ <item msgid="226750304761473436">"اثنتان\nوعشرون"</item>
+ <item msgid="616811325336838734">"ثلاث\nوعشرون"</item>
+ <item msgid="616346116869053440">"أربع\nوعشرون"</item>
+ <item msgid="4642996410384042830">"خمس\nوعشرون"</item>
+ <item msgid="7506092849993571465">"ست\nوعشرون"</item>
+ <item msgid="1915078191101042031">"سبع\nوعشرون"</item>
+ <item msgid="4292378641900520252">"ثمانٍ\nوعشرون"</item>
+ <item msgid="5339513901773103696">"تسع\nوعشرون"</item>
+ <item msgid="3574673250891657607">"ثلاثون"</item>
+ <item msgid="5796923836589110940">"إحدى\nوثلاثون"</item>
+ <item msgid="5859323597571702052">"اثنتا\nوثلاثون"</item>
+ <item msgid="5133326723148876507">"ثلاث\nوثلاثون"</item>
+ <item msgid="2693999494655663096">"أربع\nوثلاثون"</item>
+ <item msgid="3316754944962836197">"خمس\nوثلاثون"</item>
+ <item msgid="816891008836796723">"ست\nوثلاثون"</item>
+ <item msgid="9158890488666520078">"سبع\nوثلاثون"</item>
+ <item msgid="1894769703213894011">"ثمانٍ\nوثلاثون"</item>
+ <item msgid="5638820345598572399">"تسع\nوثلاثون"</item>
+ <item msgid="8838304023017895439">"أربعون"</item>
+ <item msgid="1834742948932559597">"واحد\nوأربعون"</item>
+ <item msgid="6573707308847773944">"اثنتان\nوأربعون"</item>
+ <item msgid="2450149950652678001">"ثلاث\nوأربعون"</item>
+ <item msgid="2874667401318178036">"أربع\nوأربعون"</item>
+ <item msgid="3391101532763048862">"خمس\nوأربعون"</item>
+ <item msgid="1671489330863254362">"ست\nوأربعون"</item>
+ <item msgid="5916017359554531038">"سبع\nوأربعون"</item>
+ <item msgid="8205413177993059967">"ثمانٍ\nوأربعون"</item>
+ <item msgid="6607867415142171302">"تسع\nوأربعون"</item>
+ <item msgid="8358850748472089162">"خمسون"</item>
+ <item msgid="3551313125255080234">"إحدى\nوخمسون"</item>
+ <item msgid="1559678130725716542">"اثنتان\nوخمسون"</item>
+ <item msgid="431441994725492377">"ثلاث\nوخمسون"</item>
+ <item msgid="6345774640539623024">"أربع\nوخمسون"</item>
+ <item msgid="8018192990793931120">"خمس\nوخمسون"</item>
+ <item msgid="6187650843754604534">"ست\nوخمسون"</item>
+ <item msgid="8727240174015993259">"سبع\nوخمسون"</item>
+ <item msgid="848339003778952950">"ثمانٍ\nوخمسون"</item>
+ <item msgid="5798985802835423618">"تسع\nوخمسون"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-as/strings.xml b/packages/SystemUI/res-keyguard/values-as/strings.xml
index 0a6b896..f67e009 100644
--- a/packages/SystemUI/res-keyguard/values-as/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-as/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">ছিমখন অক্ষম হ’ল। অব্যাহত ৰাখিবলৈ PUK দিয়ক। ছিমখন স্থায়ীভাৱে ব্যৱহাৰৰ অনুপযোগী হোৱাৰ পূৰ্বে আপোনাৰ হাতত <xliff:g id="_NUMBER_1">%d</xliff:g>টা প্ৰয়াস বাকী আছে। সবিশেষ জানিবলৈ বাহকৰ সৈতে যোগাযোগ কৰক।</item>
<item quantity="other">ছিমখন অক্ষম হ’ল। অব্যাহত ৰাখিবলৈ PUK দিয়ক। ছিমখন স্থায়ীভাৱে ব্যৱহাৰৰ অনুপযোগী হোৱাৰ পূৰ্বে আপোনাৰ হাতত <xliff:g id="_NUMBER_1">%d</xliff:g>টা প্ৰয়াস বাকী আছে। সবিশেষ জানিবলৈ বাহকৰ সৈতে যোগাযোগ কৰক।</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"সময়"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"বাৰ"</item>
+ <item msgid="7389464214252023751">"এক"</item>
+ <item msgid="8803180377002008046">"দুই"</item>
+ <item msgid="8614897059944644719">"তিনি"</item>
+ <item msgid="2293058674782619556">"চাৰি"</item>
+ <item msgid="4815402358455041664">"পাঁচ"</item>
+ <item msgid="3325754778509665687">"ছয়"</item>
+ <item msgid="5805551341866280575">"সাত"</item>
+ <item msgid="203334816668238610">"আঠ"</item>
+ <item msgid="4828052671464488923">"ন"</item>
+ <item msgid="2233497913571137419">"দহ"</item>
+ <item msgid="5621554266768657830">"এঘাৰ"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"বাজিছে"</item>
+ <item msgid="8837126587669001578">"এক"</item>
+ <item msgid="4294343372940455660">"দুই"</item>
+ <item msgid="7129166637707421536">"তিনি"</item>
+ <item msgid="7579404865008788673">"চাৰি"</item>
+ <item msgid="3873924689207380586">"পাঁচ"</item>
+ <item msgid="4849565597850069377">"ছয়"</item>
+ <item msgid="4404219424523572364">"সাত"</item>
+ <item msgid="8740481214764087329">"আঠ"</item>
+ <item msgid="1713216865806811237">"ন"</item>
+ <item msgid="3508406095411245038">"দহ"</item>
+ <item msgid="7161996337755311711">"এঘাৰ"</item>
+ <item msgid="4044549963329624197">"বাৰ"</item>
+ <item msgid="333373157917379088">"তেৰ"</item>
+ <item msgid="2631202907124819385">"চৈধ্য"</item>
+ <item msgid="6472396076858033453">"পোন্ধৰ"</item>
+ <item msgid="8656981856181581643">"ষোল্ল"</item>
+ <item msgid="7289026608562030619">"সোতৰ"</item>
+ <item msgid="3881477602692646573">"ওঠৰ"</item>
+ <item msgid="3358129827772984226">"ঊনৈছ"</item>
+ <item msgid="3308575407402865807">"বিছ"</item>
+ <item msgid="5346560955382229629">"একৈছ\n"</item>
+ <item msgid="226750304761473436">"বাইছ\n"</item>
+ <item msgid="616811325336838734">"তেইছ\n"</item>
+ <item msgid="616346116869053440">"চৌবিছ\n"</item>
+ <item msgid="4642996410384042830">"পঁচিছ\n"</item>
+ <item msgid="7506092849993571465">"ছাব্বিছ\n"</item>
+ <item msgid="1915078191101042031">"সাতাইছ\n"</item>
+ <item msgid="4292378641900520252">"আঠাইছ\n"</item>
+ <item msgid="5339513901773103696">"ঊনত্ৰিছ\n"</item>
+ <item msgid="3574673250891657607">"ত্ৰিছ"</item>
+ <item msgid="5796923836589110940">"একত্ৰিছ\n"</item>
+ <item msgid="5859323597571702052">"বত্ৰিছ\n"</item>
+ <item msgid="5133326723148876507">"তেত্ৰিছ\n"</item>
+ <item msgid="2693999494655663096">"চৌত্ৰিছ\n"</item>
+ <item msgid="3316754944962836197">"পঁইত্ৰিছ\n"</item>
+ <item msgid="816891008836796723">"ছয়ত্ৰিছ\n"</item>
+ <item msgid="9158890488666520078">"সাতত্ৰিছ\n"</item>
+ <item msgid="1894769703213894011">"আঠত্ৰিছ\n"</item>
+ <item msgid="5638820345598572399">"ঊনচল্লিছ\n"</item>
+ <item msgid="8838304023017895439">"চল্লিছ"</item>
+ <item msgid="1834742948932559597">"একচল্লিছ\n"</item>
+ <item msgid="6573707308847773944">"বিয়াল্লিছ\n"</item>
+ <item msgid="2450149950652678001">"তিয়াল্লিছ\n"</item>
+ <item msgid="2874667401318178036">"চৌৰাল্লিছ\n"</item>
+ <item msgid="3391101532763048862">"পঞ্চলিছ\n"</item>
+ <item msgid="1671489330863254362">"ছয়চল্লিছ\n"</item>
+ <item msgid="5916017359554531038">"সাতচল্লিছ\n"</item>
+ <item msgid="8205413177993059967">"আঠচল্লিছ\n"</item>
+ <item msgid="6607867415142171302">"ঊনপঞ্চাছ\n"</item>
+ <item msgid="8358850748472089162">"পঞ্চাছ"</item>
+ <item msgid="3551313125255080234">"একাৱন\n"</item>
+ <item msgid="1559678130725716542">"বাৱন\n"</item>
+ <item msgid="431441994725492377">"তেৱন\n"</item>
+ <item msgid="6345774640539623024">"চৌৱন\n"</item>
+ <item msgid="8018192990793931120">"পঁচপন\n"</item>
+ <item msgid="6187650843754604534">"ছাপন\n"</item>
+ <item msgid="8727240174015993259">"সাতাৱন\n"</item>
+ <item msgid="848339003778952950">"আঠাৱন\n"</item>
+ <item msgid="5798985802835423618">"ঊনষাঠি\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-az/strings.xml b/packages/SystemUI/res-keyguard/values-az/strings.xml
index 8e6df65..50f1b1f 100644
--- a/packages/SystemUI/res-keyguard/values-az/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-az/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM indi deaktivdir. Davam etmək üçün PUK kodunu daxil edin. SIM birdəfəlik yararsız olmadan öncə <xliff:g id="_NUMBER_1">%d</xliff:g> cəhdiniz qalır. Ətraflı məlumat üçün operatorla əlaqə saxlayın.</item>
<item quantity="one">SIM indi deaktivdir. Davam etmək üçün PUK kodunu daxil edin. SIM birdəfəlik yararsız olmadan öncə <xliff:g id="_NUMBER_0">%d</xliff:g> cəhdiniz qalır. Ətraflı məlumat üçün operatorla əlaqə saxlayın.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Saat"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"On iki"</item>
+ <item msgid="7389464214252023751">"Bir"</item>
+ <item msgid="8803180377002008046">"İki"</item>
+ <item msgid="8614897059944644719">"Üç"</item>
+ <item msgid="2293058674782619556">"Dörd"</item>
+ <item msgid="4815402358455041664">"Beş"</item>
+ <item msgid="3325754778509665687">"Altı"</item>
+ <item msgid="5805551341866280575">"Yeddi"</item>
+ <item msgid="203334816668238610">"Səkkiz"</item>
+ <item msgid="4828052671464488923">"Doqquz"</item>
+ <item msgid="2233497913571137419">"On"</item>
+ <item msgid="5621554266768657830">"On bir"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Saat"</item>
+ <item msgid="8837126587669001578">"Bir"</item>
+ <item msgid="4294343372940455660">"İki"</item>
+ <item msgid="7129166637707421536">"Üç"</item>
+ <item msgid="7579404865008788673">"Dörd"</item>
+ <item msgid="3873924689207380586">"Beş"</item>
+ <item msgid="4849565597850069377">"Altı"</item>
+ <item msgid="4404219424523572364">"Yeddi"</item>
+ <item msgid="8740481214764087329">"Səkkiz"</item>
+ <item msgid="1713216865806811237">"doqquz"</item>
+ <item msgid="3508406095411245038">"On"</item>
+ <item msgid="7161996337755311711">"On bir"</item>
+ <item msgid="4044549963329624197">"On iki"</item>
+ <item msgid="333373157917379088">"On üç"</item>
+ <item msgid="2631202907124819385">"On dörd"</item>
+ <item msgid="6472396076858033453">"On beş"</item>
+ <item msgid="8656981856181581643">"On altı"</item>
+ <item msgid="7289026608562030619">"On yeddi"</item>
+ <item msgid="3881477602692646573">"On səkkiz"</item>
+ <item msgid="3358129827772984226">"On doqquz"</item>
+ <item msgid="3308575407402865807">"İyirmi"</item>
+ <item msgid="5346560955382229629">"İyirmi\nBir"</item>
+ <item msgid="226750304761473436">"İyirmi\nİki"</item>
+ <item msgid="616811325336838734">"İyirmi\nÜç"</item>
+ <item msgid="616346116869053440">"İyirmi\nDörd"</item>
+ <item msgid="4642996410384042830">"İyirmi\nBeş"</item>
+ <item msgid="7506092849993571465">"İyirmi\nAltı"</item>
+ <item msgid="1915078191101042031">"İyirmi\nYeddi"</item>
+ <item msgid="4292378641900520252">"İyirmi\nSəkkiz"</item>
+ <item msgid="5339513901773103696">"İyirmi\nDoqquz"</item>
+ <item msgid="3574673250891657607">"Otuz"</item>
+ <item msgid="5796923836589110940">"Otuz\nBir"</item>
+ <item msgid="5859323597571702052">"Otuz\nİki"</item>
+ <item msgid="5133326723148876507">"Otuz\nÜç"</item>
+ <item msgid="2693999494655663096">"Otuz\nDörd"</item>
+ <item msgid="3316754944962836197">"Otuz\nBeş"</item>
+ <item msgid="816891008836796723">"Otuz\nAltı"</item>
+ <item msgid="9158890488666520078">"Otuz\nYeddi"</item>
+ <item msgid="1894769703213894011">"Otuz\nYeddi"</item>
+ <item msgid="5638820345598572399">"Otuz\nDoqquz"</item>
+ <item msgid="8838304023017895439">"Qırx"</item>
+ <item msgid="1834742948932559597">"Qırx\nBir"</item>
+ <item msgid="6573707308847773944">"Qırx\nİki"</item>
+ <item msgid="2450149950652678001">"Qırx\nÜç"</item>
+ <item msgid="2874667401318178036">"Qırx\nİki"</item>
+ <item msgid="3391101532763048862">"Qırx\nBeş"</item>
+ <item msgid="1671489330863254362">"Qırx\nAltı"</item>
+ <item msgid="5916017359554531038">"Qırx\nYeddi"</item>
+ <item msgid="8205413177993059967">"Qırx\nSəkkiz"</item>
+ <item msgid="6607867415142171302">"Qırx\nDoqquz"</item>
+ <item msgid="8358850748472089162">"Əlli"</item>
+ <item msgid="3551313125255080234">"Əlli\nBir"</item>
+ <item msgid="1559678130725716542">"Əlli\nİki"</item>
+ <item msgid="431441994725492377">"Əlli\nÜç"</item>
+ <item msgid="6345774640539623024">"Əlli\nDörd"</item>
+ <item msgid="8018192990793931120">"Əlli\nBeş"</item>
+ <item msgid="6187650843754604534">"Əlli\nAltı"</item>
+ <item msgid="8727240174015993259">"Əlli\nYeddi"</item>
+ <item msgid="848339003778952950">"Əlli\nSəkkiz"</item>
+ <item msgid="5798985802835423618">"Əlli\nDoqquz"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml
index ca32751a..a5fceef 100644
--- a/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-b+sr+Latn/strings.xml
@@ -158,78 +158,81 @@
<item quantity="few">SIM je sada onemogućen. Unesite PUK kôd da biste nastavili. Imate još <xliff:g id="_NUMBER_1">%d</xliff:g> pokušaja pre nego što SIM postane trajno neupotrebljiv. Detaljne informacije potražite od mobilnog operatera.</item>
<item quantity="other">SIM je sada onemogućen. Unesite PUK kôd da biste nastavili. Imate još <xliff:g id="_NUMBER_1">%d</xliff:g> pokušaja pre nego što SIM postane trajno neupotrebljiv. Detaljne informacije potražite od mobilnog operatera.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Sada je"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"dvanaest"</item>
+ <item msgid="7389464214252023751">"jedan"</item>
+ <item msgid="8803180377002008046">"dva"</item>
+ <item msgid="8614897059944644719">"tri"</item>
+ <item msgid="2293058674782619556">"četiri"</item>
+ <item msgid="4815402358455041664">"pet"</item>
+ <item msgid="3325754778509665687">"šest"</item>
+ <item msgid="5805551341866280575">"sedam"</item>
+ <item msgid="203334816668238610">"osam"</item>
+ <item msgid="4828052671464488923">"devet"</item>
+ <item msgid="2233497913571137419">"deset"</item>
+ <item msgid="5621554266768657830">"jedanaest"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"sata(i)"</item>
+ <item msgid="8837126587669001578">"jedan"</item>
+ <item msgid="4294343372940455660">"dva"</item>
+ <item msgid="7129166637707421536">"tri"</item>
+ <item msgid="7579404865008788673">"četiri"</item>
+ <item msgid="3873924689207380586">"pet"</item>
+ <item msgid="4849565597850069377">"šest"</item>
+ <item msgid="4404219424523572364">"sedam"</item>
+ <item msgid="8740481214764087329">"osam"</item>
+ <item msgid="1713216865806811237">"devet"</item>
+ <item msgid="3508406095411245038">"deset"</item>
+ <item msgid="7161996337755311711">"jedanaest"</item>
+ <item msgid="4044549963329624197">"dvanaest"</item>
+ <item msgid="333373157917379088">"trinaest"</item>
+ <item msgid="2631202907124819385">"četrnaest"</item>
+ <item msgid="6472396076858033453">"petnaest"</item>
+ <item msgid="8656981856181581643">"šesnaest"</item>
+ <item msgid="7289026608562030619">"sedamnaest"</item>
+ <item msgid="3881477602692646573">"osamnaest"</item>
+ <item msgid="3358129827772984226">"devetnaest"</item>
+ <item msgid="3308575407402865807">"dvadeset"</item>
+ <item msgid="5346560955382229629">"dvadeset\njedan"</item>
+ <item msgid="226750304761473436">"dvadeset\ndva"</item>
+ <item msgid="616811325336838734">"dvadeset\ntri"</item>
+ <item msgid="616346116869053440">"dvadeset\nčetiri"</item>
+ <item msgid="4642996410384042830">"dvadeset\npet"</item>
+ <item msgid="7506092849993571465">"dvadeset\nšest"</item>
+ <item msgid="1915078191101042031">"dvadeset\nsedam"</item>
+ <item msgid="4292378641900520252">"dvadeset\nosam"</item>
+ <item msgid="5339513901773103696">"dvadeset\ndevet"</item>
+ <item msgid="3574673250891657607">"trideset"</item>
+ <item msgid="5796923836589110940">"trideset\njedan"</item>
+ <item msgid="5859323597571702052">"trideset\ndva"</item>
+ <item msgid="5133326723148876507">"trideset\ntri"</item>
+ <item msgid="2693999494655663096">"trideset\nčetiri"</item>
+ <item msgid="3316754944962836197">"trideset\npet"</item>
+ <item msgid="816891008836796723">"trideset\nšest"</item>
+ <item msgid="9158890488666520078">"trideset\nsedam"</item>
+ <item msgid="1894769703213894011">"trideset\nosam"</item>
+ <item msgid="5638820345598572399">"trideset\ndevet"</item>
+ <item msgid="8838304023017895439">"četrdeset"</item>
+ <item msgid="1834742948932559597">"četrdeset\njedan"</item>
+ <item msgid="6573707308847773944">"četrdeset\ndva"</item>
+ <item msgid="2450149950652678001">"četrdeset\ntri"</item>
+ <item msgid="2874667401318178036">"četrdeset\nčetiri"</item>
+ <item msgid="3391101532763048862">"četrdeset\npet"</item>
+ <item msgid="1671489330863254362">"četrdeset\nšest"</item>
+ <item msgid="5916017359554531038">"četrdeset\nsedam"</item>
+ <item msgid="8205413177993059967">"četrdeset\nosam"</item>
+ <item msgid="6607867415142171302">"četrdeset\ndevet"</item>
+ <item msgid="8358850748472089162">"pedeset"</item>
+ <item msgid="3551313125255080234">"pedeset\njedan"</item>
+ <item msgid="1559678130725716542">"pedeset\ndva"</item>
+ <item msgid="431441994725492377">"pedeset\ntri"</item>
+ <item msgid="6345774640539623024">"pedeset\nčetiri"</item>
+ <item msgid="8018192990793931120">"pedeset\npet"</item>
+ <item msgid="6187650843754604534">"pedeset\nšest"</item>
+ <item msgid="8727240174015993259">"pedeset\nsedam"</item>
+ <item msgid="848339003778952950">"pedeset\nosam"</item>
+ <item msgid="5798985802835423618">"pedeset\ndevet"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-be/strings.xml b/packages/SystemUI/res-keyguard/values-be/strings.xml
index 2048869..872cd7b 100644
--- a/packages/SystemUI/res-keyguard/values-be/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-be/strings.xml
@@ -166,78 +166,81 @@
<item quantity="many">SIM-карта заблакіравана. Каб працягнуць, увядзіце PUK-код. У вас ёсць яшчэ <xliff:g id="_NUMBER_1">%d</xliff:g> спроб, пасля чаго SIM-карта будзе заблакіравана назаўсёды. Звярніцеся да аператара, каб даведацца больш.</item>
<item quantity="other">SIM-карта заблакіравана. Каб працягнуць, увядзіце PUK-код. У вас ёсць яшчэ <xliff:g id="_NUMBER_1">%d</xliff:g> спробы, пасля чаго SIM-карта будзе заблакіравана назаўсёды. Звярніцеся да аператара, каб даведацца больш.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Зараз"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Дванаццаць"</item>
+ <item msgid="7389464214252023751">"Адна"</item>
+ <item msgid="8803180377002008046">"Дзве"</item>
+ <item msgid="8614897059944644719">"Тры"</item>
+ <item msgid="2293058674782619556">"Чатыры"</item>
+ <item msgid="4815402358455041664">"Пяць"</item>
+ <item msgid="3325754778509665687">"Шэсць"</item>
+ <item msgid="5805551341866280575">"Сем"</item>
+ <item msgid="203334816668238610">"Восем"</item>
+ <item msgid="4828052671464488923">"Дзевяць"</item>
+ <item msgid="2233497913571137419">"Дзесяць"</item>
+ <item msgid="5621554266768657830">"Адзінаццаць"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"нуль нуль"</item>
+ <item msgid="8837126587669001578">"нуль адна"</item>
+ <item msgid="4294343372940455660">"нуль дзве"</item>
+ <item msgid="7129166637707421536">"нуль тры"</item>
+ <item msgid="7579404865008788673">"нуль чатыры"</item>
+ <item msgid="3873924689207380586">"нуль пяць"</item>
+ <item msgid="4849565597850069377">"нуль шэсць"</item>
+ <item msgid="4404219424523572364">"нуль сем"</item>
+ <item msgid="8740481214764087329">"нуль восем"</item>
+ <item msgid="1713216865806811237">"нуль дзевяць"</item>
+ <item msgid="3508406095411245038">"дзесяць"</item>
+ <item msgid="7161996337755311711">"адзінаццаць"</item>
+ <item msgid="4044549963329624197">"дванаццаць"</item>
+ <item msgid="333373157917379088">"трынаццаць"</item>
+ <item msgid="2631202907124819385">"чатырнаццаць"</item>
+ <item msgid="6472396076858033453">"пятнаццаць"</item>
+ <item msgid="8656981856181581643">"шаснаццаць"</item>
+ <item msgid="7289026608562030619">"сямнаццаць"</item>
+ <item msgid="3881477602692646573">"васямнаццаць"</item>
+ <item msgid="3358129827772984226">"дзевятнаццаць"</item>
+ <item msgid="3308575407402865807">"дваццаць"</item>
+ <item msgid="5346560955382229629">"дваццаць\nадна"</item>
+ <item msgid="226750304761473436">"дваццаць\nдзве"</item>
+ <item msgid="616811325336838734">"дваццаць\nтры"</item>
+ <item msgid="616346116869053440">"дваццаць\nчатыры"</item>
+ <item msgid="4642996410384042830">"дваццаць\nпяць"</item>
+ <item msgid="7506092849993571465">"дваццаць\nшэсць"</item>
+ <item msgid="1915078191101042031">"дваццаць\nсем"</item>
+ <item msgid="4292378641900520252">"дваццаць\nвосем"</item>
+ <item msgid="5339513901773103696">"дваццаць\nдзевяць"</item>
+ <item msgid="3574673250891657607">"трыццаць"</item>
+ <item msgid="5796923836589110940">"трыццаць\nадна"</item>
+ <item msgid="5859323597571702052">"трыццаць\nдзве"</item>
+ <item msgid="5133326723148876507">"трыццаць\nтры"</item>
+ <item msgid="2693999494655663096">"трыццаць\nчатыры"</item>
+ <item msgid="3316754944962836197">"трыццаць\nпяць"</item>
+ <item msgid="816891008836796723">"трыццаць\nшэсць"</item>
+ <item msgid="9158890488666520078">"трыццаць\nсем"</item>
+ <item msgid="1894769703213894011">"трыццаць\nвосем"</item>
+ <item msgid="5638820345598572399">"трыццаць\nдзевяць"</item>
+ <item msgid="8838304023017895439">"сорак"</item>
+ <item msgid="1834742948932559597">"сорак\nадна"</item>
+ <item msgid="6573707308847773944">"сорак\nдзве"</item>
+ <item msgid="2450149950652678001">"сорак\nтры"</item>
+ <item msgid="2874667401318178036">"сорак\nчатыры"</item>
+ <item msgid="3391101532763048862">"сорак\nпяць"</item>
+ <item msgid="1671489330863254362">"сорак\nшэсць"</item>
+ <item msgid="5916017359554531038">"сорак\nсем"</item>
+ <item msgid="8205413177993059967">"сорак\nвосем"</item>
+ <item msgid="6607867415142171302">"сорак\nдзевяць"</item>
+ <item msgid="8358850748472089162">"пяцьдзясят"</item>
+ <item msgid="3551313125255080234">"пяцьдзясят\nадна"</item>
+ <item msgid="1559678130725716542">"пяцьдзясят\nдзве"</item>
+ <item msgid="431441994725492377">"пяцьдзясят\nтры"</item>
+ <item msgid="6345774640539623024">"пяцьдзясят\nчатыры"</item>
+ <item msgid="8018192990793931120">"пяцьдзясят\nпяць"</item>
+ <item msgid="6187650843754604534">"пяцьдзясят\nшэсць"</item>
+ <item msgid="8727240174015993259">"пяцьдзясят\nсем"</item>
+ <item msgid="848339003778952950">"пяцьдзясят\nвосем"</item>
+ <item msgid="5798985802835423618">"пяцьдзясят\nдзевяць"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-bg/strings.xml b/packages/SystemUI/res-keyguard/values-bg/strings.xml
index 362fc51..741834f 100644
--- a/packages/SystemUI/res-keyguard/values-bg/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-bg/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM картата вече е деактивирана. Въведете PUK кода, за да продължите. Остават ви <xliff:g id="_NUMBER_1">%d</xliff:g> опита, преди SIM картата да стане неизползваема завинаги. Свържете се с оператора за подробности.</item>
<item quantity="one">SIM картата вече е деактивирана. Въведете PUK кода, за да продължите. Остава ви <xliff:g id="_NUMBER_0">%d</xliff:g> опит, преди SIM картата да стане неизползваема завинаги. Свържете се с оператора за подробности.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Часът е"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"дванайсет"</item>
+ <item msgid="7389464214252023751">"един"</item>
+ <item msgid="8803180377002008046">"два"</item>
+ <item msgid="8614897059944644719">"три"</item>
+ <item msgid="2293058674782619556">"четири"</item>
+ <item msgid="4815402358455041664">"пет"</item>
+ <item msgid="3325754778509665687">"шест"</item>
+ <item msgid="5805551341866280575">"седем"</item>
+ <item msgid="203334816668238610">"осем"</item>
+ <item msgid="4828052671464488923">"девет"</item>
+ <item msgid="2233497913571137419">"десет"</item>
+ <item msgid="5621554266768657830">"единайсет"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"часа"</item>
+ <item msgid="8837126587669001578">"и една"</item>
+ <item msgid="4294343372940455660">"и две"</item>
+ <item msgid="7129166637707421536">"и три"</item>
+ <item msgid="7579404865008788673">"и четири"</item>
+ <item msgid="3873924689207380586">"и пет"</item>
+ <item msgid="4849565597850069377">"и шест"</item>
+ <item msgid="4404219424523572364">"и седем"</item>
+ <item msgid="8740481214764087329">"и осем"</item>
+ <item msgid="1713216865806811237">"и девет"</item>
+ <item msgid="3508406095411245038">"десет"</item>
+ <item msgid="7161996337755311711">"единайсет"</item>
+ <item msgid="4044549963329624197">"дванайсет"</item>
+ <item msgid="333373157917379088">"тринайсет"</item>
+ <item msgid="2631202907124819385">"четиринайсет"</item>
+ <item msgid="6472396076858033453">"петнайсет"</item>
+ <item msgid="8656981856181581643">"шестнайсет"</item>
+ <item msgid="7289026608562030619">"седемнайсет"</item>
+ <item msgid="3881477602692646573">"осемнайсет"</item>
+ <item msgid="3358129827772984226">"деветнайсет"</item>
+ <item msgid="3308575407402865807">"двайсет"</item>
+ <item msgid="5346560955382229629">"двайсет\nи една"</item>
+ <item msgid="226750304761473436">"двайсет\nи две"</item>
+ <item msgid="616811325336838734">"двайсет\nи три"</item>
+ <item msgid="616346116869053440">"двайсет\nи четири"</item>
+ <item msgid="4642996410384042830">"двайсет\nи пет"</item>
+ <item msgid="7506092849993571465">"двайсет\nи шест"</item>
+ <item msgid="1915078191101042031">"двайсет\nи седем"</item>
+ <item msgid="4292378641900520252">"двайсет\nи осем"</item>
+ <item msgid="5339513901773103696">"двайсет\nи девет"</item>
+ <item msgid="3574673250891657607">"трийсет"</item>
+ <item msgid="5796923836589110940">"трийсет\nи една"</item>
+ <item msgid="5859323597571702052">"трийсет\nи две"</item>
+ <item msgid="5133326723148876507">"трийсет\nи три"</item>
+ <item msgid="2693999494655663096">"трийсет\nи четири"</item>
+ <item msgid="3316754944962836197">"трийсет\nи пет"</item>
+ <item msgid="816891008836796723">"трийсет\nи шест"</item>
+ <item msgid="9158890488666520078">"трийсет\nи седем"</item>
+ <item msgid="1894769703213894011">"трийсет\nи осем"</item>
+ <item msgid="5638820345598572399">"трийсет\nи девет"</item>
+ <item msgid="8838304023017895439">"четиресет"</item>
+ <item msgid="1834742948932559597">"четиресет\nи една"</item>
+ <item msgid="6573707308847773944">"четиресет\nи две"</item>
+ <item msgid="2450149950652678001">"четиресет\nи три"</item>
+ <item msgid="2874667401318178036">"четиресет\nи четири"</item>
+ <item msgid="3391101532763048862">"четиресет\nи пет"</item>
+ <item msgid="1671489330863254362">"четиресет\nи шест"</item>
+ <item msgid="5916017359554531038">"четиресет\nи седем"</item>
+ <item msgid="8205413177993059967">"четиресет\nи осем"</item>
+ <item msgid="6607867415142171302">"четиресет\nи девет"</item>
+ <item msgid="8358850748472089162">"петдесет"</item>
+ <item msgid="3551313125255080234">"петдесет\nи една"</item>
+ <item msgid="1559678130725716542">"петдесет\nи две"</item>
+ <item msgid="431441994725492377">"петдесет\nи три"</item>
+ <item msgid="6345774640539623024">"петдесет\nи четири"</item>
+ <item msgid="8018192990793931120">"петдесет\nи пет"</item>
+ <item msgid="6187650843754604534">"петдесет\nи шест"</item>
+ <item msgid="8727240174015993259">"петдесет\nи седем"</item>
+ <item msgid="848339003778952950">"петдесет\nи осем"</item>
+ <item msgid="5798985802835423618">"петдесет\nи девет"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-bn/strings.xml b/packages/SystemUI/res-keyguard/values-bn/strings.xml
index e3f0f65..25346a5 100644
--- a/packages/SystemUI/res-keyguard/values-bn/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-bn/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">সিম অক্ষম করা হয়েছে। চালিয়ে যেতে PUK কোড লিখুন। আপনি আর <xliff:g id="_NUMBER_1">%d</xliff:g> বার চেষ্টা করতে পারবেন, তারপরে এই সিমটি আর একেবারেই ব্যবহার করা যাবে না। বিশদে জানতে পরিষেবা প্রদানকারীর সাথে যোগাযোগ করুন।</item>
<item quantity="other">সিম অক্ষম করা হয়েছে। চালিয়ে যেতে PUK কোড লিখুন। আপনি আর <xliff:g id="_NUMBER_1">%d</xliff:g> বার চেষ্টা করতে পারবেন, তারপরে এই সিমটি আর একেবারেই ব্যবহার করা যাবে না। বিশদে জানতে পরিষেবা প্রদানকারীর সাথে যোগাযোগ করুন।</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"এখন"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"বারো"</item>
+ <item msgid="7389464214252023751">"এক"</item>
+ <item msgid="8803180377002008046">"দুই"</item>
+ <item msgid="8614897059944644719">"তিন"</item>
+ <item msgid="2293058674782619556">"চার"</item>
+ <item msgid="4815402358455041664">"পাঁচ"</item>
+ <item msgid="3325754778509665687">"ছয়"</item>
+ <item msgid="5805551341866280575">"সাত"</item>
+ <item msgid="203334816668238610">"আট"</item>
+ <item msgid="4828052671464488923">"নয়"</item>
+ <item msgid="2233497913571137419">"দশ"</item>
+ <item msgid="5621554266768657830">"ইলেভেন"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"বাজচ্ছে"</item>
+ <item msgid="8837126587669001578">"এক"</item>
+ <item msgid="4294343372940455660">"দুই"</item>
+ <item msgid="7129166637707421536">"তিন"</item>
+ <item msgid="7579404865008788673">"চার"</item>
+ <item msgid="3873924689207380586">"পাঁচ"</item>
+ <item msgid="4849565597850069377">"ছয়"</item>
+ <item msgid="4404219424523572364">"সাত"</item>
+ <item msgid="8740481214764087329">"আট"</item>
+ <item msgid="1713216865806811237">"নয়"</item>
+ <item msgid="3508406095411245038">"দশ"</item>
+ <item msgid="7161996337755311711">"ইলেভেন"</item>
+ <item msgid="4044549963329624197">"বারো"</item>
+ <item msgid="333373157917379088">"তেরো"</item>
+ <item msgid="2631202907124819385">"চোদ্দো"</item>
+ <item msgid="6472396076858033453">"পনেরো"</item>
+ <item msgid="8656981856181581643">"ষোল"</item>
+ <item msgid="7289026608562030619">"সতেরো"</item>
+ <item msgid="3881477602692646573">"আঠারো"</item>
+ <item msgid="3358129827772984226">"উনিশ"</item>
+ <item msgid="3308575407402865807">"কুড়ি"</item>
+ <item msgid="5346560955382229629">"এ\nকুশ"</item>
+ <item msgid="226750304761473436">"বাই\nশ"</item>
+ <item msgid="616811325336838734">"তেই\nশ"</item>
+ <item msgid="616346116869053440">"চব্বি\nশ"</item>
+ <item msgid="4642996410384042830">"পঁচি\nশ"</item>
+ <item msgid="7506092849993571465">"চাব্বি\nশ"</item>
+ <item msgid="1915078191101042031">"সা\nতাশ"</item>
+ <item msgid="4292378641900520252">"আটা\nশ"</item>
+ <item msgid="5339513901773103696">"উন\nত্রিশ"</item>
+ <item msgid="3574673250891657607">"তিরিশ"</item>
+ <item msgid="5796923836589110940">"এক\nত্রিশ"</item>
+ <item msgid="5859323597571702052">"বত্রি\nশ"</item>
+ <item msgid="5133326723148876507">"তে\nত্রিশ"</item>
+ <item msgid="2693999494655663096">"চৌ\nত্রিশ"</item>
+ <item msgid="3316754944962836197">"পঁয়\nত্রিশ"</item>
+ <item msgid="816891008836796723">"ছত্রি\nশ"</item>
+ <item msgid="9158890488666520078">"সাই\nত্রিশ"</item>
+ <item msgid="1894769703213894011">"আট\nত্রিশ"</item>
+ <item msgid="5638820345598572399">"উন\nচল্লিশ"</item>
+ <item msgid="8838304023017895439">"চল্লিশ"</item>
+ <item msgid="1834742948932559597">"একচ\nল্লিশ"</item>
+ <item msgid="6573707308847773944">"বিয়া\nল্লিশ"</item>
+ <item msgid="2450149950652678001">"তেতা\nল্লিশ"</item>
+ <item msgid="2874667401318178036">"চুয়া\nল্লিশ"</item>
+ <item msgid="3391101532763048862">"পঁয়তা\nল্লিশ"</item>
+ <item msgid="1671489330863254362">"চুয়া\nল্লিশ"</item>
+ <item msgid="5916017359554531038">"সাত\nচল্লিশ"</item>
+ <item msgid="8205413177993059967">"আটচ\nল্লিশ"</item>
+ <item msgid="6607867415142171302">"উন\nপঞ্চাশ"</item>
+ <item msgid="8358850748472089162">"পঞ্চাশ"</item>
+ <item msgid="3551313125255080234">"একা\nন্ন"</item>
+ <item msgid="1559678130725716542">"বাহ\nন্ন"</item>
+ <item msgid="431441994725492377">"তিপা\nন্ন"</item>
+ <item msgid="6345774640539623024">"চুয়া\nন্ন"</item>
+ <item msgid="8018192990793931120">"পঞ্চা\nন্ন"</item>
+ <item msgid="6187650843754604534">"পঞ্চা\nন্ন"</item>
+ <item msgid="8727240174015993259">"সা\nতান্ন"</item>
+ <item msgid="848339003778952950">"আটা\nন্ন"</item>
+ <item msgid="5798985802835423618">"উন\nষাট"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-bs/strings.xml b/packages/SystemUI/res-keyguard/values-bs/strings.xml
index 042c11e..9396ef1 100644
--- a/packages/SystemUI/res-keyguard/values-bs/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-bs/strings.xml
@@ -158,78 +158,81 @@
<item quantity="few">SIM kartica je onemogućena. Unesite PUK kôd da nastavite. Imate još <xliff:g id="_NUMBER_1">%d</xliff:g> pokušaja prije nego što SIM kartica postane trajno neupotrebljiva. Za više informacija kontaktirajte mobilnog operatera.</item>
<item quantity="other">SIM kartica je onemogućena. Unesite PUK kôd da nastavite. Imate još <xliff:g id="_NUMBER_1">%d</xliff:g> pokušaja prije nego što SIM kartica postane trajno neupotrebljiva. Za više informacija kontaktirajte mobilnog operatera.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Sada je"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Dvanaest"</item>
+ <item msgid="7389464214252023751">"Jedan"</item>
+ <item msgid="8803180377002008046">"Dva"</item>
+ <item msgid="8614897059944644719">"Tri"</item>
+ <item msgid="2293058674782619556">"Četiri"</item>
+ <item msgid="4815402358455041664">"Pet"</item>
+ <item msgid="3325754778509665687">"Šest"</item>
+ <item msgid="5805551341866280575">"Sedam"</item>
+ <item msgid="203334816668238610">"Osam"</item>
+ <item msgid="4828052671464488923">"Devet"</item>
+ <item msgid="2233497913571137419">"Deset"</item>
+ <item msgid="5621554266768657830">"Jedanaest"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"sata(i)"</item>
+ <item msgid="8837126587669001578">"Jedna"</item>
+ <item msgid="4294343372940455660">"Dvije"</item>
+ <item msgid="7129166637707421536">"Tri"</item>
+ <item msgid="7579404865008788673">"Četiri"</item>
+ <item msgid="3873924689207380586">"Pet"</item>
+ <item msgid="4849565597850069377">"Šest"</item>
+ <item msgid="4404219424523572364">"Sedam"</item>
+ <item msgid="8740481214764087329">"Osam"</item>
+ <item msgid="1713216865806811237">"Devet"</item>
+ <item msgid="3508406095411245038">"Deset"</item>
+ <item msgid="7161996337755311711">"Jedanaest"</item>
+ <item msgid="4044549963329624197">"Dvanaest"</item>
+ <item msgid="333373157917379088">"Trinaest"</item>
+ <item msgid="2631202907124819385">"Četrnaest"</item>
+ <item msgid="6472396076858033453">"Petnaest"</item>
+ <item msgid="8656981856181581643">"Šesnaest"</item>
+ <item msgid="7289026608562030619">"Sedamnaest"</item>
+ <item msgid="3881477602692646573">"Osamnaest"</item>
+ <item msgid="3358129827772984226">"Devetnaest"</item>
+ <item msgid="3308575407402865807">"Dvadeset"</item>
+ <item msgid="5346560955382229629">"Dvadeset\njedna"</item>
+ <item msgid="226750304761473436">"Dvadeset\ndvije"</item>
+ <item msgid="616811325336838734">"Dvadeset\ntri"</item>
+ <item msgid="616346116869053440">"Dvadeset\nčetiri"</item>
+ <item msgid="4642996410384042830">"Dvadeset\npet"</item>
+ <item msgid="7506092849993571465">"Dvadeset\nšest"</item>
+ <item msgid="1915078191101042031">"Dvadeset\nsedam"</item>
+ <item msgid="4292378641900520252">"Dvadeset\nosam"</item>
+ <item msgid="5339513901773103696">"Dvadeset\ndevet"</item>
+ <item msgid="3574673250891657607">"Trideset"</item>
+ <item msgid="5796923836589110940">"Trideset\njedna"</item>
+ <item msgid="5859323597571702052">"Trideset\ndva"</item>
+ <item msgid="5133326723148876507">"Trideset\ntri"</item>
+ <item msgid="2693999494655663096">"Trideset\nčetiri"</item>
+ <item msgid="3316754944962836197">"Trideset\npet"</item>
+ <item msgid="816891008836796723">"Trideset\nšest"</item>
+ <item msgid="9158890488666520078">"Trideset\nsedam"</item>
+ <item msgid="1894769703213894011">"Trideset\nosam"</item>
+ <item msgid="5638820345598572399">"Trideset\ndevet"</item>
+ <item msgid="8838304023017895439">"Četrdeset"</item>
+ <item msgid="1834742948932559597">"Četrdeset\njedna"</item>
+ <item msgid="6573707308847773944">"Četrdeset\ndvije"</item>
+ <item msgid="2450149950652678001">"Četrdeset\ntri"</item>
+ <item msgid="2874667401318178036">"Četrdeset\nčetiri"</item>
+ <item msgid="3391101532763048862">"Četrdeset\npet"</item>
+ <item msgid="1671489330863254362">"Četrdeset\nšest"</item>
+ <item msgid="5916017359554531038">"Četrdeset\nsedam"</item>
+ <item msgid="8205413177993059967">"Četrdeset\nosam"</item>
+ <item msgid="6607867415142171302">"Četrdeset\ndevet"</item>
+ <item msgid="8358850748472089162">"Pedeset"</item>
+ <item msgid="3551313125255080234">"Pedeset\njedna"</item>
+ <item msgid="1559678130725716542">"Pedeset\ndvije"</item>
+ <item msgid="431441994725492377">"Pedeset\ntri"</item>
+ <item msgid="6345774640539623024">"Pedeset\nčetiri"</item>
+ <item msgid="8018192990793931120">"Pedeset\npet"</item>
+ <item msgid="6187650843754604534">"Pedeset\nšest"</item>
+ <item msgid="8727240174015993259">"Pedeset\nsedam"</item>
+ <item msgid="848339003778952950">"Pedeset\nosam"</item>
+ <item msgid="5798985802835423618">"Pedeset\ndevet"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ca/strings.xml b/packages/SystemUI/res-keyguard/values-ca/strings.xml
index f6ca03c..2fa0897 100644
--- a/packages/SystemUI/res-keyguard/values-ca/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ca/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">La targeta SIM s\'ha desactivat. Introdueix el codi PUK per continuar. Et queden <xliff:g id="_NUMBER_1">%d</xliff:g> intents; si no l\'encertes, la SIM no es podrà tornar a fer servir. Contacta amb l\'operador de telefonia mòbil per obtenir-ne més informació.</item>
<item quantity="one">La targeta SIM s\'ha desactivat. Introdueix el codi PUK per continuar. Et queda <xliff:g id="_NUMBER_0">%d</xliff:g> intent; si no l\'encertes, la SIM no es podrà tornar a fer servir. Contacta amb l\'operador de telefonia mòbil per obtenir-ne més informació.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Són les"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"i dotze"</item>
+ <item msgid="7389464214252023751">"Una"</item>
+ <item msgid="8803180377002008046">"Dues"</item>
+ <item msgid="8614897059944644719">"Tres"</item>
+ <item msgid="2293058674782619556">"Quatre"</item>
+ <item msgid="4815402358455041664">"Cinc"</item>
+ <item msgid="3325754778509665687">"Sis"</item>
+ <item msgid="5805551341866280575">"Set"</item>
+ <item msgid="203334816668238610">"Vuit"</item>
+ <item msgid="4828052671464488923">"Nou"</item>
+ <item msgid="2233497913571137419">"Deu"</item>
+ <item msgid="5621554266768657830">"i onze"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"en punt"</item>
+ <item msgid="8837126587669001578">"i un"</item>
+ <item msgid="4294343372940455660">"i dos"</item>
+ <item msgid="7129166637707421536">"i tres"</item>
+ <item msgid="7579404865008788673">"i quatre"</item>
+ <item msgid="3873924689207380586">"i cinc"</item>
+ <item msgid="4849565597850069377">"i sis"</item>
+ <item msgid="4404219424523572364">"i set"</item>
+ <item msgid="8740481214764087329">"i vuit"</item>
+ <item msgid="1713216865806811237">"i nou"</item>
+ <item msgid="3508406095411245038">"i deu"</item>
+ <item msgid="7161996337755311711">"i onze"</item>
+ <item msgid="4044549963329624197">"i dotze"</item>
+ <item msgid="333373157917379088">"i tretze"</item>
+ <item msgid="2631202907124819385">"i catorze"</item>
+ <item msgid="6472396076858033453">"i quinze"</item>
+ <item msgid="8656981856181581643">"i setze"</item>
+ <item msgid="7289026608562030619">"i disset"</item>
+ <item msgid="3881477602692646573">"i divuit"</item>
+ <item msgid="3358129827772984226">"i dinou"</item>
+ <item msgid="3308575407402865807">"i vint"</item>
+ <item msgid="5346560955382229629">"i vint-i-\nu"</item>
+ <item msgid="226750304761473436">"i vint-i-\ndos"</item>
+ <item msgid="616811325336838734">"i vint-i-\ntres"</item>
+ <item msgid="616346116869053440">"i vint-i-\nquatre"</item>
+ <item msgid="4642996410384042830">"i vint-i-\ncinc"</item>
+ <item msgid="7506092849993571465">"i vint-i-\nsis"</item>
+ <item msgid="1915078191101042031">"i vint-i-\nset"</item>
+ <item msgid="4292378641900520252">"i vint-i-\nvuit"</item>
+ <item msgid="5339513901773103696">"i vint-i-\nnou"</item>
+ <item msgid="3574673250891657607">"i trenta"</item>
+ <item msgid="5796923836589110940">"i trenta-\nu"</item>
+ <item msgid="5859323597571702052">"i trenta-\ndos"</item>
+ <item msgid="5133326723148876507">"i trenta-\ntres"</item>
+ <item msgid="2693999494655663096">"i trenta-\nquatre"</item>
+ <item msgid="3316754944962836197">"i trenta-\ncinc"</item>
+ <item msgid="816891008836796723">"i trenta-\nsis"</item>
+ <item msgid="9158890488666520078">"i trenta-\nset"</item>
+ <item msgid="1894769703213894011">"i trenta-\nvuit"</item>
+ <item msgid="5638820345598572399">"i trenta-\nnou"</item>
+ <item msgid="8838304023017895439">"i quaranta"</item>
+ <item msgid="1834742948932559597">"i quaranta-\nu"</item>
+ <item msgid="6573707308847773944">"i quaranta-\ndos"</item>
+ <item msgid="2450149950652678001">"i quaranta-\ntres"</item>
+ <item msgid="2874667401318178036">"quaranta-\nquatre"</item>
+ <item msgid="3391101532763048862">"i quaranta-\ncinc"</item>
+ <item msgid="1671489330863254362">"i quaranta-\nsis"</item>
+ <item msgid="5916017359554531038">"i quaranta-\nset"</item>
+ <item msgid="8205413177993059967">"i quaranta-\nvuit"</item>
+ <item msgid="6607867415142171302">"i quaranta-\nnou"</item>
+ <item msgid="8358850748472089162">"i cinquanta"</item>
+ <item msgid="3551313125255080234">"i cinquanta-\nun"</item>
+ <item msgid="1559678130725716542">"i cinquanta-\ndos"</item>
+ <item msgid="431441994725492377">"i cinquanta-\ntres"</item>
+ <item msgid="6345774640539623024">"cinquanta-\nquatre"</item>
+ <item msgid="8018192990793931120">"i cinquanta-\ncinc"</item>
+ <item msgid="6187650843754604534">"i cinquanta-\nsis"</item>
+ <item msgid="8727240174015993259">"i cinquanta-\nset"</item>
+ <item msgid="848339003778952950">"i cinquanta-\nvuit"</item>
+ <item msgid="5798985802835423618">"i cinquanta-\nnou"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-cs/strings.xml b/packages/SystemUI/res-keyguard/values-cs/strings.xml
index f313423..2708f8f 100644
--- a/packages/SystemUI/res-keyguard/values-cs/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-cs/strings.xml
@@ -166,78 +166,81 @@
<item quantity="other">SIM karta je teď zablokována. Chcete-li pokračovat, zadejte kód PUK. Máte ještě <xliff:g id="_NUMBER_1">%d</xliff:g> pokusů, poté bude SIM karta natrvalo zablokována. Podrobnosti vám poskytne operátor.</item>
<item quantity="one">SIM karta je teď zablokována. Chcete-li pokračovat, zadejte kód PUK. Máte ještě <xliff:g id="_NUMBER_0">%d</xliff:g> pokus, poté bude SIM karta natrvalo zablokována. Podrobnosti vám poskytne operátor.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Je"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Dvanáct"</item>
+ <item msgid="7389464214252023751">"Jedna"</item>
+ <item msgid="8803180377002008046">"Dvě"</item>
+ <item msgid="8614897059944644719">"Tři"</item>
+ <item msgid="2293058674782619556">"Čtyři"</item>
+ <item msgid="4815402358455041664">"Pět"</item>
+ <item msgid="3325754778509665687">"Šest"</item>
+ <item msgid="5805551341866280575">"Sedm"</item>
+ <item msgid="203334816668238610">"Osm"</item>
+ <item msgid="4828052671464488923">"Devět"</item>
+ <item msgid="2233497913571137419">"Deset"</item>
+ <item msgid="5621554266768657830">"Jedenáct"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985"></item>
+ <item msgid="8837126587669001578">"Jedna"</item>
+ <item msgid="4294343372940455660">"Dvě"</item>
+ <item msgid="7129166637707421536">"Tři"</item>
+ <item msgid="7579404865008788673">"Čtyři"</item>
+ <item msgid="3873924689207380586">"Pět"</item>
+ <item msgid="4849565597850069377">"Šest"</item>
+ <item msgid="4404219424523572364">"Sedm"</item>
+ <item msgid="8740481214764087329">"Osm"</item>
+ <item msgid="1713216865806811237">"Devět"</item>
+ <item msgid="3508406095411245038">"Deset"</item>
+ <item msgid="7161996337755311711">"Jedenáct"</item>
+ <item msgid="4044549963329624197">"Dvanáct"</item>
+ <item msgid="333373157917379088">"Třináct"</item>
+ <item msgid="2631202907124819385">"Čtrnáct"</item>
+ <item msgid="6472396076858033453">"Patnáct"</item>
+ <item msgid="8656981856181581643">"Šestnáct"</item>
+ <item msgid="7289026608562030619">"Sedmnáct"</item>
+ <item msgid="3881477602692646573">"Osmnáct"</item>
+ <item msgid="3358129827772984226">"Devatenáct"</item>
+ <item msgid="3308575407402865807">"Dvacet"</item>
+ <item msgid="5346560955382229629">"Dvacet\njedna"</item>
+ <item msgid="226750304761473436">"Dvacet\ndva"</item>
+ <item msgid="616811325336838734">"Dvacet\ntři"</item>
+ <item msgid="616346116869053440">"Dvacet\nčtyři"</item>
+ <item msgid="4642996410384042830">"Dvacet\npět"</item>
+ <item msgid="7506092849993571465">"Dvacet\nšest"</item>
+ <item msgid="1915078191101042031">"Dvacet\nsedm"</item>
+ <item msgid="4292378641900520252">"Dvacet\nosm"</item>
+ <item msgid="5339513901773103696">"Dvacet\ndevět"</item>
+ <item msgid="3574673250891657607">"Třicet"</item>
+ <item msgid="5796923836589110940">"Třicet\njedna"</item>
+ <item msgid="5859323597571702052">"Třicet\ndva"</item>
+ <item msgid="5133326723148876507">"Třicet\ntři"</item>
+ <item msgid="2693999494655663096">"Třicet\nčtyři"</item>
+ <item msgid="3316754944962836197">"Třicet\npět"</item>
+ <item msgid="816891008836796723">"Třicet\nšest"</item>
+ <item msgid="9158890488666520078">"Třicet\nsedm"</item>
+ <item msgid="1894769703213894011">"Třicet\nosm"</item>
+ <item msgid="5638820345598572399">"Třicet\ndevět"</item>
+ <item msgid="8838304023017895439">"Čtyřicet"</item>
+ <item msgid="1834742948932559597">"Čtyřicet\njedna"</item>
+ <item msgid="6573707308847773944">"Čtyřicet\ndva"</item>
+ <item msgid="2450149950652678001">"Čtyřicet\ntři"</item>
+ <item msgid="2874667401318178036">"Čtyřicet\nčtyři"</item>
+ <item msgid="3391101532763048862">"Čtyřicet\npět"</item>
+ <item msgid="1671489330863254362">"Čtyřicet\nšest"</item>
+ <item msgid="5916017359554531038">"Čtyřicet\nsedm"</item>
+ <item msgid="8205413177993059967">"Čtyřicet\nosm"</item>
+ <item msgid="6607867415142171302">"Čtyřicet\ndevět"</item>
+ <item msgid="8358850748472089162">"Padesát"</item>
+ <item msgid="3551313125255080234">"Padesát\njedna"</item>
+ <item msgid="1559678130725716542">"Padesát\ndva"</item>
+ <item msgid="431441994725492377">"Padesát\ntři"</item>
+ <item msgid="6345774640539623024">"Padesát\nčtyři"</item>
+ <item msgid="8018192990793931120">"Padesát\npět"</item>
+ <item msgid="6187650843754604534">"Padesát\nšest"</item>
+ <item msgid="8727240174015993259">"Padesát\nsedm"</item>
+ <item msgid="848339003778952950">"Padesát\nosm"</item>
+ <item msgid="5798985802835423618">"Padesát\ndevět"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-da/strings.xml b/packages/SystemUI/res-keyguard/values-da/strings.xml
index acc91b6..34c248d 100644
--- a/packages/SystemUI/res-keyguard/values-da/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-da/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">SIM-kortet er nu deaktiveret. Angiv PUK-koden for at fortsætte. Du har <xliff:g id="_NUMBER_1">%d</xliff:g> forsøg tilbage, før SIM-kortet bliver permanent ubrugeligt. Kontakt dit mobilselskab for at få flere oplysninger.</item>
<item quantity="other">SIM-kortet er nu deaktiveret. Angiv PUK-koden for at fortsætte. Du har <xliff:g id="_NUMBER_1">%d</xliff:g> forsøg tilbage, før SIM-kortet bliver permanent ubrugeligt. Kontakt dit mobilselskab for at få flere oplysninger.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Den er"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Tolv"</item>
+ <item msgid="7389464214252023751">"Et"</item>
+ <item msgid="8803180377002008046">"To"</item>
+ <item msgid="8614897059944644719">"Tre"</item>
+ <item msgid="2293058674782619556">"Fire"</item>
+ <item msgid="4815402358455041664">"Fem"</item>
+ <item msgid="3325754778509665687">"Seks"</item>
+ <item msgid="5805551341866280575">"Syv"</item>
+ <item msgid="203334816668238610">"Otte"</item>
+ <item msgid="4828052671464488923">"Ni"</item>
+ <item msgid="2233497913571137419">"Ti"</item>
+ <item msgid="5621554266768657830">"Elleve"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"-"</item>
+ <item msgid="8837126587669001578">"Et"</item>
+ <item msgid="4294343372940455660">"To"</item>
+ <item msgid="7129166637707421536">"Tre"</item>
+ <item msgid="7579404865008788673">"Fire"</item>
+ <item msgid="3873924689207380586">"Fem"</item>
+ <item msgid="4849565597850069377">"Seks"</item>
+ <item msgid="4404219424523572364">"Syv"</item>
+ <item msgid="8740481214764087329">"Otte"</item>
+ <item msgid="1713216865806811237">"Ni"</item>
+ <item msgid="3508406095411245038">"Ti"</item>
+ <item msgid="7161996337755311711">"Elleve"</item>
+ <item msgid="4044549963329624197">"Tolv"</item>
+ <item msgid="333373157917379088">"Tretten"</item>
+ <item msgid="2631202907124819385">"Fjorten"</item>
+ <item msgid="6472396076858033453">"Femten"</item>
+ <item msgid="8656981856181581643">"Seksten"</item>
+ <item msgid="7289026608562030619">"Sytten"</item>
+ <item msgid="3881477602692646573">"Atten"</item>
+ <item msgid="3358129827772984226">"Nitten"</item>
+ <item msgid="3308575407402865807">"Tyve"</item>
+ <item msgid="5346560955382229629">"Enogtyve\n"</item>
+ <item msgid="226750304761473436">"Toogtyve\n"</item>
+ <item msgid="616811325336838734">"Treogtyve\n"</item>
+ <item msgid="616346116869053440">"Fireogtyve\n"</item>
+ <item msgid="4642996410384042830">"Femogtyve\n"</item>
+ <item msgid="7506092849993571465">"Seksogtyve\n"</item>
+ <item msgid="1915078191101042031">"Syvogtyve\n"</item>
+ <item msgid="4292378641900520252">"Otteogtyve\n"</item>
+ <item msgid="5339513901773103696">"Niogtyve\n"</item>
+ <item msgid="3574673250891657607">"Tredive"</item>
+ <item msgid="5796923836589110940">"Enogtredive\n"</item>
+ <item msgid="5859323597571702052">"Toogtredive\n"</item>
+ <item msgid="5133326723148876507">"Treogtredive\n"</item>
+ <item msgid="2693999494655663096">"Fireogtredive\n"</item>
+ <item msgid="3316754944962836197">"Femogtredive\n"</item>
+ <item msgid="816891008836796723">"Seksogtredive\n"</item>
+ <item msgid="9158890488666520078">"Syvogtredive\n"</item>
+ <item msgid="1894769703213894011">"Otteogtredive\n"</item>
+ <item msgid="5638820345598572399">"Niogtredive\n"</item>
+ <item msgid="8838304023017895439">"Fyrre"</item>
+ <item msgid="1834742948932559597">"Enogfyrre\n"</item>
+ <item msgid="6573707308847773944">"Toogfyrre\n"</item>
+ <item msgid="2450149950652678001">"Treogfyrre\n"</item>
+ <item msgid="2874667401318178036">"Fireogfyrre\n"</item>
+ <item msgid="3391101532763048862">"Femogfyrre\n"</item>
+ <item msgid="1671489330863254362">"Seksogfyrre\n"</item>
+ <item msgid="5916017359554531038">"Syvogfyrre\n"</item>
+ <item msgid="8205413177993059967">"Otteogfyrre\n"</item>
+ <item msgid="6607867415142171302">"Niogfyrre\n"</item>
+ <item msgid="8358850748472089162">"Halvtreds"</item>
+ <item msgid="3551313125255080234">"Enoghalvtreds\n"</item>
+ <item msgid="1559678130725716542">"Tooghalvtreds\n"</item>
+ <item msgid="431441994725492377">"Treoghalvtreds\n"</item>
+ <item msgid="6345774640539623024">"Fireoghalvtreds\n"</item>
+ <item msgid="8018192990793931120">"Femoghalvtreds\n"</item>
+ <item msgid="6187650843754604534">"Seksoghalvtreds\n"</item>
+ <item msgid="8727240174015993259">"Syvoghalvtreds\n"</item>
+ <item msgid="848339003778952950">"Otteoghalvtreds\n"</item>
+ <item msgid="5798985802835423618">"Nioghalvtreds\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-de/strings.xml b/packages/SystemUI/res-keyguard/values-de/strings.xml
index b925ac6..d8daf83f 100644
--- a/packages/SystemUI/res-keyguard/values-de/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-de/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">Die SIM-Karte ist jetzt deaktiviert. Gib den PUK-Code ein, um fortzufahren. Du hast noch <xliff:g id="_NUMBER_1">%d</xliff:g> Versuche, bevor die SIM-Karte endgültig gesperrt wird. Weitere Informationen erhältst du von deinem Mobilfunkanbieter.</item>
<item quantity="one">Die SIM-Karte ist jetzt deaktiviert. Gib den PUK-Code ein, um fortzufahren. Du hast noch <xliff:g id="_NUMBER_0">%d</xliff:g> Versuch, bevor die SIM-Karte endgültig gesperrt wird. Weitere Informationen erhältst du von deinem Mobilfunkanbieter.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Es ist"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"zwölf Uhr"</item>
+ <item msgid="7389464214252023751">"ein Uhr"</item>
+ <item msgid="8803180377002008046">"zwei Uhr"</item>
+ <item msgid="8614897059944644719">"drei Uhr"</item>
+ <item msgid="2293058674782619556">"vier Uhr"</item>
+ <item msgid="4815402358455041664">"fünf Uhr"</item>
+ <item msgid="3325754778509665687">"sechs Uhr"</item>
+ <item msgid="5805551341866280575">"sieben Uhr"</item>
+ <item msgid="203334816668238610">"acht Uhr"</item>
+ <item msgid="4828052671464488923">"neun Uhr"</item>
+ <item msgid="2233497913571137419">"zehn Uhr"</item>
+ <item msgid="5621554266768657830">"elf Uhr"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985"></item>
+ <item msgid="8837126587669001578">"eins"</item>
+ <item msgid="4294343372940455660">"zwei"</item>
+ <item msgid="7129166637707421536">"drei"</item>
+ <item msgid="7579404865008788673">"vier"</item>
+ <item msgid="3873924689207380586">"fünf"</item>
+ <item msgid="4849565597850069377">"sechs"</item>
+ <item msgid="4404219424523572364">"sieben"</item>
+ <item msgid="8740481214764087329">"acht"</item>
+ <item msgid="1713216865806811237">"neun"</item>
+ <item msgid="3508406095411245038">"zehn"</item>
+ <item msgid="7161996337755311711">"elf"</item>
+ <item msgid="4044549963329624197">"zwölf"</item>
+ <item msgid="333373157917379088">"dreizehn"</item>
+ <item msgid="2631202907124819385">"vierzehn"</item>
+ <item msgid="6472396076858033453">"fünfzehn"</item>
+ <item msgid="8656981856181581643">"sechzehn"</item>
+ <item msgid="7289026608562030619">"siebzehn"</item>
+ <item msgid="3881477602692646573">"achtzehn"</item>
+ <item msgid="3358129827772984226">"neunzehn"</item>
+ <item msgid="3308575407402865807">"zwanzig"</item>
+ <item msgid="5346560955382229629">"einund-\nzwanzig"</item>
+ <item msgid="226750304761473436">"zweiund-\nzwanzig"</item>
+ <item msgid="616811325336838734">"dreiund-\nzwanzig"</item>
+ <item msgid="616346116869053440">"vierund-\nzwanzig"</item>
+ <item msgid="4642996410384042830">"fünfund-\nzwanzig"</item>
+ <item msgid="7506092849993571465">"sechsund-\nzwanzig"</item>
+ <item msgid="1915078191101042031">"siebenund-\nzwanzig"</item>
+ <item msgid="4292378641900520252">"achtund-\nzwanzig"</item>
+ <item msgid="5339513901773103696">"neunund-\nzwanzig"</item>
+ <item msgid="3574673250891657607">"dreißig"</item>
+ <item msgid="5796923836589110940">"einund-\ndreißig"</item>
+ <item msgid="5859323597571702052">"zweiund-\ndreißig"</item>
+ <item msgid="5133326723148876507">"dreiund-\ndreißig"</item>
+ <item msgid="2693999494655663096">"vierund-\ndreißig"</item>
+ <item msgid="3316754944962836197">"fünfund-\ndreißig"</item>
+ <item msgid="816891008836796723">"sechsund-\ndreißig"</item>
+ <item msgid="9158890488666520078">"siebenund-\ndreißig"</item>
+ <item msgid="1894769703213894011">"achtund-\ndreißig"</item>
+ <item msgid="5638820345598572399">"neunund-\ndreißig"</item>
+ <item msgid="8838304023017895439">"vierzig"</item>
+ <item msgid="1834742948932559597">"einund-\nvierzig"</item>
+ <item msgid="6573707308847773944">"zweiund-\nvierzig"</item>
+ <item msgid="2450149950652678001">"dreiund-\nvierzig"</item>
+ <item msgid="2874667401318178036">"vierund-\nvierzig"</item>
+ <item msgid="3391101532763048862">"fünfund-\nvierzig"</item>
+ <item msgid="1671489330863254362">"sechsund-\nvierzig"</item>
+ <item msgid="5916017359554531038">"siebenund-\nvierzig"</item>
+ <item msgid="8205413177993059967">"achtund-\nvierzig"</item>
+ <item msgid="6607867415142171302">"neunund-\nvierzig"</item>
+ <item msgid="8358850748472089162">"fünfzig"</item>
+ <item msgid="3551313125255080234">"einund-\nfünfzig"</item>
+ <item msgid="1559678130725716542">"zweiund-\nfünfzig"</item>
+ <item msgid="431441994725492377">"dreiund-\nfünfzig"</item>
+ <item msgid="6345774640539623024">"vierund-\nfünfzig"</item>
+ <item msgid="8018192990793931120">"fünfund-\nfünfzig"</item>
+ <item msgid="6187650843754604534">"sechsund-\nfünfzig"</item>
+ <item msgid="8727240174015993259">"siebenund-\nfünfzig"</item>
+ <item msgid="848339003778952950">"achtund-\nfünfzig"</item>
+ <item msgid="5798985802835423618">"neunund-\nfünfzig"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-el/strings.xml b/packages/SystemUI/res-keyguard/values-el/strings.xml
index 91afac6..6c0916c 100644
--- a/packages/SystemUI/res-keyguard/values-el/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-el/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">Η κάρτα SIM απενεργοποιήθηκε. Καταχωρίστε τον κωδικό PUK, για να συνεχίσετε. Απομένουν <xliff:g id="_NUMBER_1">%d</xliff:g> ακόμη προσπάθειες προτού να μην είναι πλέον δυνατή η χρήση της κάρτας SIM. Επικοινωνήστε με την εταιρεία κινητής τηλεφωνίας για λεπτομέρειες.</item>
<item quantity="one">Η κάρτα SIM απενεργοποιήθηκε. Καταχωρίστε τον κωδικό PUK, για να συνεχίσετε. Απομένει <xliff:g id="_NUMBER_0">%d</xliff:g> ακόμη προσπάθεια προτού να μην είναι πλέον δυνατή η χρήση της κάρτας SIM. Επικοινωνήστε με την εταιρεία κινητής τηλεφωνίας για λεπτομέρειες.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Είναι"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Δώδεκα"</item>
+ <item msgid="7389464214252023751">"Μία"</item>
+ <item msgid="8803180377002008046">"Δύο"</item>
+ <item msgid="8614897059944644719">"Τρία"</item>
+ <item msgid="2293058674782619556">"Τέσσερα"</item>
+ <item msgid="4815402358455041664">"Πέντε"</item>
+ <item msgid="3325754778509665687">"Έξι"</item>
+ <item msgid="5805551341866280575">"Επτά"</item>
+ <item msgid="203334816668238610">"Οκτώ"</item>
+ <item msgid="4828052671464488923">"Εννέα"</item>
+ <item msgid="2233497913571137419">"Δέκα"</item>
+ <item msgid="5621554266768657830">"Έντεκα"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Ακριβώς"</item>
+ <item msgid="8837126587669001578">"Ένα"</item>
+ <item msgid="4294343372940455660">"Δύο"</item>
+ <item msgid="7129166637707421536">"Τρεις"</item>
+ <item msgid="7579404865008788673">"Τέσσερα"</item>
+ <item msgid="3873924689207380586">"Πέντε"</item>
+ <item msgid="4849565597850069377">"Έξι"</item>
+ <item msgid="4404219424523572364">"Επτά"</item>
+ <item msgid="8740481214764087329">"Οκτώ"</item>
+ <item msgid="1713216865806811237">"Εννέα"</item>
+ <item msgid="3508406095411245038">"Δέκα"</item>
+ <item msgid="7161996337755311711">"Έντεκα"</item>
+ <item msgid="4044549963329624197">"Δώδεκα"</item>
+ <item msgid="333373157917379088">"Δεκατρία"</item>
+ <item msgid="2631202907124819385">"Δεκατέσσερα"</item>
+ <item msgid="6472396076858033453">"Δεκαπέντε"</item>
+ <item msgid="8656981856181581643">"Δεκαέξι"</item>
+ <item msgid="7289026608562030619">"Δεκαεπτά"</item>
+ <item msgid="3881477602692646573">"Δεκαοκτώ"</item>
+ <item msgid="3358129827772984226">"Δεκαεννέα"</item>
+ <item msgid="3308575407402865807">"Είκοσι"</item>
+ <item msgid="5346560955382229629">"Είκοσι\nένα"</item>
+ <item msgid="226750304761473436">"Είκοσι\nδύο"</item>
+ <item msgid="616811325336838734">"Είκοσι\nτρία"</item>
+ <item msgid="616346116869053440">"Είκοσι\nτέσσερα"</item>
+ <item msgid="4642996410384042830">"Είκοσι\nπέντε"</item>
+ <item msgid="7506092849993571465">"Είκοσι\nέξι"</item>
+ <item msgid="1915078191101042031">"Είκοσι\nεπτά"</item>
+ <item msgid="4292378641900520252">"Είκοσι\nοκτώ"</item>
+ <item msgid="5339513901773103696">"Είκοσι\nεννέα"</item>
+ <item msgid="3574673250891657607">"Τριάντα"</item>
+ <item msgid="5796923836589110940">"Τριάντα\nένα"</item>
+ <item msgid="5859323597571702052">"Τριάντα\nδύο"</item>
+ <item msgid="5133326723148876507">"Τριάντα\nοκτώ"</item>
+ <item msgid="2693999494655663096">"Τριάντα\nοκτώ"</item>
+ <item msgid="3316754944962836197">"Τριάντα\nπέντε"</item>
+ <item msgid="816891008836796723">"Τριάντα\nέξι"</item>
+ <item msgid="9158890488666520078">"Τριάντα\nεπτά"</item>
+ <item msgid="1894769703213894011">"Τριάντα\nοκτώ"</item>
+ <item msgid="5638820345598572399">"Τριάντα\nεννέα"</item>
+ <item msgid="8838304023017895439">"Σαράντα"</item>
+ <item msgid="1834742948932559597">"Σαράντα\nένα"</item>
+ <item msgid="6573707308847773944">"Σαράντα\nδύο"</item>
+ <item msgid="2450149950652678001">"Σαράντα\nτρία"</item>
+ <item msgid="2874667401318178036">"Σαράντα\nτέσσερα"</item>
+ <item msgid="3391101532763048862">"Σαράντα\nπέντε"</item>
+ <item msgid="1671489330863254362">"Σαράντα\nέξι"</item>
+ <item msgid="5916017359554531038">"Σαράντα\nεπτά"</item>
+ <item msgid="8205413177993059967">"Σαράντα\nοκτώ"</item>
+ <item msgid="6607867415142171302">"Σαράντα\nεννέα"</item>
+ <item msgid="8358850748472089162">"Πενήντα"</item>
+ <item msgid="3551313125255080234">"Πενήντα\nένα"</item>
+ <item msgid="1559678130725716542">"Πενήντα\nδύο"</item>
+ <item msgid="431441994725492377">"Πενήντα\nτρία"</item>
+ <item msgid="6345774640539623024">"Πενήντα\nτέσσερα"</item>
+ <item msgid="8018192990793931120">"Πενήντα\nπέντε"</item>
+ <item msgid="6187650843754604534">"Πενήντα\nέξι"</item>
+ <item msgid="8727240174015993259">"Πενήντα\nεπτά"</item>
+ <item msgid="848339003778952950">"Πενήντα\nοκτώ"</item>
+ <item msgid="5798985802835423618">"Πενήντα\nεννέα"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml
index 12fae43..80c9b82 100644
--- a/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-en-rAU/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id="_NUMBER_1">%d</xliff:g> remaining attempts before SIM becomes permanently unusable. Contact operator for details.</item>
<item quantity="one">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id="_NUMBER_0">%d</xliff:g> remaining attempt before SIM becomes permanently unusable. Contact operator for details.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"It’s"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Twelve"</item>
+ <item msgid="7389464214252023751">"One"</item>
+ <item msgid="8803180377002008046">"Two"</item>
+ <item msgid="8614897059944644719">"Three"</item>
+ <item msgid="2293058674782619556">"Four"</item>
+ <item msgid="4815402358455041664">"Five"</item>
+ <item msgid="3325754778509665687">"Six"</item>
+ <item msgid="5805551341866280575">"Seven"</item>
+ <item msgid="203334816668238610">"Eight"</item>
+ <item msgid="4828052671464488923">"Nine"</item>
+ <item msgid="2233497913571137419">"Ten"</item>
+ <item msgid="5621554266768657830">"Eleven"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"O’Clock"</item>
+ <item msgid="8837126587669001578">"O’One"</item>
+ <item msgid="4294343372940455660">"O’Two"</item>
+ <item msgid="7129166637707421536">"O’Three"</item>
+ <item msgid="7579404865008788673">"O’Four"</item>
+ <item msgid="3873924689207380586">"O’Five"</item>
+ <item msgid="4849565597850069377">"O’Six"</item>
+ <item msgid="4404219424523572364">"O’Seven"</item>
+ <item msgid="8740481214764087329">"O’Eight"</item>
+ <item msgid="1713216865806811237">"O’Nine"</item>
+ <item msgid="3508406095411245038">"Ten"</item>
+ <item msgid="7161996337755311711">"Eleven"</item>
+ <item msgid="4044549963329624197">"Twelve"</item>
+ <item msgid="333373157917379088">"Thirteen"</item>
+ <item msgid="2631202907124819385">"Fourteen"</item>
+ <item msgid="6472396076858033453">"15"</item>
+ <item msgid="8656981856181581643">"Sixteen"</item>
+ <item msgid="7289026608562030619">"Seventeen"</item>
+ <item msgid="3881477602692646573">"Eighteen"</item>
+ <item msgid="3358129827772984226">"Nineteen"</item>
+ <item msgid="3308575407402865807">"Twenty"</item>
+ <item msgid="5346560955382229629">"Twenty\nOne"</item>
+ <item msgid="226750304761473436">"Twenty\nTwo"</item>
+ <item msgid="616811325336838734">"Twenty\nThree"</item>
+ <item msgid="616346116869053440">"Twenty\nFour"</item>
+ <item msgid="4642996410384042830">"Twenty\nFive"</item>
+ <item msgid="7506092849993571465">"Twenty\nSix"</item>
+ <item msgid="1915078191101042031">"Twenty\nSeven"</item>
+ <item msgid="4292378641900520252">"Twenty\nEight"</item>
+ <item msgid="5339513901773103696">"Twenty\nNine"</item>
+ <item msgid="3574673250891657607">"Thirty"</item>
+ <item msgid="5796923836589110940">"Thirty\nOne"</item>
+ <item msgid="5859323597571702052">"Thirty\nTwo"</item>
+ <item msgid="5133326723148876507">"Thirty\nThree"</item>
+ <item msgid="2693999494655663096">"Thirty\nFour"</item>
+ <item msgid="3316754944962836197">"Thirty\nFive"</item>
+ <item msgid="816891008836796723">"Thirty\nSix"</item>
+ <item msgid="9158890488666520078">"Thirty\nSeven"</item>
+ <item msgid="1894769703213894011">"Thirty\nEight"</item>
+ <item msgid="5638820345598572399">"Thirty\nNine"</item>
+ <item msgid="8838304023017895439">"Forty"</item>
+ <item msgid="1834742948932559597">"Forty\nOne"</item>
+ <item msgid="6573707308847773944">"Forty\nTwo"</item>
+ <item msgid="2450149950652678001">"Forty\nThree"</item>
+ <item msgid="2874667401318178036">"Forty\nFour"</item>
+ <item msgid="3391101532763048862">"Forty\nFive"</item>
+ <item msgid="1671489330863254362">"Forty\nSix"</item>
+ <item msgid="5916017359554531038">"Forty\nSeven"</item>
+ <item msgid="8205413177993059967">"Forty\nEight"</item>
+ <item msgid="6607867415142171302">"Forty\nNine"</item>
+ <item msgid="8358850748472089162">"Fifty"</item>
+ <item msgid="3551313125255080234">"Fifty\nOne"</item>
+ <item msgid="1559678130725716542">"Fifty\nTwo"</item>
+ <item msgid="431441994725492377">"Fifty\nThree"</item>
+ <item msgid="6345774640539623024">"Fifty\nFour"</item>
+ <item msgid="8018192990793931120">"Fifty\nFive"</item>
+ <item msgid="6187650843754604534">"Fifty\nSix"</item>
+ <item msgid="8727240174015993259">"Fifty\nSeven"</item>
+ <item msgid="848339003778952950">"Fifty\nEight"</item>
+ <item msgid="5798985802835423618">"Fifty\nNine"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml
index fb587c3..20c4d56 100644
--- a/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-en-rCA/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id="_NUMBER_1">%d</xliff:g> remaining attempts before SIM becomes permanently unusable. Contact operator for details.</item>
<item quantity="one">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id="_NUMBER_0">%d</xliff:g> remaining attempt before SIM becomes permanently unusable. Contact operator for details.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"It’s"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Twelve"</item>
+ <item msgid="7389464214252023751">"One"</item>
+ <item msgid="8803180377002008046">"Two"</item>
+ <item msgid="8614897059944644719">"Three"</item>
+ <item msgid="2293058674782619556">"Four"</item>
+ <item msgid="4815402358455041664">"Five"</item>
+ <item msgid="3325754778509665687">"Six"</item>
+ <item msgid="5805551341866280575">"Seven"</item>
+ <item msgid="203334816668238610">"Eight"</item>
+ <item msgid="4828052671464488923">"Nine"</item>
+ <item msgid="2233497913571137419">"Ten"</item>
+ <item msgid="5621554266768657830">"Eleven"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"O’Clock"</item>
+ <item msgid="8837126587669001578">"O’One"</item>
+ <item msgid="4294343372940455660">"O’Two"</item>
+ <item msgid="7129166637707421536">"O’Three"</item>
+ <item msgid="7579404865008788673">"O’Four"</item>
+ <item msgid="3873924689207380586">"O’Five"</item>
+ <item msgid="4849565597850069377">"O’Six"</item>
+ <item msgid="4404219424523572364">"O’Seven"</item>
+ <item msgid="8740481214764087329">"O’Eight"</item>
+ <item msgid="1713216865806811237">"O’Nine"</item>
+ <item msgid="3508406095411245038">"Ten"</item>
+ <item msgid="7161996337755311711">"Eleven"</item>
+ <item msgid="4044549963329624197">"Twelve"</item>
+ <item msgid="333373157917379088">"Thirteen"</item>
+ <item msgid="2631202907124819385">"Fourteen"</item>
+ <item msgid="6472396076858033453">"15"</item>
+ <item msgid="8656981856181581643">"Sixteen"</item>
+ <item msgid="7289026608562030619">"Seventeen"</item>
+ <item msgid="3881477602692646573">"Eighteen"</item>
+ <item msgid="3358129827772984226">"Nineteen"</item>
+ <item msgid="3308575407402865807">"Twenty"</item>
+ <item msgid="5346560955382229629">"Twenty\nOne"</item>
+ <item msgid="226750304761473436">"Twenty\nTwo"</item>
+ <item msgid="616811325336838734">"Twenty\nThree"</item>
+ <item msgid="616346116869053440">"Twenty\nFour"</item>
+ <item msgid="4642996410384042830">"Twenty\nFive"</item>
+ <item msgid="7506092849993571465">"Twenty\nSix"</item>
+ <item msgid="1915078191101042031">"Twenty\nSeven"</item>
+ <item msgid="4292378641900520252">"Twenty\nEight"</item>
+ <item msgid="5339513901773103696">"Twenty\nNine"</item>
+ <item msgid="3574673250891657607">"Thirty"</item>
+ <item msgid="5796923836589110940">"Thirty\nOne"</item>
+ <item msgid="5859323597571702052">"Thirty\nTwo"</item>
+ <item msgid="5133326723148876507">"Thirty\nThree"</item>
+ <item msgid="2693999494655663096">"Thirty\nFour"</item>
+ <item msgid="3316754944962836197">"Thirty\nFive"</item>
+ <item msgid="816891008836796723">"Thirty\nSix"</item>
+ <item msgid="9158890488666520078">"Thirty\nSeven"</item>
+ <item msgid="1894769703213894011">"Thirty\nEight"</item>
+ <item msgid="5638820345598572399">"Thirty\nNine"</item>
+ <item msgid="8838304023017895439">"Forty"</item>
+ <item msgid="1834742948932559597">"Forty\nOne"</item>
+ <item msgid="6573707308847773944">"Forty\nTwo"</item>
+ <item msgid="2450149950652678001">"Forty\nThree"</item>
+ <item msgid="2874667401318178036">"Forty\nFour"</item>
+ <item msgid="3391101532763048862">"Forty\nFive"</item>
+ <item msgid="1671489330863254362">"Forty\nSix"</item>
+ <item msgid="5916017359554531038">"Forty\nSeven"</item>
+ <item msgid="8205413177993059967">"Forty\nEight"</item>
+ <item msgid="6607867415142171302">"Forty\nNine"</item>
+ <item msgid="8358850748472089162">"Fifty"</item>
+ <item msgid="3551313125255080234">"Fifty\nOne"</item>
+ <item msgid="1559678130725716542">"Fifty\nTwo"</item>
+ <item msgid="431441994725492377">"Fifty\nThree"</item>
+ <item msgid="6345774640539623024">"Fifty\nFour"</item>
+ <item msgid="8018192990793931120">"Fifty\nFive"</item>
+ <item msgid="6187650843754604534">"Fifty\nSix"</item>
+ <item msgid="8727240174015993259">"Fifty\nSeven"</item>
+ <item msgid="848339003778952950">"Fifty\nEight"</item>
+ <item msgid="5798985802835423618">"Fifty\nNine"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml
index 12fae43..80c9b82 100644
--- a/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-en-rGB/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id="_NUMBER_1">%d</xliff:g> remaining attempts before SIM becomes permanently unusable. Contact operator for details.</item>
<item quantity="one">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id="_NUMBER_0">%d</xliff:g> remaining attempt before SIM becomes permanently unusable. Contact operator for details.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"It’s"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Twelve"</item>
+ <item msgid="7389464214252023751">"One"</item>
+ <item msgid="8803180377002008046">"Two"</item>
+ <item msgid="8614897059944644719">"Three"</item>
+ <item msgid="2293058674782619556">"Four"</item>
+ <item msgid="4815402358455041664">"Five"</item>
+ <item msgid="3325754778509665687">"Six"</item>
+ <item msgid="5805551341866280575">"Seven"</item>
+ <item msgid="203334816668238610">"Eight"</item>
+ <item msgid="4828052671464488923">"Nine"</item>
+ <item msgid="2233497913571137419">"Ten"</item>
+ <item msgid="5621554266768657830">"Eleven"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"O’Clock"</item>
+ <item msgid="8837126587669001578">"O’One"</item>
+ <item msgid="4294343372940455660">"O’Two"</item>
+ <item msgid="7129166637707421536">"O’Three"</item>
+ <item msgid="7579404865008788673">"O’Four"</item>
+ <item msgid="3873924689207380586">"O’Five"</item>
+ <item msgid="4849565597850069377">"O’Six"</item>
+ <item msgid="4404219424523572364">"O’Seven"</item>
+ <item msgid="8740481214764087329">"O’Eight"</item>
+ <item msgid="1713216865806811237">"O’Nine"</item>
+ <item msgid="3508406095411245038">"Ten"</item>
+ <item msgid="7161996337755311711">"Eleven"</item>
+ <item msgid="4044549963329624197">"Twelve"</item>
+ <item msgid="333373157917379088">"Thirteen"</item>
+ <item msgid="2631202907124819385">"Fourteen"</item>
+ <item msgid="6472396076858033453">"15"</item>
+ <item msgid="8656981856181581643">"Sixteen"</item>
+ <item msgid="7289026608562030619">"Seventeen"</item>
+ <item msgid="3881477602692646573">"Eighteen"</item>
+ <item msgid="3358129827772984226">"Nineteen"</item>
+ <item msgid="3308575407402865807">"Twenty"</item>
+ <item msgid="5346560955382229629">"Twenty\nOne"</item>
+ <item msgid="226750304761473436">"Twenty\nTwo"</item>
+ <item msgid="616811325336838734">"Twenty\nThree"</item>
+ <item msgid="616346116869053440">"Twenty\nFour"</item>
+ <item msgid="4642996410384042830">"Twenty\nFive"</item>
+ <item msgid="7506092849993571465">"Twenty\nSix"</item>
+ <item msgid="1915078191101042031">"Twenty\nSeven"</item>
+ <item msgid="4292378641900520252">"Twenty\nEight"</item>
+ <item msgid="5339513901773103696">"Twenty\nNine"</item>
+ <item msgid="3574673250891657607">"Thirty"</item>
+ <item msgid="5796923836589110940">"Thirty\nOne"</item>
+ <item msgid="5859323597571702052">"Thirty\nTwo"</item>
+ <item msgid="5133326723148876507">"Thirty\nThree"</item>
+ <item msgid="2693999494655663096">"Thirty\nFour"</item>
+ <item msgid="3316754944962836197">"Thirty\nFive"</item>
+ <item msgid="816891008836796723">"Thirty\nSix"</item>
+ <item msgid="9158890488666520078">"Thirty\nSeven"</item>
+ <item msgid="1894769703213894011">"Thirty\nEight"</item>
+ <item msgid="5638820345598572399">"Thirty\nNine"</item>
+ <item msgid="8838304023017895439">"Forty"</item>
+ <item msgid="1834742948932559597">"Forty\nOne"</item>
+ <item msgid="6573707308847773944">"Forty\nTwo"</item>
+ <item msgid="2450149950652678001">"Forty\nThree"</item>
+ <item msgid="2874667401318178036">"Forty\nFour"</item>
+ <item msgid="3391101532763048862">"Forty\nFive"</item>
+ <item msgid="1671489330863254362">"Forty\nSix"</item>
+ <item msgid="5916017359554531038">"Forty\nSeven"</item>
+ <item msgid="8205413177993059967">"Forty\nEight"</item>
+ <item msgid="6607867415142171302">"Forty\nNine"</item>
+ <item msgid="8358850748472089162">"Fifty"</item>
+ <item msgid="3551313125255080234">"Fifty\nOne"</item>
+ <item msgid="1559678130725716542">"Fifty\nTwo"</item>
+ <item msgid="431441994725492377">"Fifty\nThree"</item>
+ <item msgid="6345774640539623024">"Fifty\nFour"</item>
+ <item msgid="8018192990793931120">"Fifty\nFive"</item>
+ <item msgid="6187650843754604534">"Fifty\nSix"</item>
+ <item msgid="8727240174015993259">"Fifty\nSeven"</item>
+ <item msgid="848339003778952950">"Fifty\nEight"</item>
+ <item msgid="5798985802835423618">"Fifty\nNine"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml
index 12fae43..80c9b82 100644
--- a/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-en-rIN/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id="_NUMBER_1">%d</xliff:g> remaining attempts before SIM becomes permanently unusable. Contact operator for details.</item>
<item quantity="one">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id="_NUMBER_0">%d</xliff:g> remaining attempt before SIM becomes permanently unusable. Contact operator for details.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"It’s"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Twelve"</item>
+ <item msgid="7389464214252023751">"One"</item>
+ <item msgid="8803180377002008046">"Two"</item>
+ <item msgid="8614897059944644719">"Three"</item>
+ <item msgid="2293058674782619556">"Four"</item>
+ <item msgid="4815402358455041664">"Five"</item>
+ <item msgid="3325754778509665687">"Six"</item>
+ <item msgid="5805551341866280575">"Seven"</item>
+ <item msgid="203334816668238610">"Eight"</item>
+ <item msgid="4828052671464488923">"Nine"</item>
+ <item msgid="2233497913571137419">"Ten"</item>
+ <item msgid="5621554266768657830">"Eleven"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"O’Clock"</item>
+ <item msgid="8837126587669001578">"O’One"</item>
+ <item msgid="4294343372940455660">"O’Two"</item>
+ <item msgid="7129166637707421536">"O’Three"</item>
+ <item msgid="7579404865008788673">"O’Four"</item>
+ <item msgid="3873924689207380586">"O’Five"</item>
+ <item msgid="4849565597850069377">"O’Six"</item>
+ <item msgid="4404219424523572364">"O’Seven"</item>
+ <item msgid="8740481214764087329">"O’Eight"</item>
+ <item msgid="1713216865806811237">"O’Nine"</item>
+ <item msgid="3508406095411245038">"Ten"</item>
+ <item msgid="7161996337755311711">"Eleven"</item>
+ <item msgid="4044549963329624197">"Twelve"</item>
+ <item msgid="333373157917379088">"Thirteen"</item>
+ <item msgid="2631202907124819385">"Fourteen"</item>
+ <item msgid="6472396076858033453">"15"</item>
+ <item msgid="8656981856181581643">"Sixteen"</item>
+ <item msgid="7289026608562030619">"Seventeen"</item>
+ <item msgid="3881477602692646573">"Eighteen"</item>
+ <item msgid="3358129827772984226">"Nineteen"</item>
+ <item msgid="3308575407402865807">"Twenty"</item>
+ <item msgid="5346560955382229629">"Twenty\nOne"</item>
+ <item msgid="226750304761473436">"Twenty\nTwo"</item>
+ <item msgid="616811325336838734">"Twenty\nThree"</item>
+ <item msgid="616346116869053440">"Twenty\nFour"</item>
+ <item msgid="4642996410384042830">"Twenty\nFive"</item>
+ <item msgid="7506092849993571465">"Twenty\nSix"</item>
+ <item msgid="1915078191101042031">"Twenty\nSeven"</item>
+ <item msgid="4292378641900520252">"Twenty\nEight"</item>
+ <item msgid="5339513901773103696">"Twenty\nNine"</item>
+ <item msgid="3574673250891657607">"Thirty"</item>
+ <item msgid="5796923836589110940">"Thirty\nOne"</item>
+ <item msgid="5859323597571702052">"Thirty\nTwo"</item>
+ <item msgid="5133326723148876507">"Thirty\nThree"</item>
+ <item msgid="2693999494655663096">"Thirty\nFour"</item>
+ <item msgid="3316754944962836197">"Thirty\nFive"</item>
+ <item msgid="816891008836796723">"Thirty\nSix"</item>
+ <item msgid="9158890488666520078">"Thirty\nSeven"</item>
+ <item msgid="1894769703213894011">"Thirty\nEight"</item>
+ <item msgid="5638820345598572399">"Thirty\nNine"</item>
+ <item msgid="8838304023017895439">"Forty"</item>
+ <item msgid="1834742948932559597">"Forty\nOne"</item>
+ <item msgid="6573707308847773944">"Forty\nTwo"</item>
+ <item msgid="2450149950652678001">"Forty\nThree"</item>
+ <item msgid="2874667401318178036">"Forty\nFour"</item>
+ <item msgid="3391101532763048862">"Forty\nFive"</item>
+ <item msgid="1671489330863254362">"Forty\nSix"</item>
+ <item msgid="5916017359554531038">"Forty\nSeven"</item>
+ <item msgid="8205413177993059967">"Forty\nEight"</item>
+ <item msgid="6607867415142171302">"Forty\nNine"</item>
+ <item msgid="8358850748472089162">"Fifty"</item>
+ <item msgid="3551313125255080234">"Fifty\nOne"</item>
+ <item msgid="1559678130725716542">"Fifty\nTwo"</item>
+ <item msgid="431441994725492377">"Fifty\nThree"</item>
+ <item msgid="6345774640539623024">"Fifty\nFour"</item>
+ <item msgid="8018192990793931120">"Fifty\nFive"</item>
+ <item msgid="6187650843754604534">"Fifty\nSix"</item>
+ <item msgid="8727240174015993259">"Fifty\nSeven"</item>
+ <item msgid="848339003778952950">"Fifty\nEight"</item>
+ <item msgid="5798985802835423618">"Fifty\nNine"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml b/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml
index da98ea9..a33d817 100644
--- a/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-en-rXC/strings.xml
@@ -20,211 +20,211 @@
<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="3171996292755059205">"Keyguard"</string>
- <string name="keyguard_password_enter_pin_code" msgid="3420548423949593123">"Type PIN code"</string>
- <string name="keyguard_password_enter_puk_code" msgid="670683628782925409">"Type SIM PUK and new PIN code"</string>
- <string name="keyguard_password_enter_puk_prompt" msgid="3747778500166059332">"SIM PUK code"</string>
- <string name="keyguard_password_enter_pin_prompt" msgid="8188243197504453830">"New SIM PIN code"</string>
- <string name="keyguard_password_entry_touch_hint" msgid="5790410752696806482">""<font size="17">"Touch to type password"</font>""</string>
- <string name="keyguard_password_enter_password_code" msgid="595980919238127672">"Type password to unlock"</string>
- <string name="keyguard_password_enter_pin_password_code" msgid="7504123374204446086">"Type PIN to unlock"</string>
- <string name="keyguard_enter_your_pin" msgid="7152989016739952871">"Enter your PIN"</string>
- <string name="keyguard_enter_your_pattern" msgid="4297890206109830353">"Enter your pattern"</string>
- <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Enter your password"</string>
- <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Incorrect PIN code."</string>
- <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Invalid Card."</string>
- <string name="keyguard_charged" msgid="3316115607283493413">"Fully charged"</string>
- <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging"</string>
- <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging rapidly"</string>
- <string name="keyguard_plugged_in_charging_slowly" msgid="509533586841478405">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging slowly"</string>
- <string name="keyguard_low_battery" msgid="9218432555787624490">"Connect your charger."</string>
- <string name="keyguard_instructions_when_pattern_disabled" msgid="8566679946700751371">"Press Menu to unlock."</string>
- <string name="keyguard_network_locked_message" msgid="6743537524631420759">"Network locked"</string>
- <string name="keyguard_missing_sim_message_short" msgid="6327533369959764518">"No SIM card"</string>
- <string name="keyguard_missing_sim_message" product="tablet" msgid="4550152848200783542">"No SIM card in tablet."</string>
- <string name="keyguard_missing_sim_message" product="default" msgid="6585414237800161146">"No SIM card in phone."</string>
- <string name="keyguard_missing_sim_instructions" msgid="7350295932015220392">"Insert a SIM card."</string>
- <string name="keyguard_missing_sim_instructions_long" msgid="589889372883904477">"The SIM card is missing or not readable. Insert a SIM card."</string>
- <string name="keyguard_permanent_disabled_sim_message_short" msgid="654102080186420706">"Unusable SIM card."</string>
- <string name="keyguard_permanent_disabled_sim_instructions" msgid="4683178224791318347">"Your SIM card has been permanently disabled.\n Contact your wireless service provider for another SIM card."</string>
- <string name="keyguard_sim_locked_message" msgid="953766009432168127">"SIM card is locked."</string>
- <string name="keyguard_sim_puk_locked_message" msgid="1772789643694942073">"SIM card is PUK-locked."</string>
- <string name="keyguard_sim_unlock_progress_dialog_message" msgid="3586601150825821675">"Unlocking SIM card…"</string>
- <string name="keyguard_accessibility_pin_area" msgid="703175752097279029">"PIN area"</string>
- <string name="keyguard_accessibility_password" msgid="7695303207740941101">"Device password"</string>
- <string name="keyguard_accessibility_sim_pin_area" msgid="912702510825058921">"SIM PIN area"</string>
- <string name="keyguard_accessibility_sim_puk_area" msgid="136979425761438705">"SIM PUK area"</string>
- <string name="keyguard_accessibility_next_alarm" msgid="5835196989158584991">"Next alarm set for <xliff:g id="ALARM">%1$s</xliff:g>"</string>
- <string name="keyboardview_keycode_delete" msgid="6883116827512721630">"Delete"</string>
- <string name="disable_carrier_button_text" msgid="6914341927421916114">"Disable eSIM"</string>
- <string name="error_disable_esim_title" msgid="4852978431156228006">"Can’t disable eSIM"</string>
- <string name="error_disable_esim_msg" msgid="676694908770135639">"The eSIM can’t be disabled due to an error."</string>
- <string name="keyboardview_keycode_enter" msgid="4505833604411016668">"Enter"</string>
- <string name="kg_forgot_pattern_button_text" msgid="534245177645252620">"Forgot Pattern"</string>
- <string name="kg_wrong_pattern" msgid="2873443744087746812">"Wrong pattern"</string>
- <string name="kg_wrong_password" msgid="8060364776224836597">"Wrong password"</string>
- <string name="kg_wrong_pin" msgid="4785660766909463466">"Wrong PIN"</string>
+ <string name="app_name" msgid="3171996292755059205">"Keyguard"</string>
+ <string name="keyguard_password_enter_pin_code" msgid="3420548423949593123">"Type PIN code"</string>
+ <string name="keyguard_password_enter_puk_code" msgid="670683628782925409">"Type SIM PUK and new PIN code"</string>
+ <string name="keyguard_password_enter_puk_prompt" msgid="3747778500166059332">"SIM PUK code"</string>
+ <string name="keyguard_password_enter_pin_prompt" msgid="8188243197504453830">"New SIM PIN code"</string>
+ <string name="keyguard_password_entry_touch_hint" msgid="5790410752696806482">""<font size="17">"Touch to type password"</font>""</string>
+ <string name="keyguard_password_enter_password_code" msgid="595980919238127672">"Type password to unlock"</string>
+ <string name="keyguard_password_enter_pin_password_code" msgid="7504123374204446086">"Type PIN to unlock"</string>
+ <string name="keyguard_enter_your_pin" msgid="7152989016739952871">"Enter your PIN"</string>
+ <string name="keyguard_enter_your_pattern" msgid="4297890206109830353">"Enter your pattern"</string>
+ <string name="keyguard_enter_your_password" msgid="5397328359341314506">"Enter your password"</string>
+ <string name="keyguard_password_wrong_pin_code" msgid="6535018036285012028">"Incorrect PIN code."</string>
+ <string name="keyguard_sim_error_message_short" msgid="592109500618448312">"Invalid Card."</string>
+ <string name="keyguard_charged" msgid="3316115607283493413">"Fully charged"</string>
+ <string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging"</string>
+ <string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging rapidly"</string>
+ <string name="keyguard_plugged_in_charging_slowly" msgid="509533586841478405">"<xliff:g id="PERCENTAGE">%s</xliff:g> • Charging slowly"</string>
+ <string name="keyguard_low_battery" msgid="9218432555787624490">"Connect your charger."</string>
+ <string name="keyguard_instructions_when_pattern_disabled" msgid="8566679946700751371">"Press Menu to unlock."</string>
+ <string name="keyguard_network_locked_message" msgid="6743537524631420759">"Network locked"</string>
+ <string name="keyguard_missing_sim_message_short" msgid="6327533369959764518">"No SIM card"</string>
+ <string name="keyguard_missing_sim_message" product="tablet" msgid="4550152848200783542">"No SIM card in tablet."</string>
+ <string name="keyguard_missing_sim_message" product="default" msgid="6585414237800161146">"No SIM card in phone."</string>
+ <string name="keyguard_missing_sim_instructions" msgid="7350295932015220392">"Insert a SIM card."</string>
+ <string name="keyguard_missing_sim_instructions_long" msgid="589889372883904477">"The SIM card is missing or not readable. Insert a SIM card."</string>
+ <string name="keyguard_permanent_disabled_sim_message_short" msgid="654102080186420706">"Unusable SIM card."</string>
+ <string name="keyguard_permanent_disabled_sim_instructions" msgid="4683178224791318347">"Your SIM card has been permanently disabled.\n Contact your wireless service provider for another SIM card."</string>
+ <string name="keyguard_sim_locked_message" msgid="953766009432168127">"SIM card is locked."</string>
+ <string name="keyguard_sim_puk_locked_message" msgid="1772789643694942073">"SIM card is PUK-locked."</string>
+ <string name="keyguard_sim_unlock_progress_dialog_message" msgid="3586601150825821675">"Unlocking SIM card…"</string>
+ <string name="keyguard_accessibility_pin_area" msgid="703175752097279029">"PIN area"</string>
+ <string name="keyguard_accessibility_password" msgid="7695303207740941101">"Device password"</string>
+ <string name="keyguard_accessibility_sim_pin_area" msgid="912702510825058921">"SIM PIN area"</string>
+ <string name="keyguard_accessibility_sim_puk_area" msgid="136979425761438705">"SIM PUK area"</string>
+ <string name="keyguard_accessibility_next_alarm" msgid="5835196989158584991">"Next alarm set for <xliff:g id="ALARM">%1$s</xliff:g>"</string>
+ <string name="keyboardview_keycode_delete" msgid="6883116827512721630">"Delete"</string>
+ <string name="disable_carrier_button_text" msgid="6914341927421916114">"Disable eSIM"</string>
+ <string name="error_disable_esim_title" msgid="4852978431156228006">"Can’t disable eSIM"</string>
+ <string name="error_disable_esim_msg" msgid="676694908770135639">"The eSIM can’t be disabled due to an error."</string>
+ <string name="keyboardview_keycode_enter" msgid="4505833604411016668">"Enter"</string>
+ <string name="kg_forgot_pattern_button_text" msgid="534245177645252620">"Forgot Pattern"</string>
+ <string name="kg_wrong_pattern" msgid="2873443744087746812">"Wrong pattern"</string>
+ <string name="kg_wrong_password" msgid="8060364776224836597">"Wrong password"</string>
+ <string name="kg_wrong_pin" msgid="4785660766909463466">"Wrong PIN"</string>
<plurals name="kg_too_many_failed_attempts_countdown" formatted="false" msgid="4368805541257003755">
- <item quantity="other">Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds.</item>
- <item quantity="one">Try again in 1 second.</item>
+ <item quantity="other">Try again in <xliff:g id="NUMBER">%d</xliff:g> seconds.</item>
+ <item quantity="one">Try again in 1 second.</item>
</plurals>
- <string name="kg_pattern_instructions" msgid="5547646893001491340">"Draw your pattern"</string>
- <string name="kg_sim_pin_instructions" msgid="6389000973113699187">"Enter SIM PIN."</string>
- <string name="kg_sim_pin_instructions_multi" msgid="1643757228644271861">"Enter SIM PIN for \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string>
- <string name="kg_sim_lock_esim_instructions" msgid="4416732549172148542">"<xliff:g id="PREVIOUS_MSG">%1$s</xliff:g> Disable eSIM to use device without mobile service."</string>
- <string name="kg_pin_instructions" msgid="4069609316644030034">"Enter PIN"</string>
- <string name="kg_password_instructions" msgid="136952397352976538">"Enter Password"</string>
- <string name="kg_puk_enter_puk_hint" msgid="2288964170039899277">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string>
- <string name="kg_puk_enter_puk_hint_multi" msgid="1373131883510840794">"SIM \"<xliff:g id="CARRIER">%1$s</xliff:g>\" is now disabled. Enter PUK code to continue. Contact carrier for details."</string>
- <string name="kg_puk_enter_pin_hint" msgid="3137789674920391087">"Enter desired PIN code"</string>
- <string name="kg_enter_confirm_pin_hint" msgid="3089485999116759671">"Confirm desired PIN code"</string>
- <string name="kg_sim_unlock_progress_dialog_message" msgid="4471738151810900114">"Unlocking SIM card…"</string>
- <string name="kg_invalid_sim_pin_hint" msgid="3057533256729513335">"Type a PIN that is 4 to 8 numbers."</string>
- <string name="kg_invalid_sim_puk_hint" msgid="6003602401368264144">"PUK code should be 8 numbers or more."</string>
- <string name="kg_invalid_puk" msgid="5399287873762592502">"Re-enter the correct PUK code. Repeated attempts will permanently disable the SIM."</string>
- <string name="kg_invalid_confirm_pin_hint" product="default" msgid="5672736555427444330">"PIN codes does not match"</string>
- <string name="kg_login_too_many_attempts" msgid="6604574268387867255">"Too many pattern attempts"</string>
- <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8637788033282252027">"You have incorrectly typed your PIN <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
- <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7724148763268377734">"You have incorrectly typed your password <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
- <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="4820967667848302092">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
- <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="1629351522209932316">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, this tablet will be reset, which will delete all its data."</string>
- <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="3921998703529189931">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, this phone will be reset, which will delete all its data."</string>
- <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="4694232971224663735">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER">%d</xliff:g> times. This tablet will be reset, which will delete all its data."</string>
- <string name="kg_failed_attempts_now_wiping" product="default" msgid="2365964340830006961">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER">%d</xliff:g> times. This phone will be reset, which will delete all its data."</string>
- <string name="kg_failed_attempts_almost_at_erase_user" product="tablet" msgid="1365418870560228936">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, this user will be removed, which will delete all user data."</string>
- <string name="kg_failed_attempts_almost_at_erase_user" product="default" msgid="2151286957817486128">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, this user will be removed, which will delete all user data."</string>
- <string name="kg_failed_attempts_now_erasing_user" product="tablet" msgid="5464020754932560928">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER">%d</xliff:g> times. This user will be removed, which will delete all user data."</string>
- <string name="kg_failed_attempts_now_erasing_user" product="default" msgid="6171564974118059">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER">%d</xliff:g> times. This user will be removed, which will delete all user data."</string>
- <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet" msgid="9154513795928824239">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the work profile will be removed, which will delete all profile data."</string>
- <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="2162434417489128282">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the work profile will be removed, which will delete all profile data."</string>
- <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="8966727588974691544">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER">%d</xliff:g> times. The work profile will be removed, which will delete all profile data."</string>
- <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="8476407539834855">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER">%d</xliff:g> times. The work profile will be removed, which will delete all profile data."</string>
- <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="956706236554092172">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your tablet using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
- <string name="kg_failed_attempts_almost_at_login" product="default" msgid="8364140853305528449">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
- <string name="kg_password_wrong_pin_code_pukked" msgid="3389829202093674267">"Incorrect SIM PIN code you must now contact your carrier to unlock your device."</string>
+ <string name="kg_pattern_instructions" msgid="5547646893001491340">"Draw your pattern"</string>
+ <string name="kg_sim_pin_instructions" msgid="6389000973113699187">"Enter SIM PIN."</string>
+ <string name="kg_sim_pin_instructions_multi" msgid="1643757228644271861">"Enter SIM PIN for \"<xliff:g id="CARRIER">%1$s</xliff:g>\"."</string>
+ <string name="kg_sim_lock_esim_instructions" msgid="4416732549172148542">"<xliff:g id="PREVIOUS_MSG">%1$s</xliff:g> Disable eSIM to use device without mobile service."</string>
+ <string name="kg_pin_instructions" msgid="4069609316644030034">"Enter PIN"</string>
+ <string name="kg_password_instructions" msgid="136952397352976538">"Enter Password"</string>
+ <string name="kg_puk_enter_puk_hint" msgid="2288964170039899277">"SIM is now disabled. Enter PUK code to continue. Contact carrier for details."</string>
+ <string name="kg_puk_enter_puk_hint_multi" msgid="1373131883510840794">"SIM \"<xliff:g id="CARRIER">%1$s</xliff:g>\" is now disabled. Enter PUK code to continue. Contact carrier for details."</string>
+ <string name="kg_puk_enter_pin_hint" msgid="3137789674920391087">"Enter desired PIN code"</string>
+ <string name="kg_enter_confirm_pin_hint" msgid="3089485999116759671">"Confirm desired PIN code"</string>
+ <string name="kg_sim_unlock_progress_dialog_message" msgid="4471738151810900114">"Unlocking SIM card…"</string>
+ <string name="kg_invalid_sim_pin_hint" msgid="3057533256729513335">"Type a PIN that is 4 to 8 numbers."</string>
+ <string name="kg_invalid_sim_puk_hint" msgid="6003602401368264144">"PUK code should be 8 numbers or more."</string>
+ <string name="kg_invalid_puk" msgid="5399287873762592502">"Re-enter the correct PUK code. Repeated attempts will permanently disable the SIM."</string>
+ <string name="kg_invalid_confirm_pin_hint" product="default" msgid="5672736555427444330">"PIN codes does not match"</string>
+ <string name="kg_login_too_many_attempts" msgid="6604574268387867255">"Too many pattern attempts"</string>
+ <string name="kg_too_many_failed_pin_attempts_dialog_message" msgid="8637788033282252027">"You have incorrectly typed your PIN <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
+ <string name="kg_too_many_failed_password_attempts_dialog_message" msgid="7724148763268377734">"You have incorrectly typed your password <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
+ <string name="kg_too_many_failed_pattern_attempts_dialog_message" msgid="4820967667848302092">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. \n\nTry again in <xliff:g id="NUMBER_1">%2$d</xliff:g> seconds."</string>
+ <string name="kg_failed_attempts_almost_at_wipe" product="tablet" msgid="1629351522209932316">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, this tablet will be reset, which will delete all its data."</string>
+ <string name="kg_failed_attempts_almost_at_wipe" product="default" msgid="3921998703529189931">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, this phone will be reset, which will delete all its data."</string>
+ <string name="kg_failed_attempts_now_wiping" product="tablet" msgid="4694232971224663735">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER">%d</xliff:g> times. This tablet will be reset, which will delete all its data."</string>
+ <string name="kg_failed_attempts_now_wiping" product="default" msgid="2365964340830006961">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER">%d</xliff:g> times. This phone will be reset, which will delete all its data."</string>
+ <string name="kg_failed_attempts_almost_at_erase_user" product="tablet" msgid="1365418870560228936">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, this user will be removed, which will delete all user data."</string>
+ <string name="kg_failed_attempts_almost_at_erase_user" product="default" msgid="2151286957817486128">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, this user will be removed, which will delete all user data."</string>
+ <string name="kg_failed_attempts_now_erasing_user" product="tablet" msgid="5464020754932560928">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER">%d</xliff:g> times. This user will be removed, which will delete all user data."</string>
+ <string name="kg_failed_attempts_now_erasing_user" product="default" msgid="6171564974118059">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER">%d</xliff:g> times. This user will be removed, which will delete all user data."</string>
+ <string name="kg_failed_attempts_almost_at_erase_profile" product="tablet" msgid="9154513795928824239">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the work profile will be removed, which will delete all profile data."</string>
+ <string name="kg_failed_attempts_almost_at_erase_profile" product="default" msgid="2162434417489128282">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, the work profile will be removed, which will delete all profile data."</string>
+ <string name="kg_failed_attempts_now_erasing_profile" product="tablet" msgid="8966727588974691544">"You have incorrectly attempted to unlock the tablet <xliff:g id="NUMBER">%d</xliff:g> times. The work profile will be removed, which will delete all profile data."</string>
+ <string name="kg_failed_attempts_now_erasing_profile" product="default" msgid="8476407539834855">"You have incorrectly attempted to unlock the phone <xliff:g id="NUMBER">%d</xliff:g> times. The work profile will be removed, which will delete all profile data."</string>
+ <string name="kg_failed_attempts_almost_at_login" product="tablet" msgid="956706236554092172">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your tablet using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
+ <string name="kg_failed_attempts_almost_at_login" product="default" msgid="8364140853305528449">"You have incorrectly drawn your unlock pattern <xliff:g id="NUMBER_0">%1$d</xliff:g> times. After <xliff:g id="NUMBER_1">%2$d</xliff:g> more unsuccessful attempts, you will be asked to unlock your phone using an email account.\n\n Try again in <xliff:g id="NUMBER_2">%3$d</xliff:g> seconds."</string>
+ <string name="kg_password_wrong_pin_code_pukked" msgid="3389829202093674267">"Incorrect SIM PIN code you must now contact your carrier to unlock your device."</string>
<plurals name="kg_password_wrong_pin_code" formatted="false" msgid="4314341367727055967">
- <item quantity="other">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
- <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>
+ <item quantity="other">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
+ <item quantity="one">Incorrect SIM PIN code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>
</plurals>
- <string name="kg_password_wrong_puk_code_dead" msgid="3329017604125179374">"SIM is unusable. Contact your carrier."</string>
+ <string name="kg_password_wrong_puk_code_dead" msgid="3329017604125179374">"SIM is unusable. Contact your carrier."</string>
<plurals name="kg_password_wrong_puk_code" formatted="false" msgid="2287504898931957513">
- <item quantity="other">Incorrect SIM PUK code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts before SIM becomes permanently unusable.</item>
- <item quantity="one">Incorrect SIM PUK code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before SIM becomes permanently unusable.</item>
+ <item quantity="other">Incorrect SIM PUK code, you have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts before SIM becomes permanently unusable.</item>
+ <item quantity="one">Incorrect SIM PUK code, you have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before SIM becomes permanently unusable.</item>
</plurals>
- <string name="kg_password_pin_failed" msgid="8769990811451236223">"SIM PIN operation failed!"</string>
- <string name="kg_password_puk_failed" msgid="1331621440873439974">"SIM PUK operation failed!"</string>
- <string name="kg_pin_accepted" msgid="7637293533973802143">"Code Accepted!"</string>
- <string name="keyguard_carrier_default" msgid="4274828292998453695">"No service."</string>
- <string name="accessibility_ime_switch_button" msgid="2695096475319405612">"Switch input method"</string>
- <string name="airplane_mode" msgid="3807209033737676010">"Airplane mode"</string>
- <string name="kg_prompt_reason_restart_pattern" msgid="7246972020562621506">"Pattern required after device restarts"</string>
- <string name="kg_prompt_reason_restart_pin" msgid="6303592361322290145">"PIN required after device restarts"</string>
- <string name="kg_prompt_reason_restart_password" msgid="6984641181515902406">"Password required after device restarts"</string>
- <string name="kg_prompt_reason_timeout_pattern" msgid="5304487696073914063">"Pattern required for additional security"</string>
- <string name="kg_prompt_reason_timeout_pin" msgid="8851462864335757813">"PIN required for additional security"</string>
- <string name="kg_prompt_reason_timeout_password" msgid="6563904839641583441">"Password required for additional security"</string>
- <string name="kg_prompt_reason_switch_profiles_pattern" msgid="3398054847288438444">"Pattern required when you switch profiles"</string>
- <string name="kg_prompt_reason_switch_profiles_pin" msgid="7426368139226961699">"PIN required when you switch profiles"</string>
- <string name="kg_prompt_reason_switch_profiles_password" msgid="8383831046318421845">"Password required when you switch profiles"</string>
- <string name="kg_prompt_reason_device_admin" msgid="3452168247888906179">"Device locked by admin"</string>
- <string name="kg_prompt_reason_user_request" msgid="8236951765212462286">"Device was locked manually"</string>
+ <string name="kg_password_pin_failed" msgid="8769990811451236223">"SIM PIN operation failed!"</string>
+ <string name="kg_password_puk_failed" msgid="1331621440873439974">"SIM PUK operation failed!"</string>
+ <string name="kg_pin_accepted" msgid="7637293533973802143">"Code Accepted!"</string>
+ <string name="keyguard_carrier_default" msgid="4274828292998453695">"No service."</string>
+ <string name="accessibility_ime_switch_button" msgid="2695096475319405612">"Switch input method"</string>
+ <string name="airplane_mode" msgid="3807209033737676010">"Airplane mode"</string>
+ <string name="kg_prompt_reason_restart_pattern" msgid="7246972020562621506">"Pattern required after device restarts"</string>
+ <string name="kg_prompt_reason_restart_pin" msgid="6303592361322290145">"PIN required after device restarts"</string>
+ <string name="kg_prompt_reason_restart_password" msgid="6984641181515902406">"Password required after device restarts"</string>
+ <string name="kg_prompt_reason_timeout_pattern" msgid="5304487696073914063">"Pattern required for additional security"</string>
+ <string name="kg_prompt_reason_timeout_pin" msgid="8851462864335757813">"PIN required for additional security"</string>
+ <string name="kg_prompt_reason_timeout_password" msgid="6563904839641583441">"Password required for additional security"</string>
+ <string name="kg_prompt_reason_switch_profiles_pattern" msgid="3398054847288438444">"Pattern required when you switch profiles"</string>
+ <string name="kg_prompt_reason_switch_profiles_pin" msgid="7426368139226961699">"PIN required when you switch profiles"</string>
+ <string name="kg_prompt_reason_switch_profiles_password" msgid="8383831046318421845">"Password required when you switch profiles"</string>
+ <string name="kg_prompt_reason_device_admin" msgid="3452168247888906179">"Device locked by admin"</string>
+ <string name="kg_prompt_reason_user_request" msgid="8236951765212462286">"Device was locked manually"</string>
<plurals name="kg_prompt_reason_time_pattern" formatted="false" msgid="71299470072448533">
- <item quantity="other">Device hasn\'t been unlocked for <xliff:g id="NUMBER_1">%d</xliff:g> hours. Confirm pattern.</item>
- <item quantity="one">Device hasn\'t been unlocked for <xliff:g id="NUMBER_0">%d</xliff:g> hour. Confirm pattern.</item>
+ <item quantity="other">Device hasn\'t been unlocked for <xliff:g id="NUMBER_1">%d</xliff:g> hours. Confirm pattern.</item>
+ <item quantity="one">Device hasn\'t been unlocked for <xliff:g id="NUMBER_0">%d</xliff:g> hour. Confirm pattern.</item>
</plurals>
<plurals name="kg_prompt_reason_time_pin" formatted="false" msgid="34586942088144385">
- <item quantity="other">Device hasn\'t been unlocked for <xliff:g id="NUMBER_1">%d</xliff:g> hours. Confirm PIN.</item>
- <item quantity="one">Device hasn\'t been unlocked for <xliff:g id="NUMBER_0">%d</xliff:g> hour. Confirm PIN.</item>
+ <item quantity="other">Device hasn\'t been unlocked for <xliff:g id="NUMBER_1">%d</xliff:g> hours. Confirm PIN.</item>
+ <item quantity="one">Device hasn\'t been unlocked for <xliff:g id="NUMBER_0">%d</xliff:g> hour. Confirm PIN.</item>
</plurals>
<plurals name="kg_prompt_reason_time_password" formatted="false" msgid="257297696215346527">
- <item quantity="other">Device hasn\'t been unlocked for <xliff:g id="NUMBER_1">%d</xliff:g> hours. Confirm password.</item>
- <item quantity="one">Device hasn\'t been unlocked for <xliff:g id="NUMBER_0">%d</xliff:g> hour. Confirm password.</item>
+ <item quantity="other">Device hasn\'t been unlocked for <xliff:g id="NUMBER_1">%d</xliff:g> hours. Confirm password.</item>
+ <item quantity="one">Device hasn\'t been unlocked for <xliff:g id="NUMBER_0">%d</xliff:g> hour. Confirm password.</item>
</plurals>
- <string name="kg_fingerprint_not_recognized" msgid="7854413849848459418">"Not recognized"</string>
- <string name="kg_face_not_recognized" msgid="6382535088345875294">"Not recognized"</string>
+ <string name="kg_fingerprint_not_recognized" msgid="7854413849848459418">"Not recognized"</string>
+ <string name="kg_face_not_recognized" msgid="6382535088345875294">"Not recognized"</string>
<plurals name="kg_password_default_pin_message" formatted="false" msgid="3739658416797652781">
- <item quantity="other">Enter SIM PIN. You have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
- <item quantity="one">Enter SIM PIN. You have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>
+ <item quantity="other">Enter SIM PIN. You have <xliff:g id="NUMBER_1">%d</xliff:g> remaining attempts.</item>
+ <item quantity="one">Enter SIM PIN. You have <xliff:g id="NUMBER_0">%d</xliff:g> remaining attempt before you must contact your carrier to unlock your device.</item>
</plurals>
<plurals name="kg_password_default_puk_message" formatted="false" msgid="8744416410184198352">
- <item quantity="other">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id="_NUMBER_1">%d</xliff:g> remaining attempts before SIM becomes permanently unusable. Contact carrier for details.</item>
- <item quantity="one">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id="_NUMBER_0">%d</xliff:g> remaining attempt before SIM becomes permanently unusable. Contact carrier for details.</item>
+ <item quantity="other">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id="_NUMBER_1">%d</xliff:g> remaining attempts before SIM becomes permanently unusable. Contact carrier for details.</item>
+ <item quantity="one">SIM is now disabled. Enter PUK code to continue. You have <xliff:g id="_NUMBER_0">%d</xliff:g> remaining attempt before SIM becomes permanently unusable. Contact carrier for details.</item>
</plurals>
- <string name="type_clock_header" msgid="4786545441902447636">"It’s"</string>
+ <string name="type_clock_header" msgid="4786545441902447636">"It’s"</string>
<string-array name="type_clock_hours">
- <item msgid="3543074812389379830">"Twelve"</item>
- <item msgid="7389464214252023751">"One"</item>
- <item msgid="8803180377002008046">"Two"</item>
- <item msgid="8614897059944644719">"Three"</item>
- <item msgid="2293058674782619556">"Four"</item>
- <item msgid="4815402358455041664">"Five"</item>
- <item msgid="3325754778509665687">"Six"</item>
- <item msgid="5805551341866280575">"Seven"</item>
- <item msgid="203334816668238610">"Eight"</item>
- <item msgid="4828052671464488923">"Nine"</item>
- <item msgid="2233497913571137419">"Ten"</item>
- <item msgid="5621554266768657830">"Eleven"</item>
+ <item msgid="3543074812389379830">"Twelve"</item>
+ <item msgid="7389464214252023751">"One"</item>
+ <item msgid="8803180377002008046">"Two"</item>
+ <item msgid="8614897059944644719">"Three"</item>
+ <item msgid="2293058674782619556">"Four"</item>
+ <item msgid="4815402358455041664">"Five"</item>
+ <item msgid="3325754778509665687">"Six"</item>
+ <item msgid="5805551341866280575">"Seven"</item>
+ <item msgid="203334816668238610">"Eight"</item>
+ <item msgid="4828052671464488923">"Nine"</item>
+ <item msgid="2233497913571137419">"Ten"</item>
+ <item msgid="5621554266768657830">"Eleven"</item>
</string-array>
<string-array name="type_clock_minutes">
- <item msgid="8322049385467207985">"O’Clock"</item>
- <item msgid="8837126587669001578">"O’One"</item>
- <item msgid="4294343372940455660">"O’Two"</item>
- <item msgid="7129166637707421536">"O’Three"</item>
- <item msgid="7579404865008788673">"O’Four"</item>
- <item msgid="3873924689207380586">"O’Five"</item>
- <item msgid="4849565597850069377">"O’Six"</item>
- <item msgid="4404219424523572364">"O’Seven"</item>
- <item msgid="8740481214764087329">"O’Eight"</item>
- <item msgid="1713216865806811237">"O’Nine"</item>
- <item msgid="3508406095411245038">"Ten"</item>
- <item msgid="7161996337755311711">"Eleven"</item>
- <item msgid="4044549963329624197">"Twelve"</item>
- <item msgid="333373157917379088">"Thirteen"</item>
- <item msgid="2631202907124819385">"Fourteen"</item>
- <item msgid="6472396076858033453">"Fifteen"</item>
- <item msgid="8656981856181581643">"Sixteen"</item>
- <item msgid="7289026608562030619">"Seventeen"</item>
- <item msgid="3881477602692646573">"Eighteen"</item>
- <item msgid="3358129827772984226">"Nineteen"</item>
- <item msgid="3308575407402865807">"Twenty"</item>
- <item msgid="5346560955382229629">"Twenty\nOne"</item>
- <item msgid="226750304761473436">"Twenty\nTwo"</item>
- <item msgid="616811325336838734">"Twenty\nThree"</item>
- <item msgid="616346116869053440">"Twenty\nFour"</item>
- <item msgid="4642996410384042830">"Twenty\nFive"</item>
- <item msgid="7506092849993571465">"Twenty\nSix"</item>
- <item msgid="1915078191101042031">"Twenty\nSeven"</item>
- <item msgid="4292378641900520252">"Twenty\nEight"</item>
- <item msgid="5339513901773103696">"Twenty\nNine"</item>
- <item msgid="3574673250891657607">"Thirty"</item>
- <item msgid="5796923836589110940">"Thirty\nOne"</item>
- <item msgid="5859323597571702052">"Thirty\nTwo"</item>
- <item msgid="5133326723148876507">"Thirty\nThree"</item>
- <item msgid="2693999494655663096">"Thirty\nFour"</item>
- <item msgid="3316754944962836197">"Thirty\nFive"</item>
- <item msgid="816891008836796723">"Thirty\nSix"</item>
- <item msgid="9158890488666520078">"Thirty\nSeven"</item>
- <item msgid="1894769703213894011">"Thirty\nEight"</item>
- <item msgid="5638820345598572399">"Thirty\nNine"</item>
- <item msgid="8838304023017895439">"Forty"</item>
- <item msgid="1834742948932559597">"Forty\nOne"</item>
- <item msgid="6573707308847773944">"Forty\nTwo"</item>
- <item msgid="2450149950652678001">"Forty\nThree"</item>
- <item msgid="2874667401318178036">"Forty\nFour"</item>
- <item msgid="3391101532763048862">"Forty\nFive"</item>
- <item msgid="1671489330863254362">"Forty\nSix"</item>
- <item msgid="5916017359554531038">"Forty\nSeven"</item>
- <item msgid="8205413177993059967">"Forty\nEight"</item>
- <item msgid="6607867415142171302">"Forty\nNine"</item>
- <item msgid="8358850748472089162">"Fifty"</item>
- <item msgid="3551313125255080234">"Fifty\nOne"</item>
- <item msgid="1559678130725716542">"Fifty\nTwo"</item>
- <item msgid="431441994725492377">"Fifty\nThree"</item>
- <item msgid="6345774640539623024">"Fifty\nFour"</item>
- <item msgid="8018192990793931120">"Fifty\nFive"</item>
- <item msgid="6187650843754604534">"Fifty\nSix"</item>
- <item msgid="8727240174015993259">"Fifty\nSeven"</item>
- <item msgid="848339003778952950">"Fifty\nEight"</item>
- <item msgid="5798985802835423618">"Fifty\nNine"</item>
+ <item msgid="8322049385467207985">"O’Clock"</item>
+ <item msgid="8837126587669001578">"O’One"</item>
+ <item msgid="4294343372940455660">"O’Two"</item>
+ <item msgid="7129166637707421536">"O’Three"</item>
+ <item msgid="7579404865008788673">"O’Four"</item>
+ <item msgid="3873924689207380586">"O’Five"</item>
+ <item msgid="4849565597850069377">"O’Six"</item>
+ <item msgid="4404219424523572364">"O’Seven"</item>
+ <item msgid="8740481214764087329">"O’Eight"</item>
+ <item msgid="1713216865806811237">"O’Nine"</item>
+ <item msgid="3508406095411245038">"Ten"</item>
+ <item msgid="7161996337755311711">"Eleven"</item>
+ <item msgid="4044549963329624197">"Twelve"</item>
+ <item msgid="333373157917379088">"Thirteen"</item>
+ <item msgid="2631202907124819385">"Fourteen"</item>
+ <item msgid="6472396076858033453">"Fifteen"</item>
+ <item msgid="8656981856181581643">"Sixteen"</item>
+ <item msgid="7289026608562030619">"Seventeen"</item>
+ <item msgid="3881477602692646573">"Eighteen"</item>
+ <item msgid="3358129827772984226">"Nineteen"</item>
+ <item msgid="3308575407402865807">"Twenty"</item>
+ <item msgid="5346560955382229629">"Twenty\nOne"</item>
+ <item msgid="226750304761473436">"Twenty\nTwo"</item>
+ <item msgid="616811325336838734">"Twenty\nThree"</item>
+ <item msgid="616346116869053440">"Twenty\nFour"</item>
+ <item msgid="4642996410384042830">"Twenty\nFive"</item>
+ <item msgid="7506092849993571465">"Twenty\nSix"</item>
+ <item msgid="1915078191101042031">"Twenty\nSeven"</item>
+ <item msgid="4292378641900520252">"Twenty\nEight"</item>
+ <item msgid="5339513901773103696">"Twenty\nNine"</item>
+ <item msgid="3574673250891657607">"Thirty"</item>
+ <item msgid="5796923836589110940">"Thirty\nOne"</item>
+ <item msgid="5859323597571702052">"Thirty\nTwo"</item>
+ <item msgid="5133326723148876507">"Thirty\nThree"</item>
+ <item msgid="2693999494655663096">"Thirty\nFour"</item>
+ <item msgid="3316754944962836197">"Thirty\nFive"</item>
+ <item msgid="816891008836796723">"Thirty\nSix"</item>
+ <item msgid="9158890488666520078">"Thirty\nSeven"</item>
+ <item msgid="1894769703213894011">"Thirty\nEight"</item>
+ <item msgid="5638820345598572399">"Thirty\nNine"</item>
+ <item msgid="8838304023017895439">"Forty"</item>
+ <item msgid="1834742948932559597">"Forty\nOne"</item>
+ <item msgid="6573707308847773944">"Forty\nTwo"</item>
+ <item msgid="2450149950652678001">"Forty\nThree"</item>
+ <item msgid="2874667401318178036">"Forty\nFour"</item>
+ <item msgid="3391101532763048862">"Forty\nFive"</item>
+ <item msgid="1671489330863254362">"Forty\nSix"</item>
+ <item msgid="5916017359554531038">"Forty\nSeven"</item>
+ <item msgid="8205413177993059967">"Forty\nEight"</item>
+ <item msgid="6607867415142171302">"Forty\nNine"</item>
+ <item msgid="8358850748472089162">"Fifty"</item>
+ <item msgid="3551313125255080234">"Fifty\nOne"</item>
+ <item msgid="1559678130725716542">"Fifty\nTwo"</item>
+ <item msgid="431441994725492377">"Fifty\nThree"</item>
+ <item msgid="6345774640539623024">"Fifty\nFour"</item>
+ <item msgid="8018192990793931120">"Fifty\nFive"</item>
+ <item msgid="6187650843754604534">"Fifty\nSix"</item>
+ <item msgid="8727240174015993259">"Fifty\nSeven"</item>
+ <item msgid="848339003778952950">"Fifty\nEight"</item>
+ <item msgid="5798985802835423618">"Fifty\nNine"</item>
</string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml
index 72fc16a..98453a7 100644
--- a/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-es-rUS/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">Se inhabilitó la SIM. Para continuar, ingresa el código PUK. Te quedan <xliff:g id="_NUMBER_1">%d</xliff:g> intentos más antes de que la SIM quede inutilizable permanentemente. Comunícate con tu proveedor para obtener más detalles.</item>
<item quantity="one">Se inhabilitó la SIM. Para continuar, ingresa el código PUK. Te queda <xliff:g id="_NUMBER_0">%d</xliff:g> intento más antes de que la SIM quede inutilizable permanentemente. Comunícate con tu proveedor para obtener más detalles.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Son las"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Doce"</item>
+ <item msgid="7389464214252023751">"Una"</item>
+ <item msgid="8803180377002008046">"Dos"</item>
+ <item msgid="8614897059944644719">"Tres"</item>
+ <item msgid="2293058674782619556">"Cuatro"</item>
+ <item msgid="4815402358455041664">"Cinco"</item>
+ <item msgid="3325754778509665687">"Seis"</item>
+ <item msgid="5805551341866280575">"Siete"</item>
+ <item msgid="203334816668238610">"Ocho"</item>
+ <item msgid="4828052671464488923">"Nueve"</item>
+ <item msgid="2233497913571137419">"Diez"</item>
+ <item msgid="5621554266768657830">"Once"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"En punto"</item>
+ <item msgid="8837126587669001578">"y uno"</item>
+ <item msgid="4294343372940455660">"y dos"</item>
+ <item msgid="7129166637707421536">"y tres"</item>
+ <item msgid="7579404865008788673">"y cuatro"</item>
+ <item msgid="3873924689207380586">"y cinco"</item>
+ <item msgid="4849565597850069377">"y seis"</item>
+ <item msgid="4404219424523572364">"y siete"</item>
+ <item msgid="8740481214764087329">"y ocho"</item>
+ <item msgid="1713216865806811237">"y nueve"</item>
+ <item msgid="3508406095411245038">"Diez"</item>
+ <item msgid="7161996337755311711">"Once"</item>
+ <item msgid="4044549963329624197">"Doce"</item>
+ <item msgid="333373157917379088">"Trece"</item>
+ <item msgid="2631202907124819385">"Catorce"</item>
+ <item msgid="6472396076858033453">"Quince"</item>
+ <item msgid="8656981856181581643">"Dieciséis"</item>
+ <item msgid="7289026608562030619">"Diecisiete"</item>
+ <item msgid="3881477602692646573">"Dieciocho"</item>
+ <item msgid="3358129827772984226">"Diecinueve"</item>
+ <item msgid="3308575407402865807">"Veinte"</item>
+ <item msgid="5346560955382229629">"Veintiuno\n"</item>
+ <item msgid="226750304761473436">"Veintidós\n"</item>
+ <item msgid="616811325336838734">"Veintitrés\n"</item>
+ <item msgid="616346116869053440">"Veinticuatro\n"</item>
+ <item msgid="4642996410384042830">"Veinticinco\n"</item>
+ <item msgid="7506092849993571465">"Veintiséis\n"</item>
+ <item msgid="1915078191101042031">"Veintisiete\n"</item>
+ <item msgid="4292378641900520252">"Veintiocho\n"</item>
+ <item msgid="5339513901773103696">"Veintinueve\n"</item>
+ <item msgid="3574673250891657607">"Treinta"</item>
+ <item msgid="5796923836589110940">"Treinta\ny uno"</item>
+ <item msgid="5859323597571702052">"Treinta\ny dos"</item>
+ <item msgid="5133326723148876507">"Treinta\ny tres"</item>
+ <item msgid="2693999494655663096">"Treinta\ny cuatro"</item>
+ <item msgid="3316754944962836197">"Treinta\ny cinco"</item>
+ <item msgid="816891008836796723">"Treinta\ny seis"</item>
+ <item msgid="9158890488666520078">"Treinta\ny siete"</item>
+ <item msgid="1894769703213894011">"Treinta\ny ocho"</item>
+ <item msgid="5638820345598572399">"Treinta\ny nueve"</item>
+ <item msgid="8838304023017895439">"Cuarenta"</item>
+ <item msgid="1834742948932559597">"Cuarenta\ny uno"</item>
+ <item msgid="6573707308847773944">"Cuarenta\ny dos"</item>
+ <item msgid="2450149950652678001">"Cuarenta\ny tres"</item>
+ <item msgid="2874667401318178036">"Cuarenta\ny cuatro"</item>
+ <item msgid="3391101532763048862">"Cuarenta\ny cinco"</item>
+ <item msgid="1671489330863254362">"Cuarenta\ny seis"</item>
+ <item msgid="5916017359554531038">"Cuarenta\ny siete"</item>
+ <item msgid="8205413177993059967">"Cuarenta\ny ocho"</item>
+ <item msgid="6607867415142171302">"Cuarenta\ny nueve"</item>
+ <item msgid="8358850748472089162">"Cincuenta"</item>
+ <item msgid="3551313125255080234">"Cincuenta\ny uno"</item>
+ <item msgid="1559678130725716542">"Cincuenta\ny dos"</item>
+ <item msgid="431441994725492377">"Cincuenta\ny tres"</item>
+ <item msgid="6345774640539623024">"Cincuenta\ny cuatro"</item>
+ <item msgid="8018192990793931120">"Cincuenta\ny cinco"</item>
+ <item msgid="6187650843754604534">"Cincuenta\ny seis"</item>
+ <item msgid="8727240174015993259">"Cincuenta\ny siete"</item>
+ <item msgid="848339003778952950">"Cincuenta\ny ocho"</item>
+ <item msgid="5798985802835423618">"Cincuenta\ny nueve"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-es/strings.xml b/packages/SystemUI/res-keyguard/values-es/strings.xml
index 232c79b..00bdd91 100644
--- a/packages/SystemUI/res-keyguard/values-es/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-es/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">La tarjeta SIM está inhabilitada. Introduce el código PUK para continuar. Te quedan <xliff:g id="_NUMBER_1">%d</xliff:g> intentos para que la tarjeta SIM quede inservible de forma permanente. Ponte en contacto con tu operador para obtener más información.</item>
<item quantity="one">La tarjeta SIM está inhabilitada. Introduce el código PUK para continuar. Te queda <xliff:g id="_NUMBER_0">%d</xliff:g> intento para que la tarjeta SIM quede inservible de forma permanente. Ponte en contacto con tu operador para obtener más información.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Son las"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Doce"</item>
+ <item msgid="7389464214252023751">"Uno"</item>
+ <item msgid="8803180377002008046">"Dos"</item>
+ <item msgid="8614897059944644719">"Tres"</item>
+ <item msgid="2293058674782619556">"Cuatro"</item>
+ <item msgid="4815402358455041664">"Cinco"</item>
+ <item msgid="3325754778509665687">"Seis"</item>
+ <item msgid="5805551341866280575">"Siete"</item>
+ <item msgid="203334816668238610">"Ocho"</item>
+ <item msgid="4828052671464488923">"Nueve"</item>
+ <item msgid="2233497913571137419">"Diez"</item>
+ <item msgid="5621554266768657830">"Once"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"En punto"</item>
+ <item msgid="8837126587669001578">"una"</item>
+ <item msgid="4294343372940455660">"dos"</item>
+ <item msgid="7129166637707421536">"tres"</item>
+ <item msgid="7579404865008788673">"cuatro"</item>
+ <item msgid="3873924689207380586">"cinco"</item>
+ <item msgid="4849565597850069377">"seis"</item>
+ <item msgid="4404219424523572364">"siete"</item>
+ <item msgid="8740481214764087329">"ocho"</item>
+ <item msgid="1713216865806811237">"nueve"</item>
+ <item msgid="3508406095411245038">"Diez"</item>
+ <item msgid="7161996337755311711">"Once"</item>
+ <item msgid="4044549963329624197">"Doce"</item>
+ <item msgid="333373157917379088">"Trece"</item>
+ <item msgid="2631202907124819385">"Catorce"</item>
+ <item msgid="6472396076858033453">"Quince"</item>
+ <item msgid="8656981856181581643">"Dieciséis"</item>
+ <item msgid="7289026608562030619">"Diecisiete"</item>
+ <item msgid="3881477602692646573">"Dieciocho"</item>
+ <item msgid="3358129827772984226">"Diecinueve"</item>
+ <item msgid="3308575407402865807">"Veinte"</item>
+ <item msgid="5346560955382229629">"Veintiuno\n"</item>
+ <item msgid="226750304761473436">"Veintidós\n"</item>
+ <item msgid="616811325336838734">"Veintitrés\n"</item>
+ <item msgid="616346116869053440">"Veinticuatro\n"</item>
+ <item msgid="4642996410384042830">"Veinticinco\n"</item>
+ <item msgid="7506092849993571465">"Veintiséis\n"</item>
+ <item msgid="1915078191101042031">"Veintisiete\n"</item>
+ <item msgid="4292378641900520252">"Veintiocho\n"</item>
+ <item msgid="5339513901773103696">"Veintinueve\n"</item>
+ <item msgid="3574673250891657607">"Treinta"</item>
+ <item msgid="5796923836589110940">"Treinta\ny uno"</item>
+ <item msgid="5859323597571702052">"Treinta\ny dos"</item>
+ <item msgid="5133326723148876507">"Treinta\ny tres"</item>
+ <item msgid="2693999494655663096">"Treinta\ny cuatro"</item>
+ <item msgid="3316754944962836197">"Treinta\ny cinco"</item>
+ <item msgid="816891008836796723">"Treinta\ny seis"</item>
+ <item msgid="9158890488666520078">"Treinta\ny siete"</item>
+ <item msgid="1894769703213894011">"Treinta\ny ocho"</item>
+ <item msgid="5638820345598572399">"Treinta\ny nueve"</item>
+ <item msgid="8838304023017895439">"Cuarenta"</item>
+ <item msgid="1834742948932559597">"Cuarenta\ny uno"</item>
+ <item msgid="6573707308847773944">"Cuarenta\ny dos"</item>
+ <item msgid="2450149950652678001">"Cuarenta\ny tres"</item>
+ <item msgid="2874667401318178036">"Cuarenta\ny cuatro"</item>
+ <item msgid="3391101532763048862">"Cuarenta\ny cinco"</item>
+ <item msgid="1671489330863254362">"Cuarenta\n y seis"</item>
+ <item msgid="5916017359554531038">"Cuarenta\ny siete"</item>
+ <item msgid="8205413177993059967">"Cuarenta\ny ocho"</item>
+ <item msgid="6607867415142171302">"Cuarenta\ny nueve"</item>
+ <item msgid="8358850748472089162">"Cincuenta"</item>
+ <item msgid="3551313125255080234">"Cincuenta\ny uno"</item>
+ <item msgid="1559678130725716542">"Cincuenta\ny dos"</item>
+ <item msgid="431441994725492377">"Cincuenta\ny tres"</item>
+ <item msgid="6345774640539623024">"Cincuenta\ny cuatro"</item>
+ <item msgid="8018192990793931120">"Cincuenta\ny cinco"</item>
+ <item msgid="6187650843754604534">"Cincuenta\ny seis"</item>
+ <item msgid="8727240174015993259">"Cincuenta\ny siete"</item>
+ <item msgid="848339003778952950">"Cincuenta\ny ocho"</item>
+ <item msgid="5798985802835423618">"Cincuenta\ny nueve"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-et/strings.xml b/packages/SystemUI/res-keyguard/values-et/strings.xml
index 4eeebe3..e778804 100644
--- a/packages/SystemUI/res-keyguard/values-et/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-et/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM-kaart on nüüd keelatud. Jätkamiseks sisestage PUK-kood. Teil on jäänud veel <xliff:g id="_NUMBER_1">%d</xliff:g> katset enne, kui SIM-kaart püsivalt lukustatakse. Lisateavet küsige operaatorilt.</item>
<item quantity="one">SIM-kaart on nüüd keelatud. Jätkamiseks sisestage PUK-kood. Teil on jäänud veel <xliff:g id="_NUMBER_0">%d</xliff:g> katse enne, kui SIM-kaart püsivalt lukustatakse. Lisateavet küsige operaatorilt.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Kell on"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Kaksteist"</item>
+ <item msgid="7389464214252023751">"Üks"</item>
+ <item msgid="8803180377002008046">"Kaks"</item>
+ <item msgid="8614897059944644719">"Kolm"</item>
+ <item msgid="2293058674782619556">"Neli"</item>
+ <item msgid="4815402358455041664">"Viis"</item>
+ <item msgid="3325754778509665687">"Kuus"</item>
+ <item msgid="5805551341866280575">"Seitse"</item>
+ <item msgid="203334816668238610">"Kaheksa"</item>
+ <item msgid="4828052671464488923">"Üheksa"</item>
+ <item msgid="2233497913571137419">"Kümme"</item>
+ <item msgid="5621554266768657830">"Üksteist"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"null üks"</item>
+ <item msgid="8837126587669001578">"null üks"</item>
+ <item msgid="4294343372940455660">"null kaks"</item>
+ <item msgid="7129166637707421536">"null kolm"</item>
+ <item msgid="7579404865008788673">"null neli"</item>
+ <item msgid="3873924689207380586">"null viis"</item>
+ <item msgid="4849565597850069377">"null kuus"</item>
+ <item msgid="4404219424523572364">"null seitse"</item>
+ <item msgid="8740481214764087329">"null kaheksa"</item>
+ <item msgid="1713216865806811237">"null üheksa"</item>
+ <item msgid="3508406095411245038">"Kümme"</item>
+ <item msgid="7161996337755311711">"Üksteist"</item>
+ <item msgid="4044549963329624197">"Kaksteist"</item>
+ <item msgid="333373157917379088">"Kolmteist"</item>
+ <item msgid="2631202907124819385">"Neliteist"</item>
+ <item msgid="6472396076858033453">"Viisteist"</item>
+ <item msgid="8656981856181581643">"Kuusteist"</item>
+ <item msgid="7289026608562030619">"Seitseteist"</item>
+ <item msgid="3881477602692646573">"Kaheksateist"</item>
+ <item msgid="3358129827772984226">"Üheksateist"</item>
+ <item msgid="3308575407402865807">"Kakskümmend"</item>
+ <item msgid="5346560955382229629">"Kakskümmend\nüks"</item>
+ <item msgid="226750304761473436">"Kakskümmend\nkaks"</item>
+ <item msgid="616811325336838734">"Kakskümmend\nkolm"</item>
+ <item msgid="616346116869053440">"Kakskümmend\nneli"</item>
+ <item msgid="4642996410384042830">"Kakskümmend\nviis"</item>
+ <item msgid="7506092849993571465">"Kakskümmend\nkuus"</item>
+ <item msgid="1915078191101042031">"Kakskümmend\nseitse"</item>
+ <item msgid="4292378641900520252">"Kakskümmend\nkaheksa"</item>
+ <item msgid="5339513901773103696">"Kakskümmend\nüheksa"</item>
+ <item msgid="3574673250891657607">"Kolmkümmend"</item>
+ <item msgid="5796923836589110940">"Kolmkümmend\nüks"</item>
+ <item msgid="5859323597571702052">"Kolmkümmend\nkaks"</item>
+ <item msgid="5133326723148876507">"Kolmkümmend\nkolm"</item>
+ <item msgid="2693999494655663096">"Kolmkümmend\nneli"</item>
+ <item msgid="3316754944962836197">"Kolmkümmend\nviis"</item>
+ <item msgid="816891008836796723">"Kolmkümmend\nkuus"</item>
+ <item msgid="9158890488666520078">"Kolmkümmend\nseitse"</item>
+ <item msgid="1894769703213894011">"Kolmkümmend\nkaheksa"</item>
+ <item msgid="5638820345598572399">"Kolmkümmend\nüheksa"</item>
+ <item msgid="8838304023017895439">"Nelikümmend"</item>
+ <item msgid="1834742948932559597">"Nelikümmend\nüks"</item>
+ <item msgid="6573707308847773944">"Nelikümmend\nkaks"</item>
+ <item msgid="2450149950652678001">"Nelikümmend\nkolm"</item>
+ <item msgid="2874667401318178036">"Nelikümmend\nneli"</item>
+ <item msgid="3391101532763048862">"Nelikümmend\nviis"</item>
+ <item msgid="1671489330863254362">"Nelikümmend\nkuus"</item>
+ <item msgid="5916017359554531038">"Nelikümmend\nseitse"</item>
+ <item msgid="8205413177993059967">"Nelikümmend\nkaheksa"</item>
+ <item msgid="6607867415142171302">"Nelikümmend\nüheksa"</item>
+ <item msgid="8358850748472089162">"Viiskümmend"</item>
+ <item msgid="3551313125255080234">"Viiskümmend\nüks"</item>
+ <item msgid="1559678130725716542">"Viiskümmend\nkaks"</item>
+ <item msgid="431441994725492377">"Viiskümmend\nkolm"</item>
+ <item msgid="6345774640539623024">"Viiskümmend\nneli"</item>
+ <item msgid="8018192990793931120">"Viiskümmend\nviis"</item>
+ <item msgid="6187650843754604534">"Viiskümmend\nkuus"</item>
+ <item msgid="8727240174015993259">"Viiskümmend\nseitse"</item>
+ <item msgid="848339003778952950">"Viiskümmend\nkaheksa"</item>
+ <item msgid="5798985802835423618">"Viiskümmend\nüheksa"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-eu/strings.xml b/packages/SystemUI/res-keyguard/values-eu/strings.xml
index bb913d1..3ebb536 100644
--- a/packages/SystemUI/res-keyguard/values-eu/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-eu/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">Desgaitu egin da SIM txartela. Aurrera egiteko, idatzi PUK kodea. <xliff:g id="_NUMBER_1">%d</xliff:g> saiakera geratzen zaizkizu SIM txartela betiko erabilgaitz geratu aurretik. Xehetasunak lortzeko, jarri operadorearekin harremanetan.</item>
<item quantity="one">Desgaitu egin da SIM txartela. Aurrera egiteko, idatzi PUK kodea. <xliff:g id="_NUMBER_0">%d</xliff:g> saiakera geratzen zaizu SIM txartela betiko erabilgaitz geratu aurretik. Xehetasunak lortzeko, jarri operadorearekin harremanetan.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Ordua:"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Hamabiak"</item>
+ <item msgid="7389464214252023751">"Ordu bata"</item>
+ <item msgid="8803180377002008046">"Ordu biak"</item>
+ <item msgid="8614897059944644719">"Hirurak"</item>
+ <item msgid="2293058674782619556">"Laurak"</item>
+ <item msgid="4815402358455041664">"Bostak"</item>
+ <item msgid="3325754778509665687">"Seiak"</item>
+ <item msgid="5805551341866280575">"Zazpiak"</item>
+ <item msgid="203334816668238610">"Zortziak"</item>
+ <item msgid="4828052671464488923">"Bederatziak"</item>
+ <item msgid="2233497913571137419">"Hamarrak"</item>
+ <item msgid="5621554266768657830">"Hamaikak"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"dira"</item>
+ <item msgid="8837126587669001578">"bat"</item>
+ <item msgid="4294343372940455660">"bi"</item>
+ <item msgid="7129166637707421536">"hiru"</item>
+ <item msgid="7579404865008788673">"lau"</item>
+ <item msgid="3873924689207380586">"bost"</item>
+ <item msgid="4849565597850069377">"sei"</item>
+ <item msgid="4404219424523572364">"zazpi"</item>
+ <item msgid="8740481214764087329">"zortzi"</item>
+ <item msgid="1713216865806811237">"bederatzi"</item>
+ <item msgid="3508406095411245038">"hamar"</item>
+ <item msgid="7161996337755311711">"hamaika"</item>
+ <item msgid="4044549963329624197">"hamabi"</item>
+ <item msgid="333373157917379088">"hamahiru"</item>
+ <item msgid="2631202907124819385">"hamalau"</item>
+ <item msgid="6472396076858033453">"hamabost"</item>
+ <item msgid="8656981856181581643">"hamasei"</item>
+ <item msgid="7289026608562030619">"hamazazpi"</item>
+ <item msgid="3881477602692646573">"hemezortzi"</item>
+ <item msgid="3358129827772984226">"hemeretzi"</item>
+ <item msgid="3308575407402865807">"hogei"</item>
+ <item msgid="5346560955382229629">"hogeita\nbat"</item>
+ <item msgid="226750304761473436">"hogeita\nbi"</item>
+ <item msgid="616811325336838734">"hogeita\nhiru"</item>
+ <item msgid="616346116869053440">"hogeita\nlau"</item>
+ <item msgid="4642996410384042830">"hogeita\nbost"</item>
+ <item msgid="7506092849993571465">"hogeita\nsei"</item>
+ <item msgid="1915078191101042031">"hogeita\nzazpi"</item>
+ <item msgid="4292378641900520252">"hogeita\nzortzi"</item>
+ <item msgid="5339513901773103696">"hogeita\nbederatzi"</item>
+ <item msgid="3574673250891657607">"hogeita hamar"</item>
+ <item msgid="5796923836589110940">"hogeita\nhamaika"</item>
+ <item msgid="5859323597571702052">"hogeita\nhamabi"</item>
+ <item msgid="5133326723148876507">"hogeita\nhamahiru"</item>
+ <item msgid="2693999494655663096">"hogeita\nhamalau"</item>
+ <item msgid="3316754944962836197">"hogeita\nhamabost"</item>
+ <item msgid="816891008836796723">"hogeita\nhamasei"</item>
+ <item msgid="9158890488666520078">"hogeita\nhamazazpi"</item>
+ <item msgid="1894769703213894011">"hogeita\nhemezortzi"</item>
+ <item msgid="5638820345598572399">"hogeita\nhemeretzi"</item>
+ <item msgid="8838304023017895439">"berrogei"</item>
+ <item msgid="1834742948932559597">"berrogeita\nbat"</item>
+ <item msgid="6573707308847773944">"berrogeita\nbi"</item>
+ <item msgid="2450149950652678001">"berrogeita\nhiru"</item>
+ <item msgid="2874667401318178036">"berrogeita\nlau"</item>
+ <item msgid="3391101532763048862">"berrogeita\nbost"</item>
+ <item msgid="1671489330863254362">"berrogeita\nsei"</item>
+ <item msgid="5916017359554531038">"berrogeita\nzazpi"</item>
+ <item msgid="8205413177993059967">"berrogeita\nzortzi"</item>
+ <item msgid="6607867415142171302">"berrogeita\nbederatzi"</item>
+ <item msgid="8358850748472089162">"berrogeita hamar"</item>
+ <item msgid="3551313125255080234">"berrogeita\nhamaika"</item>
+ <item msgid="1559678130725716542">"berrogeita\nhamabi"</item>
+ <item msgid="431441994725492377">"berrogeita\nhamahiru"</item>
+ <item msgid="6345774640539623024">"berrogeita\nhamalau"</item>
+ <item msgid="8018192990793931120">"berrogeita\nhamabost"</item>
+ <item msgid="6187650843754604534">"berrogeita\nhamasei"</item>
+ <item msgid="8727240174015993259">"berrogeita\nhamazazpi"</item>
+ <item msgid="848339003778952950">"berrogeita\nhemezortzi"</item>
+ <item msgid="5798985802835423618">"berrogeita\nhemeretzi"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-fa/strings.xml b/packages/SystemUI/res-keyguard/values-fa/strings.xml
index 5568d94..0c30d03 100644
--- a/packages/SystemUI/res-keyguard/values-fa/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-fa/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">سیمکارت اکنون غیرفعال است. برای ادامه دادن کد PUK را وارد کنید. <xliff:g id="_NUMBER_1">%d</xliff:g> تلاش دیگر باقی مانده است و پس از آن سیمکارت برای همیشه غیرقابلاستفاده میشود. برای اطلاع از جزئیات با شرکت مخابراتی تماس بگیرید.</item>
<item quantity="other">سیمکارت اکنون غیرفعال است. برای ادامه دادن کد PUK را وارد کنید. <xliff:g id="_NUMBER_1">%d</xliff:g> تلاش دیگر باقی مانده است و پس از آن سیمکارت برای همیشه غیرقابلاستفاده میشود. برای اطلاع از جزئیات با شرکت مخابراتی تماس بگیرید.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"ساعت:"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"دوازده"</item>
+ <item msgid="7389464214252023751">"یک"</item>
+ <item msgid="8803180377002008046">"دو"</item>
+ <item msgid="8614897059944644719">"سه"</item>
+ <item msgid="2293058674782619556">"چهار"</item>
+ <item msgid="4815402358455041664">"پنج"</item>
+ <item msgid="3325754778509665687">"شش"</item>
+ <item msgid="5805551341866280575">"هفت"</item>
+ <item msgid="203334816668238610">"هشت"</item>
+ <item msgid="4828052671464488923">"نه"</item>
+ <item msgid="2233497913571137419">"ده"</item>
+ <item msgid="5621554266768657830">"یازده"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"ساعت"</item>
+ <item msgid="8837126587669001578">"یک"</item>
+ <item msgid="4294343372940455660">"دو"</item>
+ <item msgid="7129166637707421536">"سه"</item>
+ <item msgid="7579404865008788673">"چهار"</item>
+ <item msgid="3873924689207380586">"پنج"</item>
+ <item msgid="4849565597850069377">"شش"</item>
+ <item msgid="4404219424523572364">"هفت"</item>
+ <item msgid="8740481214764087329">"هشت"</item>
+ <item msgid="1713216865806811237">"نه"</item>
+ <item msgid="3508406095411245038">"ده"</item>
+ <item msgid="7161996337755311711">"یازده"</item>
+ <item msgid="4044549963329624197">"دوازده"</item>
+ <item msgid="333373157917379088">"سیزده"</item>
+ <item msgid="2631202907124819385">"چهارده"</item>
+ <item msgid="6472396076858033453">"پانزده"</item>
+ <item msgid="8656981856181581643">"شانزده"</item>
+ <item msgid="7289026608562030619">"هفده"</item>
+ <item msgid="3881477602692646573">"هجده"</item>
+ <item msgid="3358129827772984226">"نوزده"</item>
+ <item msgid="3308575407402865807">"بیست"</item>
+ <item msgid="5346560955382229629">"بیستو\nیک"</item>
+ <item msgid="226750304761473436">"بیستو\nدو"</item>
+ <item msgid="616811325336838734">"بیستو\nسه"</item>
+ <item msgid="616346116869053440">"بیست و\nچهار"</item>
+ <item msgid="4642996410384042830">"بیستو\nپنج"</item>
+ <item msgid="7506092849993571465">"بیستو\nشش"</item>
+ <item msgid="1915078191101042031">"بیستو\nهفت"</item>
+ <item msgid="4292378641900520252">"بیستو\nهشت"</item>
+ <item msgid="5339513901773103696">"بیستو\nنه"</item>
+ <item msgid="3574673250891657607">"سی"</item>
+ <item msgid="5796923836589110940">"سیو\nیک"</item>
+ <item msgid="5859323597571702052">"سیو\nدو"</item>
+ <item msgid="5133326723148876507">"سیو\nسه"</item>
+ <item msgid="2693999494655663096">"سیو\nچهار"</item>
+ <item msgid="3316754944962836197">"سیو\nپنج"</item>
+ <item msgid="816891008836796723">"سیو\nشش"</item>
+ <item msgid="9158890488666520078">"سیو\nهفت"</item>
+ <item msgid="1894769703213894011">"سیو\nهشت"</item>
+ <item msgid="5638820345598572399">"سیو\nنه"</item>
+ <item msgid="8838304023017895439">"چهل"</item>
+ <item msgid="1834742948932559597">"چهلو\nیک"</item>
+ <item msgid="6573707308847773944">"چهلو\nدو"</item>
+ <item msgid="2450149950652678001">"چهلو\nسه"</item>
+ <item msgid="2874667401318178036">"چهلو\nچهار"</item>
+ <item msgid="3391101532763048862">"چهلو\nپنج"</item>
+ <item msgid="1671489330863254362">"چهلو\nشش"</item>
+ <item msgid="5916017359554531038">"چهلو\nهفت"</item>
+ <item msgid="8205413177993059967">"چهلو\nهشت"</item>
+ <item msgid="6607867415142171302">"چهلو\nنه"</item>
+ <item msgid="8358850748472089162">"پنجاه"</item>
+ <item msgid="3551313125255080234">"پنجاهو\nیک"</item>
+ <item msgid="1559678130725716542">"پنجاهو\nدو"</item>
+ <item msgid="431441994725492377">"چهلو\nسه"</item>
+ <item msgid="6345774640539623024">"چهلو\nچهار"</item>
+ <item msgid="8018192990793931120">"پنجاهو\nپنج"</item>
+ <item msgid="6187650843754604534">"پنجاهو\nشش"</item>
+ <item msgid="8727240174015993259">"پنجاهو\nهفت"</item>
+ <item msgid="848339003778952950">"پنجاهو\nهشت"</item>
+ <item msgid="5798985802835423618">"پنجاهو\nنه"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-fi/strings.xml b/packages/SystemUI/res-keyguard/values-fi/strings.xml
index 4f3304d..6092372 100644
--- a/packages/SystemUI/res-keyguard/values-fi/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-fi/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM-kortti on nyt lukittu. Anna PUK-koodi, niin voit jatkaa. Sinulla on <xliff:g id="_NUMBER_1">%d</xliff:g> yritystä jäljellä, ennen kuin SIM-kortti poistuu pysyvästi käytöstä. Pyydä lisätietoja operaattoriltasi.</item>
<item quantity="one">SIM-kortti on nyt lukittu. Anna PUK-koodi, niin voit jatkaa. Sinulla on <xliff:g id="_NUMBER_0">%d</xliff:g> yritys jäljellä, ennen kuin SIM-kortti poistuu pysyvästi käytöstä. Pyydä lisätietoja operaattoriltasi.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Kello on"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Kaksitoista"</item>
+ <item msgid="7389464214252023751">"Yksi"</item>
+ <item msgid="8803180377002008046">"Kaksi"</item>
+ <item msgid="8614897059944644719">"Kolme"</item>
+ <item msgid="2293058674782619556">"Neljä"</item>
+ <item msgid="4815402358455041664">"Viisi"</item>
+ <item msgid="3325754778509665687">"Kuusi"</item>
+ <item msgid="5805551341866280575">"Seitsemän"</item>
+ <item msgid="203334816668238610">"Kahdeksan"</item>
+ <item msgid="4828052671464488923">"Yhdeksän"</item>
+ <item msgid="2233497913571137419">"Kymmenen"</item>
+ <item msgid="5621554266768657830">"Yksitoista"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Nolla nolla"</item>
+ <item msgid="8837126587669001578">"Nolla yksi"</item>
+ <item msgid="4294343372940455660">"Nolla kaksi"</item>
+ <item msgid="7129166637707421536">"Nolla kolme"</item>
+ <item msgid="7579404865008788673">"Nolla neljä"</item>
+ <item msgid="3873924689207380586">"Nolla viisi"</item>
+ <item msgid="4849565597850069377">"Nolla kuusi"</item>
+ <item msgid="4404219424523572364">"Nolla seitsemän"</item>
+ <item msgid="8740481214764087329">"Nolla kahdeksan"</item>
+ <item msgid="1713216865806811237">"Nolla yhdeksän"</item>
+ <item msgid="3508406095411245038">"Kymmenen"</item>
+ <item msgid="7161996337755311711">"Yksitoista"</item>
+ <item msgid="4044549963329624197">"Kaksitoista"</item>
+ <item msgid="333373157917379088">"Kolmetoista"</item>
+ <item msgid="2631202907124819385">"Neljätoista"</item>
+ <item msgid="6472396076858033453">"Viisitoista"</item>
+ <item msgid="8656981856181581643">"Kuusitoista"</item>
+ <item msgid="7289026608562030619">"Seitsemäntoista"</item>
+ <item msgid="3881477602692646573">"Kahdeksantoista"</item>
+ <item msgid="3358129827772984226">"Yhdeksäntoista"</item>
+ <item msgid="3308575407402865807">"Kaksikymmentä"</item>
+ <item msgid="5346560955382229629">"Kaksikymmentä-\nyksi"</item>
+ <item msgid="226750304761473436">"Kaksikymmentä-\nkaksi"</item>
+ <item msgid="616811325336838734">"Kaksikymmentä-\nkolme"</item>
+ <item msgid="616346116869053440">"Kaksikymmentä-\nneljä"</item>
+ <item msgid="4642996410384042830">"Kaksikymmentä-\nviisi"</item>
+ <item msgid="7506092849993571465">"Kaksikymmentä-\nkuusi"</item>
+ <item msgid="1915078191101042031">"Kaksikymmentä-\nseitsemän"</item>
+ <item msgid="4292378641900520252">"28\n"</item>
+ <item msgid="5339513901773103696">"Kaksikymmentä-\nyhdeksän"</item>
+ <item msgid="3574673250891657607">"Kolmekymmentä"</item>
+ <item msgid="5796923836589110940">"Kolmekymmentä-\nyksi"</item>
+ <item msgid="5859323597571702052">"Kolmekymmentä-\nkaksi"</item>
+ <item msgid="5133326723148876507">"Kolmekymmentä-\nkolme"</item>
+ <item msgid="2693999494655663096">"Kolmekymmentä-\nneljä"</item>
+ <item msgid="3316754944962836197">"Kolmekymmentä-\nviisi"</item>
+ <item msgid="816891008836796723">"Kolmekymmentä-\nkuusi"</item>
+ <item msgid="9158890488666520078">"Kolmekymmentä-\nseitsemän"</item>
+ <item msgid="1894769703213894011">"Kolmekymmentä-\nkahdeksan"</item>
+ <item msgid="5638820345598572399">"Kolmekymmentä-\nyhdeksän"</item>
+ <item msgid="8838304023017895439">"Neljäkymmentä"</item>
+ <item msgid="1834742948932559597">"Neljäkymmentä-\nyksi"</item>
+ <item msgid="6573707308847773944">"Neljäkymmentä-\nkaksi"</item>
+ <item msgid="2450149950652678001">"Neljäkymmentä-\nkolme"</item>
+ <item msgid="2874667401318178036">"Neljäkymmentä-\nneljä"</item>
+ <item msgid="3391101532763048862">"Neljäkymmentä-\nviisi"</item>
+ <item msgid="1671489330863254362">"Neljäkymmentä-\nkuusi"</item>
+ <item msgid="5916017359554531038">"Neljäkymmentä-\nseitsemän"</item>
+ <item msgid="8205413177993059967">"Neljäkymmentä-\nkahdeksan"</item>
+ <item msgid="6607867415142171302">"Neljäkymmentä-\nyhdeksän"</item>
+ <item msgid="8358850748472089162">"Viisikymmentä"</item>
+ <item msgid="3551313125255080234">"Viisikymmentä-\nyksi"</item>
+ <item msgid="1559678130725716542">"Viisikymmentä-\nkaksi"</item>
+ <item msgid="431441994725492377">"Viisikymmentä-\nkolme"</item>
+ <item msgid="6345774640539623024">"Viisikymmentä-\nneljä"</item>
+ <item msgid="8018192990793931120">"Viisikymmentä-\nviisi"</item>
+ <item msgid="6187650843754604534">"Viisikymmentä-\nkuusi"</item>
+ <item msgid="8727240174015993259">"Viisikymmentä-\nseitsemän"</item>
+ <item msgid="848339003778952950">"Viisikymmentä-\nkahdeksan"</item>
+ <item msgid="5798985802835423618">"Viisikymmentä-\nyhdeksän"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml
index 348a3ff..8e92ffc 100644
--- a/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-fr-rCA/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">La carte SIM est maintenant désactivée. Entrez le code PUK pour continuer. Il vous reste <xliff:g id="_NUMBER_1">%d</xliff:g> tentative avant que votre carte SIM devienne définitivement inutilisable. Pour obtenir plus de détails, communiquez avec votre fournisseur de services.</item>
<item quantity="other">La carte SIM est maintenant désactivée. Entrez le code PUK pour continuer. Il vous reste <xliff:g id="_NUMBER_1">%d</xliff:g> tentatives avant que votre carte SIM devienne définitivement inutilisable. Pour obtenir plus de détails, communiquez avec votre fournisseur de services.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Il est"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"douze h."</item>
+ <item msgid="7389464214252023751">"Une h."</item>
+ <item msgid="8803180377002008046">"Deux h."</item>
+ <item msgid="8614897059944644719">"Trois h."</item>
+ <item msgid="2293058674782619556">"Quatre h."</item>
+ <item msgid="4815402358455041664">"Cinq h."</item>
+ <item msgid="3325754778509665687">"Six h."</item>
+ <item msgid="5805551341866280575">"Sept h."</item>
+ <item msgid="203334816668238610">"Huit h."</item>
+ <item msgid="4828052671464488923">"Neuf h."</item>
+ <item msgid="2233497913571137419">"Dix h."</item>
+ <item msgid="5621554266768657830">"Onze h."</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"heures"</item>
+ <item msgid="8837126587669001578">"une"</item>
+ <item msgid="4294343372940455660">"deux"</item>
+ <item msgid="7129166637707421536">"trois"</item>
+ <item msgid="7579404865008788673">"quatre"</item>
+ <item msgid="3873924689207380586">"cinq"</item>
+ <item msgid="4849565597850069377">"six"</item>
+ <item msgid="4404219424523572364">"sept"</item>
+ <item msgid="8740481214764087329">"huit"</item>
+ <item msgid="1713216865806811237">"neuf"</item>
+ <item msgid="3508406095411245038">"dix"</item>
+ <item msgid="7161996337755311711">"onze"</item>
+ <item msgid="4044549963329624197">"douze"</item>
+ <item msgid="333373157917379088">"treize"</item>
+ <item msgid="2631202907124819385">"quatorze"</item>
+ <item msgid="6472396076858033453">"quinze"</item>
+ <item msgid="8656981856181581643">"seize"</item>
+ <item msgid="7289026608562030619">"dix-sept"</item>
+ <item msgid="3881477602692646573">"dix-huit"</item>
+ <item msgid="3358129827772984226">"dix-neuf"</item>
+ <item msgid="3308575407402865807">"vingt"</item>
+ <item msgid="5346560955382229629">"vingt\n-et-un"</item>
+ <item msgid="226750304761473436">"vingt\n-deux"</item>
+ <item msgid="616811325336838734">"vingt\n-trois"</item>
+ <item msgid="616346116869053440">"vingt\n-quatre"</item>
+ <item msgid="4642996410384042830">"vingt\n-cinq"</item>
+ <item msgid="7506092849993571465">"vingt\n-six"</item>
+ <item msgid="1915078191101042031">"vingt\n-sept"</item>
+ <item msgid="4292378641900520252">"vingt\n-huit"</item>
+ <item msgid="5339513901773103696">"vingt\n-neuf"</item>
+ <item msgid="3574673250891657607">"trente"</item>
+ <item msgid="5796923836589110940">"trente\n-et-un"</item>
+ <item msgid="5859323597571702052">"trente\n-deux"</item>
+ <item msgid="5133326723148876507">"trente\n-trois"</item>
+ <item msgid="2693999494655663096">"trente\n-quatre"</item>
+ <item msgid="3316754944962836197">"trente\n-cinq"</item>
+ <item msgid="816891008836796723">"trente\n-six"</item>
+ <item msgid="9158890488666520078">"trente\n-sept"</item>
+ <item msgid="1894769703213894011">"trente\n-huit"</item>
+ <item msgid="5638820345598572399">"trente\n-neuf"</item>
+ <item msgid="8838304023017895439">"quarante"</item>
+ <item msgid="1834742948932559597">"quarante\n-et-un"</item>
+ <item msgid="6573707308847773944">"quarante\n-deux"</item>
+ <item msgid="2450149950652678001">"quarante\n-trois"</item>
+ <item msgid="2874667401318178036">"quarante\n-quatre"</item>
+ <item msgid="3391101532763048862">"quarante\n-cinq"</item>
+ <item msgid="1671489330863254362">"quarante\n-six"</item>
+ <item msgid="5916017359554531038">"quarante\n-sept"</item>
+ <item msgid="8205413177993059967">"quarante\n-huit"</item>
+ <item msgid="6607867415142171302">"quarante\n-neuf"</item>
+ <item msgid="8358850748472089162">"cinquante"</item>
+ <item msgid="3551313125255080234">"cinquante\n-et-un"</item>
+ <item msgid="1559678130725716542">"cinquante\n-deux"</item>
+ <item msgid="431441994725492377">"cinquante\n-trois"</item>
+ <item msgid="6345774640539623024">"cinquante\n-quatre"</item>
+ <item msgid="8018192990793931120">"cinquante\n-cinq"</item>
+ <item msgid="6187650843754604534">"cinquante\n-six"</item>
+ <item msgid="8727240174015993259">"cinquante\n-sept"</item>
+ <item msgid="848339003778952950">"cinquante\n-huit"</item>
+ <item msgid="5798985802835423618">"cinquante\n-neuf"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-fr/strings.xml b/packages/SystemUI/res-keyguard/values-fr/strings.xml
index e986cee..cde5e68 100644
--- a/packages/SystemUI/res-keyguard/values-fr/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-fr/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">La carte SIM est maintenant désactivée. Saisissez le code PUK pour continuer. Il vous reste <xliff:g id="_NUMBER_1">%d</xliff:g> tentative avant que votre carte SIM ne devienne définitivement inutilisable. Pour de plus amples informations, veuillez contacter votre opérateur.</item>
<item quantity="other">La carte SIM est maintenant désactivée. Saisissez le code PUK pour continuer. Il vous reste <xliff:g id="_NUMBER_1">%d</xliff:g> tentatives avant que votre carte SIM ne devienne définitivement inutilisable. Pour de plus amples informations, veuillez contacter votre opérateur.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Il est"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"douze heures"</item>
+ <item msgid="7389464214252023751">"une heure"</item>
+ <item msgid="8803180377002008046">"deux heures"</item>
+ <item msgid="8614897059944644719">"trois heures"</item>
+ <item msgid="2293058674782619556">"quatre heures"</item>
+ <item msgid="4815402358455041664">"cinq heures"</item>
+ <item msgid="3325754778509665687">"six heures"</item>
+ <item msgid="5805551341866280575">"sept heures"</item>
+ <item msgid="203334816668238610">"huit heures"</item>
+ <item msgid="4828052671464488923">"Neuf"</item>
+ <item msgid="2233497913571137419">"dix heures"</item>
+ <item msgid="5621554266768657830">"onze heures"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985"></item>
+ <item msgid="8837126587669001578">"une"</item>
+ <item msgid="4294343372940455660">"deux"</item>
+ <item msgid="7129166637707421536">"trois"</item>
+ <item msgid="7579404865008788673">"quatre"</item>
+ <item msgid="3873924689207380586">"cinq"</item>
+ <item msgid="4849565597850069377">"six"</item>
+ <item msgid="4404219424523572364">"sept"</item>
+ <item msgid="8740481214764087329">"huit"</item>
+ <item msgid="1713216865806811237">"neuf"</item>
+ <item msgid="3508406095411245038">"dix"</item>
+ <item msgid="7161996337755311711">"onze"</item>
+ <item msgid="4044549963329624197">"douze"</item>
+ <item msgid="333373157917379088">"treize"</item>
+ <item msgid="2631202907124819385">"quatorze"</item>
+ <item msgid="6472396076858033453">"quinze"</item>
+ <item msgid="8656981856181581643">"seize"</item>
+ <item msgid="7289026608562030619">"dix-sept"</item>
+ <item msgid="3881477602692646573">"dix-huit"</item>
+ <item msgid="3358129827772984226">"dix-neuf"</item>
+ <item msgid="3308575407402865807">"vingt"</item>
+ <item msgid="5346560955382229629">"vingt\net un"</item>
+ <item msgid="226750304761473436">"vingt-\ndeux"</item>
+ <item msgid="616811325336838734">"vingt-\ntrois"</item>
+ <item msgid="616346116869053440">"vingt-\nquatre"</item>
+ <item msgid="4642996410384042830">"vingt-\ncinq"</item>
+ <item msgid="7506092849993571465">"vingt-\nsix"</item>
+ <item msgid="1915078191101042031">"vingt-\nsept"</item>
+ <item msgid="4292378641900520252">"vingt-\nhuit"</item>
+ <item msgid="5339513901773103696">"vingt-\nneuf"</item>
+ <item msgid="3574673250891657607">"trente"</item>
+ <item msgid="5796923836589110940">"trente\net un"</item>
+ <item msgid="5859323597571702052">"trente-\ndeux"</item>
+ <item msgid="5133326723148876507">"trente-\ntrois"</item>
+ <item msgid="2693999494655663096">"trente-\nquatre"</item>
+ <item msgid="3316754944962836197">"trente-\ncinq"</item>
+ <item msgid="816891008836796723">"trente-\nsix"</item>
+ <item msgid="9158890488666520078">"trente-\nsept"</item>
+ <item msgid="1894769703213894011">"trente-\nhuit"</item>
+ <item msgid="5638820345598572399">"trente-\nneuf"</item>
+ <item msgid="8838304023017895439">"quarante"</item>
+ <item msgid="1834742948932559597">"quarante\net un"</item>
+ <item msgid="6573707308847773944">"quarante-\ndeux"</item>
+ <item msgid="2450149950652678001">"quarante-\ntrois"</item>
+ <item msgid="2874667401318178036">"quarante-\nquatre"</item>
+ <item msgid="3391101532763048862">"quarante-\ncinq"</item>
+ <item msgid="1671489330863254362">"quarante-\nsix"</item>
+ <item msgid="5916017359554531038">"quarante-\nsept"</item>
+ <item msgid="8205413177993059967">"quarante-\nhuit"</item>
+ <item msgid="6607867415142171302">"quarante-\nneuf"</item>
+ <item msgid="8358850748472089162">"cinquante"</item>
+ <item msgid="3551313125255080234">"cinquante\net un"</item>
+ <item msgid="1559678130725716542">"cinquante-\ndeux"</item>
+ <item msgid="431441994725492377">"cinquante-\ntrois"</item>
+ <item msgid="6345774640539623024">"cinquante-\nquatre"</item>
+ <item msgid="8018192990793931120">"cinquante-\ncinq"</item>
+ <item msgid="6187650843754604534">"cinquante-\nsix"</item>
+ <item msgid="8727240174015993259">"cinquante-\nsept"</item>
+ <item msgid="848339003778952950">"cinquante-\nhuit"</item>
+ <item msgid="5798985802835423618">"cinquante-\nneuf"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-gl/strings.xml b/packages/SystemUI/res-keyguard/values-gl/strings.xml
index 631ab6a..6d85cdb 100644
--- a/packages/SystemUI/res-keyguard/values-gl/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-gl/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">A SIM está desactivada. Introduce o código PUK para continuar. Quédanche <xliff:g id="_NUMBER_1">%d</xliff:g> intentos antes de que a SIM quede inutilizable para sempre. Contacta co operador para obter información.</item>
<item quantity="one">A SIM está desactivada. Introduce o código PUK para continuar. Quédache <xliff:g id="_NUMBER_0">%d</xliff:g> intento antes de que a SIM quede inutilizable para sempre. Contacta co operador para obter información.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Hora:"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Doce"</item>
+ <item msgid="7389464214252023751">"Unha"</item>
+ <item msgid="8803180377002008046">"Dúas"</item>
+ <item msgid="8614897059944644719">"Tres"</item>
+ <item msgid="2293058674782619556">"Catro"</item>
+ <item msgid="4815402358455041664">"Cinco"</item>
+ <item msgid="3325754778509665687">"Seis"</item>
+ <item msgid="5805551341866280575">"Sete"</item>
+ <item msgid="203334816668238610">"Oito"</item>
+ <item msgid="4828052671464488923">"Nove"</item>
+ <item msgid="2233497913571137419">"Dez"</item>
+ <item msgid="5621554266768657830">"Once"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"En punto"</item>
+ <item msgid="8837126587669001578">"E un"</item>
+ <item msgid="4294343372940455660">"E dous"</item>
+ <item msgid="7129166637707421536">"E tres"</item>
+ <item msgid="7579404865008788673">"E catro"</item>
+ <item msgid="3873924689207380586">"E cinco"</item>
+ <item msgid="4849565597850069377">"E seis"</item>
+ <item msgid="4404219424523572364">"E sete"</item>
+ <item msgid="8740481214764087329">"E oito"</item>
+ <item msgid="1713216865806811237">"E nove"</item>
+ <item msgid="3508406095411245038">"Dez"</item>
+ <item msgid="7161996337755311711">"Once"</item>
+ <item msgid="4044549963329624197">"Doce"</item>
+ <item msgid="333373157917379088">"Trece"</item>
+ <item msgid="2631202907124819385">"Catorce"</item>
+ <item msgid="6472396076858033453">"Quince"</item>
+ <item msgid="8656981856181581643">"Dezaseis"</item>
+ <item msgid="7289026608562030619">"Dezasete"</item>
+ <item msgid="3881477602692646573">"Dezaoito"</item>
+ <item msgid="3358129827772984226">"Dezanove"</item>
+ <item msgid="3308575407402865807">"Vinte"</item>
+ <item msgid="5346560955382229629">"Vinte\ne un"</item>
+ <item msgid="226750304761473436">"Vinte\ne dous"</item>
+ <item msgid="616811325336838734">"Vinte\ne tres"</item>
+ <item msgid="616346116869053440">"Vinte\ne catro"</item>
+ <item msgid="4642996410384042830">"Vinte\ne cinco"</item>
+ <item msgid="7506092849993571465">"Vinte\ne seis"</item>
+ <item msgid="1915078191101042031">"Vinte\ne sete"</item>
+ <item msgid="4292378641900520252">"Vinte\ne oito"</item>
+ <item msgid="5339513901773103696">"Vinte\ne nove"</item>
+ <item msgid="3574673250891657607">"Trinta"</item>
+ <item msgid="5796923836589110940">"Trinta\ne un"</item>
+ <item msgid="5859323597571702052">"Trinta\ne dous"</item>
+ <item msgid="5133326723148876507">"Trinta\ne tres"</item>
+ <item msgid="2693999494655663096">"Trinta\ne catro"</item>
+ <item msgid="3316754944962836197">"Trinta\ne cinco"</item>
+ <item msgid="816891008836796723">"Trinta\ne seis"</item>
+ <item msgid="9158890488666520078">"Trinta\ne sete"</item>
+ <item msgid="1894769703213894011">"Trinta\ne oito"</item>
+ <item msgid="5638820345598572399">"Trinta\ne nove"</item>
+ <item msgid="8838304023017895439">"Corenta"</item>
+ <item msgid="1834742948932559597">"Corenta\ne un"</item>
+ <item msgid="6573707308847773944">"Corenta\ne dous"</item>
+ <item msgid="2450149950652678001">"Corenta\ne tres"</item>
+ <item msgid="2874667401318178036">"Corenta\ne catro"</item>
+ <item msgid="3391101532763048862">"Corenta\ne cinco"</item>
+ <item msgid="1671489330863254362">"Corenta\ne seis"</item>
+ <item msgid="5916017359554531038">"Corenta\ne sete"</item>
+ <item msgid="8205413177993059967">"Corenta\ne oito"</item>
+ <item msgid="6607867415142171302">"Corenta\ne nove"</item>
+ <item msgid="8358850748472089162">"Cincuenta"</item>
+ <item msgid="3551313125255080234">"Cincuenta\ne un"</item>
+ <item msgid="1559678130725716542">"Cincuenta\ne dous"</item>
+ <item msgid="431441994725492377">"Cincuenta\ne tres"</item>
+ <item msgid="6345774640539623024">"Cincuenta\ne catro"</item>
+ <item msgid="8018192990793931120">"Cincuenta\ne cinco"</item>
+ <item msgid="6187650843754604534">"Cincuenta\ne seis"</item>
+ <item msgid="8727240174015993259">"Cincuenta\ne sete"</item>
+ <item msgid="848339003778952950">"Cincuenta\ne oito"</item>
+ <item msgid="5798985802835423618">"Cincuenta\ne nove"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-gu/strings.xml b/packages/SystemUI/res-keyguard/values-gu/strings.xml
index 520f098..d9fdf03 100644
--- a/packages/SystemUI/res-keyguard/values-gu/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-gu/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">સિમ હવે બંધ કરેલ છે. ચાલુ રાખવા માટે PUK કોડ દાખલ કરો. સિમ કાયમીરૂપે બિનઉપયોગી બની જાય એ પહેલાં તમારી પાસે <xliff:g id="_NUMBER_1">%d</xliff:g> પ્રયાસ બાકી છે. વિગતો માટે કૅરિઅરનો સંપર્ક કરો.</item>
<item quantity="other">સિમ હવે બંધ કરેલ છે. ચાલુ રાખવા માટે PUK કોડ દાખલ કરો. સિમ કાયમીરૂપે બિનઉપયોગી બની જાય એ પહેલાં તમારી પાસે <xliff:g id="_NUMBER_1">%d</xliff:g> પ્રયાસો બાકી છે. વિગતો માટે કૅરિઅરનો સંપર્ક કરો.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"સમય છે"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"બાર"</item>
+ <item msgid="7389464214252023751">"એક"</item>
+ <item msgid="8803180377002008046">"બે"</item>
+ <item msgid="8614897059944644719">"ત્રણ"</item>
+ <item msgid="2293058674782619556">"ચાર"</item>
+ <item msgid="4815402358455041664">"પાંચ"</item>
+ <item msgid="3325754778509665687">"છ"</item>
+ <item msgid="5805551341866280575">"સાત"</item>
+ <item msgid="203334816668238610">"આઠ"</item>
+ <item msgid="4828052671464488923">"નવ"</item>
+ <item msgid="2233497913571137419">"દસ"</item>
+ <item msgid="5621554266768657830">"અગિયાર"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"વાગ્યે"</item>
+ <item msgid="8837126587669001578">"એક"</item>
+ <item msgid="4294343372940455660">"બે"</item>
+ <item msgid="7129166637707421536">"ત્રણ"</item>
+ <item msgid="7579404865008788673">"ચાર"</item>
+ <item msgid="3873924689207380586">"પાંચ"</item>
+ <item msgid="4849565597850069377">"છ"</item>
+ <item msgid="4404219424523572364">"સાત"</item>
+ <item msgid="8740481214764087329">"આઠ"</item>
+ <item msgid="1713216865806811237">"નવ"</item>
+ <item msgid="3508406095411245038">"દસ"</item>
+ <item msgid="7161996337755311711">"અગિયાર"</item>
+ <item msgid="4044549963329624197">"બાર"</item>
+ <item msgid="333373157917379088">"તેર"</item>
+ <item msgid="2631202907124819385">"ચૌદ"</item>
+ <item msgid="6472396076858033453">"પંદર"</item>
+ <item msgid="8656981856181581643">"સોળ"</item>
+ <item msgid="7289026608562030619">"સત્તર"</item>
+ <item msgid="3881477602692646573">"અઢાર"</item>
+ <item msgid="3358129827772984226">"ઓગણીસ"</item>
+ <item msgid="3308575407402865807">"વીસ"</item>
+ <item msgid="5346560955382229629">"એકવીસ\n"</item>
+ <item msgid="226750304761473436">"બાવીસ\n"</item>
+ <item msgid="616811325336838734">"ત્રેવીસ\n"</item>
+ <item msgid="616346116869053440">"ચોવીસ\n"</item>
+ <item msgid="4642996410384042830">"પચ્ચીસ\n"</item>
+ <item msgid="7506092849993571465">"છવ્વીસ\n"</item>
+ <item msgid="1915078191101042031">"સત્યાવીસ\n"</item>
+ <item msgid="4292378641900520252">"અઠ્ઠયાવીસ\n"</item>
+ <item msgid="5339513901773103696">"ઓગણત્રીસ\n"</item>
+ <item msgid="3574673250891657607">"ત્રીસ"</item>
+ <item msgid="5796923836589110940">"એકત્રીસ\n"</item>
+ <item msgid="5859323597571702052">"બત્રીસ\n"</item>
+ <item msgid="5133326723148876507">"તેત્રીસ\n"</item>
+ <item msgid="2693999494655663096">"ચોત્રીસ\n"</item>
+ <item msgid="3316754944962836197">"પાંત્રીસ\n"</item>
+ <item msgid="816891008836796723">"છત્રીસ\n"</item>
+ <item msgid="9158890488666520078">"તેત્રીસ\n"</item>
+ <item msgid="1894769703213894011">"આડત્રીસ\n"</item>
+ <item msgid="5638820345598572399">"ઓગણચાલીસ\n"</item>
+ <item msgid="8838304023017895439">"ચાલીસ"</item>
+ <item msgid="1834742948932559597">"એકતાળીસ\n"</item>
+ <item msgid="6573707308847773944">"બેતાલીસ\n"</item>
+ <item msgid="2450149950652678001">"તેતાલીસ\n"</item>
+ <item msgid="2874667401318178036">"ચુમાલીસ\n"</item>
+ <item msgid="3391101532763048862">"પિસ્તાળીસ\n"</item>
+ <item msgid="1671489330863254362">"છેંતાલીસ\n"</item>
+ <item msgid="5916017359554531038">"સુડતાળીસ\n"</item>
+ <item msgid="8205413177993059967">"અડતાલીસ\n"</item>
+ <item msgid="6607867415142171302">"ઓગણપચાસ\n"</item>
+ <item msgid="8358850748472089162">"પચાસ"</item>
+ <item msgid="3551313125255080234">"એકાવન\n"</item>
+ <item msgid="1559678130725716542">"બાવન\n"</item>
+ <item msgid="431441994725492377">"ત્રેપન\n"</item>
+ <item msgid="6345774640539623024">"ચોપન\n"</item>
+ <item msgid="8018192990793931120">"પંચાવન\n"</item>
+ <item msgid="6187650843754604534">"છપ્પન\n"</item>
+ <item msgid="8727240174015993259">"સત્તાવન\n"</item>
+ <item msgid="848339003778952950">"અઠ્ઠાવન\n"</item>
+ <item msgid="5798985802835423618">"ઓગણસાઠ\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-hi/strings.xml b/packages/SystemUI/res-keyguard/values-hi/strings.xml
index 9f189e8..b004cde 100644
--- a/packages/SystemUI/res-keyguard/values-hi/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-hi/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">सिम बंद कर दिया गया है. जारी रखने के लिए PUK कोड डालें. आपके पास <xliff:g id="_NUMBER_1">%d</xliff:g> मौके बचे हैं, उसके बाद, सिम हमेशा के लिए काम करना बंद कर देगा. जानकारी के लिए, मोबाइल और इंटरनेट सेवा देने वाली कंपनी से संपर्क करें.</item>
<item quantity="other">सिम बंद कर दिया गया है. जारी रखने के लिए PUK कोड डालें. आपके पास <xliff:g id="_NUMBER_1">%d</xliff:g> मौके बचे हैं, उसके बाद, सिम हमेशा के लिए काम करना बंद कर देगा. जानकारी के लिए, मोबाइल और इंटरनेट सेवा देने वाली कंपनी से संपर्क करें.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"यह"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"बारह"</item>
+ <item msgid="7389464214252023751">"एक"</item>
+ <item msgid="8803180377002008046">"दो"</item>
+ <item msgid="8614897059944644719">"तीन"</item>
+ <item msgid="2293058674782619556">"चार"</item>
+ <item msgid="4815402358455041664">"पाँच"</item>
+ <item msgid="3325754778509665687">"छह"</item>
+ <item msgid="5805551341866280575">"सात"</item>
+ <item msgid="203334816668238610">"आठ"</item>
+ <item msgid="4828052671464488923">"नौ"</item>
+ <item msgid="2233497913571137419">"दस"</item>
+ <item msgid="5621554266768657830">"ग्यारह"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"बजे"</item>
+ <item msgid="8837126587669001578">"एक"</item>
+ <item msgid="4294343372940455660">"दो"</item>
+ <item msgid="7129166637707421536">"तीन"</item>
+ <item msgid="7579404865008788673">"चार"</item>
+ <item msgid="3873924689207380586">"पाँच"</item>
+ <item msgid="4849565597850069377">"छह"</item>
+ <item msgid="4404219424523572364">"सात"</item>
+ <item msgid="8740481214764087329">"आठ"</item>
+ <item msgid="1713216865806811237">"नौ"</item>
+ <item msgid="3508406095411245038">"दस"</item>
+ <item msgid="7161996337755311711">"ग्यारह"</item>
+ <item msgid="4044549963329624197">"बारह"</item>
+ <item msgid="333373157917379088">"तेरह"</item>
+ <item msgid="2631202907124819385">"चौदह"</item>
+ <item msgid="6472396076858033453">"पंद्रह"</item>
+ <item msgid="8656981856181581643">"सोलह"</item>
+ <item msgid="7289026608562030619">"सत्रह"</item>
+ <item msgid="3881477602692646573">"अठारह"</item>
+ <item msgid="3358129827772984226">"उन्नीस"</item>
+ <item msgid="3308575407402865807">"बीस"</item>
+ <item msgid="5346560955382229629">"इक्कीस\n"</item>
+ <item msgid="226750304761473436">"बाईस\n"</item>
+ <item msgid="616811325336838734">"तेईस\n"</item>
+ <item msgid="616346116869053440">"चौबीस\n"</item>
+ <item msgid="4642996410384042830">"पच्चीस\n"</item>
+ <item msgid="7506092849993571465">"छब्बीस\n"</item>
+ <item msgid="1915078191101042031">"सत्ताईस\n"</item>
+ <item msgid="4292378641900520252">"अट्ठाइस\n"</item>
+ <item msgid="5339513901773103696">"उनतीस\n"</item>
+ <item msgid="3574673250891657607">"तीस"</item>
+ <item msgid="5796923836589110940">"इकत्तीस\n"</item>
+ <item msgid="5859323597571702052">"बत्तीस\n"</item>
+ <item msgid="5133326723148876507">"तैंतीस\n"</item>
+ <item msgid="2693999494655663096">"चौंतीस\n"</item>
+ <item msgid="3316754944962836197">"पैंतीस\n"</item>
+ <item msgid="816891008836796723">"छत्तीस\n"</item>
+ <item msgid="9158890488666520078">"सैंतीस\n"</item>
+ <item msgid="1894769703213894011">"अड़तीस\n"</item>
+ <item msgid="5638820345598572399">"उनतालीस\n"</item>
+ <item msgid="8838304023017895439">"चालीस"</item>
+ <item msgid="1834742948932559597">"इकतालीस\n"</item>
+ <item msgid="6573707308847773944">"बयालीस\n"</item>
+ <item msgid="2450149950652678001">"तैंतालीस\n"</item>
+ <item msgid="2874667401318178036">"चवालीस\n"</item>
+ <item msgid="3391101532763048862">"पैंतालीस\n"</item>
+ <item msgid="1671489330863254362">"छियालीस\n"</item>
+ <item msgid="5916017359554531038">"सैंतालीस\n"</item>
+ <item msgid="8205413177993059967">"अड़तालीस\n"</item>
+ <item msgid="6607867415142171302">"उनचास\n"</item>
+ <item msgid="8358850748472089162">"पचास"</item>
+ <item msgid="3551313125255080234">"इक्यावन\n"</item>
+ <item msgid="1559678130725716542">"बावन\n"</item>
+ <item msgid="431441994725492377">"तिरेपन\n"</item>
+ <item msgid="6345774640539623024">"चौवन\n"</item>
+ <item msgid="8018192990793931120">"पचपन\n"</item>
+ <item msgid="6187650843754604534">"छप्पन\n"</item>
+ <item msgid="8727240174015993259">"सत्तावन\n"</item>
+ <item msgid="848339003778952950">"अट्ठावन\n"</item>
+ <item msgid="5798985802835423618">"उनसठ\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-hr/strings.xml b/packages/SystemUI/res-keyguard/values-hr/strings.xml
index 5c84ecc..c99b646 100644
--- a/packages/SystemUI/res-keyguard/values-hr/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-hr/strings.xml
@@ -158,78 +158,81 @@
<item quantity="few">SIM je sada onemogućen. Unesite PUK kôd da biste nastavili. Imate još <xliff:g id="_NUMBER_1">%d</xliff:g> pokušaja prije nego što SIM kartica postane trajno neupotrebljiva. Više informacija zatražite od mobilnog operatera.</item>
<item quantity="other">SIM je sada onemogućen. Unesite PUK kôd da biste nastavili. Imate još <xliff:g id="_NUMBER_1">%d</xliff:g> pokušaja prije nego što SIM kartica postane trajno neupotrebljiva. Više informacija zatražite od mobilnog operatera.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Sada je"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Dvanaest"</item>
+ <item msgid="7389464214252023751">"Jedan"</item>
+ <item msgid="8803180377002008046">"Dva"</item>
+ <item msgid="8614897059944644719">"Tri"</item>
+ <item msgid="2293058674782619556">"Četiri"</item>
+ <item msgid="4815402358455041664">"Pet"</item>
+ <item msgid="3325754778509665687">"Šest"</item>
+ <item msgid="5805551341866280575">"Sedam"</item>
+ <item msgid="203334816668238610">"Osam"</item>
+ <item msgid="4828052671464488923">"Devet"</item>
+ <item msgid="2233497913571137419">"Deset"</item>
+ <item msgid="5621554266768657830">"Jedanaest"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985"></item>
+ <item msgid="8837126587669001578">"Jedan"</item>
+ <item msgid="4294343372940455660">"Dva"</item>
+ <item msgid="7129166637707421536">"Tri"</item>
+ <item msgid="7579404865008788673">"Četiri"</item>
+ <item msgid="3873924689207380586">"Pet"</item>
+ <item msgid="4849565597850069377">"Šest"</item>
+ <item msgid="4404219424523572364">"Sedam"</item>
+ <item msgid="8740481214764087329">"Osam"</item>
+ <item msgid="1713216865806811237">"Devet"</item>
+ <item msgid="3508406095411245038">"Deset"</item>
+ <item msgid="7161996337755311711">"Jedanaest"</item>
+ <item msgid="4044549963329624197">"Dvanaest"</item>
+ <item msgid="333373157917379088">"Trinaest"</item>
+ <item msgid="2631202907124819385">"Četrnaest"</item>
+ <item msgid="6472396076858033453">"Petnaest"</item>
+ <item msgid="8656981856181581643">"Šesnaest"</item>
+ <item msgid="7289026608562030619">"Sedamnaest"</item>
+ <item msgid="3881477602692646573">"Osamnaest"</item>
+ <item msgid="3358129827772984226">"Devetnaest"</item>
+ <item msgid="3308575407402865807">"Dvadeset"</item>
+ <item msgid="5346560955382229629">"Dvadeset\njedan"</item>
+ <item msgid="226750304761473436">"Dvadeset\ndva"</item>
+ <item msgid="616811325336838734">"Dvadeset\ntri"</item>
+ <item msgid="616346116869053440">"Dvadeset\nčetiri"</item>
+ <item msgid="4642996410384042830">"Dvadeset\npet"</item>
+ <item msgid="7506092849993571465">"Dvadeset\nšest"</item>
+ <item msgid="1915078191101042031">"Dvadeset\nsedam"</item>
+ <item msgid="4292378641900520252">"Dvadeset\nosam"</item>
+ <item msgid="5339513901773103696">"Dvadeset\ndevet"</item>
+ <item msgid="3574673250891657607">"Trideset"</item>
+ <item msgid="5796923836589110940">"Trideset\njedan"</item>
+ <item msgid="5859323597571702052">"Trideset\ndva"</item>
+ <item msgid="5133326723148876507">"Trideset\ntri"</item>
+ <item msgid="2693999494655663096">"Trideset\nčetiri"</item>
+ <item msgid="3316754944962836197">"Trideset\npet"</item>
+ <item msgid="816891008836796723">"Trideset\nšest"</item>
+ <item msgid="9158890488666520078">"Trideset\nsedam"</item>
+ <item msgid="1894769703213894011">"Trideset\nosam"</item>
+ <item msgid="5638820345598572399">"Trideset\ndevet"</item>
+ <item msgid="8838304023017895439">"Četrdeset"</item>
+ <item msgid="1834742948932559597">"Četrdeset\njedan"</item>
+ <item msgid="6573707308847773944">"Četrdeset\ndva"</item>
+ <item msgid="2450149950652678001">"Četrdeset\ntri"</item>
+ <item msgid="2874667401318178036">"Četrdeset\nčetiri"</item>
+ <item msgid="3391101532763048862">"Četrdeset\npet"</item>
+ <item msgid="1671489330863254362">"Četrdeset\nšest"</item>
+ <item msgid="5916017359554531038">"Četrdeset\nsedam"</item>
+ <item msgid="8205413177993059967">"Četrdeset\nosam"</item>
+ <item msgid="6607867415142171302">"Četrdeset\ndevet"</item>
+ <item msgid="8358850748472089162">"Pedeset"</item>
+ <item msgid="3551313125255080234">"Pedeset\njedan"</item>
+ <item msgid="1559678130725716542">"Pedeset\ndva"</item>
+ <item msgid="431441994725492377">"Pedeset\ntri"</item>
+ <item msgid="6345774640539623024">"Četrdeset\nčetiri"</item>
+ <item msgid="8018192990793931120">"Pedeset\npet"</item>
+ <item msgid="6187650843754604534">"Pedeset\nšest"</item>
+ <item msgid="8727240174015993259">"Pedeset\nsedam"</item>
+ <item msgid="848339003778952950">"Pedeset\nosam"</item>
+ <item msgid="5798985802835423618">"Pedeset\ndevet"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-hu/strings.xml b/packages/SystemUI/res-keyguard/values-hu/strings.xml
index e4e9fa6..4eb8bc8 100644
--- a/packages/SystemUI/res-keyguard/values-hu/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-hu/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">A SIM-kártya le van tiltva. A folytatáshoz adja meg a PUK-kódot. Még <xliff:g id="_NUMBER_1">%d</xliff:g> próbálkozása van, mielőtt végleg használhatatlanná válik a SIM-kártya. További információért forduljon a szolgáltatóhoz.</item>
<item quantity="one">A SIM-kártya le van tiltva. A folytatáshoz adja meg a PUK-kódot. Még <xliff:g id="_NUMBER_0">%d</xliff:g> próbálkozása van, mielőtt végleg használhatatlanná válik a SIM-kártya. További információért forduljon a szolgáltatóhoz.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Az idő:"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Tizenkettő"</item>
+ <item msgid="7389464214252023751">"Egy"</item>
+ <item msgid="8803180377002008046">"Kettő"</item>
+ <item msgid="8614897059944644719">"Három"</item>
+ <item msgid="2293058674782619556">"Négy"</item>
+ <item msgid="4815402358455041664">"Öt"</item>
+ <item msgid="3325754778509665687">"Hat"</item>
+ <item msgid="5805551341866280575">"Hét"</item>
+ <item msgid="203334816668238610">"Nyolc"</item>
+ <item msgid="4828052671464488923">"Kilenc"</item>
+ <item msgid="2233497913571137419">"Tíz"</item>
+ <item msgid="5621554266768657830">"Tizenegy"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"óra"</item>
+ <item msgid="8837126587669001578">"Egy"</item>
+ <item msgid="4294343372940455660">"Kettő"</item>
+ <item msgid="7129166637707421536">"Három"</item>
+ <item msgid="7579404865008788673">"Négy"</item>
+ <item msgid="3873924689207380586">"Öt"</item>
+ <item msgid="4849565597850069377">"Hat"</item>
+ <item msgid="4404219424523572364">"Hét"</item>
+ <item msgid="8740481214764087329">"Nyolc"</item>
+ <item msgid="1713216865806811237">"Kilenc"</item>
+ <item msgid="3508406095411245038">"Tíz"</item>
+ <item msgid="7161996337755311711">"Tizenegy"</item>
+ <item msgid="4044549963329624197">"Tizenkettő"</item>
+ <item msgid="333373157917379088">"Tizenhárom"</item>
+ <item msgid="2631202907124819385">"Tizennégy"</item>
+ <item msgid="6472396076858033453">"Tizenöt"</item>
+ <item msgid="8656981856181581643">"Tizenhat"</item>
+ <item msgid="7289026608562030619">"Tizenhét"</item>
+ <item msgid="3881477602692646573">"Tizennyolc"</item>
+ <item msgid="3358129827772984226">"Tizenkilenc"</item>
+ <item msgid="3308575407402865807">"Húsz"</item>
+ <item msgid="5346560955382229629">"Huszon\negy"</item>
+ <item msgid="226750304761473436">"Huszon\nkettő"</item>
+ <item msgid="616811325336838734">"Huszon\nhárom"</item>
+ <item msgid="616346116869053440">"Huszon\nnégy"</item>
+ <item msgid="4642996410384042830">"Huszon\nöt"</item>
+ <item msgid="7506092849993571465">"Huszon\nhat"</item>
+ <item msgid="1915078191101042031">"Huszon\nhét"</item>
+ <item msgid="4292378641900520252">"Huszon\nnyolc"</item>
+ <item msgid="5339513901773103696">"Huszon\nkilenc"</item>
+ <item msgid="3574673250891657607">"Harminc"</item>
+ <item msgid="5796923836589110940">"Harminc\negy"</item>
+ <item msgid="5859323597571702052">"Harminc\nkettő"</item>
+ <item msgid="5133326723148876507">"Harminc\nhárom"</item>
+ <item msgid="2693999494655663096">"Harminc\nnégy"</item>
+ <item msgid="3316754944962836197">"Harminc\nöt"</item>
+ <item msgid="816891008836796723">"Harminc\nhat"</item>
+ <item msgid="9158890488666520078">"Harminc\nhét"</item>
+ <item msgid="1894769703213894011">"Harminc\nnyolc"</item>
+ <item msgid="5638820345598572399">"Harminc\nkilenc"</item>
+ <item msgid="8838304023017895439">"Negyven"</item>
+ <item msgid="1834742948932559597">"Negyven\negy"</item>
+ <item msgid="6573707308847773944">"Negyven\nkettő"</item>
+ <item msgid="2450149950652678001">"Negyven\nhárom"</item>
+ <item msgid="2874667401318178036">"Negyven\nnégy"</item>
+ <item msgid="3391101532763048862">"Negyven\nöt"</item>
+ <item msgid="1671489330863254362">"Negyven\nhat"</item>
+ <item msgid="5916017359554531038">"Negyven\nhét"</item>
+ <item msgid="8205413177993059967">"Negyven\nnyolc"</item>
+ <item msgid="6607867415142171302">"Negyven\nkilenc"</item>
+ <item msgid="8358850748472089162">"Ötven"</item>
+ <item msgid="3551313125255080234">"Ötven\negy"</item>
+ <item msgid="1559678130725716542">"Ötven\nkettő"</item>
+ <item msgid="431441994725492377">"Ötven\nhárom"</item>
+ <item msgid="6345774640539623024">"Ötven\nnégy"</item>
+ <item msgid="8018192990793931120">"Ötven\nöt"</item>
+ <item msgid="6187650843754604534">"Ötven\nhat"</item>
+ <item msgid="8727240174015993259">"Ötven\nhét"</item>
+ <item msgid="848339003778952950">"Ötven\nnyolc"</item>
+ <item msgid="5798985802835423618">"Ötven\nkilenc"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-hy/strings.xml b/packages/SystemUI/res-keyguard/values-hy/strings.xml
index c237828..5d9a2c0 100644
--- a/packages/SystemUI/res-keyguard/values-hy/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-hy/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">SIM քարտն անջատված է: Շարունակելու համար մուտքագրեք PUK կոդը: Մնացել է <xliff:g id="_NUMBER_1">%d</xliff:g> փորձ, որից հետո SIM քարտն այլևս հնարավոր չի լինի օգտագործել: Մանրամասների համար դիմեք օպերատորին:</item>
<item quantity="other">SIM քարտն անջատված է: Շարունակելու համար մուտքագրեք PUK կոդը: Մնացել է <xliff:g id="_NUMBER_1">%d</xliff:g> փորձ, որից հետո SIM քարտն այլևս հնարավոր չի լինի օգտագործել: Մանրամասների համար դիմեք օպերատորին:</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Ժամն է՝"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"տասներկու"</item>
+ <item msgid="7389464214252023751">"մեկ"</item>
+ <item msgid="8803180377002008046">"երկու"</item>
+ <item msgid="8614897059944644719">"երեք"</item>
+ <item msgid="2293058674782619556">"չորս"</item>
+ <item msgid="4815402358455041664">"հինգ"</item>
+ <item msgid="3325754778509665687">"վեց"</item>
+ <item msgid="5805551341866280575">"յոթ"</item>
+ <item msgid="203334816668238610">"ութ"</item>
+ <item msgid="4828052671464488923">"ինը"</item>
+ <item msgid="2233497913571137419">"տասը"</item>
+ <item msgid="5621554266768657830">"տասնմեկ"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"ուղիղ"</item>
+ <item msgid="8837126587669001578">"զրո մեկ"</item>
+ <item msgid="4294343372940455660">"զրո երկու"</item>
+ <item msgid="7129166637707421536">"զրո երեք"</item>
+ <item msgid="7579404865008788673">"զրո չորս"</item>
+ <item msgid="3873924689207380586">"զրո հինգ"</item>
+ <item msgid="4849565597850069377">"զրո վեց"</item>
+ <item msgid="4404219424523572364">"զրո յոթ"</item>
+ <item msgid="8740481214764087329">"ութ"</item>
+ <item msgid="1713216865806811237">"զրո ինը"</item>
+ <item msgid="3508406095411245038">"տասը"</item>
+ <item msgid="7161996337755311711">"տասնմեկ"</item>
+ <item msgid="4044549963329624197">"տասներկու"</item>
+ <item msgid="333373157917379088">"տասներեք"</item>
+ <item msgid="2631202907124819385">"տասնչորս"</item>
+ <item msgid="6472396076858033453">"տասնհինգ"</item>
+ <item msgid="8656981856181581643">"տասնվեց"</item>
+ <item msgid="7289026608562030619">"տասնյոթ"</item>
+ <item msgid="3881477602692646573">"տասնութ"</item>
+ <item msgid="3358129827772984226">"տասնինը"</item>
+ <item msgid="3308575407402865807">"քսան"</item>
+ <item msgid="5346560955382229629">"քսան\nմեկ"</item>
+ <item msgid="226750304761473436">"քսան\nերկու"</item>
+ <item msgid="616811325336838734">"քսան\nերեք"</item>
+ <item msgid="616346116869053440">"քսան\nչորս"</item>
+ <item msgid="4642996410384042830">"քսան\nհինգ"</item>
+ <item msgid="7506092849993571465">"քսան\nվեց"</item>
+ <item msgid="1915078191101042031">"քսան\nյոթ"</item>
+ <item msgid="4292378641900520252">"քսան\nութ"</item>
+ <item msgid="5339513901773103696">"քսան\nինը"</item>
+ <item msgid="3574673250891657607">"երեսուն"</item>
+ <item msgid="5796923836589110940">"երեսուն\nմեկ"</item>
+ <item msgid="5859323597571702052">"երեսուն\nերկու"</item>
+ <item msgid="5133326723148876507">"երեսուն\nերեք"</item>
+ <item msgid="2693999494655663096">"երեսուն\nչորս"</item>
+ <item msgid="3316754944962836197">"երեսուն\nհինգ"</item>
+ <item msgid="816891008836796723">"երեսուն\nվեց"</item>
+ <item msgid="9158890488666520078">"երեսուն\nյոթ"</item>
+ <item msgid="1894769703213894011">"երեսուն\nութ"</item>
+ <item msgid="5638820345598572399">"երեսուն\nինը"</item>
+ <item msgid="8838304023017895439">"քառասուն"</item>
+ <item msgid="1834742948932559597">"քառասուն\nմեկ"</item>
+ <item msgid="6573707308847773944">"քառասուն\nերկու"</item>
+ <item msgid="2450149950652678001">"քառասուն\nերեք"</item>
+ <item msgid="2874667401318178036">"քառասուն\nչորս"</item>
+ <item msgid="3391101532763048862">"քառասուն\nհինգ"</item>
+ <item msgid="1671489330863254362">"քառասուն\nվեց"</item>
+ <item msgid="5916017359554531038">"քառասուն\nյոթ"</item>
+ <item msgid="8205413177993059967">"քառասուն\nութ"</item>
+ <item msgid="6607867415142171302">"քառասուն\nինը"</item>
+ <item msgid="8358850748472089162">"հիսուն"</item>
+ <item msgid="3551313125255080234">"հիսուն\nմեկ"</item>
+ <item msgid="1559678130725716542">"հիսուն\nերկու"</item>
+ <item msgid="431441994725492377">"հիսուն\nերեք"</item>
+ <item msgid="6345774640539623024">"հիսուն\nչորս"</item>
+ <item msgid="8018192990793931120">"հիսուն\nհինգ"</item>
+ <item msgid="6187650843754604534">"հիսուն\nվեց"</item>
+ <item msgid="8727240174015993259">"հիսուն\nյոթ"</item>
+ <item msgid="848339003778952950">"հիսուն\nութ"</item>
+ <item msgid="5798985802835423618">"հիսուն\nինը"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-in/strings.xml b/packages/SystemUI/res-keyguard/values-in/strings.xml
index ed41222..603b4c2 100644
--- a/packages/SystemUI/res-keyguard/values-in/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-in/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM kini dinonaktifkan. Masukkan kode PUK untuk melanjutkan. Tersisa <xliff:g id="_NUMBER_1">%d</xliff:g> percobaan sebelum SIM tidak dapat digunakan secara permanen. Hubungi operator untuk mengetahui detailnya.</item>
<item quantity="one">SIM kini dinonaktifkan. Masukkan kode PUK untuk melanjutkan. Tersisa <xliff:g id="_NUMBER_0">%d</xliff:g> percobaan sebelum SIM tidak dapat digunakan secara permanen. Hubungi operator untuk mengetahui detailnya.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Pukul"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Dua Belas"</item>
+ <item msgid="7389464214252023751">"Satu"</item>
+ <item msgid="8803180377002008046">"Dua"</item>
+ <item msgid="8614897059944644719">"Tiga"</item>
+ <item msgid="2293058674782619556">"Empat"</item>
+ <item msgid="4815402358455041664">"Lima"</item>
+ <item msgid="3325754778509665687">"Enam"</item>
+ <item msgid="5805551341866280575">"Tujuh"</item>
+ <item msgid="203334816668238610">"Delapan"</item>
+ <item msgid="4828052671464488923">"Sembilan"</item>
+ <item msgid="2233497913571137419">"Sepuluh"</item>
+ <item msgid="5621554266768657830">"Sebelas"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Tepat"</item>
+ <item msgid="8837126587669001578">"Satu"</item>
+ <item msgid="4294343372940455660">"Dua"</item>
+ <item msgid="7129166637707421536">"Tiga"</item>
+ <item msgid="7579404865008788673">"Empat"</item>
+ <item msgid="3873924689207380586">"Lima"</item>
+ <item msgid="4849565597850069377">"Enam"</item>
+ <item msgid="4404219424523572364">"Tujuh"</item>
+ <item msgid="8740481214764087329">"Delapan"</item>
+ <item msgid="1713216865806811237">"Sembilan"</item>
+ <item msgid="3508406095411245038">"Sepuluh"</item>
+ <item msgid="7161996337755311711">"Sebelas"</item>
+ <item msgid="4044549963329624197">"Dua Belas"</item>
+ <item msgid="333373157917379088">"Tiga Belas"</item>
+ <item msgid="2631202907124819385">"Empat Belas"</item>
+ <item msgid="6472396076858033453">"Lima Belas"</item>
+ <item msgid="8656981856181581643">"Enam Belas"</item>
+ <item msgid="7289026608562030619">"Tujuh Belas"</item>
+ <item msgid="3881477602692646573">"Delapan Belas"</item>
+ <item msgid="3358129827772984226">"Sembilan Belas"</item>
+ <item msgid="3308575407402865807">"Dua Puluh"</item>
+ <item msgid="5346560955382229629">"Dua Puluh\nSatu"</item>
+ <item msgid="226750304761473436">"Dua Puluh\nDua"</item>
+ <item msgid="616811325336838734">"Dua Puluh\nTiga"</item>
+ <item msgid="616346116869053440">"Dua Puluh\nEmpat"</item>
+ <item msgid="4642996410384042830">"Dua Puluh\nLima"</item>
+ <item msgid="7506092849993571465">"Dua Puluh\nEnam"</item>
+ <item msgid="1915078191101042031">"Dua Puluh\nTujuh"</item>
+ <item msgid="4292378641900520252">"Dua Puluh\nDelapan"</item>
+ <item msgid="5339513901773103696">"Dua Puluh\nSembilan"</item>
+ <item msgid="3574673250891657607">"Tiga Puluh"</item>
+ <item msgid="5796923836589110940">"Tiga Puluh\nSatu"</item>
+ <item msgid="5859323597571702052">"Tiga Puluh\nDua"</item>
+ <item msgid="5133326723148876507">"Tiga Puluh\nTiga"</item>
+ <item msgid="2693999494655663096">"Tiga Puluh\nEmpat"</item>
+ <item msgid="3316754944962836197">"Tiga Puluh\nLima"</item>
+ <item msgid="816891008836796723">"Tiga Puluh\nEnam"</item>
+ <item msgid="9158890488666520078">"Tiga Puluh\nTujuh"</item>
+ <item msgid="1894769703213894011">"Tiga Puluh\nDelapan"</item>
+ <item msgid="5638820345598572399">"Tiga Puluh\nSembilan"</item>
+ <item msgid="8838304023017895439">"Empat Puluh"</item>
+ <item msgid="1834742948932559597">"Empat Puluh\nSatu"</item>
+ <item msgid="6573707308847773944">"Empat Puluh\nDua"</item>
+ <item msgid="2450149950652678001">"Empat Puluh\nTiga"</item>
+ <item msgid="2874667401318178036">"Empat Puluh\nEmpat"</item>
+ <item msgid="3391101532763048862">"Empat Puluh\nLima"</item>
+ <item msgid="1671489330863254362">"Empat Puluh\nEnam"</item>
+ <item msgid="5916017359554531038">"Empat Puluh\nTujuh"</item>
+ <item msgid="8205413177993059967">"Empat Puluh\nDelapan"</item>
+ <item msgid="6607867415142171302">"Empat Puluh\nSembilan"</item>
+ <item msgid="8358850748472089162">"Lima Puluh"</item>
+ <item msgid="3551313125255080234">"Lima Puluh\nSatu"</item>
+ <item msgid="1559678130725716542">"Lima Puluh\nDua"</item>
+ <item msgid="431441994725492377">"Lima Puluh\nTiga"</item>
+ <item msgid="6345774640539623024">"Lima Puluh\nEmpat"</item>
+ <item msgid="8018192990793931120">"Lima Puluh\nLima"</item>
+ <item msgid="6187650843754604534">"Lima Puluh\nEnam"</item>
+ <item msgid="8727240174015993259">"Lima Puluh\nTujuh"</item>
+ <item msgid="848339003778952950">"Lima Puluh\nDelapan"</item>
+ <item msgid="5798985802835423618">"Lima Puluh\nSembilan"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-is/strings.xml b/packages/SystemUI/res-keyguard/values-is/strings.xml
index afaf6bb..71f2078 100644
--- a/packages/SystemUI/res-keyguard/values-is/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-is/strings.xml
@@ -150,78 +150,20 @@
<item quantity="one">SIM-kortið er nú óvirkt. Sláðu inn PUK-númer til að halda áfram. Það er <xliff:g id="_NUMBER_1">%d</xliff:g> tilraun eftir þar til SIM-kortið verður ónothæft til frambúðar. Hafðu samband við símafyrirtækið til að fá upplýsingar.</item>
<item quantity="other">SIM-kortið er nú óvirkt. Sláðu inn PUK-númer til að halda áfram. Það eru <xliff:g id="_NUMBER_1">%d</xliff:g> tilraunir eftir þar til SIM-kortið verður ónothæft til frambúðar. Hafðu samband við símafyrirtækið til að fá upplýsingar.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Hún er"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Tólf"</item>
+ <item msgid="7389464214252023751">"Eitt"</item>
+ <item msgid="8803180377002008046">"Tvö"</item>
+ <item msgid="8614897059944644719">"Þrjú"</item>
+ <item msgid="2293058674782619556">"Fjögur"</item>
+ <item msgid="4815402358455041664">"Fimm"</item>
+ <item msgid="3325754778509665687">"Sex"</item>
+ <item msgid="5805551341866280575">"Sjö"</item>
+ <item msgid="203334816668238610">"Átta"</item>
+ <item msgid="4828052671464488923">"Níu"</item>
+ <item msgid="2233497913571137419">"Tíu"</item>
+ <item msgid="5621554266768657830">"Ellefu"</item>
+ </string-array>
<!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-it/strings.xml b/packages/SystemUI/res-keyguard/values-it/strings.xml
index 28a53a4..e0b55b3 100644
--- a/packages/SystemUI/res-keyguard/values-it/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-it/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">La scheda SIM è ora disattivata. Inserisci il codice PUK per continuare. Hai ancora <xliff:g id="_NUMBER_1">%d</xliff:g> tentativi a disposizione prima che la SIM diventi definitivamente inutilizzabile. Per informazioni dettagliate, contatta l\'operatore.</item>
<item quantity="one">La scheda SIM è ora disattivata. Inserisci il codice PUK per continuare. Hai ancora <xliff:g id="_NUMBER_0">%d</xliff:g> tentativo a disposizione prima che la SIM diventi definitivamente inutilizzabile. Per informazioni dettagliate, contatta l\'operatore.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Ora"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Dodici"</item>
+ <item msgid="7389464214252023751">"Una"</item>
+ <item msgid="8803180377002008046">"Due"</item>
+ <item msgid="8614897059944644719">"Tre"</item>
+ <item msgid="2293058674782619556">"Quattro"</item>
+ <item msgid="4815402358455041664">"Cinque"</item>
+ <item msgid="3325754778509665687">"Sei"</item>
+ <item msgid="5805551341866280575">"Sette"</item>
+ <item msgid="203334816668238610">"Otto"</item>
+ <item msgid="4828052671464488923">"Nove"</item>
+ <item msgid="2233497913571137419">"Dieci"</item>
+ <item msgid="5621554266768657830">"Undici"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"in punto"</item>
+ <item msgid="8837126587669001578">"e uno"</item>
+ <item msgid="4294343372940455660">"e due"</item>
+ <item msgid="7129166637707421536">"e tre"</item>
+ <item msgid="7579404865008788673">"e quattro"</item>
+ <item msgid="3873924689207380586">"e cinque"</item>
+ <item msgid="4849565597850069377">"e sei"</item>
+ <item msgid="4404219424523572364">"e sette"</item>
+ <item msgid="8740481214764087329">"e otto"</item>
+ <item msgid="1713216865806811237">"e nove"</item>
+ <item msgid="3508406095411245038">"Dieci"</item>
+ <item msgid="7161996337755311711">"Undici"</item>
+ <item msgid="4044549963329624197">"Dodici"</item>
+ <item msgid="333373157917379088">"Tredici"</item>
+ <item msgid="2631202907124819385">"Quattordici"</item>
+ <item msgid="6472396076858033453">"Quindici"</item>
+ <item msgid="8656981856181581643">"Sedici"</item>
+ <item msgid="7289026608562030619">"Diciassette"</item>
+ <item msgid="3881477602692646573">"Diciotto"</item>
+ <item msgid="3358129827772984226">"Diciannove"</item>
+ <item msgid="3308575407402865807">"Venti"</item>
+ <item msgid="5346560955382229629">"Ventuno\n"</item>
+ <item msgid="226750304761473436">"Ventidue\n"</item>
+ <item msgid="616811325336838734">"Ventitre\n"</item>
+ <item msgid="616346116869053440">"Ventiquattro\n"</item>
+ <item msgid="4642996410384042830">"Venticinque\n"</item>
+ <item msgid="7506092849993571465">"Ventisei\n"</item>
+ <item msgid="1915078191101042031">"Ventisette\n"</item>
+ <item msgid="4292378641900520252">"Ventotto\n"</item>
+ <item msgid="5339513901773103696">"Ventinove\n"</item>
+ <item msgid="3574673250891657607">"Trenta"</item>
+ <item msgid="5796923836589110940">"Trentuno\n"</item>
+ <item msgid="5859323597571702052">"Trentadue\n"</item>
+ <item msgid="5133326723148876507">"Trentatre\n"</item>
+ <item msgid="2693999494655663096">"Trentaquattro\n"</item>
+ <item msgid="3316754944962836197">"Trentacinque\n"</item>
+ <item msgid="816891008836796723">"Trentasei\n"</item>
+ <item msgid="9158890488666520078">"Trentasette\n"</item>
+ <item msgid="1894769703213894011">"Trentotto\n"</item>
+ <item msgid="5638820345598572399">"Trentanove\n"</item>
+ <item msgid="8838304023017895439">"Quaranta"</item>
+ <item msgid="1834742948932559597">"Quarantuno\n"</item>
+ <item msgid="6573707308847773944">"Quarantadue\n"</item>
+ <item msgid="2450149950652678001">"Quarantatre\n"</item>
+ <item msgid="2874667401318178036">"Quarantaquattro\n"</item>
+ <item msgid="3391101532763048862">"Quarantacinque\n"</item>
+ <item msgid="1671489330863254362">"Quarantasei\n"</item>
+ <item msgid="5916017359554531038">"Quarantasette\n"</item>
+ <item msgid="8205413177993059967">"Quarantotto\n"</item>
+ <item msgid="6607867415142171302">"Quarantanove\n"</item>
+ <item msgid="8358850748472089162">"Cinquanta"</item>
+ <item msgid="3551313125255080234">"Cinquantuno\n"</item>
+ <item msgid="1559678130725716542">"Cinquantadue\n"</item>
+ <item msgid="431441994725492377">"Cinquantatre\n"</item>
+ <item msgid="6345774640539623024">"Cinquantaquattro\n"</item>
+ <item msgid="8018192990793931120">"Cinquantacinque\n"</item>
+ <item msgid="6187650843754604534">"Cinquantasei\n"</item>
+ <item msgid="8727240174015993259">"Cinquantasette\n"</item>
+ <item msgid="848339003778952950">"Cinquantotto\n"</item>
+ <item msgid="5798985802835423618">"Cinquantanove\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-iw/strings.xml b/packages/SystemUI/res-keyguard/values-iw/strings.xml
index dc9c7ed..509c463 100644
--- a/packages/SystemUI/res-keyguard/values-iw/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-iw/strings.xml
@@ -166,78 +166,81 @@
<item quantity="other">כרטיס ה-SIM מושבת כעת. יש להזין קוד PUK כדי להמשיך. נותרו לך <xliff:g id="_NUMBER_1">%d</xliff:g> ניסיונות נוספים לפני שכרטיס ה-SIM ינעל לצמיתות. למידע נוסף, ניתן לפנות לספק שלך.</item>
<item quantity="one">כרטיס ה-SIM מושבת כעת. יש להזין קוד PUK כדי להמשיך. נותר לך <xliff:g id="_NUMBER_0">%d</xliff:g> ניסיון נוסף לפני שכרטיס ה-SIM ינעל לצמיתות. למידע נוסף, ניתן לפנות לספק שלך.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"השעה"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"שתים-עשרה"</item>
+ <item msgid="7389464214252023751">"אחת"</item>
+ <item msgid="8803180377002008046">"שתיים"</item>
+ <item msgid="8614897059944644719">"שלוש"</item>
+ <item msgid="2293058674782619556">"ארבע"</item>
+ <item msgid="4815402358455041664">"חמש"</item>
+ <item msgid="3325754778509665687">"שש"</item>
+ <item msgid="5805551341866280575">"שבע"</item>
+ <item msgid="203334816668238610">"שמונה"</item>
+ <item msgid="4828052671464488923">"תשע"</item>
+ <item msgid="2233497913571137419">"עשר"</item>
+ <item msgid="5621554266768657830">"אחת-עשרה"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"בדיוק"</item>
+ <item msgid="8837126587669001578">"ודקה"</item>
+ <item msgid="4294343372940455660">"ושתי דקות"</item>
+ <item msgid="7129166637707421536">"ושלוש דקות"</item>
+ <item msgid="7579404865008788673">"וארבע דקות"</item>
+ <item msgid="3873924689207380586">"וחמש דקות"</item>
+ <item msgid="4849565597850069377">"ושש דקות"</item>
+ <item msgid="4404219424523572364">"ושבע דקות"</item>
+ <item msgid="8740481214764087329">"ושמונה דקות"</item>
+ <item msgid="1713216865806811237">"ותשע דקות"</item>
+ <item msgid="3508406095411245038">"עשר"</item>
+ <item msgid="7161996337755311711">"אחת-עשרה"</item>
+ <item msgid="4044549963329624197">"שתים-עשרה"</item>
+ <item msgid="333373157917379088">"שלוש-עשרה"</item>
+ <item msgid="2631202907124819385">"ארבע-עשרה"</item>
+ <item msgid="6472396076858033453">"חמש-עשרה"</item>
+ <item msgid="8656981856181581643">"שש-עשרה"</item>
+ <item msgid="7289026608562030619">"שבע-עשרה"</item>
+ <item msgid="3881477602692646573">"שמונה-עשרה"</item>
+ <item msgid="3358129827772984226">"תשע-עשרה"</item>
+ <item msgid="3308575407402865807">"עשרים"</item>
+ <item msgid="5346560955382229629">"עשרים\nואחת"</item>
+ <item msgid="226750304761473436">"עשרים\nושתיים"</item>
+ <item msgid="616811325336838734">"עשרים\nושלוש"</item>
+ <item msgid="616346116869053440">"עשרים\nוארבע"</item>
+ <item msgid="4642996410384042830">"עשרים\nוחמש"</item>
+ <item msgid="7506092849993571465">"עשרים\nושש"</item>
+ <item msgid="1915078191101042031">"עשרים\nושבע"</item>
+ <item msgid="4292378641900520252">"עשרים\nושמונה"</item>
+ <item msgid="5339513901773103696">"עשרים\nותשע"</item>
+ <item msgid="3574673250891657607">"שלושים"</item>
+ <item msgid="5796923836589110940">"שלושים\nואחת"</item>
+ <item msgid="5859323597571702052">"שלושים\nושתיים"</item>
+ <item msgid="5133326723148876507">"שלושים\nושלוש"</item>
+ <item msgid="2693999494655663096">"שלושים\nוארבע"</item>
+ <item msgid="3316754944962836197">"שלושים\nוחמש"</item>
+ <item msgid="816891008836796723">"שלושים\nושש"</item>
+ <item msgid="9158890488666520078">"שלושים\nושבע"</item>
+ <item msgid="1894769703213894011">"שלושים\nושמונה"</item>
+ <item msgid="5638820345598572399">"שלושים\nותשע"</item>
+ <item msgid="8838304023017895439">"ארבעים"</item>
+ <item msgid="1834742948932559597">"ארבעים\nואחת"</item>
+ <item msgid="6573707308847773944">"ארבעים\nושתיים"</item>
+ <item msgid="2450149950652678001">"ארבעים\nושלוש"</item>
+ <item msgid="2874667401318178036">"ארבעים\nוארבע"</item>
+ <item msgid="3391101532763048862">"ארבעים\nוחמש"</item>
+ <item msgid="1671489330863254362">"ארבעים\nושש"</item>
+ <item msgid="5916017359554531038">"ארבעים\nושבע"</item>
+ <item msgid="8205413177993059967">"ארבעים\nושמונה"</item>
+ <item msgid="6607867415142171302">"ארבעים\nותשע"</item>
+ <item msgid="8358850748472089162">"חמישים"</item>
+ <item msgid="3551313125255080234">"חמישים\nואחת"</item>
+ <item msgid="1559678130725716542">"חמישים\nושתיים"</item>
+ <item msgid="431441994725492377">"חמישים\nושלוש"</item>
+ <item msgid="6345774640539623024">"חמישים\nוארבע"</item>
+ <item msgid="8018192990793931120">"חמישים\nוחמש"</item>
+ <item msgid="6187650843754604534">"חמישים\nושש"</item>
+ <item msgid="8727240174015993259">"חמישים\nושבע"</item>
+ <item msgid="848339003778952950">"חמישים\nושמונה"</item>
+ <item msgid="5798985802835423618">"חמישים\nותשע"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ja/strings.xml b/packages/SystemUI/res-keyguard/values-ja/strings.xml
index 23e6d15..343d557 100644
--- a/packages/SystemUI/res-keyguard/values-ja/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ja/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM が無効になりました。続行するには PUK コードを入力してください。入力できるのはあと <xliff:g id="_NUMBER_1">%d</xliff:g> 回です。この回数を超えると SIM は完全に使用できなくなります。詳しくは携帯通信会社にお問い合わせください。</item>
<item quantity="one">SIM が無効になりました。続行するには PUK コードを入力してください。入力できるのはあと <xliff:g id="_NUMBER_0">%d</xliff:g> 回です。この回数を超えると SIM は完全に使用できなくなります。詳しくは携帯通信会社にお問い合わせください。</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"時刻:"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"12"</item>
+ <item msgid="7389464214252023751">"1"</item>
+ <item msgid="8803180377002008046">"2"</item>
+ <item msgid="8614897059944644719">"3"</item>
+ <item msgid="2293058674782619556">"4"</item>
+ <item msgid="4815402358455041664">"5"</item>
+ <item msgid="3325754778509665687">"6"</item>
+ <item msgid="5805551341866280575">"7"</item>
+ <item msgid="203334816668238610">"8"</item>
+ <item msgid="4828052671464488923">"9"</item>
+ <item msgid="2233497913571137419">"10"</item>
+ <item msgid="5621554266768657830">"11"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"時"</item>
+ <item msgid="8837126587669001578">"1"</item>
+ <item msgid="4294343372940455660">"2"</item>
+ <item msgid="7129166637707421536">"3"</item>
+ <item msgid="7579404865008788673">"4"</item>
+ <item msgid="3873924689207380586">"5"</item>
+ <item msgid="4849565597850069377">"6"</item>
+ <item msgid="4404219424523572364">"7"</item>
+ <item msgid="8740481214764087329">"8"</item>
+ <item msgid="1713216865806811237">"9"</item>
+ <item msgid="3508406095411245038">"10"</item>
+ <item msgid="7161996337755311711">"11"</item>
+ <item msgid="4044549963329624197">"12"</item>
+ <item msgid="333373157917379088">"13"</item>
+ <item msgid="2631202907124819385">"14"</item>
+ <item msgid="6472396076858033453">"15"</item>
+ <item msgid="8656981856181581643">"16"</item>
+ <item msgid="7289026608562030619">"17"</item>
+ <item msgid="3881477602692646573">"18"</item>
+ <item msgid="3358129827772984226">"19"</item>
+ <item msgid="3308575407402865807">"20"</item>
+ <item msgid="5346560955382229629">"21\n"</item>
+ <item msgid="226750304761473436">"22\n"</item>
+ <item msgid="616811325336838734">"23\n"</item>
+ <item msgid="616346116869053440">"24\n"</item>
+ <item msgid="4642996410384042830">"25\n"</item>
+ <item msgid="7506092849993571465">"26\n"</item>
+ <item msgid="1915078191101042031">"27\n"</item>
+ <item msgid="4292378641900520252">"28\n"</item>
+ <item msgid="5339513901773103696">"29\n"</item>
+ <item msgid="3574673250891657607">"30"</item>
+ <item msgid="5796923836589110940">"31\n"</item>
+ <item msgid="5859323597571702052">"32\n"</item>
+ <item msgid="5133326723148876507">"33\n"</item>
+ <item msgid="2693999494655663096">"34\n"</item>
+ <item msgid="3316754944962836197">"35\n"</item>
+ <item msgid="816891008836796723">"36\n"</item>
+ <item msgid="9158890488666520078">"37\n"</item>
+ <item msgid="1894769703213894011">"38\n"</item>
+ <item msgid="5638820345598572399">"39\n"</item>
+ <item msgid="8838304023017895439">"40"</item>
+ <item msgid="1834742948932559597">"41\n"</item>
+ <item msgid="6573707308847773944">"42\n"</item>
+ <item msgid="2450149950652678001">"43\n"</item>
+ <item msgid="2874667401318178036">"44\n"</item>
+ <item msgid="3391101532763048862">"45\n"</item>
+ <item msgid="1671489330863254362">"46\n"</item>
+ <item msgid="5916017359554531038">"47\n"</item>
+ <item msgid="8205413177993059967">"48\n"</item>
+ <item msgid="6607867415142171302">"49\n"</item>
+ <item msgid="8358850748472089162">"50"</item>
+ <item msgid="3551313125255080234">"51\n"</item>
+ <item msgid="1559678130725716542">"52\n"</item>
+ <item msgid="431441994725492377">"53\n"</item>
+ <item msgid="6345774640539623024">"54\n"</item>
+ <item msgid="8018192990793931120">"55\n"</item>
+ <item msgid="6187650843754604534">"56\n"</item>
+ <item msgid="8727240174015993259">"57\n"</item>
+ <item msgid="848339003778952950">"58\n"</item>
+ <item msgid="5798985802835423618">"59\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ka/strings.xml b/packages/SystemUI/res-keyguard/values-ka/strings.xml
index 788c772..9118e56 100644
--- a/packages/SystemUI/res-keyguard/values-ka/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ka/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM ბარათი ახლა დეაქტივირებულია. გასაგრძელებლად შეიყვანეთ PUK-კოდი. თქვენ დაგრჩათ <xliff:g id="_NUMBER_1">%d</xliff:g> მცდელობა, სანამ SIM სამუდამოდ გამოუსადეგარი გახდება. დეტალური ინფორმაციისთვის დაუკავშირდით თქვენს ოპერატორს.</item>
<item quantity="one">SIM ბარათი ახლა დეაქტივირებულია. გასაგრძელებლად შეიყვანეთ PUK-კოდი. თქვენ დაგრჩათ <xliff:g id="_NUMBER_0">%d</xliff:g> მცდელობა, სანამ SIM სამუდამოდ გამოუსადეგარი გახდება. დეტალური ინფორმაციისთვის დაუკავშირდით თქვენს ოპერატორს.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"ახლაა"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"თორმეტი"</item>
+ <item msgid="7389464214252023751">"ერთი"</item>
+ <item msgid="8803180377002008046">"ორი"</item>
+ <item msgid="8614897059944644719">"სამი"</item>
+ <item msgid="2293058674782619556">"ოთხი"</item>
+ <item msgid="4815402358455041664">"ხუთი"</item>
+ <item msgid="3325754778509665687">"ექვსი"</item>
+ <item msgid="5805551341866280575">"შვიდი"</item>
+ <item msgid="203334816668238610">"რვა"</item>
+ <item msgid="4828052671464488923">"ცხრა"</item>
+ <item msgid="2233497913571137419">"ათი"</item>
+ <item msgid="5621554266768657830">"თერთმეტი"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"საათი"</item>
+ <item msgid="8837126587669001578">"ნულ ერთი"</item>
+ <item msgid="4294343372940455660">"ნულ ორი"</item>
+ <item msgid="7129166637707421536">"ნულ სამი"</item>
+ <item msgid="7579404865008788673">"ნულ ოთხი"</item>
+ <item msgid="3873924689207380586">"ნულ ხუთი"</item>
+ <item msgid="4849565597850069377">"ნულ ექვსი"</item>
+ <item msgid="4404219424523572364">"ნულ შვიდი"</item>
+ <item msgid="8740481214764087329">"ნულ რვა"</item>
+ <item msgid="1713216865806811237">"ნულ ცხრა"</item>
+ <item msgid="3508406095411245038">"ათი"</item>
+ <item msgid="7161996337755311711">"თერთმეტი"</item>
+ <item msgid="4044549963329624197">"თორმეტი"</item>
+ <item msgid="333373157917379088">"ცამეტი"</item>
+ <item msgid="2631202907124819385">"თოთხმეტი"</item>
+ <item msgid="6472396076858033453">"თხუთმეტი"</item>
+ <item msgid="8656981856181581643">"თექვსმეტი"</item>
+ <item msgid="7289026608562030619">"ჩვიდმეტი"</item>
+ <item msgid="3881477602692646573">"თვრამეტი"</item>
+ <item msgid="3358129827772984226">"ცხრამეტი"</item>
+ <item msgid="3308575407402865807">"ოცი"</item>
+ <item msgid="5346560955382229629">"ოცდაერთი\n"</item>
+ <item msgid="226750304761473436">"ოცდაორი\n"</item>
+ <item msgid="616811325336838734">"ოცდასამი\n"</item>
+ <item msgid="616346116869053440">"ოცდაოთხი\n"</item>
+ <item msgid="4642996410384042830">"ოცდახუთი\n"</item>
+ <item msgid="7506092849993571465">"ოცდაექვსი\n"</item>
+ <item msgid="1915078191101042031">"ოცდაშვიდი\n"</item>
+ <item msgid="4292378641900520252">"ოცდარვა\n"</item>
+ <item msgid="5339513901773103696">"ოცდაცხრა\n"</item>
+ <item msgid="3574673250891657607">"ოცდაათი"</item>
+ <item msgid="5796923836589110940">"ოცდათერთმეტი\n"</item>
+ <item msgid="5859323597571702052">"ოცდათორმეტი\n"</item>
+ <item msgid="5133326723148876507">"ოცდაცამეტი\n"</item>
+ <item msgid="2693999494655663096">"ოცდათოთხმეტი\n"</item>
+ <item msgid="3316754944962836197">"ოცდათხუთმეტი\n"</item>
+ <item msgid="816891008836796723">"ოცდათექვსმეტი\n"</item>
+ <item msgid="9158890488666520078">"ოცდაჩვიდმეტი\n"</item>
+ <item msgid="1894769703213894011">"ოცდათვრამეტი\n"</item>
+ <item msgid="5638820345598572399">"ოცდაცხრამეტი\n"</item>
+ <item msgid="8838304023017895439">"ორმოცი"</item>
+ <item msgid="1834742948932559597">"ორმოცდაერთი\n"</item>
+ <item msgid="6573707308847773944">"ორმოცდაორი\n"</item>
+ <item msgid="2450149950652678001">"ორმოცდასამი\n"</item>
+ <item msgid="2874667401318178036">"ორმოცდაოთხი\n"</item>
+ <item msgid="3391101532763048862">"ორმოცდახუთი\n"</item>
+ <item msgid="1671489330863254362">"ორმოცდაექვსი\n"</item>
+ <item msgid="5916017359554531038">"ორმოცდაშვიდი\n"</item>
+ <item msgid="8205413177993059967">"ორმოცდარვა\n"</item>
+ <item msgid="6607867415142171302">"ორმოცდაცხრა\n"</item>
+ <item msgid="8358850748472089162">"ორმოცდაათი"</item>
+ <item msgid="3551313125255080234">"ორმოცდათხუთმეტი\n"</item>
+ <item msgid="1559678130725716542">"ორმოცდათორმეტი\n"</item>
+ <item msgid="431441994725492377">"ორმოცდაცამეტი\n"</item>
+ <item msgid="6345774640539623024">"ორმოცდათოთხმეტი\n"</item>
+ <item msgid="8018192990793931120">"ორმოცდათხუთმეტი\n"</item>
+ <item msgid="6187650843754604534">"ორმოცდათექვსმეტი\n"</item>
+ <item msgid="8727240174015993259">"ორმოცდაჩვიდმეტი\n"</item>
+ <item msgid="848339003778952950">"ორმოცდათვრამეტი\n"</item>
+ <item msgid="5798985802835423618">"ორმოცდაცხრამეტი\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-kk/strings.xml b/packages/SystemUI/res-keyguard/values-kk/strings.xml
index 66c4e1ee..2270c92 100644
--- a/packages/SystemUI/res-keyguard/values-kk/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-kk/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM картасы өшірілді. Жалғастыру үшін PUK кодын енгізіңіз. <xliff:g id="_NUMBER_1">%d</xliff:g> мүмкіндік қалды, одан кейін SIM картасы біржола құлыпталады. Толығырақ мәліметті оператордан алыңыз.</item>
<item quantity="one">SIM картасы өшірілді. Жалғастыру үшін PUK кодын енгізіңіз. <xliff:g id="_NUMBER_0">%d</xliff:g> мүмкіндік қалды, одан кейін SIM картасы біржола құлыпталады. Толығырақ мәліметті оператордан алыңыз.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Қазір"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Он екі"</item>
+ <item msgid="7389464214252023751">"Бір"</item>
+ <item msgid="8803180377002008046">"Екі"</item>
+ <item msgid="8614897059944644719">"Үш"</item>
+ <item msgid="2293058674782619556">"Төрт"</item>
+ <item msgid="4815402358455041664">"Бес"</item>
+ <item msgid="3325754778509665687">"Алты"</item>
+ <item msgid="5805551341866280575">"Жеті"</item>
+ <item msgid="203334816668238610">"Сегіз"</item>
+ <item msgid="4828052671464488923">"Тоғыз"</item>
+ <item msgid="2233497913571137419">"Он"</item>
+ <item msgid="5621554266768657830">"Он бір"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985"></item>
+ <item msgid="8837126587669001578">"Нөл бір"</item>
+ <item msgid="4294343372940455660">"Нөл екі"</item>
+ <item msgid="7129166637707421536">"Нөл үш"</item>
+ <item msgid="7579404865008788673">"Нөл төрт"</item>
+ <item msgid="3873924689207380586">"Нөл бес"</item>
+ <item msgid="4849565597850069377">"Нөл алты"</item>
+ <item msgid="4404219424523572364">"Нөл жеті"</item>
+ <item msgid="8740481214764087329">"Нөл сегіз"</item>
+ <item msgid="1713216865806811237">"Нөл тоғыз"</item>
+ <item msgid="3508406095411245038">"Он"</item>
+ <item msgid="7161996337755311711">"Он бір"</item>
+ <item msgid="4044549963329624197">"Он екі"</item>
+ <item msgid="333373157917379088">"Он үш"</item>
+ <item msgid="2631202907124819385">"Он төрт"</item>
+ <item msgid="6472396076858033453">"Он бес"</item>
+ <item msgid="8656981856181581643">"Он алты"</item>
+ <item msgid="7289026608562030619">"Он жеті"</item>
+ <item msgid="3881477602692646573">"Он сегіз"</item>
+ <item msgid="3358129827772984226">"Он тоғыз"</item>
+ <item msgid="3308575407402865807">"Жиырма"</item>
+ <item msgid="5346560955382229629">"Жиырма\nбір"</item>
+ <item msgid="226750304761473436">"Жиырма\nекі"</item>
+ <item msgid="616811325336838734">"Жиырма\nүш"</item>
+ <item msgid="616346116869053440">"Жиырма\nтөрт"</item>
+ <item msgid="4642996410384042830">"Жиырма\nбес"</item>
+ <item msgid="7506092849993571465">"Жиырма\nалты"</item>
+ <item msgid="1915078191101042031">"Жиырма\nжеті"</item>
+ <item msgid="4292378641900520252">"Жиырма\nсегіз"</item>
+ <item msgid="5339513901773103696">"Жиырма\nтоғыз"</item>
+ <item msgid="3574673250891657607">"Отыз"</item>
+ <item msgid="5796923836589110940">"Отыз\nбір"</item>
+ <item msgid="5859323597571702052">"Отыз\nекі"</item>
+ <item msgid="5133326723148876507">"Отыз\nүш"</item>
+ <item msgid="2693999494655663096">"Отыз\nтөрт"</item>
+ <item msgid="3316754944962836197">"Отыз\nбес"</item>
+ <item msgid="816891008836796723">"Отыз\nалты"</item>
+ <item msgid="9158890488666520078">"Отыз\nжеті"</item>
+ <item msgid="1894769703213894011">"Отыз\nсегіз"</item>
+ <item msgid="5638820345598572399">"Отыз\nтоғыз"</item>
+ <item msgid="8838304023017895439">"Қырық"</item>
+ <item msgid="1834742948932559597">"Қырық\nбір"</item>
+ <item msgid="6573707308847773944">"Қырық\nекі"</item>
+ <item msgid="2450149950652678001">"Қырық\nүш"</item>
+ <item msgid="2874667401318178036">"Қырық\nтөрт"</item>
+ <item msgid="3391101532763048862">"Қырық\nбес"</item>
+ <item msgid="1671489330863254362">"Қырық\nалты"</item>
+ <item msgid="5916017359554531038">"Қырық\nжеті"</item>
+ <item msgid="8205413177993059967">"Қырық\nсегіз"</item>
+ <item msgid="6607867415142171302">"Қырық\nтоғыз"</item>
+ <item msgid="8358850748472089162">"Елу"</item>
+ <item msgid="3551313125255080234">"Елу\nбір"</item>
+ <item msgid="1559678130725716542">"Елу\nекі"</item>
+ <item msgid="431441994725492377">"Елу\nүш"</item>
+ <item msgid="6345774640539623024">"Елу\nтөрт"</item>
+ <item msgid="8018192990793931120">"Елу\nбес"</item>
+ <item msgid="6187650843754604534">"Елу\nалты"</item>
+ <item msgid="8727240174015993259">"Елу\nжеті"</item>
+ <item msgid="848339003778952950">"Елу\nсегіз"</item>
+ <item msgid="5798985802835423618">"Елу\nтоғыз"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-km/strings.xml b/packages/SystemUI/res-keyguard/values-km/strings.xml
index dcd6ce7..80b124a 100644
--- a/packages/SystemUI/res-keyguard/values-km/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-km/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">ឥឡូវនេះស៊ីមត្រូវបានបិទ។ សូមបញ្ចូលកូដ PUK ដើម្បីបន្ត។ អ្នកនៅសល់ការព្យាយាម <xliff:g id="_NUMBER_1">%d</xliff:g> ដងទៀតមុនពេលស៊ីមមិនអាចប្រើបានជាអចិន្ត្រៃយ៍។ ទាក់ទងទៅក្រុមហ៊ុនសេវាទូរសព្ទសម្រាប់ព័ត៌មានលម្អិត។</item>
<item quantity="one">ឥឡូវនេះស៊ីមត្រូវបានបិទ។ សូមបញ្ចូលកូដ PUK ដើម្បីបន្ត។ អ្នកនៅសល់ការព្យាយាម <xliff:g id="_NUMBER_0">%d</xliff:g> ដងទៀតមុនពេលស៊ីមមិនអាចប្រើបានជាអចិន្ត្រៃយ៍។ ទាក់ទងទៅក្រុមហ៊ុនសេវាទូរសព្ទសម្រាប់ព័ត៌មានលម្អិត។</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"វាជា"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"ដប់ពីរ"</item>
+ <item msgid="7389464214252023751">"មួយ"</item>
+ <item msgid="8803180377002008046">"ពីរ"</item>
+ <item msgid="8614897059944644719">"បី"</item>
+ <item msgid="2293058674782619556">"បួន"</item>
+ <item msgid="4815402358455041664">"ប្រាំ"</item>
+ <item msgid="3325754778509665687">"ប្រាំមួយ"</item>
+ <item msgid="5805551341866280575">"ប្រាំពីរ"</item>
+ <item msgid="203334816668238610">"ប្រាំបី"</item>
+ <item msgid="4828052671464488923">"ប្រាំបួន"</item>
+ <item msgid="2233497913571137419">"ដប់"</item>
+ <item msgid="5621554266768657830">"ដប់មួយ"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"ម៉ោង"</item>
+ <item msgid="8837126587669001578">"មួយ"</item>
+ <item msgid="4294343372940455660">"ពីរ"</item>
+ <item msgid="7129166637707421536">"បី"</item>
+ <item msgid="7579404865008788673">"បួន"</item>
+ <item msgid="3873924689207380586">"ប្រាំ"</item>
+ <item msgid="4849565597850069377">"ប្រាំមួយ"</item>
+ <item msgid="4404219424523572364">"ប្រាំពីរ"</item>
+ <item msgid="8740481214764087329">"ប្រាំបី"</item>
+ <item msgid="1713216865806811237">"ប្រាំបួន"</item>
+ <item msgid="3508406095411245038">"ដប់"</item>
+ <item msgid="7161996337755311711">"ដប់មួយ"</item>
+ <item msgid="4044549963329624197">"ដប់ពីរ"</item>
+ <item msgid="333373157917379088">"ដប់បី"</item>
+ <item msgid="2631202907124819385">"ដប់បួន"</item>
+ <item msgid="6472396076858033453">"ដប់ប្រាំ"</item>
+ <item msgid="8656981856181581643">"ដប់ប្រាំមួយ"</item>
+ <item msgid="7289026608562030619">"ដប់ប្រាំពីរ"</item>
+ <item msgid="3881477602692646573">"ដប់ប្រាំបី"</item>
+ <item msgid="3358129827772984226">"ដប់ប្រាំបួន"</item>
+ <item msgid="3308575407402865807">"ម្ភៃ"</item>
+ <item msgid="5346560955382229629">"ម្ភៃ\nមួយ"</item>
+ <item msgid="226750304761473436">"ម្ភៃ\nពីរ"</item>
+ <item msgid="616811325336838734">"ម្ភៃ\nបី"</item>
+ <item msgid="616346116869053440">"ម្ភៃ\nបួន"</item>
+ <item msgid="4642996410384042830">"ម្ភៃ\nប្រាំ"</item>
+ <item msgid="7506092849993571465">"ម្ភៃ\nប្រាំមួយ"</item>
+ <item msgid="1915078191101042031">"ម្ភៃ\nប្រាំពីរ"</item>
+ <item msgid="4292378641900520252">"ម្ភៃ\nប្រាំបី"</item>
+ <item msgid="5339513901773103696">"ម្ភៃ\nប្រាំបួន"</item>
+ <item msgid="3574673250891657607">"សាមសិប"</item>
+ <item msgid="5796923836589110940">"សាមសិប\nមួយ"</item>
+ <item msgid="5859323597571702052">"សាមសិប\nពីរ"</item>
+ <item msgid="5133326723148876507">"សាមសិប\nបី"</item>
+ <item msgid="2693999494655663096">"សាមសិប\nបួន"</item>
+ <item msgid="3316754944962836197">"សាមសិប\nប្រាំ"</item>
+ <item msgid="816891008836796723">"សាមសិប\nប្រាំមួយ"</item>
+ <item msgid="9158890488666520078">"សាមសិប\nប្រាំពីរ"</item>
+ <item msgid="1894769703213894011">"សាមសិប\nប្រាំបី"</item>
+ <item msgid="5638820345598572399">"សាមសិប\nប្រាំបួន"</item>
+ <item msgid="8838304023017895439">"សែសិប"</item>
+ <item msgid="1834742948932559597">"សែសិប\nមួយ"</item>
+ <item msgid="6573707308847773944">"សែសិប\nពីរ"</item>
+ <item msgid="2450149950652678001">"សែសិប\nបី"</item>
+ <item msgid="2874667401318178036">"សែសិប\nបួន"</item>
+ <item msgid="3391101532763048862">"សែសិប\nប្រាំ"</item>
+ <item msgid="1671489330863254362">"សែសិប\nប្រាំមួយ"</item>
+ <item msgid="5916017359554531038">"សែសិប\nប្រាំពីរ"</item>
+ <item msgid="8205413177993059967">"សែសិប\nប្រាំបី"</item>
+ <item msgid="6607867415142171302">"សែសិប\nប្រាំបួន"</item>
+ <item msgid="8358850748472089162">"ហាសិប"</item>
+ <item msgid="3551313125255080234">"ហាសិប\nមួយ"</item>
+ <item msgid="1559678130725716542">"ហាសិប\nពីរ"</item>
+ <item msgid="431441994725492377">"ហាសិប\nបី"</item>
+ <item msgid="6345774640539623024">"ហាសិប\nបួន"</item>
+ <item msgid="8018192990793931120">"ហាសិប\nប្រាំ"</item>
+ <item msgid="6187650843754604534">"ហាសិប\nប្រាំមួយ"</item>
+ <item msgid="8727240174015993259">"ហាសិប\nប្រាំពីរ"</item>
+ <item msgid="848339003778952950">"ហាសិប\nប្រាំបី"</item>
+ <item msgid="5798985802835423618">"ហាសិប\nប្រាំបួន"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-kn/strings.xml b/packages/SystemUI/res-keyguard/values-kn/strings.xml
index 39fdf55..f48d606 100644
--- a/packages/SystemUI/res-keyguard/values-kn/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-kn/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">ಸಿಮ್ ಅನ್ನು ಈಗ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ಮುಂದುವರಿಸಲು PUK ಕೋಡ್ ನಮೂದಿಸಿ. ಸಿಮ್ ಶಾಶ್ವತವಾಗಿ ನಿಷ್ಪ್ರಯೋಜಕವಾಗುವ ಮುನ್ನ ನಿಮ್ಮಲ್ಲಿ <xliff:g id="_NUMBER_1">%d</xliff:g> ಪ್ರಯತ್ನಗಳು ಬಾಕಿ ಉಳಿದಿವೆ. ವಿವರಗಳಿಗಾಗಿ ವಾಹಕವನ್ನು ಸಂಪರ್ಕಿಸಿ.</item>
<item quantity="other">ಸಿಮ್ ಅನ್ನು ಈಗ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ. ಮುಂದುವರಿಸಲು PUK ಕೋಡ್ ನಮೂದಿಸಿ. ಸಿಮ್ ಶಾಶ್ವತವಾಗಿ ನಿಷ್ಪ್ರಯೋಜಕವಾಗುವ ಮುನ್ನ ನಿಮ್ಮಲ್ಲಿ <xliff:g id="_NUMBER_1">%d</xliff:g> ಪ್ರಯತ್ನಗಳು ಬಾಕಿ ಉಳಿದಿವೆ. ವಿವರಗಳಿಗಾಗಿ ವಾಹಕವನ್ನು ಸಂಪರ್ಕಿಸಿ.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"ಇದು"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"ಹನ್ನೆರಡು"</item>
+ <item msgid="7389464214252023751">"ಒಂದು"</item>
+ <item msgid="8803180377002008046">"ಎರಡು"</item>
+ <item msgid="8614897059944644719">"ಮೂರು"</item>
+ <item msgid="2293058674782619556">"ನಾಲ್ಕು"</item>
+ <item msgid="4815402358455041664">"ಐದು"</item>
+ <item msgid="3325754778509665687">"ಆರು"</item>
+ <item msgid="5805551341866280575">"ಏಳು"</item>
+ <item msgid="203334816668238610">"ಎಂಟು"</item>
+ <item msgid="4828052671464488923">"ಒಂಬತ್ತು"</item>
+ <item msgid="2233497913571137419">"ಹತ್ತು"</item>
+ <item msgid="5621554266768657830">"ಹನ್ನೊಂದು"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"ಗಂಟೆ"</item>
+ <item msgid="8837126587669001578">"ಒಂದು"</item>
+ <item msgid="4294343372940455660">"ಎರಡು"</item>
+ <item msgid="7129166637707421536">"ಮೂರು"</item>
+ <item msgid="7579404865008788673">"ನಾಲ್ಕು"</item>
+ <item msgid="3873924689207380586">"ಐದು"</item>
+ <item msgid="4849565597850069377">"ಆರು"</item>
+ <item msgid="4404219424523572364">"ಏಳು"</item>
+ <item msgid="8740481214764087329">"ಎಂಟು"</item>
+ <item msgid="1713216865806811237">"ಒಂಬತ್ತು"</item>
+ <item msgid="3508406095411245038">"ಹತ್ತು"</item>
+ <item msgid="7161996337755311711">"ಹನ್ನೊಂದು"</item>
+ <item msgid="4044549963329624197">"ಹನ್ನೆರಡು"</item>
+ <item msgid="333373157917379088">"ಹದಿಮೂರು"</item>
+ <item msgid="2631202907124819385">"ಹದಿನಾಲ್ಕು"</item>
+ <item msgid="6472396076858033453">"ಹದಿನೈದು"</item>
+ <item msgid="8656981856181581643">"ಹದಿನಾರು"</item>
+ <item msgid="7289026608562030619">"ಹದಿನೇಳು"</item>
+ <item msgid="3881477602692646573">"ಹದಿನೆಂಟು"</item>
+ <item msgid="3358129827772984226">"ಹತ್ತೊಂಬತ್ತು"</item>
+ <item msgid="3308575407402865807">"ಇಪ್ಪತ್ತು"</item>
+ <item msgid="5346560955382229629">"ಇಪ್ಪತ್ತೊಂದು\n"</item>
+ <item msgid="226750304761473436">"ಇಪ್ಪತ್ತೆರಡು\n"</item>
+ <item msgid="616811325336838734">"ಇಪ್ಪತ್ತಮೂರು\n"</item>
+ <item msgid="616346116869053440">"ಇಪ್ಪತ್ತನಾಲ್ಕು\n"</item>
+ <item msgid="4642996410384042830">"ಇಪ್ಪತ್ತೈದು\n"</item>
+ <item msgid="7506092849993571465">"ಇಪ್ಪತ್ತಾರು\n"</item>
+ <item msgid="1915078191101042031">"ಇಪ್ಪತ್ತೇಳು\n"</item>
+ <item msgid="4292378641900520252">"ಇಪ್ಪತ್ತೆಂಟು\n"</item>
+ <item msgid="5339513901773103696">"ಇಪ್ಪತ್ತೊಂಬತ್ತು\n"</item>
+ <item msgid="3574673250891657607">"ಮೂವತ್ತು"</item>
+ <item msgid="5796923836589110940">"ಮೂವತ್ತೊಂದು\n"</item>
+ <item msgid="5859323597571702052">"ಮೂವತ್ತೆರಡು\n"</item>
+ <item msgid="5133326723148876507">"ಮೂವತ್ಮೂರು\n"</item>
+ <item msgid="2693999494655663096">"ಮೂವತ್ತು\nನಾಲ್ಕು"</item>
+ <item msgid="3316754944962836197">"ಮೂವತ್ತೈದು\n"</item>
+ <item msgid="816891008836796723">"ಮೂವತ್ತಾರು\n"</item>
+ <item msgid="9158890488666520078">"ಮೂವತ್ತೇಳು\n"</item>
+ <item msgid="1894769703213894011">"ಮೂವತ್ತೆಂಟು \n"</item>
+ <item msgid="5638820345598572399">"ಮೂವತ್ತೊಂಬತ್ತು\n"</item>
+ <item msgid="8838304023017895439">"ನಲವತ್ತು"</item>
+ <item msgid="1834742948932559597">"ನಲವತ್ತೊಂದು\n"</item>
+ <item msgid="6573707308847773944">"ನಲವತ್ತೇರಡು\n"</item>
+ <item msgid="2450149950652678001">"ನಲವತ್ಮೂರು\n"</item>
+ <item msgid="2874667401318178036">"ನಲವತ್ತು\nನಾಲ್ಕು"</item>
+ <item msgid="3391101532763048862">"ನಲವತ್ತೈದು\n"</item>
+ <item msgid="1671489330863254362">"ನಲವತ್ತಾರು\n"</item>
+ <item msgid="5916017359554531038">"ನಲವತ್ತೇಳು\n"</item>
+ <item msgid="8205413177993059967">"ನಲವತ್ತೆಂಟು\n"</item>
+ <item msgid="6607867415142171302">"ನಲವತ್ತೊಂಬತ್ತು\n"</item>
+ <item msgid="8358850748472089162">"ಐವತ್ತು"</item>
+ <item msgid="3551313125255080234">"ಐವತ್ತೊಂದು\n"</item>
+ <item msgid="1559678130725716542">"ಐವತ್ತೇರಡು\n"</item>
+ <item msgid="431441994725492377">"ಐವತ್ಮೂರು\n"</item>
+ <item msgid="6345774640539623024">"ಐವತ್ನಾಲ್ಕು\n"</item>
+ <item msgid="8018192990793931120">"ಐವತ್ತೈದು\n"</item>
+ <item msgid="6187650843754604534">"ಐವತ್ತಾರು\n"</item>
+ <item msgid="8727240174015993259">"ಐವತ್ತೇಳು\n"</item>
+ <item msgid="848339003778952950">"ಐವತ್ತೆಂಟು\n"</item>
+ <item msgid="5798985802835423618">"ಐವತ್ತೊಂಬತ್ತು\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ko/strings.xml b/packages/SystemUI/res-keyguard/values-ko/strings.xml
index c20a9dd..0466009 100644
--- a/packages/SystemUI/res-keyguard/values-ko/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ko/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM이 사용 중지되었습니다. 계속하려면 PUK 코드를 입력하세요. <xliff:g id="_NUMBER_1">%d</xliff:g>번 더 실패하면 SIM을 완전히 사용할 수 없게 됩니다. 자세한 내용은 이동통신사에 문의하세요.</item>
<item quantity="one">SIM이 사용 중지되었습니다. 계속하려면 PUK 코드를 입력하세요. <xliff:g id="_NUMBER_0">%d</xliff:g>번 더 실패하면 SIM을 완전히 사용할 수 없게 됩니다. 자세한 내용은 이동통신사에 문의하세요.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"현재 시각:"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"열두 시"</item>
+ <item msgid="7389464214252023751">"한 시"</item>
+ <item msgid="8803180377002008046">"두 시"</item>
+ <item msgid="8614897059944644719">"세 시"</item>
+ <item msgid="2293058674782619556">"네 시"</item>
+ <item msgid="4815402358455041664">"다섯 시"</item>
+ <item msgid="3325754778509665687">"여섯 시"</item>
+ <item msgid="5805551341866280575">"일곱 시"</item>
+ <item msgid="203334816668238610">"여덟 시"</item>
+ <item msgid="4828052671464488923">"아홉 시"</item>
+ <item msgid="2233497913571137419">"열 시"</item>
+ <item msgid="5621554266768657830">"열한 시"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"정각"</item>
+ <item msgid="8837126587669001578">"일 분"</item>
+ <item msgid="4294343372940455660">"이 분"</item>
+ <item msgid="7129166637707421536">"삼 분"</item>
+ <item msgid="7579404865008788673">"사 분"</item>
+ <item msgid="3873924689207380586">"오 분"</item>
+ <item msgid="4849565597850069377">"육 분"</item>
+ <item msgid="4404219424523572364">"칠 분"</item>
+ <item msgid="8740481214764087329">"팔 분"</item>
+ <item msgid="1713216865806811237">"구 분"</item>
+ <item msgid="3508406095411245038">"십 분"</item>
+ <item msgid="7161996337755311711">"십일 분"</item>
+ <item msgid="4044549963329624197">"십이 분"</item>
+ <item msgid="333373157917379088">"십삼 분"</item>
+ <item msgid="2631202907124819385">"십사 분"</item>
+ <item msgid="6472396076858033453">"십오 분"</item>
+ <item msgid="8656981856181581643">"십육 분"</item>
+ <item msgid="7289026608562030619">"십칠 분"</item>
+ <item msgid="3881477602692646573">"십팔 분"</item>
+ <item msgid="3358129827772984226">"십구 분"</item>
+ <item msgid="3308575407402865807">"이십 분"</item>
+ <item msgid="5346560955382229629">"이십\n일 분"</item>
+ <item msgid="226750304761473436">"이십\n이 분"</item>
+ <item msgid="616811325336838734">"이십\n삼 분"</item>
+ <item msgid="616346116869053440">"이십\n사 분"</item>
+ <item msgid="4642996410384042830">"이십\n오 분"</item>
+ <item msgid="7506092849993571465">"이십\n육 분"</item>
+ <item msgid="1915078191101042031">"이십\n칠 분"</item>
+ <item msgid="4292378641900520252">"이십\n팔 분"</item>
+ <item msgid="5339513901773103696">"이십\n구 분"</item>
+ <item msgid="3574673250891657607">"삼십 분"</item>
+ <item msgid="5796923836589110940">"삼십\n일 분"</item>
+ <item msgid="5859323597571702052">"삼십\n이 분"</item>
+ <item msgid="5133326723148876507">"삼십\n삼 분"</item>
+ <item msgid="2693999494655663096">"삼십\n사분"</item>
+ <item msgid="3316754944962836197">"삼십\n오 분"</item>
+ <item msgid="816891008836796723">"삼십\n육 분"</item>
+ <item msgid="9158890488666520078">"삼십\n칠 분"</item>
+ <item msgid="1894769703213894011">"삼십\n팔 분"</item>
+ <item msgid="5638820345598572399">"삼십\n구 분"</item>
+ <item msgid="8838304023017895439">"사십 분"</item>
+ <item msgid="1834742948932559597">"사십\n일 분"</item>
+ <item msgid="6573707308847773944">"사십\n이 분"</item>
+ <item msgid="2450149950652678001">"사십\n삼 분"</item>
+ <item msgid="2874667401318178036">"사십\n사 분"</item>
+ <item msgid="3391101532763048862">"사십\n오 분"</item>
+ <item msgid="1671489330863254362">"사십\n육분"</item>
+ <item msgid="5916017359554531038">"사십\n칠 분"</item>
+ <item msgid="8205413177993059967">"사십\n팔 분"</item>
+ <item msgid="6607867415142171302">"사십\n구 분"</item>
+ <item msgid="8358850748472089162">"오십 분"</item>
+ <item msgid="3551313125255080234">"오십\n일 분"</item>
+ <item msgid="1559678130725716542">"오십\n이 분"</item>
+ <item msgid="431441994725492377">"오십\n삼 분"</item>
+ <item msgid="6345774640539623024">"사십\n사 분"</item>
+ <item msgid="8018192990793931120">"오십\n오 분"</item>
+ <item msgid="6187650843754604534">"오십\n육 분"</item>
+ <item msgid="8727240174015993259">"오십\n칠 분"</item>
+ <item msgid="848339003778952950">"사십\n팔 분"</item>
+ <item msgid="5798985802835423618">"오십\n구 분"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ky/strings.xml b/packages/SystemUI/res-keyguard/values-ky/strings.xml
index 9416843..eca9b22 100644
--- a/packages/SystemUI/res-keyguard/values-ky/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ky/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM-карта азыр жарактан чыкты. Улантуу үчүн PUK-кодду киргизиңиз. SIM-картанын биротоло жарактан чыгарына <xliff:g id="_NUMBER_1">%d</xliff:g> аракет калды. Чоо-жайын билүү үчүн байланыш операторуна кайрылыңыз.</item>
<item quantity="one">SIM-карта азыр жарактан чыкты. Улантуу үчүн PUK-кодду киргизиңиз. SIM-картанын биротоло жарактан чыгаарына <xliff:g id="_NUMBER_0">%d</xliff:g> аракет калды. Чоо-жайын билүү үчүн байланыш операторуна кайрылыңыз.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Саат"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Он эки"</item>
+ <item msgid="7389464214252023751">"Бир"</item>
+ <item msgid="8803180377002008046">"Эки"</item>
+ <item msgid="8614897059944644719">"Үч"</item>
+ <item msgid="2293058674782619556">"Төрт"</item>
+ <item msgid="4815402358455041664">"Беш"</item>
+ <item msgid="3325754778509665687">"Алты"</item>
+ <item msgid="5805551341866280575">"Жети"</item>
+ <item msgid="203334816668238610">"Сегиз"</item>
+ <item msgid="4828052671464488923">"Тогуз"</item>
+ <item msgid="2233497913571137419">"Он"</item>
+ <item msgid="5621554266768657830">"Он бир"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Саат"</item>
+ <item msgid="8837126587669001578">"Ноль бир"</item>
+ <item msgid="4294343372940455660">"Ноль эки"</item>
+ <item msgid="7129166637707421536">"Ноль үч"</item>
+ <item msgid="7579404865008788673">"Ноль төрт"</item>
+ <item msgid="3873924689207380586">"Ноль беш"</item>
+ <item msgid="4849565597850069377">"Ноль алты"</item>
+ <item msgid="4404219424523572364">"Ноль жети"</item>
+ <item msgid="8740481214764087329">"Ноль сегиз"</item>
+ <item msgid="1713216865806811237">"Ноль тогуз"</item>
+ <item msgid="3508406095411245038">"Он"</item>
+ <item msgid="7161996337755311711">"Он бир"</item>
+ <item msgid="4044549963329624197">"Он эки"</item>
+ <item msgid="333373157917379088">"Он үч"</item>
+ <item msgid="2631202907124819385">"Он төрт"</item>
+ <item msgid="6472396076858033453">"Он беш"</item>
+ <item msgid="8656981856181581643">"Он алты"</item>
+ <item msgid="7289026608562030619">"Он жети"</item>
+ <item msgid="3881477602692646573">"Он сегиз"</item>
+ <item msgid="3358129827772984226">"Он тогуз"</item>
+ <item msgid="3308575407402865807">"Жыйырма"</item>
+ <item msgid="5346560955382229629">"Жыйырма\nбир"</item>
+ <item msgid="226750304761473436">"Жыйырма\nэки"</item>
+ <item msgid="616811325336838734">"Жыйырма\nүч"</item>
+ <item msgid="616346116869053440">"Жыйырма\nтөрт"</item>
+ <item msgid="4642996410384042830">"Жыйырма\nбеш"</item>
+ <item msgid="7506092849993571465">"Жыйырма\nалты"</item>
+ <item msgid="1915078191101042031">"Жыйырма\nжети"</item>
+ <item msgid="4292378641900520252">"Жыйырма\nсегиз"</item>
+ <item msgid="5339513901773103696">"Жыйырма\nтогуз"</item>
+ <item msgid="3574673250891657607">"Отуз"</item>
+ <item msgid="5796923836589110940">"Отуз\nбир"</item>
+ <item msgid="5859323597571702052">"Отуз\nэки"</item>
+ <item msgid="5133326723148876507">"Отуз\nүч"</item>
+ <item msgid="2693999494655663096">"Отуз\nтөрт"</item>
+ <item msgid="3316754944962836197">"Отуз\nбеш"</item>
+ <item msgid="816891008836796723">"Отуз\nалты"</item>
+ <item msgid="9158890488666520078">"Кырк\nжети"</item>
+ <item msgid="1894769703213894011">"Отуз\nсегиз"</item>
+ <item msgid="5638820345598572399">"Отуз\nтогуз"</item>
+ <item msgid="8838304023017895439">"Кырк"</item>
+ <item msgid="1834742948932559597">"Кырк\nбир"</item>
+ <item msgid="6573707308847773944">"Кырк\nэки"</item>
+ <item msgid="2450149950652678001">"Кырк\nүч"</item>
+ <item msgid="2874667401318178036">"Кырк\nтөрт"</item>
+ <item msgid="3391101532763048862">"Кырк\nбеш"</item>
+ <item msgid="1671489330863254362">"Кырк\nалты"</item>
+ <item msgid="5916017359554531038">"Кырк\nжети"</item>
+ <item msgid="8205413177993059967">"Кырк\nсегиз"</item>
+ <item msgid="6607867415142171302">"Кырк\nтогуз"</item>
+ <item msgid="8358850748472089162">"Элүү"</item>
+ <item msgid="3551313125255080234">"Элүү\nбир"</item>
+ <item msgid="1559678130725716542">"Элүү\nэки"</item>
+ <item msgid="431441994725492377">"Элүү\nүч"</item>
+ <item msgid="6345774640539623024">"Элүү\nтөрт"</item>
+ <item msgid="8018192990793931120">"Кырк\nбеш"</item>
+ <item msgid="6187650843754604534">"Элүү\nалты"</item>
+ <item msgid="8727240174015993259">"Кырк\nжети"</item>
+ <item msgid="848339003778952950">"Элүү\nсегиз"</item>
+ <item msgid="5798985802835423618">"Элүү\nтогуз"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-lo/strings.xml b/packages/SystemUI/res-keyguard/values-lo/strings.xml
index c00f2f0..bd6e53d 100644
--- a/packages/SystemUI/res-keyguard/values-lo/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-lo/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">ຕອນນີ້ປິດການນຳໃຊ້ SIM ແລ້ວ. ໃສ່ລະຫັດ PUK ເພື່ອດຳເນີນການຕໍ່. ທ່ານສາມາດລອງໄດ້ອີກ <xliff:g id="_NUMBER_1">%d</xliff:g> ເທື່ອກ່ອນທີ່ SIM ຈະບໍ່ສາມາດໃຊ້ໄດ້ຖາວອນ. ກະລຸນາຕິດຕໍ່ຜູ້ໃຫ້ບໍລິການສຳລັບລາຍລະອຽດ.</item>
<item quantity="one">ຕອນນີ້ປິດການນຳໃຊ້ SIM ແລ້ວ. ໃສ່ລະຫັດ PUK ເພື່ອດຳເນີນການຕໍ່. ທ່ານສາມາດລອງໄດ້ອີກ <xliff:g id="_NUMBER_0">%d</xliff:g> ເທື່ອກ່ອນທີ່ SIM ຈະບໍ່ສາມາດໃຊ້ໄດ້ຖາວອນ. ກະລຸນາຕິດຕໍ່ຜູ້ໃຫ້ບໍລິການສຳລັບລາຍລະອຽດ.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"ມັນແມ່ນ"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"ສິບສອງ"</item>
+ <item msgid="7389464214252023751">"ໜຶ່ງ"</item>
+ <item msgid="8803180377002008046">"ສອງ"</item>
+ <item msgid="8614897059944644719">"ສາມ"</item>
+ <item msgid="2293058674782619556">"ສີ່"</item>
+ <item msgid="4815402358455041664">"ຫ້າ"</item>
+ <item msgid="3325754778509665687">"ຫົກ"</item>
+ <item msgid="5805551341866280575">"ເຈັດ"</item>
+ <item msgid="203334816668238610">"ແປດ"</item>
+ <item msgid="4828052671464488923">"ເກົ້າ"</item>
+ <item msgid="2233497913571137419">"ສິບ"</item>
+ <item msgid="5621554266768657830">"ສິບເອັດ"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"O’Clock"</item>
+ <item msgid="8837126587669001578">"O’One"</item>
+ <item msgid="4294343372940455660">"O’Two"</item>
+ <item msgid="7129166637707421536">"O’Three"</item>
+ <item msgid="7579404865008788673">"O’Four"</item>
+ <item msgid="3873924689207380586">"O’Five"</item>
+ <item msgid="4849565597850069377">"O’Six"</item>
+ <item msgid="4404219424523572364">"O’Seven"</item>
+ <item msgid="8740481214764087329">"O’Eight"</item>
+ <item msgid="1713216865806811237">"O’Nine"</item>
+ <item msgid="3508406095411245038">"ສິບ"</item>
+ <item msgid="7161996337755311711">"ສິບເອັດ"</item>
+ <item msgid="4044549963329624197">"ສິບສອງ"</item>
+ <item msgid="333373157917379088">"ສິບສາມ"</item>
+ <item msgid="2631202907124819385">"ສິບສີ່"</item>
+ <item msgid="6472396076858033453">"ສິບຫ້າ"</item>
+ <item msgid="8656981856181581643">"ສິບຫົກ"</item>
+ <item msgid="7289026608562030619">"ສິບເຈັດ"</item>
+ <item msgid="3881477602692646573">"ສິບແປດ"</item>
+ <item msgid="3358129827772984226">"ສິບເກົ້າ"</item>
+ <item msgid="3308575407402865807">"ຊາວ"</item>
+ <item msgid="5346560955382229629">"ຊາວ\nເອັດ"</item>
+ <item msgid="226750304761473436">"ຊາວ\nສອງ"</item>
+ <item msgid="616811325336838734">"ຊາວ\nສາມ"</item>
+ <item msgid="616346116869053440">"ຊາວ\nສີ່"</item>
+ <item msgid="4642996410384042830">"ຊາວ\nຫ້າ"</item>
+ <item msgid="7506092849993571465">"ຊາວ\nຫົກ"</item>
+ <item msgid="1915078191101042031">"ຊາວ\nເຈັດ"</item>
+ <item msgid="4292378641900520252">"ຊາວ\nແປດ"</item>
+ <item msgid="5339513901773103696">"ຊາວ\nເກົ້າ"</item>
+ <item msgid="3574673250891657607">"ສາມສິບ"</item>
+ <item msgid="5796923836589110940">"ສາມ\nສິບເອັດ"</item>
+ <item msgid="5859323597571702052">"ສາມ\nສິບສອງ"</item>
+ <item msgid="5133326723148876507">"ສາມ\nສິບສາມ"</item>
+ <item msgid="2693999494655663096">"ສາມ\nສິບສີ່"</item>
+ <item msgid="3316754944962836197">"ສາມ\nສິບຫ້າ"</item>
+ <item msgid="816891008836796723">"ສາມ\nສິບຫົກ"</item>
+ <item msgid="9158890488666520078">"ສາມ\nສິບເຈັດ"</item>
+ <item msgid="1894769703213894011">"ສາມສິບ\nແປດ"</item>
+ <item msgid="5638820345598572399">"ສາມ\nສິບເກົ້າ"</item>
+ <item msgid="8838304023017895439">"ສີ່ສິບ"</item>
+ <item msgid="1834742948932559597">"ສີ່\nສິບເອັດ"</item>
+ <item msgid="6573707308847773944">"ສີ່\nສິບສອງ"</item>
+ <item msgid="2450149950652678001">"ສີ່\nສິບສາມ"</item>
+ <item msgid="2874667401318178036">"ສີ່\nສິບສີ່"</item>
+ <item msgid="3391101532763048862">"ສີ່\nສິບຫ້າ"</item>
+ <item msgid="1671489330863254362">"ສີ່\nສິບຫົກ"</item>
+ <item msgid="5916017359554531038">"ສີ່\nສິບເຈັດ"</item>
+ <item msgid="8205413177993059967">"ສີ່\nສິບແປດ"</item>
+ <item msgid="6607867415142171302">"ສີ່\nສິບເກົ້າ"</item>
+ <item msgid="8358850748472089162">"ຫ້າສິບ"</item>
+ <item msgid="3551313125255080234">"ຫ້າ\nສິບເອັດ"</item>
+ <item msgid="1559678130725716542">"ຫ້າ\nສິບສອງ"</item>
+ <item msgid="431441994725492377">"ຫ້າ\nສິບສາມ"</item>
+ <item msgid="6345774640539623024">"ຫ້າ\nສິບສີ່"</item>
+ <item msgid="8018192990793931120">"ຫ້າ\nສິບຫ້າ"</item>
+ <item msgid="6187650843754604534">"ຫ້າ\nສິບຫົກ"</item>
+ <item msgid="8727240174015993259">"ຫ້າ\nສິບເຈັດ"</item>
+ <item msgid="848339003778952950">"ຫ້າ\nສິບແປດ"</item>
+ <item msgid="5798985802835423618">"ຫ້າ\nສິບເກົ້າ"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-lt/strings.xml b/packages/SystemUI/res-keyguard/values-lt/strings.xml
index 71e04f2..6df93d8 100644
--- a/packages/SystemUI/res-keyguard/values-lt/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-lt/strings.xml
@@ -166,78 +166,81 @@
<item quantity="many">SIM kortelė dabar yra išjungta. Jei norite tęsti, įveskite PUK kodą. Jums liko <xliff:g id="_NUMBER_1">%d</xliff:g> bandymo. Paskui visiškai nebegalėsite naudoti SIM kortelės. Jei reikia išsamios informacijos, susisiekite su operatoriumi.</item>
<item quantity="other">SIM kortelė dabar yra išjungta. Jei norite tęsti, įveskite PUK kodą. Jums liko <xliff:g id="_NUMBER_1">%d</xliff:g> bandymų. Paskui visiškai nebegalėsite naudoti SIM kortelės. Jei reikia išsamios informacijos, susisiekite su operatoriumi.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Dabar"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Dvylika"</item>
+ <item msgid="7389464214252023751">"Pirma"</item>
+ <item msgid="8803180377002008046">"Dvi"</item>
+ <item msgid="8614897059944644719">"Trys"</item>
+ <item msgid="2293058674782619556">"Keturios"</item>
+ <item msgid="4815402358455041664">"Penkios"</item>
+ <item msgid="3325754778509665687">"Šešios"</item>
+ <item msgid="5805551341866280575">"Septyn."</item>
+ <item msgid="203334816668238610">"Aštuon."</item>
+ <item msgid="4828052671464488923">"Devynios"</item>
+ <item msgid="2233497913571137419">"Dešimt"</item>
+ <item msgid="5621554266768657830">"Vienuol."</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"val."</item>
+ <item msgid="8837126587669001578">"Pirma"</item>
+ <item msgid="4294343372940455660">"Dvi"</item>
+ <item msgid="7129166637707421536">"Trys"</item>
+ <item msgid="7579404865008788673">"Keturios"</item>
+ <item msgid="3873924689207380586">"Penkios"</item>
+ <item msgid="4849565597850069377">"Šešios"</item>
+ <item msgid="4404219424523572364">"Septynios"</item>
+ <item msgid="8740481214764087329">"Aštuonios"</item>
+ <item msgid="1713216865806811237">"Devynios"</item>
+ <item msgid="3508406095411245038">"Dešimt"</item>
+ <item msgid="7161996337755311711">"Vienuolika"</item>
+ <item msgid="4044549963329624197">"Dvylika"</item>
+ <item msgid="333373157917379088">"Trylika"</item>
+ <item msgid="2631202907124819385">"Keturiolika"</item>
+ <item msgid="6472396076858033453">"Penkiolika"</item>
+ <item msgid="8656981856181581643">"Šešiolika"</item>
+ <item msgid="7289026608562030619">"Septyniolika"</item>
+ <item msgid="3881477602692646573">"Aštuoniolika"</item>
+ <item msgid="3358129827772984226">"Devyniolika"</item>
+ <item msgid="3308575407402865807">"Dvidešimt"</item>
+ <item msgid="5346560955382229629">"Dvidešimt\nviena"</item>
+ <item msgid="226750304761473436">"Dvidešimt\ndvi"</item>
+ <item msgid="616811325336838734">"Dvidešimt\ntrys"</item>
+ <item msgid="616346116869053440">"Dvidešimt\nketur."</item>
+ <item msgid="4642996410384042830">"Dvidešimt\npenkios"</item>
+ <item msgid="7506092849993571465">"Dvidešimt\nšešios"</item>
+ <item msgid="1915078191101042031">"Dvidešimt\nseptyn."</item>
+ <item msgid="4292378641900520252">"Dvidešimt\naštuon."</item>
+ <item msgid="5339513901773103696">"Dvidešimt\ndevyn."</item>
+ <item msgid="3574673250891657607">"Trisdešimt"</item>
+ <item msgid="5796923836589110940">"Trisdešimt\nviena"</item>
+ <item msgid="5859323597571702052">"Trisdešimt\ndvi"</item>
+ <item msgid="5133326723148876507">"Trisdešimt\ntrys"</item>
+ <item msgid="2693999494655663096">"Trisdešimt\nketur."</item>
+ <item msgid="3316754944962836197">"Trisdeš.\npenkios"</item>
+ <item msgid="816891008836796723">"Trisdešimt\nšešios"</item>
+ <item msgid="9158890488666520078">"Trisdeš.\nseptyn."</item>
+ <item msgid="1894769703213894011">"Trisdeš.\naštuon."</item>
+ <item msgid="5638820345598572399">"Trisdešimt\ndevyn."</item>
+ <item msgid="8838304023017895439">"Keturiasdešimt"</item>
+ <item msgid="1834742948932559597">"Keturiasd.\nviena"</item>
+ <item msgid="6573707308847773944">"Keturiasdeš.\ndvi"</item>
+ <item msgid="2450149950652678001">"Keturiasdeš.\ntrys"</item>
+ <item msgid="2874667401318178036">"Keturiasd.\nketur."</item>
+ <item msgid="3391101532763048862">"Keturiasd.\npenk."</item>
+ <item msgid="1671489330863254362">"Keturiasd.\nšešios"</item>
+ <item msgid="5916017359554531038">"Keturiasd.\nsept."</item>
+ <item msgid="8205413177993059967">"Keturiasdeš.\našt."</item>
+ <item msgid="6607867415142171302">"Keduriasd.\ndevyn."</item>
+ <item msgid="8358850748472089162">"Penkiasdešimt"</item>
+ <item msgid="3551313125255080234">"Penkiasdeš.\nviena"</item>
+ <item msgid="1559678130725716542">"Penkiasdešimt\ndvi"</item>
+ <item msgid="431441994725492377">"Penkiasdeš.\ntrys"</item>
+ <item msgid="6345774640539623024">"Penkiasd.\nketur."</item>
+ <item msgid="8018192990793931120">"Penkiasdeš.\npenk."</item>
+ <item msgid="6187650843754604534">"Penkiasd.\nšešios"</item>
+ <item msgid="8727240174015993259">"Penkiasd.\nseptyn."</item>
+ <item msgid="848339003778952950">"Penkiasd.\naštuon."</item>
+ <item msgid="5798985802835423618">"Penkiasd.\ndevyn."</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-lv/strings.xml b/packages/SystemUI/res-keyguard/values-lv/strings.xml
index 4bdaa66..d906176 100644
--- a/packages/SystemUI/res-keyguard/values-lv/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-lv/strings.xml
@@ -158,78 +158,81 @@
<item quantity="one">SIM karte tagad ir atspējota. Ievadiet PUK kodu, lai turpinātu. Varat mēģināt vēl <xliff:g id="_NUMBER_1">%d</xliff:g> reizi. Kļūdas gadījumā SIM karti vairs nevarēs izmantot. Lai iegūtu detalizētu informāciju, sazinieties ar mobilo sakaru operatoru.</item>
<item quantity="other">SIM karte tagad ir atspējota. Ievadiet PUK kodu, lai turpinātu. Varat mēģināt vēl <xliff:g id="_NUMBER_1">%d</xliff:g> reizes. Kļūdas gadījumā SIM karti vairs nevarēs izmantot. Lai iegūtu detalizētu informāciju, sazinieties ar mobilo sakaru operatoru.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Laiks:"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Divpadsmit"</item>
+ <item msgid="7389464214252023751">"Viens"</item>
+ <item msgid="8803180377002008046">"Divi"</item>
+ <item msgid="8614897059944644719">"Trīs"</item>
+ <item msgid="2293058674782619556">"Četri"</item>
+ <item msgid="4815402358455041664">"Pieci"</item>
+ <item msgid="3325754778509665687">"Seši"</item>
+ <item msgid="5805551341866280575">"Septiņi"</item>
+ <item msgid="203334816668238610">"Astoņi"</item>
+ <item msgid="4828052671464488923">"Deviņi"</item>
+ <item msgid="2233497913571137419">"Desmit"</item>
+ <item msgid="5621554266768657830">"Vienpadsmit"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Nulle, nulle"</item>
+ <item msgid="8837126587669001578">"Viena"</item>
+ <item msgid="4294343372940455660">"Divas"</item>
+ <item msgid="7129166637707421536">"Trīs"</item>
+ <item msgid="7579404865008788673">"Četras"</item>
+ <item msgid="3873924689207380586">"Piecas"</item>
+ <item msgid="4849565597850069377">"Sešas"</item>
+ <item msgid="4404219424523572364">"Septiņas"</item>
+ <item msgid="8740481214764087329">"Astoņas"</item>
+ <item msgid="1713216865806811237">"Deviņas"</item>
+ <item msgid="3508406095411245038">"Desmit"</item>
+ <item msgid="7161996337755311711">"Vienpadsmit"</item>
+ <item msgid="4044549963329624197">"Divpadsmit"</item>
+ <item msgid="333373157917379088">"Trīspadsmit"</item>
+ <item msgid="2631202907124819385">"Četrpadsmit"</item>
+ <item msgid="6472396076858033453">"Piecpadsmit"</item>
+ <item msgid="8656981856181581643">"Sešdpadsmit"</item>
+ <item msgid="7289026608562030619">"Septiņpadsmit"</item>
+ <item msgid="3881477602692646573">"Astoņpadsmit"</item>
+ <item msgid="3358129827772984226">"Deviņpadsmit"</item>
+ <item msgid="3308575407402865807">"Divdesmit"</item>
+ <item msgid="5346560955382229629">"Divdesmit\nviena"</item>
+ <item msgid="226750304761473436">"Divdesmit\ndivas"</item>
+ <item msgid="616811325336838734">"Divdesmit\ntrīs"</item>
+ <item msgid="616346116869053440">"Divdesmit\nčetras"</item>
+ <item msgid="4642996410384042830">"Divdesmit\npiecas"</item>
+ <item msgid="7506092849993571465">"Divdesmit\nsešas"</item>
+ <item msgid="1915078191101042031">"Divdesmit\nseptiņas"</item>
+ <item msgid="4292378641900520252">"Divdesmit\nastoņas"</item>
+ <item msgid="5339513901773103696">"Divdesmit\ndeviņas"</item>
+ <item msgid="3574673250891657607">"Trīsdesmit"</item>
+ <item msgid="5796923836589110940">"Trīsdesmit\nviena"</item>
+ <item msgid="5859323597571702052">"Trīsdesmit\ndivas"</item>
+ <item msgid="5133326723148876507">"Trīsdesmit\ntrīs"</item>
+ <item msgid="2693999494655663096">"Trīsdesmit\nčetras"</item>
+ <item msgid="3316754944962836197">"Trīsdesmit\npiecas"</item>
+ <item msgid="816891008836796723">"Trīsdesmit\nsešas"</item>
+ <item msgid="9158890488666520078">"Trīsdesmit\nseptiņas"</item>
+ <item msgid="1894769703213894011">"Trīsdesmit\nastoņas"</item>
+ <item msgid="5638820345598572399">"Trīsdesmit\ndeviņas"</item>
+ <item msgid="8838304023017895439">"Četrdesmit"</item>
+ <item msgid="1834742948932559597">"Četrdesmit\nviena"</item>
+ <item msgid="6573707308847773944">"Četrdesmit\ndivas"</item>
+ <item msgid="2450149950652678001">"Četrdesmit\ntrīs"</item>
+ <item msgid="2874667401318178036">"Četrdesmit\nčetras"</item>
+ <item msgid="3391101532763048862">"Četrdesmit\npiecas"</item>
+ <item msgid="1671489330863254362">"Četrdesmit\nsešas"</item>
+ <item msgid="5916017359554531038">"Četrdesmit\nseptiņas"</item>
+ <item msgid="8205413177993059967">"Četrdesmit\nastoņas"</item>
+ <item msgid="6607867415142171302">"Četrdesmit\ndeviņas"</item>
+ <item msgid="8358850748472089162">"Piecdesmit"</item>
+ <item msgid="3551313125255080234">"Piecdesmit\nviena"</item>
+ <item msgid="1559678130725716542">"Piecdesmit\ndivas"</item>
+ <item msgid="431441994725492377">"Piecdesmit\ntrīs"</item>
+ <item msgid="6345774640539623024">"Piecdesmit\nčetras"</item>
+ <item msgid="8018192990793931120">"Piecdesmit\npiecas"</item>
+ <item msgid="6187650843754604534">"Piecdesmit\nsešas"</item>
+ <item msgid="8727240174015993259">"Piecdesmit\nseptiņas"</item>
+ <item msgid="848339003778952950">"Piecdesmit\nastoņas"</item>
+ <item msgid="5798985802835423618">"Piecdesmit\ndeviņas"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-mk/strings.xml b/packages/SystemUI/res-keyguard/values-mk/strings.xml
index b963d32..221b997 100644
--- a/packages/SystemUI/res-keyguard/values-mk/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-mk/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">SIM-картичката сега е оневозможена. Внесете PUK-код за да продолжите. Ви преостанува уште <xliff:g id="_NUMBER_1">%d</xliff:g> обид пред SIM-картичката да стане трајно неупотреблива. Контактирајте го операторот за детали.</item>
<item quantity="other">SIM-картичката сега е оневозможена. Внесете PUK-код за да продолжите. Ви преостануваат уште <xliff:g id="_NUMBER_1">%d</xliff:g> обиди пред SIM-картичката да стане трајно неупотреблива. Контактирајте го операторот за детали.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Сега е"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Дванаесет"</item>
+ <item msgid="7389464214252023751">"Еден"</item>
+ <item msgid="8803180377002008046">"Два"</item>
+ <item msgid="8614897059944644719">"Три"</item>
+ <item msgid="2293058674782619556">"Четири"</item>
+ <item msgid="4815402358455041664">"Пет"</item>
+ <item msgid="3325754778509665687">"Шест"</item>
+ <item msgid="5805551341866280575">"Седум"</item>
+ <item msgid="203334816668238610">"Осум"</item>
+ <item msgid="4828052671464488923">"Девет"</item>
+ <item msgid="2233497913571137419">"Десет"</item>
+ <item msgid="5621554266768657830">"Единаесет"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"часот"</item>
+ <item msgid="8837126587669001578">"Еден по полноќ"</item>
+ <item msgid="4294343372940455660">"Два по полноќ"</item>
+ <item msgid="7129166637707421536">"Три по полноќ"</item>
+ <item msgid="7579404865008788673">"Четири по полноќ"</item>
+ <item msgid="3873924689207380586">"Пет по полноќ"</item>
+ <item msgid="4849565597850069377">"Шест по полноќ"</item>
+ <item msgid="4404219424523572364">"Седум по полноќ"</item>
+ <item msgid="8740481214764087329">"Осум по полноќ"</item>
+ <item msgid="1713216865806811237">"Девет по полноќ"</item>
+ <item msgid="3508406095411245038">"Десет"</item>
+ <item msgid="7161996337755311711">"Единаесет"</item>
+ <item msgid="4044549963329624197">"Дванаесет"</item>
+ <item msgid="333373157917379088">"Тринаесет"</item>
+ <item msgid="2631202907124819385">"Четиринаесет"</item>
+ <item msgid="6472396076858033453">"Петнаесет"</item>
+ <item msgid="8656981856181581643">"Шестнаесет"</item>
+ <item msgid="7289026608562030619">"Седумнаесет"</item>
+ <item msgid="3881477602692646573">"Осумнаесет"</item>
+ <item msgid="3358129827772984226">"Деветнаесет"</item>
+ <item msgid="3308575407402865807">"Дваесет"</item>
+ <item msgid="5346560955382229629">"Дваесет\nи еден"</item>
+ <item msgid="226750304761473436">"Дваесет\nи два"</item>
+ <item msgid="616811325336838734">"Дваесет\nи три"</item>
+ <item msgid="616346116869053440">"Дваесет\nи четири"</item>
+ <item msgid="4642996410384042830">"Дваесет\nи пет"</item>
+ <item msgid="7506092849993571465">"Дваесет\nи шест"</item>
+ <item msgid="1915078191101042031">"Дваесет\nи седум"</item>
+ <item msgid="4292378641900520252">"Дваесет\nи осум"</item>
+ <item msgid="5339513901773103696">"Дваесет\nи девет"</item>
+ <item msgid="3574673250891657607">"Триесет"</item>
+ <item msgid="5796923836589110940">"Триесет\nи еден"</item>
+ <item msgid="5859323597571702052">"Триесет\nи два"</item>
+ <item msgid="5133326723148876507">"Триесет\nи три"</item>
+ <item msgid="2693999494655663096">"Триесет\nи четири"</item>
+ <item msgid="3316754944962836197">"Триесет\nи пет"</item>
+ <item msgid="816891008836796723">"Триесет\nи шест"</item>
+ <item msgid="9158890488666520078">"Триесет\nи седум"</item>
+ <item msgid="1894769703213894011">"Триесет\nи осум"</item>
+ <item msgid="5638820345598572399">"Триесет\nи девет"</item>
+ <item msgid="8838304023017895439">"Четириесет"</item>
+ <item msgid="1834742948932559597">"Четириесет\nи еден"</item>
+ <item msgid="6573707308847773944">"Четириесет\nи два"</item>
+ <item msgid="2450149950652678001">"Четириесет\nи три"</item>
+ <item msgid="2874667401318178036">"Четириесет\nи четири"</item>
+ <item msgid="3391101532763048862">"Четириесет\nи пет"</item>
+ <item msgid="1671489330863254362">"Четириесет\nи шест"</item>
+ <item msgid="5916017359554531038">"Четириесет\nи седум"</item>
+ <item msgid="8205413177993059967">"Четириесет\nи осум"</item>
+ <item msgid="6607867415142171302">"Четириесет\nи девет"</item>
+ <item msgid="8358850748472089162">"Педесет"</item>
+ <item msgid="3551313125255080234">"Педесет\nи еден"</item>
+ <item msgid="1559678130725716542">"Педесет\nи два"</item>
+ <item msgid="431441994725492377">"Педесет\nи три"</item>
+ <item msgid="6345774640539623024">"Педесет\nи четири"</item>
+ <item msgid="8018192990793931120">"Педесет\nи пет"</item>
+ <item msgid="6187650843754604534">"Педесет\nи шест"</item>
+ <item msgid="8727240174015993259">"Педесет\nи седум"</item>
+ <item msgid="848339003778952950">"Педесет\nи осум"</item>
+ <item msgid="5798985802835423618">"Педесет\nи девет"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ml/strings.xml b/packages/SystemUI/res-keyguard/values-ml/strings.xml
index 0af354f..e664288 100644
--- a/packages/SystemUI/res-keyguard/values-ml/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ml/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">സിം ഇപ്പോൾ പ്രവർത്തനരഹിതമാക്കി. തുടരുന്നതിന് PUK കോഡ് നൽകുക. സിം ശാശ്വതമായി ഉപയോഗശൂന്യമാകുന്നതിന് മുമ്പായി <xliff:g id="_NUMBER_1">%d</xliff:g> ശ്രമങ്ങൾ കൂടി ശേഷിക്കുന്നു. വിശദാംശങ്ങൾക്ക് കാരിയറുമായി ബന്ധപ്പെടുക.</item>
<item quantity="one">സിം ഇപ്പോൾ പ്രവർത്തനരഹിതമാക്കി. തുടരുന്നതിന് PUK കോഡ് നൽകുക. സിം ശാശ്വതമായി ഉപയോഗശൂന്യമാകുന്നതിന് മുമ്പായി <xliff:g id="_NUMBER_0">%d</xliff:g> ശ്രമം കൂടി ശേഷിക്കുന്നു. വിശദാംശങ്ങൾക്ക് കാരിയറുമായി ബന്ധപ്പെടുക.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"സമയം"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"പന്ത്രണ്ട്"</item>
+ <item msgid="7389464214252023751">"ഒന്ന്"</item>
+ <item msgid="8803180377002008046">"രണ്ട്"</item>
+ <item msgid="8614897059944644719">"മൂന്ന്"</item>
+ <item msgid="2293058674782619556">"നാല്"</item>
+ <item msgid="4815402358455041664">"അഞ്ച്"</item>
+ <item msgid="3325754778509665687">"ആറ്"</item>
+ <item msgid="5805551341866280575">"ഏഴ്"</item>
+ <item msgid="203334816668238610">"എട്ട്"</item>
+ <item msgid="4828052671464488923">"ഒമ്പത്"</item>
+ <item msgid="2233497913571137419">"പത്ത്"</item>
+ <item msgid="5621554266768657830">"പതിനൊന്ന്"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"മണി"</item>
+ <item msgid="8837126587669001578">"ഒന്ന്"</item>
+ <item msgid="4294343372940455660">"രണ്ട്"</item>
+ <item msgid="7129166637707421536">"മൂന്ന്"</item>
+ <item msgid="7579404865008788673">"നാല്"</item>
+ <item msgid="3873924689207380586">"അഞ്ച്"</item>
+ <item msgid="4849565597850069377">"ആറ്"</item>
+ <item msgid="4404219424523572364">"ഏഴ്"</item>
+ <item msgid="8740481214764087329">"എട്ട്"</item>
+ <item msgid="1713216865806811237">"ഒമ്പത്"</item>
+ <item msgid="3508406095411245038">"പത്ത്"</item>
+ <item msgid="7161996337755311711">"പതിനൊന്ന്"</item>
+ <item msgid="4044549963329624197">"പന്ത്രണ്ട്"</item>
+ <item msgid="333373157917379088">"പതിമൂന്ന്"</item>
+ <item msgid="2631202907124819385">"പതിനാല്"</item>
+ <item msgid="6472396076858033453">"പതിനഞ്ച്"</item>
+ <item msgid="8656981856181581643">"പതിനാറ്"</item>
+ <item msgid="7289026608562030619">"പതിനേഴ്"</item>
+ <item msgid="3881477602692646573">"പതിനെട്ട്"</item>
+ <item msgid="3358129827772984226">"പത്തൊമ്പത്"</item>
+ <item msgid="3308575407402865807">"ഇരുപത്"</item>
+ <item msgid="5346560955382229629">"ഇരുപത്തിയൊന്ന്\n"</item>
+ <item msgid="226750304761473436">"ഇരുപത്തിരണ്ട്\n"</item>
+ <item msgid="616811325336838734">"ഇരുപത്തിമൂന്ന്\n"</item>
+ <item msgid="616346116869053440">"ഇരുപത്തിനാല്\n"</item>
+ <item msgid="4642996410384042830">"ഇരുപത്തിയഞ്ച്\n"</item>
+ <item msgid="7506092849993571465">"ഇരുപത്തിയാറ്\n"</item>
+ <item msgid="1915078191101042031">"ഇരുപത്തിയേഴ്\n"</item>
+ <item msgid="4292378641900520252">"ഇരുപത്തിയെട്ട്\n"</item>
+ <item msgid="5339513901773103696">"ഇരുപത്തിയൊമ്പത്\n"</item>
+ <item msgid="3574673250891657607">"മുപ്പത്"</item>
+ <item msgid="5796923836589110940">"മുപ്പത്തിയൊന്ന്\n"</item>
+ <item msgid="5859323597571702052">"മുപ്പത്തിരണ്ട്\n"</item>
+ <item msgid="5133326723148876507">"മുപ്പത്തിമൂന്ന്\n"</item>
+ <item msgid="2693999494655663096">"മുപ്പത്തിനാല്\n"</item>
+ <item msgid="3316754944962836197">"അമ്പത്തിയഞ്ച്\n"</item>
+ <item msgid="816891008836796723">"മുപ്പത്തിയാറ്\n"</item>
+ <item msgid="9158890488666520078">"മുപ്പത്തിയേഴ്\n"</item>
+ <item msgid="1894769703213894011">"മുപ്പത്തിയെട്ട്\n"</item>
+ <item msgid="5638820345598572399">"മുപ്പത്തിയൊമ്പത്\n"</item>
+ <item msgid="8838304023017895439">"നാൽപത്"</item>
+ <item msgid="1834742948932559597">"നാൽപ്പത്തിയൊന്ന്\n"</item>
+ <item msgid="6573707308847773944">"നാൽപത്തിരണ്ട്\n"</item>
+ <item msgid="2450149950652678001">"നാൽപ്പത്തിമൂന്ന്\n"</item>
+ <item msgid="2874667401318178036">"നാൽപത്തിനാല്\n"</item>
+ <item msgid="3391101532763048862">"നാൽപത്തിയഞ്ച്\n"</item>
+ <item msgid="1671489330863254362">"നാൽപ്പത്തിയാറ്\n"</item>
+ <item msgid="5916017359554531038">"നാൽപത്തിയേഴ്\n"</item>
+ <item msgid="8205413177993059967">"നാൽപത്തിയെട്ട്\n"</item>
+ <item msgid="6607867415142171302">"നാൽപത്തിയൊമ്പത്\n"</item>
+ <item msgid="8358850748472089162">"അമ്പത്"</item>
+ <item msgid="3551313125255080234">"അമ്പത്തിയൊന്ന്\n"</item>
+ <item msgid="1559678130725716542">"അമ്പത്തിരണ്ട്\n"</item>
+ <item msgid="431441994725492377">"അമ്പത്തിമൂന്ന്\n"</item>
+ <item msgid="6345774640539623024">"അമ്പത്തിനാല്\n"</item>
+ <item msgid="8018192990793931120">"അമ്പത്തിയഞ്ച്\n"</item>
+ <item msgid="6187650843754604534">"അമ്പത്തിയാറ്\n"</item>
+ <item msgid="8727240174015993259">"അമ്പത്തിയേഴ്\n"</item>
+ <item msgid="848339003778952950">"അമ്പത്തിയെട്ട്\n"</item>
+ <item msgid="5798985802835423618">"അമ്പത്തിയൊമ്പത്\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-mn/strings.xml b/packages/SystemUI/res-keyguard/values-mn/strings.xml
index 9e16c6d..e418731 100644
--- a/packages/SystemUI/res-keyguard/values-mn/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-mn/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM-г идэвхгүй болголоо. Үргэлжлүүлэхийн тулд PUK кодыг оруулна уу. Таны SIM бүрмөсөн хүчингүй болох хүртэл <xliff:g id="_NUMBER_1">%d</xliff:g> оролдлого үлдлээ. Дэлгэрэнгүй мэдээлэл авахын тулд оператор компанитайгаа холбогдоно уу.</item>
<item quantity="one">SIM-г идэвхгүй болголоо. Үргэлжлүүлэхийн тулд PUK кодыг оруулна уу. Таны SIM бүрмөсөн хүчингүй болох хүртэл <xliff:g id="_NUMBER_0">%d</xliff:g> оролдлого үлдлээ. Дэлгэрэнгүй мэдээлэл авахын тулд оператор компанитайгаа холбогдоно уу.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Одоо"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Арван хоёр"</item>
+ <item msgid="7389464214252023751">"Нэг"</item>
+ <item msgid="8803180377002008046">"Хоёр"</item>
+ <item msgid="8614897059944644719">"Гурав"</item>
+ <item msgid="2293058674782619556">"Дөрөв"</item>
+ <item msgid="4815402358455041664">"Тав"</item>
+ <item msgid="3325754778509665687">"Зургаа"</item>
+ <item msgid="5805551341866280575">"Долоо"</item>
+ <item msgid="203334816668238610">"Найм"</item>
+ <item msgid="4828052671464488923">"Ес"</item>
+ <item msgid="2233497913571137419">"Арав"</item>
+ <item msgid="5621554266768657830">"Арван нэг"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Цаг"</item>
+ <item msgid="8837126587669001578">"Нэг"</item>
+ <item msgid="4294343372940455660">"Хоёр"</item>
+ <item msgid="7129166637707421536">"Гурав"</item>
+ <item msgid="7579404865008788673">"Дөрөв"</item>
+ <item msgid="3873924689207380586">"Тав"</item>
+ <item msgid="4849565597850069377">"Зургаа"</item>
+ <item msgid="4404219424523572364">"Долоо"</item>
+ <item msgid="8740481214764087329">"Найм"</item>
+ <item msgid="1713216865806811237">"Ес"</item>
+ <item msgid="3508406095411245038">"Арав"</item>
+ <item msgid="7161996337755311711">"Арван нэг"</item>
+ <item msgid="4044549963329624197">"Арван хоёр"</item>
+ <item msgid="333373157917379088">"Арван гурав"</item>
+ <item msgid="2631202907124819385">"Арван дөрөв"</item>
+ <item msgid="6472396076858033453">"Арван тав"</item>
+ <item msgid="8656981856181581643">"Арван зургаа"</item>
+ <item msgid="7289026608562030619">"Арван долоо"</item>
+ <item msgid="3881477602692646573">"Арван найм"</item>
+ <item msgid="3358129827772984226">"Арван ес"</item>
+ <item msgid="3308575407402865807">"Хорь"</item>
+ <item msgid="5346560955382229629">"Хорь\nНэг"</item>
+ <item msgid="226750304761473436">"Хорь\nХоёр"</item>
+ <item msgid="616811325336838734">"Хорь\nГурав"</item>
+ <item msgid="616346116869053440">"Хорь\nДөрөв"</item>
+ <item msgid="4642996410384042830">"Хорь\nТав"</item>
+ <item msgid="7506092849993571465">"Хорь\nЗургаа"</item>
+ <item msgid="1915078191101042031">"Хорь\nДолоо"</item>
+ <item msgid="4292378641900520252">"Хорь\nНайм"</item>
+ <item msgid="5339513901773103696">"Хорь\nЕс"</item>
+ <item msgid="3574673250891657607">"Гуч"</item>
+ <item msgid="5796923836589110940">"Гуч\nНэг"</item>
+ <item msgid="5859323597571702052">"Гуч\nХоёр"</item>
+ <item msgid="5133326723148876507">"Гуч\nГурав"</item>
+ <item msgid="2693999494655663096">"Гуч\nДөрөв"</item>
+ <item msgid="3316754944962836197">"Гуч\nТав"</item>
+ <item msgid="816891008836796723">"Гуч\nЗургаа"</item>
+ <item msgid="9158890488666520078">"Гуч\nДолоо"</item>
+ <item msgid="1894769703213894011">"Гуч\nНайм"</item>
+ <item msgid="5638820345598572399">"Гуч\nЕс"</item>
+ <item msgid="8838304023017895439">"Дөч"</item>
+ <item msgid="1834742948932559597">"Дөч\nНэг"</item>
+ <item msgid="6573707308847773944">"Дөч\nХоёр"</item>
+ <item msgid="2450149950652678001">"Дөч\nГурав"</item>
+ <item msgid="2874667401318178036">"Дөч\nДөрөв"</item>
+ <item msgid="3391101532763048862">"Дөч\nТав"</item>
+ <item msgid="1671489330863254362">"Дөч\nЗургаа"</item>
+ <item msgid="5916017359554531038">"Дөч\nДолоо"</item>
+ <item msgid="8205413177993059967">"Дөч\nНайм"</item>
+ <item msgid="6607867415142171302">"Дөч\nЕс"</item>
+ <item msgid="8358850748472089162">"Тавь"</item>
+ <item msgid="3551313125255080234">"Тавь\nНэг"</item>
+ <item msgid="1559678130725716542">"Тавь\nХоёр"</item>
+ <item msgid="431441994725492377">"Тавь\nГурав"</item>
+ <item msgid="6345774640539623024">"Тавь\nДөрөв"</item>
+ <item msgid="8018192990793931120">"Тавь\nТав"</item>
+ <item msgid="6187650843754604534">"Тавь\nЗургаа"</item>
+ <item msgid="8727240174015993259">"Тавь\nДолоо"</item>
+ <item msgid="848339003778952950">"Тавь\nНайм"</item>
+ <item msgid="5798985802835423618">"Тавь\nЕс"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-mr/strings.xml b/packages/SystemUI/res-keyguard/values-mr/strings.xml
index b27b299..9d83e93 100644
--- a/packages/SystemUI/res-keyguard/values-mr/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-mr/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">सिम आता बंद केलेले आहे. सुरू ठेवण्यासाठी PUK कोड टाका. सिम कायमचे बंद होण्याआधी तुमच्याकडे <xliff:g id="_NUMBER_1">%d</xliff:g> प्रयत्न शिल्लक आहे. तपशीलांसाठी वाहकाशी संपर्क साधा.</item>
<item quantity="other">सिम आता बंद केलेले आहे. सुरू ठेवण्यासाठी PUK कोड टाका. सिम कायमचे बंद होण्याआधी तुमच्याकडे <xliff:g id="_NUMBER_1">%d</xliff:g> प्रयत्न शिल्लक आहेत. तपशीलांसाठी वाहकाशी संपर्क साधा.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"हे आहे"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"बारा"</item>
+ <item msgid="7389464214252023751">"एक"</item>
+ <item msgid="8803180377002008046">"दोन"</item>
+ <item msgid="8614897059944644719">"तीन"</item>
+ <item msgid="2293058674782619556">"चार"</item>
+ <item msgid="4815402358455041664">"पाच"</item>
+ <item msgid="3325754778509665687">"सहा"</item>
+ <item msgid="5805551341866280575">"सात"</item>
+ <item msgid="203334816668238610">"आठ"</item>
+ <item msgid="4828052671464488923">"नऊ"</item>
+ <item msgid="2233497913571137419">"दहा"</item>
+ <item msgid="5621554266768657830">"एकरा"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"वाजता"</item>
+ <item msgid="8837126587669001578">"एक"</item>
+ <item msgid="4294343372940455660">"दोन"</item>
+ <item msgid="7129166637707421536">"तीन"</item>
+ <item msgid="7579404865008788673">"चार"</item>
+ <item msgid="3873924689207380586">"पाच"</item>
+ <item msgid="4849565597850069377">"सहा"</item>
+ <item msgid="4404219424523572364">"सात"</item>
+ <item msgid="8740481214764087329">"आठ"</item>
+ <item msgid="1713216865806811237">"नऊ"</item>
+ <item msgid="3508406095411245038">"दहा"</item>
+ <item msgid="7161996337755311711">"एकरा"</item>
+ <item msgid="4044549963329624197">"बारा"</item>
+ <item msgid="333373157917379088">"तेरा"</item>
+ <item msgid="2631202907124819385">"चौदा"</item>
+ <item msgid="6472396076858033453">"पंधरा"</item>
+ <item msgid="8656981856181581643">"सोळा"</item>
+ <item msgid="7289026608562030619">"सतरा"</item>
+ <item msgid="3881477602692646573">"अठरा"</item>
+ <item msgid="3358129827772984226">"एकोणीस"</item>
+ <item msgid="3308575407402865807">"वीस"</item>
+ <item msgid="5346560955382229629">"एकवीस\n"</item>
+ <item msgid="226750304761473436">"बावीस\n"</item>
+ <item msgid="616811325336838734">"तेवीस\n"</item>
+ <item msgid="616346116869053440">"चोवीस\n"</item>
+ <item msgid="4642996410384042830">"पंचवीस\n"</item>
+ <item msgid="7506092849993571465">"सव्वीस\n"</item>
+ <item msgid="1915078191101042031">"सत्तावीस\n"</item>
+ <item msgid="4292378641900520252">"अठ्ठावीस\n"</item>
+ <item msgid="5339513901773103696">"एकोणतीस\n"</item>
+ <item msgid="3574673250891657607">"तीस"</item>
+ <item msgid="5796923836589110940">"एकतीस\n"</item>
+ <item msgid="5859323597571702052">"बत्तीस\n"</item>
+ <item msgid="5133326723148876507">"तेहतीस\n"</item>
+ <item msgid="2693999494655663096">"चौतीस\n"</item>
+ <item msgid="3316754944962836197">"पस्तीस\n"</item>
+ <item msgid="816891008836796723">"छत्तीस\n"</item>
+ <item msgid="9158890488666520078">"सदतीस\n"</item>
+ <item msgid="1894769703213894011">"अडतीस\n"</item>
+ <item msgid="5638820345598572399">"एकोणचाळीस\n"</item>
+ <item msgid="8838304023017895439">"चाळीस"</item>
+ <item msgid="1834742948932559597">"एकेचाळीस\n"</item>
+ <item msgid="6573707308847773944">"बेचाळीस\n"</item>
+ <item msgid="2450149950652678001">"त्रेचाळीस\n"</item>
+ <item msgid="2874667401318178036">"चव्वेचाळीस\n"</item>
+ <item msgid="3391101532763048862">"पंचेचाळीस\n"</item>
+ <item msgid="1671489330863254362">"शेहेचाळीस\n"</item>
+ <item msgid="5916017359554531038">"सत्तेचाळीस\n"</item>
+ <item msgid="8205413177993059967">"अठ्ठेचाळीस\n"</item>
+ <item msgid="6607867415142171302">"एकोणपन्नास\n"</item>
+ <item msgid="8358850748472089162">"पन्नास"</item>
+ <item msgid="3551313125255080234">"एकावन्न\n"</item>
+ <item msgid="1559678130725716542">"बावन्न\n"</item>
+ <item msgid="431441994725492377">"त्रेपन्न\n"</item>
+ <item msgid="6345774640539623024">"चौपन्न\n"</item>
+ <item msgid="8018192990793931120">"पंचावन्न\n"</item>
+ <item msgid="6187650843754604534">"छप्पन\n"</item>
+ <item msgid="8727240174015993259">"सत्तावन्न\n"</item>
+ <item msgid="848339003778952950">"अठ्ठावन्न\n"</item>
+ <item msgid="5798985802835423618">"एकोणसाठ\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ms/strings.xml b/packages/SystemUI/res-keyguard/values-ms/strings.xml
index c16f433..1c82f7c 100644
--- a/packages/SystemUI/res-keyguard/values-ms/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ms/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">Kini SIM dilumpuhkan. Masukkan kod PUK untuk meneruskan. Tinggal <xliff:g id="_NUMBER_1">%d</xliff:g> percubaan sebelum SIM tidak boleh digunakan secara kekal. Hubungi pembawa untuk mendapatkan butiran.</item>
<item quantity="one">Kini SIM dilumpuhkan. Masukkan kod PUK untuk meneruskan. Tinggal <xliff:g id="_NUMBER_0">%d</xliff:g> percubaan sebelum SIM tidak boleh digunakan secara kekal. Hubungi pembawa untuk mendapatkan butiran.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Pukul"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Dua bls"</item>
+ <item msgid="7389464214252023751">"Satu"</item>
+ <item msgid="8803180377002008046">"Dua"</item>
+ <item msgid="8614897059944644719">"Tiga"</item>
+ <item msgid="2293058674782619556">"Empat"</item>
+ <item msgid="4815402358455041664">"Lima"</item>
+ <item msgid="3325754778509665687">"Enam"</item>
+ <item msgid="5805551341866280575">"Tujuh"</item>
+ <item msgid="203334816668238610">"Lapan"</item>
+ <item msgid="4828052671464488923">"Sembilan"</item>
+ <item msgid="2233497913571137419">"Sepuluh"</item>
+ <item msgid="5621554266768657830">"Sebelas"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Pukul"</item>
+ <item msgid="8837126587669001578">"Satu"</item>
+ <item msgid="4294343372940455660">"Dua"</item>
+ <item msgid="7129166637707421536">"Tiga"</item>
+ <item msgid="7579404865008788673">"Empat"</item>
+ <item msgid="3873924689207380586">"Lima"</item>
+ <item msgid="4849565597850069377">"Enam"</item>
+ <item msgid="4404219424523572364">"Tujuh"</item>
+ <item msgid="8740481214764087329">"Lapan"</item>
+ <item msgid="1713216865806811237">"Sembilan"</item>
+ <item msgid="3508406095411245038">"Sepuluh"</item>
+ <item msgid="7161996337755311711">"Sebelas"</item>
+ <item msgid="4044549963329624197">"Dua belas"</item>
+ <item msgid="333373157917379088">"Tiga belas"</item>
+ <item msgid="2631202907124819385">"Empat belas"</item>
+ <item msgid="6472396076858033453">"Lima belas"</item>
+ <item msgid="8656981856181581643">"Enam belas"</item>
+ <item msgid="7289026608562030619">"Tujuh belas"</item>
+ <item msgid="3881477602692646573">"Lapan belas"</item>
+ <item msgid="3358129827772984226">"Sembilan belas"</item>
+ <item msgid="3308575407402865807">"Dua puluh"</item>
+ <item msgid="5346560955382229629">"Dua Puluh\nSatu"</item>
+ <item msgid="226750304761473436">"Dua Puluh\nDua"</item>
+ <item msgid="616811325336838734">"Dua Puluh\nTiga"</item>
+ <item msgid="616346116869053440">"Dua Puluh\nEmpat"</item>
+ <item msgid="4642996410384042830">"Dua Puluh\nLima"</item>
+ <item msgid="7506092849993571465">"Dua Puluh\nEnam"</item>
+ <item msgid="1915078191101042031">"Dua Puluh\nTujuh"</item>
+ <item msgid="4292378641900520252">"Dua Puluh\nLapan"</item>
+ <item msgid="5339513901773103696">"Dua Puluh\nSembilan"</item>
+ <item msgid="3574673250891657607">"Tiga puluh"</item>
+ <item msgid="5796923836589110940">"Tiga Puluh\nSatu"</item>
+ <item msgid="5859323597571702052">"Tiga Puluh\nDua"</item>
+ <item msgid="5133326723148876507">"Tiga Puluh\nTiga"</item>
+ <item msgid="2693999494655663096">"Tiga Puluh\nEmpat"</item>
+ <item msgid="3316754944962836197">"Tiga Puluh\nLima"</item>
+ <item msgid="816891008836796723">"Tiga Puluh\nEnam"</item>
+ <item msgid="9158890488666520078">"Tiga Puluh\nTujuh"</item>
+ <item msgid="1894769703213894011">"Tiga Puluh\nLapan"</item>
+ <item msgid="5638820345598572399">"Tiga Puluh\nSembilan"</item>
+ <item msgid="8838304023017895439">"Empat Puluh"</item>
+ <item msgid="1834742948932559597">"Empat Puluh\nSatu"</item>
+ <item msgid="6573707308847773944">"Empat Puluh\nDua"</item>
+ <item msgid="2450149950652678001">"Empat Puluh\nTiga"</item>
+ <item msgid="2874667401318178036">"Empat Puluh\nEmpat"</item>
+ <item msgid="3391101532763048862">"Empat Puluh\nLima"</item>
+ <item msgid="1671489330863254362">"Empat Puluh\nEnam"</item>
+ <item msgid="5916017359554531038">"Empat Puluh\nTujuh"</item>
+ <item msgid="8205413177993059967">"Empat Puluh\nLapan"</item>
+ <item msgid="6607867415142171302">"Empat Puluh\nSmbln"</item>
+ <item msgid="8358850748472089162">"Lima puluh"</item>
+ <item msgid="3551313125255080234">"Lima Puluh\nSatu"</item>
+ <item msgid="1559678130725716542">"Lima Puluh\nDua"</item>
+ <item msgid="431441994725492377">"Lima Puluh\nTiga"</item>
+ <item msgid="6345774640539623024">"Lima Puluh\nEmpat"</item>
+ <item msgid="8018192990793931120">"Lima Puluh\nLima"</item>
+ <item msgid="6187650843754604534">"Lima Puluh\nEnam"</item>
+ <item msgid="8727240174015993259">"Lima Puluh\nTujuh"</item>
+ <item msgid="848339003778952950">"Lima Puluh\nLapan"</item>
+ <item msgid="5798985802835423618">"Lima Puluh\nSembln"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-my/strings.xml b/packages/SystemUI/res-keyguard/values-my/strings.xml
index 0d011af..efdd779 100644
--- a/packages/SystemUI/res-keyguard/values-my/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-my/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">ဆင်းမ်ကဒ်သည် ယခု ပိတ်သွားပါပြီ။ ရှေ့ဆက်ရန် PUK ကုဒ်ကို ထည့်ပါ။ ဆင်းမ်ကဒ် အပြီးပိတ်မသွားမီ သင့်တွင် <xliff:g id="_NUMBER_1">%d</xliff:g> ကြိမ် စမ်းသပ်ခွင့် ကျန်ပါသေးသည်။ အသေးစိတ်အချက်များအတွက် ဝန်ဆောင်မှုပေးသူကို ဆက်သွယ်ပါ။</item>
<item quantity="one">ဆင်းမ်ကဒ်သည် ယခု ပိတ်သွားပါပြီ။ ရှေ့ဆက်ရန် PUK ကုဒ်ကို ထည့်ပါ။ ဆင်းမ်ကဒ် အပြီးပိတ်မသွားမီ သင့်တွင် <xliff:g id="_NUMBER_0">%d</xliff:g> ကြိမ် စမ်းသပ်ခွင့် ကျန်ပါသေးသည်။ အသေးစိတ်အချက်များအတွက် ဝန်ဆောင်မှုပေးသူကို ဆက်သွယ်ပါ။</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"ယခု"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"ဆယ့်နှစ်"</item>
+ <item msgid="7389464214252023751">"တစ်"</item>
+ <item msgid="8803180377002008046">"နှစ်"</item>
+ <item msgid="8614897059944644719">"သုံး"</item>
+ <item msgid="2293058674782619556">"လေး"</item>
+ <item msgid="4815402358455041664">"ငါး"</item>
+ <item msgid="3325754778509665687">"ခြောက်"</item>
+ <item msgid="5805551341866280575">"ခုနစ်"</item>
+ <item msgid="203334816668238610">"ရှစ်"</item>
+ <item msgid="4828052671464488923">"ကိုး"</item>
+ <item msgid="2233497913571137419">"တစ်ဆယ်"</item>
+ <item msgid="5621554266768657830">"ဆယ့်တစ်"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"နာရီ"</item>
+ <item msgid="8837126587669001578">"တစ်"</item>
+ <item msgid="4294343372940455660">"နှစ်"</item>
+ <item msgid="7129166637707421536">"သုံး"</item>
+ <item msgid="7579404865008788673">"လေး"</item>
+ <item msgid="3873924689207380586">"ငါး"</item>
+ <item msgid="4849565597850069377">"ခြောက်"</item>
+ <item msgid="4404219424523572364">"ခုနစ်"</item>
+ <item msgid="8740481214764087329">"ရှစ်"</item>
+ <item msgid="1713216865806811237">"ကိုး"</item>
+ <item msgid="3508406095411245038">"တစ်ဆယ်"</item>
+ <item msgid="7161996337755311711">"တစ်ဆယ့်တစ်"</item>
+ <item msgid="4044549963329624197">"တစ်ဆယ့်နှစ်"</item>
+ <item msgid="333373157917379088">"တစ်ဆယ့်သုံး"</item>
+ <item msgid="2631202907124819385">"တစ်ဆယ့်လေး"</item>
+ <item msgid="6472396076858033453">"တစ်ဆယ့်ငါး"</item>
+ <item msgid="8656981856181581643">"တစ်ဆယ့်ခြောက်"</item>
+ <item msgid="7289026608562030619">"တစ်ဆယ့်ခုနစ်"</item>
+ <item msgid="3881477602692646573">"တစ်ဆယ့်ရှစ်"</item>
+ <item msgid="3358129827772984226">"တစ်ဆယ့်ကိုး"</item>
+ <item msgid="3308575407402865807">"နှစ်ဆယ်"</item>
+ <item msgid="5346560955382229629">"နှစ်ဆယ့်\nတစ်"</item>
+ <item msgid="226750304761473436">"နှစ်ဆယ့်\nနှစ်"</item>
+ <item msgid="616811325336838734">"နှစ်ဆယ့်\nသုံး"</item>
+ <item msgid="616346116869053440">"နှစ်ဆယ့်\nလေး"</item>
+ <item msgid="4642996410384042830">"နှစ်ဆယ့်\nငါး"</item>
+ <item msgid="7506092849993571465">"နှစ်ဆယ့်\nခြောက်"</item>
+ <item msgid="1915078191101042031">"နှစ်ဆယ့်\nခုနစ်"</item>
+ <item msgid="4292378641900520252">"နှစ်ဆယ့်\nရှစ်"</item>
+ <item msgid="5339513901773103696">"နှစ်ဆယ့်\nကိုး"</item>
+ <item msgid="3574673250891657607">"သုံးဆယ်"</item>
+ <item msgid="5796923836589110940">"သုံးဆယ့်\nတစ်"</item>
+ <item msgid="5859323597571702052">"သုံးဆယ့်\nနှစ်"</item>
+ <item msgid="5133326723148876507">"သုံးဆယ့်\nသုံး"</item>
+ <item msgid="2693999494655663096">"သုံးဆယ့်\nလေး"</item>
+ <item msgid="3316754944962836197">"သုံးဆယ့်\nငါး"</item>
+ <item msgid="816891008836796723">"သုံးဆယ့်\nခြောက်"</item>
+ <item msgid="9158890488666520078">"သုံးဆယ့်\nခုနစ်"</item>
+ <item msgid="1894769703213894011">"သုံးဆယ့်\nရှစ်"</item>
+ <item msgid="5638820345598572399">"သုံးဆယ့်\nကိုး"</item>
+ <item msgid="8838304023017895439">"လေးဆယ်"</item>
+ <item msgid="1834742948932559597">"လေးဆယ့်\nတစ်"</item>
+ <item msgid="6573707308847773944">"လေးဆယ့်\nနှစ်"</item>
+ <item msgid="2450149950652678001">"လေးဆယ့်\nသုံး"</item>
+ <item msgid="2874667401318178036">"လေးဆယ့်\nလေး"</item>
+ <item msgid="3391101532763048862">"လေးဆယ့်\nငါး"</item>
+ <item msgid="1671489330863254362">"လေးဆယ့်\nခြောက်"</item>
+ <item msgid="5916017359554531038">"လေးဆယ့်\nခုနစ်"</item>
+ <item msgid="8205413177993059967">"လေးဆယ့်\nရှစ်"</item>
+ <item msgid="6607867415142171302">"လေးဆယ့်\nကိုး"</item>
+ <item msgid="8358850748472089162">"ငါးဆယ်"</item>
+ <item msgid="3551313125255080234">"ငါးဆယ့်\nတစ်"</item>
+ <item msgid="1559678130725716542">"ငါးဆယ့်\nနှစ်"</item>
+ <item msgid="431441994725492377">"ငါးဆယ့်\nသုံး"</item>
+ <item msgid="6345774640539623024">"ငါးဆယ့်\nလေး"</item>
+ <item msgid="8018192990793931120">"ငါးဆယ့်\nငါး"</item>
+ <item msgid="6187650843754604534">"ငါးဆယ့်\nခြောက်"</item>
+ <item msgid="8727240174015993259">"ငါးဆယ့်\nခုနစ်"</item>
+ <item msgid="848339003778952950">"ငါးဆယ့်\nရှစ်"</item>
+ <item msgid="5798985802835423618">"ငါးဆယ့်\nကိုး"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-nb/strings.xml b/packages/SystemUI/res-keyguard/values-nb/strings.xml
index dc54489..17704c4 100644
--- a/packages/SystemUI/res-keyguard/values-nb/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-nb/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM-kortet er deaktivert nå. Skriv inn PUK-koden for å fortsette. Du har <xliff:g id="_NUMBER_1">%d</xliff:g> forsøk igjen før SIM-kortet blir permanent ubrukelig. Kontakt operatøren for å få vite mer.</item>
<item quantity="one">SIM-kortet er deaktivert nå. Skriv inn PUK-koden for å fortsette. Du har <xliff:g id="_NUMBER_0">%d</xliff:g> forsøk igjen før SIM-kortet blir permanent ubrukelig. Kontakt operatøren for å få vite mer.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Klokken"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Tolv"</item>
+ <item msgid="7389464214252023751">"Ett"</item>
+ <item msgid="8803180377002008046">"To"</item>
+ <item msgid="8614897059944644719">"Tre"</item>
+ <item msgid="2293058674782619556">"Fire"</item>
+ <item msgid="4815402358455041664">"Fem"</item>
+ <item msgid="3325754778509665687">"Seks"</item>
+ <item msgid="5805551341866280575">"Sju"</item>
+ <item msgid="203334816668238610">"Åtte"</item>
+ <item msgid="4828052671464488923">"Ni"</item>
+ <item msgid="2233497913571137419">"Ti"</item>
+ <item msgid="5621554266768657830">"Elleve"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"null-null"</item>
+ <item msgid="8837126587669001578">"Ett"</item>
+ <item msgid="4294343372940455660">"To"</item>
+ <item msgid="7129166637707421536">"Tre"</item>
+ <item msgid="7579404865008788673">"Fire"</item>
+ <item msgid="3873924689207380586">"Fem"</item>
+ <item msgid="4849565597850069377">"Seks"</item>
+ <item msgid="4404219424523572364">"Sju"</item>
+ <item msgid="8740481214764087329">"åtte"</item>
+ <item msgid="1713216865806811237">"Ni"</item>
+ <item msgid="3508406095411245038">"Ti"</item>
+ <item msgid="7161996337755311711">"Elleve"</item>
+ <item msgid="4044549963329624197">"Tolv"</item>
+ <item msgid="333373157917379088">"Tretten"</item>
+ <item msgid="2631202907124819385">"Fjorten"</item>
+ <item msgid="6472396076858033453">"Femten"</item>
+ <item msgid="8656981856181581643">"Seksten"</item>
+ <item msgid="7289026608562030619">"Sytten"</item>
+ <item msgid="3881477602692646573">"Atten"</item>
+ <item msgid="3358129827772984226">"Nitten"</item>
+ <item msgid="3308575407402865807">"Tjue"</item>
+ <item msgid="5346560955382229629">"Tjue\nen"</item>
+ <item msgid="226750304761473436">"Tjue\nto"</item>
+ <item msgid="616811325336838734">"Tjue\ntre"</item>
+ <item msgid="616346116869053440">"Tjue\nfire"</item>
+ <item msgid="4642996410384042830">"Tjue\nfem"</item>
+ <item msgid="7506092849993571465">"Tjue\nseks"</item>
+ <item msgid="1915078191101042031">"Tjue\nsju"</item>
+ <item msgid="4292378641900520252">"Tjue\nåtte"</item>
+ <item msgid="5339513901773103696">"Tjue\nni"</item>
+ <item msgid="3574673250891657607">"Tretti"</item>
+ <item msgid="5796923836589110940">"Tretti\nen"</item>
+ <item msgid="5859323597571702052">"Tretti\nto"</item>
+ <item msgid="5133326723148876507">"Tretti\ntre"</item>
+ <item msgid="2693999494655663096">"Tretti\nfire"</item>
+ <item msgid="3316754944962836197">"Tretti\nfem"</item>
+ <item msgid="816891008836796723">"Tretti\nseks"</item>
+ <item msgid="9158890488666520078">"Tretti\nsju"</item>
+ <item msgid="1894769703213894011">"Tretti\nåtte"</item>
+ <item msgid="5638820345598572399">"Tretti\nni"</item>
+ <item msgid="8838304023017895439">"Førti"</item>
+ <item msgid="1834742948932559597">"Førti\nen"</item>
+ <item msgid="6573707308847773944">"Førti\nto"</item>
+ <item msgid="2450149950652678001">"Førti\ntre"</item>
+ <item msgid="2874667401318178036">"Førti\nfire"</item>
+ <item msgid="3391101532763048862">"Førti\nfem"</item>
+ <item msgid="1671489330863254362">"Førti\nseks"</item>
+ <item msgid="5916017359554531038">"Førti\nsju"</item>
+ <item msgid="8205413177993059967">"Førti\nåtte"</item>
+ <item msgid="6607867415142171302">"Førti\nni"</item>
+ <item msgid="8358850748472089162">"Femti"</item>
+ <item msgid="3551313125255080234">"Femti\nen"</item>
+ <item msgid="1559678130725716542">"Femti\nto"</item>
+ <item msgid="431441994725492377">"Femti\ntre"</item>
+ <item msgid="6345774640539623024">"Femti\nfire"</item>
+ <item msgid="8018192990793931120">"Femti\nfem"</item>
+ <item msgid="6187650843754604534">"Femti\nseks"</item>
+ <item msgid="8727240174015993259">"Femti\nsju"</item>
+ <item msgid="848339003778952950">"Femti\nåtte"</item>
+ <item msgid="5798985802835423618">"Femti\nni"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ne/strings.xml b/packages/SystemUI/res-keyguard/values-ne/strings.xml
index be39c32..77bc113 100644
--- a/packages/SystemUI/res-keyguard/values-ne/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ne/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM लाई असक्षम पारिएको छ। जारी राख्न PUK कोड प्रविष्टि गर्नुहोस्। तपाईंसँग <xliff:g id="_NUMBER_1">%d</xliff:g> प्रयासहरू बाँकी छन्, त्यसपछि SIM सदाका लागि प्रयोग गर्न नमिल्ने हुन्छ। विवरणहरूका लागि सेवा प्रदायकलाई सम्पर्क गर्नुहोस्।</item>
<item quantity="one">SIM लाई असक्षम पारिएको छ। जारी राख्न PUK कोड प्रविष्टि गर्नुहोस्। तपाईंसँग <xliff:g id="_NUMBER_0">%d</xliff:g> प्रयास बाँकी छ, त्यसपछि SIM सदाका लागि प्रयोग गर्न नमिल्ने हुन्छ। विवरणहरूका लागि सेवा प्रदायकलाई सम्पर्क गर्नुहोस्।</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"समय:"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"बाह्र"</item>
+ <item msgid="7389464214252023751">"एक"</item>
+ <item msgid="8803180377002008046">"दुई"</item>
+ <item msgid="8614897059944644719">"तीन"</item>
+ <item msgid="2293058674782619556">"चार"</item>
+ <item msgid="4815402358455041664">"पाँच"</item>
+ <item msgid="3325754778509665687">"छ"</item>
+ <item msgid="5805551341866280575">"सात"</item>
+ <item msgid="203334816668238610">"आठ"</item>
+ <item msgid="4828052671464488923">"नौ"</item>
+ <item msgid="2233497913571137419">"दस"</item>
+ <item msgid="5621554266768657830">"एघार"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"बज्यो"</item>
+ <item msgid="8837126587669001578">"एक"</item>
+ <item msgid="4294343372940455660">"दुई"</item>
+ <item msgid="7129166637707421536">"तीन"</item>
+ <item msgid="7579404865008788673">"चार"</item>
+ <item msgid="3873924689207380586">"पाँच"</item>
+ <item msgid="4849565597850069377">"छ"</item>
+ <item msgid="4404219424523572364">"सात"</item>
+ <item msgid="8740481214764087329">"आठ"</item>
+ <item msgid="1713216865806811237">"नौ"</item>
+ <item msgid="3508406095411245038">"दस"</item>
+ <item msgid="7161996337755311711">"एघार"</item>
+ <item msgid="4044549963329624197">"बाह्र"</item>
+ <item msgid="333373157917379088">"तेह्र"</item>
+ <item msgid="2631202907124819385">"चौध"</item>
+ <item msgid="6472396076858033453">"पन्ध्र"</item>
+ <item msgid="8656981856181581643">"सोह्र"</item>
+ <item msgid="7289026608562030619">"सत्र"</item>
+ <item msgid="3881477602692646573">"अठार"</item>
+ <item msgid="3358129827772984226">"उन्नाइस"</item>
+ <item msgid="3308575407402865807">"बिस"</item>
+ <item msgid="5346560955382229629">"एक्काइस\n"</item>
+ <item msgid="226750304761473436">"बाइस\n"</item>
+ <item msgid="616811325336838734">"तेइस\n"</item>
+ <item msgid="616346116869053440">"चौबिस\n"</item>
+ <item msgid="4642996410384042830">"पच्चिस\n"</item>
+ <item msgid="7506092849993571465">"छब्बिस\n"</item>
+ <item msgid="1915078191101042031">"सत्ताइस\n"</item>
+ <item msgid="4292378641900520252">"अट्ठाइस\n"</item>
+ <item msgid="5339513901773103696">"उनन्तिस\n"</item>
+ <item msgid="3574673250891657607">"तिस"</item>
+ <item msgid="5796923836589110940">"एकतिस\n"</item>
+ <item msgid="5859323597571702052">"बत्तिस\n"</item>
+ <item msgid="5133326723148876507">"तेत्तिस\n"</item>
+ <item msgid="2693999494655663096">"चौतिस\n"</item>
+ <item msgid="3316754944962836197">"पैँतिस\n"</item>
+ <item msgid="816891008836796723">"छत्तिस\n"</item>
+ <item msgid="9158890488666520078">"सैँतिस\n"</item>
+ <item msgid="1894769703213894011">"अड्तिस\n"</item>
+ <item msgid="5638820345598572399">"उनन्चालिस\n"</item>
+ <item msgid="8838304023017895439">"चालिस"</item>
+ <item msgid="1834742948932559597">"एकचालिस\n"</item>
+ <item msgid="6573707308847773944">"बयालिस\n"</item>
+ <item msgid="2450149950652678001">"त्रिचालिस\n"</item>
+ <item msgid="2874667401318178036">"चवालिस\n"</item>
+ <item msgid="3391101532763048862">"पैँतालिस\n"</item>
+ <item msgid="1671489330863254362">"छयालिस\n"</item>
+ <item msgid="5916017359554531038">"सड्चालिस\n"</item>
+ <item msgid="8205413177993059967">"अड्चालिस\n"</item>
+ <item msgid="6607867415142171302">"उनन्चास\n"</item>
+ <item msgid="8358850748472089162">"पचास"</item>
+ <item msgid="3551313125255080234">"एकाउन्न\n"</item>
+ <item msgid="1559678130725716542">"बाउन्न\n"</item>
+ <item msgid="431441994725492377">"त्रिपन्न\n"</item>
+ <item msgid="6345774640539623024">"चवन्न\n"</item>
+ <item msgid="8018192990793931120">"पचपन्न\n"</item>
+ <item msgid="6187650843754604534">"छपन्न\n"</item>
+ <item msgid="8727240174015993259">"सन्ताउन्न\n"</item>
+ <item msgid="848339003778952950">"अन्ठाउन्न\n"</item>
+ <item msgid="5798985802835423618">"उनन्साठी\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-nl/strings.xml b/packages/SystemUI/res-keyguard/values-nl/strings.xml
index 5c911be..3bbbb53 100644
--- a/packages/SystemUI/res-keyguard/values-nl/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-nl/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">De simkaart is nu uitgeschakeld. Geef de pukcode op om door te gaan. Je hebt nog <xliff:g id="_NUMBER_1">%d</xliff:g> pogingen over voordat de simkaart definitief onbruikbaar wordt. Neem contact op met je provider voor meer informatie.</item>
<item quantity="one">De simkaart is nu uitgeschakeld. Geef de pukcode op om door te gaan. Je hebt nog <xliff:g id="_NUMBER_0">%d</xliff:g> poging over voordat de simkaart definitief onbruikbaar wordt. Neem contact op met je provider voor meer informatie.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Het is"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Twaalf"</item>
+ <item msgid="7389464214252023751">"Eén"</item>
+ <item msgid="8803180377002008046">"Twee"</item>
+ <item msgid="8614897059944644719">"Drie"</item>
+ <item msgid="2293058674782619556">"Vier"</item>
+ <item msgid="4815402358455041664">"Vijf"</item>
+ <item msgid="3325754778509665687">"Zes"</item>
+ <item msgid="5805551341866280575">"Zeven"</item>
+ <item msgid="203334816668238610">"Acht"</item>
+ <item msgid="4828052671464488923">"Negen"</item>
+ <item msgid="2233497913571137419">"Tien"</item>
+ <item msgid="5621554266768657830">"Elf"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"uur"</item>
+ <item msgid="8837126587669001578">"Nul één"</item>
+ <item msgid="4294343372940455660">"Nul twee"</item>
+ <item msgid="7129166637707421536">"Nul drie"</item>
+ <item msgid="7579404865008788673">"Nul vier"</item>
+ <item msgid="3873924689207380586">"Nul vijf"</item>
+ <item msgid="4849565597850069377">"Nul zes"</item>
+ <item msgid="4404219424523572364">"Nul zeven"</item>
+ <item msgid="8740481214764087329">"Nul acht"</item>
+ <item msgid="1713216865806811237">"Nul negen"</item>
+ <item msgid="3508406095411245038">"Tien"</item>
+ <item msgid="7161996337755311711">"Elf"</item>
+ <item msgid="4044549963329624197">"Twaalf"</item>
+ <item msgid="333373157917379088">"Dertien"</item>
+ <item msgid="2631202907124819385">"Veertien"</item>
+ <item msgid="6472396076858033453">"Vijftien"</item>
+ <item msgid="8656981856181581643">"Zestien"</item>
+ <item msgid="7289026608562030619">"Zeventien"</item>
+ <item msgid="3881477602692646573">"Achttien"</item>
+ <item msgid="3358129827772984226">"Negentien"</item>
+ <item msgid="3308575407402865807">"Twintig"</item>
+ <item msgid="5346560955382229629">"Eénentwintig\n"</item>
+ <item msgid="226750304761473436">"Tweeëntwintig\n"</item>
+ <item msgid="616811325336838734">"Drieëntwintig\n"</item>
+ <item msgid="616346116869053440">"Vierentwintig\n"</item>
+ <item msgid="4642996410384042830">"Vijfentwintig\n"</item>
+ <item msgid="7506092849993571465">"Zesentwintig\n"</item>
+ <item msgid="1915078191101042031">"Zevenentwintig\n"</item>
+ <item msgid="4292378641900520252">"Achtentwintig\n"</item>
+ <item msgid="5339513901773103696">"Negenentwintig\n"</item>
+ <item msgid="3574673250891657607">"Dertig"</item>
+ <item msgid="5796923836589110940">"Eénendertig\n"</item>
+ <item msgid="5859323597571702052">"Tweeëndertig\n"</item>
+ <item msgid="5133326723148876507">"Drieëndertig\n"</item>
+ <item msgid="2693999494655663096">"Vierendertig\n"</item>
+ <item msgid="3316754944962836197">"Vijfendertig\n"</item>
+ <item msgid="816891008836796723">"Zesendertig\n"</item>
+ <item msgid="9158890488666520078">"Zevenendertig\n"</item>
+ <item msgid="1894769703213894011">"Achtendertig\n"</item>
+ <item msgid="5638820345598572399">"Negenendertig\n"</item>
+ <item msgid="8838304023017895439">"Veertig"</item>
+ <item msgid="1834742948932559597">"Eenenveertig\n"</item>
+ <item msgid="6573707308847773944">"Tweeënveertig\n"</item>
+ <item msgid="2450149950652678001">"Drieënveertig\n"</item>
+ <item msgid="2874667401318178036">"Vierenveertig\n"</item>
+ <item msgid="3391101532763048862">"Vijfenveertig\n"</item>
+ <item msgid="1671489330863254362">"Zesenveertig\n"</item>
+ <item msgid="5916017359554531038">"Zevenenveertig\n"</item>
+ <item msgid="8205413177993059967">"Achtenveertig\n"</item>
+ <item msgid="6607867415142171302">"Negenenveertig\n"</item>
+ <item msgid="8358850748472089162">"Vijftig"</item>
+ <item msgid="3551313125255080234">"Eenenvijftig\n"</item>
+ <item msgid="1559678130725716542">"Tweeënvijftig\n"</item>
+ <item msgid="431441994725492377">"Drieënvijftig\n"</item>
+ <item msgid="6345774640539623024">"Vierenvijftig\n"</item>
+ <item msgid="8018192990793931120">"Vijfenvijftig\n"</item>
+ <item msgid="6187650843754604534">"Zesenvijftig\n"</item>
+ <item msgid="8727240174015993259">"Zevenenvijftig\n"</item>
+ <item msgid="848339003778952950">"Achtenvijftig\n"</item>
+ <item msgid="5798985802835423618">"Negenenvijftig\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-or/strings.xml b/packages/SystemUI/res-keyguard/values-or/strings.xml
index 58242e6..0db20aa 100644
--- a/packages/SystemUI/res-keyguard/values-or/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-or/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM କାର୍ଡକୁ ବର୍ତ୍ତମାନ ଅକ୍ଷମ କରିଦିଆଯାଇଛି। ଜାରି ରଖିବାକୁ PUK କୋଡ୍ ଲେଖନ୍ତୁ। ଆଉ <xliff:g id="_NUMBER_1">%d</xliff:g> ଥର ଭୁଲ କୋଡ୍ ଲେଖିବା ପରେ SIM କାର୍ଡ ସ୍ଥାୟୀ ଭାବେ ଅନୁପଯୋଗୀ ହୋଇଯିବ। ବିବରଣୀ ପାଇଁ କେରିଅର୍ର ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।</item>
<item quantity="one">SIM କାର୍ଡକୁ ବର୍ତ୍ତମାନ ଅକ୍ଷମ କରିଦିଆଯାଇଛି। ଜାରି ରଖିବାକୁ PUK କୋଡ୍ ଲେଖନ୍ତୁ। ଆଉ <xliff:g id="_NUMBER_0">%d</xliff:g> ଥର ଭୁଲ କୋଡ୍ ଲେଖିବା ପରେ SIM କାର୍ଡ ସ୍ଥାୟୀ ଭାବେ ଅନୁପଯୋଗୀ ହୋଇଯିବ। ବିବରଣୀ ପାଇଁ କେରିଅର୍ର ସହ ଯୋଗାଯୋଗ କରନ୍ତୁ।</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"ଏବେ"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"ବାର"</item>
+ <item msgid="7389464214252023751">"ଏକ"</item>
+ <item msgid="8803180377002008046">"ଦୁଇ"</item>
+ <item msgid="8614897059944644719">"ତିନି"</item>
+ <item msgid="2293058674782619556">"ଚାରି"</item>
+ <item msgid="4815402358455041664">"ପାଞ୍ଚ"</item>
+ <item msgid="3325754778509665687">"ଛଅ"</item>
+ <item msgid="5805551341866280575">"ସାତ"</item>
+ <item msgid="203334816668238610">"ଆଠ"</item>
+ <item msgid="4828052671464488923">"ନଅ"</item>
+ <item msgid="2233497913571137419">"ଦଶ"</item>
+ <item msgid="5621554266768657830">"ଏଗାର"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"ଘଣ୍ଟା"</item>
+ <item msgid="8837126587669001578">"ଏକ"</item>
+ <item msgid="4294343372940455660">"ଦୁଇ"</item>
+ <item msgid="7129166637707421536">"ତିନି"</item>
+ <item msgid="7579404865008788673">"ଚାରି"</item>
+ <item msgid="3873924689207380586">"ପାଞ୍ଚ"</item>
+ <item msgid="4849565597850069377">"ଛଅ"</item>
+ <item msgid="4404219424523572364">"ସାତ"</item>
+ <item msgid="8740481214764087329">"ଆଠ"</item>
+ <item msgid="1713216865806811237">"ନଅ"</item>
+ <item msgid="3508406095411245038">"ଦଶ"</item>
+ <item msgid="7161996337755311711">"ଏଗାର"</item>
+ <item msgid="4044549963329624197">"ବାର"</item>
+ <item msgid="333373157917379088">"ତେର"</item>
+ <item msgid="2631202907124819385">"ଚଉଦ"</item>
+ <item msgid="6472396076858033453">"ପନ୍ଦର"</item>
+ <item msgid="8656981856181581643">"ଷୋହଳ"</item>
+ <item msgid="7289026608562030619">"ସତର"</item>
+ <item msgid="3881477602692646573">"ଅଠର"</item>
+ <item msgid="3358129827772984226">"ଉଣେଇଶି"</item>
+ <item msgid="3308575407402865807">"କୋଡି଼ଏ"</item>
+ <item msgid="5346560955382229629">"ଏକୋଇଶି\n"</item>
+ <item msgid="226750304761473436">"ବାଇଶି\n"</item>
+ <item msgid="616811325336838734">"ତେଇଶି\n"</item>
+ <item msgid="616346116869053440">"ଚବିଶି\n"</item>
+ <item msgid="4642996410384042830">"ପଚିଶି\n"</item>
+ <item msgid="7506092849993571465">"ଛବିଶି\n"</item>
+ <item msgid="1915078191101042031">"ସତାଇଶି\n"</item>
+ <item msgid="4292378641900520252">"ଅଠାଇଶି\n"</item>
+ <item msgid="5339513901773103696">"ଅଣତିରିଶି\n"</item>
+ <item msgid="3574673250891657607">"ତିରିଶି"</item>
+ <item msgid="5796923836589110940">"ଏକତିରିଶି\n"</item>
+ <item msgid="5859323597571702052">"ବତିଶି\n"</item>
+ <item msgid="5133326723148876507">"ତେତିଶି\n"</item>
+ <item msgid="2693999494655663096">"ଚଉତିରିଶି\n"</item>
+ <item msgid="3316754944962836197">"ପଞ୍ଚତିରିଶି\n"</item>
+ <item msgid="816891008836796723">"ଛତିଶି\n"</item>
+ <item msgid="9158890488666520078">"ସଂଇତିରିଶି\n"</item>
+ <item msgid="1894769703213894011">"ଅଠତିରିଶ\n"</item>
+ <item msgid="5638820345598572399">"ଅଣଚାଳିଶି\n"</item>
+ <item msgid="8838304023017895439">"ଚାଳିଶି"</item>
+ <item msgid="1834742948932559597">"ଏକଚାଳିଶି\n"</item>
+ <item msgid="6573707308847773944">"ବୟାଳିଶି\n"</item>
+ <item msgid="2450149950652678001">"ତେୟାଳିଶି\n"</item>
+ <item msgid="2874667401318178036">"ଚଉରାଳିଶି\n"</item>
+ <item msgid="3391101532763048862">"ପଞ୍ଚଚାଳିଶି\n"</item>
+ <item msgid="1671489330863254362">"ଛୟାଳିଶି\n"</item>
+ <item msgid="5916017359554531038">"ସତଚାଳିଶି\n"</item>
+ <item msgid="8205413177993059967">"ଅଠଚାଳିଶି\n"</item>
+ <item msgid="6607867415142171302">"ଅଣଚାଶ\n"</item>
+ <item msgid="8358850748472089162">"ପଚାଶ"</item>
+ <item msgid="3551313125255080234">"ଏକାବନ\n"</item>
+ <item msgid="1559678130725716542">"ବାଉନ\n"</item>
+ <item msgid="431441994725492377">"ତେପନ\n"</item>
+ <item msgid="6345774640539623024">"ଚଉରାଳିଶି\n"</item>
+ <item msgid="8018192990793931120">"ପଞ୍ଚାବନ\n"</item>
+ <item msgid="6187650843754604534">"ଛପନ\n"</item>
+ <item msgid="8727240174015993259">"ସତାବନ\n"</item>
+ <item msgid="848339003778952950">"ଅଠାବନ\n"</item>
+ <item msgid="5798985802835423618">"ଅଣଷଠି\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-pa/strings.xml b/packages/SystemUI/res-keyguard/values-pa/strings.xml
index a435c79..9fd9b19 100644
--- a/packages/SystemUI/res-keyguard/values-pa/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-pa/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">ਸਿਮ ਹੁਣ ਬੰਦ ਹੋ ਗਿਆ ਹੈ। ਜਾਰੀ ਰੱਖਣ ਲਈ PUK ਕੋਡ ਦਾਖਲ ਕਰੋ। ਸਿਮ ਦੇ ਪੱਕੇ ਤੌਰ \'ਤੇ ਬੇਕਾਰ ਹੋ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="_NUMBER_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼ ਬਾਕੀ ਹੈ। ਵੇਰਵਿਆਂ ਲਈ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</item>
<item quantity="other">ਸਿਮ ਹੁਣ ਬੰਦ ਹੋ ਗਿਆ ਹੈ। ਜਾਰੀ ਰੱਖਣ ਲਈ PUK ਕੋਡ ਦਾਖਲ ਕਰੋ। ਸਿਮ ਦੇ ਪੱਕੇ ਤੌਰ \'ਤੇ ਬੇਕਾਰ ਹੋ ਜਾਣ ਤੋਂ ਪਹਿਲਾਂ ਤੁਹਾਡੇ ਕੋਲ <xliff:g id="_NUMBER_1">%d</xliff:g> ਕੋਸ਼ਿਸ਼ਾਂ ਬਾਕੀ ਹਨ। ਵੇਰਵਿਆਂ ਲਈ ਕੈਰੀਅਰ ਨੂੰ ਸੰਪਰਕ ਕਰੋ।</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"ਸਮਾਂ"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"ਬਾਰਾਂ"</item>
+ <item msgid="7389464214252023751">"ਇੱਕ"</item>
+ <item msgid="8803180377002008046">"ਦੋ"</item>
+ <item msgid="8614897059944644719">"ਤਿੰਨ"</item>
+ <item msgid="2293058674782619556">"ਚਾਰ"</item>
+ <item msgid="4815402358455041664">"ਪੰਜ"</item>
+ <item msgid="3325754778509665687">"ਛੇ"</item>
+ <item msgid="5805551341866280575">"ਸੱਤ"</item>
+ <item msgid="203334816668238610">"ਅੱਠ"</item>
+ <item msgid="4828052671464488923">"ਨੌ"</item>
+ <item msgid="2233497913571137419">"ਦਸ"</item>
+ <item msgid="5621554266768657830">"ਗਿਆਰਾਂ"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"ਵਜੇ"</item>
+ <item msgid="8837126587669001578">"ਇੱਕ"</item>
+ <item msgid="4294343372940455660">"ਦੋ"</item>
+ <item msgid="7129166637707421536">"ਤਿੰਨ"</item>
+ <item msgid="7579404865008788673">"ਚਾਰ"</item>
+ <item msgid="3873924689207380586">"ਪੰਜ"</item>
+ <item msgid="4849565597850069377">"ਛੇ"</item>
+ <item msgid="4404219424523572364">"ਸੱਤ"</item>
+ <item msgid="8740481214764087329">"ਅੱਠ"</item>
+ <item msgid="1713216865806811237">"ਨੌ"</item>
+ <item msgid="3508406095411245038">"ਦਸ"</item>
+ <item msgid="7161996337755311711">"ਗਿਆਰਾਂ"</item>
+ <item msgid="4044549963329624197">"ਬਾਰਾਂ"</item>
+ <item msgid="333373157917379088">"ਤੇਰਾਂ"</item>
+ <item msgid="2631202907124819385">"ਚੌਦਾਂ"</item>
+ <item msgid="6472396076858033453">"ਪੰਦਰਾਂ"</item>
+ <item msgid="8656981856181581643">"ਸੋਲਾਂ"</item>
+ <item msgid="7289026608562030619">"ਸਤਾਰਾਂ"</item>
+ <item msgid="3881477602692646573">"ਅਠਾਰਾਂ"</item>
+ <item msgid="3358129827772984226">"ਉੱਨੀ"</item>
+ <item msgid="3308575407402865807">"ਵੀਹ"</item>
+ <item msgid="5346560955382229629">"ਵੀਹ\nਇੱਕ"</item>
+ <item msgid="226750304761473436">"ਵੀਹ\nਦੋ"</item>
+ <item msgid="616811325336838734">"ਵੀਹ\nਤਿੰਨ"</item>
+ <item msgid="616346116869053440">"ਵੀਹ\nਚਾਰ"</item>
+ <item msgid="4642996410384042830">"ਵੀਹ\nਪੰਜ"</item>
+ <item msgid="7506092849993571465">"ਵੀਹ\nਛੇ"</item>
+ <item msgid="1915078191101042031">"ਵੀਹ\nਸੱਤ"</item>
+ <item msgid="4292378641900520252">"ਵੀਹ\nਅੱਠ"</item>
+ <item msgid="5339513901773103696">"ਵੀਹ\nਨੌ"</item>
+ <item msgid="3574673250891657607">"ਤੀਹ"</item>
+ <item msgid="5796923836589110940">"ਤੀਹ\nਇੱਕ"</item>
+ <item msgid="5859323597571702052">"ਤੀਹ\nਦੋ"</item>
+ <item msgid="5133326723148876507">"ਤੀਹ\nਤਿੰਨ"</item>
+ <item msgid="2693999494655663096">"ਤੀਹ\nਚਾਰ"</item>
+ <item msgid="3316754944962836197">"ਤੀਹ\nਪੰਜ"</item>
+ <item msgid="816891008836796723">"ਤੀਹ\nਛੇ"</item>
+ <item msgid="9158890488666520078">"ਤੀਹ\nਸੱਤ"</item>
+ <item msgid="1894769703213894011">"ਤੀਹ\nਅੱਠ"</item>
+ <item msgid="5638820345598572399">"ਤੀਹ\nਨੌ"</item>
+ <item msgid="8838304023017895439">"ਚਾਲੀ"</item>
+ <item msgid="1834742948932559597">"ਚਾਲੀ\nਇੱਕ"</item>
+ <item msgid="6573707308847773944">"ਚਾਲੀ\nਦੋ"</item>
+ <item msgid="2450149950652678001">"ਚਾਲੀ\nਤਿੰਨ"</item>
+ <item msgid="2874667401318178036">"ਚਾਲੀ\nਚਾਰ"</item>
+ <item msgid="3391101532763048862">"ਚਾਲੀ\nਪੰਜ"</item>
+ <item msgid="1671489330863254362">"ਚਾਲੀ\nਛੇ"</item>
+ <item msgid="5916017359554531038">"ਚਾਲੀ\nਸੱਤ"</item>
+ <item msgid="8205413177993059967">"ਚਾਲੀ\nਅੱਠ"</item>
+ <item msgid="6607867415142171302">"ਚਾਲੀ\nਨੌ"</item>
+ <item msgid="8358850748472089162">"ਪੰਜਾਹ"</item>
+ <item msgid="3551313125255080234">"ਪੰਜਾਹ\nਇੱਕ"</item>
+ <item msgid="1559678130725716542">"ਪੰਜਾਹ\nਦੋ"</item>
+ <item msgid="431441994725492377">"ਪੰਜਾਹ\nਤਿੰਨ"</item>
+ <item msgid="6345774640539623024">"ਪੰਜਾਹ\nਚਾਰ"</item>
+ <item msgid="8018192990793931120">"ਪੰਜਾਹ\nਪੰਜ"</item>
+ <item msgid="6187650843754604534">"ਪੰਜਾਹ\nਛੇ"</item>
+ <item msgid="8727240174015993259">"ਪੰਜਾਹ\nਸੱਤ"</item>
+ <item msgid="848339003778952950">"ਪੰਜਾਹ\nਅੱਠ"</item>
+ <item msgid="5798985802835423618">"ਪੰਜਾਹ\nਨੌ"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-pl/strings.xml b/packages/SystemUI/res-keyguard/values-pl/strings.xml
index 51c7ac8..106fab3 100644
--- a/packages/SystemUI/res-keyguard/values-pl/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-pl/strings.xml
@@ -166,78 +166,81 @@
<item quantity="other">Karta SIM została wyłączona. Wpisz kod PUK, by przejść dalej. Masz jeszcze <xliff:g id="_NUMBER_1">%d</xliff:g> próby, zanim karta SIM zostanie trwale zablokowana. Aby uzyskać szczegółowe informacje, skontaktuj się z operatorem.</item>
<item quantity="one">Karta SIM została wyłączona. Wpisz kod PUK, by przejść dalej. Masz jeszcze <xliff:g id="_NUMBER_0">%d</xliff:g> próbę, zanim karta SIM zostanie trwale zablokowana. Aby uzyskać szczegółowe informacje, skontaktuj się z operatorem.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Jest"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Dwanaście"</item>
+ <item msgid="7389464214252023751">"Jeden"</item>
+ <item msgid="8803180377002008046">"Dwa"</item>
+ <item msgid="8614897059944644719">"Trzy"</item>
+ <item msgid="2293058674782619556">"Cztery"</item>
+ <item msgid="4815402358455041664">"Pięć"</item>
+ <item msgid="3325754778509665687">"Sześć"</item>
+ <item msgid="5805551341866280575">"Siedem"</item>
+ <item msgid="203334816668238610">"Osiem"</item>
+ <item msgid="4828052671464488923">"Dziewięć"</item>
+ <item msgid="2233497913571137419">"Dziesięć"</item>
+ <item msgid="5621554266768657830">"Jedenaście"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Zero zero"</item>
+ <item msgid="8837126587669001578">"Zero jeden"</item>
+ <item msgid="4294343372940455660">"Zero dwa"</item>
+ <item msgid="7129166637707421536">"Zero trzy"</item>
+ <item msgid="7579404865008788673">"Zero cztery"</item>
+ <item msgid="3873924689207380586">"Zero pięć"</item>
+ <item msgid="4849565597850069377">"Zero sześć"</item>
+ <item msgid="4404219424523572364">"Zero siedem"</item>
+ <item msgid="8740481214764087329">"Zero osiem"</item>
+ <item msgid="1713216865806811237">"Zero dziewięć"</item>
+ <item msgid="3508406095411245038">"Dziesięć"</item>
+ <item msgid="7161996337755311711">"Jedenaście"</item>
+ <item msgid="4044549963329624197">"Dwanaście"</item>
+ <item msgid="333373157917379088">"Trzynaście"</item>
+ <item msgid="2631202907124819385">"Czternaście"</item>
+ <item msgid="6472396076858033453">"Piętnaście"</item>
+ <item msgid="8656981856181581643">"Szesnaście"</item>
+ <item msgid="7289026608562030619">"Siedemnaście"</item>
+ <item msgid="3881477602692646573">"Osiemnaście"</item>
+ <item msgid="3358129827772984226">"Dziewiętnaście"</item>
+ <item msgid="3308575407402865807">"Dwadzieścia"</item>
+ <item msgid="5346560955382229629">"Dwadzieścia\njeden"</item>
+ <item msgid="226750304761473436">"Dwadzieścia\ndwa"</item>
+ <item msgid="616811325336838734">"Dwadzieścia\ntrzy"</item>
+ <item msgid="616346116869053440">"Dwadzieścia\ncztery"</item>
+ <item msgid="4642996410384042830">"Dwadzieścia\npięć"</item>
+ <item msgid="7506092849993571465">"Dwadzieścia\nsześć"</item>
+ <item msgid="1915078191101042031">"Dwadzieścia\nsiedem"</item>
+ <item msgid="4292378641900520252">"Dwadzieścia\nosiem"</item>
+ <item msgid="5339513901773103696">"Dwadzieścia\ndziewięć"</item>
+ <item msgid="3574673250891657607">"Trzydzieści"</item>
+ <item msgid="5796923836589110940">"Trzydzieści\njeden"</item>
+ <item msgid="5859323597571702052">"Trzydzieści\ndwa"</item>
+ <item msgid="5133326723148876507">"Trzydzieści\ntrzy"</item>
+ <item msgid="2693999494655663096">"Trzydzieści\ncztery"</item>
+ <item msgid="3316754944962836197">"Trzydzieści\npięć"</item>
+ <item msgid="816891008836796723">"Trzydzieści\nsześć"</item>
+ <item msgid="9158890488666520078">"Trzydzieści\nsiedem"</item>
+ <item msgid="1894769703213894011">"Trzydzieści\nosiem"</item>
+ <item msgid="5638820345598572399">"Trzydzieści\ndziewięć"</item>
+ <item msgid="8838304023017895439">"Czterdzieści"</item>
+ <item msgid="1834742948932559597">"Czterdzieści\njeden"</item>
+ <item msgid="6573707308847773944">"Czterdzieści\ndwa"</item>
+ <item msgid="2450149950652678001">"Czterdzieści\ntrzy"</item>
+ <item msgid="2874667401318178036">"Czterdzieści\ncztery"</item>
+ <item msgid="3391101532763048862">"Czterdzieści\npięć"</item>
+ <item msgid="1671489330863254362">"Czterdzieści\nsześć"</item>
+ <item msgid="5916017359554531038">"Czterdzieści\nsiedem"</item>
+ <item msgid="8205413177993059967">"Czterdzieści\nosiem"</item>
+ <item msgid="6607867415142171302">"Czterdzieści\ndziewięć"</item>
+ <item msgid="8358850748472089162">"Pięćdziesiąt"</item>
+ <item msgid="3551313125255080234">"Pięćdziesiąt\njeden"</item>
+ <item msgid="1559678130725716542">"Pięćdziesiąt\ndwa"</item>
+ <item msgid="431441994725492377">"Pięćdziesiąt\ntrzy"</item>
+ <item msgid="6345774640539623024">"Pięćdziesiąt\ncztery"</item>
+ <item msgid="8018192990793931120">"Pięćdziesiąt\npięć"</item>
+ <item msgid="6187650843754604534">"Pięćdziesiąt\nsześć"</item>
+ <item msgid="8727240174015993259">"Pięćdziesiąt\nsiedem"</item>
+ <item msgid="848339003778952950">"Pięćdziesiąt\nosiem."</item>
+ <item msgid="5798985802835423618">"Pięćdziesiąt\ndziewięć"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml
index 6698bf9..3c6a372 100644
--- a/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-pt-rBR/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">O chip agora está desativado. Informe o código PUK para continuar. Você tem <xliff:g id="_NUMBER_1">%d</xliff:g> tentativa restante antes de o chip se tornar permanentemente inutilizável. Entre em contato com a operadora para saber mais detalhes.</item>
<item quantity="other">O chip agora está desativado. Informe o código PUK para continuar. Você tem <xliff:g id="_NUMBER_1">%d</xliff:g> tentativas restantes antes de o chip se tornar permanentemente inutilizável. Entre em contato com a operadora para saber mais detalhes.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"São"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Doze"</item>
+ <item msgid="7389464214252023751">"Uma"</item>
+ <item msgid="8803180377002008046">"Duas"</item>
+ <item msgid="8614897059944644719">"Três"</item>
+ <item msgid="2293058674782619556">"Quatro"</item>
+ <item msgid="4815402358455041664">"Cinco"</item>
+ <item msgid="3325754778509665687">"Seis"</item>
+ <item msgid="5805551341866280575">"Sete"</item>
+ <item msgid="203334816668238610">"Oito"</item>
+ <item msgid="4828052671464488923">"Nove"</item>
+ <item msgid="2233497913571137419">"Dez"</item>
+ <item msgid="5621554266768657830">"Onze"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Em ponto"</item>
+ <item msgid="8837126587669001578">"Um"</item>
+ <item msgid="4294343372940455660">"Dois"</item>
+ <item msgid="7129166637707421536">"Três"</item>
+ <item msgid="7579404865008788673">"Quatro"</item>
+ <item msgid="3873924689207380586">"Cinco"</item>
+ <item msgid="4849565597850069377">"Seis"</item>
+ <item msgid="4404219424523572364">"Sete"</item>
+ <item msgid="8740481214764087329">"Oito"</item>
+ <item msgid="1713216865806811237">"Nove"</item>
+ <item msgid="3508406095411245038">"Dez"</item>
+ <item msgid="7161996337755311711">"Onze"</item>
+ <item msgid="4044549963329624197">"Doze"</item>
+ <item msgid="333373157917379088">"Treze"</item>
+ <item msgid="2631202907124819385">"Catorze"</item>
+ <item msgid="6472396076858033453">"Quinze"</item>
+ <item msgid="8656981856181581643">"Dezesseis"</item>
+ <item msgid="7289026608562030619">"Dezessete"</item>
+ <item msgid="3881477602692646573">"Dezoito"</item>
+ <item msgid="3358129827772984226">"Dezenove"</item>
+ <item msgid="3308575407402865807">"Vinte"</item>
+ <item msgid="5346560955382229629">"Vinte\ne um"</item>
+ <item msgid="226750304761473436">"Vinte\ne dois"</item>
+ <item msgid="616811325336838734">"Vinte\ne três"</item>
+ <item msgid="616346116869053440">"Vinte\ne quatro"</item>
+ <item msgid="4642996410384042830">"Vinte\ne cinco"</item>
+ <item msgid="7506092849993571465">"Vinte\ne seis"</item>
+ <item msgid="1915078191101042031">"Vinte\ne sete"</item>
+ <item msgid="4292378641900520252">"Vinte\ne oito"</item>
+ <item msgid="5339513901773103696">"Vinte\ne nove"</item>
+ <item msgid="3574673250891657607">"Trinta"</item>
+ <item msgid="5796923836589110940">"Trinta\ne um"</item>
+ <item msgid="5859323597571702052">"Trinta\ne dois"</item>
+ <item msgid="5133326723148876507">"Trinta\ne três"</item>
+ <item msgid="2693999494655663096">"Trinta\ne quatro"</item>
+ <item msgid="3316754944962836197">"Trinta\ne cinco"</item>
+ <item msgid="816891008836796723">"Trinta\ne seis"</item>
+ <item msgid="9158890488666520078">"Trinta\ne sete"</item>
+ <item msgid="1894769703213894011">"Trinta\ne oito"</item>
+ <item msgid="5638820345598572399">"Trinta\ne nove"</item>
+ <item msgid="8838304023017895439">"Quarenta"</item>
+ <item msgid="1834742948932559597">"Quarenta\ne um"</item>
+ <item msgid="6573707308847773944">"Quarenta\ne dois"</item>
+ <item msgid="2450149950652678001">"Quarenta\ne três"</item>
+ <item msgid="2874667401318178036">"Quarenta\ne quatro"</item>
+ <item msgid="3391101532763048862">"Quarenta\ne cinco"</item>
+ <item msgid="1671489330863254362">"Quarenta\ne seis"</item>
+ <item msgid="5916017359554531038">"Quarenta\ne sete"</item>
+ <item msgid="8205413177993059967">"Quarenta\ne oito"</item>
+ <item msgid="6607867415142171302">"Quarenta\ne nove"</item>
+ <item msgid="8358850748472089162">"Cinquenta"</item>
+ <item msgid="3551313125255080234">"Cinquenta\ne um"</item>
+ <item msgid="1559678130725716542">"Cinquenta\ne dois"</item>
+ <item msgid="431441994725492377">"Cinquenta\ne três"</item>
+ <item msgid="6345774640539623024">"Cinquenta\ne quatro"</item>
+ <item msgid="8018192990793931120">"Cinquenta\ne cinco"</item>
+ <item msgid="6187650843754604534">"Cinquenta\ne seis"</item>
+ <item msgid="8727240174015993259">"Cinquenta\ne sete"</item>
+ <item msgid="848339003778952950">"Cinquenta\ne oito"</item>
+ <item msgid="5798985802835423618">"Cinquenta\ne nove"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml
index 118f05f..4f60187 100644
--- a/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-pt-rPT/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">O SIM encontra-se desativado. Introduza o código PUK para continuar. Tem mais <xliff:g id="_NUMBER_1">%d</xliff:g> tentativas antes de o cartão SIM ficar permanentemente inutilizável. Contacte o operador para obter mais detalhes.</item>
<item quantity="one">O SIM encontra-se desativado. Introduza o código PUK para continuar. Tem mais <xliff:g id="_NUMBER_0">%d</xliff:g> tentativa antes de o cartão SIM ficar permanentemente inutilizável. Contacte o operador para obter mais detalhes.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"São"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Doze"</item>
+ <item msgid="7389464214252023751">"Google One"</item>
+ <item msgid="8803180377002008046">"Duas"</item>
+ <item msgid="8614897059944644719">"Três"</item>
+ <item msgid="2293058674782619556">"Quatro"</item>
+ <item msgid="4815402358455041664">"Cinco"</item>
+ <item msgid="3325754778509665687">"Seis"</item>
+ <item msgid="5805551341866280575">"Sete"</item>
+ <item msgid="203334816668238610">"Oito"</item>
+ <item msgid="4828052671464488923">"Nove"</item>
+ <item msgid="2233497913571137419">"Dez"</item>
+ <item msgid="5621554266768657830">"Onze"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985"></item>
+ <item msgid="8837126587669001578">"Um"</item>
+ <item msgid="4294343372940455660">"Dois"</item>
+ <item msgid="7129166637707421536">"Três"</item>
+ <item msgid="7579404865008788673">"Quatro"</item>
+ <item msgid="3873924689207380586">"Cinco"</item>
+ <item msgid="4849565597850069377">"Seis"</item>
+ <item msgid="4404219424523572364">"Sete"</item>
+ <item msgid="8740481214764087329">"Oito"</item>
+ <item msgid="1713216865806811237">"Nove"</item>
+ <item msgid="3508406095411245038">"Dez"</item>
+ <item msgid="7161996337755311711">"Onze"</item>
+ <item msgid="4044549963329624197">"Doze"</item>
+ <item msgid="333373157917379088">"Treze"</item>
+ <item msgid="2631202907124819385">"Catorze"</item>
+ <item msgid="6472396076858033453">"Quinze"</item>
+ <item msgid="8656981856181581643">"Dezasseis"</item>
+ <item msgid="7289026608562030619">"Dezassete"</item>
+ <item msgid="3881477602692646573">"Dezoito"</item>
+ <item msgid="3358129827772984226">"Dezanove"</item>
+ <item msgid="3308575407402865807">"Vinte"</item>
+ <item msgid="5346560955382229629">"Vinte\ne um"</item>
+ <item msgid="226750304761473436">"Vinte\ne dois"</item>
+ <item msgid="616811325336838734">"Vinte\ne três"</item>
+ <item msgid="616346116869053440">"Vinte\ne quatro"</item>
+ <item msgid="4642996410384042830">"Vinte\ne cinco"</item>
+ <item msgid="7506092849993571465">"Vinte\ne seis"</item>
+ <item msgid="1915078191101042031">"Vinte\ne sete"</item>
+ <item msgid="4292378641900520252">"Vinte\ne oito"</item>
+ <item msgid="5339513901773103696">"Vinte\ne nove"</item>
+ <item msgid="3574673250891657607">"Trinta"</item>
+ <item msgid="5796923836589110940">"Trinta\ne um"</item>
+ <item msgid="5859323597571702052">"Trinta\ne dois"</item>
+ <item msgid="5133326723148876507">"Trinta\ne três"</item>
+ <item msgid="2693999494655663096">"Trinta\ne quatro"</item>
+ <item msgid="3316754944962836197">"Trinta\ne cinco"</item>
+ <item msgid="816891008836796723">"Trinta\ne seis"</item>
+ <item msgid="9158890488666520078">"Trinta\ne sete"</item>
+ <item msgid="1894769703213894011">"Trinta\ne oito"</item>
+ <item msgid="5638820345598572399">"Trinta\ne nove"</item>
+ <item msgid="8838304023017895439">"Quarenta"</item>
+ <item msgid="1834742948932559597">"Quarenta\ne um"</item>
+ <item msgid="6573707308847773944">"Quarenta\ne dois"</item>
+ <item msgid="2450149950652678001">"Quarenta\ne três"</item>
+ <item msgid="2874667401318178036">"Quarenta\ne quatro"</item>
+ <item msgid="3391101532763048862">"Quarenta\ne cinco"</item>
+ <item msgid="1671489330863254362">"Quarenta\ne seis"</item>
+ <item msgid="5916017359554531038">"Quarenta\ne sete"</item>
+ <item msgid="8205413177993059967">"Quarenta\ne oito"</item>
+ <item msgid="6607867415142171302">"Quarenta\ne nove"</item>
+ <item msgid="8358850748472089162">"Cinquenta"</item>
+ <item msgid="3551313125255080234">"Cinquenta\ne um"</item>
+ <item msgid="1559678130725716542">"Cinquenta\ne dois"</item>
+ <item msgid="431441994725492377">"Cinquenta\ne três"</item>
+ <item msgid="6345774640539623024">"Cinquenta\ne quatro"</item>
+ <item msgid="8018192990793931120">"Cinquenta\ne cinco"</item>
+ <item msgid="6187650843754604534">"Cinquenta\ne seis"</item>
+ <item msgid="8727240174015993259">"Cinquenta\ne sete"</item>
+ <item msgid="848339003778952950">"Cinquenta\ne oito"</item>
+ <item msgid="5798985802835423618">"Cinquenta\ne nove"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-pt/strings.xml b/packages/SystemUI/res-keyguard/values-pt/strings.xml
index 6698bf9..3c6a372 100644
--- a/packages/SystemUI/res-keyguard/values-pt/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-pt/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">O chip agora está desativado. Informe o código PUK para continuar. Você tem <xliff:g id="_NUMBER_1">%d</xliff:g> tentativa restante antes de o chip se tornar permanentemente inutilizável. Entre em contato com a operadora para saber mais detalhes.</item>
<item quantity="other">O chip agora está desativado. Informe o código PUK para continuar. Você tem <xliff:g id="_NUMBER_1">%d</xliff:g> tentativas restantes antes de o chip se tornar permanentemente inutilizável. Entre em contato com a operadora para saber mais detalhes.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"São"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Doze"</item>
+ <item msgid="7389464214252023751">"Uma"</item>
+ <item msgid="8803180377002008046">"Duas"</item>
+ <item msgid="8614897059944644719">"Três"</item>
+ <item msgid="2293058674782619556">"Quatro"</item>
+ <item msgid="4815402358455041664">"Cinco"</item>
+ <item msgid="3325754778509665687">"Seis"</item>
+ <item msgid="5805551341866280575">"Sete"</item>
+ <item msgid="203334816668238610">"Oito"</item>
+ <item msgid="4828052671464488923">"Nove"</item>
+ <item msgid="2233497913571137419">"Dez"</item>
+ <item msgid="5621554266768657830">"Onze"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Em ponto"</item>
+ <item msgid="8837126587669001578">"Um"</item>
+ <item msgid="4294343372940455660">"Dois"</item>
+ <item msgid="7129166637707421536">"Três"</item>
+ <item msgid="7579404865008788673">"Quatro"</item>
+ <item msgid="3873924689207380586">"Cinco"</item>
+ <item msgid="4849565597850069377">"Seis"</item>
+ <item msgid="4404219424523572364">"Sete"</item>
+ <item msgid="8740481214764087329">"Oito"</item>
+ <item msgid="1713216865806811237">"Nove"</item>
+ <item msgid="3508406095411245038">"Dez"</item>
+ <item msgid="7161996337755311711">"Onze"</item>
+ <item msgid="4044549963329624197">"Doze"</item>
+ <item msgid="333373157917379088">"Treze"</item>
+ <item msgid="2631202907124819385">"Catorze"</item>
+ <item msgid="6472396076858033453">"Quinze"</item>
+ <item msgid="8656981856181581643">"Dezesseis"</item>
+ <item msgid="7289026608562030619">"Dezessete"</item>
+ <item msgid="3881477602692646573">"Dezoito"</item>
+ <item msgid="3358129827772984226">"Dezenove"</item>
+ <item msgid="3308575407402865807">"Vinte"</item>
+ <item msgid="5346560955382229629">"Vinte\ne um"</item>
+ <item msgid="226750304761473436">"Vinte\ne dois"</item>
+ <item msgid="616811325336838734">"Vinte\ne três"</item>
+ <item msgid="616346116869053440">"Vinte\ne quatro"</item>
+ <item msgid="4642996410384042830">"Vinte\ne cinco"</item>
+ <item msgid="7506092849993571465">"Vinte\ne seis"</item>
+ <item msgid="1915078191101042031">"Vinte\ne sete"</item>
+ <item msgid="4292378641900520252">"Vinte\ne oito"</item>
+ <item msgid="5339513901773103696">"Vinte\ne nove"</item>
+ <item msgid="3574673250891657607">"Trinta"</item>
+ <item msgid="5796923836589110940">"Trinta\ne um"</item>
+ <item msgid="5859323597571702052">"Trinta\ne dois"</item>
+ <item msgid="5133326723148876507">"Trinta\ne três"</item>
+ <item msgid="2693999494655663096">"Trinta\ne quatro"</item>
+ <item msgid="3316754944962836197">"Trinta\ne cinco"</item>
+ <item msgid="816891008836796723">"Trinta\ne seis"</item>
+ <item msgid="9158890488666520078">"Trinta\ne sete"</item>
+ <item msgid="1894769703213894011">"Trinta\ne oito"</item>
+ <item msgid="5638820345598572399">"Trinta\ne nove"</item>
+ <item msgid="8838304023017895439">"Quarenta"</item>
+ <item msgid="1834742948932559597">"Quarenta\ne um"</item>
+ <item msgid="6573707308847773944">"Quarenta\ne dois"</item>
+ <item msgid="2450149950652678001">"Quarenta\ne três"</item>
+ <item msgid="2874667401318178036">"Quarenta\ne quatro"</item>
+ <item msgid="3391101532763048862">"Quarenta\ne cinco"</item>
+ <item msgid="1671489330863254362">"Quarenta\ne seis"</item>
+ <item msgid="5916017359554531038">"Quarenta\ne sete"</item>
+ <item msgid="8205413177993059967">"Quarenta\ne oito"</item>
+ <item msgid="6607867415142171302">"Quarenta\ne nove"</item>
+ <item msgid="8358850748472089162">"Cinquenta"</item>
+ <item msgid="3551313125255080234">"Cinquenta\ne um"</item>
+ <item msgid="1559678130725716542">"Cinquenta\ne dois"</item>
+ <item msgid="431441994725492377">"Cinquenta\ne três"</item>
+ <item msgid="6345774640539623024">"Cinquenta\ne quatro"</item>
+ <item msgid="8018192990793931120">"Cinquenta\ne cinco"</item>
+ <item msgid="6187650843754604534">"Cinquenta\ne seis"</item>
+ <item msgid="8727240174015993259">"Cinquenta\ne sete"</item>
+ <item msgid="848339003778952950">"Cinquenta\ne oito"</item>
+ <item msgid="5798985802835423618">"Cinquenta\ne nove"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ro/strings.xml b/packages/SystemUI/res-keyguard/values-ro/strings.xml
index 915a47b..9e4170e 100644
--- a/packages/SystemUI/res-keyguard/values-ro/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ro/strings.xml
@@ -158,78 +158,81 @@
<item quantity="other">Cardul SIM este dezactivat acum. Introduceți codul PUK pentru a continua. V-au mai rămas <xliff:g id="_NUMBER_1">%d</xliff:g> de încercări până când cardul SIM va deveni inutilizabil definitiv. Contactați operatorul pentru detalii.</item>
<item quantity="one">Cardul SIM este dezactivat acum. Introduceți codul PUK pentru a continua. V-a mai rămas <xliff:g id="_NUMBER_0">%d</xliff:g> încercare până când cardul SIM va deveni inutilizabil definitiv. Contactați operatorul pentru detalii.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Este"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Douăsprezece"</item>
+ <item msgid="7389464214252023751">"Unu"</item>
+ <item msgid="8803180377002008046">"Două"</item>
+ <item msgid="8614897059944644719">"Trei"</item>
+ <item msgid="2293058674782619556">"Patru"</item>
+ <item msgid="4815402358455041664">"Cinci"</item>
+ <item msgid="3325754778509665687">"Șase"</item>
+ <item msgid="5805551341866280575">"Șapte"</item>
+ <item msgid="203334816668238610">"Opt"</item>
+ <item msgid="4828052671464488923">"Nouă"</item>
+ <item msgid="2233497913571137419">"Zece"</item>
+ <item msgid="5621554266768657830">"Unsprezece"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"."</item>
+ <item msgid="8837126587669001578">"și unu"</item>
+ <item msgid="4294343372940455660">"și două"</item>
+ <item msgid="7129166637707421536">"și trei"</item>
+ <item msgid="7579404865008788673">"și patru"</item>
+ <item msgid="3873924689207380586">"și cinci"</item>
+ <item msgid="4849565597850069377">"și șase"</item>
+ <item msgid="4404219424523572364">"și șapte"</item>
+ <item msgid="8740481214764087329">"și opt"</item>
+ <item msgid="1713216865806811237">"și nouă"</item>
+ <item msgid="3508406095411245038">"Zece"</item>
+ <item msgid="7161996337755311711">"Unsprezece"</item>
+ <item msgid="4044549963329624197">"Douăsprezece"</item>
+ <item msgid="333373157917379088">"Treisprezece"</item>
+ <item msgid="2631202907124819385">"Paisprezece"</item>
+ <item msgid="6472396076858033453">"Cincisprezece"</item>
+ <item msgid="8656981856181581643">"Șaisprezece"</item>
+ <item msgid="7289026608562030619">"Șaptesprezece"</item>
+ <item msgid="3881477602692646573">"Optsprezece"</item>
+ <item msgid="3358129827772984226">"Nouăsprezece"</item>
+ <item msgid="3308575407402865807">"Douăzeci"</item>
+ <item msgid="5346560955382229629">"Douăzeci\nși unu"</item>
+ <item msgid="226750304761473436">"Douăzeci\nși doi"</item>
+ <item msgid="616811325336838734">"Douăzeci\nși trei"</item>
+ <item msgid="616346116869053440">"Douăzeci\nși patru"</item>
+ <item msgid="4642996410384042830">"Douăzeci\nși cinci"</item>
+ <item msgid="7506092849993571465">"Douăzeci\nși șase"</item>
+ <item msgid="1915078191101042031">"Douăzeci\nși șapte"</item>
+ <item msgid="4292378641900520252">"Douăzeci\nși opt"</item>
+ <item msgid="5339513901773103696">"Douăzeci\nși nouă"</item>
+ <item msgid="3574673250891657607">"Treizeci"</item>
+ <item msgid="5796923836589110940">"Treizeci\nși unu"</item>
+ <item msgid="5859323597571702052">"Treizeci\nși două"</item>
+ <item msgid="5133326723148876507">"Treizeci\nși trei"</item>
+ <item msgid="2693999494655663096">"Treizeci\nși patru"</item>
+ <item msgid="3316754944962836197">"Treizeci\nși cinci"</item>
+ <item msgid="816891008836796723">"Treizeci\nși șase"</item>
+ <item msgid="9158890488666520078">"Treizeci\nși șapte"</item>
+ <item msgid="1894769703213894011">"Treizeci\nși opt"</item>
+ <item msgid="5638820345598572399">"Treizeci\nși nouă"</item>
+ <item msgid="8838304023017895439">"Patruzeci"</item>
+ <item msgid="1834742948932559597">"Patruzeci\nși unu"</item>
+ <item msgid="6573707308847773944">"Patruzeci\nși două"</item>
+ <item msgid="2450149950652678001">"Patruzeci\nși trei"</item>
+ <item msgid="2874667401318178036">"Patruzeci\nși patru"</item>
+ <item msgid="3391101532763048862">"Patruzeci\nși cinci"</item>
+ <item msgid="1671489330863254362">"Patruzeci\nși șase"</item>
+ <item msgid="5916017359554531038">"Patruzeci\nși șapte"</item>
+ <item msgid="8205413177993059967">"Patruzeci\nși opt"</item>
+ <item msgid="6607867415142171302">"Patruzeci\nși nouă"</item>
+ <item msgid="8358850748472089162">"Cincizeci"</item>
+ <item msgid="3551313125255080234">"Cincizeci\nși unu"</item>
+ <item msgid="1559678130725716542">"Cincizeci\nși doi"</item>
+ <item msgid="431441994725492377">"Cincizeci\nși trei"</item>
+ <item msgid="6345774640539623024">"Cincizeci\nși patru"</item>
+ <item msgid="8018192990793931120">"Cincizeci\nși cinci"</item>
+ <item msgid="6187650843754604534">"Cincizeci\nși șase"</item>
+ <item msgid="8727240174015993259">"Cincizeci\nși șapte"</item>
+ <item msgid="848339003778952950">"Cincizeci\nși opt"</item>
+ <item msgid="5798985802835423618">"Cincizeci\nși nouă"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ru/strings.xml b/packages/SystemUI/res-keyguard/values-ru/strings.xml
index d036e0d..dd9bc6a 100644
--- a/packages/SystemUI/res-keyguard/values-ru/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ru/strings.xml
@@ -166,78 +166,81 @@
<item quantity="many">SIM-карта отключена. Чтобы продолжить, введите PUK-код. Осталось <xliff:g id="_NUMBER_1">%d</xliff:g> попыток. После этого SIM-карта будет заблокирована навсегда. За подробной информацией обратитесь к оператору связи.</item>
<item quantity="other">SIM-карта отключена. Чтобы продолжить, введите PUK-код. Осталось <xliff:g id="_NUMBER_1">%d</xliff:g> попытки. После этого SIM-карта будет заблокирована навсегда. За подробной информацией обратитесь к оператору связи.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Сейчас"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"двенадцать"</item>
+ <item msgid="7389464214252023751">"один"</item>
+ <item msgid="8803180377002008046">"два"</item>
+ <item msgid="8614897059944644719">"три"</item>
+ <item msgid="2293058674782619556">"четыре"</item>
+ <item msgid="4815402358455041664">"пять"</item>
+ <item msgid="3325754778509665687">"шесть"</item>
+ <item msgid="5805551341866280575">"семь"</item>
+ <item msgid="203334816668238610">"восемь"</item>
+ <item msgid="4828052671464488923">"девять"</item>
+ <item msgid="2233497913571137419">"десять"</item>
+ <item msgid="5621554266768657830">"одиннадцать"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"ровно"</item>
+ <item msgid="8837126587669001578">"ноль одна"</item>
+ <item msgid="4294343372940455660">"ноль две"</item>
+ <item msgid="7129166637707421536">"ноль три"</item>
+ <item msgid="7579404865008788673">"ноль четыре"</item>
+ <item msgid="3873924689207380586">"ноль пять"</item>
+ <item msgid="4849565597850069377">"ноль шесть"</item>
+ <item msgid="4404219424523572364">"ноль семь"</item>
+ <item msgid="8740481214764087329">"ноль восемь"</item>
+ <item msgid="1713216865806811237">"ноль девять"</item>
+ <item msgid="3508406095411245038">"десять"</item>
+ <item msgid="7161996337755311711">"одиннадцать"</item>
+ <item msgid="4044549963329624197">"двенадцать"</item>
+ <item msgid="333373157917379088">"тринадцать"</item>
+ <item msgid="2631202907124819385">"четырнадцать"</item>
+ <item msgid="6472396076858033453">"пятнадцать"</item>
+ <item msgid="8656981856181581643">"шестнадцать"</item>
+ <item msgid="7289026608562030619">"семнадцать"</item>
+ <item msgid="3881477602692646573">"восемнадцать"</item>
+ <item msgid="3358129827772984226">"девятнадцать"</item>
+ <item msgid="3308575407402865807">"двадцать"</item>
+ <item msgid="5346560955382229629">"двадцать\nодна"</item>
+ <item msgid="226750304761473436">"двадцать\nдве"</item>
+ <item msgid="616811325336838734">"двадцать\nтри"</item>
+ <item msgid="616346116869053440">"двадцать\nчетыре"</item>
+ <item msgid="4642996410384042830">"двадцать\nпять"</item>
+ <item msgid="7506092849993571465">"двадцать\nшесть"</item>
+ <item msgid="1915078191101042031">"двадцать\nсемь"</item>
+ <item msgid="4292378641900520252">"двадцать\nвосемь"</item>
+ <item msgid="5339513901773103696">"двадцать\nдевять"</item>
+ <item msgid="3574673250891657607">"тридцать"</item>
+ <item msgid="5796923836589110940">"тридцать\nодна"</item>
+ <item msgid="5859323597571702052">"тридцать\nдве"</item>
+ <item msgid="5133326723148876507">"тридцать\nтри"</item>
+ <item msgid="2693999494655663096">"тридцать\nчетыре"</item>
+ <item msgid="3316754944962836197">"тридцать\nпять"</item>
+ <item msgid="816891008836796723">"тридцать\nшесть"</item>
+ <item msgid="9158890488666520078">"тридцать\nсемь"</item>
+ <item msgid="1894769703213894011">"тридцать\nвосемь"</item>
+ <item msgid="5638820345598572399">"тридцать\nдевять"</item>
+ <item msgid="8838304023017895439">"сорок"</item>
+ <item msgid="1834742948932559597">"сорок\nодна"</item>
+ <item msgid="6573707308847773944">"сорок\nдве"</item>
+ <item msgid="2450149950652678001">"сорок\nтри"</item>
+ <item msgid="2874667401318178036">"сорок\nчетыре"</item>
+ <item msgid="3391101532763048862">"сорок\nпять"</item>
+ <item msgid="1671489330863254362">"сорок\nшесть"</item>
+ <item msgid="5916017359554531038">"cорок\nсемь"</item>
+ <item msgid="8205413177993059967">"сорок\nвосемь"</item>
+ <item msgid="6607867415142171302">"сорок\nдевять"</item>
+ <item msgid="8358850748472089162">"пятьдесят"</item>
+ <item msgid="3551313125255080234">"пятьдесят\nодна"</item>
+ <item msgid="1559678130725716542">"пятьдесят\nдве"</item>
+ <item msgid="431441994725492377">"пятьдесят\nтри"</item>
+ <item msgid="6345774640539623024">"пятьдесят\nчетыре"</item>
+ <item msgid="8018192990793931120">"пятьдесят\nпять"</item>
+ <item msgid="6187650843754604534">"пятьдесят\nшесть"</item>
+ <item msgid="8727240174015993259">"пятьдесят\nсемь"</item>
+ <item msgid="848339003778952950">"пятьдесят\nвосемь"</item>
+ <item msgid="5798985802835423618">"пятьдесят\nдевять"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-si/strings.xml b/packages/SystemUI/res-keyguard/values-si/strings.xml
index 7073526..59d2a06 100644
--- a/packages/SystemUI/res-keyguard/values-si/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-si/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">SIM දැන් අබල කර ඇත. දිගටම කරගෙන යාමට PUK කේතය ඇතුළු කරන්න. SIM ස්ථිරවම භාවිත කළ නොහැකි බවට පත් වීමට පෙර ඔබ සතුව උත්සාහයන් <xliff:g id="_NUMBER_1">%d</xliff:g>ක් ඉතිරිව ඇත. විස්තර සඳහා වාහක සම්බන්ධ කර ගන්න.</item>
<item quantity="other">SIM දැන් අබල කර ඇත. දිගටම කරගෙන යාමට PUK කේතය ඇතුළු කරන්න. SIM ස්ථිරවම භාවිත කළ නොහැකි බවට පත් වීමට පෙර ඔබ සතුව උත්සාහයන් <xliff:g id="_NUMBER_1">%d</xliff:g>ක් ඉතිරිව ඇත. විස්තර සඳහා වාහක සම්බන්ධ කර ගන්න.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"ඒ"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"දොළහ"</item>
+ <item msgid="7389464214252023751">"එක"</item>
+ <item msgid="8803180377002008046">"දෙක"</item>
+ <item msgid="8614897059944644719">"තුන"</item>
+ <item msgid="2293058674782619556">"හතර"</item>
+ <item msgid="4815402358455041664">"පහ"</item>
+ <item msgid="3325754778509665687">"හය"</item>
+ <item msgid="5805551341866280575">"හත"</item>
+ <item msgid="203334816668238610">"අට"</item>
+ <item msgid="4828052671464488923">"නවය"</item>
+ <item msgid="2233497913571137419">"දහය"</item>
+ <item msgid="5621554266768657830">"එකොළහ"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"පැය"</item>
+ <item msgid="8837126587669001578">"එකයි"</item>
+ <item msgid="4294343372940455660">"දෙකයි"</item>
+ <item msgid="7129166637707421536">"තුනයි"</item>
+ <item msgid="7579404865008788673">"හතරයි"</item>
+ <item msgid="3873924689207380586">"පහයි"</item>
+ <item msgid="4849565597850069377">"හයයි"</item>
+ <item msgid="4404219424523572364">"හතයි"</item>
+ <item msgid="8740481214764087329">"අටයි"</item>
+ <item msgid="1713216865806811237">"නවයයි"</item>
+ <item msgid="3508406095411245038">"දහය"</item>
+ <item msgid="7161996337755311711">"එකොළහ"</item>
+ <item msgid="4044549963329624197">"දොළහ"</item>
+ <item msgid="333373157917379088">"දහතුන"</item>
+ <item msgid="2631202907124819385">"දහහතර"</item>
+ <item msgid="6472396076858033453">"පහළොව"</item>
+ <item msgid="8656981856181581643">"දහසය"</item>
+ <item msgid="7289026608562030619">"දහහත"</item>
+ <item msgid="3881477602692646573">"දහඅට"</item>
+ <item msgid="3358129827772984226">"දහනවය"</item>
+ <item msgid="3308575407402865807">"විස්ස"</item>
+ <item msgid="5346560955382229629">"විසි\nඑක"</item>
+ <item msgid="226750304761473436">"විසි\nදෙක"</item>
+ <item msgid="616811325336838734">"විසි\nතුනයි"</item>
+ <item msgid="616346116869053440">"විසි\nහතර"</item>
+ <item msgid="4642996410384042830">"විසි\nපහ"</item>
+ <item msgid="7506092849993571465">"විසි\nහය"</item>
+ <item msgid="1915078191101042031">"විසි\nහත"</item>
+ <item msgid="4292378641900520252">"විසි\nඅට"</item>
+ <item msgid="5339513901773103696">"විසි\nනවය"</item>
+ <item msgid="3574673250891657607">"තිහ"</item>
+ <item msgid="5796923836589110940">"තිස්\nඑක"</item>
+ <item msgid="5859323597571702052">"තිස්\nදෙක"</item>
+ <item msgid="5133326723148876507">"තිස්\nතුන"</item>
+ <item msgid="2693999494655663096">"තිස්\nහතර"</item>
+ <item msgid="3316754944962836197">"තිස්\nපහ"</item>
+ <item msgid="816891008836796723">"තිස්\nහය"</item>
+ <item msgid="9158890488666520078">"තිස්\nහත"</item>
+ <item msgid="1894769703213894011">"තිස්\nඅට"</item>
+ <item msgid="5638820345598572399">"තිස්\nනවය"</item>
+ <item msgid="8838304023017895439">"හතළිහ"</item>
+ <item msgid="1834742948932559597">"හතළිස්\nඑක"</item>
+ <item msgid="6573707308847773944">"හතළිස්\nදෙක"</item>
+ <item msgid="2450149950652678001">"හතළිස්\nතුන"</item>
+ <item msgid="2874667401318178036">"හතළිස්\nහතර"</item>
+ <item msgid="3391101532763048862">"හතළිස්\nපහ"</item>
+ <item msgid="1671489330863254362">"හතළිස්\nහය"</item>
+ <item msgid="5916017359554531038">"හතළිස්\nහත"</item>
+ <item msgid="8205413177993059967">"හතළිස්\nඅට"</item>
+ <item msgid="6607867415142171302">"හතළිස්\nනවය"</item>
+ <item msgid="8358850748472089162">"පනහ"</item>
+ <item msgid="3551313125255080234">"පනස්\nඑක"</item>
+ <item msgid="1559678130725716542">"පනස්\nදෙක"</item>
+ <item msgid="431441994725492377">"පනස්\nතුන"</item>
+ <item msgid="6345774640539623024">"පනස්\nහතර"</item>
+ <item msgid="8018192990793931120">"පනස්\nපහ"</item>
+ <item msgid="6187650843754604534">"පනස\nහය"</item>
+ <item msgid="8727240174015993259">"පනස්\nහත"</item>
+ <item msgid="848339003778952950">"පනස්\nඅට"</item>
+ <item msgid="5798985802835423618">"පනස්\nනවය"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-sk/strings.xml b/packages/SystemUI/res-keyguard/values-sk/strings.xml
index 9f0501c..0cd5f78 100644
--- a/packages/SystemUI/res-keyguard/values-sk/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-sk/strings.xml
@@ -166,78 +166,81 @@
<item quantity="other">SIM karta je deaktivovaná. Pokračujte zadaním kódu PUK. Zostáva vám <xliff:g id="_NUMBER_1">%d</xliff:g> pokusov, potom sa SIM karta natrvalo zablokuje. Podrobnosti vám poskytne operátor.</item>
<item quantity="one">SIM karta je deaktivovaná. Pokračujte zadaním kódu PUK. Zostáva vám <xliff:g id="_NUMBER_0">%d</xliff:g> pokus, potom sa SIM karta natrvalo zablokuje. Podrobnosti vám poskytne operátor.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Práve je"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Dvanásť"</item>
+ <item msgid="7389464214252023751">"Jedna"</item>
+ <item msgid="8803180377002008046">"Dve"</item>
+ <item msgid="8614897059944644719">"Tri"</item>
+ <item msgid="2293058674782619556">"Štyri"</item>
+ <item msgid="4815402358455041664">"Päť"</item>
+ <item msgid="3325754778509665687">"Šesť"</item>
+ <item msgid="5805551341866280575">"Sedem"</item>
+ <item msgid="203334816668238610">"Osem"</item>
+ <item msgid="4828052671464488923">"Deväť"</item>
+ <item msgid="2233497913571137419">"Desať"</item>
+ <item msgid="5621554266768657830">"Jedenásť"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"hod."</item>
+ <item msgid="8837126587669001578">"Jedna hodina"</item>
+ <item msgid="4294343372940455660">"Dve hodiny"</item>
+ <item msgid="7129166637707421536">"Tri hodiny"</item>
+ <item msgid="7579404865008788673">"Štyri hodiny"</item>
+ <item msgid="3873924689207380586">"Päť hodín"</item>
+ <item msgid="4849565597850069377">"Šesť hodín"</item>
+ <item msgid="4404219424523572364">"Sedem hodín"</item>
+ <item msgid="8740481214764087329">"Osem hodín"</item>
+ <item msgid="1713216865806811237">"Deväť hodín"</item>
+ <item msgid="3508406095411245038">"Desať"</item>
+ <item msgid="7161996337755311711">"Jedenásť"</item>
+ <item msgid="4044549963329624197">"Dvanásť"</item>
+ <item msgid="333373157917379088">"Trinásť"</item>
+ <item msgid="2631202907124819385">"Štrnásť"</item>
+ <item msgid="6472396076858033453">"Päťnásť"</item>
+ <item msgid="8656981856181581643">"Šesťnásť"</item>
+ <item msgid="7289026608562030619">"Sedemnásť"</item>
+ <item msgid="3881477602692646573">"Osemnásť"</item>
+ <item msgid="3358129827772984226">"Deväťnásť"</item>
+ <item msgid="3308575407402865807">"Dvadsať"</item>
+ <item msgid="5346560955382229629">"Dvadsaťjeden\n"</item>
+ <item msgid="226750304761473436">"Dvadsaťdva\n"</item>
+ <item msgid="616811325336838734">"Dvadsaťtri\n"</item>
+ <item msgid="616346116869053440">"Dvadsaťštyri\n"</item>
+ <item msgid="4642996410384042830">"Dvadsaťpäť\n"</item>
+ <item msgid="7506092849993571465">"Dvadsaťšesť\n"</item>
+ <item msgid="1915078191101042031">"Dvadsaťsedem\n"</item>
+ <item msgid="4292378641900520252">"Dvadsaťosem\n"</item>
+ <item msgid="5339513901773103696">"Dvadsaťdeväť\n"</item>
+ <item msgid="3574673250891657607">"Tridsať"</item>
+ <item msgid="5796923836589110940">"Tridsaťjeden\n"</item>
+ <item msgid="5859323597571702052">"Tridsaťdva\n"</item>
+ <item msgid="5133326723148876507">"Tridsaťtri\n"</item>
+ <item msgid="2693999494655663096">"Tridsaťštyri\n"</item>
+ <item msgid="3316754944962836197">"Tridsaťpäť\n"</item>
+ <item msgid="816891008836796723">"Tridsaťšesť\n"</item>
+ <item msgid="9158890488666520078">"Tridsaťsedem\n"</item>
+ <item msgid="1894769703213894011">"Tridsaťosem\n"</item>
+ <item msgid="5638820345598572399">"Tridsaťdeväť\n"</item>
+ <item msgid="8838304023017895439">"Štyridsať"</item>
+ <item msgid="1834742948932559597">"Štyridsaťjeden\n"</item>
+ <item msgid="6573707308847773944">"Štyridsaťdva\n"</item>
+ <item msgid="2450149950652678001">"Štyridsaťtri\n"</item>
+ <item msgid="2874667401318178036">"Štyridsaťštyri\n"</item>
+ <item msgid="3391101532763048862">"Štyridsaťpäť\n"</item>
+ <item msgid="1671489330863254362">"Štyridsaťšesť\n"</item>
+ <item msgid="5916017359554531038">"Štyridsaťsedem\n"</item>
+ <item msgid="8205413177993059967">"Štyridsaťosem\n"</item>
+ <item msgid="6607867415142171302">"Štyridsaťdeväť\n"</item>
+ <item msgid="8358850748472089162">"Päťdesiať"</item>
+ <item msgid="3551313125255080234">"Päťdesiatjeden\n"</item>
+ <item msgid="1559678130725716542">"Päťdesiatdva\n"</item>
+ <item msgid="431441994725492377">"Päťdesiattri\n"</item>
+ <item msgid="6345774640539623024">"Päťdesiatštyri\n"</item>
+ <item msgid="8018192990793931120">"Päťdesiaťpäť\n"</item>
+ <item msgid="6187650843754604534">"Päťdesiatšesť\n"</item>
+ <item msgid="8727240174015993259">"Päťdesiatsedem\n"</item>
+ <item msgid="848339003778952950">"Päťdesiatosem\n"</item>
+ <item msgid="5798985802835423618">"Päťdesiatdeväť\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-sl/strings.xml b/packages/SystemUI/res-keyguard/values-sl/strings.xml
index afc6ee1b..52b9d60 100644
--- a/packages/SystemUI/res-keyguard/values-sl/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-sl/strings.xml
@@ -166,78 +166,81 @@
<item quantity="few">Kartica SIM je zdaj onemogočena. Če želite nadaljevati, vnesite kodo PUK. Na voljo imate še <xliff:g id="_NUMBER_1">%d</xliff:g> poskuse. Potem bo kartica SIM postala trajno neuporabna. Za podrobnosti se obrnite na operaterja.</item>
<item quantity="other">Kartica SIM je zdaj onemogočena. Če želite nadaljevati, vnesite kodo PUK. Na voljo imate še <xliff:g id="_NUMBER_1">%d</xliff:g> poskusov. Potem bo kartica SIM postala trajno neuporabna. Za podrobnosti se obrnite na operaterja.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Ura je"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Dvanajst"</item>
+ <item msgid="7389464214252023751">"Ena"</item>
+ <item msgid="8803180377002008046">"Dve"</item>
+ <item msgid="8614897059944644719">"Tri"</item>
+ <item msgid="2293058674782619556">"Štiri"</item>
+ <item msgid="4815402358455041664">"Pet"</item>
+ <item msgid="3325754778509665687">"Šest"</item>
+ <item msgid="5805551341866280575">"Sedem"</item>
+ <item msgid="203334816668238610">"Osem"</item>
+ <item msgid="4828052671464488923">"Devet"</item>
+ <item msgid="2233497913571137419">"Deset"</item>
+ <item msgid="5621554266768657830">"Enajst"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985"></item>
+ <item msgid="8837126587669001578">"Ena"</item>
+ <item msgid="4294343372940455660">"Dve"</item>
+ <item msgid="7129166637707421536">"Tri"</item>
+ <item msgid="7579404865008788673">"Štiri"</item>
+ <item msgid="3873924689207380586">"Pet"</item>
+ <item msgid="4849565597850069377">"Šest"</item>
+ <item msgid="4404219424523572364">"Sedem"</item>
+ <item msgid="8740481214764087329">"Osem"</item>
+ <item msgid="1713216865806811237">"Devet"</item>
+ <item msgid="3508406095411245038">"Deset"</item>
+ <item msgid="7161996337755311711">"Enajst"</item>
+ <item msgid="4044549963329624197">"Dvanajst"</item>
+ <item msgid="333373157917379088">"Trinajst"</item>
+ <item msgid="2631202907124819385">"Štirinajst"</item>
+ <item msgid="6472396076858033453">"Petnajst"</item>
+ <item msgid="8656981856181581643">"Šestnajst"</item>
+ <item msgid="7289026608562030619">"Sedemnajst"</item>
+ <item msgid="3881477602692646573">"Osemnajst"</item>
+ <item msgid="3358129827772984226">"Devetnajst"</item>
+ <item msgid="3308575407402865807">"Dvajset"</item>
+ <item msgid="5346560955382229629">"Enaindvajset\n"</item>
+ <item msgid="226750304761473436">"Dvaindvajset\n"</item>
+ <item msgid="616811325336838734">"Triindvajset\n"</item>
+ <item msgid="616346116869053440">"Štiriindvajset\n"</item>
+ <item msgid="4642996410384042830">"Petindvajset\n"</item>
+ <item msgid="7506092849993571465">"Šestindvajset\n"</item>
+ <item msgid="1915078191101042031">"Sedemindvajset\n"</item>
+ <item msgid="4292378641900520252">"Osemindvajset\n"</item>
+ <item msgid="5339513901773103696">"Devetindvajset\n"</item>
+ <item msgid="3574673250891657607">"Trideset"</item>
+ <item msgid="5796923836589110940">"Enaintrideset\n"</item>
+ <item msgid="5859323597571702052">"Dvaintrideset\n"</item>
+ <item msgid="5133326723148876507">"Triintrideset\n"</item>
+ <item msgid="2693999494655663096">"Štiriintrideset\n"</item>
+ <item msgid="3316754944962836197">"Petintrideset\n"</item>
+ <item msgid="816891008836796723">"Šestintrideset\n"</item>
+ <item msgid="9158890488666520078">"Sedemintrideset\n"</item>
+ <item msgid="1894769703213894011">"Osemintrideset\n"</item>
+ <item msgid="5638820345598572399">"Devetintrideset\n"</item>
+ <item msgid="8838304023017895439">"Štirideset"</item>
+ <item msgid="1834742948932559597">"Enainštirideset\n"</item>
+ <item msgid="6573707308847773944">"Dvainštirideset\n"</item>
+ <item msgid="2450149950652678001">"Triinštirideset\n"</item>
+ <item msgid="2874667401318178036">"Štiriinštirides.\n"</item>
+ <item msgid="3391101532763048862">"Petinštirideset\n"</item>
+ <item msgid="1671489330863254362">"Šestinštirideset\n"</item>
+ <item msgid="5916017359554531038">"Sedeminštirides.\n"</item>
+ <item msgid="8205413177993059967">"Oseminštirideset\n"</item>
+ <item msgid="6607867415142171302">"Devetinštirides.\n"</item>
+ <item msgid="8358850748472089162">"Petdeset"</item>
+ <item msgid="3551313125255080234">"Enainpetdeset\n"</item>
+ <item msgid="1559678130725716542">"Dvainpetdeset\n"</item>
+ <item msgid="431441994725492377">"Triinpetdeset\n"</item>
+ <item msgid="6345774640539623024">"Štiriinpetdeset\n"</item>
+ <item msgid="8018192990793931120">"Petinpetdeset\n"</item>
+ <item msgid="6187650843754604534">"Šestinpetdeset\n"</item>
+ <item msgid="8727240174015993259">"Sedeminpetdeset\n"</item>
+ <item msgid="848339003778952950">"Oseminpetdeset\n"</item>
+ <item msgid="5798985802835423618">"Devetinpetdeset\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-sq/strings.xml b/packages/SystemUI/res-keyguard/values-sq/strings.xml
index d8e68d7..1dfb8fd 100644
--- a/packages/SystemUI/res-keyguard/values-sq/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-sq/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">Karta SIM tani është çaktivizuar. Fut kodin PUK për të vazhduar. Të kanë mbetur edhe <xliff:g id="_NUMBER_1">%d</xliff:g> përpjekje përpara se karta SIM të bëhet përgjithmonë e papërdorshme. Kontakto me operatorin për detaje.</item>
<item quantity="one">Karta SIM tani është çaktivizuar. Fut kodin PUK për të vazhduar. Të ka mbetur edhe <xliff:g id="_NUMBER_0">%d</xliff:g> përpjekje përpara se karta SIM të bëhet përgjithmonë e papërdorshme. Kontakto me operatorin për detaje.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Ora është"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Dymbëdhjetë"</item>
+ <item msgid="7389464214252023751">"Një"</item>
+ <item msgid="8803180377002008046">"Dy"</item>
+ <item msgid="8614897059944644719">"Tre"</item>
+ <item msgid="2293058674782619556">"Katër"</item>
+ <item msgid="4815402358455041664">"Pesë"</item>
+ <item msgid="3325754778509665687">"Gjashtë"</item>
+ <item msgid="5805551341866280575">"Shtatë"</item>
+ <item msgid="203334816668238610">"Tetë"</item>
+ <item msgid="4828052671464488923">"Nëntë"</item>
+ <item msgid="2233497913571137419">"Dhjetë"</item>
+ <item msgid="5621554266768657830">"Njëmbëdhjetë"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Fiks"</item>
+ <item msgid="8837126587669001578">"E një"</item>
+ <item msgid="4294343372940455660">"E dy"</item>
+ <item msgid="7129166637707421536">"E tre"</item>
+ <item msgid="7579404865008788673">"E katër"</item>
+ <item msgid="3873924689207380586">"E pesë"</item>
+ <item msgid="4849565597850069377">"E gjashtë"</item>
+ <item msgid="4404219424523572364">"E shtatë"</item>
+ <item msgid="8740481214764087329">"E tetë"</item>
+ <item msgid="1713216865806811237">"E nëntë"</item>
+ <item msgid="3508406095411245038">"Dhjetë"</item>
+ <item msgid="7161996337755311711">"Njëmbëdhjetë"</item>
+ <item msgid="4044549963329624197">"Dymbëdhjetë"</item>
+ <item msgid="333373157917379088">"Trembëdhjetë"</item>
+ <item msgid="2631202907124819385">"Katërmbëdhjetë"</item>
+ <item msgid="6472396076858033453">"Pesëmbëdhjetë"</item>
+ <item msgid="8656981856181581643">"Gjashtëmbëdhjetë"</item>
+ <item msgid="7289026608562030619">"Shtatëmbëdhjetë"</item>
+ <item msgid="3881477602692646573">"Tetëmbëdhjetë"</item>
+ <item msgid="3358129827772984226">"Nëntëmbëdhjetë"</item>
+ <item msgid="3308575407402865807">"Njëzet"</item>
+ <item msgid="5346560955382229629">"Njëzet\ne një"</item>
+ <item msgid="226750304761473436">"Njëzet\ne dy"</item>
+ <item msgid="616811325336838734">"Njëzet\ne tre"</item>
+ <item msgid="616346116869053440">"Njëzet\ne katër"</item>
+ <item msgid="4642996410384042830">"Njëzet\ne pesë"</item>
+ <item msgid="7506092849993571465">"Njëzet\ne gjashtë"</item>
+ <item msgid="1915078191101042031">"Njëzet\ne shtatë"</item>
+ <item msgid="4292378641900520252">"Njëzet\ne tetë"</item>
+ <item msgid="5339513901773103696">"Njëzet\ne nëntë"</item>
+ <item msgid="3574673250891657607">"Tridhjetë"</item>
+ <item msgid="5796923836589110940">"Tridhjetë\ne një"</item>
+ <item msgid="5859323597571702052">"Tridhjetë\ne dy"</item>
+ <item msgid="5133326723148876507">"Tridhjetë\ne tre"</item>
+ <item msgid="2693999494655663096">"Tridhjetë\ne katër"</item>
+ <item msgid="3316754944962836197">"Tridhjetë\ne pesë"</item>
+ <item msgid="816891008836796723">"Tridhjetë\ne gjashtë"</item>
+ <item msgid="9158890488666520078">"Tridhjetë\ne shtatë"</item>
+ <item msgid="1894769703213894011">"Tridhjetë\ne tetë"</item>
+ <item msgid="5638820345598572399">"Tridhjetë\ne nëntë"</item>
+ <item msgid="8838304023017895439">"Dyzet"</item>
+ <item msgid="1834742948932559597">"Dyzet\ne një"</item>
+ <item msgid="6573707308847773944">"Dyzet\ne dy"</item>
+ <item msgid="2450149950652678001">"Dyzet\ne tre"</item>
+ <item msgid="2874667401318178036">"Dyzet\ne katër"</item>
+ <item msgid="3391101532763048862">"Dyzet\ne pesë"</item>
+ <item msgid="1671489330863254362">"Dyzet\ne gjashtë"</item>
+ <item msgid="5916017359554531038">"Dyzet\ne shtatë"</item>
+ <item msgid="8205413177993059967">"Dyzet\ne tetë"</item>
+ <item msgid="6607867415142171302">"Dyzet\ne nëntë"</item>
+ <item msgid="8358850748472089162">"Pesëdhjetë"</item>
+ <item msgid="3551313125255080234">"Pesëdhjetë\ne një"</item>
+ <item msgid="1559678130725716542">"Pesëdhjetë\ne dy"</item>
+ <item msgid="431441994725492377">"Pesëdhjetë\ne tre"</item>
+ <item msgid="6345774640539623024">"Pesëdhjetë\ne katër"</item>
+ <item msgid="8018192990793931120">"Pesëdhjetë\ne pesë"</item>
+ <item msgid="6187650843754604534">"Pesëdhjetë\ne gjashtë"</item>
+ <item msgid="8727240174015993259">"Pesëdhjetë\ne shtatë"</item>
+ <item msgid="848339003778952950">"Pesëdhjetë\ne tetë"</item>
+ <item msgid="5798985802835423618">"Pesëdhjetë\ne nëntë"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-sr/strings.xml b/packages/SystemUI/res-keyguard/values-sr/strings.xml
index c576493..7bb41e9 100644
--- a/packages/SystemUI/res-keyguard/values-sr/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-sr/strings.xml
@@ -158,78 +158,81 @@
<item quantity="few">SIM је сада онемогућен. Унесите PUK кôд да бисте наставили. Имате још <xliff:g id="_NUMBER_1">%d</xliff:g> покушаја пре него што SIM постане трајно неупотребљив. Детаљне информације потражите од мобилног оператера.</item>
<item quantity="other">SIM је сада онемогућен. Унесите PUK кôд да бисте наставили. Имате још <xliff:g id="_NUMBER_1">%d</xliff:g> покушаја пре него што SIM постане трајно неупотребљив. Детаљне информације потражите од мобилног оператера.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Сада је"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"дванаест"</item>
+ <item msgid="7389464214252023751">"један"</item>
+ <item msgid="8803180377002008046">"два"</item>
+ <item msgid="8614897059944644719">"три"</item>
+ <item msgid="2293058674782619556">"четири"</item>
+ <item msgid="4815402358455041664">"пет"</item>
+ <item msgid="3325754778509665687">"шест"</item>
+ <item msgid="5805551341866280575">"седам"</item>
+ <item msgid="203334816668238610">"осам"</item>
+ <item msgid="4828052671464488923">"девет"</item>
+ <item msgid="2233497913571137419">"десет"</item>
+ <item msgid="5621554266768657830">"једанаест"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"сата(и)"</item>
+ <item msgid="8837126587669001578">"један"</item>
+ <item msgid="4294343372940455660">"два"</item>
+ <item msgid="7129166637707421536">"три"</item>
+ <item msgid="7579404865008788673">"четири"</item>
+ <item msgid="3873924689207380586">"пет"</item>
+ <item msgid="4849565597850069377">"шест"</item>
+ <item msgid="4404219424523572364">"седам"</item>
+ <item msgid="8740481214764087329">"осам"</item>
+ <item msgid="1713216865806811237">"девет"</item>
+ <item msgid="3508406095411245038">"десет"</item>
+ <item msgid="7161996337755311711">"једанаест"</item>
+ <item msgid="4044549963329624197">"дванаест"</item>
+ <item msgid="333373157917379088">"тринаест"</item>
+ <item msgid="2631202907124819385">"четрнаест"</item>
+ <item msgid="6472396076858033453">"петнаест"</item>
+ <item msgid="8656981856181581643">"шеснаест"</item>
+ <item msgid="7289026608562030619">"седамнаест"</item>
+ <item msgid="3881477602692646573">"осамнаест"</item>
+ <item msgid="3358129827772984226">"деветнаест"</item>
+ <item msgid="3308575407402865807">"двадесет"</item>
+ <item msgid="5346560955382229629">"двадесет\nједан"</item>
+ <item msgid="226750304761473436">"двадесет\nдва"</item>
+ <item msgid="616811325336838734">"двадесет\nтри"</item>
+ <item msgid="616346116869053440">"двадесет\nчетири"</item>
+ <item msgid="4642996410384042830">"двадесет\nпет"</item>
+ <item msgid="7506092849993571465">"двадесет\nшест"</item>
+ <item msgid="1915078191101042031">"двадесет\nседам"</item>
+ <item msgid="4292378641900520252">"двадесет\nосам"</item>
+ <item msgid="5339513901773103696">"двадесет\nдевет"</item>
+ <item msgid="3574673250891657607">"тридесет"</item>
+ <item msgid="5796923836589110940">"тридесет\nједан"</item>
+ <item msgid="5859323597571702052">"тридесет\nдва"</item>
+ <item msgid="5133326723148876507">"тридесет\nтри"</item>
+ <item msgid="2693999494655663096">"тридесет\nчетири"</item>
+ <item msgid="3316754944962836197">"тридесет\nпет"</item>
+ <item msgid="816891008836796723">"тридесет\nшест"</item>
+ <item msgid="9158890488666520078">"тридесет\nседам"</item>
+ <item msgid="1894769703213894011">"тридесет\nосам"</item>
+ <item msgid="5638820345598572399">"тридесет\nдевет"</item>
+ <item msgid="8838304023017895439">"четрдесет"</item>
+ <item msgid="1834742948932559597">"четрдесет\nједан"</item>
+ <item msgid="6573707308847773944">"четрдесет\nдва"</item>
+ <item msgid="2450149950652678001">"четрдесет\nтри"</item>
+ <item msgid="2874667401318178036">"четрдесет\nчетири"</item>
+ <item msgid="3391101532763048862">"четрдесет\nпет"</item>
+ <item msgid="1671489330863254362">"четрдесет\nшест"</item>
+ <item msgid="5916017359554531038">"четрдесет\nседам"</item>
+ <item msgid="8205413177993059967">"четрдесет\nосам"</item>
+ <item msgid="6607867415142171302">"четрдесет\nдевет"</item>
+ <item msgid="8358850748472089162">"педесет"</item>
+ <item msgid="3551313125255080234">"педесет\nједан"</item>
+ <item msgid="1559678130725716542">"педесет\nдва"</item>
+ <item msgid="431441994725492377">"педесет\nтри"</item>
+ <item msgid="6345774640539623024">"педесет\nчетири"</item>
+ <item msgid="8018192990793931120">"педесет\nпет"</item>
+ <item msgid="6187650843754604534">"педесет\nшест"</item>
+ <item msgid="8727240174015993259">"педесет\nседам"</item>
+ <item msgid="848339003778952950">"педесет\nосам"</item>
+ <item msgid="5798985802835423618">"педесет\nдевет"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-sv/strings.xml b/packages/SystemUI/res-keyguard/values-sv/strings.xml
index dfa570b..2475dc1 100644
--- a/packages/SystemUI/res-keyguard/values-sv/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-sv/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM-kortet är inaktiverat. Ange PUK-koden om du vill fortsätta. <xliff:g id="_NUMBER_1">%d</xliff:g> försök återstår innan SIM-kortet blir obrukbart. Kontakta operatören för mer information.</item>
<item quantity="one">SIM-kortet är inaktiverat. Ange PUK-koden om du vill fortsätta. <xliff:g id="_NUMBER_0">%d</xliff:g> försök återstår innan SIM-kortet blir obrukbart. Kontakta operatören för mer information.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Hon är"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Tolv"</item>
+ <item msgid="7389464214252023751">"En"</item>
+ <item msgid="8803180377002008046">"Två"</item>
+ <item msgid="8614897059944644719">"Tre"</item>
+ <item msgid="2293058674782619556">"Fyra"</item>
+ <item msgid="4815402358455041664">"Fem"</item>
+ <item msgid="3325754778509665687">"Sex"</item>
+ <item msgid="5805551341866280575">"Sju"</item>
+ <item msgid="203334816668238610">"Åtta"</item>
+ <item msgid="4828052671464488923">"Nio"</item>
+ <item msgid="2233497913571137419">"Tio"</item>
+ <item msgid="5621554266768657830">"Elva"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Klockan"</item>
+ <item msgid="8837126587669001578">"Noll ett"</item>
+ <item msgid="4294343372940455660">"Noll två"</item>
+ <item msgid="7129166637707421536">"Noll tre"</item>
+ <item msgid="7579404865008788673">"Noll fyra"</item>
+ <item msgid="3873924689207380586">"Noll fem"</item>
+ <item msgid="4849565597850069377">"Noll sex"</item>
+ <item msgid="4404219424523572364">"Noll sju"</item>
+ <item msgid="8740481214764087329">"Noll åtta"</item>
+ <item msgid="1713216865806811237">"Noll nio"</item>
+ <item msgid="3508406095411245038">"Tio"</item>
+ <item msgid="7161996337755311711">"Elva"</item>
+ <item msgid="4044549963329624197">"Tolv"</item>
+ <item msgid="333373157917379088">"Tretton"</item>
+ <item msgid="2631202907124819385">"Fjorton"</item>
+ <item msgid="6472396076858033453">"Femton"</item>
+ <item msgid="8656981856181581643">"Sexton"</item>
+ <item msgid="7289026608562030619">"Sjutton"</item>
+ <item msgid="3881477602692646573">"Arton"</item>
+ <item msgid="3358129827772984226">"Nitton"</item>
+ <item msgid="3308575407402865807">"Tjugo"</item>
+ <item msgid="5346560955382229629">"Tjugoett\n"</item>
+ <item msgid="226750304761473436">"Tjugotvå\n"</item>
+ <item msgid="616811325336838734">"Tjugotre\n"</item>
+ <item msgid="616346116869053440">"Tjugofyra\n"</item>
+ <item msgid="4642996410384042830">"Tjugofem\n"</item>
+ <item msgid="7506092849993571465">"Tjugosex\n"</item>
+ <item msgid="1915078191101042031">"Tjugosju\n"</item>
+ <item msgid="4292378641900520252">"Tjugoåtta\n"</item>
+ <item msgid="5339513901773103696">"Tjugonio\n"</item>
+ <item msgid="3574673250891657607">"Trettio"</item>
+ <item msgid="5796923836589110940">"Trettioett\n"</item>
+ <item msgid="5859323597571702052">"Trettiotvå\n"</item>
+ <item msgid="5133326723148876507">"Trettiotre\n"</item>
+ <item msgid="2693999494655663096">"Trettiofyra\n"</item>
+ <item msgid="3316754944962836197">"Trettiofem\n"</item>
+ <item msgid="816891008836796723">"Trettiosex\n"</item>
+ <item msgid="9158890488666520078">"Trettiosju\n"</item>
+ <item msgid="1894769703213894011">"Trettioåtta\n"</item>
+ <item msgid="5638820345598572399">"Trettionio\n"</item>
+ <item msgid="8838304023017895439">"Fyrtio"</item>
+ <item msgid="1834742948932559597">"Fyrtioett\n"</item>
+ <item msgid="6573707308847773944">"Fyrtiotvå\n"</item>
+ <item msgid="2450149950652678001">"Fyrtiotre\n"</item>
+ <item msgid="2874667401318178036">"Fyrtiofyra\n"</item>
+ <item msgid="3391101532763048862">"Fyrtiofem\n"</item>
+ <item msgid="1671489330863254362">"Fyrtiosex\n"</item>
+ <item msgid="5916017359554531038">"Fyrtiosju\n"</item>
+ <item msgid="8205413177993059967">"Fyrtioåtta\n"</item>
+ <item msgid="6607867415142171302">"Fyrtionio\n"</item>
+ <item msgid="8358850748472089162">"Femtio"</item>
+ <item msgid="3551313125255080234">"Femtioett\n"</item>
+ <item msgid="1559678130725716542">"Femtiotvå\n"</item>
+ <item msgid="431441994725492377">"Femtiotre\n"</item>
+ <item msgid="6345774640539623024">"Femtiofyra\n"</item>
+ <item msgid="8018192990793931120">"Femtiofem\n"</item>
+ <item msgid="6187650843754604534">"Femtiosex\n"</item>
+ <item msgid="8727240174015993259">"Femtiosju\n"</item>
+ <item msgid="848339003778952950">"Femtioåtta\n"</item>
+ <item msgid="5798985802835423618">"Femtionio\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-sw/strings.xml b/packages/SystemUI/res-keyguard/values-sw/strings.xml
index 00334be..0a1acf2 100644
--- a/packages/SystemUI/res-keyguard/values-sw/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-sw/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">Sasa SIM imefungwa. Weka msimbo wa PUK ili uendelee. Umesalia na majaribio <xliff:g id="_NUMBER_1">%d</xliff:g> kabla ya SIM kuacha kufanya kazi kabisa. Wasiliana na mtoa huduma kwa maelezo.</item>
<item quantity="one">Sasa SIM imefungwa. Weka msimbo wa PUK ili uendelee. Umesalia na jaribio <xliff:g id="_NUMBER_0">%d</xliff:g> kabla ya SIM kuacha kufanya kazi kabisa. Wasiliana na mtoa huduma kwa maelezo.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Ni saa"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Sita"</item>
+ <item msgid="7389464214252023751">"Saba"</item>
+ <item msgid="8803180377002008046">"Nane"</item>
+ <item msgid="8614897059944644719">"Tisa"</item>
+ <item msgid="2293058674782619556">"Kumi"</item>
+ <item msgid="4815402358455041664">"Kumi na moja"</item>
+ <item msgid="3325754778509665687">"Kumi na mbili"</item>
+ <item msgid="5805551341866280575">"Moja"</item>
+ <item msgid="203334816668238610">"Mbili"</item>
+ <item msgid="4828052671464488923">"Tatu"</item>
+ <item msgid="2233497913571137419">"Nne"</item>
+ <item msgid="5621554266768657830">"Tano"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Kamili"</item>
+ <item msgid="8837126587669001578">"Na Dakika Moja"</item>
+ <item msgid="4294343372940455660">"Na Dakika Mbili"</item>
+ <item msgid="7129166637707421536">"Na Dakika Tatu"</item>
+ <item msgid="7579404865008788673">"Na Dakika Nne"</item>
+ <item msgid="3873924689207380586">"Na Dakika Tano"</item>
+ <item msgid="4849565597850069377">"Na Dakika Sita"</item>
+ <item msgid="4404219424523572364">"Na Dakika Saba"</item>
+ <item msgid="8740481214764087329">"Nane"</item>
+ <item msgid="1713216865806811237">"Na Dakika Tisa"</item>
+ <item msgid="3508406095411245038">"Kumi"</item>
+ <item msgid="7161996337755311711">"Kumi na Moja"</item>
+ <item msgid="4044549963329624197">"Kumi na Mbili"</item>
+ <item msgid="333373157917379088">"Kumi na tatu"</item>
+ <item msgid="2631202907124819385">"Kumi na nne"</item>
+ <item msgid="6472396076858033453">"Kumi na Tano"</item>
+ <item msgid="8656981856181581643">"Kumi na Sita"</item>
+ <item msgid="7289026608562030619">"Kumi na Saba"</item>
+ <item msgid="3881477602692646573">"Kumi na nane"</item>
+ <item msgid="3358129827772984226">"Kumi na tisa"</item>
+ <item msgid="3308575407402865807">"Ishirini"</item>
+ <item msgid="5346560955382229629">"Ishirini na\nMoja"</item>
+ <item msgid="226750304761473436">"Ishirini na\nMbili"</item>
+ <item msgid="616811325336838734">"Ishirini na\nTatu"</item>
+ <item msgid="616346116869053440">"Ishirini na\nNne"</item>
+ <item msgid="4642996410384042830">"Ishirini na \nTano"</item>
+ <item msgid="7506092849993571465">"Ishirni na\nSita"</item>
+ <item msgid="1915078191101042031">"Ishirini na\nSaba"</item>
+ <item msgid="4292378641900520252">"Ishirini na\nNane"</item>
+ <item msgid="5339513901773103696">"Ishirini na\nTisa"</item>
+ <item msgid="3574673250891657607">"Thelathini"</item>
+ <item msgid="5796923836589110940">"Thelathini na\nMoja"</item>
+ <item msgid="5859323597571702052">"Thelathini na\nMbili"</item>
+ <item msgid="5133326723148876507">"Thelathini na\nTatu"</item>
+ <item msgid="2693999494655663096">"Thelathini na\nNne"</item>
+ <item msgid="3316754944962836197">"Thelathini na\nTano"</item>
+ <item msgid="816891008836796723">"Thelathini na\nSita"</item>
+ <item msgid="9158890488666520078">"Thelathini na\nSaba"</item>
+ <item msgid="1894769703213894011">"Thelathini na\nNane"</item>
+ <item msgid="5638820345598572399">"Thelathini na\nTisa"</item>
+ <item msgid="8838304023017895439">"Arobaini"</item>
+ <item msgid="1834742948932559597">"Arobaini na\nMoja"</item>
+ <item msgid="6573707308847773944">"Arobaini na\nMbili"</item>
+ <item msgid="2450149950652678001">"Arobaini na\nTatu"</item>
+ <item msgid="2874667401318178036">"Arobaini na\nNne"</item>
+ <item msgid="3391101532763048862">"Arobaini na\nTano"</item>
+ <item msgid="1671489330863254362">"Arobaini na\nSita"</item>
+ <item msgid="5916017359554531038">"Arobaini na\nSaba"</item>
+ <item msgid="8205413177993059967">"Arobaini na\nNane"</item>
+ <item msgid="6607867415142171302">"Arobaini na\nTisa"</item>
+ <item msgid="8358850748472089162">"Hamsini"</item>
+ <item msgid="3551313125255080234">"Hamsini na\nMoja"</item>
+ <item msgid="1559678130725716542">"Hamsini na\nMbili"</item>
+ <item msgid="431441994725492377">"Hamsini\nTatu"</item>
+ <item msgid="6345774640539623024">"Hamsini na\nNne"</item>
+ <item msgid="8018192990793931120">"Hamsini na\nTano"</item>
+ <item msgid="6187650843754604534">"Hamsini na\nSita"</item>
+ <item msgid="8727240174015993259">"Hamsini na\nSaba"</item>
+ <item msgid="848339003778952950">"Hamsini na\nNane"</item>
+ <item msgid="5798985802835423618">"Hamsini na\nTisa"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ta/strings.xml b/packages/SystemUI/res-keyguard/values-ta/strings.xml
index d978643..57a614a 100644
--- a/packages/SystemUI/res-keyguard/values-ta/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ta/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">சிம் தற்போது முடக்கப்பட்டுள்ளது. தொடர்வதற்கு, PUK குறியீட்டை உள்ளிடவும். நீங்கள் <xliff:g id="_NUMBER_1">%d</xliff:g> முறை மட்டுமே முயற்சிக்க முடியும். அதன்பிறகு சிம் நிரந்தரமாக முடக்கப்படும். விவரங்களுக்கு, மொபைல் நிறுவனத்தைத் தொடர்புகொள்ளவும்.</item>
<item quantity="one">சிம் தற்போது முடக்கப்பட்டுள்ளது. தொடர்வதற்கு, PUK குறியீட்டை உள்ளிடவும். நீங்கள் <xliff:g id="_NUMBER_0">%d</xliff:g> முறை மட்டுமே முயற்சிக்க முடியும். அதன்பிறகு சிம் நிரந்தரமாக முடக்கப்படும். விவரங்களுக்கு, மொபைல் நிறுவனத்தைத் தொடர்புகொள்ளவும்.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"அதன்"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"பன்னிரண்டு"</item>
+ <item msgid="7389464214252023751">"ஒன்று"</item>
+ <item msgid="8803180377002008046">"இரண்டு"</item>
+ <item msgid="8614897059944644719">"மூன்று"</item>
+ <item msgid="2293058674782619556">"நான்கு"</item>
+ <item msgid="4815402358455041664">"ஐந்து"</item>
+ <item msgid="3325754778509665687">"ஆறு"</item>
+ <item msgid="5805551341866280575">"ஏழு"</item>
+ <item msgid="203334816668238610">"எட்டு"</item>
+ <item msgid="4828052671464488923">"ஒன்பது"</item>
+ <item msgid="2233497913571137419">"பத்து"</item>
+ <item msgid="5621554266768657830">"பதினொன்று"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"மணி"</item>
+ <item msgid="8837126587669001578">"ஒன்று"</item>
+ <item msgid="4294343372940455660">"இரண்டு"</item>
+ <item msgid="7129166637707421536">"மூன்று"</item>
+ <item msgid="7579404865008788673">"நான்கு"</item>
+ <item msgid="3873924689207380586">"ஐந்து"</item>
+ <item msgid="4849565597850069377">"ஆறு"</item>
+ <item msgid="4404219424523572364">"ஏழு"</item>
+ <item msgid="8740481214764087329">"எட்டு"</item>
+ <item msgid="1713216865806811237">"ஒன்பது"</item>
+ <item msgid="3508406095411245038">"பத்து"</item>
+ <item msgid="7161996337755311711">"பதினொன்று"</item>
+ <item msgid="4044549963329624197">"பன்னிரண்டு"</item>
+ <item msgid="333373157917379088">"பதிமூன்று"</item>
+ <item msgid="2631202907124819385">"பதினான்கு"</item>
+ <item msgid="6472396076858033453">"பதினைந்து"</item>
+ <item msgid="8656981856181581643">"பதினாறு"</item>
+ <item msgid="7289026608562030619">"பதினேழு"</item>
+ <item msgid="3881477602692646573">"பதினெட்டு"</item>
+ <item msgid="3358129827772984226">"பத்தொன்பது"</item>
+ <item msgid="3308575407402865807">"இருபது"</item>
+ <item msgid="5346560955382229629">"இருபத்து\nஒன்று"</item>
+ <item msgid="226750304761473436">"இருபத்து\nஇரண்டு"</item>
+ <item msgid="616811325336838734">"இருபத்து\nமூன்று"</item>
+ <item msgid="616346116869053440">"இருபத்து\nநான்கு"</item>
+ <item msgid="4642996410384042830">"இருபத்து\nஐந்து"</item>
+ <item msgid="7506092849993571465">"இருபத்து\nஆறு"</item>
+ <item msgid="1915078191101042031">"இருபத்து\nஏழு"</item>
+ <item msgid="4292378641900520252">"இருபத்து\nஎட்டு"</item>
+ <item msgid="5339513901773103696">"இருபத்து\nஒன்பது"</item>
+ <item msgid="3574673250891657607">"முப்பது"</item>
+ <item msgid="5796923836589110940">"முப்பத்து\nஒன்று"</item>
+ <item msgid="5859323597571702052">"முப்பத்து\nஇரண்டு"</item>
+ <item msgid="5133326723148876507">"முப்பத்து\nமூன்று"</item>
+ <item msgid="2693999494655663096">"முப்பத்து\nநான்கு"</item>
+ <item msgid="3316754944962836197">"முப்பத்து\nஐந்து"</item>
+ <item msgid="816891008836796723">"முப்பத்து\nஆறு"</item>
+ <item msgid="9158890488666520078">"முப்பத்து\nஏழு"</item>
+ <item msgid="1894769703213894011">"முப்பத்து\nஎட்டு"</item>
+ <item msgid="5638820345598572399">"முப்பத்து\nஒன்பது"</item>
+ <item msgid="8838304023017895439">"நாற்பது"</item>
+ <item msgid="1834742948932559597">"நாற்பத்து\nஒன்று"</item>
+ <item msgid="6573707308847773944">"நாற்பத்து\nஇரண்டு"</item>
+ <item msgid="2450149950652678001">"நாற்பத்து\nமூன்று"</item>
+ <item msgid="2874667401318178036">"நாற்பத்து\nநான்கு"</item>
+ <item msgid="3391101532763048862">"நாற்பத்து\nஐந்து"</item>
+ <item msgid="1671489330863254362">"நாற்பத்து\nஆறு"</item>
+ <item msgid="5916017359554531038">"நாற்பத்து\nஏழு"</item>
+ <item msgid="8205413177993059967">"நாற்பத்து\nஎட்டு"</item>
+ <item msgid="6607867415142171302">"நாற்பத்து\nஒன்பது"</item>
+ <item msgid="8358850748472089162">"ஐம்பது"</item>
+ <item msgid="3551313125255080234">"ஐம்பத்து\nஒன்று"</item>
+ <item msgid="1559678130725716542">"ஐம்பத்து\nஇரண்டு"</item>
+ <item msgid="431441994725492377">"ஐம்பத்து\nமூன்று"</item>
+ <item msgid="6345774640539623024">"ஐம்பத்து\nநான்கு"</item>
+ <item msgid="8018192990793931120">"முப்பத்து\nஐந்து"</item>
+ <item msgid="6187650843754604534">"ஐம்பத்து\nஆறு"</item>
+ <item msgid="8727240174015993259">"ஐம்பத்து\nஏழு"</item>
+ <item msgid="848339003778952950">"ஐம்பத்து\nஎட்டு"</item>
+ <item msgid="5798985802835423618">"ஐம்பத்து\nஒன்பது"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-te/strings.xml b/packages/SystemUI/res-keyguard/values-te/strings.xml
index 8a8df34..58880c4 100644
--- a/packages/SystemUI/res-keyguard/values-te/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-te/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM ఇప్పుడు నిలిపివేయబడింది. PUK కోడ్ను నమోదు చేయండి. SIM శాశ్వతంగా నిరుపయోగం కాకుండా ఉండటానికి మీకు <xliff:g id="_NUMBER_1">%d</xliff:g> ప్రయత్నాలు మిగిలి ఉన్నాయి. వివరాల కోసం కారియర్ను సంప్రదించండి.</item>
<item quantity="one">SIM ఇప్పుడు నిలిపివేయబడింది. PUK కోడ్ను నమోదు చేయండి. SIM శాశ్వతంగా నిరుపయోగం కాకుండా ఉండటానికి మీకు <xliff:g id="_NUMBER_0">%d</xliff:g> ప్రయత్నం మిగిలి ఉంది వివరాల కోసం కారియర్ను సంప్రదించండి.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"ఇప్పుడు"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"పన్నెండు"</item>
+ <item msgid="7389464214252023751">"ఒకటి"</item>
+ <item msgid="8803180377002008046">"రెండు"</item>
+ <item msgid="8614897059944644719">"మూడు"</item>
+ <item msgid="2293058674782619556">"నాలుగు"</item>
+ <item msgid="4815402358455041664">"ఐదు"</item>
+ <item msgid="3325754778509665687">"ఆరు"</item>
+ <item msgid="5805551341866280575">"ఏడు"</item>
+ <item msgid="203334816668238610">"ఎనిమిది"</item>
+ <item msgid="4828052671464488923">"తొమ్మిది"</item>
+ <item msgid="2233497913571137419">"పది"</item>
+ <item msgid="5621554266768657830">"పదకొండు"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"అవుతుంది"</item>
+ <item msgid="8837126587669001578">"ఒకటి అవుతుంది"</item>
+ <item msgid="4294343372940455660">"రెండు అవుతుంది"</item>
+ <item msgid="7129166637707421536">"మూడు అవుతుంది"</item>
+ <item msgid="7579404865008788673">"నాలుగు అవుతుంది"</item>
+ <item msgid="3873924689207380586">"ఐదు అవుతుంది"</item>
+ <item msgid="4849565597850069377">"ఆరు అవుతుంది"</item>
+ <item msgid="4404219424523572364">"ఏడు అవుతుంది"</item>
+ <item msgid="8740481214764087329">"ఎనిమిది అవుతుంది"</item>
+ <item msgid="1713216865806811237">"తొమ్మిది అవుతుంది"</item>
+ <item msgid="3508406095411245038">"పది"</item>
+ <item msgid="7161996337755311711">"పదకొండు"</item>
+ <item msgid="4044549963329624197">"పన్నెండు"</item>
+ <item msgid="333373157917379088">"పదమూడు"</item>
+ <item msgid="2631202907124819385">"పద్నాలుగు"</item>
+ <item msgid="6472396076858033453">"పదిహేను"</item>
+ <item msgid="8656981856181581643">"పదహారు"</item>
+ <item msgid="7289026608562030619">"పదిహేడు"</item>
+ <item msgid="3881477602692646573">"పద్దెనిమిది"</item>
+ <item msgid="3358129827772984226">"పంతొమ్మిది"</item>
+ <item msgid="3308575407402865807">"ఇరవై"</item>
+ <item msgid="5346560955382229629">"ఇరవై\nఒకటి"</item>
+ <item msgid="226750304761473436">"ఇరవై\nరెండు"</item>
+ <item msgid="616811325336838734">"ఇరవై\nమూడు"</item>
+ <item msgid="616346116869053440">"ఇరవై\nనాలుగు"</item>
+ <item msgid="4642996410384042830">"ఇరవై\nఐదు"</item>
+ <item msgid="7506092849993571465">"ఇరవై\nఆరు"</item>
+ <item msgid="1915078191101042031">"ఇరవై\nఏడు"</item>
+ <item msgid="4292378641900520252">"ఇరవై\nఎనిమిది"</item>
+ <item msgid="5339513901773103696">"ఇరవై\nతొమ్మిది"</item>
+ <item msgid="3574673250891657607">"ముప్పై"</item>
+ <item msgid="5796923836589110940">"ముప్పై\nఒకటి"</item>
+ <item msgid="5859323597571702052">"ముప్పై\nరెండు"</item>
+ <item msgid="5133326723148876507">"ముప్పై\nమూడు"</item>
+ <item msgid="2693999494655663096">"ముప్పై\nనాలుగు"</item>
+ <item msgid="3316754944962836197">"ముప్పై\nఐదు"</item>
+ <item msgid="816891008836796723">"ముప్పై\nఆరు"</item>
+ <item msgid="9158890488666520078">"ముప్పై\nఏడు"</item>
+ <item msgid="1894769703213894011">"ముప్ఫై\nఎనిమిది"</item>
+ <item msgid="5638820345598572399">"ముప్పై\nతొమ్మిది"</item>
+ <item msgid="8838304023017895439">"నలభై"</item>
+ <item msgid="1834742948932559597">"నలభై\nఒకటి"</item>
+ <item msgid="6573707308847773944">"నలభై\nరెండు"</item>
+ <item msgid="2450149950652678001">"నలభై\nమూడు"</item>
+ <item msgid="2874667401318178036">"నలభై\nనాలుగు"</item>
+ <item msgid="3391101532763048862">"నలభై\nఐదు"</item>
+ <item msgid="1671489330863254362">"నలభై\nఆరు"</item>
+ <item msgid="5916017359554531038">"నలభై\nఏడు"</item>
+ <item msgid="8205413177993059967">"నలభై\nఎనిమిది"</item>
+ <item msgid="6607867415142171302">"నలభై\nతొమ్మిది"</item>
+ <item msgid="8358850748472089162">"యాభై"</item>
+ <item msgid="3551313125255080234">"యాభై\nఒకటి"</item>
+ <item msgid="1559678130725716542">"యాభై\nరెండు"</item>
+ <item msgid="431441994725492377">"యాభై\nమూడు"</item>
+ <item msgid="6345774640539623024">"యాభై\nనాలుగు"</item>
+ <item msgid="8018192990793931120">"యాభై\nఐదు"</item>
+ <item msgid="6187650843754604534">"యాభై\nఆరు"</item>
+ <item msgid="8727240174015993259">"యాభై\nఏడు"</item>
+ <item msgid="848339003778952950">"యాభై\nఎనిమిది"</item>
+ <item msgid="5798985802835423618">"యాభై\nతొమ్మిది"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-th/strings.xml b/packages/SystemUI/res-keyguard/values-th/strings.xml
index a8577a7..bb52a7f 100644
--- a/packages/SystemUI/res-keyguard/values-th/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-th/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">ซิมถูกปิดใช้งานในขณะนี้ โปรดป้อนรหัส PUK เพื่อทำต่อ คุณพยายามได้อีก <xliff:g id="_NUMBER_1">%d</xliff:g> ครั้งก่อนที่ซิมจะไม่สามารถใช้งานได้อย่างถาวร โปรดติดต่อสอบถามรายละเอียดจากผู้ให้บริการ</item>
<item quantity="one">ซิมถูกปิดใช้งานในขณะนี้ โปรดป้อนรหัส PUK เพื่อทำต่อ คุณพยายามได้อีก <xliff:g id="_NUMBER_0">%d</xliff:g> ครั้งก่อนที่ซิมจะไม่สามารถใช้งานได้อย่างถาวร โปรดติดต่อสอบถามรายละเอียดจากผู้ให้บริการ</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"เวลา"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"สิบสอง"</item>
+ <item msgid="7389464214252023751">"หนึ่ง"</item>
+ <item msgid="8803180377002008046">"สอง"</item>
+ <item msgid="8614897059944644719">"สาม"</item>
+ <item msgid="2293058674782619556">"สี่"</item>
+ <item msgid="4815402358455041664">"ห้า"</item>
+ <item msgid="3325754778509665687">"หก"</item>
+ <item msgid="5805551341866280575">"เจ็ด"</item>
+ <item msgid="203334816668238610">"แปด"</item>
+ <item msgid="4828052671464488923">"เก้า"</item>
+ <item msgid="2233497913571137419">"สิบ"</item>
+ <item msgid="5621554266768657830">"สิบเอ็ด"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"นาฬิกา"</item>
+ <item msgid="8837126587669001578">"ศูนย์หนึ่ง"</item>
+ <item msgid="4294343372940455660">"ศูนย์สอง"</item>
+ <item msgid="7129166637707421536">"ศูนย์สาม"</item>
+ <item msgid="7579404865008788673">"ศูนย์สี่"</item>
+ <item msgid="3873924689207380586">"ศูนย์ห้า"</item>
+ <item msgid="4849565597850069377">"ศูนย์หก"</item>
+ <item msgid="4404219424523572364">"ศูนย์เจ็ด"</item>
+ <item msgid="8740481214764087329">"ศูนย์แปด"</item>
+ <item msgid="1713216865806811237">"ศูนย์เก้า"</item>
+ <item msgid="3508406095411245038">"สิบ"</item>
+ <item msgid="7161996337755311711">"สิบเอ็ด"</item>
+ <item msgid="4044549963329624197">"สิบสอง"</item>
+ <item msgid="333373157917379088">"สิบสาม"</item>
+ <item msgid="2631202907124819385">"สิบสี่"</item>
+ <item msgid="6472396076858033453">"สิบห้า"</item>
+ <item msgid="8656981856181581643">"สิบหก"</item>
+ <item msgid="7289026608562030619">"สิบเจ็ด"</item>
+ <item msgid="3881477602692646573">"สิบแปด"</item>
+ <item msgid="3358129827772984226">"สิบเก้า"</item>
+ <item msgid="3308575407402865807">"ยี่สิบ"</item>
+ <item msgid="5346560955382229629">"ยี่สิบ\nเอ็ด"</item>
+ <item msgid="226750304761473436">"ยี่สิบ\nสอง"</item>
+ <item msgid="616811325336838734">"ยี่สิบ\nสาม"</item>
+ <item msgid="616346116869053440">"ยี่สิบ\nสี่"</item>
+ <item msgid="4642996410384042830">"ยี่สิบ\nห้า"</item>
+ <item msgid="7506092849993571465">"ยี่สิบ\nหก"</item>
+ <item msgid="1915078191101042031">"ยี่สิบ\nเจ็ด"</item>
+ <item msgid="4292378641900520252">"ยี่สิบ\nแปด"</item>
+ <item msgid="5339513901773103696">"ยี่สิบ\nเก้า"</item>
+ <item msgid="3574673250891657607">"สามสิบ"</item>
+ <item msgid="5796923836589110940">"สามสิบ\nเอ็ด"</item>
+ <item msgid="5859323597571702052">"สามสิบ\nสอง"</item>
+ <item msgid="5133326723148876507">"สามสิบ\nสาม"</item>
+ <item msgid="2693999494655663096">"สามสิบ\nสี่"</item>
+ <item msgid="3316754944962836197">"สามสิบ\nห้า"</item>
+ <item msgid="816891008836796723">"สามสิบ\nหก"</item>
+ <item msgid="9158890488666520078">"สามสิบ\nเจ็ด"</item>
+ <item msgid="1894769703213894011">"สามสิบ\nแปด"</item>
+ <item msgid="5638820345598572399">"สามสิบ\nเก้า"</item>
+ <item msgid="8838304023017895439">"สี่สิบ"</item>
+ <item msgid="1834742948932559597">"สี่สิบ\nเอ็ด"</item>
+ <item msgid="6573707308847773944">"สี่สิบ\nสอง"</item>
+ <item msgid="2450149950652678001">"สี่สิบ\nสาม"</item>
+ <item msgid="2874667401318178036">"สี่สิบ\nสี่"</item>
+ <item msgid="3391101532763048862">"สี่สิบ\nห้า"</item>
+ <item msgid="1671489330863254362">"สี่สิบ\nหก"</item>
+ <item msgid="5916017359554531038">"สี่สิบ\nเจ็ด"</item>
+ <item msgid="8205413177993059967">"สี่สิบ\nแปด"</item>
+ <item msgid="6607867415142171302">"สี่สิบ\nเก้า"</item>
+ <item msgid="8358850748472089162">"ห้าสิบ"</item>
+ <item msgid="3551313125255080234">"ห้าสิบ\nเอ็ด"</item>
+ <item msgid="1559678130725716542">"ห้าสิบ\nสอง"</item>
+ <item msgid="431441994725492377">"ห้าสิบ\nสาม"</item>
+ <item msgid="6345774640539623024">"ห้าสิบ\nสี่"</item>
+ <item msgid="8018192990793931120">"ห้าสิบ\nห้า"</item>
+ <item msgid="6187650843754604534">"ห้าสิบ\nหก"</item>
+ <item msgid="8727240174015993259">"ห้าสิบ\nเจ็ด"</item>
+ <item msgid="848339003778952950">"ห้าสิบ\nแปด"</item>
+ <item msgid="5798985802835423618">"ห้าสิบ\nเก้า"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-tl/strings.xml b/packages/SystemUI/res-keyguard/values-tl/strings.xml
index b3609d1..1f480f4 100644
--- a/packages/SystemUI/res-keyguard/values-tl/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-tl/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">Naka-disable na ang SIM. Ilagay ang PUK code upang magpatuloy. Mayroon kang <xliff:g id="_NUMBER_1">%d</xliff:g> natitirang pagsubok bago tuluyang hindi magamit ang SIM. Makipag-ugnayan sa carrier para sa mga detalye.</item>
<item quantity="other">Naka-disable na ang SIM. Ilagay ang PUK code upang magpatuloy. Mayroon kang <xliff:g id="_NUMBER_1">%d</xliff:g> na natitirang pagsubok bago tuluyang hindi magamit ang SIM. Makipag-ugnayan sa carrier para sa mga detalye.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Oras ay"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Twelve"</item>
+ <item msgid="7389464214252023751">"One"</item>
+ <item msgid="8803180377002008046">"Two"</item>
+ <item msgid="8614897059944644719">"Three"</item>
+ <item msgid="2293058674782619556">"Four"</item>
+ <item msgid="4815402358455041664">"Five"</item>
+ <item msgid="3325754778509665687">"Six"</item>
+ <item msgid="5805551341866280575">"Seven"</item>
+ <item msgid="203334816668238610">"Eight"</item>
+ <item msgid="4828052671464488923">"Nine"</item>
+ <item msgid="2233497913571137419">"Ten"</item>
+ <item msgid="5621554266768657830">"Eleven"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"O’Clock"</item>
+ <item msgid="8837126587669001578">"O’One"</item>
+ <item msgid="4294343372940455660">"O’Two"</item>
+ <item msgid="7129166637707421536">"O’Three"</item>
+ <item msgid="7579404865008788673">"O’Four"</item>
+ <item msgid="3873924689207380586">"O’Five"</item>
+ <item msgid="4849565597850069377">"O’Six"</item>
+ <item msgid="4404219424523572364">"O’Seven"</item>
+ <item msgid="8740481214764087329">"O’Eight"</item>
+ <item msgid="1713216865806811237">"O’Nine"</item>
+ <item msgid="3508406095411245038">"Ten"</item>
+ <item msgid="7161996337755311711">"Eleven"</item>
+ <item msgid="4044549963329624197">"Twelve"</item>
+ <item msgid="333373157917379088">"Thirteen"</item>
+ <item msgid="2631202907124819385">"Fourteen"</item>
+ <item msgid="6472396076858033453">"Fifteen"</item>
+ <item msgid="8656981856181581643">"Sixteen"</item>
+ <item msgid="7289026608562030619">"Seventeen"</item>
+ <item msgid="3881477602692646573">"Eighteen"</item>
+ <item msgid="3358129827772984226">"Nineteen"</item>
+ <item msgid="3308575407402865807">"Twenty"</item>
+ <item msgid="5346560955382229629">"Twenty\nOne"</item>
+ <item msgid="226750304761473436">"Twenty\nTwo"</item>
+ <item msgid="616811325336838734">"Twenty\nThree"</item>
+ <item msgid="616346116869053440">"Twenty\nFour"</item>
+ <item msgid="4642996410384042830">"Twenty\nFive"</item>
+ <item msgid="7506092849993571465">"Twenty\nSix"</item>
+ <item msgid="1915078191101042031">"Twenty\nSeven"</item>
+ <item msgid="4292378641900520252">"Twenty\nEight"</item>
+ <item msgid="5339513901773103696">"Twenty\nNine"</item>
+ <item msgid="3574673250891657607">"Thirty"</item>
+ <item msgid="5796923836589110940">"Thirty\nOne"</item>
+ <item msgid="5859323597571702052">"Thirty\nTwo"</item>
+ <item msgid="5133326723148876507">"Thirty\nThree"</item>
+ <item msgid="2693999494655663096">"Thirty\nFour"</item>
+ <item msgid="3316754944962836197">"Thirty\nFive"</item>
+ <item msgid="816891008836796723">"Thirty\nSix"</item>
+ <item msgid="9158890488666520078">"Thirty\nSeven"</item>
+ <item msgid="1894769703213894011">"Thirty\nEight"</item>
+ <item msgid="5638820345598572399">"Thirty\nNine"</item>
+ <item msgid="8838304023017895439">"Forty"</item>
+ <item msgid="1834742948932559597">"Forty\nOne"</item>
+ <item msgid="6573707308847773944">"Forty\nTwo"</item>
+ <item msgid="2450149950652678001">"Forty\nThree"</item>
+ <item msgid="2874667401318178036">"Forty\nFour"</item>
+ <item msgid="3391101532763048862">"Forty\nFive"</item>
+ <item msgid="1671489330863254362">"Forty\nSix"</item>
+ <item msgid="5916017359554531038">"Forty\nSeven"</item>
+ <item msgid="8205413177993059967">"Forty\nEight"</item>
+ <item msgid="6607867415142171302">"Forty\nNine"</item>
+ <item msgid="8358850748472089162">"Fifty"</item>
+ <item msgid="3551313125255080234">"Fifty\nOne"</item>
+ <item msgid="1559678130725716542">"Fifty\nTwo"</item>
+ <item msgid="431441994725492377">"Fifty\nThree"</item>
+ <item msgid="6345774640539623024">"Fifty\nFour"</item>
+ <item msgid="8018192990793931120">"Fifty\nFive"</item>
+ <item msgid="6187650843754604534">"Fifty\nSix"</item>
+ <item msgid="8727240174015993259">"Fifty\nSeven"</item>
+ <item msgid="848339003778952950">"Fifty\nEight"</item>
+ <item msgid="5798985802835423618">"Fifty\nNine"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-tr/strings.xml b/packages/SystemUI/res-keyguard/values-tr/strings.xml
index 018e271..8ff1d88 100644
--- a/packages/SystemUI/res-keyguard/values-tr/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-tr/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM artık devre dışı. Devam etmek için PUK kodunu girin. SIM kalıcı olarak kullanım dışı kalmadan önce <xliff:g id="_NUMBER_1">%d</xliff:g> deneme hakkınız kaldı. Ayrıntılı bilgi için operatörünüzle iletişim kurun.</item>
<item quantity="one">SIM artık devre dışı. Devam etmek için PUK kodunu girin. SIM kalıcı olarak kullanım dışı kalmadan önce <xliff:g id="_NUMBER_0">%d</xliff:g> deneme hakkınız kaldı. Ayrıntılı bilgi için operatörünüzle iletişim kurun.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Saat"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"On İki"</item>
+ <item msgid="7389464214252023751">"Bir"</item>
+ <item msgid="8803180377002008046">"İki"</item>
+ <item msgid="8614897059944644719">"Üç"</item>
+ <item msgid="2293058674782619556">"Dört"</item>
+ <item msgid="4815402358455041664">"Beş"</item>
+ <item msgid="3325754778509665687">"Altı"</item>
+ <item msgid="5805551341866280575">"Yedi"</item>
+ <item msgid="203334816668238610">"Sekiz"</item>
+ <item msgid="4828052671464488923">"Dokuz"</item>
+ <item msgid="2233497913571137419">"On"</item>
+ <item msgid="5621554266768657830">"On Bir"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Saat"</item>
+ <item msgid="8837126587669001578">"Bir"</item>
+ <item msgid="4294343372940455660">"İki"</item>
+ <item msgid="7129166637707421536">"Üç"</item>
+ <item msgid="7579404865008788673">"Dört"</item>
+ <item msgid="3873924689207380586">"Beş"</item>
+ <item msgid="4849565597850069377">"Altı"</item>
+ <item msgid="4404219424523572364">"Yedi"</item>
+ <item msgid="8740481214764087329">"Sekiz"</item>
+ <item msgid="1713216865806811237">"Dokuz"</item>
+ <item msgid="3508406095411245038">"On"</item>
+ <item msgid="7161996337755311711">"On Bir"</item>
+ <item msgid="4044549963329624197">"On İki"</item>
+ <item msgid="333373157917379088">"On Üç"</item>
+ <item msgid="2631202907124819385">"On Dört"</item>
+ <item msgid="6472396076858033453">"On Beş"</item>
+ <item msgid="8656981856181581643">"On Altı"</item>
+ <item msgid="7289026608562030619">"On Yedi"</item>
+ <item msgid="3881477602692646573">"On Sekiz"</item>
+ <item msgid="3358129827772984226">"On Dokuz"</item>
+ <item msgid="3308575407402865807">"Yirmi"</item>
+ <item msgid="5346560955382229629">"Yirmi\nBir"</item>
+ <item msgid="226750304761473436">"Yirmi\nİki"</item>
+ <item msgid="616811325336838734">"Yirmi\nÜç"</item>
+ <item msgid="616346116869053440">"Yirmi\nDört"</item>
+ <item msgid="4642996410384042830">"Yirmi\nBeş"</item>
+ <item msgid="7506092849993571465">"Yirmi\nAltı"</item>
+ <item msgid="1915078191101042031">"Yirmi\nYedi"</item>
+ <item msgid="4292378641900520252">"Yirmi\nSekiz"</item>
+ <item msgid="5339513901773103696">"Yirmi\nDokuz"</item>
+ <item msgid="3574673250891657607">"Otuz"</item>
+ <item msgid="5796923836589110940">"Otuz\nBir"</item>
+ <item msgid="5859323597571702052">"Otuz\nİki"</item>
+ <item msgid="5133326723148876507">"Otuz\nÜç"</item>
+ <item msgid="2693999494655663096">"Otuz\nDört"</item>
+ <item msgid="3316754944962836197">"Otuz\nBeş"</item>
+ <item msgid="816891008836796723">"Otuz\nAltı"</item>
+ <item msgid="9158890488666520078">"Otuz\nYedi"</item>
+ <item msgid="1894769703213894011">"Otuz\nSekiz"</item>
+ <item msgid="5638820345598572399">"Otuz\nDokuz"</item>
+ <item msgid="8838304023017895439">"Kırk"</item>
+ <item msgid="1834742948932559597">"Kırk\nBir"</item>
+ <item msgid="6573707308847773944">"Kırk\nİki"</item>
+ <item msgid="2450149950652678001">"Kırk\nÜç"</item>
+ <item msgid="2874667401318178036">"Kırk\nDört"</item>
+ <item msgid="3391101532763048862">"Kırk\nBeş"</item>
+ <item msgid="1671489330863254362">"Kırk\nAltı"</item>
+ <item msgid="5916017359554531038">"Kırk\nYedi"</item>
+ <item msgid="8205413177993059967">"Kırk\nSekiz"</item>
+ <item msgid="6607867415142171302">"Kırk\nDokuz"</item>
+ <item msgid="8358850748472089162">"Elli"</item>
+ <item msgid="3551313125255080234">"Elli\nBir"</item>
+ <item msgid="1559678130725716542">"Elli\nİki"</item>
+ <item msgid="431441994725492377">"Elli\nÜç"</item>
+ <item msgid="6345774640539623024">"Elli\nDört"</item>
+ <item msgid="8018192990793931120">"Elli\nBeş"</item>
+ <item msgid="6187650843754604534">"Elli\nAltı"</item>
+ <item msgid="8727240174015993259">"Elli\nYedi"</item>
+ <item msgid="848339003778952950">"Elli\nSekiz"</item>
+ <item msgid="5798985802835423618">"Elli\nDokuz"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-uk/strings.xml b/packages/SystemUI/res-keyguard/values-uk/strings.xml
index 92ca57b..3f0982f 100644
--- a/packages/SystemUI/res-keyguard/values-uk/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-uk/strings.xml
@@ -166,78 +166,81 @@
<item quantity="many">SIM-карту заблоковано. Щоб продовжити, введіть PUK-код. Залишилося <xliff:g id="_NUMBER_1">%d</xliff:g> спроб. Після цього SIM-карту буде назавжди заблоковано. Щоб дізнатися більше, зверніться до свого оператора.</item>
<item quantity="other">SIM-карту заблоковано. Щоб продовжити, введіть PUK-код. Залишилося <xliff:g id="_NUMBER_1">%d</xliff:g> спроби. Після цього SIM-карту буде назавжди заблоковано. Щоб дізнатися більше, зверніться до свого оператора.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Зараз"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"дванадцята"</item>
+ <item msgid="7389464214252023751">"перша"</item>
+ <item msgid="8803180377002008046">"друга"</item>
+ <item msgid="8614897059944644719">"третя"</item>
+ <item msgid="2293058674782619556">"четверта"</item>
+ <item msgid="4815402358455041664">"п’ята"</item>
+ <item msgid="3325754778509665687">"шоста"</item>
+ <item msgid="5805551341866280575">"сьома"</item>
+ <item msgid="203334816668238610">"восьма"</item>
+ <item msgid="4828052671464488923">"дев’ята"</item>
+ <item msgid="2233497913571137419">"десята"</item>
+ <item msgid="5621554266768657830">"одинадцята"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985"></item>
+ <item msgid="8837126587669001578">"одна"</item>
+ <item msgid="4294343372940455660">"дві"</item>
+ <item msgid="7129166637707421536">"три"</item>
+ <item msgid="7579404865008788673">"чотири"</item>
+ <item msgid="3873924689207380586">"п’ять"</item>
+ <item msgid="4849565597850069377">"шість"</item>
+ <item msgid="4404219424523572364">"сім"</item>
+ <item msgid="8740481214764087329">"вісім"</item>
+ <item msgid="1713216865806811237">"дев’ять"</item>
+ <item msgid="3508406095411245038">"десять"</item>
+ <item msgid="7161996337755311711">"одинадцять"</item>
+ <item msgid="4044549963329624197">"дванадцять"</item>
+ <item msgid="333373157917379088">"тринадцять"</item>
+ <item msgid="2631202907124819385">"чотирнадцять"</item>
+ <item msgid="6472396076858033453">"п’ятнадцять"</item>
+ <item msgid="8656981856181581643">"шістнадцять"</item>
+ <item msgid="7289026608562030619">"сімнадцять"</item>
+ <item msgid="3881477602692646573">"вісімнадцять"</item>
+ <item msgid="3358129827772984226">"дев’ятнадцять"</item>
+ <item msgid="3308575407402865807">"двадцять"</item>
+ <item msgid="5346560955382229629">"двадцять\nодна"</item>
+ <item msgid="226750304761473436">"двадцять\nдві"</item>
+ <item msgid="616811325336838734">"двадцять\nтри"</item>
+ <item msgid="616346116869053440">"двадцять\nчотири"</item>
+ <item msgid="4642996410384042830">"двадцять\nп’ять"</item>
+ <item msgid="7506092849993571465">"двадцять\nшість"</item>
+ <item msgid="1915078191101042031">"двадцять\nсім"</item>
+ <item msgid="4292378641900520252">"двадцять\nвісім"</item>
+ <item msgid="5339513901773103696">"двадцять\nдев’ять"</item>
+ <item msgid="3574673250891657607">"тридцять"</item>
+ <item msgid="5796923836589110940">"тридцять\nодна"</item>
+ <item msgid="5859323597571702052">"тридцять\nдві"</item>
+ <item msgid="5133326723148876507">"тридцять\nтри"</item>
+ <item msgid="2693999494655663096">"тридцять\nчотири"</item>
+ <item msgid="3316754944962836197">"тридцять\nп’ять"</item>
+ <item msgid="816891008836796723">"тридцять\nшість"</item>
+ <item msgid="9158890488666520078">"тридцять\nсім"</item>
+ <item msgid="1894769703213894011">"тридцять\nвісім"</item>
+ <item msgid="5638820345598572399">"тридцять\nдев’ять"</item>
+ <item msgid="8838304023017895439">"сорок"</item>
+ <item msgid="1834742948932559597">"сорок\nодна"</item>
+ <item msgid="6573707308847773944">"сорок\nдві"</item>
+ <item msgid="2450149950652678001">"сорок\nтри"</item>
+ <item msgid="2874667401318178036">"сорок\nчотири"</item>
+ <item msgid="3391101532763048862">"сорок\nп’ять"</item>
+ <item msgid="1671489330863254362">"сорок\nшість"</item>
+ <item msgid="5916017359554531038">"сорок\nсім"</item>
+ <item msgid="8205413177993059967">"сорок\nвісім"</item>
+ <item msgid="6607867415142171302">"сорок\nдев’ять"</item>
+ <item msgid="8358850748472089162">"п’ятдесят"</item>
+ <item msgid="3551313125255080234">"п’ятдесят\nодна"</item>
+ <item msgid="1559678130725716542">"п’ятдесят\nдві"</item>
+ <item msgid="431441994725492377">"п’ятдесят\nтри"</item>
+ <item msgid="6345774640539623024">"п’ятдесят\nчотири"</item>
+ <item msgid="8018192990793931120">"п’ятдесят\nп’ять"</item>
+ <item msgid="6187650843754604534">"п’ятдесят\nшість"</item>
+ <item msgid="8727240174015993259">"п’ятдесят\nсім"</item>
+ <item msgid="848339003778952950">"п’ятдесят\nвісім"</item>
+ <item msgid="5798985802835423618">"п’ятдесят\nдев’ять"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-ur/strings.xml b/packages/SystemUI/res-keyguard/values-ur/strings.xml
index ace9f79..3c520f9 100644
--- a/packages/SystemUI/res-keyguard/values-ur/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-ur/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM اب غیر فعال ہے۔ جاری رکھنے کیلئے PUK کوڈ درج کریں۔ SIM کے مستقل طور پر ناقابل استعمال ہونے سے پہلے آپ کے پاس <xliff:g id="_NUMBER_1">%d</xliff:g> کوششیں بچی ہیں۔ تفصیلات کیلئے کیریئر سے رابطہ کریں۔</item>
<item quantity="one">SIM اب غیر فعال ہے۔ جاری رکھنے کیلئے PUK کوڈ درج کریں۔ SIM کے مستقل طور پر ناقابل استعمال ہونے سے پہلے آپ کے پاس <xliff:g id="_NUMBER_0">%d</xliff:g> کوشش بچی ہے۔ تفصیلات کیلئے کیریئر سے رابطہ کریں۔</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"وقت/ابھی"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"بارہ"</item>
+ <item msgid="7389464214252023751">"ایک"</item>
+ <item msgid="8803180377002008046">"دو"</item>
+ <item msgid="8614897059944644719">"تین"</item>
+ <item msgid="2293058674782619556">"چار"</item>
+ <item msgid="4815402358455041664">"پانچ"</item>
+ <item msgid="3325754778509665687">"چھ"</item>
+ <item msgid="5805551341866280575">"سات"</item>
+ <item msgid="203334816668238610">"آٹھ"</item>
+ <item msgid="4828052671464488923">"نو"</item>
+ <item msgid="2233497913571137419">"دس"</item>
+ <item msgid="5621554266768657830">"گیارہ"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"0 بجے"</item>
+ <item msgid="8837126587669001578">"ایک منٹ"</item>
+ <item msgid="4294343372940455660">"دو منٹ"</item>
+ <item msgid="7129166637707421536">"تین منٹ"</item>
+ <item msgid="7579404865008788673">"چار منٹ"</item>
+ <item msgid="3873924689207380586">"پانچ منٹ"</item>
+ <item msgid="4849565597850069377">"چھ منٹ"</item>
+ <item msgid="4404219424523572364">"سات منٹ"</item>
+ <item msgid="8740481214764087329">"آٹھ منٹ"</item>
+ <item msgid="1713216865806811237">"نو منٹ"</item>
+ <item msgid="3508406095411245038">"دس"</item>
+ <item msgid="7161996337755311711">"گیارہ"</item>
+ <item msgid="4044549963329624197">"بارہ"</item>
+ <item msgid="333373157917379088">"تیرہ"</item>
+ <item msgid="2631202907124819385">"چودہ"</item>
+ <item msgid="6472396076858033453">"پندرہ"</item>
+ <item msgid="8656981856181581643">"سولہ"</item>
+ <item msgid="7289026608562030619">"سترہ"</item>
+ <item msgid="3881477602692646573">"اٹھارہ"</item>
+ <item msgid="3358129827772984226">"انّیس"</item>
+ <item msgid="3308575407402865807">"بیس"</item>
+ <item msgid="5346560955382229629">"اکیس\n"</item>
+ <item msgid="226750304761473436">"بائیس\n"</item>
+ <item msgid="616811325336838734">"تیئیس\n"</item>
+ <item msgid="616346116869053440">"چوبیس\n"</item>
+ <item msgid="4642996410384042830">"پچیس\n"</item>
+ <item msgid="7506092849993571465">"چھبیس\n"</item>
+ <item msgid="1915078191101042031">"ستائیں\n"</item>
+ <item msgid="4292378641900520252">"اٹھائیس\n"</item>
+ <item msgid="5339513901773103696">"انتیس\n"</item>
+ <item msgid="3574673250891657607">"تیس"</item>
+ <item msgid="5796923836589110940">"اکتیس\n"</item>
+ <item msgid="5859323597571702052">"بتّیس\n"</item>
+ <item msgid="5133326723148876507">"تینتیس\n"</item>
+ <item msgid="2693999494655663096">"چونتیس\n"</item>
+ <item msgid="3316754944962836197">"پینتیس\n"</item>
+ <item msgid="816891008836796723">"چھتیس\n"</item>
+ <item msgid="9158890488666520078">"سینتیس\n"</item>
+ <item msgid="1894769703213894011">"اڑتیس\n"</item>
+ <item msgid="5638820345598572399">"انچالیس\n"</item>
+ <item msgid="8838304023017895439">"چالیس"</item>
+ <item msgid="1834742948932559597">"اکتالیس\n"</item>
+ <item msgid="6573707308847773944">"بیالیس\n"</item>
+ <item msgid="2450149950652678001">"تینتالیس\n"</item>
+ <item msgid="2874667401318178036">"چوالیس\n"</item>
+ <item msgid="3391101532763048862">"پینتالیس\n"</item>
+ <item msgid="1671489330863254362">"چھیالیس\n"</item>
+ <item msgid="5916017359554531038">"سینتالیس\n"</item>
+ <item msgid="8205413177993059967">"اڑتالیس\n"</item>
+ <item msgid="6607867415142171302">"انچاس\n"</item>
+ <item msgid="8358850748472089162">"پچاس"</item>
+ <item msgid="3551313125255080234">"اکیاون\n"</item>
+ <item msgid="1559678130725716542">"باون\n"</item>
+ <item msgid="431441994725492377">"تریپن\n"</item>
+ <item msgid="6345774640539623024">"چوّن\n"</item>
+ <item msgid="8018192990793931120">"پچپن\n"</item>
+ <item msgid="6187650843754604534">"چھپّن\n"</item>
+ <item msgid="8727240174015993259">"ستاون\n"</item>
+ <item msgid="848339003778952950">"اٹھاون\n"</item>
+ <item msgid="5798985802835423618">"انسٹھ\n"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-uz/strings.xml b/packages/SystemUI/res-keyguard/values-uz/strings.xml
index 1766d11..640a987 100644
--- a/packages/SystemUI/res-keyguard/values-uz/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-uz/strings.xml
@@ -152,78 +152,81 @@
<item quantity="other">SIM karta faolsizlantirildi. Davom etish uchun PUK kodni kiriting. Yana <xliff:g id="_NUMBER_1">%d</xliff:g> marta xato qilsangiz, SIM kartangiz butunlay qulflanadi. Batafsil axborot olish uchun tarmoq operatoriga murojaat qiling.</item>
<item quantity="one">SIM karta faolsizlantirildi. Davom etish uchun PUK kodni kiriting. Yana <xliff:g id="_NUMBER_0">%d</xliff:g> marta xato qilsangiz, SIM kartangiz butunlay qulflanadi. Batafsil axborot olish uchun tarmoq operatoriga murojaat qiling.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Hozir"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Oʻn ikki"</item>
+ <item msgid="7389464214252023751">"Bir"</item>
+ <item msgid="8803180377002008046">"Ikki"</item>
+ <item msgid="8614897059944644719">"Uch"</item>
+ <item msgid="2293058674782619556">"Toʻrt"</item>
+ <item msgid="4815402358455041664">"Besh"</item>
+ <item msgid="3325754778509665687">"Olti"</item>
+ <item msgid="5805551341866280575">"Yetti"</item>
+ <item msgid="203334816668238610">"Sakkiz"</item>
+ <item msgid="4828052671464488923">"Toʻqqiz"</item>
+ <item msgid="2233497913571137419">"Oʻn"</item>
+ <item msgid="5621554266768657830">"Oʻn bir"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Soat"</item>
+ <item msgid="8837126587669001578">"Nol bir"</item>
+ <item msgid="4294343372940455660">"Nol ikki"</item>
+ <item msgid="7129166637707421536">"Nol uch"</item>
+ <item msgid="7579404865008788673">"Nol toʻrt"</item>
+ <item msgid="3873924689207380586">"Nol besh"</item>
+ <item msgid="4849565597850069377">"Nol olti"</item>
+ <item msgid="4404219424523572364">"Nol yetti"</item>
+ <item msgid="8740481214764087329">"Nol sakkiz"</item>
+ <item msgid="1713216865806811237">"Nol toʻqqiz"</item>
+ <item msgid="3508406095411245038">"Oʻn"</item>
+ <item msgid="7161996337755311711">"Oʻn bir"</item>
+ <item msgid="4044549963329624197">"Oʻn ikki"</item>
+ <item msgid="333373157917379088">"Oʻn uch"</item>
+ <item msgid="2631202907124819385">"Oʻn toʻrt"</item>
+ <item msgid="6472396076858033453">"Oʻn besh"</item>
+ <item msgid="8656981856181581643">"Oʻn olti"</item>
+ <item msgid="7289026608562030619">"Oʻn yetti"</item>
+ <item msgid="3881477602692646573">"Oʻn sakkiz"</item>
+ <item msgid="3358129827772984226">"Oʻn toʻqqiz"</item>
+ <item msgid="3308575407402865807">"Yigirma"</item>
+ <item msgid="5346560955382229629">"Yigirma\nbir"</item>
+ <item msgid="226750304761473436">"Yigirma\nikki"</item>
+ <item msgid="616811325336838734">"Yigirma\nuch"</item>
+ <item msgid="616346116869053440">"Yigirma\ntoʻrt"</item>
+ <item msgid="4642996410384042830">"Yigirma\nbesh"</item>
+ <item msgid="7506092849993571465">"Yigirma\nolti"</item>
+ <item msgid="1915078191101042031">"Yigirma\nyetti"</item>
+ <item msgid="4292378641900520252">"Yigirma\nsakkiz"</item>
+ <item msgid="5339513901773103696">"Yigirma\ntoʻqqiz"</item>
+ <item msgid="3574673250891657607">"Oʻttiz"</item>
+ <item msgid="5796923836589110940">"Oʻttiz\nbir"</item>
+ <item msgid="5859323597571702052">"Oʻttiz\nikki"</item>
+ <item msgid="5133326723148876507">"Oʻttiz\nuch"</item>
+ <item msgid="2693999494655663096">"Oʻttiz\ntoʻrt"</item>
+ <item msgid="3316754944962836197">"Oʻttiz\nbesh"</item>
+ <item msgid="816891008836796723">"Oʻttiz\nolti"</item>
+ <item msgid="9158890488666520078">"Oʻttiz\nyetti"</item>
+ <item msgid="1894769703213894011">"Oʻttiz\nsakkiz"</item>
+ <item msgid="5638820345598572399">"Oʻttiz\ntoʻqqiz"</item>
+ <item msgid="8838304023017895439">"Qirq"</item>
+ <item msgid="1834742948932559597">"Qirq\nbir"</item>
+ <item msgid="6573707308847773944">"Qirq\nikki"</item>
+ <item msgid="2450149950652678001">"Qirq\nuch"</item>
+ <item msgid="2874667401318178036">"Qirq\ntoʻrt"</item>
+ <item msgid="3391101532763048862">"Qirq\nbesh"</item>
+ <item msgid="1671489330863254362">"Qirq\nolti"</item>
+ <item msgid="5916017359554531038">"Qirq\nyetti"</item>
+ <item msgid="8205413177993059967">"Qirq\nsakkiz"</item>
+ <item msgid="6607867415142171302">"Qirq\ntoʻqqiz"</item>
+ <item msgid="8358850748472089162">"Ellik"</item>
+ <item msgid="3551313125255080234">"Ellik\nbir"</item>
+ <item msgid="1559678130725716542">"Ellik\nikki"</item>
+ <item msgid="431441994725492377">"Ellik\nuch"</item>
+ <item msgid="6345774640539623024">"Ellik\ntoʻrt"</item>
+ <item msgid="8018192990793931120">"Ellik\nbesh"</item>
+ <item msgid="6187650843754604534">"Ellik\nolti"</item>
+ <item msgid="8727240174015993259">"Ellik\nyetti"</item>
+ <item msgid="848339003778952950">"Ellik\nsakkiz"</item>
+ <item msgid="5798985802835423618">"Ellik\ntoʻqqiz"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-vi/strings.xml b/packages/SystemUI/res-keyguard/values-vi/strings.xml
index eb6e536..2a62fb8 100644
--- a/packages/SystemUI/res-keyguard/values-vi/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-vi/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM hiện đã bị tắt. Hãy nhập mã PUK để tiếp tục. Bạn còn <xliff:g id="_NUMBER_1">%d</xliff:g> lần thử trước khi SIM vĩnh viễn không sử dụng được. Hãy liên hệ với nhà cung cấp dịch vụ để biết chi tiết.</item>
<item quantity="one">SIM hiện đã bị tắt. Hãy nhập mã PUK để tiếp tục. Bạn còn <xliff:g id="_NUMBER_0">%d</xliff:g> lần thử trước khi SIM vĩnh viễn không thể sử dụng được. Hãy liên hệ với nhà cung cấp dịch vụ để biết chi tiết.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Hiện là"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Mười hai"</item>
+ <item msgid="7389464214252023751">"Một"</item>
+ <item msgid="8803180377002008046">"Hai"</item>
+ <item msgid="8614897059944644719">"Ba"</item>
+ <item msgid="2293058674782619556">"Bốn"</item>
+ <item msgid="4815402358455041664">"Năm"</item>
+ <item msgid="3325754778509665687">"Sáu"</item>
+ <item msgid="5805551341866280575">"Bảy"</item>
+ <item msgid="203334816668238610">"Tám"</item>
+ <item msgid="4828052671464488923">"Chín"</item>
+ <item msgid="2233497913571137419">"Mười"</item>
+ <item msgid="5621554266768657830">"Mười một"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Giờ"</item>
+ <item msgid="8837126587669001578">"Một"</item>
+ <item msgid="4294343372940455660">"Hai"</item>
+ <item msgid="7129166637707421536">"Ba"</item>
+ <item msgid="7579404865008788673">"Bốn"</item>
+ <item msgid="3873924689207380586">"Năm"</item>
+ <item msgid="4849565597850069377">"Sáu"</item>
+ <item msgid="4404219424523572364">"Bảy"</item>
+ <item msgid="8740481214764087329">"Tám"</item>
+ <item msgid="1713216865806811237">"Chín"</item>
+ <item msgid="3508406095411245038">"Mười"</item>
+ <item msgid="7161996337755311711">"Mười một"</item>
+ <item msgid="4044549963329624197">"Mười hai"</item>
+ <item msgid="333373157917379088">"Mười ba"</item>
+ <item msgid="2631202907124819385">"Mười bốn"</item>
+ <item msgid="6472396076858033453">"Mười lăm"</item>
+ <item msgid="8656981856181581643">"Mười sáu"</item>
+ <item msgid="7289026608562030619">"Mười bảy"</item>
+ <item msgid="3881477602692646573">"Mười tám"</item>
+ <item msgid="3358129827772984226">"Mười chín"</item>
+ <item msgid="3308575407402865807">"Hai mươi"</item>
+ <item msgid="5346560955382229629">"Hai mươi\nmốt"</item>
+ <item msgid="226750304761473436">"Hai mươi\nhai"</item>
+ <item msgid="616811325336838734">"Hai mươi\nba"</item>
+ <item msgid="616346116869053440">"Hai mươi\nbốn"</item>
+ <item msgid="4642996410384042830">"Hai mươi\nlăm"</item>
+ <item msgid="7506092849993571465">"Hai mươi\nsáu"</item>
+ <item msgid="1915078191101042031">"Hai mươi\nbảy"</item>
+ <item msgid="4292378641900520252">"Hai mươi\ntám"</item>
+ <item msgid="5339513901773103696">"Hai mươi\nchín"</item>
+ <item msgid="3574673250891657607">"Ba mươi"</item>
+ <item msgid="5796923836589110940">"Ba mươi\nmốt"</item>
+ <item msgid="5859323597571702052">"Ba mươi\nhai"</item>
+ <item msgid="5133326723148876507">"Ba mươi\nba"</item>
+ <item msgid="2693999494655663096">"Ba mươi\ntư"</item>
+ <item msgid="3316754944962836197">"Ba mươi\nlăm"</item>
+ <item msgid="816891008836796723">"Ba mươi\nsáu"</item>
+ <item msgid="9158890488666520078">"Ba mươi\nbảy"</item>
+ <item msgid="1894769703213894011">"Ba mươi\ntám"</item>
+ <item msgid="5638820345598572399">"Ba mươi\nchín"</item>
+ <item msgid="8838304023017895439">"Bốn mươi"</item>
+ <item msgid="1834742948932559597">"Bốn mươi\nmốt"</item>
+ <item msgid="6573707308847773944">"Bốn mươi\nhai"</item>
+ <item msgid="2450149950652678001">"Bốn mươi\nba"</item>
+ <item msgid="2874667401318178036">"Bốn mươi\nbốn"</item>
+ <item msgid="3391101532763048862">"Bốn mươi\nlăm"</item>
+ <item msgid="1671489330863254362">"Bốn mươi\nsáu"</item>
+ <item msgid="5916017359554531038">"Bốn mươi\nbảy"</item>
+ <item msgid="8205413177993059967">"Bốn mươi\ntám"</item>
+ <item msgid="6607867415142171302">"Bốn mươi\nchín"</item>
+ <item msgid="8358850748472089162">"Năm mươi"</item>
+ <item msgid="3551313125255080234">"Năm mươi\nmốt"</item>
+ <item msgid="1559678130725716542">"Năm mươi\nhai"</item>
+ <item msgid="431441994725492377">"Năm mươi\nba"</item>
+ <item msgid="6345774640539623024">"Năm mươi\nbốn"</item>
+ <item msgid="8018192990793931120">"Năm mươi\nlăm"</item>
+ <item msgid="6187650843754604534">"Năm mươi\nsáu"</item>
+ <item msgid="8727240174015993259">"Năm mươi\nbảy"</item>
+ <item msgid="848339003778952950">"Năm mươi\ntám"</item>
+ <item msgid="5798985802835423618">"Năm mươi\nchín"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml
index 5fafe2f..80fac90 100644
--- a/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-zh-rCN/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM 卡现已停用，请输入 PUK 码继续使用。您还可以尝试 <xliff:g id="_NUMBER_1">%d</xliff:g> 次。如果仍不正确，该 SIM 卡将永远无法使用。有关详情，请联系您的运营商。</item>
<item quantity="one">SIM 卡现已停用，请输入 PUK 码继续使用。您还可以尝试 <xliff:g id="_NUMBER_0">%d</xliff:g> 次。如果仍不正确，该 SIM 卡将永远无法使用。有关详情，请联系您的运营商。</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"时间是"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"十二"</item>
+ <item msgid="7389464214252023751">"一"</item>
+ <item msgid="8803180377002008046">"二"</item>
+ <item msgid="8614897059944644719">"三"</item>
+ <item msgid="2293058674782619556">"四"</item>
+ <item msgid="4815402358455041664">"五"</item>
+ <item msgid="3325754778509665687">"六"</item>
+ <item msgid="5805551341866280575">"七"</item>
+ <item msgid="203334816668238610">"八"</item>
+ <item msgid="4828052671464488923">"九"</item>
+ <item msgid="2233497913571137419">"十"</item>
+ <item msgid="5621554266768657830">"十一"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"点整"</item>
+ <item msgid="8837126587669001578">"一点"</item>
+ <item msgid="4294343372940455660">"两点"</item>
+ <item msgid="7129166637707421536">"三点"</item>
+ <item msgid="7579404865008788673">"四点"</item>
+ <item msgid="3873924689207380586">"五点"</item>
+ <item msgid="4849565597850069377">"六点"</item>
+ <item msgid="4404219424523572364">"七点"</item>
+ <item msgid="8740481214764087329">"八点"</item>
+ <item msgid="1713216865806811237">"九点"</item>
+ <item msgid="3508406095411245038">"十"</item>
+ <item msgid="7161996337755311711">"十一"</item>
+ <item msgid="4044549963329624197">"十二"</item>
+ <item msgid="333373157917379088">"十三"</item>
+ <item msgid="2631202907124819385">"十四"</item>
+ <item msgid="6472396076858033453">"十五"</item>
+ <item msgid="8656981856181581643">"十六"</item>
+ <item msgid="7289026608562030619">"十七"</item>
+ <item msgid="3881477602692646573">"十八"</item>
+ <item msgid="3358129827772984226">"十九"</item>
+ <item msgid="3308575407402865807">"二十"</item>
+ <item msgid="5346560955382229629">"二十\n一"</item>
+ <item msgid="226750304761473436">"二十\n二"</item>
+ <item msgid="616811325336838734">"二十\n三"</item>
+ <item msgid="616346116869053440">"二十\n四"</item>
+ <item msgid="4642996410384042830">"二十\n五"</item>
+ <item msgid="7506092849993571465">"二十\n六"</item>
+ <item msgid="1915078191101042031">"二十\n七"</item>
+ <item msgid="4292378641900520252">"二十\n八"</item>
+ <item msgid="5339513901773103696">"二十\n九"</item>
+ <item msgid="3574673250891657607">"三十"</item>
+ <item msgid="5796923836589110940">"三十\n一"</item>
+ <item msgid="5859323597571702052">"三十\n二"</item>
+ <item msgid="5133326723148876507">"三十\n三"</item>
+ <item msgid="2693999494655663096">"三十\n四"</item>
+ <item msgid="3316754944962836197">"三十\n五"</item>
+ <item msgid="816891008836796723">"三十\n六"</item>
+ <item msgid="9158890488666520078">"三十\n七"</item>
+ <item msgid="1894769703213894011">"三十\n八"</item>
+ <item msgid="5638820345598572399">"三十\n九"</item>
+ <item msgid="8838304023017895439">"四十"</item>
+ <item msgid="1834742948932559597">"四十\n一"</item>
+ <item msgid="6573707308847773944">"四十\n二"</item>
+ <item msgid="2450149950652678001">"四十\n三"</item>
+ <item msgid="2874667401318178036">"四十\n四"</item>
+ <item msgid="3391101532763048862">"四十\n五"</item>
+ <item msgid="1671489330863254362">"四十\n六"</item>
+ <item msgid="5916017359554531038">"四十\n七"</item>
+ <item msgid="8205413177993059967">"四十\n八"</item>
+ <item msgid="6607867415142171302">"四十\n九"</item>
+ <item msgid="8358850748472089162">"五十"</item>
+ <item msgid="3551313125255080234">"五十\n一"</item>
+ <item msgid="1559678130725716542">"五十\n二"</item>
+ <item msgid="431441994725492377">"五十\n三"</item>
+ <item msgid="6345774640539623024">"五十\n四"</item>
+ <item msgid="8018192990793931120">"五十\n五"</item>
+ <item msgid="6187650843754604534">"五十\n六"</item>
+ <item msgid="8727240174015993259">"五十\n七"</item>
+ <item msgid="848339003778952950">"五十\n八"</item>
+ <item msgid="5798985802835423618">"五十\n九"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml
index 0181ed3..926d601 100644
--- a/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-zh-rHK/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM 卡已停用。請輸入 PUK 碼以繼續進行。您還可以再試 <xliff:g id="_NUMBER_1">%d</xliff:g> 次。如果仍然輸入錯誤，SIM 卡將永久無法使用。詳情請與流動網絡供應商聯絡。</item>
<item quantity="one">SIM 卡已停用。請輸入 PUK 碼以繼續進行。您還可以再試 <xliff:g id="_NUMBER_0">%d</xliff:g> 次。如果仍然輸入錯誤，SIM 卡將永久無法使用。詳情請與流動網絡供應商聯絡。</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"現在是"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"十二"</item>
+ <item msgid="7389464214252023751">"一"</item>
+ <item msgid="8803180377002008046">"二"</item>
+ <item msgid="8614897059944644719">"三"</item>
+ <item msgid="2293058674782619556">"四"</item>
+ <item msgid="4815402358455041664">"五"</item>
+ <item msgid="3325754778509665687">"六"</item>
+ <item msgid="5805551341866280575">"七"</item>
+ <item msgid="203334816668238610">"八"</item>
+ <item msgid="4828052671464488923">"九"</item>
+ <item msgid="2233497913571137419">"十"</item>
+ <item msgid="5621554266768657830">"十一"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"零九"</item>
+ <item msgid="8837126587669001578">"零一"</item>
+ <item msgid="4294343372940455660">"零二"</item>
+ <item msgid="7129166637707421536">"零三"</item>
+ <item msgid="7579404865008788673">"零四"</item>
+ <item msgid="3873924689207380586">"零五"</item>
+ <item msgid="4849565597850069377">"零六"</item>
+ <item msgid="4404219424523572364">"零七"</item>
+ <item msgid="8740481214764087329">"零八"</item>
+ <item msgid="1713216865806811237">"零九"</item>
+ <item msgid="3508406095411245038">"十"</item>
+ <item msgid="7161996337755311711">"十一"</item>
+ <item msgid="4044549963329624197">"十二"</item>
+ <item msgid="333373157917379088">"十三"</item>
+ <item msgid="2631202907124819385">"十四"</item>
+ <item msgid="6472396076858033453">"十五"</item>
+ <item msgid="8656981856181581643">"十六"</item>
+ <item msgid="7289026608562030619">"十七"</item>
+ <item msgid="3881477602692646573">"十八"</item>
+ <item msgid="3358129827772984226">"十九"</item>
+ <item msgid="3308575407402865807">"二十"</item>
+ <item msgid="5346560955382229629">"二十\n一"</item>
+ <item msgid="226750304761473436">"二十\n二"</item>
+ <item msgid="616811325336838734">"二十\n三"</item>
+ <item msgid="616346116869053440">"二十\n四"</item>
+ <item msgid="4642996410384042830">"二十\n五"</item>
+ <item msgid="7506092849993571465">"二十\n六"</item>
+ <item msgid="1915078191101042031">"二十\n七"</item>
+ <item msgid="4292378641900520252">"二十\n八"</item>
+ <item msgid="5339513901773103696">"二十\n九"</item>
+ <item msgid="3574673250891657607">"三十"</item>
+ <item msgid="5796923836589110940">"三十\n一"</item>
+ <item msgid="5859323597571702052">"三十\n二"</item>
+ <item msgid="5133326723148876507">"三十\n三"</item>
+ <item msgid="2693999494655663096">"三十\n四"</item>
+ <item msgid="3316754944962836197">"三十\n五"</item>
+ <item msgid="816891008836796723">"三十\n六"</item>
+ <item msgid="9158890488666520078">"三十\n七"</item>
+ <item msgid="1894769703213894011">"三十\n八"</item>
+ <item msgid="5638820345598572399">"三十\n九"</item>
+ <item msgid="8838304023017895439">"四十"</item>
+ <item msgid="1834742948932559597">"四十\n一"</item>
+ <item msgid="6573707308847773944">"四十\n二"</item>
+ <item msgid="2450149950652678001">"四十\n三"</item>
+ <item msgid="2874667401318178036">"四十\n四"</item>
+ <item msgid="3391101532763048862">"四十\n五"</item>
+ <item msgid="1671489330863254362">"四十\n六"</item>
+ <item msgid="5916017359554531038">"四十\n七"</item>
+ <item msgid="8205413177993059967">"四十\n八"</item>
+ <item msgid="6607867415142171302">"四十\n九"</item>
+ <item msgid="8358850748472089162">"五十"</item>
+ <item msgid="3551313125255080234">"五十\n一"</item>
+ <item msgid="1559678130725716542">"五十\n二"</item>
+ <item msgid="431441994725492377">"五十\n三"</item>
+ <item msgid="6345774640539623024">"五十\n四"</item>
+ <item msgid="8018192990793931120">"五十\n五"</item>
+ <item msgid="6187650843754604534">"五十\n六"</item>
+ <item msgid="8727240174015993259">"五十\n七"</item>
+ <item msgid="848339003778952950">"五十\n八"</item>
+ <item msgid="5798985802835423618">"五十\n九"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml
index 126304f..728f1a9 100644
--- a/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-zh-rTW/strings.xml
@@ -150,78 +150,81 @@
<item quantity="other">SIM 卡現在已遭停用。請輸入 PUK 碼以繼續進行。你還可以再試 <xliff:g id="_NUMBER_1">%d</xliff:g> 次，如果仍然失敗，SIM 卡將永久無法使用。詳情請與電信業者聯絡。</item>
<item quantity="one">SIM 卡現在已遭停用。請輸入 PUK 碼以繼續進行。你還可以再試 <xliff:g id="_NUMBER_0">%d</xliff:g> 次，如果仍然失敗，SIM 卡將永久無法使用。詳情請與電信業者聯絡。</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"時間是"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"十二"</item>
+ <item msgid="7389464214252023751">"一"</item>
+ <item msgid="8803180377002008046">"二"</item>
+ <item msgid="8614897059944644719">"三"</item>
+ <item msgid="2293058674782619556">"四"</item>
+ <item msgid="4815402358455041664">"五"</item>
+ <item msgid="3325754778509665687">"六"</item>
+ <item msgid="5805551341866280575">"七"</item>
+ <item msgid="203334816668238610">"八"</item>
+ <item msgid="4828052671464488923">"九"</item>
+ <item msgid="2233497913571137419">"十"</item>
+ <item msgid="5621554266768657830">"十一"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"點整"</item>
+ <item msgid="8837126587669001578">"零一"</item>
+ <item msgid="4294343372940455660">"零二"</item>
+ <item msgid="7129166637707421536">"零三"</item>
+ <item msgid="7579404865008788673">"零四"</item>
+ <item msgid="3873924689207380586">"零五"</item>
+ <item msgid="4849565597850069377">"零六"</item>
+ <item msgid="4404219424523572364">"零七"</item>
+ <item msgid="8740481214764087329">"零八"</item>
+ <item msgid="1713216865806811237">"零九"</item>
+ <item msgid="3508406095411245038">"十"</item>
+ <item msgid="7161996337755311711">"十一"</item>
+ <item msgid="4044549963329624197">"十二"</item>
+ <item msgid="333373157917379088">"十三"</item>
+ <item msgid="2631202907124819385">"十四"</item>
+ <item msgid="6472396076858033453">"十五"</item>
+ <item msgid="8656981856181581643">"十六"</item>
+ <item msgid="7289026608562030619">"十七"</item>
+ <item msgid="3881477602692646573">"十八"</item>
+ <item msgid="3358129827772984226">"十九"</item>
+ <item msgid="3308575407402865807">"二十"</item>
+ <item msgid="5346560955382229629">"二十\n一"</item>
+ <item msgid="226750304761473436">"二十\n二"</item>
+ <item msgid="616811325336838734">"二十\n三"</item>
+ <item msgid="616346116869053440">"二十\n四"</item>
+ <item msgid="4642996410384042830">"二十\n五"</item>
+ <item msgid="7506092849993571465">"二十\n六"</item>
+ <item msgid="1915078191101042031">"二十\n七"</item>
+ <item msgid="4292378641900520252">"二十\n八"</item>
+ <item msgid="5339513901773103696">"二十\n九"</item>
+ <item msgid="3574673250891657607">"三十"</item>
+ <item msgid="5796923836589110940">"三十\n一"</item>
+ <item msgid="5859323597571702052">"三十\n二"</item>
+ <item msgid="5133326723148876507">"三十\n三"</item>
+ <item msgid="2693999494655663096">"三十\n四"</item>
+ <item msgid="3316754944962836197">"三十\n五"</item>
+ <item msgid="816891008836796723">"三十\n六"</item>
+ <item msgid="9158890488666520078">"三十\n七"</item>
+ <item msgid="1894769703213894011">"三十\n八"</item>
+ <item msgid="5638820345598572399">"三十\n九"</item>
+ <item msgid="8838304023017895439">"四十"</item>
+ <item msgid="1834742948932559597">"四十\n一"</item>
+ <item msgid="6573707308847773944">"四十\n二"</item>
+ <item msgid="2450149950652678001">"四十\n三"</item>
+ <item msgid="2874667401318178036">"四十\n四"</item>
+ <item msgid="3391101532763048862">"四十\n五"</item>
+ <item msgid="1671489330863254362">"四十\n六"</item>
+ <item msgid="5916017359554531038">"四十\n七"</item>
+ <item msgid="8205413177993059967">"四十\n八"</item>
+ <item msgid="6607867415142171302">"四十\n九"</item>
+ <item msgid="8358850748472089162">"五十"</item>
+ <item msgid="3551313125255080234">"五十\n一"</item>
+ <item msgid="1559678130725716542">"五十\n二"</item>
+ <item msgid="431441994725492377">"五十\n三"</item>
+ <item msgid="6345774640539623024">"五十\n四"</item>
+ <item msgid="8018192990793931120">"五十\n五"</item>
+ <item msgid="6187650843754604534">"五十\n六"</item>
+ <item msgid="8727240174015993259">"五十\n七"</item>
+ <item msgid="848339003778952950">"五十\n八"</item>
+ <item msgid="5798985802835423618">"五十\n九"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values-zu/strings.xml b/packages/SystemUI/res-keyguard/values-zu/strings.xml
index 6a62d52..7e0a03c 100644
--- a/packages/SystemUI/res-keyguard/values-zu/strings.xml
+++ b/packages/SystemUI/res-keyguard/values-zu/strings.xml
@@ -150,78 +150,81 @@
<item quantity="one">I-SIM manje ikhutshaziwe. Faka ikhodi ye-PUK ukuze uqhubeke. Unemizamo engu-<xliff:g id="_NUMBER_1">%d</xliff:g> esele ngaphambi kokuthi i-SIM ingasebenziseki unaphakade. Xhumana nenkampani yenethiwekhi ngemininingwane.</item>
<item quantity="other">I-SIM manje ikhutshaziwe. Faka ikhodi ye-PUK ukuze uqhubeke. Unemizamo engu-<xliff:g id="_NUMBER_1">%d</xliff:g> esele ngaphambi kokuthi i-SIM ingasebenziseki unaphakade. Xhumana nenkampani yenethiwekhi ngemininingwane.</item>
</plurals>
- <!-- no translation found for type_clock_header (4786545441902447636) -->
- <skip />
- <!-- no translation found for type_clock_hours:0 (3543074812389379830) -->
- <!-- no translation found for type_clock_hours:1 (7389464214252023751) -->
- <!-- no translation found for type_clock_hours:2 (8803180377002008046) -->
- <!-- no translation found for type_clock_hours:3 (8614897059944644719) -->
- <!-- no translation found for type_clock_hours:4 (2293058674782619556) -->
- <!-- no translation found for type_clock_hours:5 (4815402358455041664) -->
- <!-- no translation found for type_clock_hours:6 (3325754778509665687) -->
- <!-- no translation found for type_clock_hours:7 (5805551341866280575) -->
- <!-- no translation found for type_clock_hours:8 (203334816668238610) -->
- <!-- no translation found for type_clock_hours:9 (4828052671464488923) -->
- <!-- no translation found for type_clock_hours:10 (2233497913571137419) -->
- <!-- no translation found for type_clock_hours:11 (5621554266768657830) -->
- <!-- no translation found for type_clock_minutes:0 (8322049385467207985) -->
- <!-- no translation found for type_clock_minutes:1 (8837126587669001578) -->
- <!-- no translation found for type_clock_minutes:2 (4294343372940455660) -->
- <!-- no translation found for type_clock_minutes:3 (7129166637707421536) -->
- <!-- no translation found for type_clock_minutes:4 (7579404865008788673) -->
- <!-- no translation found for type_clock_minutes:5 (3873924689207380586) -->
- <!-- no translation found for type_clock_minutes:6 (4849565597850069377) -->
- <!-- no translation found for type_clock_minutes:7 (4404219424523572364) -->
- <!-- no translation found for type_clock_minutes:8 (8740481214764087329) -->
- <!-- no translation found for type_clock_minutes:9 (1713216865806811237) -->
- <!-- no translation found for type_clock_minutes:10 (3508406095411245038) -->
- <!-- no translation found for type_clock_minutes:11 (7161996337755311711) -->
- <!-- no translation found for type_clock_minutes:12 (4044549963329624197) -->
- <!-- no translation found for type_clock_minutes:13 (333373157917379088) -->
- <!-- no translation found for type_clock_minutes:14 (2631202907124819385) -->
- <!-- no translation found for type_clock_minutes:15 (6472396076858033453) -->
- <!-- no translation found for type_clock_minutes:16 (8656981856181581643) -->
- <!-- no translation found for type_clock_minutes:17 (7289026608562030619) -->
- <!-- no translation found for type_clock_minutes:18 (3881477602692646573) -->
- <!-- no translation found for type_clock_minutes:19 (3358129827772984226) -->
- <!-- no translation found for type_clock_minutes:20 (3308575407402865807) -->
- <!-- no translation found for type_clock_minutes:21 (5346560955382229629) -->
- <!-- no translation found for type_clock_minutes:22 (226750304761473436) -->
- <!-- no translation found for type_clock_minutes:23 (616811325336838734) -->
- <!-- no translation found for type_clock_minutes:24 (616346116869053440) -->
- <!-- no translation found for type_clock_minutes:25 (4642996410384042830) -->
- <!-- no translation found for type_clock_minutes:26 (7506092849993571465) -->
- <!-- no translation found for type_clock_minutes:27 (1915078191101042031) -->
- <!-- no translation found for type_clock_minutes:28 (4292378641900520252) -->
- <!-- no translation found for type_clock_minutes:29 (5339513901773103696) -->
- <!-- no translation found for type_clock_minutes:30 (3574673250891657607) -->
- <!-- no translation found for type_clock_minutes:31 (5796923836589110940) -->
- <!-- no translation found for type_clock_minutes:32 (5859323597571702052) -->
- <!-- no translation found for type_clock_minutes:33 (5133326723148876507) -->
- <!-- no translation found for type_clock_minutes:34 (2693999494655663096) -->
- <!-- no translation found for type_clock_minutes:35 (3316754944962836197) -->
- <!-- no translation found for type_clock_minutes:36 (816891008836796723) -->
- <!-- no translation found for type_clock_minutes:37 (9158890488666520078) -->
- <!-- no translation found for type_clock_minutes:38 (1894769703213894011) -->
- <!-- no translation found for type_clock_minutes:39 (5638820345598572399) -->
- <!-- no translation found for type_clock_minutes:40 (8838304023017895439) -->
- <!-- no translation found for type_clock_minutes:41 (1834742948932559597) -->
- <!-- no translation found for type_clock_minutes:42 (6573707308847773944) -->
- <!-- no translation found for type_clock_minutes:43 (2450149950652678001) -->
- <!-- no translation found for type_clock_minutes:44 (2874667401318178036) -->
- <!-- no translation found for type_clock_minutes:45 (3391101532763048862) -->
- <!-- no translation found for type_clock_minutes:46 (1671489330863254362) -->
- <!-- no translation found for type_clock_minutes:47 (5916017359554531038) -->
- <!-- no translation found for type_clock_minutes:48 (8205413177993059967) -->
- <!-- no translation found for type_clock_minutes:49 (6607867415142171302) -->
- <!-- no translation found for type_clock_minutes:50 (8358850748472089162) -->
- <!-- no translation found for type_clock_minutes:51 (3551313125255080234) -->
- <!-- no translation found for type_clock_minutes:52 (1559678130725716542) -->
- <!-- no translation found for type_clock_minutes:53 (431441994725492377) -->
- <!-- no translation found for type_clock_minutes:54 (6345774640539623024) -->
- <!-- no translation found for type_clock_minutes:55 (8018192990793931120) -->
- <!-- no translation found for type_clock_minutes:56 (6187650843754604534) -->
- <!-- no translation found for type_clock_minutes:57 (8727240174015993259) -->
- <!-- no translation found for type_clock_minutes:58 (848339003778952950) -->
- <!-- no translation found for type_clock_minutes:59 (5798985802835423618) -->
+ <string name="type_clock_header" msgid="4786545441902447636">"Kuyi-"</string>
+ <string-array name="type_clock_hours">
+ <item msgid="3543074812389379830">"Ishumi nambili"</item>
+ <item msgid="7389464214252023751">"Kunye"</item>
+ <item msgid="8803180377002008046">"Kubili"</item>
+ <item msgid="8614897059944644719">"Kuthathu"</item>
+ <item msgid="2293058674782619556">"Kune"</item>
+ <item msgid="4815402358455041664">"Kuhlanu"</item>
+ <item msgid="3325754778509665687">"Isithupha"</item>
+ <item msgid="5805551341866280575">"Isikhombisa"</item>
+ <item msgid="203334816668238610">"Isishiyagalombili"</item>
+ <item msgid="4828052671464488923">"Isishiyagalolunye"</item>
+ <item msgid="2233497913571137419">"Ishumi"</item>
+ <item msgid="5621554266768657830">"Ishumi nanye"</item>
+ </string-array>
+ <string-array name="type_clock_minutes">
+ <item msgid="8322049385467207985">"Ezimpondweni"</item>
+ <item msgid="8837126587669001578">"O’Okukodwa"</item>
+ <item msgid="4294343372940455660">"O’Okubili"</item>
+ <item msgid="7129166637707421536">"O’Kuthathu"</item>
+ <item msgid="7579404865008788673">"O’Okune"</item>
+ <item msgid="3873924689207380586">"O’Isihlanu"</item>
+ <item msgid="4849565597850069377">"O’Isithupha"</item>
+ <item msgid="4404219424523572364">"O’Isikhombisa"</item>
+ <item msgid="8740481214764087329">"O’Isishiyagalombili"</item>
+ <item msgid="1713216865806811237">"O’Isishiyagalombili"</item>
+ <item msgid="3508406095411245038">"Ishumi"</item>
+ <item msgid="7161996337755311711">"Ishumi nanye"</item>
+ <item msgid="4044549963329624197">"Ishumi nambili"</item>
+ <item msgid="333373157917379088">"Ishumi nantathu"</item>
+ <item msgid="2631202907124819385">"Ishumi nane"</item>
+ <item msgid="6472396076858033453">"Ishumi nanhlanu"</item>
+ <item msgid="8656981856181581643">"Ishumi nesithupha"</item>
+ <item msgid="7289026608562030619">"Ishumi nesikhombisa"</item>
+ <item msgid="3881477602692646573">"Ishumi nesishiyagalombili"</item>
+ <item msgid="3358129827772984226">"Ishumi nesishiyagalolunye"</item>
+ <item msgid="3308575407402865807">"Amashumi amabili"</item>
+ <item msgid="5346560955382229629">"Amashumi amabili\nnanye"</item>
+ <item msgid="226750304761473436">"Amashumi amabili\nnambili"</item>
+ <item msgid="616811325336838734">"Amashumi amabili\nnantathu"</item>
+ <item msgid="616346116869053440">"Amashumi amabili\nnane"</item>
+ <item msgid="4642996410384042830">"Amashumi amabili\nnanhlanu"</item>
+ <item msgid="7506092849993571465">"Amashumi amabili\nnesithupha"</item>
+ <item msgid="1915078191101042031">"Amashumi amabili\nnesikhombisa"</item>
+ <item msgid="4292378641900520252">"Amashumi nambili\nnesishiyagalombili"</item>
+ <item msgid="5339513901773103696">"Amashumi amabili\nnesishiyagalolunye"</item>
+ <item msgid="3574673250891657607">"Amashumi amathathu"</item>
+ <item msgid="5796923836589110940">"Amashumi amathathu\nnanye"</item>
+ <item msgid="5859323597571702052">"Amashumi amathathu\nnambili"</item>
+ <item msgid="5133326723148876507">"Amashumi amathathu\nnantathu"</item>
+ <item msgid="2693999494655663096">"Amashumi amathathu\nnane"</item>
+ <item msgid="3316754944962836197">"Amashumi amathathu\nnesihlanu"</item>
+ <item msgid="816891008836796723">"Amashumi amathathu\nnesithupha"</item>
+ <item msgid="9158890488666520078">"Amashumi amathathu\nnesikhombisa"</item>
+ <item msgid="1894769703213894011">"Amshumi amathathu\nnesishiyagalombili"</item>
+ <item msgid="5638820345598572399">"Amashumi amathathu\nnesishiyagalolunye"</item>
+ <item msgid="8838304023017895439">"Amashumi amane"</item>
+ <item msgid="1834742948932559597">"Amashumi amane\nnanye"</item>
+ <item msgid="6573707308847773944">"Amashumi amane\nnambili"</item>
+ <item msgid="2450149950652678001">"Amashumi amane\nnantathu"</item>
+ <item msgid="2874667401318178036">"Amashumi amane\nnane"</item>
+ <item msgid="3391101532763048862">"Amashumi amane\nnanhlanu"</item>
+ <item msgid="1671489330863254362">"Amashumi amane\nnesithupha"</item>
+ <item msgid="5916017359554531038">"Amashumi amane\nnesikhombisa"</item>
+ <item msgid="8205413177993059967">"Amashumi nane\nnesishiyagalombili"</item>
+ <item msgid="6607867415142171302">"Amashumi amane\nnesishiyagalolunye"</item>
+ <item msgid="8358850748472089162">"Amashumi nanhlanu"</item>
+ <item msgid="3551313125255080234">"Amashumi amahlanu\nnanye"</item>
+ <item msgid="1559678130725716542">"Amashumi amahlanu\nnambili"</item>
+ <item msgid="431441994725492377">"Amashumi amahlanu\nnantathu"</item>
+ <item msgid="6345774640539623024">"Amashumi amahlanu\nnane"</item>
+ <item msgid="8018192990793931120">"Amashumi amahlanu\nnanhlanu"</item>
+ <item msgid="6187650843754604534">"Amashumi amahlanu\nnesithupha"</item>
+ <item msgid="8727240174015993259">"Amashumi amahlanu\nnesikhombisa"</item>
+ <item msgid="848339003778952950">"Amashumi amahlanu\nnesishiyagalombili"</item>
+ <item msgid="5798985802835423618">"Amashumi amahlanu\nnesishiyagalolunye"</item>
+ </string-array>
</resources>
diff --git a/packages/SystemUI/res-keyguard/values/styles.xml b/packages/SystemUI/res-keyguard/values/styles.xml
index b9966cf..8bbc270 100644
--- a/packages/SystemUI/res-keyguard/values/styles.xml
+++ b/packages/SystemUI/res-keyguard/values/styles.xml
@@ -103,4 +103,10 @@
<item name="android:textSize">@dimen/widget_label_font_size</item>
</style>
+ <style name="TextAppearance.Keyguard.BottomArea">
+ <item name="android:textSize">16sp</item>
+ <item name="android:maxLines">1</item>
+ <item name="android:textColor">?attr/wallpaperTextColor</item>
+ </style>
+
</resources>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_bottompath_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_bottompath_animation.xml
deleted file mode 100644
index 073bf6d..0000000
--- a/packages/SystemUI/res/anim/error_to_trustedstate_bottompath_animation.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="283"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,-1.1 l 0.0,0.0 c 0.60751322478,0.0 1.1,0.49248677522 1.1,1.1 l 0.0,0.0 c 0.0,0.60751322478 -0.49248677522,1.1 -1.1,1.1 l 0.0,0.0 c -0.60751322478,0.0 -1.1,-0.49248677522 -1.1,-1.1 l 0.0,0.0 c 0.0,-0.60751322478 0.49248677522,-1.1 1.1,-1.1 Z"
- android:valueTo="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_0" />
-</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_circlepath_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_circlepath_animation.xml
deleted file mode 100644
index 990392d..0000000
--- a/packages/SystemUI/res/anim/error_to_trustedstate_circlepath_animation.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="383"
- android:propertyName="trimPathEnd"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
-</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml
deleted file mode 100644
index a00d937..0000000
--- a/packages/SystemUI/res/anim/error_to_trustedstate_ellipse_path_1_animation.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="350"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueTo="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueType="pathType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="200"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueTo="M 0.0,-1.988645 c 1.09829830627,0.0 1.988645,0.890346693734 1.988645,1.988645 c 0.0,1.09829830627 -0.890346693734,1.988645 -1.988645,1.988645 c -1.09829830627,0.0 -1.988645,-0.890346693734 -1.988645,-1.988645 c 0.0,-1.09829830627 0.890346693734,-1.988645 1.988645,-1.988645 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_6" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_errorcircle_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_errorcircle_animation.xml
deleted file mode 100644
index 59d6232..0000000
--- a/packages/SystemUI/res/anim/error_to_trustedstate_errorcircle_animation.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="33"
- android:propertyName="rotation"
- android:valueFrom="5.0"
- android:valueTo="5.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="366"
- android:propertyName="rotation"
- android:valueFrom="5.0"
- android:valueTo="-180.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_errorexclamationdot_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_errorexclamationdot_animation.xml
deleted file mode 100644
index 55bfa58..0000000
--- a/packages/SystemUI/res/anim/error_to_trustedstate_errorexclamationdot_animation.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="283"
- android:propertyXName="translateX"
- android:propertyYName="translateY"
- android:pathData="M 12.0,12.0 c 0.0,-0.66667 0.0,-3.33333 0.0,-4.0"
- android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_5" />
-</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_exclamationtop_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_exclamationtop_animation.xml
deleted file mode 100644
index 4c44c6b..0000000
--- a/packages/SystemUI/res/anim/error_to_trustedstate_exclamationtop_animation.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="283"
- android:propertyXName="translateX"
- android:propertyYName="translateY"
- android:pathData="M 0.0,-2.0 c 0.0,0.5 0.0,2.5 0.0,3.0"
- android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_2" />
-</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml
deleted file mode 100644
index 6f7d692..0000000
--- a/packages/SystemUI/res/anim/error_to_trustedstate_lock_top_animation.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="266"
- android:propertyName="scaleX"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="66"
- android:propertyName="scaleX"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="266"
- android:propertyName="scaleY"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="66"
- android:propertyName="scaleY"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml
deleted file mode 100644
index 6821e62..0000000
--- a/packages/SystemUI/res/anim/error_to_trustedstate_path_1_animation.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="283"
- android:propertyName="pathData"
- android:valueFrom="M 1.63623046875,-4.953125 c 0.0,0.0 -1.61499023438,0.0 -1.61499023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 0.0118713378906,7.9296875 0.0118713378906,7.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 1.61987304688,0.0 1.61987304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 -0.01123046875,-7.9296875 -0.01123046875,-7.9296875 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
- android:valueTo="M 1.63623046875,-4.953125 c 0.0,0.0 -1.61499023438,0.0 -1.61499023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 0.0118713378906,7.9296875 0.0118713378906,7.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 1.61987304688,0.0 1.61987304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 -0.01123046875,-7.9296875 -0.01123046875,-7.9296875 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
- android:valueType="pathType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="266"
- android:propertyName="pathData"
- android:valueFrom="M 1.63623046875,-4.953125 c 0.0,0.0 -1.61499023438,0.0 -1.61499023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 0.0118713378906,7.9296875 0.0118713378906,7.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 1.61987304688,0.0 1.61987304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 -0.01123046875,-7.9296875 -0.01123046875,-7.9296875 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
- android:valueTo="M 6.00561523438,-4.046875 c 0.0,0.0 -5.98999023438,0.0 -5.98999023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 5.98812866211,0.0 5.98812866211,0.0 c 0.0,0.0 0.00064086914062,10.0 0.00064086914062,10.0 c 0.0,0.0 -5.98840332031,0.0 -5.98840332031,0.0 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 5.99487304688,0.0 5.99487304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.0 0.0,-10.0 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_3" />
- </set>
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="266"
- android:propertyName="fillAlpha"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="16"
- android:propertyName="fillAlpha"
- android:valueFrom="0.0"
- android:valueTo="0.5"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml
deleted file mode 100644
index a8251dc..0000000
--- a/packages/SystemUI/res/anim/error_to_trustedstate_path_2_animation.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="283"
- android:propertyName="pathData"
- android:valueFrom="M 0.0252990722656,-2.96975708008 c 0.0,0.0 -0.00390625,0.0166320800781 -0.00390625,0.0166320800781 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -1.63500976562,0.0 -1.63500976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.01123046875,7.9296875 0.01123046875,7.9296875 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 1.63500976562,0.0 1.63500976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 0.00390625,-0.015869140625 0.00390625,-0.015869140625 c 0.0,0.0 -0.0108337402344,-7.92947387695 -0.0108337402344,-7.92947387695 Z"
- android:valueTo="M 0.0252990722656,-2.96975708008 c 0.0,0.0 -0.00390625,0.0166320800781 -0.00390625,0.0166320800781 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -1.63500976562,0.0 -1.63500976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.01123046875,7.9296875 0.01123046875,7.9296875 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 1.63500976562,0.0 1.63500976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 0.00390625,-0.015869140625 0.00390625,-0.015869140625 c 0.0,0.0 -0.0108337402344,-7.92947387695 -0.0108337402344,-7.92947387695 Z"
- android:valueType="pathType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="266"
- android:propertyName="pathData"
- android:valueFrom="M 0.0252990722656,-2.96975708008 c 0.0,0.0 -0.00390625,0.0166320800781 -0.00390625,0.0166320800781 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -1.63500976562,0.0 -1.63500976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.01123046875,7.9296875 0.01123046875,7.9296875 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 1.63500976562,0.0 1.63500976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 0.00390625,-0.015869140625 0.00390625,-0.015869140625 c 0.0,0.0 -0.0108337402344,-7.92947387695 -0.0108337402344,-7.92947387695 Z"
- android:valueTo="M -5.9959564209,-2.04727172852 c 0.0,0.0 6.01173400879,0.00039672851562 6.01173400879,0.00039672851562 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -6.01000976562,0.0 -6.01000976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.0 0.0,10.0 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 6.01000976562,0.0 6.01000976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 -6.01171875,0.0003662109375 -6.01171875,0.0003662109375 c 0.0,0.0 0.00038146972656,-9.99978637695 0.00038146972656,-9.99978637695 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_3" />
- </set>
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="266"
- android:propertyName="fillAlpha"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="16"
- android:propertyName="fillAlpha"
- android:valueFrom="0.0"
- android:valueTo="0.5"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml
deleted file mode 100644
index c1ece08..0000000
--- a/packages/SystemUI/res/anim/error_to_trustedstate_path_3_animation.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="250"
- android:propertyName="pathData"
- android:valueFrom="M 5.01239013672,3.390625 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
- android:valueTo="M 5.01239013672,3.390625 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
- android:valueType="pathType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="216"
- android:propertyName="pathData"
- android:valueFrom="M 5.01239013672,3.390625 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
- android:valueTo="M 5.00619506836,-6.046875 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_4" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/error_to_trustedstate_toppath_animation.xml b/packages/SystemUI/res/anim/error_to_trustedstate_toppath_animation.xml
deleted file mode 100644
index d9781df..0000000
--- a/packages/SystemUI/res/anim/error_to_trustedstate_toppath_animation.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="66"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,-3.0 l 0.0,0.0 c 0.5522847498,0.0 1.0,0.4477152502 1.0,1.0 l 0.0,4.0 c 0.0,0.5522847498 -0.4477152502,1.0 -1.0,1.0 l 0.0,0.0 c -0.5522847498,0.0 -1.0,-0.4477152502 -1.0,-1.0 l 0.0,-4.0 c 0.0,-0.5522847498 0.4477152502,-1.0 1.0,-1.0 Z"
- android:valueTo="M 0.0,-3.0 l 0.0,0.0 c 0.5522847498,0.0 1.0,0.4477152502 1.0,1.0 l 0.0,4.0 c 0.0,0.5522847498 -0.4477152502,1.0 -1.0,1.0 l 0.0,0.0 c -0.5522847498,0.0 -1.0,-0.4477152502 -1.0,-1.0 l 0.0,-4.0 c 0.0,-0.5522847498 0.4477152502,-1.0 1.0,-1.0 Z"
- android:valueType="pathType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="216"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,-3.0 l 0.0,0.0 c 0.5522847498,0.0 1.0,0.4477152502 1.0,1.0 l 0.0,4.0 c 0.0,0.5522847498 -0.4477152502,1.0 -1.0,1.0 l 0.0,0.0 c -0.5522847498,0.0 -1.0,-0.4477152502 -1.0,-1.0 l 0.0,-4.0 c 0.0,-0.5522847498 0.4477152502,-1.0 1.0,-1.0 Z"
- android:valueTo="M 0.0,-6.0 l 0.0,0.0 c 1.9329966243,0.0 3.5,1.5670033757 3.5,3.5 l 0.0,5.0 c 0.0,1.9329966243 -1.5670033757,3.5 -3.5,3.5 l 0.0,0.0 c -1.9329966243,0.0 -3.5,-1.5670033757 -3.5,-3.5 l 0.0,-5.0 c 0.0,-1.9329966243 1.5670033757,-3.5 3.5,-3.5 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/error_to_trustedstate_animation_interpolator_0" />
- </set>
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="283"
- android:propertyName="fillAlpha"
- android:valueFrom="1.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="16"
- android:propertyName="fillAlpha"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_bottompath_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_bottompath_animation.xml
deleted file mode 100644
index 91829c0..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_bottompath_animation.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="316"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueTo="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueType="pathType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="83"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueTo="M 0.0,-1.1 l 0.0,0.0 c 0.60751322478,0.0 1.1,0.49248677522 1.1,1.1 l 0.0,0.0 c 0.0,0.60751322478 -0.49248677522,1.1 -1.1,1.1 l 0.0,0.0 c -0.60751322478,0.0 -1.1,-0.49248677522 -1.1,-1.1 l 0.0,0.0 c 0.0,-0.60751322478 0.49248677522,-1.1 1.1,-1.1 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_5" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_circlepath_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_circlepath_animation.xml
deleted file mode 100644
index 9b08fa2..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_circlepath_animation.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="166"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="533"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_errorcircle_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_errorcircle_animation.xml
deleted file mode 100644
index 1ea2100..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_errorcircle_animation.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="150"
- android:propertyName="rotation"
- android:valueFrom="190.0"
- android:valueTo="190.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="549"
- android:propertyName="rotation"
- android:valueFrom="190.0"
- android:valueTo="-6.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_2" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_errorexclamation_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_errorexclamation_animation.xml
deleted file mode 100644
index 0b9cb95..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_errorexclamation_animation.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="200"
- android:propertyName="rotation"
- android:valueFrom="180.0"
- android:valueTo="180.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="499"
- android:propertyName="rotation"
- android:valueFrom="180.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_6" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_exclamationbottom_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_exclamationbottom_animation.xml
deleted file mode 100644
index c597b82..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_exclamationbottom_animation.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" />
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_exclamationtop_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_exclamationtop_animation.xml
deleted file mode 100644
index bde83de..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_exclamationtop_animation.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="700"
- android:propertyXName="translateX"
- android:propertyYName="translateY"
- android:pathData="M 0.0,0.0 c 0.0,-0.33333 0.0,-1.66667 0.0,-2.0"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_3" />
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_fingerprinterror_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_fingerprinterror_animation.xml
deleted file mode 100644
index a3afaef..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_fingerprinterror_animation.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="100"
- android:propertyName="rotation"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="566"
- android:propertyName="rotation"
- android:valueFrom="0.0"
- android:valueTo="-305.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_2" />
- <objectAnimator
- android:duration="1066"
- android:propertyName="rotation"
- android:valueFrom="-305.0"
- android:valueTo="-305.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_0" />
- <objectAnimator
- android:duration="800"
- android:propertyName="rotation"
- android:valueFrom="-305.0"
- android:valueTo="-720.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_0" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_fingerprintwhite_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_fingerprintwhite_animation.xml
deleted file mode 100644
index a3afaef..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_fingerprintwhite_animation.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="100"
- android:propertyName="rotation"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="566"
- android:propertyName="rotation"
- android:valueFrom="0.0"
- android:valueTo="-305.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_2" />
- <objectAnimator
- android:duration="1066"
- android:propertyName="rotation"
- android:valueFrom="-305.0"
- android:valueTo="-305.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_0" />
- <objectAnimator
- android:duration="800"
- android:propertyName="rotation"
- android:valueFrom="-305.0"
- android:valueTo="-720.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_0" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_1_path_0_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_1_path_0_animation.xml
deleted file mode 100644
index 1c3a766..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_1_path_0_animation.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="133"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="100"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="100"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_1_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_1_path_animation.xml
deleted file mode 100644
index 5a9258a..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_1_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="16"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="66"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_2_path_0_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_2_path_0_animation.xml
deleted file mode 100644
index 04b8b80..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_2_path_0_animation.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="116"
- android:propertyName="trimPathEnd"
- android:valueFrom="1.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="116"
- android:propertyName="trimPathEnd"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_2" />
- </set>
- <objectAnimator
- android:duration="166"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_2" />
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_2_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_2_path_animation.xml
deleted file mode 100644
index c69001c..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_2_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="16"
- android:propertyName="trimPathEnd"
- android:valueFrom="1.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="133"
- android:propertyName="trimPathEnd"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_5_path_0_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_5_path_0_animation.xml
deleted file mode 100644
index 6fb22cd..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_5_path_0_animation.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="166"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="150"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="166"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_5_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_5_path_animation.xml
deleted file mode 100644
index 8e9a0510..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_5_path_animation.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="150"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_6_path_0_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_6_path_0_animation.xml
deleted file mode 100644
index 3ffb8f8..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_6_path_0_animation.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="250"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_0" />
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="133"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="199"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_0" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_6_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_6_path_animation.xml
deleted file mode 100644
index 3584f91..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_6_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="16"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="216"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_7_path_0_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_7_path_0_animation.xml
deleted file mode 100644
index 0d44810..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_7_path_0_animation.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="16"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="216"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
- </set>
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="133"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="199"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_7_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_7_path_animation.xml
deleted file mode 100644
index 52a5b3e..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_ridge_7_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="33"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="150"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_toerror_toppath_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_toerror_toppath_animation.xml
deleted file mode 100644
index ff7420b..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_toerror_toppath_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="200"
- android:propertyName="pathData"
- android:valueFrom="M -1.0,0.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueTo="M -1.0,0.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueType="pathType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="499"
- android:propertyName="pathData"
- android:valueFrom="M -1.0,0.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueTo="M 0.0,-3.0 l 0.0,0.0 c 0.5522847498,0.0 1.0,0.4477152502 1.0,1.0 l 0.0,4.0 c 0.0,0.5522847498 -0.4477152502,1.0 -1.0,1.0 l 0.0,0.0 c -0.5522847498,0.0 -1.0,-0.4477152502 -1.0,-1.0 l 0.0,-4.0 c 0.0,-0.5522847498 0.4477152502,-1.0 1.0,-1.0 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/ic_fingerprint_toerror_animation_interpolator_4" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_bottompath_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_bottompath_animation.xml
deleted file mode 100644
index 4bc18f2..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_bottompath_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="250"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,-1.1 l 0.0,0.0 c 0.60751322478,0.0 1.1,0.49248677522 1.1,1.1 l 0.0,0.0 c 0.0,0.60751322478 -0.49248677522,1.1 -1.1,1.1 l 0.0,0.0 c -0.60751322478,0.0 -1.1,-0.49248677522 -1.1,-1.1 l 0.0,0.0 c 0.0,-0.60751322478 0.49248677522,-1.1 1.1,-1.1 Z"
- android:valueTo="M 0.0,-1.1 l 0.0,0.0 c 0.60751322478,0.0 1.1,0.49248677522 1.1,1.1 l 0.0,0.0 c 0.0,0.60751322478 -0.49248677522,1.1 -1.1,1.1 l 0.0,0.0 c -0.60751322478,0.0 -1.1,-0.49248677522 -1.1,-1.1 l 0.0,0.0 c 0.0,-0.60751322478 0.49248677522,-1.1 1.1,-1.1 Z"
- android:valueType="pathType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="150"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,-1.1 l 0.0,0.0 c 0.60751322478,0.0 1.1,0.49248677522 1.1,1.1 l 0.0,0.0 c 0.0,0.60751322478 -0.49248677522,1.1 -1.1,1.1 l 0.0,0.0 c -0.60751322478,0.0 -1.1,-0.49248677522 -1.1,-1.1 l 0.0,0.0 c 0.0,-0.60751322478 0.49248677522,-1.1 1.1,-1.1 Z"
- android:valueTo="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/ic_fingerprint_tofp_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_circlepath_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_circlepath_animation.xml
deleted file mode 100644
index 9273b9a..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_circlepath_animation.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="383"
- android:propertyName="trimPathEnd"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_tofp_animation_interpolator_4" />
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_errorcircle_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_errorcircle_animation.xml
deleted file mode 100644
index 062c6a0..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_errorcircle_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="33"
- android:propertyName="rotation"
- android:valueFrom="10.0"
- android:valueTo="10.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="366"
- android:propertyName="rotation"
- android:valueFrom="10.0"
- android:valueTo="-180.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_tofp_animation_interpolator_2" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_errorexclamation_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_errorexclamation_animation.xml
deleted file mode 100644
index 5d4b268..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_errorexclamation_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="33"
- android:propertyName="rotation"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="416"
- android:propertyName="rotation"
- android:valueFrom="0.0"
- android:valueTo="-180.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_tofp_animation_interpolator_5" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_exclamationbottom_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_exclamationbottom_animation.xml
deleted file mode 100644
index d3d7d1c..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_exclamationbottom_animation.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="450"
- android:propertyXName="translateX"
- android:propertyYName="translateY"
- android:pathData="M 0.0,4.0 c 0.0,-0.66667 0.0,-3.33333 0.0,-4.0"
- android:interpolator="@interpolator/ic_fingerprint_tofp_animation_interpolator_0" />
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_exclamationtop_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_exclamationtop_animation.xml
deleted file mode 100644
index 04b6868..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_exclamationtop_animation.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="450"
- android:propertyXName="translateX"
- android:propertyYName="translateY"
- android:pathData="M 0.0,-2.0 c 0.0,0.33333 0.0,1.66667 0.0,2.0"
- android:interpolator="@interpolator/ic_fingerprint_tofp_animation_interpolator_3" />
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_fingerprintwhite_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_fingerprintwhite_animation.xml
deleted file mode 100644
index 25f2c43..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_fingerprintwhite_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="200"
- android:propertyName="rotation"
- android:valueFrom="180.0"
- android:valueTo="180.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="499"
- android:propertyName="rotation"
- android:valueFrom="180.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/ic_fingerprint_tofp_animation_interpolator_2" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_1_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_1_path_animation.xml
deleted file mode 100644
index 4a6f39a..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_1_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="416"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="116"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_2_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_2_path_animation.xml
deleted file mode 100644
index c9a9f64..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_2_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="350"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="116"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_5_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_5_path_animation.xml
deleted file mode 100644
index 43e44cf..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_5_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="350"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="350"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_6_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_6_path_animation.xml
deleted file mode 100644
index 04a6036..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_6_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="250"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="250"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_7_path_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_7_path_animation.xml
deleted file mode 100644
index 031c5e6..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_ridge_7_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="266"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="433"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/ic_fingerprint_tofp_toppath_animation.xml b/packages/SystemUI/res/anim/ic_fingerprint_tofp_toppath_animation.xml
deleted file mode 100644
index 9b3498f..0000000
--- a/packages/SystemUI/res/anim/ic_fingerprint_tofp_toppath_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="200"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,-3.0 l 0.0,0.0 c 0.5522847498,0.0 1.0,0.4477152502 1.0,1.0 l 0.0,4.0 c 0.0,0.5522847498 -0.4477152502,1.0 -1.0,1.0 l 0.0,0.0 c -0.5522847498,0.0 -1.0,-0.4477152502 -1.0,-1.0 l 0.0,-4.0 c 0.0,-0.5522847498 0.4477152502,-1.0 1.0,-1.0 Z"
- android:valueTo="M 0.0,-3.0 l 0.0,0.0 c 0.5522847498,0.0 1.0,0.4477152502 1.0,1.0 l 0.0,4.0 c 0.0,0.5522847498 -0.4477152502,1.0 -1.0,1.0 l 0.0,0.0 c -0.5522847498,0.0 -1.0,-0.4477152502 -1.0,-1.0 l 0.0,-4.0 c 0.0,-0.5522847498 0.4477152502,-1.0 1.0,-1.0 Z"
- android:valueType="pathType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="250"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,-3.0 l 0.0,0.0 c 0.5522847498,0.0 1.0,0.4477152502 1.0,1.0 l 0.0,4.0 c 0.0,0.5522847498 -0.4477152502,1.0 -1.0,1.0 l 0.0,0.0 c -0.5522847498,0.0 -1.0,-0.4477152502 -1.0,-1.0 l 0.0,-4.0 c 0.0,-0.5522847498 0.4477152502,-1.0 1.0,-1.0 Z"
- android:valueTo="M -1.0,0.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/ic_fingerprint_tofp_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_1_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_1_path_animation.xml
deleted file mode 100644
index 18bc8a2..0000000
--- a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_1_path_animation.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ 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
- -->
-
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="60"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="216"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/lockscreen_fingerprint_draw_off_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_2_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_2_path_animation.xml
deleted file mode 100644
index 531fac0..0000000
--- a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_2_path_animation.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ 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
- -->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="140"
- android:propertyName="trimPathEnd"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/lockscreen_fingerprint_draw_off_animation_interpolator_0" />
-</set>
diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_5_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_5_path_animation.xml
deleted file mode 100644
index 87c7f21..0000000
--- a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_5_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ 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
- -->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="20"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="180"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/lockscreen_fingerprint_draw_off_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_6_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_6_path_animation.xml
deleted file mode 100644
index e0a66d9..0000000
--- a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_6_path_animation.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ 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
- -->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="190"
- android:propertyName="trimPathEnd"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/lockscreen_fingerprint_draw_off_animation_interpolator_1" />
-</set>
diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_7_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_7_path_animation.xml
deleted file mode 100644
index 9b0e17b..0000000
--- a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_off_ridge_7_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ 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
- -->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="10"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="160"
- android:propertyName="trimPathStart"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/lockscreen_fingerprint_draw_off_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_1_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_1_path_animation.xml
deleted file mode 100644
index eb323f5..0000000
--- a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_1_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ 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
- -->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="316"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="383"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/lockscreen_fingerprint_draw_on_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_2_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_2_path_animation.xml
deleted file mode 100644
index cae4a70..0000000
--- a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_2_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ 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
- -->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="216"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="400"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/lockscreen_fingerprint_draw_on_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_5_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_5_path_animation.xml
deleted file mode 100644
index 0be6c9e..0000000
--- a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_5_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ 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
- -->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="33"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="383"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/lockscreen_fingerprint_draw_on_animation_interpolator_0" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_6_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_6_path_animation.xml
deleted file mode 100644
index 5d2cdb6..0000000
--- a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_6_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ 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
- -->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="50"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="549"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/lockscreen_fingerprint_draw_on_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_7_path_animation.xml b/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_7_path_animation.xml
deleted file mode 100644
index 6f8b559..0000000
--- a/packages/SystemUI/res/anim/lockscreen_fingerprint_draw_on_ridge_7_path_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ 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
- -->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="83"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="483"
- android:propertyName="trimPathEnd"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/lockscreen_fingerprint_draw_on_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_bottompath_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_bottompath_animation.xml
deleted file mode 100644
index 7a01896..0000000
--- a/packages/SystemUI/res/anim/trusted_state_to_error_bottompath_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="200"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueTo="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueType="pathType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="149"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueTo="M 0.0,-1.1 l 0.0,0.0 c 0.60751322478,0.0 1.1,0.49248677522 1.1,1.1 l 0.0,0.0 c 0.0,0.60751322478 -0.49248677522,1.1 -1.1,1.1 l 0.0,0.0 c -0.60751322478,0.0 -1.1,-0.49248677522 -1.1,-1.1 l 0.0,0.0 c 0.0,-0.60751322478 0.49248677522,-1.1 1.1,-1.1 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_0" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_circlepath_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_circlepath_animation.xml
deleted file mode 100644
index ac5e448..0000000
--- a/packages/SystemUI/res/anim/trusted_state_to_error_circlepath_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="100"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="450"
- android:propertyName="trimPathStart"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/fast_out_slow_in" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_1_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_1_animation.xml
deleted file mode 100644
index 6697316..0000000
--- a/packages/SystemUI/res/anim/trusted_state_to_error_ellipse_path_1_animation.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="200"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,-1.988645 c 1.09829830627,0.0 1.988645,0.890346693734 1.988645,1.988645 c 0.0,1.09829830627 -0.890346693734,1.988645 -1.988645,1.988645 c -1.09829830627,0.0 -1.988645,-0.890346693734 -1.988645,-1.988645 c 0.0,-1.09829830627 0.890346693734,-1.988645 1.988645,-1.988645 Z"
- android:valueTo="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_0" />
-</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_errorcircle_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_errorcircle_animation.xml
deleted file mode 100644
index 903d97e..0000000
--- a/packages/SystemUI/res/anim/trusted_state_to_error_errorcircle_animation.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="50"
- android:propertyName="rotation"
- android:valueFrom="184.0"
- android:valueTo="184.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="450"
- android:propertyName="rotation"
- android:valueFrom="184.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_1" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_errorexclamationdot_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_errorexclamationdot_animation.xml
deleted file mode 100644
index c5339a0..0000000
--- a/packages/SystemUI/res/anim/trusted_state_to_error_errorexclamationdot_animation.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="550"
- android:propertyXName="translateX"
- android:propertyYName="translateY"
- android:pathData="M 12.0,8.0 c 0.0,0.66667 0.0,3.33333 0.0,4.0"
- android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_3" />
-</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_exclamationtop_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_exclamationtop_animation.xml
deleted file mode 100644
index c5b2c12..0000000
--- a/packages/SystemUI/res/anim/trusted_state_to_error_exclamationtop_animation.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <objectAnimator
- android:duration="500"
- android:propertyXName="translateX"
- android:propertyYName="translateY"
- android:pathData="M 0.0,2.5 c 0.0,-0.75 0.0,-3.75 0.0,-4.5"
- android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_4" />
-</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml
deleted file mode 100644
index 63a25d9..0000000
--- a/packages/SystemUI/res/anim/trusted_state_to_error_lock_top_animation.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="150"
- android:propertyName="scaleX"
- android:valueFrom="1.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="16"
- android:propertyName="scaleX"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="150"
- android:propertyName="scaleY"
- android:valueFrom="1.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="16"
- android:propertyName="scaleY"
- android:valueFrom="1.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml
deleted file mode 100644
index 547f42e..0000000
--- a/packages/SystemUI/res/anim/trusted_state_to_error_path_1_animation.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="200"
- android:propertyName="pathData"
- android:valueFrom="M 6.00561523438,-4.046875 c 0.0,0.0 -5.98999023438,0.0 -5.98999023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 5.98812866211,0.0 5.98812866211,0.0 c 0.0,0.0 0.00064086914062,10.0 0.00064086914062,10.0 c 0.0,0.0 -5.98840332031,0.0 -5.98840332031,0.0 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 5.99487304688,0.0 5.99487304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.0 0.0,-10.0 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
- android:valueTo="M 1.63623046875,-4.953125 c 0.0,0.0 -1.61499023438,0.0 -1.61499023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 0.00064086914062,10.625 0.00064086914062,10.625 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 1.61987304688,0.0 1.61987304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.625 0.0,-10.625 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_0" />
- <objectAnimator
- android:duration="149"
- android:propertyName="pathData"
- android:valueFrom="M 1.63623046875,-4.953125 c 0.0,0.0 -1.61499023438,0.0 -1.61499023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 0.00064086914062,10.625 0.00064086914062,10.625 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 1.61987304688,0.0 1.61987304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.625 0.0,-10.625 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
- android:valueTo="M 0.02685546875,-4.96875 c 0.0,0.0 -0.005615234375,0.015625 -0.005615234375,0.015625 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 -0.00936889648438,3.9296875 -0.00936889648438,3.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0028076171875,0.0234375 -0.0028076171875,0.0234375 c 0.0,0.0 0.010498046875,-0.015625 0.010498046875,-0.015625 c 0.0,0.0 0.985595703125,0.0078125 0.985595703125,0.0078125 c 0.0,0.0 0.017578125,-6.015625 0.017578125,-6.015625 c 0.0,0.0 0.104400634766,0.0546875 -0.99560546875,0.0546875 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_5" />
- </set>
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="183"
- android:propertyName="fillAlpha"
- android:valueFrom="0.5"
- android:valueTo="0.5"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="16"
- android:propertyName="fillAlpha"
- android:valueFrom="0.5"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml
deleted file mode 100644
index e5fe4d1..0000000
--- a/packages/SystemUI/res/anim/trusted_state_to_error_path_2_animation.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="200"
- android:propertyName="pathData"
- android:valueFrom="M -5.9959564209,-2.04727172852 c 0.0,0.0 6.01173400879,0.00039672851562 6.01173400879,0.00039672851562 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -6.01000976562,0.0 -6.01000976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.0 0.0,10.0 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 6.01000976562,0.0 6.01000976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 -6.01171875,0.0003662109375 -6.01171875,0.0003662109375 c 0.0,0.0 0.00038146972656,-9.99978637695 0.00038146972656,-9.99978637695 Z"
- android:valueTo="M 0.0252990722656,-2.96975708008 c 0.0,0.0 -0.00390625,0.0166320800781 -0.00390625,0.0166320800781 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -1.63500976562,0.0 -1.63500976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.625 0.0,10.625 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 1.63500976562,0.0 1.63500976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 0.00390625,-0.015869140625 0.00390625,-0.015869140625 c 0.0,0.0 0.00039672851562,-10.624786377 0.00039672851562,-10.624786377 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_0" />
- <objectAnimator
- android:duration="149"
- android:propertyName="pathData"
- android:valueFrom="M 0.0252990722656,-2.96975708008 c 0.0,0.0 -0.00390625,0.0166320800781 -0.00390625,0.0166320800781 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -1.63500976562,0.0 -1.63500976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.625 0.0,10.625 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 1.63500976562,0.0 1.63500976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 0.00390625,-0.015869140625 0.00390625,-0.015869140625 c 0.0,0.0 0.00039672851562,-10.624786377 0.00039672851562,-10.624786377 Z"
- android:valueTo="M 0.0252990722656,-2.96914672852 c 0.0,0.0 -0.00390625,0.0160217285156 -0.00390625,0.0160217285156 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 0.005615234375,-0.015625 0.005615234375,-0.015625 c -1.10000610352,0.0 -1.01220703125,-0.0546875 -1.01220703125,-0.0546875 c 0.0,0.0 -0.017578125,6.015625 -0.017578125,6.015625 c 0.0,0.0 -0.0777893066406,-0.0078125 1.02221679688,-0.0078125 c 0.0,0.0 -0.005615234375,0.015625 -0.005615234375,0.015625 c 0.0,0.0 -0.002685546875,-0.0244140625 -0.002685546875,-0.0244140625 c 0.0,0.0 0.00390625,-0.0152587890625 0.00390625,-0.0152587890625 c 0.0,0.0 0.0104064941406,-3.92947387695 0.0104064941406,-3.92947387695 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_5" />
- </set>
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="183"
- android:propertyName="fillAlpha"
- android:valueFrom="0.5"
- android:valueTo="0.5"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="16"
- android:propertyName="fillAlpha"
- android:valueFrom="0.5"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml
deleted file mode 100644
index 455d0b8..0000000
--- a/packages/SystemUI/res/anim/trusted_state_to_error_path_3_animation.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="50"
- android:propertyName="pathData"
- android:valueFrom="M 5.00619506836,-6.046875 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
- android:valueTo="M 5.00619506836,-6.046875 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
- android:valueType="pathType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="150"
- android:propertyName="pathData"
- android:valueFrom="M 5.00619506836,-6.046875 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
- android:valueTo="M 5.01239013672,3.390625 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_0" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/anim/trusted_state_to_error_toppath_animation.xml b/packages/SystemUI/res/anim/trusted_state_to_error_toppath_animation.xml
deleted file mode 100644
index b2944e5..0000000
--- a/packages/SystemUI/res/anim/trusted_state_to_error_toppath_animation.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<set
- xmlns:android="http://schemas.android.com/apk/res/android" >
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="200"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 1.9329966243,0.0 3.5,1.5670033757 3.5,3.5 l 0.0,7.0 c 0.0,1.9329966243 -1.5670033757,3.5 -3.5,3.5 l 0.0,0.0 c -1.9329966243,0.0 -3.5,-1.5670033757 -3.5,-3.5 l 0.0,-7.0 c 0.0,-1.9329966243 1.5670033757,-3.5 3.5,-3.5 Z"
- android:valueTo="M 0.0,-7.0 l 0.0,0.0 c 1.9329966243,0.0 3.5,1.5670033757 3.5,3.5 l 0.0,7.0 c 0.0,1.9329966243 -1.5670033757,3.5 -3.5,3.5 l 0.0,0.0 c -1.9329966243,0.0 -3.5,-1.5670033757 -3.5,-3.5 l 0.0,-7.0 c 0.0,-1.9329966243 1.5670033757,-3.5 3.5,-3.5 Z"
- android:valueType="pathType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="300"
- android:propertyName="pathData"
- android:valueFrom="M 0.0,-7.0 l 0.0,0.0 c 1.9329966243,0.0 3.5,1.5670033757 3.5,3.5 l 0.0,7.0 c 0.0,1.9329966243 -1.5670033757,3.5 -3.5,3.5 l 0.0,0.0 c -1.9329966243,0.0 -3.5,-1.5670033757 -3.5,-3.5 l 0.0,-7.0 c 0.0,-1.9329966243 1.5670033757,-3.5 3.5,-3.5 Z"
- android:valueTo="M 0.0,-3.0 l 0.0,0.0 c 0.5522847498,0.0 1.0,0.4477152502 1.0,1.0 l 0.0,4.0 c 0.0,0.5522847498 -0.4477152502,1.0 -1.0,1.0 l 0.0,0.0 c -0.5522847498,0.0 -1.0,-0.4477152502 -1.0,-1.0 l 0.0,-4.0 c 0.0,-0.5522847498 0.4477152502,-1.0 1.0,-1.0 Z"
- android:valueType="pathType"
- android:interpolator="@interpolator/trusted_state_to_error_animation_interpolator_2" />
- </set>
- <set
- android:ordering="sequentially" >
- <objectAnimator
- android:duration="183"
- android:propertyName="fillAlpha"
- android:valueFrom="0.0"
- android:valueTo="0.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- <objectAnimator
- android:duration="16"
- android:propertyName="fillAlpha"
- android:valueFrom="0.0"
- android:valueTo="1.0"
- android:valueType="floatType"
- android:interpolator="@android:interpolator/linear" />
- </set>
-</set>
diff --git a/packages/SystemUI/res/drawable/error_to_trustedstate.xml b/packages/SystemUI/res/drawable/error_to_trustedstate.xml
deleted file mode 100755
index bc196c9..0000000
--- a/packages/SystemUI/res/drawable/error_to_trustedstate.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:name="error_to_trustedstate"
- android:width="24dp"
- android:viewportWidth="24"
- android:height="24dp"
- android:viewportHeight="24" >
- <group
- android:name="lock"
- android:translateX="12"
- android:translateY="12" >
- <group
- android:name="middle_ellipse"
- android:translateY="2.9375" >
- <path
- android:name="ellipse_path_1"
- android:fillColor="?attr/wallpaperTextColor"
- android:fillAlpha="0.5"
- android:pathData="M 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />
- </group>
- <group
- android:name="lock_right_side" >
- <path
- android:name="path_1"
- android:pathData="M 1.63623046875,-4.953125 c 0.0,0.0 -1.61499023438,0.0 -1.61499023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 0.00375366210938,-0.015625 0.00375366210938,-0.015625 c 0.0,0.0 0.0118713378906,7.9296875 0.0118713378906,7.9296875 c 0.0,0.0 -0.0040283203125,0.015625 -0.0040283203125,0.015625 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 1.61987304688,0.0 1.61987304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 -0.01123046875,-7.9296875 -0.01123046875,-7.9296875 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
- android:fillColor="?attr/wallpaperTextColor"
- android:fillAlpha="0.5" />
- </group>
- <group
- android:name="lock_left_side" >
- <path
- android:name="path_2"
- android:pathData="M 0.0252990722656,-2.96975708008 c 0.0,0.0 -0.00390625,0.0166320800781 -0.00390625,0.0166320800781 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -1.63500976562,0.0 -1.63500976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.01123046875,7.9296875 0.01123046875,7.9296875 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 1.63500976562,0.0 1.63500976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 0.00390625,-0.015869140625 0.00390625,-0.015869140625 c 0.0,0.0 -0.0108337402344,-7.92947387695 -0.0108337402344,-7.92947387695 Z"
- android:fillColor="?attr/wallpaperTextColor"
- android:fillAlpha="0.5" />
- </group>
- <group
- android:name="lock_top"
- android:scaleX="0"
- android:scaleY="0" >
- <path
- android:name="path_3"
- android:pathData="M 5.01239013672,3.390625 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
- android:fillColor="?attr/wallpaperTextColor"
- android:fillAlpha="0.5" />
- </group>
- </group>
- <group
- android:name="errorexclamationdot"
- android:translateX="12"
- android:translateY="12" >
- <group
- android:name="exclamationbottom"
- android:translateY="4" >
- <path
- android:name="bottompath"
- android:fillColor="?android:attr/colorError"
- android:pathData="M 0.0,-1.1 l 0.0,0.0 c 0.60751322478,0.0 1.1,0.49248677522 1.1,1.1 l 0.0,0.0 c 0.0,0.60751322478 -0.49248677522,1.1 -1.1,1.1 l 0.0,0.0 c -0.60751322478,0.0 -1.1,-0.49248677522 -1.1,-1.1 l 0.0,0.0 c 0.0,-0.60751322478 0.49248677522,-1.1 1.1,-1.1 Z" />
- </group>
- </group>
- <group
- android:name="errorexclamation"
- android:translateX="12"
- android:translateY="12" >
- <group
- android:name="exclamationtop"
- android:translateY="-2" >
- <path
- android:name="toppath"
- android:fillColor="?android:attr/colorError"
- android:pathData="M 0.0,-3.0 l 0.0,0.0 c 0.5522847498,0.0 1.0,0.4477152502 1.0,1.0 l 0.0,4.0 c 0.0,0.5522847498 -0.4477152502,1.0 -1.0,1.0 l 0.0,0.0 c -0.5522847498,0.0 -1.0,-0.4477152502 -1.0,-1.0 l 0.0,-4.0 c 0.0,-0.5522847498 0.4477152502,-1.0 1.0,-1.0 Z" />
- </group>
- </group>
- <group
- android:name="errorcircle"
- android:translateX="12"
- android:translateY="12"
- android:rotation="5" >
- <group
- android:name="circle" >
- <path
- android:name="circlepath"
- android:strokeColor="?android:attr/colorError"
- android:strokeWidth="2"
- android:strokeLineCap="round"
- android:pathData="M 0.0,-9.0 c 4.9705627482,0.0 9.0,4.0294372518 9.0,9.0 c 0.0,4.9705627482 -4.0294372518,9.0 -9.0,9.0 c -4.9705627482,0.0 -9.0,-4.0294372518 -9.0,-9.0 c 0.0,-4.9705627482 4.0294372518,-9.0 9.0,-9.0 Z" />
- </group>
- </group>
-</vector>
diff --git a/packages/SystemUI/res/drawable/error_to_trustedstate_animation.xml b/packages/SystemUI/res/drawable/error_to_trustedstate_animation.xml
deleted file mode 100755
index a494f1d..0000000
--- a/packages/SystemUI/res/drawable/error_to_trustedstate_animation.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<animated-vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:drawable="@drawable/error_to_trustedstate" >
- <target
- android:name="ellipse_path_1"
- android:animation="@anim/error_to_trustedstate_ellipse_path_1_animation" />
- <target
- android:name="path_1"
- android:animation="@anim/error_to_trustedstate_path_1_animation" />
- <target
- android:name="path_2"
- android:animation="@anim/error_to_trustedstate_path_2_animation" />
- <target
- android:name="lock_top"
- android:animation="@anim/error_to_trustedstate_lock_top_animation" />
- <target
- android:name="path_3"
- android:animation="@anim/error_to_trustedstate_path_3_animation" />
- <target
- android:name="errorexclamationdot"
- android:animation="@anim/error_to_trustedstate_errorexclamationdot_animation" />
- <target
- android:name="bottompath"
- android:animation="@anim/error_to_trustedstate_bottompath_animation" />
- <target
- android:name="exclamationtop"
- android:animation="@anim/error_to_trustedstate_exclamationtop_animation" />
- <target
- android:name="toppath"
- android:animation="@anim/error_to_trustedstate_toppath_animation" />
- <target
- android:name="errorcircle"
- android:animation="@anim/error_to_trustedstate_errorcircle_animation" />
- <target
- android:name="circlepath"
- android:animation="@anim/error_to_trustedstate_circlepath_animation" />
-</animated-vector>
diff --git a/packages/SystemUI/res/drawable/ic_face_unlock.xml b/packages/SystemUI/res/drawable/ic_face_unlock.xml
deleted file mode 100644
index b302ed4..0000000
--- a/packages/SystemUI/res/drawable/ic_face_unlock.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
- ~ Copyright (C) 2018 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
- -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
- <path android:fillColor="?attr/wallpaperTextColor"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeWidth="1"
- android:pathData="M9,11.75C8.31,11.75 7.75,12.31 7.75,13C7.75,13.69 8.31,14.25 9,14.25C9.69,14.25 10.25,13.69 10.25,13C10.25,12.31 9.69,11.75 9,11.75ZM15,11.75C14.31,11.75 13.75,12.31 13.75,13C13.75,13.69 14.31,14.25 15,14.25C15.69,14.25 16.25,13.69 16.25,13C16.25,12.31 15.69,11.75 15,11.75ZM12,2C6.48,2 2,6.48 2,12C2,17.52 6.48,22 12,22C17.52,22 22,17.52 22,12C22,6.48 17.52,2 12,2ZM12,20C7.59,20 4,16.41 4,12C4,11.71 4.02,11.42 4.05,11.14C6.41,10.09 8.28,8.16 9.26,5.77C11.07,8.33 14.05,10 17.42,10C18.2,10 18.95,9.91 19.67,9.74C19.88,10.45 20,11.21 20,12C20,16.41 16.41,20 12,20Z"
- />
-</vector>
diff --git a/packages/SystemUI/res/drawable/ic_fingerprint_error.xml b/packages/SystemUI/res/drawable/ic_fingerprint_error.xml
deleted file mode 100644
index a7fb1a1..0000000
--- a/packages/SystemUI/res/drawable/ic_fingerprint_error.xml
+++ /dev/null
@@ -1,30 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="32.0dp"
- android:height="32.0dp"
- android:viewportWidth="32.0"
- android:viewportHeight="32.0">
- <path
- android:fillColor="?android:attr/colorError"
- android:pathData="M15.99,2.5C8.53,2.5 2.5,8.54 2.5,16.0s6.03,13.5 13.49,13.5S29.5,23.46 29.5,16.0S23.45,2.5 15.99,2.5zM16.0,26.8c-5.97,0.0 -10.8,-4.83 -10.8,-10.8S10.03,5.2 16.0,5.2S26.8,10.03 26.8,16.0S21.97,26.8 16.0,26.8z"/>
- <path
- android:fillColor="?android:attr/colorError"
- android:pathData="M14.65,20.05l2.7,0.0l0.0,2.7l-2.7,0.0z"/>
- <path
- android:fillColor="?android:attr/colorError"
- android:pathData="M14.65,9.25l2.7,0.0l0.0,8.1l-2.7,0.0z"/>
-</vector>
diff --git a/packages/SystemUI/res/drawable/ic_lock.xml b/packages/SystemUI/res/drawable/ic_lock.xml
deleted file mode 100644
index 3fb8c8d..0000000
--- a/packages/SystemUI/res/drawable/ic_lock.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- ~ Copyright (C) 2018 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
- -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="32dp"
- android:height="32dp"
- android:viewportWidth="32.0"
- android:viewportHeight="32.0">
- <path
- android:pathData="M20.25,6.89C20.25,4.62 18.36,2.75 16,2.75C13.64,2.75 11.75,4.62 11.75,6.89V11.25H20.25V6.89ZM21.75,11.25V6.89C21.75,3.76 19.16,1.25 16,1.25C12.84,1.25 10.25,3.76 10.25,6.89V11.25H10C8.48,11.25 7.25,12.48 7.25,14V26C7.25,27.52 8.48,28.75 10,28.75H22C23.52,28.75 24.75,27.52 24.75,26V14C24.75,12.48 23.52,11.25 22,11.25H21.75ZM10,12.75C9.31,12.75 8.75,13.31 8.75,14V26C8.75,26.69 9.31,27.25 10,27.25H22C22.69,27.25 23.25,26.69 23.25,26V14C23.25,13.31 22.69,12.75 22,12.75H10ZM18,20C18,21.1 17.1,22 16,22C14.9,22 14,21.1 14,20C14,18.9 14.9,18 16,18C17.1,18 18,18.9 18,20Z"
- android:fillType="evenOdd"
- android:fillColor="?attr/wallpaperTextColor"/>
-</vector>
diff --git a/packages/SystemUI/res/drawable/ic_lock_open.xml b/packages/SystemUI/res/drawable/ic_lock_open.xml
deleted file mode 100644
index 12a811c..0000000
--- a/packages/SystemUI/res/drawable/ic_lock_open.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
- ~ Copyright (C) 2018 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
- -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="32dp"
- android:height="32dp"
- android:viewportWidth="32.0"
- android:viewportHeight="32.0">
- <path
- android:pathData="M21.75,6.89C21.75,4.62 23.64,2.75 26,2.75C28.36,2.75 30.25,4.62 30.25,6.89V12H31.75V6.89C31.75,3.76 29.16,1.25 26,1.25C22.84,1.25 20.25,3.76 20.25,6.89V11.25H10C8.48,11.25 7.25,12.48 7.25,14V26C7.25,27.52 8.48,28.75 10,28.75H22C23.52,28.75 24.75,27.52 24.75,26V14C24.75,12.48 23.52,11.25 22,11.25H21.75V6.89ZM10,12.75C9.31,12.75 8.75,13.31 8.75,14V26C8.75,26.69 9.31,27.25 10,27.25H22C22.69,27.25 23.25,26.69 23.25,26V14C23.25,13.31 22.69,12.75 22,12.75H10ZM18,20C18,21.1 17.1,22 16,22C14.9,22 14,21.1 14,20C14,18.9 14.9,18 16,18C17.1,18 18,18.9 18,20Z"
- android:fillType="evenOdd"
- android:fillColor="?attr/wallpaperTextColor"/>
-</vector>
diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_off.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_off.xml
deleted file mode 100644
index 8d382a3..0000000
--- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_off.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2017 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
- -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:name="lockscreen_fingerprint_draw_off"
- android:width="32dp"
- android:viewportWidth="32"
- android:height="32dp"
- android:viewportHeight="32" >
- <group
- android:name="white_fingerprint_ridges"
- android:translateX="16.125"
- android:translateY="19.75" >
- <group
- android:name="white_fingerprint_ridges_pivot"
- android:translateX="33.2085"
- android:translateY="30.91685" >
- <group
- android:name="ridge_5" >
- <path
- android:name="ridge_5_path"
- android:pathData="M -25.3591003418,-24.4138946533 c -0.569000244141,0.106399536133 -1.12660217285,0.140594482422 -1.45460510254,0.140594482422 c -1.29689025879,0.0 -2.53239440918,-0.343307495117 -3.62019348145,-1.12400817871 c -1.67700195312,-1.20349121094 -2.76950073242,-3.17008972168 -2.76950073242,-5.39189147949"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round" />
- </group>
- <group
- android:name="ridge_4" >
- <path
- android:name="ridge_7_path"
- android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round" />
- </group>
- <group
- android:name="ridge_3" >
- <path
- android:name="ridge_6_path"
- android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round" />
- </group>
- <group
- android:name="ridge_2" >
- <path
- android:name="ridge_2_path"
- android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round" />
- </group>
- <group
- android:name="ridge_1"
- android:translateX="-97.5"
- android:translateY="-142.5" >
- <path
- android:name="ridge_1_path"
- android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round" />
- </group>
- </group>
- </group>
-</vector>
diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_off_animation.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_off_animation.xml
deleted file mode 100644
index 1599577..0000000
--- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_off_animation.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ 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
- -->
-<animated-vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:drawable="@drawable/lockscreen_fingerprint_draw_off" >
- <target
- android:name="ridge_5_path"
- android:animation="@anim/lockscreen_fingerprint_draw_off_ridge_5_path_animation" />
- <target
- android:name="ridge_7_path"
- android:animation="@anim/lockscreen_fingerprint_draw_off_ridge_7_path_animation" />
- <target
- android:name="ridge_6_path"
- android:animation="@anim/lockscreen_fingerprint_draw_off_ridge_6_path_animation" />
- <target
- android:name="ridge_2_path"
- android:animation="@anim/lockscreen_fingerprint_draw_off_ridge_2_path_animation" />
- <target
- android:name="ridge_1_path"
- android:animation="@anim/lockscreen_fingerprint_draw_off_ridge_1_path_animation" />
-</animated-vector>
diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_on.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_on.xml
deleted file mode 100644
index 4fe160d..0000000
--- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_on.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2017 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
- -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:name="lockscreen_fingerprint_draw_on"
- android:width="32dp"
- android:viewportWidth="32"
- android:height="32dp"
- android:viewportHeight="32" >
- <group
- android:name="white_fingerprint_ridges"
- android:translateX="16.125"
- android:translateY="19.75" >
- <group
- android:name="white_fingerprint_ridges_pivot"
- android:translateX="33.2085"
- android:translateY="30.91685" >
- <group
- android:name="ridge_5" >
- <path
- android:name="ridge_5_path"
- android:pathData="M -25.3591003418,-24.4138946533 c -0.569000244141,0.106399536133 -1.12660217285,0.140594482422 -1.45460510254,0.140594482422 c -1.29689025879,0.0 -2.53239440918,-0.343307495117 -3.62019348145,-1.12400817871 c -1.67700195312,-1.20349121094 -2.76950073242,-3.17008972168 -2.76950073242,-5.39189147949"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathEnd="0" />
- </group>
- <group
- android:name="ridge_4" >
- <path
- android:name="ridge_7_path"
- android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathEnd="0" />
- </group>
- <group
- android:name="ridge_3" >
- <path
- android:name="ridge_6_path"
- android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathStart="1" />
- </group>
- <group
- android:name="ridge_2" >
- <path
- android:name="ridge_2_path"
- android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathStart="1" />
- </group>
- <group
- android:name="ridge_1"
- android:translateX="-97.5"
- android:translateY="-142.5" >
- <path
- android:name="ridge_1_path"
- android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathEnd="0" />
- </group>
- </group>
- </group>
-</vector>
diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_on_animation.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_on_animation.xml
deleted file mode 100644
index d1aac02..0000000
--- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_draw_on_animation.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ 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
- -->
-<animated-vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:drawable="@drawable/lockscreen_fingerprint_draw_on" >
- <target
- android:name="ridge_5_path"
- android:animation="@anim/lockscreen_fingerprint_draw_on_ridge_5_path_animation" />
- <target
- android:name="ridge_7_path"
- android:animation="@anim/lockscreen_fingerprint_draw_on_ridge_7_path_animation" />
- <target
- android:name="ridge_6_path"
- android:animation="@anim/lockscreen_fingerprint_draw_on_ridge_6_path_animation" />
- <target
- android:name="ridge_2_path"
- android:animation="@anim/lockscreen_fingerprint_draw_on_ridge_2_path_animation" />
- <target
- android:name="ridge_1_path"
- android:animation="@anim/lockscreen_fingerprint_draw_on_ridge_1_path_animation" />
-</animated-vector>
diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml
deleted file mode 100644
index 832716a..0000000
--- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- ~ Copyright (C) 2017 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
- -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:name="ic_fingerprint_tofp"
- android:width="32dp"
- android:viewportWidth="24"
- android:height="32dp"
- android:viewportHeight="24" >
- <group
- android:name="fingerprintwhite"
- android:translateX="12"
- android:translateY="12.4"
- android:scaleX="0.738"
- android:scaleY="0.738"
- android:rotation="180" >
- <group
- android:name="fingerprintwhite_pivot"
- android:translateX="33"
- android:translateY="34" >
- <group
- android:name="ridge_5" >
- <path
- android:name="ridge_5_path"
- android:pathData="M -25.3591003418,-24.4138946533 c -0.569000244141,0.106399536133 -1.12660217285,0.140594482422 -1.45460510254,0.140594482422 c -1.29689025879,0.0 -2.53239440918,-0.343307495117 -3.62019348145,-1.12400817871 c -1.67700195312,-1.20349121094 -2.76950073242,-3.17008972168 -2.76950073242,-5.39189147949"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathEnd="0" />
- </group>
- <group
- android:name="ridge_4" >
- <path
- android:name="ridge_7_path"
- android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathEnd="0" />
- </group>
- <group
- android:name="ridge_3" >
- <path
- android:name="ridge_6_path"
- android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathStart="1" />
- </group>
- <group
- android:name="ridge_2" >
- <path
- android:name="ridge_2_path"
- android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathStart="1" />
- </group>
- <group
- android:name="ridge_1"
- android:translateX="-97.5"
- android:translateY="-142.5" >
- <path
- android:name="ridge_1_path"
- android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathEnd="0" />
- </group>
- </group>
- </group>
- <group
- android:name="errorcircle"
- android:translateX="12"
- android:translateY="12"
- android:rotation="10" >
- <group
- android:name="circle" >
- <path
- android:name="circlepath"
- android:strokeColor="?android:attr/colorError"
- android:strokeWidth="2"
- android:strokeLineCap="round"
- android:pathData="M 0.0,-9.0 c 4.9705627482,0.0 9.0,4.0294372518 9.0,9.0 c 0.0,4.9705627482 -4.0294372518,9.0 -9.0,9.0 c -4.9705627482,0.0 -9.0,-4.0294372518 -9.0,-9.0 c 0.0,-4.9705627482 4.0294372518,-9.0 9.0,-9.0 Z" />
- </group>
- </group>
- <group
- android:name="errorexclamation"
- android:translateX="12"
- android:translateY="12" >
- <group
- android:name="exclamationbottom"
- android:translateY="4" >
- <path
- android:name="bottompath"
- android:fillColor="?android:attr/colorError"
- android:pathData="M 0.0,-1.1 l 0.0,0.0 c 0.60751322478,0.0 1.1,0.49248677522 1.1,1.1 l 0.0,0.0 c 0.0,0.60751322478 -0.49248677522,1.1 -1.1,1.1 l 0.0,0.0 c -0.60751322478,0.0 -1.1,-0.49248677522 -1.1,-1.1 l 0.0,0.0 c 0.0,-0.60751322478 0.49248677522,-1.1 1.1,-1.1 Z" />
- </group>
- <group
- android:name="exclamationtop"
- android:translateY="-2" >
- <path
- android:name="toppath"
- android:fillColor="?android:attr/colorError"
- android:pathData="M 0.0,-3.0 l 0.0,0.0 c 0.5522847498,0.0 1.0,0.4477152502 1.0,1.0 l 0.0,4.0 c 0.0,0.5522847498 -0.4477152502,1.0 -1.0,1.0 l 0.0,0.0 c -0.5522847498,0.0 -1.0,-0.4477152502 -1.0,-1.0 l 0.0,-4.0 c 0.0,-0.5522847498 0.4477152502,-1.0 1.0,-1.0 Z" />
- </group>
- </group>
-</vector>
diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp_animation.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp_animation.xml
deleted file mode 100644
index 2f33306..0000000
--- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_error_state_to_fp_animation.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<animated-vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:drawable="@drawable/lockscreen_fingerprint_error_state_to_fp" >
- <target
- android:name="fingerprintwhite"
- android:animation="@anim/ic_fingerprint_tofp_fingerprintwhite_animation" />
- <target
- android:name="ridge_5_path"
- android:animation="@anim/ic_fingerprint_tofp_ridge_5_path_animation" />
- <target
- android:name="ridge_7_path"
- android:animation="@anim/ic_fingerprint_tofp_ridge_7_path_animation" />
- <target
- android:name="ridge_6_path"
- android:animation="@anim/ic_fingerprint_tofp_ridge_6_path_animation" />
- <target
- android:name="ridge_2_path"
- android:animation="@anim/ic_fingerprint_tofp_ridge_2_path_animation" />
- <target
- android:name="ridge_1_path"
- android:animation="@anim/ic_fingerprint_tofp_ridge_1_path_animation" />
- <target
- android:name="errorcircle"
- android:animation="@anim/ic_fingerprint_tofp_errorcircle_animation" />
- <target
- android:name="circlepath"
- android:animation="@anim/ic_fingerprint_tofp_circlepath_animation" />
- <target
- android:name="errorexclamation"
- android:animation="@anim/ic_fingerprint_tofp_errorexclamation_animation" />
- <target
- android:name="exclamationbottom"
- android:animation="@anim/ic_fingerprint_tofp_exclamationbottom_animation" />
- <target
- android:name="bottompath"
- android:animation="@anim/ic_fingerprint_tofp_bottompath_animation" />
- <target
- android:name="exclamationtop"
- android:animation="@anim/ic_fingerprint_tofp_exclamationtop_animation" />
- <target
- android:name="toppath"
- android:animation="@anim/ic_fingerprint_tofp_toppath_animation" />
-</animated-vector>
diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml
deleted file mode 100644
index 7cc2e5c..0000000
--- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state.xml
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:name="ic_fingerprint_toerror"
- android:width="32dp"
- android:viewportWidth="24"
- android:height="32dp"
- android:viewportHeight="24" >
- <group
- android:name="fingerprintwhite"
- android:translateX="12"
- android:translateY="12.4"
- android:scaleX="0.738"
- android:scaleY="0.738" >
- <group
- android:name="fingerprintwhite_pivot"
- android:translateX="33"
- android:translateY="34" >
- <group
- android:name="ridge_5" >
- <path
- android:name="ridge_5_path"
- android:pathData="M -25.3591003418,-24.4138946533 c -0.569000244141,0.106399536133 -1.12660217285,0.140594482422 -1.45460510254,0.140594482422 c -1.29689025879,0.0 -2.53239440918,-0.343307495117 -3.62019348145,-1.12400817871 c -1.67700195312,-1.20349121094 -2.76950073242,-3.17008972168 -2.76950073242,-5.39189147949"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round" />
- </group>
- <group
- android:name="ridge_4" >
- <path
- android:name="ridge_7_path"
- android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round" />
- </group>
- <group
- android:name="ridge_3" >
- <path
- android:name="ridge_6_path"
- android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round" />
- </group>
- <group
- android:name="ridge_2" >
- <path
- android:name="ridge_2_path"
- android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round" />
- </group>
- <group
- android:name="ridge_1"
- android:translateX="-97.5"
- android:translateY="-142.5" >
- <path
- android:name="ridge_1_path"
- android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938"
- android:strokeColor="?attr/wallpaperTextColor"
- android:strokeAlpha="0.5"
- android:strokeWidth="1.45"
- android:strokeLineCap="round" />
- </group>
- </group>
- </group>
- <group
- android:name="fingerprinterror"
- android:translateX="12"
- android:translateY="12.4"
- android:scaleX="0.738"
- android:scaleY="0.738" >
- <group
- android:name="fingerprinterror_pivot"
- android:translateX="33"
- android:translateY="34" >
- <group
- android:name="ridge_6" >
- <path
- android:name="ridge_5_path_0"
- android:pathData="M -25.3591003418,-24.4138946533 c -0.569000244141,0.106399536133 -1.12660217285,0.140594482422 -1.45460510254,0.140594482422 c -1.29689025879,0.0 -2.53239440918,-0.343307495117 -3.62019348145,-1.12400817871 c -1.67700195312,-1.20349121094 -2.76950073242,-3.17008972168 -2.76950073242,-5.39189147949"
- android:strokeColor="?android:attr/colorError"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathEnd="0" />
- </group>
- <group
- android:name="ridge_7" >
- <path
- android:name="ridge_7_path_0"
- android:pathData="M -36.1409912109,-21.7843475342 c -1.00540161133,-1.19300842285 -1.57499694824,-1.9181060791 -2.36520385742,-3.50170898438 c -0.827560424805,-1.65869140625 -1.31352233887,-3.49159240723 -1.31352233887,-5.48489379883 c 0.0,-3.66279602051 2.96932983398,-6.63220214844 6.63221740723,-6.63220214844 c 3.6628112793,0.0 6.63220214844,2.96940612793 6.63220214844,6.63220214844"
- android:strokeColor="?android:attr/colorError"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathEnd="0" />
- </group>
- <group
- android:name="ridge_8" >
- <path
- android:name="ridge_6_path_0"
- android:pathData="M -42.1907958984,-25.6756896973 c -0.758117675781,-2.14370727539 -0.896545410156,-3.86891174316 -0.896545410156,-5.12921142578 c 0.0,-1.46069335938 0.249176025391,-2.84799194336 0.814682006836,-4.09748840332 c 1.56153869629,-3.45030212402 5.03434753418,-5.85076904297 9.0679473877,-5.85076904297 c 5.49430847168,0.0 9.94830322266,4.4539642334 9.94830322266,9.94825744629 c 0.0,1.83151245117 -1.48460388184,3.31610107422 -3.31610107422,3.31610107422 c -1.83149719238,0.0 -3.31610107422,-1.48469543457 -3.31610107422,-3.31610107422 c 0.0,-1.83139038086 -1.48458862305,-3.31610107422 -3.31610107422,-3.31610107422 c -1.83149719238,0.0 -3.31610107422,1.48471069336 -3.31610107422,3.31610107422 c 0.0,2.57020568848 0.989517211914,4.88710021973 2.60510253906,6.5865020752 c 1.22210693359,1.28550720215 2.43139648438,2.09950256348 4.47590637207,2.69030761719"
- android:strokeColor="?android:attr/colorError"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathEnd="0" />
- </group>
- <group
- android:name="ridge_9" >
- <path
- android:name="ridge_2_path_0"
- android:pathData="M -44.0646514893,-38.1672973633 c 1.19026184082,-1.77430725098 2.67503356934,-3.24531555176 4.55902099609,-4.27278137207 c 1.88395690918,-1.0274810791 4.04466247559,-1.61137390137 6.34175109863,-1.61137390137 c 2.28761291504,0.0 4.43991088867,0.579071044922 6.31831359863,1.59861755371 c 1.8784942627,1.01954650879 3.36059570312,2.4796295166 4.55279541016,4.24153137207"
- android:strokeColor="?android:attr/colorError"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathStart="1" />
- </group>
- <group
- android:name="ridge_10"
- android:translateX="-97.5"
- android:translateY="-142.5" >
- <path
- android:name="ridge_1_path_0"
- android:pathData="M 71.7812347412,97.0507202148 c -2.27149963379,-1.31344604492 -4.71360778809,-2.07006835938 -7.56221008301,-2.07006835938 c -2.84869384766,0.0 -5.23320007324,0.779556274414 -7.34411621094,2.07006835938"
- android:strokeColor="?android:attr/colorError"
- android:strokeWidth="1.45"
- android:strokeLineCap="round"
- android:trimPathEnd="0" />
- </group>
- </group>
- </group>
- <group
- android:name="errorcircle"
- android:translateX="12"
- android:translateY="12"
- android:rotation="190" >
- <group
- android:name="circle" >
- <path
- android:name="circlepath"
- android:strokeColor="?android:attr/colorError"
- android:strokeWidth="2"
- android:strokeLineCap="round"
- android:trimPathStart="1"
- android:pathData="M 0.0,-9.0 c 4.9705627482,0.0 9.0,4.0294372518 9.0,9.0 c 0.0,4.9705627482 -4.0294372518,9.0 -9.0,9.0 c -4.9705627482,0.0 -9.0,-4.0294372518 -9.0,-9.0 c 0.0,-4.9705627482 4.0294372518,-9.0 9.0,-9.0 Z" />
- </group>
- </group>
- <group
- android:name="errorexclamation"
- android:translateX="12"
- android:translateY="12"
- android:rotation="180" >
- <group
- android:name="exclamationbottom"
- android:translateY="4" >
- <path
- android:name="bottompath"
- android:fillColor="?android:attr/colorError"
- android:pathData="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />
- </group>
- <group
- android:name="exclamationtop" >
- <path
- android:name="toppath"
- android:fillColor="?android:attr/colorError"
- android:pathData="M -1.0,0.0 l 2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l -2.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />
- </group>
- </group>
-</vector>
diff --git a/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state_animation.xml b/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state_animation.xml
deleted file mode 100644
index 38096a9..0000000
--- a/packages/SystemUI/res/drawable/lockscreen_fingerprint_fp_to_error_state_animation.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<animated-vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:drawable="@drawable/lockscreen_fingerprint_fp_to_error_state" >
- <target
- android:name="fingerprintwhite"
- android:animation="@anim/ic_fingerprint_toerror_fingerprintwhite_animation" />
- <target
- android:name="ridge_5_path"
- android:animation="@anim/ic_fingerprint_toerror_ridge_5_path_animation" />
- <target
- android:name="ridge_7_path"
- android:animation="@anim/ic_fingerprint_toerror_ridge_7_path_animation" />
- <target
- android:name="ridge_6_path"
- android:animation="@anim/ic_fingerprint_toerror_ridge_6_path_animation" />
- <target
- android:name="ridge_2_path"
- android:animation="@anim/ic_fingerprint_toerror_ridge_2_path_animation" />
- <target
- android:name="ridge_1_path"
- android:animation="@anim/ic_fingerprint_toerror_ridge_1_path_animation" />
- <target
- android:name="fingerprinterror"
- android:animation="@anim/ic_fingerprint_toerror_fingerprinterror_animation" />
- <target
- android:name="ridge_5_path_0"
- android:animation="@anim/ic_fingerprint_toerror_ridge_5_path_0_animation" />
- <target
- android:name="ridge_7_path_0"
- android:animation="@anim/ic_fingerprint_toerror_ridge_7_path_0_animation" />
- <target
- android:name="ridge_6_path_0"
- android:animation="@anim/ic_fingerprint_toerror_ridge_6_path_0_animation" />
- <target
- android:name="ridge_2_path_0"
- android:animation="@anim/ic_fingerprint_toerror_ridge_2_path_0_animation" />
- <target
- android:name="ridge_1_path_0"
- android:animation="@anim/ic_fingerprint_toerror_ridge_1_path_0_animation" />
- <target
- android:name="errorcircle"
- android:animation="@anim/ic_fingerprint_toerror_errorcircle_animation" />
- <target
- android:name="circlepath"
- android:animation="@anim/ic_fingerprint_toerror_circlepath_animation" />
- <target
- android:name="errorexclamation"
- android:animation="@anim/ic_fingerprint_toerror_errorexclamation_animation" />
- <target
- android:name="exclamationbottom"
- android:animation="@anim/ic_fingerprint_toerror_exclamationbottom_animation" />
- <target
- android:name="bottompath"
- android:animation="@anim/ic_fingerprint_toerror_bottompath_animation" />
- <target
- android:name="exclamationtop"
- android:animation="@anim/ic_fingerprint_toerror_exclamationtop_animation" />
- <target
- android:name="toppath"
- android:animation="@anim/ic_fingerprint_toerror_toppath_animation" />
-</animated-vector>
diff --git a/packages/SystemUI/res/drawable/trusted_state_to_error.xml b/packages/SystemUI/res/drawable/trusted_state_to_error.xml
deleted file mode 100755
index 4a8e452..0000000
--- a/packages/SystemUI/res/drawable/trusted_state_to_error.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:name="trusted_state_to_error"
- android:width="24dp"
- android:viewportWidth="24"
- android:height="24dp"
- android:viewportHeight="24" >
- <group
- android:name="lock"
- android:translateX="12"
- android:translateY="12" >
- <group
- android:name="middle_ellipse"
- android:translateY="2.9375" >
- <path
- android:name="ellipse_path_1"
- android:fillColor="?attr/wallpaperTextColor"
- android:fillAlpha="0.5"
- android:pathData="M 0.0,-1.988645 c 1.09829830627,0.0 1.988645,0.890346693734 1.988645,1.988645 c 0.0,1.09829830627 -0.890346693734,1.988645 -1.988645,1.988645 c -1.09829830627,0.0 -1.988645,-0.890346693734 -1.988645,-1.988645 c 0.0,-1.09829830627 0.890346693734,-1.988645 1.988645,-1.988645 Z" />
- </group>
- <group
- android:name="lock_right_side" >
- <path
- android:name="path_1"
- android:pathData="M 6.00561523438,-4.046875 c 0.0,0.0 -5.98999023438,0.0 -5.98999023438,0.0 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 5.98812866211,0.0 5.98812866211,0.0 c 0.0,0.0 0.00064086914062,10.0 0.00064086914062,10.0 c 0.0,0.0 -5.98840332031,0.0 -5.98840332031,0.0 c 0.0,0.0 -0.0052490234375,2.0 -0.0052490234375,2.0 c 0.0,0.0 5.99487304688,0.0 5.99487304688,0.0 c 1.10000610352,0.0 2.0,-0.900024414062 2.0,-2.0 c 0.0,0.0 0.0,-10.0 0.0,-10.0 c 0.0,-1.09997558594 -0.899993896484,-2.0 -2.0,-2.0 Z"
- android:fillColor="?attr/wallpaperTextColor"
- android:fillAlpha="0.5" />
- </group>
- <group
- android:name="lock_left_side" >
- <path
- android:name="path_2"
- android:pathData="M -5.9959564209,-2.04727172852 c 0.0,0.0 6.01173400879,0.00039672851562 6.01173400879,0.00039672851562 c 0.0,0.0 -0.00015258789062,-2.0 -0.00015258789062,-2.0 c 0.0,0.0 -6.01000976562,0.0 -6.01000976562,0.0 c -1.10000610352,0.0 -2.0,0.900024414062 -2.0,2.0 c 0.0,0.0 0.0,10.0 0.0,10.0 c 0.0,1.09997558594 0.899993896484,2.0 2.0,2.0 c 0.0,0.0 6.01000976562,0.0 6.01000976562,0.0 c 0.0,0.0 -0.000244140625,-2.0009765625 -0.000244140625,-2.0009765625 c 0.0,0.0 -6.01171875,0.0003662109375 -6.01171875,0.0003662109375 c 0.0,0.0 0.00038146972656,-9.99978637695 0.00038146972656,-9.99978637695 Z"
- android:fillColor="?attr/wallpaperTextColor"
- android:fillAlpha="0.5" />
- </group>
- <group
- android:name="lock_top" >
- <path
- android:name="path_3"
- android:pathData="M 5.00619506836,-6.046875 c 0.0,-2.76000976562 -2.23999023438,-5.0 -5.0,-5.0 c -2.76000976562,0.0 -5.0,2.23999023438 -5.0,5.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,-1.71002197266 1.38999938965,-3.09997558594 3.10000610352,-3.09997558594 c 1.71000671387,0.0 3.10000610352,1.38995361328 3.10000610352,3.09997558594 c 0.0,0.0 0.0,2.0 0.0,2.0 c 0.0,0.0 1.89999389648,0.0 1.89999389648,0.0 c 0.0,0.0 0.0,-2.0 0.0,-2.0 Z"
- android:fillColor="?attr/wallpaperTextColor"
- android:fillAlpha="0.5" />
- </group>
- </group>
- <group
- android:name="errorexclamationdot"
- android:translateX="12"
- android:translateY="8" >
- <group
- android:name="exclamationbottom"
- android:translateY="4" >
- <path
- android:name="bottompath"
- android:fillColor="?android:attr/colorError"
- android:pathData="M 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 l 0.0,0.0 c 0.0,0.0 0.0,0.0 0.0,0.0 Z" />
- </group>
- </group>
- <group
- android:name="errorexclamation"
- android:translateX="12"
- android:translateY="12" >
- <group
- android:name="exclamationtop"
- android:translateY="2.5" >
- <path
- android:name="toppath"
- android:fillColor="?android:attr/colorError"
- android:pathData="M 0.0,-7.0 l 0.0,0.0 c 1.9329966243,0.0 3.5,1.5670033757 3.5,3.5 l 0.0,7.0 c 0.0,1.9329966243 -1.5670033757,3.5 -3.5,3.5 l 0.0,0.0 c -1.9329966243,0.0 -3.5,-1.5670033757 -3.5,-3.5 l 0.0,-7.0 c 0.0,-1.9329966243 1.5670033757,-3.5 3.5,-3.5 Z" />
- </group>
- </group>
- <group
- android:name="errorcircle"
- android:translateX="12"
- android:translateY="12"
- android:rotation="184" >
- <group
- android:name="circle" >
- <path
- android:name="circlepath"
- android:strokeColor="?android:attr/colorError"
- android:strokeWidth="2"
- android:strokeLineCap="round"
- android:trimPathStart="1"
- android:pathData="M 0.0,-9.0 c 4.9705627482,0.0 9.0,4.0294372518 9.0,9.0 c 0.0,4.9705627482 -4.0294372518,9.0 -9.0,9.0 c -4.9705627482,0.0 -9.0,-4.0294372518 -9.0,-9.0 c 0.0,-4.9705627482 4.0294372518,-9.0 9.0,-9.0 Z" />
- </group>
- </group>
-</vector>
diff --git a/packages/SystemUI/res/drawable/trusted_state_to_error_animation.xml b/packages/SystemUI/res/drawable/trusted_state_to_error_animation.xml
deleted file mode 100755
index 3457be5..0000000
--- a/packages/SystemUI/res/drawable/trusted_state_to_error_animation.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright (C) 2017 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.
--->
-<animated-vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:drawable="@drawable/trusted_state_to_error" >
- <target
- android:name="ellipse_path_1"
- android:animation="@anim/trusted_state_to_error_ellipse_path_1_animation" />
- <target
- android:name="path_1"
- android:animation="@anim/trusted_state_to_error_path_1_animation" />
- <target
- android:name="path_2"
- android:animation="@anim/trusted_state_to_error_path_2_animation" />
- <target
- android:name="lock_top"
- android:animation="@anim/trusted_state_to_error_lock_top_animation" />
- <target
- android:name="path_3"
- android:animation="@anim/trusted_state_to_error_path_3_animation" />
- <target
- android:name="errorexclamationdot"
- android:animation="@anim/trusted_state_to_error_errorexclamationdot_animation" />
- <target
- android:name="bottompath"
- android:animation="@anim/trusted_state_to_error_bottompath_animation" />
- <target
- android:name="exclamationtop"
- android:animation="@anim/trusted_state_to_error_exclamationtop_animation" />
- <target
- android:name="toppath"
- android:animation="@anim/trusted_state_to_error_toppath_animation" />
- <target
- android:name="errorcircle"
- android:animation="@anim/trusted_state_to_error_errorcircle_animation" />
- <target
- android:name="circlepath"
- android:animation="@anim/trusted_state_to_error_circlepath_animation" />
-</animated-vector>
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
index 098c975..53b3a7e 100644
--- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml
+++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml
@@ -37,22 +37,16 @@
android:id="@+id/keyguard_indication_enterprise_disclosure"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:textStyle="italic"
- android:textColor="?attr/wallpaperTextColorSecondary"
- android:textSize="16sp"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:gravity="center"
+ android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"
android:visibility="gone" />
<com.android.systemui.statusbar.phone.KeyguardIndicationTextView
android:id="@+id/keyguard_indication_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center_horizontal"
- android:textStyle="italic"
- android:textColor="?attr/wallpaperTextColorSecondary"
- android:textSize="16sp"
- android:textAppearance="?android:attr/textAppearanceSmall"
+ android:gravity="center"
+ android:textAppearance="@style/TextAppearance.Keyguard.BottomArea"
android:accessibilityLiveRegion="polite" />
</LinearLayout>
@@ -85,12 +79,13 @@
<com.android.systemui.statusbar.phone.LockIcon
android:id="@+id/lock_icon"
- android:layout_width="@dimen/keyguard_affordance_width"
- android:layout_height="@dimen/keyguard_affordance_height"
+ android:layout_width="@dimen/keyguard_lock_width"
+ android:layout_height="@dimen/keyguard_lock_height"
android:layout_gravity="bottom|center_horizontal"
- android:src="@drawable/ic_lock"
+ android:layout_marginBottom="@dimen/keyguard_lock_padding"
+ android:src="@*android:drawable/ic_lock_24dp"
android:contentDescription="@string/accessibility_unlock_button"
- android:scaleType="center" />
+ android:scaleType="fitCenter" />
<FrameLayout
android:id="@+id/overlay_container"
diff --git a/packages/SystemUI/res/values-af/strings.xml b/packages/SystemUI/res/values-af/strings.xml
index 31e450b..053371a 100644
--- a/packages/SystemUI/res/values-af/strings.xml
+++ b/packages/SystemUI/res/values-af/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Laat USB-ontfouting toe?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Die rekenaar se RSA-sleutel-vingerafdruk is:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Laat altyd toe van hierdie rekenaar af"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Laat toe"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB-ontfouting word nie toegelaat nie"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Die gebruiker wat tans by hierdie toestel aangemeld is, kan nie USB-ontfouting aanskakel nie. Skakel na die primêre gebruiker toe oor om hierdie kenmerk te gebruik."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-poort is gedeaktiveer"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Die USB-poort is gedeaktiveer om jou toestel teen vloeistowwe en vuilgoed te beskerm en dit sal nie enige bykomstighede bespeur nie.\n\nJy sal ingelig word wanneer dit veilig is om weer die USB-poort te gebruik."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoem om skerm te vul"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Strek om skerm te vul"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Skermkiekie"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> programme gebruik jou <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> program gebruik jou <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Het dit"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Bekyk details"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Program wat jou <xliff:g id="TYPES_LIST">%s</xliff:g> gebruik"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Programme wat jou <xliff:g id="TYPES_LIST">%s</xliff:g> gebruik"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensors is af"</string>
<string name="device_services" msgid="1191212554435440592">"Toesteldienste"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Titelloos"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-am/strings.xml b/packages/SystemUI/res/values-am/strings.xml
index 731acce..8acd1b8 100644
--- a/packages/SystemUI/res/values-am/strings.xml
+++ b/packages/SystemUI/res/values-am/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"የUSB ማረሚያ ይፈቀድ?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"የኮምፒውተሩ RSA ቁልፍ ጣት አሻራ ይሄ ነው፦\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"ሁልጊዜ ከዚህ ኮምፒውተር ፍቀድ"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"ፍቀድ"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"የዩኤስቢ እርማት አይፈቀድም"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"አሁን ወደዚህ መሣሪያ የገባው ተጠቃሚ የዩኤስቢ እርማትን ማብራት አይችልም። ይህን ባህሪ ለመጠቀም ወደ ዋና ተጠቃሚ ይቀይሩ።"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"የዩኤስቢ ወደብ ተሰናክሏል"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"መሣሪያዎን ከፈሳሽ ወይም ፍርስራሽ ለመጠበቅ ሲባል የዩኤስቢ ወደቡ ተሰናክሏል፣ እና ማናቸውም ተቀጥላዎችን አያገኝም።\n\nየዩኤስቢ ወደቡን እንደገና መጠቀም ችግር በማይኖረው ጊዜ ማሳወቂያ ይደርሰዎታል።"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"ማያ እንዲሞላ አጉላ"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ማያ ለመሙለት ሳብ"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ቅጽበታዊ ገጽ እይታ"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> መተግበሪያዎች የእርስዎን <xliff:g id="TYPE_5">%2$s</xliff:g> እየተጠቀሙ ነው።</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> መተግበሪያዎች የእርስዎን <xliff:g id="TYPE_5">%2$s</xliff:g> እየተጠቀሙ ነው።</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"ገባኝ"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"ዝርዝሮችን አሳይ"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"የእርስዎን <xliff:g id="TYPES_LIST">%s</xliff:g> የሚጠቀሙ መተግበሪያዎች"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"የእርስዎን <xliff:g id="TYPES_LIST">%s</xliff:g> የሚጠቀሙ መተግበሪያዎች"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">"፣ "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"ዳሳሾች ጠፍተዋል"</string>
<string name="device_services" msgid="1191212554435440592">"የመሣሪያ አገልግሎቶች"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"ርዕስ የለም"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ar/strings.xml b/packages/SystemUI/res/values-ar/strings.xml
index 3306388..0312adf 100644
--- a/packages/SystemUI/res/values-ar/strings.xml
+++ b/packages/SystemUI/res/values-ar/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"هل تريد السماح بتصحيح أخطاء USB؟"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"الملف المرجعي الرئيسي لـ RSA في هذا الكمبيوتر هو:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"السماح دائمًا من هذا الكمبيوتر"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"سماح"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"لا يُسمح بتصحيح أخطاء USB"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"لا يمكن للمستخدم الذي يسجّل دخوله حاليًا إلى هذا الجهاز تشغيل تصحيح أخطاء USB. لاستخدام هذه الميزة، يمكنك التبديل إلى المستخدم الأساسي."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"تمّ إيقاف منفذ USB"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"لحماية جهازك من السوائل أو الشوائب، سيتمّ إيقاف منفذ USB الذي لن يتمكَّن من اكتشاف أيّ ملحقات.\n\nوسيتمّ إعلامك عندما يتوفّر الأمان لاستخدام منفذ USB مرّةً أخرى."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"تكبير/تصغير لملء الشاشة"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"توسيع بملء الشاشة"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"لقطة شاشة"</string>
@@ -909,9 +906,9 @@
<item quantity="other">هناك <xliff:g id="NUM_APPS_4">%1$d</xliff:g> تطبيق يستخدِم <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one">هناك تطبيق واحد (<xliff:g id="NUM_APPS_0">%1$d</xliff:g>) يستخدِم <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"حسنًا"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"عرض التفاصيل"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"التطبيق الذي يستخدِم <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"التطبيقات التي تستخدِم <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">"، "</string>
@@ -930,4 +927,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"إيقاف أجهزة الاستشعار"</string>
<string name="device_services" msgid="1191212554435440592">"خدمات الأجهزة"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"بلا عنوان"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-as/strings.xml b/packages/SystemUI/res/values-as/strings.xml
index 4a09194..fbaad96 100644
--- a/packages/SystemUI/res/values-as/strings.xml
+++ b/packages/SystemUI/res/values-as/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"ইউএছবি ডিবাগিংৰ অনুমতি দিবনে?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"এয়া হৈছে কম্পিউটাৰটোৰ RSA কী ফিংগাৰপ্ৰিণ্ট:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"এই কম্পিউটাৰটোৰ পৰা সদায় অনুমতি দিয়ক"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"অনুমতি দিয়ক"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"ইউএছবি ডিবাগিঙৰ অনুমতি নাই"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"এই ডিভাইচটোত বর্তমান ছাইন ইন হৈ থকা ব্যৱহাৰকাৰীজনে ইউএছবি ডিবাগিং অন কৰিব নোৱাৰে। এই সুবিধাটো ব্যৱহাৰ কৰিবলৈ হ\'লে মুখ্য ব্যৱহাৰকাৰী হিচাপে ছাইন ইন কৰক।"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"ইউএছবি প’ৰ্ট অক্ষম কৰা হ’ল"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"আপোনাৰ ডিভাইচটো তৰল বা ধূলি-মাকতিৰ পৰা ৰক্ষা কৰিবলৈ ইউএছবি প’ৰ্টটো অক্ষম কৰি ৰখা হৈছে ফলত ই কোনো আনুষংগিক সামগ্ৰী ধৰা পেলাব নোৱাৰে।\n\nযেতিয়া ইউএছবি প’ৰ্টটো নিৰাপদভাৱে ব্যৱহাৰ কৰিব পৰা হ’ব তেতিয়া আপোনাক জনোৱা হ’ব।"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"স্ক্ৰীণ পূর্ণ কৰিবলৈ জুম কৰক"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"স্ক্ৰীণ পূর্ণ কৰিবলৈ প্ৰসাৰিত কৰক"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"স্ক্ৰীণশ্বট"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g>টা এপ্লিকেশ্বনে আপোনাৰ <xliff:g id="TYPE_5">%2$s</xliff:g> ব্যৱহাৰ কৰি আছে।</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g>টা এপ্লিকেশ্বনে আপোনাৰ <xliff:g id="TYPE_5">%2$s</xliff:g> ব্যৱহাৰ কৰি আছে।</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"বুজি পালোঁ"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"সবিশেষ চাওক"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"এপটোৱে আপোনাৰ <xliff:g id="TYPES_LIST">%s</xliff:g> ব্যৱহাৰ কৰি আছে"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"এপসমূহে আপোনাৰ <xliff:g id="TYPES_LIST">%s</xliff:g> ব্যৱহাৰ কৰি আছে"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"ছেন্সৰ অফ হৈ আছে"</string>
<string name="device_services" msgid="1191212554435440592">"ডিভাইচ সেৱা"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"কোনো শিৰোনাম নাই"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-az/strings.xml b/packages/SystemUI/res/values-az/strings.xml
index b8bace9..70608a1 100644
--- a/packages/SystemUI/res/values-az/strings.xml
+++ b/packages/SystemUI/res/values-az/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB sazlamaya icazə verilsin?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Kompüterin RSA barmaq izi: \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Bu kompüterdən həmişə icazə verilsin"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"İcazə verin"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB debaq prosesinə icazə verilmir"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Hazırda bu cihaza daxil olmuş istifadəçi USB sazlama prosesini aktiv edə bilməz. Bu funksiyadan istifadə etmək üçün əsas istifadəçi hesaba daxil olmalıdır."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB portu deaktiv edildi"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"USB portu cihazı maye və qırılmaqdan qorumaq üçün deaktiv edildiyinə görə heç bir aksesuar tapılmayacaq.\n\nUSB portu yenidən istifadə üçün təhlükəsiz olduqda bildiriş göndəriləcək."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Ekranı doldurmaq üçün yaxınlaşdır"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Ekranı doldurmaq üçün uzat"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Skrinşot"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> tətbiq <xliff:g id="TYPE_5">%2$s</xliff:g> tətbiqindən istifadə edir.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> tətbiq <xliff:g id="TYPE_1">%2$s</xliff:g> tətbiqindən istifadə edir.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Anladım"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Detallara baxın"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"<xliff:g id="TYPES_LIST">%s</xliff:g> tətbiqindən istifadə edən tətbiq"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"<xliff:g id="TYPES_LIST">%s</xliff:g> tətbiqindən istifadə edən tətbiqlər"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensorlar deaktivdir"</string>
<string name="device_services" msgid="1191212554435440592">"Cihaz Xidmətləri"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Başlıq yoxdur"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <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 eed9ce6..8a754f3 100644
--- a/packages/SystemUI/res/values-b+sr+Latn/strings.xml
+++ b/packages/SystemUI/res/values-b+sr+Latn/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Želite li da dozvolite otklanjanje USB grešaka?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Digitalni otisak RSA ključa ovog računara je:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Uvek dozvoli sa ovog računara"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Dozvoli"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Otklanjanje grešaka na USB-u nije dozvoljeno"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Korisnik koji je trenutno prijavljen na ovaj uređaj ne može da uključi otklanjanje grešaka na USB-u. Da biste koristili ovu funkciju, prebacite na primarnog korisnika."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB port je onemogućen"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Da bi se uređaj zaštitio od tečnosti ili nečistoće, USB port je onemogućen i neće otkrivati dodatnu opremu.\n\nObavestićemo vas kada ponovo budete mogli da koristite USB port."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zumiraj na celom ekranu"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Razvuci na ceo ekran"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Snimak ekrana"</string>
@@ -888,9 +885,9 @@
<item quantity="few"><xliff:g id="NUM_APPS_2">%1$d</xliff:g> aplikacije koriste dozvolu <xliff:g id="TYPE_3">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikacija koristi dozvolu <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Važi"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Prikaži detalje"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplikacija koja koristi dozvole <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplikacije koje koriste dozvole <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -906,4 +903,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Senzori su isključeni"</string>
<string name="device_services" msgid="1191212554435440592">"Usluge za uređaje"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Bez naslova"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-be/strings.xml b/packages/SystemUI/res/values-be/strings.xml
index 8bc87cd..3390fcb 100644
--- a/packages/SystemUI/res/values-be/strings.xml
+++ b/packages/SystemUI/res/values-be/strings.xml
@@ -57,14 +57,11 @@
<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>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Дазволіць"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Адладка USB не дапускаецца"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Карыстальнік, які зараз увайшоў у гэту прыладу, не можа ўключыць адладку USB. Каб выкарыстоўваць гэту функцыю, пераключыцеся на асноўнага карыстальніка."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Порт USB адключаны"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Порт USB адключаны для аховы прылады ад вадкасці і смецця і не будзе выяўляць аксесуары.\n\nКалі можна будзе зноў бяспечна выкарыстоўваць порт USB, вы атрымаеце апавяшчэнне."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Павял. на ўвесь экран"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Расцягн. на ўвесь экран"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Здымак экрана"</string>
@@ -897,9 +894,9 @@
<item quantity="many">Функцыю \"<xliff:g id="TYPE_5">%2$s</xliff:g>\" выкарыстоўваюць <xliff:g id="NUM_APPS_4">%1$d</xliff:g> праграм.</item>
<item quantity="other">Функцыю \"<xliff:g id="TYPE_5">%2$s</xliff:g>\" выкарыстоўваюць <xliff:g id="NUM_APPS_4">%1$d</xliff:g> праграмы.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Зразумела"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Падрабязнасці"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Праграма, якая выкарыстоўвае: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Праграмы, якія выкарыстоўваюць: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -916,4 +913,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Датчыкі выкл."</string>
<string name="device_services" msgid="1191212554435440592">"Сэрвісы прылады"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Без назвы"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-bg/strings.xml b/packages/SystemUI/res/values-bg/strings.xml
index 63111276..00454dd 100644
--- a/packages/SystemUI/res/values-bg/strings.xml
+++ b/packages/SystemUI/res/values-bg/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Да се разреши ли отстраняването на грешки през USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Отпечатъкът на RSA ключа на компютъра е:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Винаги да се разрешава от този компютър"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Разрешаване"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Отстраняването на грешки през USB не е разрешено"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Потребителят, който понастоящем е влязъл в това устройство, не може да включи функцията за отстраняване на грешки през USB. За да я използвате, превключете към основния потребител."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB портът е деактивиран"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"С цел защита на устройството ви от течности и замърсяване USB портът ще бъде деактивиран и няма да открива аксесоари.\n\nЩе получите известие, когато е безопасно отново да използвате USB порта."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Мащаб – запълва екрана"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Разпъване – запълва екрана"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Екранна снимка"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> приложения използват <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> приложение използва <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Разбрах"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Преглед на подробностите"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Приложение, което използва <xliff:g id="TYPES_LIST">%s</xliff:g> ви"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Приложения, които използват <xliff:g id="TYPES_LIST">%s</xliff:g> ви"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Сензорите са изключени"</string>
<string name="device_services" msgid="1191212554435440592">"Услуги за устройството"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Няма заглавие"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-bn/strings.xml b/packages/SystemUI/res/values-bn/strings.xml
index 58678ba..b864206 100644
--- a/packages/SystemUI/res/values-bn/strings.xml
+++ b/packages/SystemUI/res/values-bn/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB ডিবাগিং মঞ্জুর করবেন?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"কম্পিউটারের RSA কী আঙ্গুলের ছাপ হল:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"এই কম্পিউটার থেকে সর্বদা অনুমতি দিন"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"অনুমতি দিন"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB ডিবাগিং অনুমোদিত নয়"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"ব্যবহারকারী এখন এই ডিভাইসে সাইন-ইন করেছেন তাই USB ডিবাগিং চালু করা যাবে না। এই বৈশিষ্ট্যটি ব্যবহার করতে, প্রাথমিক ব্যবহারকারীতে পাল্টে নিন।"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"ইউএসবি পোর্ট বন্ধ করা হয়েছে"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"কোনও তরল পদার্থ এবং ধুলো কণা থেকে আপনার ডিভাইসকে সুরক্ষিত করতে, ইউএসবি পোর্ট বন্ধ করা হবে এবং কোনও অ্যাক্সেসরির শনাক্ত করবে না।\n\nযখন ইউএসবি পোর্ট ব্যবহার করা নিরাপদ হবে তখন আপনাকে জানানো হবে।"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"স্ক্রীণ পূরণ করতে জুম করুন"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ফুল স্ক্রিন করুন"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"স্ক্রিনশট নিন"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g>টি অ্যাপ আপনার <xliff:g id="TYPE_5">%2$s</xliff:g> ব্যবহার করছে।</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g>টি অ্যাপ আপনার <xliff:g id="TYPE_5">%2$s</xliff:g> ব্যবহার করছে।</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"বুঝেছি"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"বিবরণ দেখুন"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"অ্যাপ আপনার <xliff:g id="TYPES_LIST">%s</xliff:g> ব্যবহার করছে"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"অ্যাপ আপনার <xliff:g id="TYPES_LIST">%s</xliff:g> ব্যবহার করছে"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"সেন্সর বন্ধ"</string>
<string name="device_services" msgid="1191212554435440592">"ডিভাইস সংক্রান্ত পরিষেবা"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"কোনও শীর্ষক নেই"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-bs/strings.xml b/packages/SystemUI/res/values-bs/strings.xml
index b2b2ee7..d152831 100644
--- a/packages/SystemUI/res/values-bs/strings.xml
+++ b/packages/SystemUI/res/values-bs/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Omogućiti otklanjanje grešaka putem uređaja spojenog na USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"RSA otisak prsta za otključavanje računara je: \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Uvijek dozvoli sa ovog računara"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Dozvoli"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Otklanjanje grešaka putem uređaja spojenog na USB nije dozvoljeno"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Korisnik koji je trenutno prijavljen na ovaj uređaj ne može uključiti opciju za otklanjanje grešaka koristeći USB. Da koristite tu funkciju, prebacite se na primarnog korisnika."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB priključak je onemogućen"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"USB priključak je onemogućen kako bi se vaš uređaj zaštitio od tečnosti i nečistoća i neće detektirati priključene uređaje.\n\nDobit ćete obavještenje kada ponovo bude sigurno koristiti USB priključak."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Uvećaj prikaz na ekran"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Razvuci prikaz na ekran"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Snimak ekrana"</string>
@@ -890,9 +887,9 @@
<item quantity="few"><xliff:g id="NUM_APPS_2">%1$d</xliff:g> aplikacije koriste <xliff:g id="TYPE_3">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikacija koristi <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Razumijem"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Prikaži detalje"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplikacija koristi odobrenja <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplikacije koriste odobrenja <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -908,4 +905,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Senzori su isključeni"</string>
<string name="device_services" msgid="1191212554435440592">"Usluge uređaja"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Bez naslova"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ca/strings.xml b/packages/SystemUI/res/values-ca/strings.xml
index 45ad570..f41ea3c 100644
--- a/packages/SystemUI/res/values-ca/strings.xml
+++ b/packages/SystemUI/res/values-ca/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Vols permetre la depuració per USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"L\'empremta digital de la clau RSA de l\'equip és:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Dona sempre permís des d\'aquest equip"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Permet"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"No es permet la depuració per USB"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"L\'usuari que té iniciada la sessió al dispositiu en aquest moment no pot activar la depuració per USB. Per utilitzar aquesta funció, cal canviar a l\'usuari principal."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"El port USB està desactivat"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Per protegir el teu dispositiu dels líquids o la pols, el port USB s\'ha desactivat i no detectarà cap accessori.\n\nRebràs una notificació quan sigui segur utilitzar-lo."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom per omplir pantalla"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Estira per omplir pant."</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Captura de pantalla"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplicacions estan fent servir: <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplicació està fent servir: <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"D\'acord"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Mostra els detalls"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplicació que fa servir: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplicacions que fan servir: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensors desactivats"</string>
<string name="device_services" msgid="1191212554435440592">"Serveis per a dispositius"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Sense títol"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-cs/strings.xml b/packages/SystemUI/res/values-cs/strings.xml
index 3b3dc00..4bdc271 100644
--- a/packages/SystemUI/res/values-cs/strings.xml
+++ b/packages/SystemUI/res/values-cs/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Povolit ladění přes USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Digitální otisk RSA počítače je:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Vždy povolit z tohoto počítače"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Povolit"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Ladění přes USB není povoleno"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Uživatel aktuálně přihlášený k tomuto zařízení nemůže zapnout ladění přes USB. Chcete-li tuto funkci použít, přepněte na primárního uživatele."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Port USB je deaktivován"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Kvůli ochraně vašeho zařízení před tekutinami a nečistotami je port USB zakázán a nerozpozná žádné příslušenství.\n\nAž bude opět bezpečné port USB použít, budeme vás informovat."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Přiblížit na celou obrazovku"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Na celou obrazovku"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Snímek obrazovky"</string>
@@ -895,9 +892,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikací využívá tato oprávnění: <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplikace využívá tato oprávnění: <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Rozumím"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Zobrazit podrobnosti"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplikace používající vaše údaje: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplikace používající vaše údaje: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -914,4 +911,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Senzory jsou vypnuty"</string>
<string name="device_services" msgid="1191212554435440592">"Služby zařízení"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Bez názvu"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-da/strings.xml b/packages/SystemUI/res/values-da/strings.xml
index 118204e..0c3c253 100644
--- a/packages/SystemUI/res/values-da/strings.xml
+++ b/packages/SystemUI/res/values-da/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Vil du tillade USB-fejlretning?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Fingeraftrykket for computerens RSA-nøgle er:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Tillad altid fra denne computer"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Tillad"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB-fejlretning er ikke tilladt"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Den bruger, der i øjeblikket er logget ind på denne enhed, kan ikke aktivere USB-fejlretning. Skift til den primære bruger for at bruge denne funktion."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-porten er deaktiveret"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"USB-porten er blevet deaktiveret for at beskytte din enhed mod væske og snavs. Den kan derfor ikke registrere noget tilbehør.\n\nDu får besked, når det er sikkert at bruge USB-porten igen."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom til fuld skærm"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Stræk til fuld skærm"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
@@ -828,7 +825,7 @@
<string name="tuner_right" msgid="6222734772467850156">"Højre"</string>
<string name="tuner_menu" msgid="191640047241552081">"Menu"</string>
<string name="tuner_app" msgid="3507057938640108777">"Appen <xliff:g id="APP">%1$s</xliff:g>"</string>
- <string name="notification_channel_alerts" msgid="4496839309318519037">"Notifikationer"</string>
+ <string name="notification_channel_alerts" msgid="4496839309318519037">"Underretninger"</string>
<string name="notification_channel_battery" msgid="5786118169182888462">"Batteri"</string>
<string name="notification_channel_screenshot" msgid="6314080179230000938">"Screenshots"</string>
<string name="notification_channel_general" msgid="4525309436693914482">"Generelle meddelelser"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> app anvender din/dit <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> apps anvender din/dit <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Se info"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App, der anvender din/dit <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apps, der anvender din/dit <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Deaktiver sensorer"</string>
<string name="device_services" msgid="1191212554435440592">"Enhedstjenester"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Ingen titel"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-de/strings.xml b/packages/SystemUI/res/values-de/strings.xml
index d91e678..c21288d 100644
--- a/packages/SystemUI/res/values-de/strings.xml
+++ b/packages/SystemUI/res/values-de/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB-Debugging zulassen?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Der Fingerabdruck des RSA-Schlüssels für diesen Computer lautet: \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Von diesem Computer immer zulassen"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Erlauben"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB-Debugging nicht zulässig"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Der momentan auf diesem Gerät angemeldete Nutzer kann das USB-Debugging nicht aktivieren. Um diese Funktion verwenden zu können, wechsle zum primären Nutzer."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-Port deaktiviert"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Zum Schutz deines Geräts vor Flüssigkeiten oder Fremdkörpern ist der USB-Port deaktiviert und erkennt kein Zubehör.\n\nDu wirst benachrichtigt, wenn der USB-Port wieder sicher verwendet werden kann."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom auf Bildschirmgröße"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Auf Bildschirmgröße anpassen"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
@@ -885,9 +882,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> Apps verwenden gerade: <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> App verwendet gerade: <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Details ansehen"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App, die <xliff:g id="TYPES_LIST">%s</xliff:g> verwendet"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apps, die <xliff:g id="TYPES_LIST">%s</xliff:g> verwenden"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -902,4 +899,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensoren aus"</string>
<string name="device_services" msgid="1191212554435440592">"Gerätedienste"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Kein Titel"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-el/strings.xml b/packages/SystemUI/res/values-el/strings.xml
index 52bcfce..23818956 100644
--- a/packages/SystemUI/res/values-el/strings.xml
+++ b/packages/SystemUI/res/values-el/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Να επιτρέπεται ο εντοπισμός σφαλμάτων USB;"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Το μοναδικό χαρακτηριστικό του κλειδιού RSA είναι:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Να επιτρέπεται πάντα από αυτόν τον υπολογιστή"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Να επιτρέπεται"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Δεν επιτρέπεται ο εντοπισμός σφαλμάτων USB"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Ο χρήστης που είναι συνδεδεμένος αυτήν τη στιγμή σε αυτήν τη συσκευή δεν μπορεί να ενεργοποιήσει τον εντοπισμό σφαλμάτων USB. Για να χρησιμοποιήσετε αυτήν τη λειτουργία, κάντε εναλλαγή στον κύριο χρήστη."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Η θύρα USB απενεργοποιήθηκε"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Για την προστασία της συσκευής σας από υγρασία ή ακαθαρσίες, η θύρα USB έχει απενεργοποιηθεί και δεν θα εντοπίζει τυχόν αξεσουάρ.\n\nΘα ειδοποιηθείτε όταν μπορείτε να χρησιμοποιήσετε ξανά με ασφάλεια τη θύρα USB."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Ζουμ σε πλήρη οθόνη"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Προβoλή σε πλήρη οθ."</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Στιγμιότυπο οθόνης"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> εφαρμογές χρησιμοποιούν το <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> εφαρμογή χρησιμοποιεί το <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Κατάλαβα"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Προβολή λεπτομ."</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Εφαρμογή που χρησιμοποιεί τις λειτουργίες <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Εφαρμογές που χρησιμοποιούν τις λειτουργίες <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Αισθητήρες ανενεργοί"</string>
<string name="device_services" msgid="1191212554435440592">"Υπηρεσίες συσκευής"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Χωρίς τίτλο"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-en-rAU/strings.xml b/packages/SystemUI/res/values-en-rAU/strings.xml
index 70208fb..63f6773 100644
--- a/packages/SystemUI/res/values-en-rAU/strings.xml
+++ b/packages/SystemUI/res/values-en-rAU/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Allow USB debugging?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"The computer\'s RSA key fingerprint is:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Always allow from this computer"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Allow"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB debugging not allowed"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"The user currently signed in to this device can\'t turn on USB debugging. To use this feature, switch to the primary user."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB port disabled"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"To protect your device from liquid or debris, the USB port is disabled and won’t detect any accessories.\n\nYou’ll be notified when it’s safe to use the USB port again."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom to fill screen"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Stretch to fill screen"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> applications are using your <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> application is using your <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Got it"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"View details"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App using your <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apps using your <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensors off"</string>
<string name="device_services" msgid="1191212554435440592">"Device Services"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"No title"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-en-rCA/strings.xml b/packages/SystemUI/res/values-en-rCA/strings.xml
index 3084403..d6539e7 100644
--- a/packages/SystemUI/res/values-en-rCA/strings.xml
+++ b/packages/SystemUI/res/values-en-rCA/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Allow USB debugging?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"The computer\'s RSA key fingerprint is:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Always allow from this computer"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Allow"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB debugging not allowed"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"The user currently signed in to this device can\'t turn on USB debugging. To use this feature, switch to the primary user."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB port disabled"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"To protect your device from liquid or debris, the USB port is disabled and won’t detect any accessories.\n\nYou’ll be notified when it’s safe to use the USB port again."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom to fill screen"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Stretch to fill screen"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> applications are using your <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> application is using your <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Got it"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"View details"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App using your <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apps using your <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensors off"</string>
<string name="device_services" msgid="1191212554435440592">"Device Services"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"No title"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-en-rGB/strings.xml b/packages/SystemUI/res/values-en-rGB/strings.xml
index 70208fb..63f6773 100644
--- a/packages/SystemUI/res/values-en-rGB/strings.xml
+++ b/packages/SystemUI/res/values-en-rGB/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Allow USB debugging?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"The computer\'s RSA key fingerprint is:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Always allow from this computer"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Allow"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB debugging not allowed"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"The user currently signed in to this device can\'t turn on USB debugging. To use this feature, switch to the primary user."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB port disabled"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"To protect your device from liquid or debris, the USB port is disabled and won’t detect any accessories.\n\nYou’ll be notified when it’s safe to use the USB port again."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom to fill screen"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Stretch to fill screen"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> applications are using your <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> application is using your <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Got it"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"View details"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App using your <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apps using your <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensors off"</string>
<string name="device_services" msgid="1191212554435440592">"Device Services"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"No title"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-en-rIN/strings.xml b/packages/SystemUI/res/values-en-rIN/strings.xml
index 70208fb..63f6773 100644
--- a/packages/SystemUI/res/values-en-rIN/strings.xml
+++ b/packages/SystemUI/res/values-en-rIN/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Allow USB debugging?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"The computer\'s RSA key fingerprint is:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Always allow from this computer"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Allow"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB debugging not allowed"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"The user currently signed in to this device can\'t turn on USB debugging. To use this feature, switch to the primary user."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB port disabled"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"To protect your device from liquid or debris, the USB port is disabled and won’t detect any accessories.\n\nYou’ll be notified when it’s safe to use the USB port again."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom to fill screen"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Stretch to fill screen"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> applications are using your <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> application is using your <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Got it"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"View details"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App using your <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apps using your <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensors off"</string>
<string name="device_services" msgid="1191212554435440592">"Device Services"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"No title"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-en-rXC-land/strings.xml b/packages/SystemUI/res/values-en-rXC-land/strings.xml
index 957164f..3566810 100644
--- a/packages/SystemUI/res/values-en-rXC-land/strings.xml
+++ b/packages/SystemUI/res/values-en-rXC-land/strings.xml
@@ -19,5 +19,5 @@
<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">"Screen is now locked in landscape orientation."</string>
+ <string name="toast_rotation_locked" msgid="7609673011431556092">"Screen is now locked in landscape orientation."</string>
</resources>
diff --git a/packages/SystemUI/res/values-en-rXC-ldrtl/strings.xml b/packages/SystemUI/res/values-en-rXC-ldrtl/strings.xml
index 51fb3ae..4c7ea16 100644
--- a/packages/SystemUI/res/values-en-rXC-ldrtl/strings.xml
+++ b/packages/SystemUI/res/values-en-rXC-ldrtl/strings.xml
@@ -19,5 +19,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="recents_quick_scrub_onboarding" msgid="3449337212132057178">"Drag left to quickly switch apps"</string>
+ <string name="recents_quick_scrub_onboarding" msgid="3449337212132057178">"Drag left to quickly switch apps"</string>
</resources>
diff --git a/packages/SystemUI/res/values-en-rXC/strings.xml b/packages/SystemUI/res/values-en-rXC/strings.xml
index 0154c82..36ef647 100644
--- a/packages/SystemUI/res/values-en-rXC/strings.xml
+++ b/packages/SystemUI/res/values-en-rXC/strings.xml
@@ -19,879 +19,884 @@
<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">"System UI"</string>
- <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Clear"</string>
- <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"No notifications"</string>
- <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"Ongoing"</string>
- <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notifications"</string>
- <string name="battery_low_title" msgid="9187898087363540349">"Battery may run out soon"</string>
- <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining"</string>
- <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> remaining, about <xliff:g id="TIME">%2$s</xliff:g> left based on your usage"</string>
- <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> remaining, about <xliff:g id="TIME">%2$s</xliff:g> left"</string>
- <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining. Battery Saver is on."</string>
- <string name="invalid_charger" msgid="2741987096648693172">"Can\'t charge via USB. Use the charger that came with your device."</string>
- <string name="invalid_charger_title" msgid="2836102177577255404">"Can\'t charge via USB"</string>
- <string name="invalid_charger_text" msgid="6480624964117840005">"Use the charger that came with your device"</string>
- <string name="battery_low_why" msgid="4553600287639198111">"Settings"</string>
- <string name="battery_saver_confirmation_title" msgid="2052100465684817154">"Turn on Battery Saver?"</string>
- <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"Turn on"</string>
- <string name="battery_saver_start_action" msgid="8187820911065797519">"Turn on Battery Saver"</string>
- <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Settings"</string>
- <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string>
- <string name="status_bar_settings_auto_rotation" msgid="3790482541357798421">"Auto-rotate screen"</string>
- <string name="status_bar_settings_mute_label" msgid="554682549917429396">"MUTE"</string>
- <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string>
- <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notifications"</string>
- <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth tethered"</string>
- <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Set up input methods"</string>
- <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Physical keyboard"</string>
- <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string>
- <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string>
- <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string>
- <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string>
- <string name="usb_accessory_uri_prompt" msgid="513450621413733343">"No installed apps work with this USB accessory. Learn more about this accessory at <xliff:g id="URL">%1$s</xliff:g>"</string>
- <string name="title_usb_accessory" msgid="4966265263465181372">"USB accessory"</string>
- <string name="label_view" msgid="6304565553218192990">"View"</string>
- <string name="always_use_device" msgid="4015357883336738417">"Always open <xliff:g id="APPLICATION">%1$s</xliff:g> when <xliff:g id="USB_DEVICE">%2$s</xliff:g> is connected"</string>
- <string name="always_use_accessory" msgid="3257892669444535154">"Always open <xliff:g id="APPLICATION">%1$s</xliff:g> when <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> is connected"</string>
- <string name="usb_debugging_title" msgid="4513918393387141949">"Allow USB debugging?"</string>
- <string name="usb_debugging_message" msgid="2220143855912376496">"The computer\'s RSA key fingerprint is:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
- <string name="usb_debugging_always" msgid="303335496705863070">"Always allow from this computer"</string>
- <string name="usb_debugging_allow" msgid="2272145052073254852">"Allow"</string>
- <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB debugging not allowed"</string>
- <string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"The user currently signed in to this device can\'t turn on USB debugging. To use this feature, switch to the primary user."</string>
- <string name="usb_contaminant_title" msgid="206854874263058490">"USB port disabled"</string>
- <string name="usb_contaminant_message" msgid="2205845572186473860">"To protect your device from liquid or debris, the USB port is disabled and won’t detect any accessories.\n\nYou’ll be notified when it’s safe to use the USB port again."</string>
- <string name="compat_mode_on" msgid="6623839244840638213">"Zoom to fill screen"</string>
- <string name="compat_mode_off" msgid="4434467572461327898">"Stretch to fill screen"</string>
- <string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
- <string name="screenshot_saving_ticker" msgid="7403652894056693515">"Saving screenshot…"</string>
- <string name="screenshot_saving_title" msgid="8242282144535555697">"Saving screenshot…"</string>
- <string name="screenshot_saved_title" msgid="5637073968117370753">"Screenshot saved"</string>
- <string name="screenshot_saved_text" msgid="7574667448002050363">"Tap to view your screenshot"</string>
- <string name="screenshot_failed_title" msgid="7612509838919089748">"Couldn\'t save screenshot"</string>
- <string name="screenshot_failed_to_save_unknown_text" msgid="3637758096565605541">"Try taking screenshot again"</string>
- <string name="screenshot_failed_to_save_text" msgid="3041612585107107310">"Can\'t save screenshot due to limited storage space"</string>
- <string name="screenshot_failed_to_capture_text" msgid="173674476457581486">"Taking screenshots isn\'t allowed by the app or your organization"</string>
- <string name="screenrecord_name" msgid="4196719243134204796">"Screen Recording"</string>
- <string name="screenrecord_channel_description" msgid="4630777331970993858">"Ongoing notification for a screen record session"</string>
- <string name="screenrecord_start_label" msgid="5177739269492196055">"Start Recording"</string>
- <string name="screenrecord_mic_label" msgid="4522870600914810019">"Record voiceover"</string>
- <string name="screenrecord_taps_label" msgid="1776467076607964790">"Show taps"</string>
- <string name="screenrecord_stop_label" msgid="2544887572381260038">"Stop"</string>
- <string name="screenrecord_pause_label" msgid="7162476078856786227">"Pause"</string>
- <string name="screenrecord_resume_label" msgid="3605818317015993314">"Resume"</string>
- <string name="screenrecord_cancel_label" msgid="3385204992871088609">"Cancel"</string>
- <string name="screenrecord_share_label" msgid="4197867360204019389">"Share"</string>
- <string name="screenrecord_delete_label" msgid="7893716870917824013">"Delete"</string>
- <string name="screenrecord_cancel_success" msgid="7768976011702614782">"Screen recording canceled"</string>
- <string name="screenrecord_save_message" msgid="4733982661301846778">"Screen recording saved, tap to view"</string>
- <string name="screenrecord_delete_description" msgid="5743190456090354585">"Screen recording deleted"</string>
- <string name="screenrecord_delete_error" msgid="8154904464563560282">"Error deleting screen recording"</string>
- <string name="screenrecord_permission_error" msgid="1526755299469001000">"Failed to get permissions"</string>
- <string name="usb_preference_title" msgid="6551050377388882787">"USB file transfer options"</string>
- <string name="use_mtp_button_title" msgid="4333504413563023626">"Mount as a media player (MTP)"</string>
- <string name="use_ptp_button_title" msgid="7517127540301625751">"Mount as a camera (PTP)"</string>
- <string name="installer_cd_button_title" msgid="2312667578562201583">"Install Android File Transfer app for Mac"</string>
- <string name="accessibility_back" msgid="567011538994429120">"Back"</string>
- <string name="accessibility_home" msgid="8217216074895377641">"Home"</string>
- <string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
- <string name="accessibility_accessibility_button" msgid="7601252764577607915">"Accessibility"</string>
- <string name="accessibility_rotate_button" msgid="7402949513740253006">"Rotate screen"</string>
- <string name="accessibility_recent" msgid="5208608566793607626">"Overview"</string>
- <string name="accessibility_search_light" msgid="1103867596330271848">"Search"</string>
- <string name="accessibility_camera_button" msgid="8064671582820358152">"Camera"</string>
- <string name="accessibility_phone_button" msgid="6738112589538563574">"Phone"</string>
- <string name="accessibility_voice_assist_button" msgid="487611083884852965">"Voice Assist"</string>
- <string name="accessibility_unlock_button" msgid="128158454631118828">"Unlock"</string>
- <string name="accessibility_waiting_for_fingerprint" msgid="4808860050517462885">"Waiting for fingerprint"</string>
- <string name="accessibility_unlock_without_fingerprint" msgid="7541705575183694446">"Unlock without using your fingerprint"</string>
- <string name="accessibility_scanning_face" msgid="769545173211758586">"Scanning face"</string>
- <string name="accessibility_send_smart_reply" msgid="7766727839703044493">"Send"</string>
- <string name="unlock_label" msgid="8779712358041029439">"unlock"</string>
- <string name="phone_label" msgid="2320074140205331708">"open phone"</string>
- <string name="voice_assist_label" msgid="3956854378310019854">"open voice assist"</string>
- <string name="camera_label" msgid="7261107956054836961">"open camera"</string>
- <string name="cancel" msgid="6442560571259935130">"Cancel"</string>
- <string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Help message area"</string>
- <string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confirm"</string>
- <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Try again"</string>
- <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Touch the fingerprint sensor"</string>
- <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Fingerprint icon"</string>
- <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Looking for you…"</string>
- <string name="accessibility_face_dialog_face_icon" msgid="2658119009870383490">"Face icon"</string>
- <string name="accessibility_compatibility_zoom_button" msgid="8461115318742350699">"Compatibility zoom button."</string>
- <string name="accessibility_compatibility_zoom_example" msgid="4220687294564945780">"Zoom smaller to larger screen."</string>
- <string name="accessibility_bluetooth_connected" msgid="2707027633242983370">"Bluetooth connected."</string>
- <string name="accessibility_bluetooth_disconnected" msgid="7416648669976870175">"Bluetooth disconnected."</string>
- <string name="accessibility_no_battery" msgid="358343022352820946">"No battery."</string>
- <string name="accessibility_battery_one_bar" msgid="7774887721891057523">"Battery one bar."</string>
- <string name="accessibility_battery_two_bars" msgid="8500650438735009973">"Battery two bars."</string>
- <string name="accessibility_battery_three_bars" msgid="2302983330865040446">"Battery three bars."</string>
- <string name="accessibility_battery_full" msgid="8909122401720158582">"Battery full."</string>
- <string name="accessibility_no_phone" msgid="4894708937052611281">"No phone."</string>
- <string name="accessibility_phone_one_bar" msgid="687699278132664115">"Phone one bar."</string>
- <string name="accessibility_phone_two_bars" msgid="8384905382804815201">"Phone two bars."</string>
- <string name="accessibility_phone_three_bars" msgid="8521904843919971885">"Phone three bars."</string>
- <string name="accessibility_phone_signal_full" msgid="6471834868580757898">"Phone signal full."</string>
- <string name="accessibility_no_data" msgid="4791966295096867555">"No data."</string>
- <string name="accessibility_data_one_bar" msgid="1415625833238273628">"Data one bar."</string>
- <string name="accessibility_data_two_bars" msgid="6166018492360432091">"Data two bars."</string>
- <string name="accessibility_data_three_bars" msgid="9167670452395038520">"Data three bars."</string>
- <string name="accessibility_data_signal_full" msgid="2708384608124519369">"Data signal full."</string>
- <string name="accessibility_wifi_name" msgid="7202151365171148501">"Connected to <xliff:g id="WIFI">%s</xliff:g>."</string>
- <string name="accessibility_bluetooth_name" msgid="8441517146585531676">"Connected to <xliff:g id="BLUETOOTH">%s</xliff:g>."</string>
- <string name="accessibility_cast_name" msgid="4026393061247081201">"Connected to <xliff:g id="CAST">%s</xliff:g>."</string>
- <string name="accessibility_no_wimax" msgid="4329180129727630368">"No WiMAX."</string>
- <string name="accessibility_wimax_one_bar" msgid="4170994299011863648">"WiMAX one bar."</string>
- <string name="accessibility_wimax_two_bars" msgid="9176236858336502288">"WiMAX two bars."</string>
- <string name="accessibility_wimax_three_bars" msgid="6116551636752103927">"WiMAX three bars."</string>
- <string name="accessibility_wimax_signal_full" msgid="2768089986795579558">"WiMAX signal full."</string>
- <string name="accessibility_ethernet_disconnected" msgid="5896059303377589469">"Ethernet disconnected."</string>
- <string name="accessibility_ethernet_connected" msgid="2692130313069182636">"Ethernet connected."</string>
- <string name="accessibility_no_signal" msgid="7064645320782585167">"No signal."</string>
- <string name="accessibility_not_connected" msgid="6395326276213402883">"Not connected."</string>
- <string name="accessibility_zero_bars" msgid="3806060224467027887">"Zero bars."</string>
- <string name="accessibility_one_bar" msgid="1685730113192081895">"One bar."</string>
- <string name="accessibility_two_bars" msgid="6437363648385206679">"Two bars."</string>
- <string name="accessibility_three_bars" msgid="2648241415119396648">"Three bars."</string>
- <string name="accessibility_signal_full" msgid="9122922886519676839">"Signal full."</string>
- <string name="accessibility_desc_on" msgid="2385254693624345265">"On."</string>
- <string name="accessibility_desc_off" msgid="6475508157786853157">"Off."</string>
- <string name="accessibility_desc_connected" msgid="8366256693719499665">"Connected."</string>
- <string name="accessibility_desc_connecting" msgid="3812924520316280149">"Connecting."</string>
- <string name="data_connection_gprs" msgid="7652872568358508452">"GPRS"</string>
- <string name="data_connection_hspa" msgid="1499615426569473562">"HSPA"</string>
- <string name="data_connection_3g" msgid="503045449315378373">"3G"</string>
- <string name="data_connection_3_5g" msgid="3164370985817123144">"H"</string>
- <string name="data_connection_3_5g_plus" msgid="4464630787664529264">"H+"</string>
- <string name="data_connection_4g" msgid="9139963475267449144">"4G"</string>
- <string name="data_connection_4g_plus" msgid="1148687201877800700">"4G+"</string>
- <string name="data_connection_lte" msgid="2694876797724028614">"LTE"</string>
- <string name="data_connection_lte_plus" msgid="3423013208570937424">"LTE+"</string>
- <string name="data_connection_5g" msgid="6357743323196864504">"5G"</string>
- <string name="data_connection_5g_plus" msgid="3284146603743732965">"5G+"</string>
- <string name="data_connection_cdma" msgid="8176597308239086780">"1X"</string>
- <string name="data_connection_roaming" msgid="6037232010953697354">"Roaming"</string>
- <string name="data_connection_edge" msgid="871835227939216682">"EDGE"</string>
- <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
- <string name="accessibility_no_sim" msgid="8274017118472455155">"No SIM."</string>
- <string name="accessibility_cell_data" msgid="5326139158682385073">"Mobile Data"</string>
- <string name="accessibility_cell_data_on" msgid="5927098403452994422">"Mobile Data On"</string>
- <string name="cell_data_off_content_description" msgid="4356113230238585072">"Mobile data off"</string>
- <string name="cell_data_off" msgid="1051264981229902873">"Off"</string>
- <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth tethering."</string>
- <string name="accessibility_airplane_mode" msgid="834748999790763092">"Airplane mode."</string>
- <string name="accessibility_vpn_on" msgid="5993385083262856059">"VPN on."</string>
- <string name="accessibility_no_sims" msgid="3957997018324995781">"No SIM card."</string>
- <string name="carrier_network_change_mode" msgid="8149202439957837762">"Carrier network changing"</string>
- <string name="accessibility_battery_details" msgid="7645516654955025422">"Open battery details"</string>
- <string name="accessibility_battery_level" msgid="7451474187113371965">"Battery <xliff:g id="NUMBER">%d</xliff:g> percent."</string>
- <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Battery charging, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> percent."</string>
- <string name="accessibility_settings_button" msgid="799583911231893380">"System settings."</string>
- <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notifications."</string>
- <string name="accessibility_overflow_action" msgid="5681882033274783311">"See all notifications"</string>
- <string name="accessibility_remove_notification" msgid="3603099514902182350">"Clear notification."</string>
- <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS enabled."</string>
- <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS acquiring."</string>
- <string name="accessibility_tty_enabled" msgid="4613200365379426561">"TeleTypewriter enabled."</string>
- <string name="accessibility_ringer_vibrate" msgid="666585363364155055">"Ringer vibrate."</string>
- <string name="accessibility_ringer_silent" msgid="9061243307939135383">"Ringer silent."</string>
+ <string name="app_label" msgid="7164937344850004466">"System UI"</string>
+ <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Clear"</string>
+ <string name="status_bar_no_notifications_title" msgid="4755261167193833213">"No notifications"</string>
+ <string name="status_bar_ongoing_events_title" msgid="1682504513316879202">"Ongoing"</string>
+ <string name="status_bar_latest_events_title" msgid="6594767438577593172">"Notifications"</string>
+ <string name="battery_low_title" msgid="9187898087363540349">"Battery may run out soon"</string>
+ <string name="battery_low_percent_format" msgid="2900940511201380775">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining"</string>
+ <string name="battery_low_percent_format_hybrid" msgid="6838677459286775617">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> remaining, about <xliff:g id="TIME">%2$s</xliff:g> left based on your usage"</string>
+ <string name="battery_low_percent_format_hybrid_short" msgid="9025795469949145586">"<xliff:g id="PERCENTAGE">%1$s</xliff:g> remaining, about <xliff:g id="TIME">%2$s</xliff:g> left"</string>
+ <string name="battery_low_percent_format_saver_started" msgid="7879389868952879166">"<xliff:g id="PERCENTAGE">%s</xliff:g> remaining. Battery Saver is on."</string>
+ <string name="invalid_charger" msgid="2741987096648693172">"Can\'t charge via USB. Use the charger that came with your device."</string>
+ <string name="invalid_charger_title" msgid="2836102177577255404">"Can\'t charge via USB"</string>
+ <string name="invalid_charger_text" msgid="6480624964117840005">"Use the charger that came with your device"</string>
+ <string name="battery_low_why" msgid="4553600287639198111">"Settings"</string>
+ <string name="battery_saver_confirmation_title" msgid="2052100465684817154">"Turn on Battery Saver?"</string>
+ <string name="battery_saver_confirmation_ok" msgid="7507968430447930257">"Turn on"</string>
+ <string name="battery_saver_start_action" msgid="8187820911065797519">"Turn on Battery Saver"</string>
+ <string name="status_bar_settings_settings_button" msgid="3023889916699270224">"Settings"</string>
+ <string name="status_bar_settings_wifi_button" msgid="1733928151698311923">"Wi-Fi"</string>
+ <string name="status_bar_settings_auto_rotation" msgid="3790482541357798421">"Auto-rotate screen"</string>
+ <string name="status_bar_settings_mute_label" msgid="554682549917429396">"MUTE"</string>
+ <string name="status_bar_settings_auto_brightness_label" msgid="511453614962324674">"AUTO"</string>
+ <string name="status_bar_settings_notifications" msgid="397146176280905137">"Notifications"</string>
+ <string name="bluetooth_tethered" msgid="7094101612161133267">"Bluetooth tethered"</string>
+ <string name="status_bar_input_method_settings_configure_input_methods" msgid="3504292471512317827">"Set up input methods"</string>
+ <string name="status_bar_use_physical_keyboard" msgid="7551903084416057810">"Physical keyboard"</string>
+ <string name="usb_device_permission_prompt" msgid="1825685909587559679">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string>
+ <string name="usb_accessory_permission_prompt" msgid="2465531696941369047">"Allow <xliff:g id="APPLICATION">%1$s</xliff:g> to access <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string>
+ <string name="usb_device_confirm_prompt" msgid="7440562274256843905">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_DEVICE">%2$s</xliff:g>?"</string>
+ <string name="usb_accessory_confirm_prompt" msgid="4333670517539993561">"Open <xliff:g id="APPLICATION">%1$s</xliff:g> to handle <xliff:g id="USB_ACCESSORY">%2$s</xliff:g>?"</string>
+ <string name="usb_accessory_uri_prompt" msgid="513450621413733343">"No installed apps work with this USB accessory. Learn more about this accessory at <xliff:g id="URL">%1$s</xliff:g>"</string>
+ <string name="title_usb_accessory" msgid="4966265263465181372">"USB accessory"</string>
+ <string name="label_view" msgid="6304565553218192990">"View"</string>
+ <string name="always_use_device" msgid="4015357883336738417">"Always open <xliff:g id="APPLICATION">%1$s</xliff:g> when <xliff:g id="USB_DEVICE">%2$s</xliff:g> is connected"</string>
+ <string name="always_use_accessory" msgid="3257892669444535154">"Always open <xliff:g id="APPLICATION">%1$s</xliff:g> when <xliff:g id="USB_ACCESSORY">%2$s</xliff:g> is connected"</string>
+ <string name="usb_debugging_title" msgid="4513918393387141949">"Allow USB debugging?"</string>
+ <string name="usb_debugging_message" msgid="2220143855912376496">"The computer\'s RSA key fingerprint is:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
+ <string name="usb_debugging_always" msgid="303335496705863070">"Always allow from this computer"</string>
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Allow"</string>
+ <string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB debugging not allowed"</string>
+ <string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"The user currently signed in to this device can\'t turn on USB debugging. To use this feature, switch to the primary user."</string>
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB port disabled"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"To protect your device from liquid or debris, the USB port is disabled and won’t detect any accessories.\n\nYou’ll be notified when it’s safe to use the USB port again."</string>
+ <string name="compat_mode_on" msgid="6623839244840638213">"Zoom to fill screen"</string>
+ <string name="compat_mode_off" msgid="4434467572461327898">"Stretch to fill screen"</string>
+ <string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
+ <string name="screenshot_saving_ticker" msgid="7403652894056693515">"Saving screenshot…"</string>
+ <string name="screenshot_saving_title" msgid="8242282144535555697">"Saving screenshot…"</string>
+ <string name="screenshot_saved_title" msgid="5637073968117370753">"Screenshot saved"</string>
+ <string name="screenshot_saved_text" msgid="7574667448002050363">"Tap to view your screenshot"</string>
+ <string name="screenshot_failed_title" msgid="7612509838919089748">"Couldn\'t save screenshot"</string>
+ <string name="screenshot_failed_to_save_unknown_text" msgid="3637758096565605541">"Try taking screenshot again"</string>
+ <string name="screenshot_failed_to_save_text" msgid="3041612585107107310">"Can\'t save screenshot due to limited storage space"</string>
+ <string name="screenshot_failed_to_capture_text" msgid="173674476457581486">"Taking screenshots isn\'t allowed by the app or your organization"</string>
+ <string name="screenrecord_name" msgid="4196719243134204796">"Screen Recording"</string>
+ <string name="screenrecord_channel_description" msgid="4630777331970993858">"Ongoing notification for a screen record session"</string>
+ <string name="screenrecord_start_label" msgid="5177739269492196055">"Start Recording"</string>
+ <string name="screenrecord_mic_label" msgid="4522870600914810019">"Record voiceover"</string>
+ <string name="screenrecord_taps_label" msgid="1776467076607964790">"Show taps"</string>
+ <string name="screenrecord_stop_label" msgid="2544887572381260038">"Stop"</string>
+ <string name="screenrecord_pause_label" msgid="7162476078856786227">"Pause"</string>
+ <string name="screenrecord_resume_label" msgid="3605818317015993314">"Resume"</string>
+ <string name="screenrecord_cancel_label" msgid="3385204992871088609">"Cancel"</string>
+ <string name="screenrecord_share_label" msgid="4197867360204019389">"Share"</string>
+ <string name="screenrecord_delete_label" msgid="7893716870917824013">"Delete"</string>
+ <string name="screenrecord_cancel_success" msgid="7768976011702614782">"Screen recording canceled"</string>
+ <string name="screenrecord_save_message" msgid="4733982661301846778">"Screen recording saved, tap to view"</string>
+ <string name="screenrecord_delete_description" msgid="5743190456090354585">"Screen recording deleted"</string>
+ <string name="screenrecord_delete_error" msgid="8154904464563560282">"Error deleting screen recording"</string>
+ <string name="screenrecord_permission_error" msgid="1526755299469001000">"Failed to get permissions"</string>
+ <string name="usb_preference_title" msgid="6551050377388882787">"USB file transfer options"</string>
+ <string name="use_mtp_button_title" msgid="4333504413563023626">"Mount as a media player (MTP)"</string>
+ <string name="use_ptp_button_title" msgid="7517127540301625751">"Mount as a camera (PTP)"</string>
+ <string name="installer_cd_button_title" msgid="2312667578562201583">"Install Android File Transfer app for Mac"</string>
+ <string name="accessibility_back" msgid="567011538994429120">"Back"</string>
+ <string name="accessibility_home" msgid="8217216074895377641">"Home"</string>
+ <string name="accessibility_menu" msgid="316839303324695949">"Menu"</string>
+ <string name="accessibility_accessibility_button" msgid="7601252764577607915">"Accessibility"</string>
+ <string name="accessibility_rotate_button" msgid="7402949513740253006">"Rotate screen"</string>
+ <string name="accessibility_recent" msgid="5208608566793607626">"Overview"</string>
+ <string name="accessibility_search_light" msgid="1103867596330271848">"Search"</string>
+ <string name="accessibility_camera_button" msgid="8064671582820358152">"Camera"</string>
+ <string name="accessibility_phone_button" msgid="6738112589538563574">"Phone"</string>
+ <string name="accessibility_voice_assist_button" msgid="487611083884852965">"Voice Assist"</string>
+ <string name="accessibility_unlock_button" msgid="128158454631118828">"Unlock"</string>
+ <string name="accessibility_waiting_for_fingerprint" msgid="4808860050517462885">"Waiting for fingerprint"</string>
+ <string name="accessibility_unlock_without_fingerprint" msgid="7541705575183694446">"Unlock without using your fingerprint"</string>
+ <string name="accessibility_scanning_face" msgid="769545173211758586">"Scanning face"</string>
+ <string name="accessibility_send_smart_reply" msgid="7766727839703044493">"Send"</string>
+ <string name="unlock_label" msgid="8779712358041029439">"unlock"</string>
+ <string name="phone_label" msgid="2320074140205331708">"open phone"</string>
+ <string name="voice_assist_label" msgid="3956854378310019854">"open voice assist"</string>
+ <string name="camera_label" msgid="7261107956054836961">"open camera"</string>
+ <string name="cancel" msgid="6442560571259935130">"Cancel"</string>
+ <string name="accessibility_biometric_dialog_help_area" msgid="8953787076940186847">"Help message area"</string>
+ <string name="biometric_dialog_confirm" msgid="6468457350041712674">"Confirm"</string>
+ <string name="biometric_dialog_try_again" msgid="1900185172633183201">"Try again"</string>
+ <string name="fingerprint_dialog_touch_sensor" msgid="8511557690663181761">"Touch the fingerprint sensor"</string>
+ <string name="accessibility_fingerprint_dialog_fingerprint_icon" msgid="3125122495414253226">"Fingerprint icon"</string>
+ <string name="face_dialog_looking_for_face" msgid="7049276266074494689">"Looking for you…"</string>
+ <string name="accessibility_face_dialog_face_icon" msgid="2658119009870383490">"Face icon"</string>
+ <string name="accessibility_compatibility_zoom_button" msgid="8461115318742350699">"Compatibility zoom button."</string>
+ <string name="accessibility_compatibility_zoom_example" msgid="4220687294564945780">"Zoom smaller to larger screen."</string>
+ <string name="accessibility_bluetooth_connected" msgid="2707027633242983370">"Bluetooth connected."</string>
+ <string name="accessibility_bluetooth_disconnected" msgid="7416648669976870175">"Bluetooth disconnected."</string>
+ <string name="accessibility_no_battery" msgid="358343022352820946">"No battery."</string>
+ <string name="accessibility_battery_one_bar" msgid="7774887721891057523">"Battery one bar."</string>
+ <string name="accessibility_battery_two_bars" msgid="8500650438735009973">"Battery two bars."</string>
+ <string name="accessibility_battery_three_bars" msgid="2302983330865040446">"Battery three bars."</string>
+ <string name="accessibility_battery_full" msgid="8909122401720158582">"Battery full."</string>
+ <string name="accessibility_no_phone" msgid="4894708937052611281">"No phone."</string>
+ <string name="accessibility_phone_one_bar" msgid="687699278132664115">"Phone one bar."</string>
+ <string name="accessibility_phone_two_bars" msgid="8384905382804815201">"Phone two bars."</string>
+ <string name="accessibility_phone_three_bars" msgid="8521904843919971885">"Phone three bars."</string>
+ <string name="accessibility_phone_signal_full" msgid="6471834868580757898">"Phone signal full."</string>
+ <string name="accessibility_no_data" msgid="4791966295096867555">"No data."</string>
+ <string name="accessibility_data_one_bar" msgid="1415625833238273628">"Data one bar."</string>
+ <string name="accessibility_data_two_bars" msgid="6166018492360432091">"Data two bars."</string>
+ <string name="accessibility_data_three_bars" msgid="9167670452395038520">"Data three bars."</string>
+ <string name="accessibility_data_signal_full" msgid="2708384608124519369">"Data signal full."</string>
+ <string name="accessibility_wifi_name" msgid="7202151365171148501">"Connected to <xliff:g id="WIFI">%s</xliff:g>."</string>
+ <string name="accessibility_bluetooth_name" msgid="8441517146585531676">"Connected to <xliff:g id="BLUETOOTH">%s</xliff:g>."</string>
+ <string name="accessibility_cast_name" msgid="4026393061247081201">"Connected to <xliff:g id="CAST">%s</xliff:g>."</string>
+ <string name="accessibility_no_wimax" msgid="4329180129727630368">"No WiMAX."</string>
+ <string name="accessibility_wimax_one_bar" msgid="4170994299011863648">"WiMAX one bar."</string>
+ <string name="accessibility_wimax_two_bars" msgid="9176236858336502288">"WiMAX two bars."</string>
+ <string name="accessibility_wimax_three_bars" msgid="6116551636752103927">"WiMAX three bars."</string>
+ <string name="accessibility_wimax_signal_full" msgid="2768089986795579558">"WiMAX signal full."</string>
+ <string name="accessibility_ethernet_disconnected" msgid="5896059303377589469">"Ethernet disconnected."</string>
+ <string name="accessibility_ethernet_connected" msgid="2692130313069182636">"Ethernet connected."</string>
+ <string name="accessibility_no_signal" msgid="7064645320782585167">"No signal."</string>
+ <string name="accessibility_not_connected" msgid="6395326276213402883">"Not connected."</string>
+ <string name="accessibility_zero_bars" msgid="3806060224467027887">"Zero bars."</string>
+ <string name="accessibility_one_bar" msgid="1685730113192081895">"One bar."</string>
+ <string name="accessibility_two_bars" msgid="6437363648385206679">"Two bars."</string>
+ <string name="accessibility_three_bars" msgid="2648241415119396648">"Three bars."</string>
+ <string name="accessibility_signal_full" msgid="9122922886519676839">"Signal full."</string>
+ <string name="accessibility_desc_on" msgid="2385254693624345265">"On."</string>
+ <string name="accessibility_desc_off" msgid="6475508157786853157">"Off."</string>
+ <string name="accessibility_desc_connected" msgid="8366256693719499665">"Connected."</string>
+ <string name="accessibility_desc_connecting" msgid="3812924520316280149">"Connecting."</string>
+ <string name="data_connection_gprs" msgid="7652872568358508452">"GPRS"</string>
+ <string name="data_connection_hspa" msgid="1499615426569473562">"HSPA"</string>
+ <string name="data_connection_3g" msgid="503045449315378373">"3G"</string>
+ <string name="data_connection_3_5g" msgid="3164370985817123144">"H"</string>
+ <string name="data_connection_3_5g_plus" msgid="4464630787664529264">"H+"</string>
+ <string name="data_connection_4g" msgid="9139963475267449144">"4G"</string>
+ <string name="data_connection_4g_plus" msgid="1148687201877800700">"4G+"</string>
+ <string name="data_connection_lte" msgid="2694876797724028614">"LTE"</string>
+ <string name="data_connection_lte_plus" msgid="3423013208570937424">"LTE+"</string>
+ <string name="data_connection_5g" msgid="6357743323196864504">"5G"</string>
+ <string name="data_connection_5g_plus" msgid="3284146603743732965">"5G+"</string>
+ <string name="data_connection_cdma" msgid="8176597308239086780">"1X"</string>
+ <string name="data_connection_roaming" msgid="6037232010953697354">"Roaming"</string>
+ <string name="data_connection_edge" msgid="871835227939216682">"EDGE"</string>
+ <string name="accessibility_data_connection_wifi" msgid="2324496756590645221">"Wi-Fi"</string>
+ <string name="accessibility_no_sim" msgid="8274017118472455155">"No SIM."</string>
+ <string name="accessibility_cell_data" msgid="5326139158682385073">"Mobile Data"</string>
+ <string name="accessibility_cell_data_on" msgid="5927098403452994422">"Mobile Data On"</string>
+ <string name="cell_data_off_content_description" msgid="4356113230238585072">"Mobile data off"</string>
+ <string name="cell_data_off" msgid="1051264981229902873">"Off"</string>
+ <string name="accessibility_bluetooth_tether" msgid="4102784498140271969">"Bluetooth tethering."</string>
+ <string name="accessibility_airplane_mode" msgid="834748999790763092">"Airplane mode."</string>
+ <string name="accessibility_vpn_on" msgid="5993385083262856059">"VPN on."</string>
+ <string name="accessibility_no_sims" msgid="3957997018324995781">"No SIM card."</string>
+ <string name="carrier_network_change_mode" msgid="8149202439957837762">"Carrier network changing"</string>
+ <string name="accessibility_battery_details" msgid="7645516654955025422">"Open battery details"</string>
+ <string name="accessibility_battery_level" msgid="7451474187113371965">"Battery <xliff:g id="NUMBER">%d</xliff:g> percent."</string>
+ <string name="accessibility_battery_level_charging" msgid="1147587904439319646">"Battery charging, <xliff:g id="BATTERY_PERCENTAGE">%d</xliff:g> percent."</string>
+ <string name="accessibility_settings_button" msgid="799583911231893380">"System settings."</string>
+ <string name="accessibility_notifications_button" msgid="4498000369779421892">"Notifications."</string>
+ <string name="accessibility_overflow_action" msgid="5681882033274783311">"See all notifications"</string>
+ <string name="accessibility_remove_notification" msgid="3603099514902182350">"Clear notification."</string>
+ <string name="accessibility_gps_enabled" msgid="3511469499240123019">"GPS enabled."</string>
+ <string name="accessibility_gps_acquiring" msgid="8959333351058967158">"GPS acquiring."</string>
+ <string name="accessibility_tty_enabled" msgid="4613200365379426561">"TeleTypewriter enabled."</string>
+ <string name="accessibility_ringer_vibrate" msgid="666585363364155055">"Ringer vibrate."</string>
+ <string name="accessibility_ringer_silent" msgid="9061243307939135383">"Ringer silent."</string>
<!-- no translation found for accessibility_casting (6887382141726543668) -->
<skip />
<!-- no translation found for accessibility_work_mode (702887484664647430) -->
<skip />
- <string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notification dismissed."</string>
- <string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Notification shade."</string>
- <string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Quick settings."</string>
- <string name="accessibility_desc_lock_screen" msgid="5625143713611759164">"Lock screen."</string>
- <string name="accessibility_desc_settings" msgid="3417884241751434521">"Settings"</string>
- <string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Overview."</string>
- <string name="accessibility_desc_work_lock" msgid="4288774420752813383">"Work lock screen"</string>
- <string name="accessibility_desc_close" msgid="7479755364962766729">"Close"</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">"Wifi turned off."</string>
- <string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi turned on."</string>
- <string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobile <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">"Battery <xliff:g id="STATE">%s</xliff:g>."</string>
- <string name="accessibility_quick_settings_airplane_off" msgid="7786329360056634412">"Airplane mode off."</string>
- <string name="accessibility_quick_settings_airplane_on" msgid="6406141469157599296">"Airplane mode on."</string>
- <string name="accessibility_quick_settings_airplane_changed_off" msgid="66846307818850664">"Airplane mode turned off."</string>
- <string name="accessibility_quick_settings_airplane_changed_on" msgid="8983005603505087728">"Airplane mode turned on."</string>
- <string name="accessibility_quick_settings_dnd_none_on" msgid="2960643943620637020">"total silence"</string>
- <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3357131899365865386">"alarms only"</string>
- <string name="accessibility_quick_settings_dnd" msgid="6607873236717185815">"Do not disturb."</string>
- <string name="accessibility_quick_settings_dnd_changed_off" msgid="898107593453022935">"Do not disturb turned off."</string>
- <string name="accessibility_quick_settings_dnd_changed_on" msgid="4483780856613561039">"Do not disturb turned on."</string>
- <string name="accessibility_quick_settings_bluetooth" msgid="6341675755803320038">"Bluetooth."</string>
- <string name="accessibility_quick_settings_bluetooth_off" msgid="2133631372372064339">"Bluetooth off."</string>
- <string name="accessibility_quick_settings_bluetooth_on" msgid="7681999166216621838">"Bluetooth on."</string>
- <string name="accessibility_quick_settings_bluetooth_connecting" msgid="6953242966685343855">"Bluetooth connecting."</string>
- <string name="accessibility_quick_settings_bluetooth_connected" msgid="4306637793614573659">"Bluetooth connected."</string>
- <string name="accessibility_quick_settings_bluetooth_changed_off" msgid="2730003763480934529">"Bluetooth turned off."</string>
- <string name="accessibility_quick_settings_bluetooth_changed_on" msgid="8722351798763206577">"Bluetooth turned on."</string>
- <string name="accessibility_quick_settings_location_off" msgid="5119080556976115520">"Location reporting off."</string>
- <string name="accessibility_quick_settings_location_on" msgid="5809937096590102036">"Location reporting on."</string>
- <string name="accessibility_quick_settings_location_changed_off" msgid="8526845571503387376">"Location reporting turned off."</string>
- <string name="accessibility_quick_settings_location_changed_on" msgid="339403053079338468">"Location reporting turned on."</string>
- <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarm set for <xliff:g id="TIME">%s</xliff:g>."</string>
- <string name="accessibility_quick_settings_close" msgid="3115847794692516306">"Close panel."</string>
- <string name="accessibility_quick_settings_more_time" msgid="3659274935356197708">"More time."</string>
- <string name="accessibility_quick_settings_less_time" msgid="2404728746293515623">"Less time."</string>
- <string name="accessibility_quick_settings_flashlight_off" msgid="4936432000069786988">"Flashlight off."</string>
- <string name="accessibility_quick_settings_flashlight_unavailable" msgid="8012811023312280810">"Flashlight unavailable."</string>
- <string name="accessibility_quick_settings_flashlight_on" msgid="2003479320007841077">"Flashlight on."</string>
- <string name="accessibility_quick_settings_flashlight_changed_off" msgid="3303701786768224304">"Flashlight turned off."</string>
- <string name="accessibility_quick_settings_flashlight_changed_on" msgid="6531793301533894686">"Flashlight turned on."</string>
- <string name="accessibility_quick_settings_color_inversion_changed_off" msgid="4406577213290173911">"Color inversion turned off."</string>
- <string name="accessibility_quick_settings_color_inversion_changed_on" msgid="6897462320184911126">"Color inversion turned on."</string>
- <string name="accessibility_quick_settings_hotspot_changed_off" msgid="5004708003447561394">"Mobile hotspot turned off."</string>
- <string name="accessibility_quick_settings_hotspot_changed_on" msgid="2890951609226476206">"Mobile hotspot turned on."</string>
- <string name="accessibility_casting_turned_off" msgid="1430668982271976172">"Screen casting stopped."</string>
- <string name="accessibility_quick_settings_work_mode_off" msgid="7045417396436552890">"Work mode off."</string>
- <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Work mode on."</string>
- <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Work mode turned off."</string>
- <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Work mode turned on."</string>
- <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Data Saver turned off."</string>
- <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Data Saver turned on."</string>
- <string name="accessibility_quick_settings_sensor_privacy_changed_off" msgid="5152819588955163090">"Sensor Privacy turned off."</string>
- <string name="accessibility_quick_settings_sensor_privacy_changed_on" msgid="529705259565826355">"Sensor Privacy turned on."</string>
- <string name="accessibility_brightness" msgid="8003681285547803095">"Display brightness"</string>
- <string name="accessibility_ambient_display_charging" msgid="9084521679384069087">"Charging"</string>
- <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G data is paused"</string>
- <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G data is paused"</string>
- <string name="data_usage_disabled_dialog_mobile_title" msgid="6801382439018099779">"Mobile data is paused"</string>
- <string name="data_usage_disabled_dialog_title" msgid="3932437232199671967">"Data is paused"</string>
- <string name="data_usage_disabled_dialog" msgid="4919541636934603816">"The data limit you set has been reached. You are no longer using mobile data.\n\nIf you resume, charges may apply for data usage."</string>
- <string name="data_usage_disabled_dialog_enable" msgid="1412395410306390593">"Resume"</string>
- <string name="gps_notification_searching_text" msgid="8574247005642736060">"Searching for GPS"</string>
- <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="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
+ <string name="accessibility_notification_dismissed" msgid="854211387186306927">"Notification dismissed."</string>
+ <string name="accessibility_desc_notification_shade" msgid="4690274844447504208">"Notification shade."</string>
+ <string name="accessibility_desc_quick_settings" msgid="6186378411582437046">"Quick settings."</string>
+ <string name="accessibility_desc_lock_screen" msgid="5625143713611759164">"Lock screen."</string>
+ <string name="accessibility_desc_settings" msgid="3417884241751434521">"Settings"</string>
+ <string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Overview."</string>
+ <string name="accessibility_desc_work_lock" msgid="4288774420752813383">"Work lock screen"</string>
+ <string name="accessibility_desc_close" msgid="7479755364962766729">"Close"</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">"Wifi turned off."</string>
+ <string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi turned on."</string>
+ <string name="accessibility_quick_settings_mobile" msgid="4876806564086241341">"Mobile <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">"Battery <xliff:g id="STATE">%s</xliff:g>."</string>
+ <string name="accessibility_quick_settings_airplane_off" msgid="7786329360056634412">"Airplane mode off."</string>
+ <string name="accessibility_quick_settings_airplane_on" msgid="6406141469157599296">"Airplane mode on."</string>
+ <string name="accessibility_quick_settings_airplane_changed_off" msgid="66846307818850664">"Airplane mode turned off."</string>
+ <string name="accessibility_quick_settings_airplane_changed_on" msgid="8983005603505087728">"Airplane mode turned on."</string>
+ <string name="accessibility_quick_settings_dnd_none_on" msgid="2960643943620637020">"total silence"</string>
+ <string name="accessibility_quick_settings_dnd_alarms_on" msgid="3357131899365865386">"alarms only"</string>
+ <string name="accessibility_quick_settings_dnd" msgid="6607873236717185815">"Do not disturb."</string>
+ <string name="accessibility_quick_settings_dnd_changed_off" msgid="898107593453022935">"Do not disturb turned off."</string>
+ <string name="accessibility_quick_settings_dnd_changed_on" msgid="4483780856613561039">"Do not disturb turned on."</string>
+ <string name="accessibility_quick_settings_bluetooth" msgid="6341675755803320038">"Bluetooth."</string>
+ <string name="accessibility_quick_settings_bluetooth_off" msgid="2133631372372064339">"Bluetooth off."</string>
+ <string name="accessibility_quick_settings_bluetooth_on" msgid="7681999166216621838">"Bluetooth on."</string>
+ <string name="accessibility_quick_settings_bluetooth_connecting" msgid="6953242966685343855">"Bluetooth connecting."</string>
+ <string name="accessibility_quick_settings_bluetooth_connected" msgid="4306637793614573659">"Bluetooth connected."</string>
+ <string name="accessibility_quick_settings_bluetooth_changed_off" msgid="2730003763480934529">"Bluetooth turned off."</string>
+ <string name="accessibility_quick_settings_bluetooth_changed_on" msgid="8722351798763206577">"Bluetooth turned on."</string>
+ <string name="accessibility_quick_settings_location_off" msgid="5119080556976115520">"Location reporting off."</string>
+ <string name="accessibility_quick_settings_location_on" msgid="5809937096590102036">"Location reporting on."</string>
+ <string name="accessibility_quick_settings_location_changed_off" msgid="8526845571503387376">"Location reporting turned off."</string>
+ <string name="accessibility_quick_settings_location_changed_on" msgid="339403053079338468">"Location reporting turned on."</string>
+ <string name="accessibility_quick_settings_alarm" msgid="3959908972897295660">"Alarm set for <xliff:g id="TIME">%s</xliff:g>."</string>
+ <string name="accessibility_quick_settings_close" msgid="3115847794692516306">"Close panel."</string>
+ <string name="accessibility_quick_settings_more_time" msgid="3659274935356197708">"More time."</string>
+ <string name="accessibility_quick_settings_less_time" msgid="2404728746293515623">"Less time."</string>
+ <string name="accessibility_quick_settings_flashlight_off" msgid="4936432000069786988">"Flashlight off."</string>
+ <string name="accessibility_quick_settings_flashlight_unavailable" msgid="8012811023312280810">"Flashlight unavailable."</string>
+ <string name="accessibility_quick_settings_flashlight_on" msgid="2003479320007841077">"Flashlight on."</string>
+ <string name="accessibility_quick_settings_flashlight_changed_off" msgid="3303701786768224304">"Flashlight turned off."</string>
+ <string name="accessibility_quick_settings_flashlight_changed_on" msgid="6531793301533894686">"Flashlight turned on."</string>
+ <string name="accessibility_quick_settings_color_inversion_changed_off" msgid="4406577213290173911">"Color inversion turned off."</string>
+ <string name="accessibility_quick_settings_color_inversion_changed_on" msgid="6897462320184911126">"Color inversion turned on."</string>
+ <string name="accessibility_quick_settings_hotspot_changed_off" msgid="5004708003447561394">"Mobile hotspot turned off."</string>
+ <string name="accessibility_quick_settings_hotspot_changed_on" msgid="2890951609226476206">"Mobile hotspot turned on."</string>
+ <string name="accessibility_casting_turned_off" msgid="1430668982271976172">"Screen casting stopped."</string>
+ <string name="accessibility_quick_settings_work_mode_off" msgid="7045417396436552890">"Work mode off."</string>
+ <string name="accessibility_quick_settings_work_mode_on" msgid="7650588553988014341">"Work mode on."</string>
+ <string name="accessibility_quick_settings_work_mode_changed_off" msgid="5605534876107300711">"Work mode turned off."</string>
+ <string name="accessibility_quick_settings_work_mode_changed_on" msgid="249840330756998612">"Work mode turned on."</string>
+ <string name="accessibility_quick_settings_data_saver_changed_off" msgid="650231949881093289">"Data Saver turned off."</string>
+ <string name="accessibility_quick_settings_data_saver_changed_on" msgid="4218725402373934151">"Data Saver turned on."</string>
+ <string name="accessibility_quick_settings_sensor_privacy_changed_off" msgid="5152819588955163090">"Sensor Privacy turned off."</string>
+ <string name="accessibility_quick_settings_sensor_privacy_changed_on" msgid="529705259565826355">"Sensor Privacy turned on."</string>
+ <string name="accessibility_brightness" msgid="8003681285547803095">"Display brightness"</string>
+ <string name="accessibility_ambient_display_charging" msgid="9084521679384069087">"Charging"</string>
+ <string name="data_usage_disabled_dialog_3g_title" msgid="5281770593459841889">"2G-3G data is paused"</string>
+ <string name="data_usage_disabled_dialog_4g_title" msgid="1601769736881078016">"4G data is paused"</string>
+ <string name="data_usage_disabled_dialog_mobile_title" msgid="6801382439018099779">"Mobile data is paused"</string>
+ <string name="data_usage_disabled_dialog_title" msgid="3932437232199671967">"Data is paused"</string>
+ <string name="data_usage_disabled_dialog" msgid="4919541636934603816">"The data limit you set has been reached. You are no longer using mobile data.\n\nIf you resume, charges may apply for data usage."</string>
+ <string name="data_usage_disabled_dialog_enable" msgid="1412395410306390593">"Resume"</string>
+ <string name="gps_notification_searching_text" msgid="8574247005642736060">"Searching for GPS"</string>
+ <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="notification_group_overflow_indicator_ambient" msgid="879560382990377886">"<xliff:g id="NOTIFICATION_TITLE">%1$s</xliff:g>, +<xliff:g id="OVERFLOW">%2$s</xliff:g>"</string>
<plurals name="notification_group_overflow_description" formatted="false" msgid="4579313201268495404">
- <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> more notifications inside.</item>
- <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> more notification inside.</item>
+ <item quantity="other"><xliff:g id="NUMBER_1">%s</xliff:g> more notifications inside.</item>
+ <item quantity="one"><xliff:g id="NUMBER_0">%s</xliff:g> more notification inside.</item>
</plurals>
- <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>
- <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Screen is locked in landscape orientation."</string>
- <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Screen is locked in portrait orientation."</string>
- <string name="accessibility_rotation_lock_off_changed" msgid="8134601071026305153">"Screen will now rotate automatically."</string>
- <string name="accessibility_rotation_lock_on_landscape_changed" msgid="3135965553707519743">"Screen is now locked in landscape orientation."</string>
- <string name="accessibility_rotation_lock_on_portrait_changed" msgid="8922481981834012126">"Screen is now locked in portrait orientation."</string>
- <string name="dessert_case" msgid="1295161776223959221">"Dessert Case"</string>
- <string name="start_dreams" msgid="5640361424498338327">"Screen saver"</string>
- <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string>
- <string name="quick_settings_header_onboarding_text" msgid="8030309023792936283">"Touch & hold icons for more options"</string>
- <string name="quick_settings_dnd_label" msgid="8735855737575028208">"Do not disturb"</string>
- <string name="quick_settings_dnd_priority_label" msgid="483232950670692036">"Priority only"</string>
- <string name="quick_settings_dnd_alarms_label" msgid="2559229444312445858">"Alarms only"</string>
- <string name="quick_settings_dnd_none_label" msgid="5025477807123029478">"Total silence"</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> Devices)"</string>
- <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"Bluetooth Off"</string>
- <string name="quick_settings_bluetooth_detail_empty_text" msgid="4910015762433302860">"No paired devices available"</string>
- <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="7106697106764717416">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> battery"</string>
- <string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
- <string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Headset"</string>
- <string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Input"</string>
- <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Hearing Aids"</string>
- <string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Turning on…"</string>
- <string name="quick_settings_brightness_label" msgid="6968372297018755815">"Brightness"</string>
- <string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Auto-rotate"</string>
- <string name="accessibility_quick_settings_rotation" msgid="4231661040698488779">"Auto-rotate screen"</string>
- <string name="accessibility_quick_settings_rotation_value" msgid="8187398200140760213">"<xliff:g id="ID_1">%s</xliff:g> mode"</string>
- <string name="quick_settings_rotation_locked_label" msgid="6359205706154282377">"Rotation locked"</string>
- <string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"Portrait"</string>
- <string name="quick_settings_rotation_locked_landscape_label" msgid="8553157770061178719">"Landscape"</string>
- <string name="quick_settings_ime_label" msgid="7073463064369468429">"Input Method"</string>
- <string name="quick_settings_location_label" msgid="5011327048748762257">"Location"</string>
- <string name="quick_settings_location_off_label" msgid="7464544086507331459">"Location Off"</string>
- <string name="quick_settings_media_device_label" msgid="1302906836372603762">"Media device"</string>
- <string name="quick_settings_rssi_label" msgid="7725671335550695589">"RSSI"</string>
- <string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"Emergency Calls Only"</string>
- <string name="quick_settings_settings_label" msgid="5326556592578065401">"Settings"</string>
- <string name="quick_settings_time_label" msgid="4635969182239736408">"Time"</string>
- <string name="quick_settings_user_label" msgid="5238995632130897840">"Me"</string>
- <string name="quick_settings_user_title" msgid="4467690427642392403">"User"</string>
- <string name="quick_settings_user_new_user" msgid="9030521362023479778">"New user"</string>
- <string name="quick_settings_wifi_label" msgid="9135344704899546041">"Wi-Fi"</string>
- <string name="quick_settings_wifi_not_connected" msgid="7171904845345573431">"Not Connected"</string>
- <string name="quick_settings_wifi_no_network" msgid="2221993077220856376">"No Network"</string>
- <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Wi-Fi Off"</string>
- <string name="quick_settings_wifi_on_label" msgid="7607810331387031235">"Wi-Fi On"</string>
- <string name="quick_settings_wifi_detail_empty_text" msgid="269990350383909226">"No Wi-Fi networks available"</string>
- <string name="quick_settings_wifi_secondary_label_transient" msgid="7748206246119760554">"Turning on…"</string>
- <string name="quick_settings_cast_title" msgid="7709016546426454729">"Cast"</string>
- <string name="quick_settings_casting" msgid="6601710681033353316">"Casting"</string>
- <string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"Unnamed device"</string>
- <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"Ready to cast"</string>
- <string name="quick_settings_cast_detail_empty_text" msgid="311785821261640623">"No devices available"</string>
- <string name="quick_settings_cast_no_wifi" msgid="2696477881905521882">"Wi‑Fi not connected"</string>
- <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Brightness"</string>
- <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string>
- <string name="quick_settings_inversion_label" msgid="8790919884718619648">"Invert colors"</string>
- <string name="quick_settings_color_space_label" msgid="853443689745584770">"Color correction mode"</string>
- <string name="quick_settings_more_settings" msgid="326112621462813682">"More settings"</string>
- <string name="quick_settings_done" msgid="3402999958839153376">"Done"</string>
- <string name="quick_settings_connected" msgid="1722253542984847487">"Connected"</string>
- <string name="quick_settings_connected_battery_level" msgid="4136051440381328892">"Connected, battery <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>"</string>
- <string name="quick_settings_connecting" msgid="47623027419264404">"Connecting..."</string>
- <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Tethering"</string>
- <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string>
- <string name="quick_settings_hotspot_secondary_label_transient" msgid="8010579363691405477">"Turning on…"</string>
- <string name="quick_settings_hotspot_secondary_label_data_saver_enabled" msgid="5672131949987422420">"Data Saver is on"</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>
+ <string name="accessibility_rotation_lock_on_landscape" msgid="6731197337665366273">"Screen is locked in landscape orientation."</string>
+ <string name="accessibility_rotation_lock_on_portrait" msgid="5809367521644012115">"Screen is locked in portrait orientation."</string>
+ <string name="accessibility_rotation_lock_off_changed" msgid="8134601071026305153">"Screen will now rotate automatically."</string>
+ <string name="accessibility_rotation_lock_on_landscape_changed" msgid="3135965553707519743">"Screen is now locked in landscape orientation."</string>
+ <string name="accessibility_rotation_lock_on_portrait_changed" msgid="8922481981834012126">"Screen is now locked in portrait orientation."</string>
+ <string name="dessert_case" msgid="1295161776223959221">"Dessert Case"</string>
+ <string name="start_dreams" msgid="5640361424498338327">"Screen saver"</string>
+ <string name="ethernet_label" msgid="7967563676324087464">"Ethernet"</string>
+ <string name="quick_settings_header_onboarding_text" msgid="8030309023792936283">"Touch & hold icons for more options"</string>
+ <string name="quick_settings_dnd_label" msgid="8735855737575028208">"Do not disturb"</string>
+ <string name="quick_settings_dnd_priority_label" msgid="483232950670692036">"Priority only"</string>
+ <string name="quick_settings_dnd_alarms_label" msgid="2559229444312445858">"Alarms only"</string>
+ <string name="quick_settings_dnd_none_label" msgid="5025477807123029478">"Total silence"</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> Devices)"</string>
+ <string name="quick_settings_bluetooth_off_label" msgid="8159652146149219937">"Bluetooth Off"</string>
+ <string name="quick_settings_bluetooth_detail_empty_text" msgid="4910015762433302860">"No paired devices available"</string>
+ <string name="quick_settings_bluetooth_secondary_label_battery_level" msgid="7106697106764717416">"<xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%s</xliff:g> battery"</string>
+ <string name="quick_settings_bluetooth_secondary_label_audio" msgid="5673845963301132071">"Audio"</string>
+ <string name="quick_settings_bluetooth_secondary_label_headset" msgid="1880572731276240588">"Headset"</string>
+ <string name="quick_settings_bluetooth_secondary_label_input" msgid="2173322305072945905">"Input"</string>
+ <string name="quick_settings_bluetooth_secondary_label_hearing_aids" msgid="4930931771490695395">"Hearing Aids"</string>
+ <string name="quick_settings_bluetooth_secondary_label_transient" msgid="4551281899312150640">"Turning on…"</string>
+ <string name="quick_settings_brightness_label" msgid="6968372297018755815">"Brightness"</string>
+ <string name="quick_settings_rotation_unlocked_label" msgid="7305323031808150099">"Auto-rotate"</string>
+ <string name="accessibility_quick_settings_rotation" msgid="4231661040698488779">"Auto-rotate screen"</string>
+ <string name="accessibility_quick_settings_rotation_value" msgid="8187398200140760213">"<xliff:g id="ID_1">%s</xliff:g> mode"</string>
+ <string name="quick_settings_rotation_locked_label" msgid="6359205706154282377">"Rotation locked"</string>
+ <string name="quick_settings_rotation_locked_portrait_label" msgid="5102691921442135053">"Portrait"</string>
+ <string name="quick_settings_rotation_locked_landscape_label" msgid="8553157770061178719">"Landscape"</string>
+ <string name="quick_settings_ime_label" msgid="7073463064369468429">"Input Method"</string>
+ <string name="quick_settings_location_label" msgid="5011327048748762257">"Location"</string>
+ <string name="quick_settings_location_off_label" msgid="7464544086507331459">"Location Off"</string>
+ <string name="quick_settings_media_device_label" msgid="1302906836372603762">"Media device"</string>
+ <string name="quick_settings_rssi_label" msgid="7725671335550695589">"RSSI"</string>
+ <string name="quick_settings_rssi_emergency_only" msgid="2713774041672886750">"Emergency Calls Only"</string>
+ <string name="quick_settings_settings_label" msgid="5326556592578065401">"Settings"</string>
+ <string name="quick_settings_time_label" msgid="4635969182239736408">"Time"</string>
+ <string name="quick_settings_user_label" msgid="5238995632130897840">"Me"</string>
+ <string name="quick_settings_user_title" msgid="4467690427642392403">"User"</string>
+ <string name="quick_settings_user_new_user" msgid="9030521362023479778">"New user"</string>
+ <string name="quick_settings_wifi_label" msgid="9135344704899546041">"Wi-Fi"</string>
+ <string name="quick_settings_wifi_not_connected" msgid="7171904845345573431">"Not Connected"</string>
+ <string name="quick_settings_wifi_no_network" msgid="2221993077220856376">"No Network"</string>
+ <string name="quick_settings_wifi_off_label" msgid="7558778100843885864">"Wi-Fi Off"</string>
+ <string name="quick_settings_wifi_on_label" msgid="7607810331387031235">"Wi-Fi On"</string>
+ <string name="quick_settings_wifi_detail_empty_text" msgid="269990350383909226">"No Wi-Fi networks available"</string>
+ <string name="quick_settings_wifi_secondary_label_transient" msgid="7748206246119760554">"Turning on…"</string>
+ <string name="quick_settings_cast_title" msgid="7709016546426454729">"Cast"</string>
+ <string name="quick_settings_casting" msgid="6601710681033353316">"Casting"</string>
+ <string name="quick_settings_cast_device_default_name" msgid="5367253104742382945">"Unnamed device"</string>
+ <string name="quick_settings_cast_device_default_description" msgid="2484573682378634413">"Ready to cast"</string>
+ <string name="quick_settings_cast_detail_empty_text" msgid="311785821261640623">"No devices available"</string>
+ <string name="quick_settings_cast_no_wifi" msgid="2696477881905521882">"Wi‑Fi not connected"</string>
+ <string name="quick_settings_brightness_dialog_title" msgid="8599674057673605368">"Brightness"</string>
+ <string name="quick_settings_brightness_dialog_auto_brightness_label" msgid="5064982743784071218">"AUTO"</string>
+ <string name="quick_settings_inversion_label" msgid="8790919884718619648">"Invert colors"</string>
+ <string name="quick_settings_color_space_label" msgid="853443689745584770">"Color correction mode"</string>
+ <string name="quick_settings_more_settings" msgid="326112621462813682">"More settings"</string>
+ <string name="quick_settings_done" msgid="3402999958839153376">"Done"</string>
+ <string name="quick_settings_connected" msgid="1722253542984847487">"Connected"</string>
+ <string name="quick_settings_connected_battery_level" msgid="4136051440381328892">"Connected, battery <xliff:g id="BATTERY_LEVEL_AS_PERCENTAGE">%1$s</xliff:g>"</string>
+ <string name="quick_settings_connecting" msgid="47623027419264404">"Connecting..."</string>
+ <string name="quick_settings_tethering_label" msgid="7153452060448575549">"Tethering"</string>
+ <string name="quick_settings_hotspot_label" msgid="6046917934974004879">"Hotspot"</string>
+ <string name="quick_settings_hotspot_secondary_label_transient" msgid="8010579363691405477">"Turning on…"</string>
+ <string name="quick_settings_hotspot_secondary_label_data_saver_enabled" msgid="5672131949987422420">"Data Saver is on"</string>
<plurals name="quick_settings_hotspot_secondary_label_num_devices" formatted="false" msgid="2324635800672199428">
- <item quantity="other">%d devices</item>
- <item quantity="one">%d device</item>
+ <item quantity="other">%d devices</item>
+ <item quantity="one">%d device</item>
</plurals>
- <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string>
- <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Flashlight"</string>
- <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobile data"</string>
- <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Data usage"</string>
- <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Remaining data"</string>
- <string name="quick_settings_cellular_detail_over_limit" msgid="967669665390990427">"Over limit"</string>
- <string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> used"</string>
- <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="7608026833638817218">"Work profile"</string>
- <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Night Light"</string>
- <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="8483259341596943314">"On at sunset"</string>
- <string name="quick_settings_night_secondary_label_until_sunrise" msgid="4453017157391574402">"Until sunrise"</string>
- <string name="quick_settings_night_secondary_label_on_at" msgid="6256314040368487637">"On at <xliff:g id="TIME">%s</xliff:g>"</string>
- <string name="quick_settings_secondary_label_until" msgid="2749196569462600150">"Until <xliff:g id="TIME">%s</xliff:g>"</string>
- <string name="quick_settings_nfc_label" msgid="9012153754816969325">"NFC"</string>
- <string name="quick_settings_nfc_off" msgid="6883274004315134333">"NFC is disabled"</string>
- <string name="quick_settings_nfc_on" msgid="6680317193676884311">"NFC is enabled"</string>
- <string name="recents_swipe_up_onboarding" msgid="3824607135920170001">"Swipe up to switch apps"</string>
- <string name="recents_quick_scrub_onboarding" msgid="2778062804333285789">"Drag right to quickly switch apps"</string>
- <string name="quick_step_accessibility_toggle_overview" msgid="7171470775439860480">"Toggle Overview"</string>
- <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Charged"</string>
- <string name="expanded_header_battery_charging" msgid="205623198487189724">"Charging"</string>
- <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> until full"</string>
- <string name="expanded_header_battery_not_charging" msgid="4798147152367049732">"Not charging"</string>
- <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Network may\nbe monitored"</string>
- <string name="description_target_search" msgid="3091587249776033139">"Search"</string>
- <string name="description_direction_up" msgid="7169032478259485180">"Slide up for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
- <string name="description_direction_left" msgid="7207478719805562165">"Slide left for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
- <string name="zen_priority_introduction" msgid="1149025108714420281">"You won\'t be disturbed by sounds and vibrations, except from alarms, reminders, events, and callers you specify. You\'ll still hear anything you choose to play including music, videos, and games."</string>
- <string name="zen_alarms_introduction" msgid="4934328096749380201">"You won\'t be disturbed by sounds and vibrations, except from alarms. You\'ll still hear anything you choose to play including music, videos, and games."</string>
- <string name="zen_priority_customize_button" msgid="7948043278226955063">"Customize"</string>
- <string name="zen_silence_introduction_voice" msgid="3948778066295728085">"This blocks ALL sounds and vibrations, including from alarms, music, videos, and games. You\'ll still be able to make phone calls."</string>
- <string name="zen_silence_introduction" msgid="3137882381093271568">"This blocks ALL sounds and vibrations, including from alarms, music, videos, and games."</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">"Less urgent notifications below"</string>
- <string name="notification_tap_again" msgid="7590196980943943842">"Tap again to open"</string>
- <string name="keyguard_unlock" msgid="8043466894212841998">"Swipe up to unlock"</string>
- <string name="do_disclosure_generic" msgid="5615898451805157556">"This device is managed by your organization"</string>
- <string name="do_disclosure_with_name" msgid="5640615509915445501">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
- <string name="phone_hint" msgid="4872890986869209950">"Swipe from icon for phone"</string>
- <string name="voice_hint" msgid="8939888732119726665">"Swipe from icon for voice assist"</string>
- <string name="camera_hint" msgid="7939688436797157483">"Swipe from icon for camera"</string>
- <string name="interruption_level_none_with_warning" msgid="5114872171614161084">"Total silence. This will also silence screen readers."</string>
- <string name="interruption_level_none" msgid="6000083681244492992">"Total silence"</string>
- <string name="interruption_level_priority" msgid="6426766465363855505">"Priority only"</string>
- <string name="interruption_level_alarms" msgid="5226306993448328896">"Alarms only"</string>
- <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Total\nsilence"</string>
- <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Priority\nonly"</string>
- <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Alarms\nonly"</string>
- <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
- <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging rapidly (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
- <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging slowly (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
- <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Switch user"</string>
- <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Switch user, current user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
- <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Current user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
- <string name="accessibility_multi_user_switch_quick_contact" msgid="3020367729287990475">"Show profile"</string>
- <string name="user_add_user" msgid="5110251524486079492">"Add user"</string>
- <string name="user_new_user_name" msgid="426540612051178753">"New user"</string>
- <string name="guest_nickname" msgid="8059989128963789678">"Guest"</string>
- <string name="guest_new_guest" msgid="600537543078847803">"Add guest"</string>
- <string name="guest_exit_guest" msgid="7187359342030096885">"Remove guest"</string>
- <string name="guest_exit_guest_dialog_title" msgid="8480693520521766688">"Remove guest?"</string>
- <string name="guest_exit_guest_dialog_message" msgid="4155503224769676625">"All apps and data in this session will be deleted."</string>
- <string name="guest_exit_guest_dialog_remove" msgid="7402231963862520531">"Remove"</string>
- <string name="guest_wipe_session_title" msgid="6419439912885956132">"Welcome back, guest!"</string>
- <string name="guest_wipe_session_message" msgid="8476238178270112811">"Do you want to continue your session?"</string>
- <string name="guest_wipe_session_wipe" msgid="5065558566939858884">"Start over"</string>
- <string name="guest_wipe_session_dontwipe" msgid="1401113462524894716">"Yes, continue"</string>
- <string name="guest_notification_title" msgid="1585278533840603063">"Guest user"</string>
- <string name="guest_notification_text" msgid="335747957734796689">"To delete apps and data, remove guest user"</string>
- <string name="guest_notification_remove_action" msgid="8820670703892101990">"REMOVE GUEST"</string>
- <string name="user_logout_notification_title" msgid="1453960926437240727">"Logout user"</string>
- <string name="user_logout_notification_text" msgid="3350262809611876284">"Logout current user"</string>
- <string name="user_logout_notification_action" msgid="1195428991423425062">"LOGOUT USER"</string>
- <string name="user_add_user_title" msgid="4553596395824132638">"Add new user?"</string>
- <string name="user_add_user_message_short" msgid="2161624834066214559">"When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
- <string name="user_limit_reached_title" msgid="7374910700117359177">"User limit reached"</string>
+ <string name="quick_settings_notifications_label" msgid="4818156442169154523">"Notifications"</string>
+ <string name="quick_settings_flashlight_label" msgid="2133093497691661546">"Flashlight"</string>
+ <string name="quick_settings_cellular_detail_title" msgid="3661194685666477347">"Mobile data"</string>
+ <string name="quick_settings_cellular_detail_data_usage" msgid="1964260360259312002">"Data usage"</string>
+ <string name="quick_settings_cellular_detail_remaining_data" msgid="722715415543541249">"Remaining data"</string>
+ <string name="quick_settings_cellular_detail_over_limit" msgid="967669665390990427">"Over limit"</string>
+ <string name="quick_settings_cellular_detail_data_used" msgid="1476810587475761478">"<xliff:g id="DATA_USED">%s</xliff:g> used"</string>
+ <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="7608026833638817218">"Work profile"</string>
+ <string name="quick_settings_night_display_label" msgid="3577098011487644395">"Night Light"</string>
+ <string name="quick_settings_night_secondary_label_on_at_sunset" msgid="8483259341596943314">"On at sunset"</string>
+ <string name="quick_settings_night_secondary_label_until_sunrise" msgid="4453017157391574402">"Until sunrise"</string>
+ <string name="quick_settings_night_secondary_label_on_at" msgid="6256314040368487637">"On at <xliff:g id="TIME">%s</xliff:g>"</string>
+ <string name="quick_settings_secondary_label_until" msgid="2749196569462600150">"Until <xliff:g id="TIME">%s</xliff:g>"</string>
+ <string name="quick_settings_nfc_label" msgid="9012153754816969325">"NFC"</string>
+ <string name="quick_settings_nfc_off" msgid="6883274004315134333">"NFC is disabled"</string>
+ <string name="quick_settings_nfc_on" msgid="6680317193676884311">"NFC is enabled"</string>
+ <string name="recents_swipe_up_onboarding" msgid="3824607135920170001">"Swipe up to switch apps"</string>
+ <string name="recents_quick_scrub_onboarding" msgid="2778062804333285789">"Drag right to quickly switch apps"</string>
+ <string name="quick_step_accessibility_toggle_overview" msgid="7171470775439860480">"Toggle Overview"</string>
+ <string name="expanded_header_battery_charged" msgid="5945855970267657951">"Charged"</string>
+ <string name="expanded_header_battery_charging" msgid="205623198487189724">"Charging"</string>
+ <string name="expanded_header_battery_charging_with_time" msgid="457559884275395376">"<xliff:g id="CHARGING_TIME">%s</xliff:g> until full"</string>
+ <string name="expanded_header_battery_not_charging" msgid="4798147152367049732">"Not charging"</string>
+ <string name="ssl_ca_cert_warning" msgid="9005954106902053641">"Network may\nbe monitored"</string>
+ <string name="description_target_search" msgid="3091587249776033139">"Search"</string>
+ <string name="description_direction_up" msgid="7169032478259485180">"Slide up for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+ <string name="description_direction_left" msgid="7207478719805562165">"Slide left for <xliff:g id="TARGET_DESCRIPTION">%s</xliff:g>."</string>
+ <string name="zen_priority_introduction" msgid="1149025108714420281">"You won\'t be disturbed by sounds and vibrations, except from alarms, reminders, events, and callers you specify. You\'ll still hear anything you choose to play including music, videos, and games."</string>
+ <string name="zen_alarms_introduction" msgid="4934328096749380201">"You won\'t be disturbed by sounds and vibrations, except from alarms. You\'ll still hear anything you choose to play including music, videos, and games."</string>
+ <string name="zen_priority_customize_button" msgid="7948043278226955063">"Customize"</string>
+ <string name="zen_silence_introduction_voice" msgid="3948778066295728085">"This blocks ALL sounds and vibrations, including from alarms, music, videos, and games. You\'ll still be able to make phone calls."</string>
+ <string name="zen_silence_introduction" msgid="3137882381093271568">"This blocks ALL sounds and vibrations, including from alarms, music, videos, and games."</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">"Less urgent notifications below"</string>
+ <string name="notification_tap_again" msgid="7590196980943943842">"Tap again to open"</string>
+ <string name="keyguard_unlock" msgid="8043466894212841998">"Swipe up to unlock"</string>
+ <string name="do_disclosure_generic" msgid="5615898451805157556">"This device is managed by your organization"</string>
+ <string name="do_disclosure_with_name" msgid="5640615509915445501">"This device is managed by <xliff:g id="ORGANIZATION_NAME">%s</xliff:g>"</string>
+ <string name="phone_hint" msgid="4872890986869209950">"Swipe from icon for phone"</string>
+ <string name="voice_hint" msgid="8939888732119726665">"Swipe from icon for voice assist"</string>
+ <string name="camera_hint" msgid="7939688436797157483">"Swipe from icon for camera"</string>
+ <string name="interruption_level_none_with_warning" msgid="5114872171614161084">"Total silence. This will also silence screen readers."</string>
+ <string name="interruption_level_none" msgid="6000083681244492992">"Total silence"</string>
+ <string name="interruption_level_priority" msgid="6426766465363855505">"Priority only"</string>
+ <string name="interruption_level_alarms" msgid="5226306993448328896">"Alarms only"</string>
+ <string name="interruption_level_none_twoline" msgid="3957581548190765889">"Total\nsilence"</string>
+ <string name="interruption_level_priority_twoline" msgid="1564715335217164124">"Priority\nonly"</string>
+ <string name="interruption_level_alarms_twoline" msgid="3266909566410106146">"Alarms\nonly"</string>
+ <string name="keyguard_indication_charging_time" msgid="2056340799276374421">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
+ <string name="keyguard_indication_charging_time_fast" msgid="7767562163577492332">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging rapidly (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
+ <string name="keyguard_indication_charging_time_slowly" msgid="3769655133567307069">"<xliff:g id="PERCENTAGE">%2$s</xliff:g> • Charging slowly (<xliff:g id="CHARGING_TIME_LEFT">%1$s</xliff:g> until full)"</string>
+ <string name="accessibility_multi_user_switch_switcher" msgid="7305948938141024937">"Switch user"</string>
+ <string name="accessibility_multi_user_switch_switcher_with_current" msgid="8434880595284601601">"Switch user, current user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
+ <string name="accessibility_multi_user_switch_inactive" msgid="1424081831468083402">"Current user <xliff:g id="CURRENT_USER_NAME">%s</xliff:g>"</string>
+ <string name="accessibility_multi_user_switch_quick_contact" msgid="3020367729287990475">"Show profile"</string>
+ <string name="user_add_user" msgid="5110251524486079492">"Add user"</string>
+ <string name="user_new_user_name" msgid="426540612051178753">"New user"</string>
+ <string name="guest_nickname" msgid="8059989128963789678">"Guest"</string>
+ <string name="guest_new_guest" msgid="600537543078847803">"Add guest"</string>
+ <string name="guest_exit_guest" msgid="7187359342030096885">"Remove guest"</string>
+ <string name="guest_exit_guest_dialog_title" msgid="8480693520521766688">"Remove guest?"</string>
+ <string name="guest_exit_guest_dialog_message" msgid="4155503224769676625">"All apps and data in this session will be deleted."</string>
+ <string name="guest_exit_guest_dialog_remove" msgid="7402231963862520531">"Remove"</string>
+ <string name="guest_wipe_session_title" msgid="6419439912885956132">"Welcome back, guest!"</string>
+ <string name="guest_wipe_session_message" msgid="8476238178270112811">"Do you want to continue your session?"</string>
+ <string name="guest_wipe_session_wipe" msgid="5065558566939858884">"Start over"</string>
+ <string name="guest_wipe_session_dontwipe" msgid="1401113462524894716">"Yes, continue"</string>
+ <string name="guest_notification_title" msgid="1585278533840603063">"Guest user"</string>
+ <string name="guest_notification_text" msgid="335747957734796689">"To delete apps and data, remove guest user"</string>
+ <string name="guest_notification_remove_action" msgid="8820670703892101990">"REMOVE GUEST"</string>
+ <string name="user_logout_notification_title" msgid="1453960926437240727">"Logout user"</string>
+ <string name="user_logout_notification_text" msgid="3350262809611876284">"Logout current user"</string>
+ <string name="user_logout_notification_action" msgid="1195428991423425062">"LOGOUT USER"</string>
+ <string name="user_add_user_title" msgid="4553596395824132638">"Add new user?"</string>
+ <string name="user_add_user_message_short" msgid="2161624834066214559">"When you add a new user, that person needs to set up their space.\n\nAny user can update apps for all other users."</string>
+ <string name="user_limit_reached_title" msgid="7374910700117359177">"User limit reached"</string>
<plurals name="user_limit_reached_message" formatted="false" msgid="1855040563671964242">
- <item quantity="other">You can add up to <xliff:g id="COUNT">%d</xliff:g> users.</item>
- <item quantity="one">Only one user can be created.</item>
+ <item quantity="other">You can add up to <xliff:g id="COUNT">%d</xliff:g> users.</item>
+ <item quantity="one">Only one user can be created.</item>
</plurals>
- <string name="user_remove_user_title" msgid="4681256956076895559">"Remove user?"</string>
- <string name="user_remove_user_message" msgid="1453218013959498039">"All apps and data of this user will be deleted."</string>
- <string name="user_remove_user_remove" msgid="7479275741742178297">"Remove"</string>
- <string name="battery_saver_notification_title" msgid="8614079794522291840">"Battery Saver is on"</string>
- <string name="battery_saver_notification_text" msgid="820318788126672692">"Reduces performance and background data"</string>
- <string name="battery_saver_notification_action_text" msgid="132118784269455533">"Turn off Battery Saver"</string>
- <string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> will start capturing everything that\'s displayed on your screen."</string>
- <string name="media_projection_remember_text" msgid="3103510882172746752">"Don\'t show again"</string>
- <string name="clear_all_notifications_text" msgid="814192889771462828">"Clear all"</string>
- <string name="manage_notifications_text" msgid="2386728145475108753">"Manage"</string>
- <string name="dnd_suppressing_shade_text" msgid="1904574852846769301">"Notifications paused by Do Not Disturb"</string>
- <string name="media_projection_action_text" msgid="8470872969457985954">"Start now"</string>
- <string name="empty_shade_text" msgid="708135716272867002">"No notifications"</string>
- <string name="profile_owned_footer" msgid="8021888108553696069">"Profile may be monitored"</string>
- <string name="vpn_footer" msgid="2388611096129106812">"Network may be monitored"</string>
- <string name="branded_vpn_footer" msgid="2168111859226496230">"Network may be monitored"</string>
- <string name="quick_settings_disclosure_management_monitoring" msgid="6645176135063957394">"Your organization manages this device and may monitor network traffic"</string>
- <string name="quick_settings_disclosure_named_management_monitoring" msgid="370622174777570853">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> manages this device and may monitor network traffic"</string>
- <string name="quick_settings_disclosure_management_named_vpn" msgid="1085137869053332307">"Device is managed by your organization and connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string>
- <string name="quick_settings_disclosure_named_management_named_vpn" msgid="6290456493852584017">"Device is managed by <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and connected to <xliff:g id="VPN_APP">%2$s</xliff:g>"</string>
- <string name="quick_settings_disclosure_management" msgid="3294967280853150271">"Device is managed by your organization"</string>
- <string name="quick_settings_disclosure_named_management" msgid="1059403025094542908">"Device is managed by <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string>
- <string name="quick_settings_disclosure_management_vpns" msgid="3698767349925266482">"Device is managed by your organization and connected to VPNs"</string>
- <string name="quick_settings_disclosure_named_management_vpns" msgid="7777821385318891527">"Device is managed by <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and connected to VPNs"</string>
- <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="5125463987558278215">"Your organization may monitor network traffic in your work profile"</string>
- <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8973606847896650284">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> may monitor network traffic in your work profile"</string>
- <string name="quick_settings_disclosure_monitoring" msgid="679658227269205728">"Network may be monitored"</string>
- <string name="quick_settings_disclosure_vpns" msgid="8170318392053156330">"Device connected to VPNs"</string>
- <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="3494535754792751741">"Work profile connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string>
- <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="4467456202486569906">"Personal profile connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string>
- <string name="quick_settings_disclosure_named_vpn" msgid="6943724064780847080">"Device connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string>
- <string name="monitoring_title_device_owned" msgid="1652495295941959815">"Device management"</string>
- <string name="monitoring_title_profile_owned" msgid="6790109874733501487">"Profile monitoring"</string>
- <string name="monitoring_title" msgid="169206259253048106">"Network monitoring"</string>
- <string name="monitoring_subtitle_vpn" msgid="876537538087857300">"VPN"</string>
- <string name="monitoring_subtitle_network_logging" msgid="3341264304793193386">"Network logging"</string>
- <string name="monitoring_subtitle_ca_certificate" msgid="3874151893894355988">"CA certificates"</string>
- <string name="disable_vpn" msgid="4435534311510272506">"Disable VPN"</string>
- <string name="disconnect_vpn" msgid="1324915059568548655">"Disconnect VPN"</string>
- <string name="monitoring_button_view_policies" msgid="100913612638514424">"View Policies"</string>
- <string name="monitoring_description_named_management" msgid="5281789135578986303">"Your device is managed by <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>.\n\nYour admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nFor more information, contact your admin."</string>
- <string name="monitoring_description_management" msgid="4573721970278370790">"Your device is managed by your organization.\n\nYour admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nFor more information, contact your admin."</string>
- <string name="monitoring_description_management_ca_certificate" msgid="5202023784131001751">"Your organization installed a certificate authority on this device. Your secure network traffic may be monitored or modified."</string>
- <string name="monitoring_description_managed_profile_ca_certificate" msgid="4683248196789897964">"Your organization installed a certificate authority in your work profile. Your secure network traffic may be monitored or modified."</string>
- <string name="monitoring_description_ca_certificate" msgid="7886985418413598352">"A certificate authority is installed on this device. Your secure network traffic may be monitored or modified."</string>
- <string name="monitoring_description_management_network_logging" msgid="7184005419733060736">"Your admin has turned on network logging, which monitors traffic on your device."</string>
- <string name="monitoring_description_named_vpn" msgid="7403457334088909254">"You\'re connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string>
- <string name="monitoring_description_two_named_vpns" msgid="4198511413729213802">"You\'re connected to <xliff:g id="VPN_APP_0">%1$s</xliff:g> and <xliff:g id="VPN_APP_1">%2$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string>
- <string name="monitoring_description_managed_profile_named_vpn" msgid="1427905889862420559">"Your work profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string>
- <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"Your personal profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string>
- <string name="monitoring_description_do_header_generic" msgid="96588491028288691">"Your device is managed by <xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g>."</string>
- <string name="monitoring_description_do_header_with_name" msgid="5511133708978206460">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> uses <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> to manage your device."</string>
- <string name="monitoring_description_do_body" msgid="3639594537660975895">"Your admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information."</string>
- <string name="monitoring_description_do_learn_more_separator" msgid="3785251953067436862">" "</string>
- <string name="monitoring_description_do_learn_more" msgid="1849514470437907421">"Learn more"</string>
- <string name="monitoring_description_do_body_vpn" msgid="8255218762488901796">"You\'re connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string>
- <string name="monitoring_description_vpn_settings_separator" msgid="1933186756733474388">" "</string>
- <string name="monitoring_description_vpn_settings" msgid="6434859242636063861">"Open VPN settings"</string>
- <string name="monitoring_description_ca_cert_settings_separator" msgid="4987350385906393626">" "</string>
- <string name="monitoring_description_ca_cert_settings" msgid="5489969458872997092">"Open trusted credentials"</string>
- <string name="monitoring_description_network_logging" msgid="7223505523384076027">"Your admin has turned on network logging, which monitors traffic on your device.\n\nFor more information, contact your admin."</string>
- <string name="monitoring_description_vpn" msgid="4445150119515393526">"You gave an app permission to set up a VPN connection.\n\nThis app can monitor your device and network activity, including emails, apps, and websites."</string>
- <string name="monitoring_description_vpn_profile_owned" msgid="2958019119161161530">"Your work profile is managed by <xliff:g id="ORGANIZATION">%1$s</xliff:g>.\n\nYour admin is capable of monitoring your network activity including emails, apps, and websites.\n\nFor more information, contact your admin.\n\nYou\'re also connected to a VPN, which can monitor your network activity."</string>
- <string name="legacy_vpn_name" msgid="6604123105765737830">"VPN"</string>
- <string name="monitoring_description_app" msgid="1828472472674709532">"You\'re connected to <xliff:g id="APPLICATION">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string>
- <string name="monitoring_description_app_personal" msgid="484599052118316268">"You\'re connected to <xliff:g id="APPLICATION">%1$s</xliff:g>, which can monitor your personal network activity, including emails, apps, and websites."</string>
- <string name="branded_monitoring_description_app_personal" msgid="2669518213949202599">"You\'re connected to <xliff:g id="APPLICATION">%1$s</xliff:g>, which can monitor your personal network activity, including emails, apps, and websites."</string>
- <string name="monitoring_description_app_work" msgid="4612997849787922906">"Your work profile is managed by <xliff:g id="ORGANIZATION">%1$s</xliff:g>. The profile is connected to <xliff:g id="APPLICATION">%2$s</xliff:g>, which can monitor your work network activity, including emails, apps, and websites.\n\nFor more information, contact your admin."</string>
- <string name="monitoring_description_app_personal_work" msgid="5664165460056859391">"Your work profile is managed by <xliff:g id="ORGANIZATION">%1$s</xliff:g>. The profile is connected to <xliff:g id="APPLICATION_WORK">%2$s</xliff:g>, which can monitor your work network activity, including emails, apps, and websites.\n\nYou\'re also connected to <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g>, which can monitor your personal network activity."</string>
- <string name="keyguard_indication_trust_granted" msgid="4985003749105182372">"Unlocked for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
- <string name="keyguard_indication_trust_managed" msgid="8319646760022357585">"<xliff:g id="TRUST_AGENT">%1$s</xliff:g> is running"</string>
- <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"Device will stay locked until you manually unlock"</string>
- <string name="hidden_notifications_title" msgid="7139628534207443290">"Get notifications faster"</string>
- <string name="hidden_notifications_text" msgid="2326409389088668981">"See them before you unlock"</string>
- <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No thanks"</string>
- <string name="hidden_notifications_setup" msgid="41079514801976810">"Set up"</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="6930243045593601084">"Turn off now"</string>
- <string name="accessibility_volume_settings" msgid="4915364006817819212">"Sound settings"</string>
- <string name="accessibility_volume_expand" msgid="5946812790999244205">"Expand"</string>
- <string name="accessibility_volume_collapse" msgid="3609549593031810875">"Collapse"</string>
- <string name="accessibility_output_chooser" msgid="8185317493017988680">"Switch output device"</string>
- <string name="screen_pinning_title" msgid="3273740381976175811">"Screen is pinned"</string>
- <string name="screen_pinning_description" msgid="8909878447196419623">"This keeps it in view until you unpin. Touch & hold Back and Overview to unpin."</string>
- <string name="screen_pinning_description_recents_invisible" msgid="8281145542163727971">"This keeps it in view until you unpin. Touch & hold Back and Home to unpin."</string>
- <string name="screen_pinning_description_accessible" msgid="426190689254018656">"This keeps it in view until you unpin. Touch & hold Overview to unpin."</string>
- <string name="screen_pinning_description_recents_invisible_accessible" msgid="6134833683151189507">"This keeps it in view until you unpin. Touch & hold Home to unpin."</string>
- <string name="screen_pinning_toast" msgid="2266705122951934150">"To unpin this screen, touch & hold Back and Overview buttons"</string>
- <string name="screen_pinning_toast_recents_invisible" msgid="8252402309499161281">"To unpin this screen, touch & hold Back and Home buttons"</string>
- <string name="screen_pinning_positive" msgid="3783985798366751226">"Got it"</string>
- <string name="screen_pinning_negative" msgid="3741602308343880268">"No thanks"</string>
- <string name="screen_pinning_start" msgid="1022122128489278317">"Screen pinned"</string>
- <string name="screen_pinning_exit" msgid="5187339744262325372">"Screen unpinned"</string>
- <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Hide <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string>
- <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"It will reappear the next time you turn it on in settings."</string>
- <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Hide"</string>
- <string name="stream_voice_call" msgid="4410002696470423714">"Call"</string>
- <string name="stream_system" msgid="7493299064422163147">"System"</string>
- <string name="stream_ring" msgid="8213049469184048338">"Ring"</string>
- <string name="stream_music" msgid="9086982948697544342">"Media"</string>
- <string name="stream_alarm" msgid="5209444229227197703">"Alarm"</string>
- <string name="stream_notification" msgid="2563720670905665031">"Notification"</string>
- <string name="stream_bluetooth_sco" msgid="2055645746402746292">"Bluetooth"</string>
- <string name="stream_dtmf" msgid="2447177903892477915">"Dual multi tone frequency"</string>
- <string name="stream_accessibility" msgid="301136219144385106">"Accessibility"</string>
- <string name="ring_toggle_title" msgid="3281244519428819576">"Calls"</string>
- <string name="volume_ringer_status_normal" msgid="4273142424125855384">"Ring"</string>
- <string name="volume_ringer_status_vibrate" msgid="1825615171021346557">"Vibrate"</string>
- <string name="volume_ringer_status_silent" msgid="6896394161022916369">"Mute"</string>
- <string name="qs_status_phone_vibrate" msgid="204362991135761679">"Phone on vibrate"</string>
- <string name="qs_status_phone_muted" msgid="5437668875879171548">"Phone muted"</string>
- <string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Tap to unmute."</string>
- <string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Tap to set to vibrate. Accessibility services may be muted."</string>
- <string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Tap to mute. Accessibility services may be muted."</string>
- <string name="volume_stream_content_description_vibrate_a11y" msgid="6427727603978431301">"%1$s. Tap to set to vibrate."</string>
- <string name="volume_stream_content_description_mute_a11y" msgid="8995013018414535494">"%1$s. Tap to mute."</string>
- <string name="volume_ringer_hint_mute" msgid="9199811307292269601">"mute"</string>
- <string name="volume_ringer_hint_unmute" msgid="6602880133293060368">"unmute"</string>
- <string name="volume_ringer_hint_vibrate" msgid="4036802135666515202">"vibrate"</string>
- <string name="volume_dialog_title" msgid="7272969888820035876">"%s volume controls"</string>
- <string name="volume_dialog_ringer_guidance_ring" msgid="3360373718388509040">"Calls and notifications will ring (<xliff:g id="VOLUME_LEVEL">%1$s</xliff:g>)"</string>
- <string name="output_title" msgid="5355078100792942802">"Media output"</string>
- <string name="output_calls_title" msgid="8717692905017206161">"Phone call output"</string>
- <string name="output_none_found" msgid="5544982839808921091">"No devices found"</string>
- <string name="output_none_found_service_off" msgid="8631969668659757069">"No devices found. Try turning on <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
- <string name="output_service_bt" msgid="6224213415445509542">"Bluetooth"</string>
- <string name="output_service_wifi" msgid="3749735218931825054">"Wi-Fi"</string>
- <string name="output_service_bt_wifi" msgid="4486837869988770896">"Bluetooth and Wi-Fi"</string>
- <string name="system_ui_tuner" msgid="708224127392452018">"System UI Tuner"</string>
- <string name="show_battery_percentage" msgid="5444136600512968798">"Show embedded battery percentage"</string>
- <string name="show_battery_percentage_summary" msgid="3215025775576786037">"Show battery level percentage inside the status bar icon when not charging"</string>
- <string name="quick_settings" msgid="10042998191725428">"Quick Settings"</string>
- <string name="status_bar" msgid="4877645476959324760">"Status bar"</string>
- <string name="overview" msgid="4018602013895926956">"Overview"</string>
- <string name="demo_mode" msgid="2532177350215638026">"System UI demo mode"</string>
- <string name="enable_demo_mode" msgid="4844205668718636518">"Enable demo mode"</string>
- <string name="show_demo_mode" msgid="2018336697782464029">"Show demo mode"</string>
- <string name="status_bar_ethernet" msgid="5044290963549500128">"Ethernet"</string>
- <string name="status_bar_alarm" msgid="8536256753575881818">"Alarm"</string>
- <string name="status_bar_work" msgid="6022553324802866373">"Work profile"</string>
- <string name="status_bar_airplane" msgid="7057575501472249002">"Airplane mode"</string>
- <string name="add_tile" msgid="2995389510240786221">"Add tile"</string>
- <string name="broadcast_tile" msgid="3894036511763289383">"Broadcast Tile"</string>
- <string name="zen_alarm_warning_indef" msgid="3482966345578319605">"You won\'t hear your next alarm <xliff:g id="WHEN">%1$s</xliff:g> unless you turn this off before then"</string>
- <string name="zen_alarm_warning" msgid="444533119582244293">"You won\'t hear your next alarm <xliff:g id="WHEN">%1$s</xliff:g>"</string>
- <string name="alarm_template" msgid="3980063409350522735">"at <xliff:g id="WHEN">%1$s</xliff:g>"</string>
- <string name="alarm_template_far" msgid="4242179982586714810">"on <xliff:g id="WHEN">%1$s</xliff:g>"</string>
- <string name="accessibility_quick_settings_detail" msgid="2579369091672902101">"Quick Settings, <xliff:g id="TITLE">%s</xliff:g>."</string>
- <string name="accessibility_status_bar_hotspot" msgid="4099381329956402865">"Hotspot"</string>
- <string name="accessibility_managed_profile" msgid="6613641363112584120">"Work profile"</string>
- <string name="tuner_warning_title" msgid="7094689930793031682">"Fun for some but not for all"</string>
- <string name="tuner_warning" msgid="8730648121973575701">"System UI Tuner gives you extra ways to tweak and customize the Android user interface. These experimental features may change, break, or disappear in future releases. Proceed with caution."</string>
- <string name="tuner_persistent_warning" msgid="8597333795565621795">"These experimental features may change, break, or disappear in future releases. Proceed with caution."</string>
- <string name="got_it" msgid="2239653834387972602">"Got it"</string>
- <string name="tuner_toast" msgid="603429811084428439">"Congrats! System UI Tuner has been added to Settings"</string>
- <string name="remove_from_settings" msgid="8389591916603406378">"Remove from Settings"</string>
- <string name="remove_from_settings_prompt" msgid="6069085993355887748">"Remove System UI Tuner from Settings and stop using all of its features?"</string>
- <string name="activity_not_found" msgid="348423244327799974">"Application is not installed on your device"</string>
- <string name="clock_seconds" msgid="7689554147579179507">"Show clock seconds"</string>
- <string name="clock_seconds_desc" msgid="6282693067130470675">"Show clock seconds in the status bar. May impact battery life."</string>
- <string name="qs_rearrange" msgid="8060918697551068765">"Rearrange Quick Settings"</string>
- <string name="show_brightness" msgid="6613930842805942519">"Show brightness in Quick Settings"</string>
- <string name="experimental" msgid="6198182315536726162">"Experimental"</string>
- <string name="enable_bluetooth_title" msgid="5027037706500635269">"Turn on Bluetooth?"</string>
- <string name="enable_bluetooth_message" msgid="9106595990708985385">"To connect your keyboard with your tablet, you first have to turn on Bluetooth."</string>
- <string name="enable_bluetooth_confirmation_ok" msgid="6258074250948309715">"Turn on"</string>
- <string name="show_silently" msgid="6841966539811264192">"Show notifications silently"</string>
- <string name="block" msgid="2734508760962682611">"Block all notifications"</string>
- <string name="do_not_silence" msgid="6878060322594892441">"Don\'t silence"</string>
- <string name="do_not_silence_block" msgid="4070647971382232311">"Don\'t silence or block"</string>
- <string name="tuner_full_importance_settings" msgid="3207312268609236827">"Power notification controls"</string>
- <string name="tuner_full_importance_settings_on" msgid="7545060756610299966">"On"</string>
- <string name="tuner_full_importance_settings_off" msgid="8208165412614935229">"Off"</string>
- <string name="power_notification_controls_description" msgid="4372459941671353358">"With power notification controls, you can set an importance level from 0 to 5 for an app\'s notifications. \n\n"<b>"Level 5"</b>" \n- Show at the top of the notification list \n- Allow full screen interruption \n- Always peek \n\n"<b>"Level 4"</b>" \n- Prevent full screen interruption \n- Always peek \n\n"<b>"Level 3"</b>" \n- Prevent full screen interruption \n- Never peek \n\n"<b>"Level 2"</b>" \n- Prevent full screen interruption \n- Never peek \n- Never make sound and vibration \n\n"<b>"Level 1"</b>" \n- Prevent full screen interruption \n- Never peek \n- Never make sound or vibrate \n- Hide from lock screen and status bar \n- Show at the bottom of the notification list \n\n"<b>"Level 0"</b>" \n- Block all notifications from the app"</string>
- <string name="notification_header_default_channel" msgid="7506845022070889909">"Notifications"</string>
- <string name="notification_channel_disabled" msgid="344536703863700565">"You won\'t see these notifications anymore"</string>
- <string name="notification_channel_minimized" msgid="1664411570378910931">"These notifications will be minimized"</string>
- <string name="notification_channel_silenced" msgid="2877199534497961942">"These notifications will be shown silently"</string>
- <string name="notification_channel_unsilenced" msgid="4790904571552394137">"These notifications will alert you"</string>
- <string name="inline_blocking_helper" msgid="3055064577771478591">"You usually dismiss these notifications. \nKeep showing them?"</string>
- <string name="inline_keep_showing" msgid="8945102997083836858">"Keep showing these notifications?"</string>
- <string name="inline_stop_button" msgid="4172980096860941033">"Stop notifications"</string>
- <string name="inline_block_button" msgid="8735843688021655065">"Block"</string>
- <string name="inline_keep_button" msgid="6665940297019018232">"Keep showing"</string>
- <string name="inline_minimize_button" msgid="966233327974702195">"Minimize"</string>
- <string name="inline_silent_button_silent" msgid="4411510650503783646">"Show silently"</string>
- <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Stay silent"</string>
- <string name="inline_silent_button_alert" msgid="7961887853830826523">"Alert me"</string>
- <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Keep alerting"</string>
- <string name="inline_keep_showing_app" msgid="1723113469580031041">"Keep showing notifications from this app?"</string>
- <string name="notification_unblockable_desc" msgid="1037434112919403708">"These notifications can\'t be turned off"</string>
- <string name="notification_delegate_header" msgid="9167022191405284627">"via <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
- <string name="appops_camera" msgid="8100147441602585776">"This app is using the camera."</string>
- <string name="appops_microphone" msgid="741508267659494555">"This app is using the microphone."</string>
- <string name="appops_overlay" msgid="6165912637560323464">"This app is displaying over other apps on your screen."</string>
- <string name="appops_camera_mic" msgid="1576901651150187433">"This app is using the microphone and camera."</string>
- <string name="appops_camera_overlay" msgid="8869400080809298814">"This app is displaying over other apps on your screen and using the camera."</string>
- <string name="appops_mic_overlay" msgid="4835157962857919804">"This app is displaying over other apps on your screen and using the microphone."</string>
- <string name="appops_camera_mic_overlay" msgid="6718768197048030993">"This app is displaying over other apps on your screen and using the microphone and camera."</string>
- <string name="notification_appops_settings" msgid="1028328314935908050">"Settings"</string>
- <string name="notification_appops_ok" msgid="1156966426011011434">"OK"</string>
- <string name="notification_channel_controls_opened_accessibility" msgid="6553950422055908113">"Notification controls for <xliff:g id="APP_NAME">%1$s</xliff:g> opened"</string>
- <string name="notification_channel_controls_closed_accessibility" msgid="7521619812603693144">"Notification controls for <xliff:g id="APP_NAME">%1$s</xliff:g> closed"</string>
- <string name="notification_channel_switch_accessibility" msgid="3420796005601900717">"Allow notifications from this channel"</string>
- <string name="notification_more_settings" msgid="816306283396553571">"More settings"</string>
- <string name="notification_app_settings" msgid="420348114670768449">"Customize"</string>
- <string name="notification_done" msgid="5279426047273930175">"Done"</string>
- <string name="inline_undo" msgid="558916737624706010">"Undo"</string>
- <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string>
- <string name="notification_menu_gear_description" msgid="2204480013726775108">"notification controls"</string>
- <string name="notification_menu_snooze_description" msgid="3653669438131034525">"notification snooze options"</string>
- <string name="notification_menu_snooze_action" msgid="1112254519029621372">"Snooze"</string>
- <string name="snooze_undo" msgid="6074877317002985129">"UNDO"</string>
- <string name="snoozed_for_time" msgid="2390718332980204462">"Snoozed for <xliff:g id="TIME_AMOUNT">%1$s</xliff:g>"</string>
+ <string name="user_remove_user_title" msgid="4681256956076895559">"Remove user?"</string>
+ <string name="user_remove_user_message" msgid="1453218013959498039">"All apps and data of this user will be deleted."</string>
+ <string name="user_remove_user_remove" msgid="7479275741742178297">"Remove"</string>
+ <string name="battery_saver_notification_title" msgid="8614079794522291840">"Battery Saver is on"</string>
+ <string name="battery_saver_notification_text" msgid="820318788126672692">"Reduces performance and background data"</string>
+ <string name="battery_saver_notification_action_text" msgid="132118784269455533">"Turn off Battery Saver"</string>
+ <string name="media_projection_dialog_text" msgid="3071431025448218928">"<xliff:g id="APP_SEEKING_PERMISSION">%s</xliff:g> will start capturing everything that\'s displayed on your screen."</string>
+ <string name="media_projection_remember_text" msgid="3103510882172746752">"Don\'t show again"</string>
+ <string name="clear_all_notifications_text" msgid="814192889771462828">"Clear all"</string>
+ <string name="manage_notifications_text" msgid="2386728145475108753">"Manage"</string>
+ <string name="dnd_suppressing_shade_text" msgid="1904574852846769301">"Notifications paused by Do Not Disturb"</string>
+ <string name="media_projection_action_text" msgid="8470872969457985954">"Start now"</string>
+ <string name="empty_shade_text" msgid="708135716272867002">"No notifications"</string>
+ <string name="profile_owned_footer" msgid="8021888108553696069">"Profile may be monitored"</string>
+ <string name="vpn_footer" msgid="2388611096129106812">"Network may be monitored"</string>
+ <string name="branded_vpn_footer" msgid="2168111859226496230">"Network may be monitored"</string>
+ <string name="quick_settings_disclosure_management_monitoring" msgid="6645176135063957394">"Your organization manages this device and may monitor network traffic"</string>
+ <string name="quick_settings_disclosure_named_management_monitoring" msgid="370622174777570853">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> manages this device and may monitor network traffic"</string>
+ <string name="quick_settings_disclosure_management_named_vpn" msgid="1085137869053332307">"Device is managed by your organization and connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string>
+ <string name="quick_settings_disclosure_named_management_named_vpn" msgid="6290456493852584017">"Device is managed by <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and connected to <xliff:g id="VPN_APP">%2$s</xliff:g>"</string>
+ <string name="quick_settings_disclosure_management" msgid="3294967280853150271">"Device is managed by your organization"</string>
+ <string name="quick_settings_disclosure_named_management" msgid="1059403025094542908">"Device is managed by <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>"</string>
+ <string name="quick_settings_disclosure_management_vpns" msgid="3698767349925266482">"Device is managed by your organization and connected to VPNs"</string>
+ <string name="quick_settings_disclosure_named_management_vpns" msgid="7777821385318891527">"Device is managed by <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> and connected to VPNs"</string>
+ <string name="quick_settings_disclosure_managed_profile_monitoring" msgid="5125463987558278215">"Your organization may monitor network traffic in your work profile"</string>
+ <string name="quick_settings_disclosure_named_managed_profile_monitoring" msgid="8973606847896650284">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> may monitor network traffic in your work profile"</string>
+ <string name="quick_settings_disclosure_monitoring" msgid="679658227269205728">"Network may be monitored"</string>
+ <string name="quick_settings_disclosure_vpns" msgid="8170318392053156330">"Device connected to VPNs"</string>
+ <string name="quick_settings_disclosure_managed_profile_named_vpn" msgid="3494535754792751741">"Work profile connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string>
+ <string name="quick_settings_disclosure_personal_profile_named_vpn" msgid="4467456202486569906">"Personal profile connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string>
+ <string name="quick_settings_disclosure_named_vpn" msgid="6943724064780847080">"Device connected to <xliff:g id="VPN_APP">%1$s</xliff:g>"</string>
+ <string name="monitoring_title_device_owned" msgid="1652495295941959815">"Device management"</string>
+ <string name="monitoring_title_profile_owned" msgid="6790109874733501487">"Profile monitoring"</string>
+ <string name="monitoring_title" msgid="169206259253048106">"Network monitoring"</string>
+ <string name="monitoring_subtitle_vpn" msgid="876537538087857300">"VPN"</string>
+ <string name="monitoring_subtitle_network_logging" msgid="3341264304793193386">"Network logging"</string>
+ <string name="monitoring_subtitle_ca_certificate" msgid="3874151893894355988">"CA certificates"</string>
+ <string name="disable_vpn" msgid="4435534311510272506">"Disable VPN"</string>
+ <string name="disconnect_vpn" msgid="1324915059568548655">"Disconnect VPN"</string>
+ <string name="monitoring_button_view_policies" msgid="100913612638514424">"View Policies"</string>
+ <string name="monitoring_description_named_management" msgid="5281789135578986303">"Your device is managed by <xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g>.\n\nYour admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nFor more information, contact your admin."</string>
+ <string name="monitoring_description_management" msgid="4573721970278370790">"Your device is managed by your organization.\n\nYour admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information.\n\nFor more information, contact your admin."</string>
+ <string name="monitoring_description_management_ca_certificate" msgid="5202023784131001751">"Your organization installed a certificate authority on this device. Your secure network traffic may be monitored or modified."</string>
+ <string name="monitoring_description_managed_profile_ca_certificate" msgid="4683248196789897964">"Your organization installed a certificate authority in your work profile. Your secure network traffic may be monitored or modified."</string>
+ <string name="monitoring_description_ca_certificate" msgid="7886985418413598352">"A certificate authority is installed on this device. Your secure network traffic may be monitored or modified."</string>
+ <string name="monitoring_description_management_network_logging" msgid="7184005419733060736">"Your admin has turned on network logging, which monitors traffic on your device."</string>
+ <string name="monitoring_description_named_vpn" msgid="7403457334088909254">"You\'re connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string>
+ <string name="monitoring_description_two_named_vpns" msgid="4198511413729213802">"You\'re connected to <xliff:g id="VPN_APP_0">%1$s</xliff:g> and <xliff:g id="VPN_APP_1">%2$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string>
+ <string name="monitoring_description_managed_profile_named_vpn" msgid="1427905889862420559">"Your work profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string>
+ <string name="monitoring_description_personal_profile_named_vpn" msgid="3133980926929069283">"Your personal profile is connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string>
+ <string name="monitoring_description_do_header_generic" msgid="96588491028288691">"Your device is managed by <xliff:g id="DEVICE_OWNER_APP">%1$s</xliff:g>."</string>
+ <string name="monitoring_description_do_header_with_name" msgid="5511133708978206460">"<xliff:g id="ORGANIZATION_NAME">%1$s</xliff:g> uses <xliff:g id="DEVICE_OWNER_APP">%2$s</xliff:g> to manage your device."</string>
+ <string name="monitoring_description_do_body" msgid="3639594537660975895">"Your admin can monitor and manage settings, corporate access, apps, data associated with your device, and your device\'s location information."</string>
+ <string name="monitoring_description_do_learn_more_separator" msgid="3785251953067436862">" "</string>
+ <string name="monitoring_description_do_learn_more" msgid="1849514470437907421">"Learn more"</string>
+ <string name="monitoring_description_do_body_vpn" msgid="8255218762488901796">"You\'re connected to <xliff:g id="VPN_APP">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string>
+ <string name="monitoring_description_vpn_settings_separator" msgid="1933186756733474388">" "</string>
+ <string name="monitoring_description_vpn_settings" msgid="6434859242636063861">"Open VPN settings"</string>
+ <string name="monitoring_description_ca_cert_settings_separator" msgid="4987350385906393626">" "</string>
+ <string name="monitoring_description_ca_cert_settings" msgid="5489969458872997092">"Open trusted credentials"</string>
+ <string name="monitoring_description_network_logging" msgid="7223505523384076027">"Your admin has turned on network logging, which monitors traffic on your device.\n\nFor more information, contact your admin."</string>
+ <string name="monitoring_description_vpn" msgid="4445150119515393526">"You gave an app permission to set up a VPN connection.\n\nThis app can monitor your device and network activity, including emails, apps, and websites."</string>
+ <string name="monitoring_description_vpn_profile_owned" msgid="2958019119161161530">"Your work profile is managed by <xliff:g id="ORGANIZATION">%1$s</xliff:g>.\n\nYour admin is capable of monitoring your network activity including emails, apps, and websites.\n\nFor more information, contact your admin.\n\nYou\'re also connected to a VPN, which can monitor your network activity."</string>
+ <string name="legacy_vpn_name" msgid="6604123105765737830">"VPN"</string>
+ <string name="monitoring_description_app" msgid="1828472472674709532">"You\'re connected to <xliff:g id="APPLICATION">%1$s</xliff:g>, which can monitor your network activity, including emails, apps, and websites."</string>
+ <string name="monitoring_description_app_personal" msgid="484599052118316268">"You\'re connected to <xliff:g id="APPLICATION">%1$s</xliff:g>, which can monitor your personal network activity, including emails, apps, and websites."</string>
+ <string name="branded_monitoring_description_app_personal" msgid="2669518213949202599">"You\'re connected to <xliff:g id="APPLICATION">%1$s</xliff:g>, which can monitor your personal network activity, including emails, apps, and websites."</string>
+ <string name="monitoring_description_app_work" msgid="4612997849787922906">"Your work profile is managed by <xliff:g id="ORGANIZATION">%1$s</xliff:g>. The profile is connected to <xliff:g id="APPLICATION">%2$s</xliff:g>, which can monitor your work network activity, including emails, apps, and websites.\n\nFor more information, contact your admin."</string>
+ <string name="monitoring_description_app_personal_work" msgid="5664165460056859391">"Your work profile is managed by <xliff:g id="ORGANIZATION">%1$s</xliff:g>. The profile is connected to <xliff:g id="APPLICATION_WORK">%2$s</xliff:g>, which can monitor your work network activity, including emails, apps, and websites.\n\nYou\'re also connected to <xliff:g id="APPLICATION_PERSONAL">%3$s</xliff:g>, which can monitor your personal network activity."</string>
+ <string name="keyguard_indication_trust_granted" msgid="4985003749105182372">"Unlocked for <xliff:g id="USER_NAME">%1$s</xliff:g>"</string>
+ <string name="keyguard_indication_trust_managed" msgid="8319646760022357585">"<xliff:g id="TRUST_AGENT">%1$s</xliff:g> is running"</string>
+ <string name="keyguard_indication_trust_disabled" msgid="7412534203633528135">"Device will stay locked until you manually unlock"</string>
+ <string name="hidden_notifications_title" msgid="7139628534207443290">"Get notifications faster"</string>
+ <string name="hidden_notifications_text" msgid="2326409389088668981">"See them before you unlock"</string>
+ <string name="hidden_notifications_cancel" msgid="3690709735122344913">"No thanks"</string>
+ <string name="hidden_notifications_setup" msgid="41079514801976810">"Set up"</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="6930243045593601084">"Turn off now"</string>
+ <string name="accessibility_volume_settings" msgid="4915364006817819212">"Sound settings"</string>
+ <string name="accessibility_volume_expand" msgid="5946812790999244205">"Expand"</string>
+ <string name="accessibility_volume_collapse" msgid="3609549593031810875">"Collapse"</string>
+ <string name="accessibility_output_chooser" msgid="8185317493017988680">"Switch output device"</string>
+ <string name="screen_pinning_title" msgid="3273740381976175811">"Screen is pinned"</string>
+ <string name="screen_pinning_description" msgid="8909878447196419623">"This keeps it in view until you unpin. Touch & hold Back and Overview to unpin."</string>
+ <string name="screen_pinning_description_recents_invisible" msgid="8281145542163727971">"This keeps it in view until you unpin. Touch & hold Back and Home to unpin."</string>
+ <string name="screen_pinning_description_accessible" msgid="426190689254018656">"This keeps it in view until you unpin. Touch & hold Overview to unpin."</string>
+ <string name="screen_pinning_description_recents_invisible_accessible" msgid="6134833683151189507">"This keeps it in view until you unpin. Touch & hold Home to unpin."</string>
+ <string name="screen_pinning_toast" msgid="2266705122951934150">"To unpin this screen, touch & hold Back and Overview buttons"</string>
+ <string name="screen_pinning_toast_recents_invisible" msgid="8252402309499161281">"To unpin this screen, touch & hold Back and Home buttons"</string>
+ <string name="screen_pinning_positive" msgid="3783985798366751226">"Got it"</string>
+ <string name="screen_pinning_negative" msgid="3741602308343880268">"No thanks"</string>
+ <string name="screen_pinning_start" msgid="1022122128489278317">"Screen pinned"</string>
+ <string name="screen_pinning_exit" msgid="5187339744262325372">"Screen unpinned"</string>
+ <string name="quick_settings_reset_confirmation_title" msgid="748792586749897883">"Hide <xliff:g id="TILE_LABEL">%1$s</xliff:g>?"</string>
+ <string name="quick_settings_reset_confirmation_message" msgid="2235970126803317374">"It will reappear the next time you turn it on in settings."</string>
+ <string name="quick_settings_reset_confirmation_button" msgid="2660339101868367515">"Hide"</string>
+ <string name="stream_voice_call" msgid="4410002696470423714">"Call"</string>
+ <string name="stream_system" msgid="7493299064422163147">"System"</string>
+ <string name="stream_ring" msgid="8213049469184048338">"Ring"</string>
+ <string name="stream_music" msgid="9086982948697544342">"Media"</string>
+ <string name="stream_alarm" msgid="5209444229227197703">"Alarm"</string>
+ <string name="stream_notification" msgid="2563720670905665031">"Notification"</string>
+ <string name="stream_bluetooth_sco" msgid="2055645746402746292">"Bluetooth"</string>
+ <string name="stream_dtmf" msgid="2447177903892477915">"Dual multi tone frequency"</string>
+ <string name="stream_accessibility" msgid="301136219144385106">"Accessibility"</string>
+ <string name="ring_toggle_title" msgid="3281244519428819576">"Calls"</string>
+ <string name="volume_ringer_status_normal" msgid="4273142424125855384">"Ring"</string>
+ <string name="volume_ringer_status_vibrate" msgid="1825615171021346557">"Vibrate"</string>
+ <string name="volume_ringer_status_silent" msgid="6896394161022916369">"Mute"</string>
+ <string name="qs_status_phone_vibrate" msgid="204362991135761679">"Phone on vibrate"</string>
+ <string name="qs_status_phone_muted" msgid="5437668875879171548">"Phone muted"</string>
+ <string name="volume_stream_content_description_unmute" msgid="4436631538779230857">"%1$s. Tap to unmute."</string>
+ <string name="volume_stream_content_description_vibrate" msgid="1187944970457807498">"%1$s. Tap to set to vibrate. Accessibility services may be muted."</string>
+ <string name="volume_stream_content_description_mute" msgid="3625049841390467354">"%1$s. Tap to mute. Accessibility services may be muted."</string>
+ <string name="volume_stream_content_description_vibrate_a11y" msgid="6427727603978431301">"%1$s. Tap to set to vibrate."</string>
+ <string name="volume_stream_content_description_mute_a11y" msgid="8995013018414535494">"%1$s. Tap to mute."</string>
+ <string name="volume_ringer_hint_mute" msgid="9199811307292269601">"mute"</string>
+ <string name="volume_ringer_hint_unmute" msgid="6602880133293060368">"unmute"</string>
+ <string name="volume_ringer_hint_vibrate" msgid="4036802135666515202">"vibrate"</string>
+ <string name="volume_dialog_title" msgid="7272969888820035876">"%s volume controls"</string>
+ <string name="volume_dialog_ringer_guidance_ring" msgid="3360373718388509040">"Calls and notifications will ring (<xliff:g id="VOLUME_LEVEL">%1$s</xliff:g>)"</string>
+ <string name="output_title" msgid="5355078100792942802">"Media output"</string>
+ <string name="output_calls_title" msgid="8717692905017206161">"Phone call output"</string>
+ <string name="output_none_found" msgid="5544982839808921091">"No devices found"</string>
+ <string name="output_none_found_service_off" msgid="8631969668659757069">"No devices found. Try turning on <xliff:g id="SERVICE">%1$s</xliff:g>"</string>
+ <string name="output_service_bt" msgid="6224213415445509542">"Bluetooth"</string>
+ <string name="output_service_wifi" msgid="3749735218931825054">"Wi-Fi"</string>
+ <string name="output_service_bt_wifi" msgid="4486837869988770896">"Bluetooth and Wi-Fi"</string>
+ <string name="system_ui_tuner" msgid="708224127392452018">"System UI Tuner"</string>
+ <string name="show_battery_percentage" msgid="5444136600512968798">"Show embedded battery percentage"</string>
+ <string name="show_battery_percentage_summary" msgid="3215025775576786037">"Show battery level percentage inside the status bar icon when not charging"</string>
+ <string name="quick_settings" msgid="10042998191725428">"Quick Settings"</string>
+ <string name="status_bar" msgid="4877645476959324760">"Status bar"</string>
+ <string name="overview" msgid="4018602013895926956">"Overview"</string>
+ <string name="demo_mode" msgid="2532177350215638026">"System UI demo mode"</string>
+ <string name="enable_demo_mode" msgid="4844205668718636518">"Enable demo mode"</string>
+ <string name="show_demo_mode" msgid="2018336697782464029">"Show demo mode"</string>
+ <string name="status_bar_ethernet" msgid="5044290963549500128">"Ethernet"</string>
+ <string name="status_bar_alarm" msgid="8536256753575881818">"Alarm"</string>
+ <string name="status_bar_work" msgid="6022553324802866373">"Work profile"</string>
+ <string name="status_bar_airplane" msgid="7057575501472249002">"Airplane mode"</string>
+ <string name="add_tile" msgid="2995389510240786221">"Add tile"</string>
+ <string name="broadcast_tile" msgid="3894036511763289383">"Broadcast Tile"</string>
+ <string name="zen_alarm_warning_indef" msgid="3482966345578319605">"You won\'t hear your next alarm <xliff:g id="WHEN">%1$s</xliff:g> unless you turn this off before then"</string>
+ <string name="zen_alarm_warning" msgid="444533119582244293">"You won\'t hear your next alarm <xliff:g id="WHEN">%1$s</xliff:g>"</string>
+ <string name="alarm_template" msgid="3980063409350522735">"at <xliff:g id="WHEN">%1$s</xliff:g>"</string>
+ <string name="alarm_template_far" msgid="4242179982586714810">"on <xliff:g id="WHEN">%1$s</xliff:g>"</string>
+ <string name="accessibility_quick_settings_detail" msgid="2579369091672902101">"Quick Settings, <xliff:g id="TITLE">%s</xliff:g>."</string>
+ <string name="accessibility_status_bar_hotspot" msgid="4099381329956402865">"Hotspot"</string>
+ <string name="accessibility_managed_profile" msgid="6613641363112584120">"Work profile"</string>
+ <string name="tuner_warning_title" msgid="7094689930793031682">"Fun for some but not for all"</string>
+ <string name="tuner_warning" msgid="8730648121973575701">"System UI Tuner gives you extra ways to tweak and customize the Android user interface. These experimental features may change, break, or disappear in future releases. Proceed with caution."</string>
+ <string name="tuner_persistent_warning" msgid="8597333795565621795">"These experimental features may change, break, or disappear in future releases. Proceed with caution."</string>
+ <string name="got_it" msgid="2239653834387972602">"Got it"</string>
+ <string name="tuner_toast" msgid="603429811084428439">"Congrats! System UI Tuner has been added to Settings"</string>
+ <string name="remove_from_settings" msgid="8389591916603406378">"Remove from Settings"</string>
+ <string name="remove_from_settings_prompt" msgid="6069085993355887748">"Remove System UI Tuner from Settings and stop using all of its features?"</string>
+ <string name="activity_not_found" msgid="348423244327799974">"Application is not installed on your device"</string>
+ <string name="clock_seconds" msgid="7689554147579179507">"Show clock seconds"</string>
+ <string name="clock_seconds_desc" msgid="6282693067130470675">"Show clock seconds in the status bar. May impact battery life."</string>
+ <string name="qs_rearrange" msgid="8060918697551068765">"Rearrange Quick Settings"</string>
+ <string name="show_brightness" msgid="6613930842805942519">"Show brightness in Quick Settings"</string>
+ <string name="experimental" msgid="6198182315536726162">"Experimental"</string>
+ <string name="enable_bluetooth_title" msgid="5027037706500635269">"Turn on Bluetooth?"</string>
+ <string name="enable_bluetooth_message" msgid="9106595990708985385">"To connect your keyboard with your tablet, you first have to turn on Bluetooth."</string>
+ <string name="enable_bluetooth_confirmation_ok" msgid="6258074250948309715">"Turn on"</string>
+ <string name="show_silently" msgid="6841966539811264192">"Show notifications silently"</string>
+ <string name="block" msgid="2734508760962682611">"Block all notifications"</string>
+ <string name="do_not_silence" msgid="6878060322594892441">"Don\'t silence"</string>
+ <string name="do_not_silence_block" msgid="4070647971382232311">"Don\'t silence or block"</string>
+ <string name="tuner_full_importance_settings" msgid="3207312268609236827">"Power notification controls"</string>
+ <string name="tuner_full_importance_settings_on" msgid="7545060756610299966">"On"</string>
+ <string name="tuner_full_importance_settings_off" msgid="8208165412614935229">"Off"</string>
+ <string name="power_notification_controls_description" msgid="4372459941671353358">"With power notification controls, you can set an importance level from 0 to 5 for an app\'s notifications. \n\n"<b>"Level 5"</b>" \n- Show at the top of the notification list \n- Allow full screen interruption \n- Always peek \n\n"<b>"Level 4"</b>" \n- Prevent full screen interruption \n- Always peek \n\n"<b>"Level 3"</b>" \n- Prevent full screen interruption \n- Never peek \n\n"<b>"Level 2"</b>" \n- Prevent full screen interruption \n- Never peek \n- Never make sound and vibration \n\n"<b>"Level 1"</b>" \n- Prevent full screen interruption \n- Never peek \n- Never make sound or vibrate \n- Hide from lock screen and status bar \n- Show at the bottom of the notification list \n\n"<b>"Level 0"</b>" \n- Block all notifications from the app"</string>
+ <string name="notification_header_default_channel" msgid="7506845022070889909">"Notifications"</string>
+ <string name="notification_channel_disabled" msgid="344536703863700565">"You won\'t see these notifications anymore"</string>
+ <string name="notification_channel_minimized" msgid="1664411570378910931">"These notifications will be minimized"</string>
+ <string name="notification_channel_silenced" msgid="2877199534497961942">"These notifications will be shown silently"</string>
+ <string name="notification_channel_unsilenced" msgid="4790904571552394137">"These notifications will alert you"</string>
+ <string name="inline_blocking_helper" msgid="3055064577771478591">"You usually dismiss these notifications. \nKeep showing them?"</string>
+ <string name="inline_keep_showing" msgid="8945102997083836858">"Keep showing these notifications?"</string>
+ <string name="inline_stop_button" msgid="4172980096860941033">"Stop notifications"</string>
+ <string name="inline_block_button" msgid="8735843688021655065">"Block"</string>
+ <string name="inline_keep_button" msgid="6665940297019018232">"Keep showing"</string>
+ <string name="inline_minimize_button" msgid="966233327974702195">"Minimize"</string>
+ <string name="inline_silent_button_silent" msgid="4411510650503783646">"Show silently"</string>
+ <string name="inline_silent_button_stay_silent" msgid="6308371431217601009">"Stay silent"</string>
+ <string name="inline_silent_button_alert" msgid="7961887853830826523">"Alert me"</string>
+ <string name="inline_silent_button_keep_alerting" msgid="327696842264359693">"Keep alerting"</string>
+ <string name="inline_keep_showing_app" msgid="1723113469580031041">"Keep showing notifications from this app?"</string>
+ <string name="notification_unblockable_desc" msgid="1037434112919403708">"These notifications can\'t be turned off"</string>
+ <string name="notification_delegate_header" msgid="9167022191405284627">"via <xliff:g id="APP_NAME">%1$s</xliff:g>"</string>
+ <string name="appops_camera" msgid="8100147441602585776">"This app is using the camera."</string>
+ <string name="appops_microphone" msgid="741508267659494555">"This app is using the microphone."</string>
+ <string name="appops_overlay" msgid="6165912637560323464">"This app is displaying over other apps on your screen."</string>
+ <string name="appops_camera_mic" msgid="1576901651150187433">"This app is using the microphone and camera."</string>
+ <string name="appops_camera_overlay" msgid="8869400080809298814">"This app is displaying over other apps on your screen and using the camera."</string>
+ <string name="appops_mic_overlay" msgid="4835157962857919804">"This app is displaying over other apps on your screen and using the microphone."</string>
+ <string name="appops_camera_mic_overlay" msgid="6718768197048030993">"This app is displaying over other apps on your screen and using the microphone and camera."</string>
+ <string name="notification_appops_settings" msgid="1028328314935908050">"Settings"</string>
+ <string name="notification_appops_ok" msgid="1156966426011011434">"OK"</string>
+ <string name="notification_channel_controls_opened_accessibility" msgid="6553950422055908113">"Notification controls for <xliff:g id="APP_NAME">%1$s</xliff:g> opened"</string>
+ <string name="notification_channel_controls_closed_accessibility" msgid="7521619812603693144">"Notification controls for <xliff:g id="APP_NAME">%1$s</xliff:g> closed"</string>
+ <string name="notification_channel_switch_accessibility" msgid="3420796005601900717">"Allow notifications from this channel"</string>
+ <string name="notification_more_settings" msgid="816306283396553571">"More settings"</string>
+ <string name="notification_app_settings" msgid="420348114670768449">"Customize"</string>
+ <string name="notification_done" msgid="5279426047273930175">"Done"</string>
+ <string name="inline_undo" msgid="558916737624706010">"Undo"</string>
+ <string name="notification_menu_accessibility" msgid="2046162834248888553">"<xliff:g id="APP_NAME">%1$s</xliff:g> <xliff:g id="MENU_DESCRIPTION">%2$s</xliff:g>"</string>
+ <string name="notification_menu_gear_description" msgid="2204480013726775108">"notification controls"</string>
+ <string name="notification_menu_snooze_description" msgid="3653669438131034525">"notification snooze options"</string>
+ <string name="notification_menu_snooze_action" msgid="1112254519029621372">"Snooze"</string>
+ <string name="snooze_undo" msgid="6074877317002985129">"UNDO"</string>
+ <string name="snoozed_for_time" msgid="2390718332980204462">"Snoozed for <xliff:g id="TIME_AMOUNT">%1$s</xliff:g>"</string>
<plurals name="snoozeHourOptions" formatted="false" msgid="2124335842674413030">
- <item quantity="other">%d hours</item>
- <item quantity="one">%d hour</item>
+ <item quantity="other">%d hours</item>
+ <item quantity="one">%d hour</item>
</plurals>
<plurals name="snoozeMinuteOptions" formatted="false" msgid="4127251700591510196">
- <item quantity="other">%d minutes</item>
- <item quantity="one">%d minute</item>
+ <item quantity="other">%d minutes</item>
+ <item quantity="one">%d minute</item>
</plurals>
- <string name="battery_panel_title" msgid="7944156115535366613">"Battery usage"</string>
- <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Battery Saver not available during charging"</string>
- <string name="battery_detail_switch_title" msgid="6285872470260795421">"Battery Saver"</string>
- <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduces performance and background data"</string>
- <string name="keyboard_key_button_template" msgid="6230056639734377300">"Button <xliff:g id="NAME">%1$s</xliff:g>"</string>
- <string name="keyboard_key_home" msgid="2243500072071305073">"Home"</string>
- <string name="keyboard_key_back" msgid="2337450286042721351">"Back"</string>
- <string name="keyboard_key_dpad_up" msgid="5584144111755734686">"Up"</string>
- <string name="keyboard_key_dpad_down" msgid="7331518671788337815">"Down"</string>
- <string name="keyboard_key_dpad_left" msgid="1346446024676962251">"Left"</string>
- <string name="keyboard_key_dpad_right" msgid="3317323247127515341">"Right"</string>
- <string name="keyboard_key_dpad_center" msgid="2566737770049304658">"Center"</string>
- <string name="keyboard_key_tab" msgid="3871485650463164476">"Tab"</string>
- <string name="keyboard_key_space" msgid="2499861316311153293">"Space"</string>
- <string name="keyboard_key_enter" msgid="5739632123216118137">"Enter"</string>
- <string name="keyboard_key_backspace" msgid="1559580097512385854">"Backspace"</string>
- <string name="keyboard_key_media_play_pause" msgid="3861975717393887428">"Play/Pause"</string>
- <string name="keyboard_key_media_stop" msgid="2859963958595908962">"Stop"</string>
- <string name="keyboard_key_media_next" msgid="1894394911630345607">"Next"</string>
- <string name="keyboard_key_media_previous" msgid="4256072387192967261">"Previous"</string>
- <string name="keyboard_key_media_rewind" msgid="2654808213360820186">"Rewind"</string>
- <string name="keyboard_key_media_fast_forward" msgid="3849417047738200605">"Fast Forward"</string>
- <string name="keyboard_key_page_up" msgid="5654098530106845603">"Page Up"</string>
- <string name="keyboard_key_page_down" msgid="8720502083731906136">"Page Down"</string>
- <string name="keyboard_key_forward_del" msgid="1391451334716490176">"Delete"</string>
- <string name="keyboard_key_move_home" msgid="2765693292069487486">"Home"</string>
- <string name="keyboard_key_move_end" msgid="5901174332047975247">"End"</string>
- <string name="keyboard_key_insert" msgid="8530501581636082614">"Insert"</string>
- <string name="keyboard_key_num_lock" msgid="5052537581246772117">"Num Lock"</string>
- <string name="keyboard_key_numpad_template" msgid="8729216555174634026">"Numpad <xliff:g id="NAME">%1$s</xliff:g>"</string>
- <string name="keyboard_shortcut_group_system" msgid="6472647649616541064">"System"</string>
- <string name="keyboard_shortcut_group_system_home" msgid="3054369431319891965">"Home"</string>
- <string name="keyboard_shortcut_group_system_recents" msgid="3154851905021926744">"Recents"</string>
- <string name="keyboard_shortcut_group_system_back" msgid="2207004531216446378">"Back"</string>
- <string name="keyboard_shortcut_group_system_notifications" msgid="8366964080041773224">"Notifications"</string>
- <string name="keyboard_shortcut_group_system_shortcuts_helper" msgid="4892255911160332762">"Keyboard Shortcuts"</string>
- <string name="keyboard_shortcut_group_system_switch_input" msgid="8413348767825486492">"Switch keyboard layout"</string>
- <string name="keyboard_shortcut_group_applications" msgid="9129465955073449206">"Applications"</string>
- <string name="keyboard_shortcut_group_applications_assist" msgid="9095441910537146013">"Assist"</string>
- <string name="keyboard_shortcut_group_applications_browser" msgid="6465985474000766533">"Browser"</string>
- <string name="keyboard_shortcut_group_applications_contacts" msgid="2064197111278436375">"Contacts"</string>
- <string name="keyboard_shortcut_group_applications_email" msgid="6257036897441939004">"Email"</string>
- <string name="keyboard_shortcut_group_applications_sms" msgid="638701213803242744">"SMS"</string>
- <string name="keyboard_shortcut_group_applications_music" msgid="4775559515850922780">"Music"</string>
- <string name="keyboard_shortcut_group_applications_youtube" msgid="6555453761294723317">"YouTube"</string>
- <string name="keyboard_shortcut_group_applications_calendar" msgid="9043614299194991263">"Calendar"</string>
- <string name="tuner_full_zen_title" msgid="4540823317772234308">"Show with volume controls"</string>
- <string name="volume_and_do_not_disturb" msgid="3373784330208603030">"Do not disturb"</string>
- <string name="volume_dnd_silent" msgid="4363882330723050727">"Volume buttons shortcut"</string>
- <string name="volume_up_silent" msgid="7141255269783588286">"Exit do not disturb on volume up"</string>
- <string name="battery" msgid="7498329822413202973">"Battery"</string>
- <string name="clock" msgid="7416090374234785905">"Clock"</string>
- <string name="headset" msgid="4534219457597457353">"Headset"</string>
- <string name="accessibility_long_click_tile" msgid="6687350750091842525">"Open settings"</string>
- <string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Headphones connected"</string>
- <string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Headset connected"</string>
- <string name="data_saver" msgid="5037565123367048522">"Data Saver"</string>
- <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Data Saver is on"</string>
- <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Data Saver is off"</string>
- <string name="switch_bar_on" msgid="1142437840752794229">"On"</string>
- <string name="switch_bar_off" msgid="8803270596930432874">"Off"</string>
- <string name="nav_bar" msgid="1993221402773877607">"Navigation bar"</string>
- <string name="nav_bar_layout" msgid="3664072994198772020">"Layout"</string>
- <string name="left_nav_bar_button_type" msgid="8555981238887546528">"Extra left button type"</string>
- <string name="right_nav_bar_button_type" msgid="2481056627065649656">"Extra right button type"</string>
- <string name="nav_bar_default" msgid="8587114043070993007">"(default)"</string>
+ <string name="battery_panel_title" msgid="7944156115535366613">"Battery usage"</string>
+ <string name="battery_detail_charging_summary" msgid="1279095653533044008">"Battery Saver not available during charging"</string>
+ <string name="battery_detail_switch_title" msgid="6285872470260795421">"Battery Saver"</string>
+ <string name="battery_detail_switch_summary" msgid="9049111149407626804">"Reduces performance and background data"</string>
+ <string name="keyboard_key_button_template" msgid="6230056639734377300">"Button <xliff:g id="NAME">%1$s</xliff:g>"</string>
+ <string name="keyboard_key_home" msgid="2243500072071305073">"Home"</string>
+ <string name="keyboard_key_back" msgid="2337450286042721351">"Back"</string>
+ <string name="keyboard_key_dpad_up" msgid="5584144111755734686">"Up"</string>
+ <string name="keyboard_key_dpad_down" msgid="7331518671788337815">"Down"</string>
+ <string name="keyboard_key_dpad_left" msgid="1346446024676962251">"Left"</string>
+ <string name="keyboard_key_dpad_right" msgid="3317323247127515341">"Right"</string>
+ <string name="keyboard_key_dpad_center" msgid="2566737770049304658">"Center"</string>
+ <string name="keyboard_key_tab" msgid="3871485650463164476">"Tab"</string>
+ <string name="keyboard_key_space" msgid="2499861316311153293">"Space"</string>
+ <string name="keyboard_key_enter" msgid="5739632123216118137">"Enter"</string>
+ <string name="keyboard_key_backspace" msgid="1559580097512385854">"Backspace"</string>
+ <string name="keyboard_key_media_play_pause" msgid="3861975717393887428">"Play/Pause"</string>
+ <string name="keyboard_key_media_stop" msgid="2859963958595908962">"Stop"</string>
+ <string name="keyboard_key_media_next" msgid="1894394911630345607">"Next"</string>
+ <string name="keyboard_key_media_previous" msgid="4256072387192967261">"Previous"</string>
+ <string name="keyboard_key_media_rewind" msgid="2654808213360820186">"Rewind"</string>
+ <string name="keyboard_key_media_fast_forward" msgid="3849417047738200605">"Fast Forward"</string>
+ <string name="keyboard_key_page_up" msgid="5654098530106845603">"Page Up"</string>
+ <string name="keyboard_key_page_down" msgid="8720502083731906136">"Page Down"</string>
+ <string name="keyboard_key_forward_del" msgid="1391451334716490176">"Delete"</string>
+ <string name="keyboard_key_move_home" msgid="2765693292069487486">"Home"</string>
+ <string name="keyboard_key_move_end" msgid="5901174332047975247">"End"</string>
+ <string name="keyboard_key_insert" msgid="8530501581636082614">"Insert"</string>
+ <string name="keyboard_key_num_lock" msgid="5052537581246772117">"Num Lock"</string>
+ <string name="keyboard_key_numpad_template" msgid="8729216555174634026">"Numpad <xliff:g id="NAME">%1$s</xliff:g>"</string>
+ <string name="keyboard_shortcut_group_system" msgid="6472647649616541064">"System"</string>
+ <string name="keyboard_shortcut_group_system_home" msgid="3054369431319891965">"Home"</string>
+ <string name="keyboard_shortcut_group_system_recents" msgid="3154851905021926744">"Recents"</string>
+ <string name="keyboard_shortcut_group_system_back" msgid="2207004531216446378">"Back"</string>
+ <string name="keyboard_shortcut_group_system_notifications" msgid="8366964080041773224">"Notifications"</string>
+ <string name="keyboard_shortcut_group_system_shortcuts_helper" msgid="4892255911160332762">"Keyboard Shortcuts"</string>
+ <string name="keyboard_shortcut_group_system_switch_input" msgid="8413348767825486492">"Switch keyboard layout"</string>
+ <string name="keyboard_shortcut_group_applications" msgid="9129465955073449206">"Applications"</string>
+ <string name="keyboard_shortcut_group_applications_assist" msgid="9095441910537146013">"Assist"</string>
+ <string name="keyboard_shortcut_group_applications_browser" msgid="6465985474000766533">"Browser"</string>
+ <string name="keyboard_shortcut_group_applications_contacts" msgid="2064197111278436375">"Contacts"</string>
+ <string name="keyboard_shortcut_group_applications_email" msgid="6257036897441939004">"Email"</string>
+ <string name="keyboard_shortcut_group_applications_sms" msgid="638701213803242744">"SMS"</string>
+ <string name="keyboard_shortcut_group_applications_music" msgid="4775559515850922780">"Music"</string>
+ <string name="keyboard_shortcut_group_applications_youtube" msgid="6555453761294723317">"YouTube"</string>
+ <string name="keyboard_shortcut_group_applications_calendar" msgid="9043614299194991263">"Calendar"</string>
+ <string name="tuner_full_zen_title" msgid="4540823317772234308">"Show with volume controls"</string>
+ <string name="volume_and_do_not_disturb" msgid="3373784330208603030">"Do not disturb"</string>
+ <string name="volume_dnd_silent" msgid="4363882330723050727">"Volume buttons shortcut"</string>
+ <string name="volume_up_silent" msgid="7141255269783588286">"Exit do not disturb on volume up"</string>
+ <string name="battery" msgid="7498329822413202973">"Battery"</string>
+ <string name="clock" msgid="7416090374234785905">"Clock"</string>
+ <string name="headset" msgid="4534219457597457353">"Headset"</string>
+ <string name="accessibility_long_click_tile" msgid="6687350750091842525">"Open settings"</string>
+ <string name="accessibility_status_bar_headphones" msgid="9156307120060559989">"Headphones connected"</string>
+ <string name="accessibility_status_bar_headset" msgid="8666419213072449202">"Headset connected"</string>
+ <string name="data_saver" msgid="5037565123367048522">"Data Saver"</string>
+ <string name="accessibility_data_saver_on" msgid="8454111686783887148">"Data Saver is on"</string>
+ <string name="accessibility_data_saver_off" msgid="8841582529453005337">"Data Saver is off"</string>
+ <string name="switch_bar_on" msgid="1142437840752794229">"On"</string>
+ <string name="switch_bar_off" msgid="8803270596930432874">"Off"</string>
+ <string name="nav_bar" msgid="1993221402773877607">"Navigation bar"</string>
+ <string name="nav_bar_layout" msgid="3664072994198772020">"Layout"</string>
+ <string name="left_nav_bar_button_type" msgid="8555981238887546528">"Extra left button type"</string>
+ <string name="right_nav_bar_button_type" msgid="2481056627065649656">"Extra right button type"</string>
+ <string name="nav_bar_default" msgid="8587114043070993007">"(default)"</string>
<string-array name="nav_bar_buttons">
- <item msgid="1545641631806817203">"Clipboard"</item>
- <item msgid="5742013440802239414">"Keycode"</item>
- <item msgid="1951959982985094069">"Rotate confirm, keyboard switcher"</item>
- <item msgid="8175437057325747277">"None"</item>
+ <item msgid="1545641631806817203">"Clipboard"</item>
+ <item msgid="5742013440802239414">"Keycode"</item>
+ <item msgid="1951959982985094069">"Rotate confirm, keyboard switcher"</item>
+ <item msgid="8175437057325747277">"None"</item>
</string-array>
<string-array name="nav_bar_layouts">
- <item msgid="8077901629964902399">"Normal"</item>
- <item msgid="8256205964297588988">"Compact"</item>
- <item msgid="8719936228094005878">"Left-leaning"</item>
- <item msgid="586019486955594690">"Right-leaning"</item>
+ <item msgid="8077901629964902399">"Normal"</item>
+ <item msgid="8256205964297588988">"Compact"</item>
+ <item msgid="8719936228094005878">"Left-leaning"</item>
+ <item msgid="586019486955594690">"Right-leaning"</item>
</string-array>
- <string name="menu_ime" msgid="4998010205321292416">"Keyboard switcher"</string>
- <string name="save" msgid="2311877285724540644">"Save"</string>
- <string name="reset" msgid="2448168080964209908">"Reset"</string>
- <string name="adjust_button_width" msgid="6138616087197632947">"Adjust button width"</string>
- <string name="clipboard" msgid="1313879395099896312">"Clipboard"</string>
- <string name="accessibility_key" msgid="5701989859305675896">"Custom navigation button"</string>
- <string name="left_keycode" msgid="2010948862498918135">"Left keycode"</string>
- <string name="right_keycode" msgid="708447961000848163">"Right keycode"</string>
- <string name="left_icon" msgid="3096287125959387541">"Left icon"</string>
- <string name="right_icon" msgid="3952104823293824311">"Right icon"</string>
- <string name="drag_to_add_tiles" msgid="230586591689084925">"Hold and drag to add tiles"</string>
- <string name="drag_to_rearrange_tiles" msgid="4566074720193667473">"Hold and drag to rearrange tiles"</string>
- <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Drag here to remove"</string>
- <string name="drag_to_remove_disabled" msgid="2390968976638993382">"You need at least 6 tiles"</string>
- <string name="qs_edit" msgid="2232596095725105230">"Edit"</string>
- <string name="tuner_time" msgid="6572217313285536011">"Time"</string>
+ <string name="menu_ime" msgid="4998010205321292416">"Keyboard switcher"</string>
+ <string name="save" msgid="2311877285724540644">"Save"</string>
+ <string name="reset" msgid="2448168080964209908">"Reset"</string>
+ <string name="adjust_button_width" msgid="6138616087197632947">"Adjust button width"</string>
+ <string name="clipboard" msgid="1313879395099896312">"Clipboard"</string>
+ <string name="accessibility_key" msgid="5701989859305675896">"Custom navigation button"</string>
+ <string name="left_keycode" msgid="2010948862498918135">"Left keycode"</string>
+ <string name="right_keycode" msgid="708447961000848163">"Right keycode"</string>
+ <string name="left_icon" msgid="3096287125959387541">"Left icon"</string>
+ <string name="right_icon" msgid="3952104823293824311">"Right icon"</string>
+ <string name="drag_to_add_tiles" msgid="230586591689084925">"Hold and drag to add tiles"</string>
+ <string name="drag_to_rearrange_tiles" msgid="4566074720193667473">"Hold and drag to rearrange tiles"</string>
+ <string name="drag_to_remove_tiles" msgid="3361212377437088062">"Drag here to remove"</string>
+ <string name="drag_to_remove_disabled" msgid="2390968976638993382">"You need at least 6 tiles"</string>
+ <string name="qs_edit" msgid="2232596095725105230">"Edit"</string>
+ <string name="tuner_time" msgid="6572217313285536011">"Time"</string>
<string-array name="clock_options">
- <item msgid="5965318737560463480">"Show hours, minutes, and seconds"</item>
- <item msgid="1427801730816895300">"Show hours and minutes (default)"</item>
- <item msgid="3830170141562534721">"Don\'t show this icon"</item>
+ <item msgid="5965318737560463480">"Show hours, minutes, and seconds"</item>
+ <item msgid="1427801730816895300">"Show hours and minutes (default)"</item>
+ <item msgid="3830170141562534721">"Don\'t show this icon"</item>
</string-array>
<string-array name="battery_options">
- <item msgid="3160236755818672034">"Always show percentage"</item>
- <item msgid="2139628951880142927">"Show percentage when charging (default)"</item>
- <item msgid="3327323682209964956">"Don\'t show this icon"</item>
+ <item msgid="3160236755818672034">"Always show percentage"</item>
+ <item msgid="2139628951880142927">"Show percentage when charging (default)"</item>
+ <item msgid="3327323682209964956">"Don\'t show this icon"</item>
</string-array>
- <string name="tuner_low_priority" msgid="1325884786608312358">"Show low-priority notification icons"</string>
- <string name="other" msgid="4060683095962566764">"Other"</string>
- <string name="accessibility_divider" msgid="5903423481953635044">"Split-screen divider"</string>
- <string name="accessibility_action_divider_left_full" msgid="2801570521881574972">"Left full screen"</string>
- <string name="accessibility_action_divider_left_70" msgid="3612060638991687254">"Left 70%"</string>
- <string name="accessibility_action_divider_left_50" msgid="1248083470322193075">"Left 50%"</string>
- <string name="accessibility_action_divider_left_30" msgid="543324403127069386">"Left 30%"</string>
- <string name="accessibility_action_divider_right_full" msgid="4639381073802030463">"Right full screen"</string>
- <string name="accessibility_action_divider_top_full" msgid="5357010904067731654">"Top full screen"</string>
- <string name="accessibility_action_divider_top_70" msgid="5090779195650364522">"Top 70%"</string>
- <string name="accessibility_action_divider_top_50" msgid="6385859741925078668">"Top 50%"</string>
- <string name="accessibility_action_divider_top_30" msgid="6201455163864841205">"Top 30%"</string>
- <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Bottom full screen"</string>
- <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Position <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Double tap to edit."</string>
- <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Double tap to add."</string>
- <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
- <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Remove <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
- <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Add <xliff:g id="TILE_NAME">%1$s</xliff:g> to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
- <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g> to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
- <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Quick settings editor."</string>
- <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> notification: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="dock_forced_resizable" msgid="5914261505436217520">"App may not work with split-screen."</string>
- <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"App does not support split-screen."</string>
- <string name="forced_resizable_secondary_display" msgid="4230857851756391925">"App may not work on a secondary display."</string>
- <string name="activity_launch_on_secondary_display_failed_text" msgid="7793821742158306742">"App does not support launch on secondary displays."</string>
- <string name="accessibility_quick_settings_settings" msgid="6132460890024942157">"Open settings."</string>
- <string name="accessibility_quick_settings_expand" msgid="2375165227880477530">"Open quick settings."</string>
- <string name="accessibility_quick_settings_collapse" msgid="1792625797142648105">"Close quick settings."</string>
- <string name="accessibility_quick_settings_alarm_set" msgid="1863000242431528676">"Alarm set."</string>
- <string name="accessibility_quick_settings_user" msgid="1567445362870421770">"Signed in as <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="data_connection_no_internet" msgid="4503302451650972989">"No internet"</string>
- <string name="accessibility_quick_settings_open_details" msgid="4230931801728005194">"Open details."</string>
- <string name="accessibility_quick_settings_not_available" msgid="4190068184294019846">"Unvailable due to <xliff:g id="REASON">%s</xliff:g>"</string>
- <string name="accessibility_quick_settings_open_settings" msgid="7806613775728380737">"Open <xliff:g id="ID_1">%s</xliff:g> settings."</string>
- <string name="accessibility_quick_settings_edit" msgid="7839992848995240393">"Edit order of settings."</string>
- <string name="accessibility_quick_settings_page" msgid="5032979051755200721">"Page <xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$d</xliff:g>"</string>
- <string name="tuner_lock_screen" msgid="5755818559638850294">"Lock screen"</string>
- <string name="pip_phone_expand" msgid="5889780005575693909">"Expand"</string>
- <string name="pip_phone_minimize" msgid="1079119422589131792">"Minimize"</string>
- <string name="pip_phone_close" msgid="8416647892889710330">"Close"</string>
- <string name="pip_phone_settings" msgid="8080777499521528521">"Settings"</string>
- <string name="pip_phone_dismiss_hint" msgid="6351678169095923899">"Drag down to dismiss"</string>
- <string name="pip_menu_title" msgid="4707292089961887657">"Menu"</string>
- <string name="pip_notification_title" msgid="3204024940158161322">"<xliff:g id="NAME">%s</xliff:g> is in picture-in-picture"</string>
- <string name="pip_notification_message" msgid="5619512781514343311">"If you don\'t want <xliff:g id="NAME">%s</xliff:g> to use this feature, tap to open settings and turn it off."</string>
- <string name="pip_play" msgid="1417176722760265888">"Play"</string>
- <string name="pip_pause" msgid="8881063404466476571">"Pause"</string>
- <string name="pip_skip_to_next" msgid="1948440006726306284">"Skip to next"</string>
- <string name="pip_skip_to_prev" msgid="1955311326688637914">"Skip to previous"</string>
- <string name="thermal_shutdown_title" msgid="4458304833443861111">"Phone turned off due to heat"</string>
- <string name="thermal_shutdown_message" msgid="9006456746902370523">"Your phone is now running normally"</string>
- <string name="thermal_shutdown_dialog_message" msgid="566347880005304139">"Your phone was too hot, so it turned off to cool down. Your phone is now running normally.\n\nYour phone may get too hot if you:\n • Use resource-intensive apps (such as gaming, video, or navigation apps)\n • Download or upload large files\n • Use your phone in high temperatures"</string>
- <string name="high_temp_title" msgid="4589508026407318374">"Phone is getting warm"</string>
- <string name="high_temp_notif_message" msgid="5642466103153429279">"Some features limited while phone cools down"</string>
- <string name="high_temp_dialog_message" msgid="6840700639374113553">"Your phone will automatically try to cool down. You can still use your phone, but it may run slower.\n\nOnce your phone has cooled down, it will run normally."</string>
- <string name="lockscreen_shortcut_left" msgid="2182769107618938629">"Left shortcut"</string>
- <string name="lockscreen_shortcut_right" msgid="3328683699505226536">"Right shortcut"</string>
- <string name="lockscreen_unlock_left" msgid="2043092136246951985">"Left shortcut also unlocks"</string>
- <string name="lockscreen_unlock_right" msgid="1529992940510318775">"Right shortcut also unlocks"</string>
- <string name="lockscreen_none" msgid="4783896034844841821">"None"</string>
- <string name="tuner_launch_app" msgid="1527264114781925348">"Launch <xliff:g id="APP">%1$s</xliff:g>"</string>
- <string name="tuner_other_apps" msgid="4726596850501162493">"Other apps"</string>
- <string name="tuner_circle" msgid="2340998864056901350">"Circle"</string>
- <string name="tuner_plus" msgid="6792960658533229675">"Plus"</string>
- <string name="tuner_minus" msgid="4806116839519226809">"Minus"</string>
- <string name="tuner_left" msgid="8404287986475034806">"Left"</string>
- <string name="tuner_right" msgid="6222734772467850156">"Right"</string>
- <string name="tuner_menu" msgid="191640047241552081">"Menu"</string>
- <string name="tuner_app" msgid="3507057938640108777">"<xliff:g id="APP">%1$s</xliff:g> app"</string>
- <string name="notification_channel_alerts" msgid="4496839309318519037">"Alerts"</string>
- <string name="notification_channel_battery" msgid="5786118169182888462">"Battery"</string>
- <string name="notification_channel_screenshot" msgid="6314080179230000938">"Screenshots"</string>
- <string name="notification_channel_general" msgid="4525309436693914482">"General Messages"</string>
- <string name="notification_channel_storage" msgid="3077205683020695313">"Storage"</string>
- <string name="notification_channel_hints" msgid="7323870212489152689">"Hints"</string>
- <string name="instant_apps" msgid="6647570248119804907">"Instant Apps"</string>
- <string name="instant_apps_title" msgid="8738419517367449783">"<xliff:g id="APP">%1$s</xliff:g> running"</string>
- <string name="instant_apps_message" msgid="1183313016396018086">"App opened without being installed."</string>
- <string name="instant_apps_message_with_help" msgid="6179830437630729747">"App opened without being installed. Tap to learn more."</string>
- <string name="app_info" msgid="6856026610594615344">"App info"</string>
- <string name="go_to_web" msgid="2650669128861626071">"Go to browser"</string>
- <string name="mobile_data" msgid="7094582042819250762">"Mobile data"</string>
- <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
- <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi is off"</string>
- <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth is off"</string>
- <string name="dnd_is_off" msgid="6167780215212497572">"Do Not Disturb is off"</string>
- <string name="qs_dnd_prompt_auto_rule" msgid="862559028345233052">"Do Not Disturb was turned on by an automatic rule (<xliff:g id="ID_1">%s</xliff:g>)."</string>
- <string name="qs_dnd_prompt_app" msgid="7978037419334156034">"Do Not Disturb was turned on by an app (<xliff:g id="ID_1">%s</xliff:g>)."</string>
- <string name="qs_dnd_prompt_auto_rule_app" msgid="2599343675391111951">"Do Not Disturb was turned on by an automatic rule or app."</string>
- <string name="qs_dnd_until" msgid="3469471136280079874">"Until <xliff:g id="ID_1">%s</xliff:g>"</string>
- <string name="qs_dnd_keep" msgid="1825009164681928736">"Keep"</string>
- <string name="qs_dnd_replace" msgid="8019520786644276623">"Replace"</string>
- <string name="running_foreground_services_title" msgid="381024150898615683">"Apps running in background"</string>
- <string name="running_foreground_services_msg" msgid="6326247670075574355">"Tap for details on battery and data usage"</string>
- <string name="mobile_data_disable_title" msgid="1068272097382942231">"Turn off mobile data?"</string>
- <string name="mobile_data_disable_message" msgid="4756541658791493506">"You wont have access to data or the internet through <xliff:g id="CARRIER">%s</xliff:g>. Internet will only be available via Wi-Fi."</string>
- <string name="mobile_data_disable_message_default_carrier" msgid="6078110473451946831">"your carrier"</string>
- <string name="touch_filtered_warning" msgid="8671693809204767551">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
- <string name="slice_permission_title" msgid="7465009437851044444">"Allow <xliff:g id="APP_0">%1$s</xliff:g> to show <xliff:g id="APP_2">%2$s</xliff:g> slices?"</string>
- <string name="slice_permission_text_1" msgid="3514586565609596523">"- It can read information from <xliff:g id="APP">%1$s</xliff:g>"</string>
- <string name="slice_permission_text_2" msgid="3146758297471143723">"- It can take actions inside <xliff:g id="APP">%1$s</xliff:g>"</string>
- <string name="slice_permission_checkbox" msgid="7986504458640562900">"Allow <xliff:g id="APP">%1$s</xliff:g> to show slices from any app"</string>
- <string name="slice_permission_allow" msgid="2340244901366722709">"Allow"</string>
- <string name="slice_permission_deny" msgid="7683681514008048807">"Deny"</string>
- <string name="auto_saver_title" msgid="1217959994732964228">"Tap to schedule Battery Saver"</string>
- <string name="auto_saver_text" msgid="6324376061044218113">"Turn on automatically when battery is at <xliff:g id="PERCENTAGE">%d</xliff:g>%%"</string>
- <string name="no_auto_saver_action" msgid="8086002101711328500">"No thanks"</string>
- <string name="auto_saver_enabled_title" msgid="6726474226058316862">"Battery Saver schedule turned on"</string>
- <string name="auto_saver_enabled_text" msgid="874711029884777579">"Battery Saver will turn on automatically once battery goes below <xliff:g id="PERCENTAGE">%d</xliff:g>%%."</string>
- <string name="open_saver_setting_action" msgid="8314624730997322529">"Settings"</string>
- <string name="auto_saver_okay_action" msgid="2701221740227683650">"Got it"</string>
- <string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
+ <string name="tuner_low_priority" msgid="1325884786608312358">"Show low-priority notification icons"</string>
+ <string name="other" msgid="4060683095962566764">"Other"</string>
+ <string name="accessibility_divider" msgid="5903423481953635044">"Split-screen divider"</string>
+ <string name="accessibility_action_divider_left_full" msgid="2801570521881574972">"Left full screen"</string>
+ <string name="accessibility_action_divider_left_70" msgid="3612060638991687254">"Left 70%"</string>
+ <string name="accessibility_action_divider_left_50" msgid="1248083470322193075">"Left 50%"</string>
+ <string name="accessibility_action_divider_left_30" msgid="543324403127069386">"Left 30%"</string>
+ <string name="accessibility_action_divider_right_full" msgid="4639381073802030463">"Right full screen"</string>
+ <string name="accessibility_action_divider_top_full" msgid="5357010904067731654">"Top full screen"</string>
+ <string name="accessibility_action_divider_top_70" msgid="5090779195650364522">"Top 70%"</string>
+ <string name="accessibility_action_divider_top_50" msgid="6385859741925078668">"Top 50%"</string>
+ <string name="accessibility_action_divider_top_30" msgid="6201455163864841205">"Top 30%"</string>
+ <string name="accessibility_action_divider_bottom_full" msgid="301433196679548001">"Bottom full screen"</string>
+ <string name="accessibility_qs_edit_tile_label" msgid="8374924053307764245">"Position <xliff:g id="POSITION">%1$d</xliff:g>, <xliff:g id="TILE_NAME">%2$s</xliff:g>. Double tap to edit."</string>
+ <string name="accessibility_qs_edit_add_tile_label" msgid="8133209638023882667">"<xliff:g id="TILE_NAME">%1$s</xliff:g>. Double tap to add."</string>
+ <string name="accessibility_qs_edit_move_tile" msgid="2461819993780159542">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
+ <string name="accessibility_qs_edit_remove_tile" msgid="7484493384665907197">"Remove <xliff:g id="TILE_NAME">%1$s</xliff:g>"</string>
+ <string name="accessibility_qs_edit_tile_add" msgid="3520406665865985109">"Add <xliff:g id="TILE_NAME">%1$s</xliff:g> to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+ <string name="accessibility_qs_edit_tile_move" msgid="3108103090006972938">"Move <xliff:g id="TILE_NAME">%1$s</xliff:g> to position <xliff:g id="POSITION">%2$d</xliff:g>"</string>
+ <string name="accessibility_desc_quick_settings_edit" msgid="8073587401747016103">"Quick settings editor."</string>
+ <string name="accessibility_desc_notification_icon" msgid="8352414185263916335">"<xliff:g id="ID_1">%1$s</xliff:g> notification: <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+ <string name="dock_forced_resizable" msgid="5914261505436217520">"App may not work with split-screen."</string>
+ <string name="dock_non_resizeble_failed_to_dock_text" msgid="3871617304250207291">"App does not support split-screen."</string>
+ <string name="forced_resizable_secondary_display" msgid="4230857851756391925">"App may not work on a secondary display."</string>
+ <string name="activity_launch_on_secondary_display_failed_text" msgid="7793821742158306742">"App does not support launch on secondary displays."</string>
+ <string name="accessibility_quick_settings_settings" msgid="6132460890024942157">"Open settings."</string>
+ <string name="accessibility_quick_settings_expand" msgid="2375165227880477530">"Open quick settings."</string>
+ <string name="accessibility_quick_settings_collapse" msgid="1792625797142648105">"Close quick settings."</string>
+ <string name="accessibility_quick_settings_alarm_set" msgid="1863000242431528676">"Alarm set."</string>
+ <string name="accessibility_quick_settings_user" msgid="1567445362870421770">"Signed in as <xliff:g id="ID_1">%s</xliff:g>"</string>
+ <string name="data_connection_no_internet" msgid="4503302451650972989">"No internet"</string>
+ <string name="accessibility_quick_settings_open_details" msgid="4230931801728005194">"Open details."</string>
+ <string name="accessibility_quick_settings_not_available" msgid="4190068184294019846">"Unvailable due to <xliff:g id="REASON">%s</xliff:g>"</string>
+ <string name="accessibility_quick_settings_open_settings" msgid="7806613775728380737">"Open <xliff:g id="ID_1">%s</xliff:g> settings."</string>
+ <string name="accessibility_quick_settings_edit" msgid="7839992848995240393">"Edit order of settings."</string>
+ <string name="accessibility_quick_settings_page" msgid="5032979051755200721">"Page <xliff:g id="ID_1">%1$d</xliff:g> of <xliff:g id="ID_2">%2$d</xliff:g>"</string>
+ <string name="tuner_lock_screen" msgid="5755818559638850294">"Lock screen"</string>
+ <string name="pip_phone_expand" msgid="5889780005575693909">"Expand"</string>
+ <string name="pip_phone_minimize" msgid="1079119422589131792">"Minimize"</string>
+ <string name="pip_phone_close" msgid="8416647892889710330">"Close"</string>
+ <string name="pip_phone_settings" msgid="8080777499521528521">"Settings"</string>
+ <string name="pip_phone_dismiss_hint" msgid="6351678169095923899">"Drag down to dismiss"</string>
+ <string name="pip_menu_title" msgid="4707292089961887657">"Menu"</string>
+ <string name="pip_notification_title" msgid="3204024940158161322">"<xliff:g id="NAME">%s</xliff:g> is in picture-in-picture"</string>
+ <string name="pip_notification_message" msgid="5619512781514343311">"If you don\'t want <xliff:g id="NAME">%s</xliff:g> to use this feature, tap to open settings and turn it off."</string>
+ <string name="pip_play" msgid="1417176722760265888">"Play"</string>
+ <string name="pip_pause" msgid="8881063404466476571">"Pause"</string>
+ <string name="pip_skip_to_next" msgid="1948440006726306284">"Skip to next"</string>
+ <string name="pip_skip_to_prev" msgid="1955311326688637914">"Skip to previous"</string>
+ <string name="thermal_shutdown_title" msgid="4458304833443861111">"Phone turned off due to heat"</string>
+ <string name="thermal_shutdown_message" msgid="9006456746902370523">"Your phone is now running normally"</string>
+ <string name="thermal_shutdown_dialog_message" msgid="566347880005304139">"Your phone was too hot, so it turned off to cool down. Your phone is now running normally.\n\nYour phone may get too hot if you:\n • Use resource-intensive apps (such as gaming, video, or navigation apps)\n • Download or upload large files\n • Use your phone in high temperatures"</string>
+ <string name="high_temp_title" msgid="4589508026407318374">"Phone is getting warm"</string>
+ <string name="high_temp_notif_message" msgid="5642466103153429279">"Some features limited while phone cools down"</string>
+ <string name="high_temp_dialog_message" msgid="6840700639374113553">"Your phone will automatically try to cool down. You can still use your phone, but it may run slower.\n\nOnce your phone has cooled down, it will run normally."</string>
+ <string name="lockscreen_shortcut_left" msgid="2182769107618938629">"Left shortcut"</string>
+ <string name="lockscreen_shortcut_right" msgid="3328683699505226536">"Right shortcut"</string>
+ <string name="lockscreen_unlock_left" msgid="2043092136246951985">"Left shortcut also unlocks"</string>
+ <string name="lockscreen_unlock_right" msgid="1529992940510318775">"Right shortcut also unlocks"</string>
+ <string name="lockscreen_none" msgid="4783896034844841821">"None"</string>
+ <string name="tuner_launch_app" msgid="1527264114781925348">"Launch <xliff:g id="APP">%1$s</xliff:g>"</string>
+ <string name="tuner_other_apps" msgid="4726596850501162493">"Other apps"</string>
+ <string name="tuner_circle" msgid="2340998864056901350">"Circle"</string>
+ <string name="tuner_plus" msgid="6792960658533229675">"Plus"</string>
+ <string name="tuner_minus" msgid="4806116839519226809">"Minus"</string>
+ <string name="tuner_left" msgid="8404287986475034806">"Left"</string>
+ <string name="tuner_right" msgid="6222734772467850156">"Right"</string>
+ <string name="tuner_menu" msgid="191640047241552081">"Menu"</string>
+ <string name="tuner_app" msgid="3507057938640108777">"<xliff:g id="APP">%1$s</xliff:g> app"</string>
+ <string name="notification_channel_alerts" msgid="4496839309318519037">"Alerts"</string>
+ <string name="notification_channel_battery" msgid="5786118169182888462">"Battery"</string>
+ <string name="notification_channel_screenshot" msgid="6314080179230000938">"Screenshots"</string>
+ <string name="notification_channel_general" msgid="4525309436693914482">"General Messages"</string>
+ <string name="notification_channel_storage" msgid="3077205683020695313">"Storage"</string>
+ <string name="notification_channel_hints" msgid="7323870212489152689">"Hints"</string>
+ <string name="instant_apps" msgid="6647570248119804907">"Instant Apps"</string>
+ <string name="instant_apps_title" msgid="8738419517367449783">"<xliff:g id="APP">%1$s</xliff:g> running"</string>
+ <string name="instant_apps_message" msgid="1183313016396018086">"App opened without being installed."</string>
+ <string name="instant_apps_message_with_help" msgid="6179830437630729747">"App opened without being installed. Tap to learn more."</string>
+ <string name="app_info" msgid="6856026610594615344">"App info"</string>
+ <string name="go_to_web" msgid="2650669128861626071">"Go to browser"</string>
+ <string name="mobile_data" msgid="7094582042819250762">"Mobile data"</string>
+ <string name="mobile_data_text_format" msgid="3526214522670876454">"<xliff:g id="ID_1">%1$s</xliff:g> — <xliff:g id="ID_2">%2$s</xliff:g>"</string>
+ <string name="wifi_is_off" msgid="1838559392210456893">"Wi-Fi is off"</string>
+ <string name="bt_is_off" msgid="2640685272289706392">"Bluetooth is off"</string>
+ <string name="dnd_is_off" msgid="6167780215212497572">"Do Not Disturb is off"</string>
+ <string name="qs_dnd_prompt_auto_rule" msgid="862559028345233052">"Do Not Disturb was turned on by an automatic rule (<xliff:g id="ID_1">%s</xliff:g>)."</string>
+ <string name="qs_dnd_prompt_app" msgid="7978037419334156034">"Do Not Disturb was turned on by an app (<xliff:g id="ID_1">%s</xliff:g>)."</string>
+ <string name="qs_dnd_prompt_auto_rule_app" msgid="2599343675391111951">"Do Not Disturb was turned on by an automatic rule or app."</string>
+ <string name="qs_dnd_until" msgid="3469471136280079874">"Until <xliff:g id="ID_1">%s</xliff:g>"</string>
+ <string name="qs_dnd_keep" msgid="1825009164681928736">"Keep"</string>
+ <string name="qs_dnd_replace" msgid="8019520786644276623">"Replace"</string>
+ <string name="running_foreground_services_title" msgid="381024150898615683">"Apps running in background"</string>
+ <string name="running_foreground_services_msg" msgid="6326247670075574355">"Tap for details on battery and data usage"</string>
+ <string name="mobile_data_disable_title" msgid="1068272097382942231">"Turn off mobile data?"</string>
+ <string name="mobile_data_disable_message" msgid="4756541658791493506">"You wont have access to data or the internet through <xliff:g id="CARRIER">%s</xliff:g>. Internet will only be available via Wi-Fi."</string>
+ <string name="mobile_data_disable_message_default_carrier" msgid="6078110473451946831">"your carrier"</string>
+ <string name="touch_filtered_warning" msgid="8671693809204767551">"Because an app is obscuring a permission request, Settings can’t verify your response."</string>
+ <string name="slice_permission_title" msgid="7465009437851044444">"Allow <xliff:g id="APP_0">%1$s</xliff:g> to show <xliff:g id="APP_2">%2$s</xliff:g> slices?"</string>
+ <string name="slice_permission_text_1" msgid="3514586565609596523">"- It can read information from <xliff:g id="APP">%1$s</xliff:g>"</string>
+ <string name="slice_permission_text_2" msgid="3146758297471143723">"- It can take actions inside <xliff:g id="APP">%1$s</xliff:g>"</string>
+ <string name="slice_permission_checkbox" msgid="7986504458640562900">"Allow <xliff:g id="APP">%1$s</xliff:g> to show slices from any app"</string>
+ <string name="slice_permission_allow" msgid="2340244901366722709">"Allow"</string>
+ <string name="slice_permission_deny" msgid="7683681514008048807">"Deny"</string>
+ <string name="auto_saver_title" msgid="1217959994732964228">"Tap to schedule Battery Saver"</string>
+ <string name="auto_saver_text" msgid="6324376061044218113">"Turn on automatically when battery is at <xliff:g id="PERCENTAGE">%d</xliff:g>%%"</string>
+ <string name="no_auto_saver_action" msgid="8086002101711328500">"No thanks"</string>
+ <string name="auto_saver_enabled_title" msgid="6726474226058316862">"Battery Saver schedule turned on"</string>
+ <string name="auto_saver_enabled_text" msgid="874711029884777579">"Battery Saver will turn on automatically once battery goes below <xliff:g id="PERCENTAGE">%d</xliff:g>%%."</string>
+ <string name="open_saver_setting_action" msgid="8314624730997322529">"Settings"</string>
+ <string name="auto_saver_okay_action" msgid="2701221740227683650">"Got it"</string>
+ <string name="heap_dump_tile_name" msgid="9141031328971226374">"Dump SysUI Heap"</string>
<plurals name="ongoing_privacy_chip_multiple_apps" formatted="false" msgid="1406406529558080714">
- <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> apps</item>
- <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> app</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_2">%d</xliff:g> apps</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> app</item>
</plurals>
- <string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> is using your <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
- <string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Applications are using your <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
+ <string name="ongoing_privacy_chip_content_single_app" msgid="4479560741898690064">"<xliff:g id="APP">%1$s</xliff:g> is using your <xliff:g id="TYPES_LIST">%2$s</xliff:g>."</string>
+ <string name="ongoing_privacy_chip_content_multiple_apps" msgid="8640691753867990511">"Applications are using your <xliff:g id="TYPES_LIST">%s</xliff:g>."</string>
<plurals name="ongoing_privacy_chip_content_multiple_apps_single_op" formatted="false" msgid="4871926099254314088">
- <item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> applications are using your <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
- <item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> application is using your <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> applications are using your <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> application is using your <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Got it"</string>
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"View details"</string>
- <string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App using your <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
- <string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apps using your <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
- <string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
- <string name="ongoing_privacy_dialog_last_separator" msgid="2400503446627122483">" and "</string>
- <string name="privacy_type_camera" msgid="1676604631892420333">"camera"</string>
- <string name="privacy_type_location" msgid="6435497989657286700">"location"</string>
- <string name="privacy_type_microphone" msgid="4153045784928554506">"microphone"</string>
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Got it"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
+ <skip />
+ <string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App using your <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
+ <string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apps using your <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
+ <string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
+ <string name="ongoing_privacy_dialog_last_separator" msgid="2400503446627122483">" and "</string>
+ <string name="privacy_type_camera" msgid="1676604631892420333">"camera"</string>
+ <string name="privacy_type_location" msgid="6435497989657286700">"location"</string>
+ <string name="privacy_type_microphone" msgid="4153045784928554506">"microphone"</string>
<plurals name="ongoing_privacy_dialog_overflow_text" formatted="false" msgid="3441296594927649172">
- <item quantity="other"><xliff:g id="NUM_APPS_1">%d</xliff:g> other apps</item>
- <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> other app</item>
+ <item quantity="other"><xliff:g id="NUM_APPS_1">%d</xliff:g> other apps</item>
+ <item quantity="one"><xliff:g id="NUM_APPS_0">%d</xliff:g> other app</item>
</plurals>
- <string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensors off"</string>
- <string name="device_services" msgid="1191212554435440592">"Device Services"</string>
- <string name="music_controls_no_title" msgid="5236895307087002011">"No title"</string>
+ <string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensors off"</string>
+ <string name="device_services" msgid="1191212554435440592">"Device Services"</string>
+ <string name="music_controls_no_title" msgid="5236895307087002011">"No title"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-en-rXC/strings_tv.xml b/packages/SystemUI/res/values-en-rXC/strings_tv.xml
index c1c7adf..5651642 100644
--- a/packages/SystemUI/res/values-en-rXC/strings_tv.xml
+++ b/packages/SystemUI/res/values-en-rXC/strings_tv.xml
@@ -19,8 +19,8 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="notification_channel_tv_pip" msgid="134047986446577723">"Picture-in-Picture"</string>
- <string name="pip_notification_unknown_title" msgid="6289156118095849438">"(No title program)"</string>
- <string name="pip_close" msgid="3480680679023423574">"Close PIP"</string>
- <string name="pip_fullscreen" msgid="8604643018538487816">"Full screen"</string>
+ <string name="notification_channel_tv_pip" msgid="134047986446577723">"Picture-in-Picture"</string>
+ <string name="pip_notification_unknown_title" msgid="6289156118095849438">"(No title program)"</string>
+ <string name="pip_close" msgid="3480680679023423574">"Close PIP"</string>
+ <string name="pip_fullscreen" msgid="8604643018538487816">"Full screen"</string>
</resources>
diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml
index 4ee4006..81cd300 100644
--- a/packages/SystemUI/res/values-es-rUS/strings.xml
+++ b/packages/SystemUI/res/values-es-rUS/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"¿Permitir depuración por USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"La huella digital de tu clave RSA es:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Permitir siempre desde esta computadora"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Permitir"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"No tienes permitida la depuración por USB"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"El usuario al que accediste en este dispositivo no puede activar la depuración por USB. Para usar esta función, debes cambiar al usuario principal."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Puerto USB inhabilitado"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Para proteger tu dispositivo de líquidos o suciedad, el puerto USB está inhabilitado y no detectará ningún accesorio.\n\nTe avisaremos cuando sea seguro usar el puerto USB de nuevo."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom para ocupar la pantalla"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Estirar p/ ocupar la pantalla"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Captura de pantalla"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplicaciones están usando tu <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplicación está usando tu <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Entendido"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Ver detalles"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Una app está usando tu <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apps que están usando tu <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Se desactivaron los sensores"</string>
<string name="device_services" msgid="1191212554435440592">"Servicios del dispositivo"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Sin título"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-es/strings.xml b/packages/SystemUI/res/values-es/strings.xml
index 446b6ac..16c182b 100644
--- a/packages/SystemUI/res/values-es/strings.xml
+++ b/packages/SystemUI/res/values-es/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"¿Permitir depuración por USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"La huella digital de tu clave RSA es:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Permitir siempre desde este ordenador"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Permitir"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Depuración USB no permitida"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"El usuario con el que se ha iniciado sesión en este dispositivo no puede activar la depuración USB. Para utilizar esta función, inicia sesión con la cuenta de usuario principal."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Puerto USB inhabilitado"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Para proteger tu dispositivo de los líquidos y la suciedad, el puerto USB se ha inhabilitado y no detectará ningún accesorio.\n\nRecibirás una notificación cuando puedas volver a usarlo."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom para ajustar"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Expandir para ajustar"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Captura de pantalla"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplicaciones están usando tu <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplicación está usando tu <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Entendido"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Ver detalles"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplicación que usa tu <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplicaciones que usan tu <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensores desactivados"</string>
<string name="device_services" msgid="1191212554435440592">"Servicios del dispositivo"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Sin título"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-et/strings.xml b/packages/SystemUI/res/values-et/strings.xml
index 080f206..b02e457 100644
--- a/packages/SystemUI/res/values-et/strings.xml
+++ b/packages/SystemUI/res/values-et/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Kas luban USB silumise?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Arvuti RSA-võtme sõrmejälg:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Luba alati sellest arvutist"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Luba"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB-silumine pole lubatud"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Sellesse seadmesse praegu sisse logitud kasutaja ei saa USB-silumist sisse lülitada. Selle funktsiooni kasutamiseks vahetage peamisele kasutajale."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-port on keelatud"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Selleks et kaitsta teie seadet vedeliku või mustuse eest, on USB-port keelatud ja see ei tuvasta lisatarvikuid.\n\nKui USB-porti on taas ohutu kasutada, saate selle kohta märguande."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Suumi ekraani täitmiseks"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Venita ekraani täitmiseks"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Ekraanipilt"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> rakendust kasutavad üksust <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> rakendus kasutab üksust <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Selge"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Kuva üksikasjad"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Rakendus, mis kasutab üksusi <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Rakendused, mis kasutavad üksusi <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Andurid on välja lülitatud"</string>
<string name="device_services" msgid="1191212554435440592">"Seadme teenused"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Pealkiri puudub"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-eu/strings.xml b/packages/SystemUI/res/values-eu/strings.xml
index 8d62bcf..b2d29c1 100644
--- a/packages/SystemUI/res/values-eu/strings.xml
+++ b/packages/SystemUI/res/values-eu/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB arazketa onartu?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Ordenagailuaren RSA gakoaren erreferentzia-gako digitala hau da:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Onartu beti ordenagailu honetatik"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Eman baimena"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Ez da onartzen USB arazketa"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Gailu honetan saioa hasita duen erabiltzaileak ezin du aktibatu USB arazketa. Eginbide hori erabiltzeko, aldatu erabiltzaile nagusira."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Desgaitu egin da USB ataka"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"USB ataka desgaitu egin da gailua likido edo zikinkeriengandik babesteko, eta ez du hautemango osagarririk.\n\nUSB ataka berriz erabiltzea segurua denean jakinaraziko zaizu."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Handiagotu pantaila betetzeko"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Luzatu pantaila betetzeko"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Pantaila-argazkia"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikazio ari dira <xliff:g id="TYPE_5">%2$s</xliff:g> erabiltzen.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplikazio ari da <xliff:g id="TYPE_1">%2$s</xliff:g> erabiltzen.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Ados"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Ikusi datuak"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"<xliff:g id="TYPES_LIST">%s</xliff:g> erabiltzen ari den aplikazioa"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"<xliff:g id="TYPES_LIST">%s</xliff:g> erabiltzen ari diren aplikazioak"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sentsoreak desaktibatuta daude"</string>
<string name="device_services" msgid="1191212554435440592">"Gailuetarako zerbitzuak"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Ez du izenik"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-fa/strings.xml b/packages/SystemUI/res/values-fa/strings.xml
index 035c6f3..4fb889b 100644
--- a/packages/SystemUI/res/values-fa/strings.xml
+++ b/packages/SystemUI/res/values-fa/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"اشکالزدایی USB مجاز است؟"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"اثر انگشت کلید RSA رایانه: \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"همیشه از این رایانه انجام شود"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"اجازه دادن"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"اشکالزدایی USB مجاز نیست"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"کاربری که درحال حاضر در این دستگاه وارد سیستم شده است نمیتواند اشکالزدایی USB را روشن کند. برای استفاده از این قابلیت، به کاربر اصلی تغییر وضعیت دهید."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"درگاه USB غیرفعال شده است"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"برای محافظت از دستگاهتان دربرابر مایعات یا خاکروبه، درگاه USB غیرفعال شده است و هیچکدام از لوازم جانبی را شناسایی نخواهد کرد.\n\nهرزمان که استفاده از درگاه USB ایمن باشد، به شما اطلاع داده میشود."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"بزرگنمایی برای پر کردن صفحه"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"گسترده کردن برای پر کردن صفحه"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"عکس صفحهنمایش"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> برنامه درحال استفاده از <xliff:g id="TYPE_5">%2$s</xliff:g> شما است.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> برنامه درحال استفاده از <xliff:g id="TYPE_5">%2$s</xliff:g> شما است.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"متوجه شدم"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"مشاهده جزئیات"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"برنامهای که از <xliff:g id="TYPES_LIST">%s</xliff:g> شما استفاده میکند"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"برنامههایی که از <xliff:g id="TYPES_LIST">%s</xliff:g> شما استفاده میکنند"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">"، "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"حسگرها خاموش است"</string>
<string name="device_services" msgid="1191212554435440592">"سرویسهای دستگاه"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"بدون عنوان"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-fi/strings.xml b/packages/SystemUI/res/values-fi/strings.xml
index c2ccd99..1ab48a0 100644
--- a/packages/SystemUI/res/values-fi/strings.xml
+++ b/packages/SystemUI/res/values-fi/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Sallitaanko USB-vianetsintä?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Tietokoneen RSA-avaintunnistetiedosto on:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Salli aina tällä tietokoneella"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Salli"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB-vianetsintää ei sallita"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Laitteelle tällä hetkellä kirjautunut käyttäjä ei voi ottaa USB-vianetsintää käyttöön. Vaihda käyttäjäksi ensisijainen käyttäjä, jotta voit käyttää tätä ominaisuutta."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-portti poistettu käytöstä"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Laitteen suojaamiseksi nesteiltä ja lialta USB-portti on poistettu käytöstä, eikä se havaitse lisävarusteita.\n\nSaat ilmoituksen, kun USB-porttia voi taas käyttää."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoomaa koko näyttöön"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Venytä koko näyttöön"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Kuvakaappaus"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="TYPE_5">%2$s</xliff:g> on <xliff:g id="NUM_APPS_4">%1$d</xliff:g> sovelluksen käytössä.</item>
<item quantity="one"><xliff:g id="TYPE_1">%2$s</xliff:g> on <xliff:g id="NUM_APPS_0">%1$d</xliff:g> sovelluksen käytössä.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Selvä"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Näytä tiedot"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Sovellus, jolla on <xliff:g id="TYPES_LIST">%s</xliff:g> ‑käyttöoikeus"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Sovellukset, joilla on <xliff:g id="TYPES_LIST">%s</xliff:g> ‑käyttöoikeus"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Anturit pois päältä"</string>
<string name="device_services" msgid="1191212554435440592">"Laitepalvelut"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Ei nimeä"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-fr-rCA/strings.xml b/packages/SystemUI/res/values-fr-rCA/strings.xml
index 98e6489..554a222 100644
--- a/packages/SystemUI/res/values-fr-rCA/strings.xml
+++ b/packages/SystemUI/res/values-fr-rCA/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Autoriser le débogage USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Empreinte numérique de la clé RSA de l\'ordinateur : \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Toujours autoriser sur cet ordinateur"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Autoriser"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Débogage USB non autorisé"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"L\'utilisateur actuellement connecté sur cet appareil ne peut pas activer le débogage USB. Pour utiliser cette fonctionnalité, l\'utilisateur principal doit se connecter."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Le port USB a été désactivé"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Pour protéger votre appareil contre les liquides et les débris, le port USB est désactivé et ne détectera pas les accessoires connectés.\n\nVous recevrez une notification lorsque vous pourrez utiliser le port USB de nouveau."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoomer pour remplir l\'écran"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Étirer pour remplir l\'écran"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Capture d\'écran"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> application utilise votre <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> applications utilisent votre <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"J\'ai compris"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Afficher détails"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Application qui utilise votre <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Applications qui utilisent votre <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Capteurs désactivés"</string>
<string name="device_services" msgid="1191212554435440592">"Services de l\'appareil"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Sans titre"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-fr/strings.xml b/packages/SystemUI/res/values-fr/strings.xml
index 1233bbe..2e47000 100644
--- a/packages/SystemUI/res/values-fr/strings.xml
+++ b/packages/SystemUI/res/values-fr/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Autoriser le débogage USB ?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Empreinte numérique de la clé RSA de l\'ordinateur : \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Toujours autoriser sur cet ordinateur"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Autoriser"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Débogage USB non autorisé"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"L\'utilisateur actuellement connecté sur cet appareil ne peut pas activer le débogage USB. Pour utiliser cette fonctionnalité, l\'utilisateur principal doit se connecter."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Port USB désactivé"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Pour protéger votre appareil des liquides et des saletés, le port USB est désactivé et ne détecte plus les accessoires.\n\nVous recevrez une notification lorsque vous pourrez de nouveau utiliser le port USB en toute sécurité."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoomer pour remplir l\'écran"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Étirer pour remplir l\'écran"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Capture d\'écran"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> application utilise votre <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> applications utilisent votre <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Voir les détails"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Application utilisant votre/vos <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Applications utilisant votre/vos <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Capteurs désactivés"</string>
<string name="device_services" msgid="1191212554435440592">"Services pour l\'appareil"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Sans titre"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-gl/strings.xml b/packages/SystemUI/res/values-gl/strings.xml
index 38554d1..90b9f87 100644
--- a/packages/SystemUI/res/values-gl/strings.xml
+++ b/packages/SystemUI/res/values-gl/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Permitir a depuración de erros de USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"A impresión dixital da clave de RSA do ordenador é:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Permitir sempre desde este ordenador"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Permitir"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Non se permite a depuración por USB"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"O usuario coa sesión iniciada actualmente neste dispositivo non pode activar a depuración por USB. Para utilizar esta función, cambia ao usuario principal."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"O porto USB está desactivado"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Para protexer o dispositivo de líquidos ou residuos, desactivouse o porto USB e non detectará ningún accesorio.\n\nRecibirás unha notificación cando o poidas usar de novo."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Ampliar ata ocupar todo"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Estirar ata ocupar todo"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Captura de pantalla"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplicacións utilizan o teu dispositivo (<xliff:g id="TYPE_5">%2$s</xliff:g>).</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplicación utiliza o teu dispositivo (<xliff:g id="TYPE_1">%2$s</xliff:g>).</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"De acordo"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Ver detalles"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplicación que utiliza o seguinte: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplicacións que utilizan o seguinte: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Desactivar sensores"</string>
<string name="device_services" msgid="1191212554435440592">"Servizos do dispositivo"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Sen título"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-gu/strings.xml b/packages/SystemUI/res/values-gu/strings.xml
index 878d0b9..5717616 100644
--- a/packages/SystemUI/res/values-gu/strings.xml
+++ b/packages/SystemUI/res/values-gu/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB ડિબગિંગને મંજૂરી આપીએ?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"કમ્પ્યુટરની RSA મુખ્ય ફિંગરપ્રિંટ આ છે:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"હંમેશા આ કમ્પ્યુટરથી મંજૂરી આપો"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"મંજૂરી આપો"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB ડીબગિંગની મંજૂરી નથી"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"હાલમાં આ ઉપકરણમાં સાઇન ઇન થયેલ વપરાશકર્તા USB ડિબગીંગ ચાલુ કરી શકતા નથી. આ સુવિધાનો ઉપયોગ કરવા માટે પ્રાથમિક વપરાશકર્તા પર સ્વિચ કરો."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB પોર્ટ બંધ કરવામાં આવ્યો છે"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"પ્રવાહી અથવા ધૂળથી તમારા ડિવાઇસનું રક્ષણ કરવા માટે, USB પોર્ટ બંધ કરવામાં આવ્યો છે અને કોઈ ઍક્સેસરી શોધશે નહીં.\n\nફરી USB પોર્ટનો ઉપયોગ કરવાનું સુરક્ષિત હશે ત્યારે તમને નોટિફિકેશન આપવામાં આવશે."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"સ્ક્રીન ભરવા માટે ઝૂમ કરો"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"સ્ક્રીન ભરવા માટે ખેંચો"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"સ્ક્રીનશૉટ"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ઍપ્લિકેશન તમારા <xliff:g id="TYPE_5">%2$s</xliff:g>નો ઉપયોગ કરી રહી છે.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ઍપ્લિકેશનો તમારા <xliff:g id="TYPE_5">%2$s</xliff:g>નો ઉપયોગ કરી રહી છે.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"સમજાઈ ગયું"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"વિગતો જુઓ"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"અૅપ તમારા <xliff:g id="TYPES_LIST">%s</xliff:g>નો ઉપયોગ કરી રહી છે"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"અૅપ તમારા <xliff:g id="TYPES_LIST">%s</xliff:g>નો ઉપયોગ કરી રહી છે"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"સેન્સર બંધ છે"</string>
<string name="device_services" msgid="1191212554435440592">"ડિવાઇસ સેવાઓ"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"કોઈ શીર્ષક નથી"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-hi/strings.xml b/packages/SystemUI/res/values-hi/strings.xml
index 96c6f6e..20b9198 100644
--- a/packages/SystemUI/res/values-hi/strings.xml
+++ b/packages/SystemUI/res/values-hi/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB डीबगिंग करने दें?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"कंप्यूटर का RSA कुंजी फ़िंगरप्रिंट है:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"इस कंप्यूटर से हमेशा अनुमति दें"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"अनुमति दें"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB डीबगिंग की अनुमति नहीं है"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"अभी इस डिवाइस में जिस उपयोगकर्ता ने साइन इन किया है, वो USB डीबगिंग चालू नहीं कर सकता. इस सुविधा का इस्तेमाल करने के लिए, प्राथमिक उपयोगकर्ता में बदलें."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"यूएसबी पोर्ट बंद है"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"तरल चीज़ या कचरे से आपके डिवाइस की सुरक्षा करने के लिए, यूएसबी पोर्ट को बंद कर दिया गया है और वह किसी भी एक्सेसरी की पहचान नहीं करेगा.\n\nयूएसबी पोर्ट का दोबारा इस्तेमाल करना सुरक्षित होने पर आपको सूचित किया जाएगा."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"स्क्रीन भरने के लिए ज़ूम करें"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"स्क्रीन भरने के लिए खींचें"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"स्क्रीनशॉट"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ऐप्लिकेशन आपके <xliff:g id="TYPE_5">%2$s</xliff:g> का इस्तेमाल कर रहे हैं.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ऐप्लिकेशन आपके <xliff:g id="TYPE_5">%2$s</xliff:g> का इस्तेमाल कर रहे हैं.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"ठीक है"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"विवरण देखें"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"<xliff:g id="TYPES_LIST">%s</xliff:g> का इस्तेमाल कर रहा ऐप्लिकेशन"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"आपके <xliff:g id="TYPES_LIST">%s</xliff:g> का इस्तेमाल कर रहे ऐप्लिकेशन"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"सेंसर बंद हैं"</string>
<string name="device_services" msgid="1191212554435440592">"डिवाइस सेवाएं"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"कोई शीर्षक नहीं"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-hr/strings.xml b/packages/SystemUI/res/values-hr/strings.xml
index 17e1cc3..79f410a 100644
--- a/packages/SystemUI/res/values-hr/strings.xml
+++ b/packages/SystemUI/res/values-hr/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Omogućiti otklanjanje pogrešaka putem USB-a?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Otisak prsta RSA ključa računala je: \n <xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Uvijek dopusti s ovog računala"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Dopusti"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Otklanjanje pogrešaka putem USB-a nije dopušteno"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Korisnik koji je trenutačno prijavljen na ovaj uređaj ne može uključiti otklanjanje pogrešaka putem USB-a. Da biste upotrebljavali tu značajku, prijeđite na primarnog korisnika."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Onemogućen je USB priključak"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Radi zaštite uređaja od tekućine ili prljavštine USB priključak onemogućen je i neće otkrivati pribor.\n\nPrimit ćete obavijest kad upotreba USB priključka ponovo bude sigurna."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zumiraj i ispuni zaslon"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Rastegni i ispuni zaslon"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Snimka zaslona"</string>
@@ -888,9 +885,9 @@
<item quantity="few"><xliff:g id="NUM_APPS_2">%1$d</xliff:g> aplikacije upotrebljavaju <xliff:g id="TYPE_3">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikacija upotrebljava <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Shvaćam"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Prikaži detalje"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplikacije koje upotrebljavaju <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplikacije koje upotrebljavaju <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -906,4 +903,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Senzori su isključeni"</string>
<string name="device_services" msgid="1191212554435440592">"Usluge uređaja"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Bez naslova"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-hu/strings.xml b/packages/SystemUI/res/values-hu/strings.xml
index 6e14200..d0cdfb4 100644
--- a/packages/SystemUI/res/values-hu/strings.xml
+++ b/packages/SystemUI/res/values-hu/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Engedélyezi az USB hibakeresést?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"A számítógép RSA kulcs ujjlenyomata:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Mindig engedélyezze erről a számítógépről"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Engedélyezés"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Az USB hibakeresése nem engedélyezett"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Az eszközre jelenleg bejelentkezett felhasználó nem engedélyezheti az USB-hibakeresést. A funkció használatához váltson az elsődleges felhasználóra."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-port letiltva"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Az eszköz folyadéktól és szennyeződésektől való megóvása érdekében az USB-portot letiltottuk, így az nem észleli a kiegészítőket.\n\nÉrtesítést küldünk, amikor ismét biztonságosan használhatja az USB-portot."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Nagyítás a kitöltéshez"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Nyújtás kitöltéshez"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Képernyőkép"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> alkalmazás használja a következőt: <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> alkalmazás használja a következőt: <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Értem"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Részletek"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"A következőket használó alkalmazás: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"A következőt használó alkalmazások: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Érzékelők kikapcsolva"</string>
<string name="device_services" msgid="1191212554435440592">"Eszközszolgáltatások"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Nincs cím"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-hy/strings.xml b/packages/SystemUI/res/values-hy/strings.xml
index 37512e6..41bd378 100644
--- a/packages/SystemUI/res/values-hy/strings.xml
+++ b/packages/SystemUI/res/values-hy/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Թույլատրե՞լ USB-ի կարգաբերումը:"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Համակարգչի RSA-ի բանալի մատնահետքն է`\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Միշտ թույլատրել այս համակարգչից"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Թույլատրել"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB վրիպազերծումը արգելված է"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Ընթացիկ հաշվի օգտատերը չի կարող միացնել USB վրիպազերծումը: Այս գործառույթը միացնելու համար մուտք գործեք հիմնական օգտատիրոջ հաշվով:"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB միացքն անջատված է"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"USB միացքն անջատվել է, որպեսզի ձեր սարքը չթրջվի կամ չաղտոտվի: Այժմ USB միացքի միջոցով հնարավոր չէ միացնել այլ սարքեր:\n\nԴուք ծանուցում կստանաք, երբ այն նորից անվտանգ լինի օգտագործել:"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Խոշորացնել` էկրանը լցնելու համար"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Ձգել` էկրանը լցնելու համար"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Սքրինշոթ"</string>
@@ -881,9 +878,9 @@
<item quantity="one">Ձեր սարքում <xliff:g id="NUM_APPS_4">%1$d</xliff:g> հավելված օգտագործում է <xliff:g id="TYPE_5">%2$s</xliff:g>։</item>
<item quantity="other">Ձեր սարքում <xliff:g id="NUM_APPS_4">%1$d</xliff:g> հավելված օգտագործում է <xliff:g id="TYPE_5">%2$s</xliff:g>:</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Եղավ"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Մանրամասն"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Հավելված, որն օգտագործում է <xliff:g id="TYPES_LIST">%s</xliff:g> ձեր սարքում"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Հավելվածներ, որոնք օգտագործում են <xliff:g id="TYPES_LIST">%s</xliff:g> ձեր սարքում"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Տվիչներն անջատած են"</string>
<string name="device_services" msgid="1191212554435440592">"Սարքի ծառայություններ"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Անանուն"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-in/strings.xml b/packages/SystemUI/res/values-in/strings.xml
index 9d49bdc..98e1c4b 100644
--- a/packages/SystemUI/res/values-in/strings.xml
+++ b/packages/SystemUI/res/values-in/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Izinkan debugging USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Sidik jari kunci RSA komputer adalah:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Selalu izinkan dari komputer ini"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Izinkan"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Debug USB tidak diizinkan"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Pengguna yang sedang login ke perangkat ini tidak dapat mengaktifkan proses debug USB. Beralihlah ke pengguna utama untuk menggunakan fitur ini."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Port USB dinonaktifkan"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Untuk melindungi perangkat dari cairan atau kotoran, port USB dinonaktifkan dan tidak akan mendeteksi aksesori apa pun.\n\nAnda akan diberi tahu jika sudah aman untuk menggunakan port USB kembali."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Perbesar utk mengisi layar"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Rentangkn utk mngisi layar"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikasi menggunakan <xliff:g id="TYPE_5">%2$s</xliff:g> Anda.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplikasi menggunakan <xliff:g id="TYPE_1">%2$s</xliff:g> Anda.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Oke"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Lihat detail"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplikasi yang menggunakan <xliff:g id="TYPES_LIST">%s</xliff:g> Anda"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplikasi yang menggunakan <xliff:g id="TYPES_LIST">%s</xliff:g> Anda"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensor nonaktif"</string>
<string name="device_services" msgid="1191212554435440592">"Layanan Perangkat"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Tanpa judul"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-is/strings.xml b/packages/SystemUI/res/values-is/strings.xml
index 0cc367b..d1ea979 100644
--- a/packages/SystemUI/res/values-is/strings.xml
+++ b/packages/SystemUI/res/values-is/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Leyfa USB-villuleit?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Fingrafar RSA-lykils tölvunnar er:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Leyfa alltaf úr þessari tölvu"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Leyfa"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB-villuleit ekki leyfð"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Notandinn sem er skráður inn í þetta tæki núna getur ekki kveikt á USB-villuleit. Til þess að nota þennan eiginleika skaltu skipta yfir í aðalnotandann."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-tengi gert óvirkt"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Til að vernda tækið frá vökva og óhreinindum er USB-tengið óvirkt og mun ekki greina aukabúnað.\n\nÞú færð tilkynningu þegar öruggt er að nota USB-tengið aftur."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Fylla skjá með aðdrætti"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Teygja yfir allan skjáinn"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Skjámynd"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> forrit er að nota <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> forrit eru að nota <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Ég skil"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Sjá nánar"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Forrit sem nota <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Forrit sem nota <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Slökkt á skynjurum"</string>
<string name="device_services" msgid="1191212554435440592">"Tækjaþjónusta"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Enginn titill"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-it/strings.xml b/packages/SystemUI/res/values-it/strings.xml
index 27998bf..af22c6d 100644
--- a/packages/SystemUI/res/values-it/strings.xml
+++ b/packages/SystemUI/res/values-it/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Consentire debug USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Fingerprint della chiave RSA del computer: \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Consenti sempre da questo computer"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Consenti"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Debug USB non consentito"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"L\'utente che ha eseguito l\'accesso a questo dispositivo non può attivare il debug USB. Per utilizzare questa funzione, passa all\'utente principale."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Porta USB disattivata"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Per proteggere il tuo dispositivo da liquidi o detriti, la porta USB è stata disattivata e non rileverà alcun accessorio.\n\nRiceverai una notifica quando potrai riutilizzare in sicurezza la porta USB."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom per riempire schermo"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Estendi per riemp. schermo"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> applicazioni stanno utilizzando <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> applicazione sta utilizzando <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Vedi dettagli"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App che usa <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"App che utilizzano <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensori disattivati"</string>
<string name="device_services" msgid="1191212554435440592">"Servizi del dispositivo"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Senza titolo"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-iw/strings.xml b/packages/SystemUI/res/values-iw/strings.xml
index 71cf575..a7d5138 100644
--- a/packages/SystemUI/res/values-iw/strings.xml
+++ b/packages/SystemUI/res/values-iw/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"האם לאפשר ניפוי באגים ב-USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"טביעת האצבע של מפתח ה-RSA של המחשב היא:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"אפשר תמיד ממחשב זה"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"לאישור"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"לא ניתן לבצע ניפוי באגים ב-USB"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"למשתמש המחובר לחשבון במכשיר הזה אין אפשרות להפעיל ניפוי באגים ב-USB. כדי להשתמש בתכונה הזו יש לעבור אל המשתמש הראשי."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"יציאת ה-USB מושבתת"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"כדי להגן על המכשיר שלך מנוזלים או חלקיקים, יציאת ה-USB מושבתת ולא מזהה אביזרים כלל.\n\nתתקבל התראה כשיהיה בטוח להשתמש ביציאת ה-USB."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"הגדל תצוגה כדי למלא את המסך"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"מתח כדי למלא את המסך"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"צילום מסך"</string>
@@ -895,9 +892,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> אפליקציות משתמשות ב<xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one">אפליקציה אחת (<xliff:g id="NUM_APPS_0">%1$d</xliff:g>) משתמשת ב<xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"הבנתי"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"הצגת פרטים"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"האפליקציה משתמשת ב<xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"אפליקציות משתמשות ב<xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -914,4 +911,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"החיישנים כבויים"</string>
<string name="device_services" msgid="1191212554435440592">"שירותים למכשיר"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"ללא שם"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ja/strings.xml b/packages/SystemUI/res/values-ja/strings.xml
index 2430500..9095fd1 100644
--- a/packages/SystemUI/res/values-ja/strings.xml
+++ b/packages/SystemUI/res/values-ja/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USBデバッグを許可しますか？"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"このパソコンのRSAキーのフィンガープリント:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"このパソコンからのUSBデバッグを常に許可する"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"許可"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USBデバッグは許可されていません"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"この端末に現在ログインしているユーザーでは、USB デバッグを ON にすることはできません。この機能を使用するには、メインユーザーに切り替えてください。"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB ポート無効"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"液体やゴミからデバイスを保護するため、USB ポートは無効になっています。アクセサリの検出は行われません。\n\nUSB ポートを再び安全に使用できるようになりましたらお知らせします。"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"画面サイズに合わせて拡大"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"画面サイズに合わせて拡大"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"スクリーンショット"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> 個のアプリが <xliff:g id="TYPE_5">%2$s</xliff:g> を使用しています。</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> 個のアプリが <xliff:g id="TYPE_1">%2$s</xliff:g> を使用しています。</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"詳細を表示"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"<xliff:g id="TYPES_LIST">%s</xliff:g>を使用しているアプリ"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"<xliff:g id="TYPES_LIST">%s</xliff:g>を使用しているアプリ"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">"、 "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"センサー OFF"</string>
<string name="device_services" msgid="1191212554435440592">"デバイス サービス"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"タイトルなし"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ka/strings.xml b/packages/SystemUI/res/values-ka/strings.xml
index 40f13039f..9236830 100644
--- a/packages/SystemUI/res/values-ka/strings.xml
+++ b/packages/SystemUI/res/values-ka/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"გააქტიურდეს USB გამართვა?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"კომპიუტერის RSA გასაღების თითის ანაბეჭდია:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"ყოველთვის დართე ნება ამ კომპიუტერიდან."</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"დაშვება"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB ხარვეზების გამართვა ნებადართული არაა"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"ამ მოწყობილობაზე ამჟამად შესულ მომხმარებელს არ შეუძლია USB ხარვეზების გამართვის ფუნქციის ჩართვა. ამ ფუნქციის გამოსაყენებლად, მიუერთდით მთავარ მომხმარებელს."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB პორტი გათიშულია"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"USB პორტი გათიშულია თქვენი ტელეფონის დასაცავად სითხის ან ჭუჭყის მოხვედრისგან. აქსესუარების აღმოჩენა ვერ მოხერხდება.\n\nთქვენ მიიღებთ შეტყობინებას, როცა USB პორტის გამოყენება კვლავ უსაფრთხო იქნება."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"მასშტაბი შეცვალეთ ეკრანის შესავსებად."</string>
<string name="compat_mode_off" msgid="4434467572461327898">"გაწიეთ ეკრანის შესავსებად."</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ეკრანის ანაბეჭდი"</string>
@@ -881,9 +878,9 @@
<item quantity="other">თქვენი <xliff:g id="TYPE_5">%2$s</xliff:g> გამოიყენება <xliff:g id="NUM_APPS_4">%1$d</xliff:g> აპლიკაციის მიერ.</item>
<item quantity="one">თქვენი <xliff:g id="TYPE_1">%2$s</xliff:g> გამოიყენება <xliff:g id="NUM_APPS_0">%1$d</xliff:g> აპლიკაციის მიერ.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"გასაგებია"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"დეტალების ნახვა"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"აპი, რომლის მიერაც გამოიყენება თქვენი <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"აპები, რომელთა მიერაც გამოიყენება თქვენი <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"სენსორების გამორთვა"</string>
<string name="device_services" msgid="1191212554435440592">"მოწყობილობის სერვისები"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"უსათაურო"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-kk/strings.xml b/packages/SystemUI/res/values-kk/strings.xml
index b00c560..3b46364 100644
--- a/packages/SystemUI/res/values-kk/strings.xml
+++ b/packages/SystemUI/res/values-kk/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB жөндеуге рұқсат берілсін бе?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Бұл компьютердің RSA перне саусақ таңбасы:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Осы компьютерден әрқашан рұқсат беру"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Рұқсат беру"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB жөндеу рұқсат етілмеген"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Бұл құрылғыға жаңа кірген пайдаланушы USB түзетуін іске қосылмайды. Бұл мүмкіндікті пайдалану үшін негізгі пайдаланушыға ауысыңыз."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB порты өшірілді"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Құрылғыңызға сұйықтық немесе қоқыс кіріп кетпеуі үшін, USB порты өшірілген және ешқандай керек-жарақты танымайды.\n\nUSB портын қайта пайдалануға болатын кезде, сізге хабарландыру жібереміз."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Экранды толтыру үшін ұлғайту"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Экранды толтыру үшін созу"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Скриншот"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="TYPE_5">%2$s</xliff:g> опциясын <xliff:g id="NUM_APPS_4">%1$d</xliff:g> қолданба пайдаланып жатыр.</item>
<item quantity="one"><xliff:g id="TYPE_1">%2$s</xliff:g> опциясын <xliff:g id="NUM_APPS_0">%1$d</xliff:g> қолданба пайдаланып жатыр.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Түсінікті"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Мәліметті көру"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"<xliff:g id="TYPES_LIST">%s</xliff:g> пайдаланып жатқан қолданба"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"<xliff:g id="TYPES_LIST">%s</xliff:g> пайдаланып жатқан қолданбалар"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Датчиктер өшірулі"</string>
<string name="device_services" msgid="1191212554435440592">"Құрылғы қызметтері"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Атауы жоқ"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-km/strings.xml b/packages/SystemUI/res/values-km/strings.xml
index a3c37a6..6811072 100644
--- a/packages/SystemUI/res/values-km/strings.xml
+++ b/packages/SystemUI/res/values-km/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"អនុញ្ញាតការកែកំហុសតាម USB ឬ?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"ស្នាមម្រាមដៃ RSA របស់កុំព្យូទ័រគឺ៖ \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"អនុញ្ញាតជានិច្ចសម្រាប់កុំព្យូទ័រនេះ"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"អនុញ្ញាត"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"មិនអនុញ្ញាតការកែកំហុសតាម USB ទេ"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"អ្នកប្រើដែលបច្ចុប្បន្នបានចូលគណនីនៅលើឧបករណ៍នេះមិនអាចបើកការកែកំហុស USB បានទេ។ ដើម្បីប្រើមុខងារនេះ សូមប្តូរទៅអ្នកប្រើចម្បង។"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"បានបិទរន្ធ USB"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"ដើម្បីការពារឧបករណ៍របស់អ្នកកុំឱ្យចូលទឹក ឬកម្ទេចផ្សេងៗ រន្ធ USB ត្រូវបានបិទ ហើយនឹងមិនស្គាល់គ្រឿងបរិក្ខារនោះទេ។\n\nអ្នកនឹងទទួលបានការជូនដំណឺង នៅពេលការប្រើប្រាស់រន្ធ USB មានសុវត្ថិភាពម្ដងទៀត។"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"ពង្រីកដើម្បីឲ្យពេញអេក្រង់"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ទាញដើម្បីឲ្យពេញអេក្រង់"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"រូបថតអេក្រង់"</string>
@@ -881,9 +878,9 @@
<item quantity="other">កម្មវិធី <xliff:g id="NUM_APPS_4">%1$d</xliff:g> កំពុងប្រើប្រាស់ <xliff:g id="TYPE_5">%2$s</xliff:g> របស់អ្នក។</item>
<item quantity="one">កម្មវិធី <xliff:g id="NUM_APPS_0">%1$d</xliff:g> កំពុងប្រើប្រាស់ <xliff:g id="TYPE_1">%2$s</xliff:g> របស់អ្នក។</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"យល់ហើយ"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"មើលព័ត៌មានលម្អិត"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"កម្មវិធីកំពុងប្រើប្រាស់ <xliff:g id="TYPES_LIST">%s</xliff:g> របស់អ្នក"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"កម្មវិធីកំពុងប្រើប្រាស់ <xliff:g id="TYPES_LIST">%s</xliff:g> របស់អ្នក"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"បិទឧបករណ៍ចាប់សញ្ញា"</string>
<string name="device_services" msgid="1191212554435440592">"សេវាកម្មឧបករណ៍"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"គ្មានចំណងជើង"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-kn/strings.xml b/packages/SystemUI/res/values-kn/strings.xml
index 8c553f5..273470a 100644
--- a/packages/SystemUI/res/values-kn/strings.xml
+++ b/packages/SystemUI/res/values-kn/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯನ್ನು ಅನುಮತಿಸುವುದೇ?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"ಕಂಪ್ಯೂಟರ್ನ RSA ಕೀ ಫಿಂಗರ್ ಪ್ರಿಂಟ್ ಹೀಗಿದೆ :\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"ಈ ಕಂಪ್ಯೂಟರ್ನಿಂದ ಯಾವಾಗಲೂ ಅನುಮತಿಸಿ"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"ಅನುಮತಿಸಿ"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB ಡೀಬಗ್ ಮಾಡುವಿಕೆಯನ್ನು ಅನುಮತಿಸಲಾಗಿಲ್ಲ"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"ಬಳಕೆದಾರರು ಪ್ರಸ್ತುತ ಈ ಸಾಧನಕ್ಕೆ ಸೈನ್ ಇನ್ ಮಾಡಿದ್ದಾರೆ USB ಡೀಬಗ್ ಮಾಡುವುದನ್ನು ಆನ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ. ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಬಳಸಲು, ಪ್ರಾಥಮಿಕ ಬಳಕೆದಾರರಿಗೆ ಬದಲಾಯಿಸಿ."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB ಪೋರ್ಟ್ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"ದ್ರವ ಅಥವಾ ಧೂಳಿನ ಕಣಗಳಿಂದ ನಿಮ್ಮ ಸಾಧನವನ್ನು ರಕ್ಷಿಸಲು, USB ಪೋರ್ಟ್ ಅನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ ಮತ್ತು ಯಾವುದೇ ಪರಿಕರಗಳನ್ನು ಪತ್ತೆ ಮಾಡುವುದಿಲ್ಲ. \n\n USB ಪೋರ್ಟ್ ಅನ್ನು ಬಳಸಲು ಸುರಕ್ಷಿತವಾಗಿದ್ದಾಗ ಮತ್ತೆ ನಿಮಗೆ ಸೂಚಿಸಲಾಗುವುದು."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"ಪರದೆ ತುಂಬಿಸಲು ಝೂಮ್ ಮಾಡು"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ಪರದೆ ತುಂಬಿಸಲು ವಿಸ್ತಾರಗೊಳಿಸು"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ಸ್ಕ್ರೀನ್ಶಾಟ್"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ಆ್ಯಪ್ಗಳು ನಿಮ್ಮ <xliff:g id="TYPE_5">%2$s</xliff:g> ಅನ್ನು ಬಳಸುತ್ತಿವೆ.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ಆ್ಯಪ್ಗಳು ನಿಮ್ಮ <xliff:g id="TYPE_5">%2$s</xliff:g> ಅನ್ನು ಬಳಸುತ್ತಿವೆ.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"ಅರ್ಥವಾಯಿತು"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"ವಿವರಗಳನ್ನು ನೋಡಿ"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"ಆ್ಯಪ್ ನಿಮ್ಮ <xliff:g id="TYPES_LIST">%s</xliff:g> ಅನ್ನು ಬಳಸುತ್ತಿದೆ"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"ಆ್ಯಪ್ಗಳು ನಿಮ್ಮ <xliff:g id="TYPES_LIST">%s</xliff:g> ಅನ್ನು ಬಳಸುತ್ತಿವೆ"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"ಸೆನ್ಸರ್ಗಳು ಆಫ್"</string>
<string name="device_services" msgid="1191212554435440592">"ಸಾಧನ ಸೇವೆಗಳು"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"ಯಾವುದೇ ಶೀರ್ಷಿಕೆಯಿಲ್ಲ"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ko/strings.xml b/packages/SystemUI/res/values-ko/strings.xml
index 559357f..ca45e4d 100644
--- a/packages/SystemUI/res/values-ko/strings.xml
+++ b/packages/SystemUI/res/values-ko/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB 디버깅을 허용하시겠습니까?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"컴퓨터 RSA 키 지문:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"이 컴퓨터에서 항상 허용"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"허용"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB 디버깅이 허용되지 않음"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"현재 이 기기에 로그인한 사용자는 USB 디버깅을 사용 설정할 수 없습니다. 이 기능을 사용하려면 기본 사용자로 전환하세요."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB 포트 비활성화됨"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"기기를 액체나 이물질로부터 보호하기 위해 USB 포트가 사용 중지되었으며 액세서리를 연결할 수 없습니다.\n\nUSB 포트를 다시 안전하게 사용할 수 있게 되면 알려 드리겠습니다."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"전체화면 모드로 확대"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"전체화면 모드로 확대"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"스크린샷"</string>
@@ -881,9 +878,9 @@
<item quantity="other">애플리케이션 <xliff:g id="NUM_APPS_4">%1$d</xliff:g>개가 <xliff:g id="TYPE_5">%2$s</xliff:g>을(를) 사용하고 있습니다.</item>
<item quantity="one">애플리케이션 <xliff:g id="NUM_APPS_0">%1$d</xliff:g>개가 <xliff:g id="TYPE_1">%2$s</xliff:g>을(를) 사용하고 있습니다.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"확인"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"세부정보 보기"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"<xliff:g id="TYPES_LIST">%s</xliff:g>을(를) 사용 중인 앱"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"<xliff:g id="TYPES_LIST">%s</xliff:g>을(를) 사용 중인 앱"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"센서 사용 안함"</string>
<string name="device_services" msgid="1191212554435440592">"기기 서비스"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"제목 없음"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ky/strings.xml b/packages/SystemUI/res/values-ky/strings.xml
index 5725d16..82d709b 100644
--- a/packages/SystemUI/res/values-ky/strings.xml
+++ b/packages/SystemUI/res/values-ky/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB аркылуу жөндөөгө уруксат берилсинби?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Компүтердин RSA ачкычынын контролдук суммасы:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Бул компүтерден дайыма уруксат берилсин"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Уруксат берүү"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB мүчүлүштүктөрүн оңдоого уруксат жок"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Учурда бул аккаунтта USB аркылуу мүчүлүштүктөрдү оңдоо функциясын иштетүүгө болбойт. Негизги колдонуучунун аккаунтуна кириңиз."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB порту өчүрүлдү"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Түзмөгүңүздү суюктук менен урандылардан коргоо үчүн USB порту өчүрүлдү, азырынча ага гарнитураны саюуга болбойт.\n\nUSB портун кайра колдонуу мүмкүн болгондо, билдирме аласыз."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Экрнд тлтр ү. чен өлч өзг"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Экранды толтуруу ү-н чоюу"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Скриншот"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="TYPE_5">%2$s</xliff:g> <xliff:g id="NUM_APPS_4">%1$d</xliff:g> колдонмо аркылуу пайдаланылууда.</item>
<item quantity="one"><xliff:g id="TYPE_1">%2$s</xliff:g> <xliff:g id="NUM_APPS_0">%1$d</xliff:g> колдонмо аркылуу пайдаланылууда.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Түшүндүм"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Кеңири маалымат"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"<xliff:g id="TYPES_LIST">%s</xliff:g> программаларын пайдаланып жаткан колдонмо"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"<xliff:g id="TYPES_LIST">%s</xliff:g> программаларын пайдаланып жаткан колдонмолор"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Сенсорлорду өчүрүү"</string>
<string name="device_services" msgid="1191212554435440592">"Түзмөк кызматтары"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Аталышы жок"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-lo/strings.xml b/packages/SystemUI/res/values-lo/strings.xml
index 4472fc5..ed05407 100644
--- a/packages/SystemUI/res/values-lo/strings.xml
+++ b/packages/SystemUI/res/values-lo/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"ອະນຸຍາດການດີບັ໊ກຜ່ານ USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"ລາຍນິ້ມື RSA ຂອງຄອມພິວເຕີແມ່ນ:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"ອະນຸຍາດຈາກຄອມພິວເຕີນີ້ຕະຫຼອດ"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"ອະນຸຍາດ"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"ບໍ່ອະນຸຍາດໃຫ້ມີການແກ້ໄຂບັນຫາ USB"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"ຜູ້ໃຊ້ທີ່ກຳລັງເຂົ້າສູ່ລະບົບອຸປະກອນຢູ່ໃນຕອນນີ້ບໍ່ສາມາດເປີດໃຊ້ການດີບັກ USB ໄດ້. ເພື່ອໃຊ້ຄຸນສົມບັດນີ້, ໃຫ້ສະຫຼັບໄປໃຊ້ຜູ້ໃຊ້ຫຼັກ."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"ປິດການນຳໃຊ້ຜອດ USB ແລ້ວ"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"ເພື່ອປົກປ້ອງອຸປະກອນຂອງທ່ານຈາກຂອງແຫລວ ຫຼື ເສດດິນຕ່າງໆ, ຜອດ USB ຈຶ່ງຖືກປິດການນຳໃຊ້ ແລະ ຈະບໍ່ກວດຫາອຸປະກອນເສີມໃດໆ.\n\nທ່ານຈະໄດ້ຮັບການແຈ້ງເຕືອນເມື່ອມັນປອດໄພໃນການໃຊ້ຜອດ USB ອີກເທື່ອໜຶ່ງ."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"ຊູມໃຫ້ເຕັມໜ້າຈໍ"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ປັບໃຫ້ເຕັມໜ້າຈໍ"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ພາບໜ້າຈໍ"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ແອັບພລິເຄຊັນກຳລັງໃຊ້ <xliff:g id="TYPE_5">%2$s</xliff:g> ຂອງທ່ານຢູ່.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> ແອັບພລິເຄຊັນກຳລັງໃຊ້ <xliff:g id="TYPE_1">%2$s</xliff:g> ຂອງທ່ານຢູ່.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"ເຂົ້າໃຈແລ້ວ"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"ເບິ່ງລາຍລະອຽດ"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"ແອັບກຳລັງໃຊ້ <xliff:g id="TYPES_LIST">%s</xliff:g> ຂອງທ່ານ"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"ແອັບກຳລັງໃຊ້ <xliff:g id="TYPES_LIST">%s</xliff:g> ຂອງທ່ານ"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"ປິດການຮັບຮູ້ຢູ່"</string>
<string name="device_services" msgid="1191212554435440592">"ບໍລິການອຸປະກອນ"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"ບໍ່ມີຊື່"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-lt/strings.xml b/packages/SystemUI/res/values-lt/strings.xml
index a99df69..a136772 100644
--- a/packages/SystemUI/res/values-lt/strings.xml
+++ b/packages/SystemUI/res/values-lt/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Leisti USB derinimą?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Šio kompiuterio RSA rakto piršto antspaudas yra:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Visada leisti iš šio kompiuterio"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Leisti"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB derinimas neleidžiamas"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Šiuo metu prie įrenginio prisijungęs naudotojas negali įjungti USB derinimo. Kad galėtumėte naudoti šią funkciją, perjunkite į pagrindinį naudotoją."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB prievadas išjungtas"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Siekiant apsaugoti įrenginį nuo skysčių ar smulkių dalelių, USB prievadas buvo išjungtas ir neaptiks jokių priedų.\n\nJums bus pranešta, kai galėsite vėl saugiai naudoti USB prievadą."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Keisti mast., kad atit. ekr."</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Ištempti, kad atit. ekr."</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Ekrano kopija"</string>
@@ -895,9 +892,9 @@
<item quantity="many"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> programos naudoja jūsų <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> programų naudoja jūsų <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Supratau"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Žr. išsam. inf."</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Programa, kuri naudoja: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Programos, kurios naudoja: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -914,4 +911,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Jutikliai išjungti"</string>
<string name="device_services" msgid="1191212554435440592">"Įrenginio paslaugos"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Nėra pavadinimo"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-lv/strings.xml b/packages/SystemUI/res/values-lv/strings.xml
index 250920d..fec4fe8 100644
--- a/packages/SystemUI/res/values-lv/strings.xml
+++ b/packages/SystemUI/res/values-lv/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Vai atļaut USB atkļūdošanu?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Datora RSA atslēgas ciparfails: \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Vienmēr atļaut no šī datora"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Atļaut"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB atkļūdošana nav atļauta"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Lietotājs, kurš pašlaik ir pierakstījies šajā ierīcē, nevar iespējot USB atkļūdošanu. Lai izmantotu šo funkciju, pārslēdzieties uz galveno lietotāju."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB pieslēgvieta atspējota"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Lai aizsargātu ierīci no šķidruma un gružiem, USB pieslēgvieta ir atspējota un tajā nevarēs noteikt pieslēgtus piederumus.\n\nKad USB pieslēgvietas izmantošana būs atkal droša, saņemsiet paziņojumu."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Tālumm., lai aizp. ekr."</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Stiepiet, lai aizp. ekr."</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Ekrānuzņēmums"</string>
@@ -888,9 +885,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> lietojumprogrammā tiek izmantots: <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> lietojumprogrammās tiek izmantots: <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Labi"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Skatīt detalizētu informāciju"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Lietotne, kurā tiek izmantots: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Lietotnes, kurās tiek izmantots: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -906,4 +903,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensori izslēgti"</string>
<string name="device_services" msgid="1191212554435440592">"Ierīces pakalpojumi"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Nav nosaukuma"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-mk/strings.xml b/packages/SystemUI/res/values-mk/strings.xml
index 49a7655..6b3e8cc 100644
--- a/packages/SystemUI/res/values-mk/strings.xml
+++ b/packages/SystemUI/res/values-mk/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Овозможи отстранување грешки на USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Клучниот отпечаток на RSA на компјутерот е:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Секогаш дозволувај од овој компјутер"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Дозволи"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Отстранувањето грешки на USB не е дозволено"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Корисникот што моментално е најавен на уредов не може да вклучи отстранување грешки на USB. За да ја користите функцијава, префрлете се на примарниот корисник."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-портата е оневозможена"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"За да го заштити уредот од течност и нечистотија, USB-портата е оневозможена и нема да открива додатоци.\n\nЌе ве известиме кога ќе биде безбедно да ја користите USB-портата повторно."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Зумирај да се исполни екранот"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Растегни да се исполни екранот"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Слика од екранот"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="TYPE_5">%2$s</xliff:g> се користи од <xliff:g id="NUM_APPS_4">%1$d</xliff:g> апликација.</item>
<item quantity="other"><xliff:g id="TYPE_5">%2$s</xliff:g> се користи од <xliff:g id="NUM_APPS_4">%1$d</xliff:g> апликации.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Сфатив"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Прикажи ги деталите"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Апликации што ја користат вашата <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Апликации што ја користат вашата <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Сензорите се исклучени"</string>
<string name="device_services" msgid="1191212554435440592">"Услуги за уредот"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Без наслов"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ml/strings.xml b/packages/SystemUI/res/values-ml/strings.xml
index ba93974..37d4b8c 100644
--- a/packages/SystemUI/res/values-ml/strings.xml
+++ b/packages/SystemUI/res/values-ml/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB ഡീബഗ്ഗിംഗ് അനുവദിക്കണോ?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"ഈ കമ്പ്യൂട്ടറിന്റെ RSA കീ ഫിംഗർപ്രിന്റ് ഇതാണ്:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"ഈ കമ്പ്യൂട്ടറിൽ നിന്ന് എല്ലായ്പ്പോഴും അനുവദിക്കുക"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"അനുവദിക്കുക"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB ഡീബഗ്ഗിംഗ് അനുവദനീയമല്ല"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"ഉപകരണത്തിൽ ഇപ്പോൾ സൈൻ ഇൻ ചെയ്തിരിക്കുന്ന ഉപയോക്താവിന് USB ഡീബഗ്ഗിംഗ് ഓണാക്കാനാകില്ല. ഈ ഫീച്ചർ ഉപയോഗിക്കാൻ പ്രാഥമിക ഉപയോക്താവിലേക്ക് മാറുക."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB പോർട്ട് പ്രവർത്തനരഹിതമാക്കി"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"ദ്രാവകത്തിൽ നിന്നോ പൊടിയിൽ നിന്നോ നിങ്ങളുടെ ഉപകരണത്തെ പരിരക്ഷിക്കാനായി USB പോർട്ട് പ്രവർത്തനരഹിതമാക്കിയിരിക്കുന്നതിനാൽ അത് ആക്സസറികളൊന്നും തിരിച്ചറിയില്ല.\n\n USB പോർട്ട് സുരക്ഷിതമായി വീണ്ടും ഉപയോഗിക്കാനാകുമ്പോൾ നിങ്ങളെ അറിയിക്കും."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"സ്ക്രീനിൽ ഉൾക്കൊള്ളിക്കാൻ സൂം ചെയ്യുക"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"സ്ക്രീനിൽ ഉൾക്കൊള്ളിക്കാൻ വലിച്ചുനീട്ടുക"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"സ്ക്രീൻഷോട്ട്"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ആപ്പുകൾ നിങ്ങളുടെ <xliff:g id="TYPE_5">%2$s</xliff:g> ഉപയോഗിക്കുന്നു.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> ആപ്പ് നിങ്ങളുടെ <xliff:g id="TYPE_1">%2$s</xliff:g> ഉപയോഗിക്കുന്നു.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"മനസ്സിലായി"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"വിശദാംശങ്ങൾ കാണുക"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"നിങ്ങളുടെ <xliff:g id="TYPES_LIST">%s</xliff:g> ഉപയോഗിക്കുന്ന ആപ്പ്"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"നിങ്ങളുടെ <xliff:g id="TYPES_LIST">%s</xliff:g> ഉപയോഗിക്കുന്ന ആപ്പുകൾ"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"സെൻസറുകൾ ഓഫാണ്"</string>
<string name="device_services" msgid="1191212554435440592">"ഉപകരണ സേവനങ്ങള്"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"പേരില്ല"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-mn/strings.xml b/packages/SystemUI/res/values-mn/strings.xml
index e19cb2b..42cb765 100644
--- a/packages/SystemUI/res/values-mn/strings.xml
+++ b/packages/SystemUI/res/values-mn/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB дебаг хийхийг зөвшөөрөх үү?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Компьютерийн RSA түлхүүрийн хурууны хээ :\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Энэ компьютерээс орохыг байнга зөвшөөрөх"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Зөвшөөрөх"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB алдаа засалт хийх боломжгүй"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Энэ төхөөрөмжид нэвтэрсэн хэрэглэгч USB дебаг хийх онцлогийг асаах боломжгүй байна. Энэ онцлогийг ашиглахын тулд үндсэн хэрэглэгч рүү сэлгэнэ үү."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB портыг идэвхгүй болгосон"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Таны төхөөрөмжийг шингэн зүйл эсвэл бохирдлоос хамгаалах зорилгоор USB портыг идэвхгүй болгосон бөгөөд ямар ч нэмэлт хэрэгслийг илрүүлэхгүй.\n\nТанд USB портыг дахин ашиглахад аюулгүй болох үед мэдэгдэх болно."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Дэлгэц дүүргэх бол өсгөнө үү"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Дэлгэц дүүргэх бол татна уу"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Дэлгэцийн зураг дарах"</string>
@@ -881,9 +878,9 @@
<item quantity="other">Таны <xliff:g id="TYPE_5">%2$s</xliff:g>-г <xliff:g id="NUM_APPS_4">%1$d</xliff:g> апп ашиглаж байна.</item>
<item quantity="one">Таны <xliff:g id="TYPE_1">%2$s</xliff:g>-г <xliff:g id="NUM_APPS_0">%1$d</xliff:g> апп ашиглаж байна.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Ойлголоо"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Дэлгэрэнгүй үзэх"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Апп таны <xliff:g id="TYPES_LIST">%s</xliff:g>-г ашиглаж байна"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Аппууд таны <xliff:g id="TYPES_LIST">%s</xliff:g>-г ашиглаж байна"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Мэдрэгчийг унтраах"</string>
<string name="device_services" msgid="1191212554435440592">"Төхөөрөмжийн үйлчилгээ"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Гарчиггүй"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-mr/strings.xml b/packages/SystemUI/res/values-mr/strings.xml
index 71e0e3c..44d8c4e 100644
--- a/packages/SystemUI/res/values-mr/strings.xml
+++ b/packages/SystemUI/res/values-mr/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB डीबग करण्यास अनुमती द्यायची?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"संगणकाची RSA की फिंगरप्रिंट ही आहे:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"या संगणकावरून नेहमी अनुमती द्या"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"अनुमती द्या"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB डीबग करण्यास अनुमती नाही"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"सध्या या डीव्हाइसमध्ये साइन इन केलेला वापरकर्ता USB डीबग करणे चालू करू शकत नाही. हे वैशिष्ट्य वापरण्यासाठी, प्राथमिक वापरकर्त्यावर स्विच करा."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB पोर्ट बंद करा"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"ओलावा आणि धूळ यापासून तुमच्या डिव्हाइसचे रक्षण करण्यासाठी, USB पोर्ट बंद केले आहे आणि कोणत्याही अॅक्सेसरीज शोधू शकत नाही.\n\nपुन्हा USB पोर्ट वापरण्यासाठी सुरक्षित असेल तेव्हा तुम्हाला सूचना दिली जाईल."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"स्क्रीन भरण्यासाठी झूम करा"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"स्क्रीन भरण्यासाठी ताणा"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"स्क्रीनशॉट"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> अॅप्लिकेशन तुमचे <xliff:g id="TYPE_5">%2$s</xliff:g> वापरत आहे.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> अॅप्लिकेशन तुमचे <xliff:g id="TYPE_5">%2$s</xliff:g> वापरत आहेत.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"समजले"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"तपशील पाहा"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"अॅप तुमचे <xliff:g id="TYPES_LIST">%s</xliff:g> वापरत आहे"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"अॅप्स तुमचे <xliff:g id="TYPES_LIST">%s</xliff:g> वापरत आहेत"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"सेन्सर बंद आहेत"</string>
<string name="device_services" msgid="1191212554435440592">"डिव्हाइस सेवा"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"शीर्षक नाही"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ms/strings.xml b/packages/SystemUI/res/values-ms/strings.xml
index 1b7cc7c..eee6b25 100644
--- a/packages/SystemUI/res/values-ms/strings.xml
+++ b/packages/SystemUI/res/values-ms/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Benarkan penyahpepijatan USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Cap jari kekunci RSA komputer ialah:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Sentiasa benarkan komputer ini"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Benarkan"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Penyahpepijatan USB tidak dibenarkan"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Pengguna yang log masuk ke peranti ini pada masa ini tidak boleh menghidupkan penyahpepijatan USB. Untuk menggunakan ciri ini, tukar kepada pengguna utama."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Port USB dilumpuhkan"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Untuk melindungi peranti anda daripada cecair atau serpihan, port USB dilumpuhkan dan tidak akan mengesan sebarang aksesori.\n\nAnda akan dimaklumi apabila selamat untuk menggunakan port USB lagi."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zum untuk memenuhi skrin"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Regang utk memenuhi skrin"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Tangkapan skrin"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikasi sedang menggunakan <xliff:g id="TYPE_5">%2$s</xliff:g> anda.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplikasi sedang menggunakan <xliff:g id="TYPE_1">%2$s</xliff:g> anda.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Lihat butiran"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Apl yang menggunakan <xliff:g id="TYPES_LIST">%s</xliff:g> anda"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apl yang menggunakan <xliff:g id="TYPES_LIST">%s</xliff:g> anda"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Penderia dimatikan"</string>
<string name="device_services" msgid="1191212554435440592">"Perkhidmatan Peranti"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Tiada tajuk"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-my/strings.xml b/packages/SystemUI/res/values-my/strings.xml
index b5cd82e..b341bea 100644
--- a/packages/SystemUI/res/values-my/strings.xml
+++ b/packages/SystemUI/res/values-my/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB အမှားရှာဖွေပြင်ဆင်ခြင်း ခွင့်ပြုပါမည်လား?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"ဒီကွန်ပျူတာရဲ့ RSA key fingerprint ကတော့:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g> ဖြစ်ပါသည်"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"ဒီကွန်ပျူတာမှ အမြဲခွင့်ပြုရန်"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"ခွင့်ပြုရန်"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB အမှားပြင်ဆင်ခြင်း ခွင့်မပြုပါ"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"ဤစက်ပစ္စည်းသို့ လက်ရှိဝင်ရောက်ထားသည့် အသုံးပြုသူသည် USB အမှားပြင်ဆင်ခြင်းကို ဖွင့်၍မရပါ။ ဤဝန်ဆောင်မှုကို အသုံးပြုရန် အဓိကအသုံးပြုသူအဖြစ်သို့ ပြောင်းပါ။"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB ပို့တ် ပိတ်ပြီးပြီ"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"USB ပို့တ်ကို ပိတ်၍ သင့်ကိရိယာသို့ အရည် သို့မဟုတ် အမှိုက်စများ မဝင်စေရန် ကာကွယ်ပါ၊ မည်သည့် အပိုပစ္စည်းကိုမျှ အာရုံခံသိရှိနိုင်တော့မည် မဟုတ်ပါ။\n\nUSB ပို့တ်ကို ပြန်အသုံးပြုနိုင်သည့်အခါ သင့်ကိုအကြောင်းကြားပါမည်။"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"ဇူးမ်အပြည့်ဆွဲခြင်း"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ဖန်သားပြင်အပြည့်ဆန့်ခြင်း"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ဖန်သားပြင်ဓာတ်ပုံ"</string>
@@ -881,9 +878,9 @@
<item quantity="other">အပလီကေးရှင်း <xliff:g id="NUM_APPS_4">%1$d</xliff:g> ခုက သင်၏ <xliff:g id="TYPE_5">%2$s</xliff:g> ကို အသုံးပြုနေသည်။</item>
<item quantity="one">အပလီကေးရှင်း <xliff:g id="NUM_APPS_0">%1$d</xliff:g> ခုက သင်၏ <xliff:g id="TYPE_1">%2$s</xliff:g> ကို အသုံးပြုနေသည်။</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"ရပါပြီ"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"အသေးစိတ်ကြည့်ပါ"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"သင့် <xliff:g id="TYPES_LIST">%s</xliff:g> ကို အသုံးပြုနေသော အက်ပ်"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"သင့် <xliff:g id="TYPES_LIST">%s</xliff:g> ကို အသုံးပြုနေသော အက်ပ်များ"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">"၊ "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"အာရုံခံကိရိယာများ ပိတ်ထားသည်"</string>
<string name="device_services" msgid="1191212554435440592">"စက်ပစ္စည်းဝန်ဆောင်မှုများ"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"ခေါင်းစဉ် မရှိပါ"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-nb/strings.xml b/packages/SystemUI/res/values-nb/strings.xml
index 83a1ad9..a27addb 100644
--- a/packages/SystemUI/res/values-nb/strings.xml
+++ b/packages/SystemUI/res/values-nb/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Vil du tillate USB-feilsøking?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Datamaskinens nøkkelfingeravtrykk for RSA er:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Tillat alltid fra denne datamaskinen"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Tillat"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB-feilsøking er ikke tillatt"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Brukeren som for øyeblikket er logget på denne enheten, kan ikke slå på USB-feilsøking. For å bruke denne funksjonen, bytt til hovedbrukeren."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-porten er deaktivert"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"For å beskytte enheten din mot væsker eller rusk er USB-porten deaktivert og kan ikke oppdage tilbehør.\n\nDu blir varslet når det er trygt å bruke USB-porten igjen."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom for å fylle skjermen"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Strekk for å fylle skjerm"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Skjermdump"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> apper bruker <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> app bruker <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Greit"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Se detaljer"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App som bruker <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apper som bruker <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensorer er av"</string>
<string name="device_services" msgid="1191212554435440592">"Enhetstjenester"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Ingen tittel"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ne/strings.xml b/packages/SystemUI/res/values-ne/strings.xml
index 8ebb22e..1bb3664 100644
--- a/packages/SystemUI/res/values-ne/strings.xml
+++ b/packages/SystemUI/res/values-ne/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB डिबग गर्नको लागि अनुमति दिने हो?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"कम्प्युटरको RSA कुञ्जी औंलाछाप:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"यो कम्प्युटरबाट सधैँ अनुमति दिनुहोस्"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"अनुमति दिनुहोस्"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB डिबग गर्न अनुमति छैन"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"हाल यस यन्त्रमा साइन इन हुनुभएको प्रयोगकर्ताले USB डिबग सक्रिय गर्न सक्नुहुन्न। यो सुविधाको प्रयोग गर्न प्राथमिक प्रयोगकर्तामा बदल्नुहोस्।"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB पोर्ट असक्षम पारियो"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"तपाईंको यन्त्रलाई तरल पदार्थ वा धुलोबाट जोगाउन यसको USB पोर्ट असक्षम पारिएको छ र यसले कुनै पनि सहायक उपकरणहरू पहिचान गर्ने छैन।\n\nउक्त USB पोर्ट प्रयोग गर्न सुरक्षित हुँदा तपाईंलाई यसबारे सूचित गरिने छ।"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"स्क्रिन भर्न जुम गर्नुहोस्"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"स्क्रिन भर्न तन्काउनुहोस्"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"स्क्रिनसट"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> अनुप्रयोगहरूले तपाईंको <xliff:g id="TYPE_5">%2$s</xliff:g> प्रयोग गरिरहेका छन्।</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> अनुप्रयोगले तपाईंको <xliff:g id="TYPE_1">%2$s</xliff:g> प्रयोग गरिरहेको छ।</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"बुझेँ"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"विवरणहरू हेर्नुहोस्"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"तपाईंको <xliff:g id="TYPES_LIST">%s</xliff:g> प्रयोग गरिरहेका अनुप्रयोग"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"तपाईंको <xliff:g id="TYPES_LIST">%s</xliff:g> प्रयोग गरिरहेका अनुप्रयोगहरू"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"सेन्सरहरू निष्क्रिय छन्"</string>
<string name="device_services" msgid="1191212554435440592">"यन्त्रका सेवाहरू"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"शीर्षक छैन"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-nl/strings.xml b/packages/SystemUI/res/values-nl/strings.xml
index f28e206..8075ef4 100644
--- a/packages/SystemUI/res/values-nl/strings.xml
+++ b/packages/SystemUI/res/values-nl/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB-foutopsporing toestaan?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"De vingerafdruk voor de RSA-sleutel van de computer is:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Altijd toestaan vanaf deze computer"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Toestaan"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB-foutopsporing niet toegestaan"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"De gebruiker die momenteel is ingelogd op dit apparaat, kan USB-foutopsporing niet inschakelen. Als je deze functie wilt gebruiken, schakel je naar de primaire gebruiker."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-poort uitgeschakeld"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"De USB-poort is uitgeschakeld en detecteert geen accessoires, zodat je apparaat wordt beschermd tegen vloeistof en vuil.\n\nJe ontvangt een melding wanneer het weer veilig is om de USB-poort te gebruiken."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom om scherm te vullen"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Rek uit v. schermvulling"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> apps gebruiken je <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> app gebruikt je <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Details weergeven"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App die je <xliff:g id="TYPES_LIST">%s</xliff:g> gebruikt"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apps die je <xliff:g id="TYPES_LIST">%s</xliff:g> gebruiken"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensoren uit"</string>
<string name="device_services" msgid="1191212554435440592">"Apparaatservices"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Geen titel"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-or/strings.xml b/packages/SystemUI/res/values-or/strings.xml
index 07cd18f..337b15d 100644
--- a/packages/SystemUI/res/values-or/strings.xml
+++ b/packages/SystemUI/res/values-or/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB ଡିବଗିଙ୍ଗ କରିବେ?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"କମ୍ପ୍ୟୁଟର୍ର RSA କୀ\' ଆଙ୍ଗୁଠି ଚିହ୍ନ ହେଉଛି:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"ସବୁବେଳେ ଏହି କମ୍ପ୍ୟୁଟର୍ରୁ ଅନୁମତି ଦିଅନ୍ତୁ"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"ଅନୁମତି ଦିଅନ୍ତୁ"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USBରେ ଡିବଗ୍ କରାଯାଇପାରିବ ନାହିଁ"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"ସମ୍ପ୍ରତି ସାଇନ୍-ଇନ୍ କରିଥିବା ୟୁଜର୍ ଜଣକ ଏହି ଡିଭାଇସରେ USB ଡିବଗିଙ୍ଗ ଅନ୍ କରିପାରିବେ ନାହିଁ। ଏହି ବୈଶିଷ୍ଟ୍ୟ ବ୍ୟବହାର କରିବାକୁ, ପ୍ରାଥମିକ ୟୁଜର୍ରେ ସାଇନ୍-ଇନ୍ କରନ୍ତୁ।"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB ପୋର୍ଟକୁ ଅକ୍ଷମ କରାଯାଇଛି"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"ଆପଣଙ୍କ ଡିଭାଇସ୍କୁ ତରଳ ପଦାର୍ଥ ଏବଂ ଧୂଳିରୁ ସୁରକ୍ଷିତ ରଖିବା ପାଇଁ, USB ପୋର୍ଟକୁ ଅକ୍ଷମ କରାଯାଇଛି ଏବଂ ଏହା କୌଣସି ଉପକରଣ ଚିହ୍ନଟ କରିବ ନାହିଁ। \n\nUSB ପୋର୍ଟକୁ ପୁଣିି ବ୍ୟବହାର କରିବାକୁ ସୁରକ୍ଷିତ ହେଲେ ଆପଣଙ୍କୁ ସୂଚିତ କରାଯିବ।"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"ସ୍କ୍ରୀନ ଭରିବା ପାଇଁ ଜୁମ୍ କରନ୍ତୁ"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ସ୍କ୍ରୀନ୍କୁ ଭରିବା ପାଇଁ ଟାଣନ୍ତୁ"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ସ୍କ୍ରୀନଶଟ୍"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g>ଟି ଆପ୍ଲିକେସନ୍ ଆପଣଙ୍କର <xliff:g id="TYPE_5">%2$s</xliff:g> ବ୍ୟବହାର କରୁଛନ୍ତି।</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g>ଟି ଆପ୍ଲିକେସନ୍ ଆପଣଙ୍କର <xliff:g id="TYPE_1">%2$s</xliff:g>ବ୍ୟବହାର କରୁଛନ୍ତି।</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"ବୁଝିଗଲି"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"ବିବରଣୀ ଦେଖନ୍ତୁ"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"ଆପ୍ ଆପଣଙ୍କ <xliff:g id="TYPES_LIST">%s</xliff:g> ବ୍ୟବହାର କରୁଛି"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"ଆପ୍ସ ଆପଣଙ୍କ <xliff:g id="TYPES_LIST">%s</xliff:g> ବ୍ୟବହାର କରୁଛନ୍ତି"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"ସେନ୍ସର୍ଗୁଡ଼ିକ ବନ୍ଦ ଅଛି"</string>
<string name="device_services" msgid="1191212554435440592">"ଡିଭାଇସ୍ ସେବାଗୁଡିକ"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"କୌଣସି ଶୀର୍ଷକ ନାହିଁ"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-pa/strings.xml b/packages/SystemUI/res/values-pa/strings.xml
index 2b2a124..4d8e3f1 100644
--- a/packages/SystemUI/res/values-pa/strings.xml
+++ b/packages/SystemUI/res/values-pa/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"ਕੀ USB ਡੀਬਗਿੰਗ ਦੀ ਆਗਿਆ ਦੇਣੀ ਹੈ?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"ਕੰਪਿਊਟਰ ਦਾ RSA ਕੁੰਜੀ ਫਿੰਗਰਪ੍ਰਿੰਟ \n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"ਹਮੇਸ਼ਾਂ ਇਸ ਕੰਪਿਊਟਰ ਤੋਂ ਆਗਿਆ ਦਿਓ"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"ਕਰਨ ਦਿਓ"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB ਡਿਬੱਗਿੰਗ ਦੀ ਆਗਿਆ ਨਹੀਂ"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"The user currently signed in to this device can\'t turn on USB debugging. To use this feature, switch to the primary user."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB ਪੋਰਟ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"ਤੁਹਾਡੇ ਡੀਵਾਈਸ ਨੂੰ ਪਾਣੀ ਅਤੇ ਧੂੜ-ਮਿੱਟੀ ਤੋਂ ਬਚਾਉਣ ਲਈ, USB ਪੋਰਟ ਨੂੰ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ ਅਤੇ ਕੋਈ ਵੀ ਐਕਸੈਸਰੀ ਪਛਾਣੀ ਨਹੀਂ ਜਾਵੇਗੀ।\n\nUSB ਪੋਰਟ ਨੂੰ ਦੁਬਾਰਾ ਵਰਤਣਾ ਸੁਰੱਖਿਅਤ ਹੋਣ \'ਤੇ ਤੁਹਾਨੂੰ ਸੂਚਿਤ ਕੀਤਾ ਜਾਵੇਗਾ।"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"ਸਕ੍ਰੀਨ ਭਰਨ ਲਈ ਜ਼ੂਮ ਕਰੋ"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ਸਕ੍ਰੀਨ ਭਰਨ ਲਈ ਸਟ੍ਰੈਚ ਕਰੋ"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ਸਕ੍ਰੀਨਸ਼ਾਟ"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ਐਪਲੀਕੇਸ਼ਨ ਤੁਹਾਡੇ <xliff:g id="TYPE_5">%2$s</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀ ਹੈ।</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੁਹਾਡੇ <xliff:g id="TYPE_5">%2$s</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀਆਂ ਹਨ।</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"ਸਮਝ ਲਿਆ"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"ਵੇਰਵੇ ਦੇਖੋ"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"ਤੁਹਾਡੇ <xliff:g id="TYPES_LIST">%s</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀ ਐਪ"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"ਤੁਹਾਡੇ <xliff:g id="TYPES_LIST">%s</xliff:g> ਦੀ ਵਰਤੋਂ ਕਰ ਰਹੀਆਂ ਐਪਾਂ"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"ਸੈਂਸਰ ਬੰਦ ਕਰੋ"</string>
<string name="device_services" msgid="1191212554435440592">"ਡੀਵਾਈਸ ਸੇਵਾਵਾਂ"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"ਕੋਈ ਸਿਰਲੇਖ ਨਹੀਂ"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-pl/strings.xml b/packages/SystemUI/res/values-pl/strings.xml
index b5b6da4..d955236 100644
--- a/packages/SystemUI/res/values-pl/strings.xml
+++ b/packages/SystemUI/res/values-pl/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Zezwalać na debugowanie USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Odcisk cyfrowy klucza RSA komputera to:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Zawsze zezwalaj z tego komputera"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Zezwalaj"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Debugowanie USB jest niedozwolone"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Użytkownik obecnie zalogowany na tym urządzeniu nie może włączyć debugowania USB. Aby użyć tej funkcji, przełącz się na użytkownika głównego."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Port USB wyłączony"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Aby chronić urządzenie przed wilgocią i zanieczyszczeniami, port USB został wyłączony i nie wykryje żadnych akcesoriów.\n\nOtrzymasz powiadomienie, gdy będzie można znów bezpiecznie używać portu."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Powiększ, aby wypełnić ekran"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Rozciągnij, aby wypełnić ekran"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Zrzut ekranu"</string>
@@ -895,9 +892,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikacji używa: <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplikacja używa: <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Wyświetl szczegóły"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplikacje, które używają: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplikacje, które używają: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -914,4 +911,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Wyłącz czujniki"</string>
<string name="device_services" msgid="1191212554435440592">"Usługi urządzenia"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Bez tytułu"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-pt-rBR/strings.xml b/packages/SystemUI/res/values-pt-rBR/strings.xml
index bc73403..d2219d2 100644
--- a/packages/SystemUI/res/values-pt-rBR/strings.xml
+++ b/packages/SystemUI/res/values-pt-rBR/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Permitir a depuração USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"A impressão digital da chave RSA deste computador é:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Sempre permitir a partir deste computador"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Permitir"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Depuração USB não permitida"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"O usuário conectado a este dispositivo não pode ativar a depuração USB. Para usar esse recurso, mude para o usuário principal \"NAME\"."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Porta USB desativada"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Para proteger seu dispositivo de líquidos e detritos, a porta USB está desativada e não detectará nenhum acessório.\n\nVocê receberá uma notificação quando for seguro usar a porta USB novamente."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom p/ preencher a tela"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Ampliar p/ preencher tela"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Captura de tela"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplicativo está usando <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplicativos estão usando <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Ok"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Ver detalhes"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App usando <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apps usando <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensores desativados"</string>
<string name="device_services" msgid="1191212554435440592">"Serviços do dispositivo"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Sem título"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-pt-rPT/strings.xml b/packages/SystemUI/res/values-pt-rPT/strings.xml
index d7ae161..0866ffc 100644
--- a/packages/SystemUI/res/values-pt-rPT/strings.xml
+++ b/packages/SystemUI/res/values-pt-rPT/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Permitir depuração USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"A impressão digital da chave RSA do computador é:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Permitir sempre a partir deste computador"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Permitir"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Depuração USB não permitida"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"O utilizador com sessão iniciada atualmente neste dispositivo não pode ativar a depuração USB. Para utilizar esta funcionalidade, mude para o utilizador principal."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Porta USB desativada"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Para proteger o dispositivo contra líquidos ou resíduos, a porta USB está desativada e não irá detetar quaisquer acessórios.\n\nSerá notificado quando for seguro utilizar a porta USB novamente."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom para preencher o ecrã"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Esticar p. caber em ec. int."</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Captura de ecrã"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplicações estão a utilizar o(a) <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplicação está a utilizar o(a) <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Compreendi"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Ver detalhes"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplicações que utilizam o(a) <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplicações que utilizam o(a) <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensores desativados"</string>
<string name="device_services" msgid="1191212554435440592">"Serviços do dispositivo"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Sem título"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-pt/strings.xml b/packages/SystemUI/res/values-pt/strings.xml
index bc73403..d2219d2 100644
--- a/packages/SystemUI/res/values-pt/strings.xml
+++ b/packages/SystemUI/res/values-pt/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Permitir a depuração USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"A impressão digital da chave RSA deste computador é:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Sempre permitir a partir deste computador"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Permitir"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Depuração USB não permitida"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"O usuário conectado a este dispositivo não pode ativar a depuração USB. Para usar esse recurso, mude para o usuário principal \"NAME\"."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Porta USB desativada"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Para proteger seu dispositivo de líquidos e detritos, a porta USB está desativada e não detectará nenhum acessório.\n\nVocê receberá uma notificação quando for seguro usar a porta USB novamente."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom p/ preencher a tela"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Ampliar p/ preencher tela"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Captura de tela"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplicativo está usando <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplicativos estão usando <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Ok"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Ver detalhes"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App usando <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Apps usando <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensores desativados"</string>
<string name="device_services" msgid="1191212554435440592">"Serviços do dispositivo"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Sem título"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ro/strings.xml b/packages/SystemUI/res/values-ro/strings.xml
index 268a406..e040484 100644
--- a/packages/SystemUI/res/values-ro/strings.xml
+++ b/packages/SystemUI/res/values-ro/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Permiteți remedierea erorilor prin USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Amprenta digitală din cheia RSA a computerului este:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Permiteți întotdeauna de pe acest computer"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Permiteți"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Remedierea erorilor prin USB nu este permisă"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Utilizatorul conectat momentan pe acest dispozitiv nu poate activa remedierea erorilor prin USB. Pentru a folosi această funcție, comutați la utilizatorul principal."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Portul USB a fost dezactivat"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Pentru a vă proteja dispozitivul de lichide sau reziduuri, portul USB este dezactivat și nu va detecta niciun accesoriu.\n\nVeți primi o notificare când puteți folosi din nou portul USB în siguranță."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zoom pt. a umple ecranul"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Înt. pt. a umple ecranul"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Captură de ecran"</string>
@@ -888,9 +885,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> de aplicații folosesc <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplicație folosește <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Afișați detaliile"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplicație care folosește <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplicații care folosesc <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -906,4 +903,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Senzori dezactivați"</string>
<string name="device_services" msgid="1191212554435440592">"Servicii pentru dispozitiv"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Fără titlu"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ru/strings.xml b/packages/SystemUI/res/values-ru/strings.xml
index bbea694..338ce14 100644
--- a/packages/SystemUI/res/values-ru/strings.xml
+++ b/packages/SystemUI/res/values-ru/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Отладка по USB"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Цифровой отпечаток ключа RSA:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Всегда разрешать отладку с этого компьютера"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Разрешить"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Отладка по USB запрещена"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"В этом аккаунте нельзя включить отладку по USB. Перейдите в аккаунт основного пользователя."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-порт отключен"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Чтобы внутрь устройства не попала вода или грязь, USB-порт был отключен. Сейчас через него нельзя подсоединять другие устройства.\n\nКогда USB-порт снова можно будет использовать, вы получите уведомление."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Подогнать по размерам экрана"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Растянуть на весь экран"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Скриншот"</string>
@@ -895,9 +892,9 @@
<item quantity="many">Функцию \"<xliff:g id="TYPE_5">%2$s</xliff:g>\" используют <xliff:g id="NUM_APPS_4">%1$d</xliff:g> приложений.</item>
<item quantity="other">Функцию \"<xliff:g id="TYPE_5">%2$s</xliff:g>\" используют <xliff:g id="NUM_APPS_4">%1$d</xliff:g> приложения.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"ОК"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Подробнее"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Приложение, в котором используются операции <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Приложения, в которых используются операции <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -914,4 +911,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Датчики отключены"</string>
<string name="device_services" msgid="1191212554435440592">"Сервисы устройства"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Без названия"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-si/strings.xml b/packages/SystemUI/res/values-si/strings.xml
index aaaa703..3a0b3a4 100644
--- a/packages/SystemUI/res/values-si/strings.xml
+++ b/packages/SystemUI/res/values-si/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB නිදොස්කරණයට අවසර දෙනවද?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"මෙම පරිගණකයේ RSA යතුරු ඇඟිලි සටහන වන්නේ:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"සැම විටම මෙම පරිගණකයෙන් ඉඩ ලබා දෙන්න"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"ඉඩ දෙන්න"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB නිදොස්කරණය වෙත අවසර නැහැ"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"දැනට මෙම උපාංගයට පුරා ඇති පරිශීලකයාට USB නිදොස්කරණය ක්රියාත්මක කළ නොහැක. මෙම විශේෂාංගය භාවිතා කිරීම සඳහා, මූලික පරිශීලකයා වෙත මාරු වෙන්න."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB තොට අබලයි"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"ඔබේ උපාංගය ද්රවවලින් හෝ කුණුවලින් ආරක්ෂා කිරීමට, USB තොට අබල කර තිබෙන අතර, එය කිසිම අමතරාංගයක් අනාවරණ නොකරයි.\n\nනැවතත් USB තොට භාවිත කිරීම ආරක්ෂාකාරී වූ විට ඔබව දැනුම් දෙනු ලැබේ."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"තිරය පිරවීමට විශාලනය කරන්න"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"තිරය පිරවීමට අදින්න"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"තිර රුව"</string>
@@ -881,9 +878,9 @@
<item quantity="one">යෙදුම් <xliff:g id="NUM_APPS_4">%1$d</xliff:g>ක් ඔබේ <xliff:g id="TYPE_5">%2$s</xliff:g> භාවිත කරමින් සිටිති.</item>
<item quantity="other">යෙදුම් <xliff:g id="NUM_APPS_4">%1$d</xliff:g>ක් ඔබේ <xliff:g id="TYPE_5">%2$s</xliff:g> භාවිත කරමින් සිටිති.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"තේරුණා"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"විස්තර බලන්න"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"ඔබගේ <xliff:g id="TYPES_LIST">%s</xliff:g> භාවිත කරන යෙදුම්"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"ඔබගේ <xliff:g id="TYPES_LIST">%s</xliff:g> භාවිත කරන යෙදුම්"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"සංවේදක ක්රියාවිරහිතයි"</string>
<string name="device_services" msgid="1191212554435440592">"උපාංග සේවා"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"මාතෘකාවක් නැත"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-sk/strings.xml b/packages/SystemUI/res/values-sk/strings.xml
index 28b3d24..883243e 100644
--- a/packages/SystemUI/res/values-sk/strings.xml
+++ b/packages/SystemUI/res/values-sk/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Povoliť ladenie USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Digitálny odtlačok RSA počítača je:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Vždy povoliť z tohto počítača"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Povoliť"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Ladenie cez USB nie je povolené"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Používateľ, ktorý je práve prihlásený v tomto zariadení, nemôže zapnúť ladenie USB. Ak chcete použiť túto funkciu, prepnite na hlavného používateľa."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Port USB je deaktivovaný"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Port USB je deaktivovaný na zaistenie ochrany zariadenia pred tekutinami alebo nečistotami a nerozpoznáva príslušenstvo.\n\nKeď ho budete môcť znova bezpečne použiť, upozorníme vás."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Priblížiť na celú obrazovku"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Na celú obrazovku"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Snímka obrazovky"</string>
@@ -895,9 +892,9 @@
<item quantity="other"><xliff:g id="TYPE_5">%2$s</xliff:g> používa <xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikácií</item>
<item quantity="one"><xliff:g id="TYPE_1">%2$s</xliff:g> používa <xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplikácia.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Dobre"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Podrobnosti"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplikácia používajúca <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplikácie používajúce <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -914,4 +911,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Senzory sú vypnuté"</string>
<string name="device_services" msgid="1191212554435440592">"Služby zariadenia"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Bez názvu"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-sl/strings.xml b/packages/SystemUI/res/values-sl/strings.xml
index b25a49d..db40b44 100644
--- a/packages/SystemUI/res/values-sl/strings.xml
+++ b/packages/SystemUI/res/values-sl/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Ali dovolite odpravljanje težav prek USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Računalnikov prstni odtis ključa RSA je:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Vedno dovoli iz tega računalnika"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Dovoli"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Odpravljanje napak s povezavo USB ni dovoljeno"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Uporabnik, trenutno prijavljen v napravo, ne more vklopiti odpravljanja napak s povezavo USB. Če želite uporabljati to funkcijo, preklopite na primarnega uporabnika."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Vrata USB so onemogočena"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Za zaščito naprave pred tekočino ali umazanijo so vrata USB onemogočena in ne bodo zaznala nobene dodatne opreme.\n\nKo bo znova varno uporabljati vrata USB, boste obveščeni."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Povečava čez cel zaslon"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Raztegnitev čez zaslon"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Posnetek zaslona"</string>
@@ -895,9 +892,9 @@
<item quantity="few"><xliff:g id="NUM_APPS_2">%1$d</xliff:g> aplikacije uporabljajo <xliff:g id="TYPE_3">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikacij uporablja <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Razumem"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Podrobnosti"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplikacija, ki uporablja te funkcije: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplikacije, ki uporabljajo te funkcije: <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -914,4 +911,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Izklop za tipala"</string>
<string name="device_services" msgid="1191212554435440592">"Storitve naprave"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Brez naslova"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-sq/strings.xml b/packages/SystemUI/res/values-sq/strings.xml
index 1642e99..ad6113e 100644
--- a/packages/SystemUI/res/values-sq/strings.xml
+++ b/packages/SystemUI/res/values-sq/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Të lejohet korrigjimi i USB-së?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Shenja e gishtit të tastit \"RSA\" së kompjuterit është:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Lejo gjithmonë nga ky kompjuter"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Lejo"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Korrigjimi i USB-së nuk lejohet"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Përdoruesi i identifikuar aktualisht në këtë pajisje nuk mund ta aktivizojë korrigjimin e USB-së. Për ta përdorur këtë funksion, kalo te përdoruesi parësor."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Porta e USB-së është çaktivizuar"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Për të mbrojtur pajisjen tënde nga lëngjet apo papastërtitë, porta e USB-së është çaktivizuar dhe nuk do t\'i dallojë aksesorët.\n\nDo të njoftohesh kur të mos ketë rrezik përdorimi përsëri i portës së USB-së."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zmadho për të mbushur ekranin"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Shtrije për të mbushur ekranin"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Pamja e ekranit"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> aplikacione po përdorin <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> aplikacion po përdor <xliff:g id="TYPE_1">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"E kuptova"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Shiko detajet"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Aplikacionet që po përdorin <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Aplikacionet që po përdorin <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensorët joaktivë"</string>
<string name="device_services" msgid="1191212554435440592">"Shërbimet e pajisjes"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Pa titull"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-sr/strings.xml b/packages/SystemUI/res/values-sr/strings.xml
index dac91a870..768ae7f 100644
--- a/packages/SystemUI/res/values-sr/strings.xml
+++ b/packages/SystemUI/res/values-sr/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Желите ли да дозволите отклањање USB грешака?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Дигитални отисак RSA кључа овог рачунара је:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Увек дозволи са овог рачунара"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Дозволи"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Отклањање грешака на USB-у није дозвољено"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Корисник који је тренутно пријављен на овај уређај не може да укључи отклањање грешака на USB-у. Да бисте користили ову функцију, пребаците на примарног корисника."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB порт је онемогућен"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Да би се уређај заштитио од течности или нечистоће, USB порт је онемогућен и неће откривати додатну опрему.\n\nОбавестићемо вас када поново будете могли да користите USB порт."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Зумирај на целом екрану"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Развуци на цео екран"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Снимак екрана"</string>
@@ -888,9 +885,9 @@
<item quantity="few"><xliff:g id="NUM_APPS_2">%1$d</xliff:g> апликације користе дозволу <xliff:g id="TYPE_3">%2$s</xliff:g>.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> апликација користи дозволу <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Важи"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Прикажи детаље"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Апликација која користи дозволе <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Апликације које користе дозволе <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -906,4 +903,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Сензори су искључени"</string>
<string name="device_services" msgid="1191212554435440592">"Услуге за уређаје"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Без наслова"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-sv/strings.xml b/packages/SystemUI/res/values-sv/strings.xml
index ff0d0c0..0f36517 100644
--- a/packages/SystemUI/res/values-sv/strings.xml
+++ b/packages/SystemUI/res/values-sv/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Ska USB-felsökning tillåtas?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Fingeravtrycket för datorns RSA-nyckel är:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Tillåt alltid på den här datorn"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Tillåt"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB-felsökning är inte tillåtet"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Användaren som är inloggad på enheten för närvarande kan inte aktivera USB-felsökning. Byt till den primära användaren om du vill använda den här funktionen."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-porten har inaktiverats"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"USB-porten har inaktiverats för att skydda enheten mot vätska eller smuts. Inga tillbehör kommer att hittas.\n\nDu meddelas när det går att använda USB-porten igen."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Zooma för att fylla skärm"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Dra för att fylla skärmen"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Skärmdump"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="TYPE_5">%2$s</xliff:g> används av <xliff:g id="NUM_APPS_4">%1$d</xliff:g> appar.</item>
<item quantity="one"><xliff:g id="TYPE_1">%2$s</xliff:g> används av <xliff:g id="NUM_APPS_0">%1$d</xliff:g> app.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Läs mer"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"En app använder din <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Appar använder dina <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensorer har inaktiverats"</string>
<string name="device_services" msgid="1191212554435440592">"Enhetstjänster"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Ingen titel"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-sw/strings.xml b/packages/SystemUI/res/values-sw/strings.xml
index dbb3a8d..a11e4d4 100644
--- a/packages/SystemUI/res/values-sw/strings.xml
+++ b/packages/SystemUI/res/values-sw/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Ruhusu utatuaji wa USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Alama ya kidole ya kitufe cha RSA ya kompyuta ni:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Ruhusu kutoka kwenye kompyuta hii kila wakati"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Ruhusu"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Utatuzi wa USB hauruhusiwi"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Mtumiaji aliyeingia katika akaunti kwa kutumia kifaa hiki kwa sasa hawezi kuwasha utatuzi wa USB. Ili utumie kipengele hiki, tumia akaunti ya mtumiaji wa msingi."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Mlango wa USB umezimwa"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Ili ulinde kifaa chako dhidi ya vitu vya unyevu au uchafu, mlango wa USB umezimwa na hautatambua vifaa vyovyote.\n\nUtaarifiwa itapokuwa salama kutumia mlango wa USB tena."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Kuza ili kujaza skrini"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Tanua ili kujaza skrini"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Picha ya skrini"</string>
@@ -881,9 +878,9 @@
<item quantity="other">Programu <xliff:g id="NUM_APPS_4">%1$d</xliff:g> zinatumia <xliff:g id="TYPE_5">%2$s</xliff:g> yako.</item>
<item quantity="one">Programu <xliff:g id="NUM_APPS_0">%1$d</xliff:g> inatumia <xliff:g id="TYPE_1">%2$s</xliff:g> yako.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Nimeelewa"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Angalia maelezo"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Programu inayotumia <xliff:g id="TYPES_LIST">%s</xliff:g> yako"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Programu zinazotumia <xliff:g id="TYPES_LIST">%s</xliff:g> yako"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Umezima vitambuzi"</string>
<string name="device_services" msgid="1191212554435440592">"Huduma za Kifaa"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Wimbo hauna jina"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ta/strings.xml b/packages/SystemUI/res/values-ta/strings.xml
index 0ef8bbf..a8587c1 100644
--- a/packages/SystemUI/res/values-ta/strings.xml
+++ b/packages/SystemUI/res/values-ta/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB பிழைத்திருத்தத்தை அனுமதிக்கவா?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"பின்வருவது கணினியின் RSA விசை கைரேகையாகும்:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"இந்தக் கணினியிலிருந்து எப்போதும் அனுமதி"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"அனுமதி"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB பிழைத்திருத்தம் அனுமதிக்கப்படவில்லை"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"தற்போது இந்தச் சாதனத்தில் உள்நுழைந்துள்ள பயனரால் USB பிழைத்திருத்தத்தை இயக்க முடியாது. இந்த அம்சத்தை இயக்க, முதன்மைப் பயனருக்கு மாறவும்."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB போர்ட் முடக்கப்பட்டது"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"தேவையற்றவையில் இருந்து உங்கள் சாதனத்தைப் பாதுகாக்க, USB போர்ட் முடக்கப்பட்டுள்ளது, மேலும் எந்த துணைக் கருவிகளையும் கண்டறியாது.\n\nUSB போர்ட்டை மீண்டும் எப்போது பாதுகாப்பாகப் பயன்படுத்தலாம் என்பதைப் பற்றி உங்களுக்குத் தெரிவிக்கப்படும்."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"திரையை நிரப்ப அளவை மாற்று"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"திரையை நிரப்ப இழு"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ஸ்கிரீன் ஷாட்"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ஆப்ஸால் உங்கள் <xliff:g id="TYPE_5">%2$s</xliff:g> பயன்படுத்தப் படுகிறது.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> ஆப்ஸால் உங்கள் <xliff:g id="TYPE_1">%2$s</xliff:g> பயன்படுத்தப் படுகிறது.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"சரி"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"விவரங்களைக் காட்டு"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"உங்கள் <xliff:g id="TYPES_LIST">%s</xliff:g> ஆகியவற்றைப் பயன்படுத்தும் ஆப்ஸ்"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"உங்கள் <xliff:g id="TYPES_LIST">%s</xliff:g> ஆகியவற்றைப் பயன்படுத்தும் ஆப்ஸ்"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"சென்சார்களை ஆஃப் செய்தல்"</string>
<string name="device_services" msgid="1191212554435440592">"சாதன சேவைகள்"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"தலைப்பு இல்லை"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-te/strings.xml b/packages/SystemUI/res/values-te/strings.xml
index 4b05f0f..a512c0c 100644
--- a/packages/SystemUI/res/values-te/strings.xml
+++ b/packages/SystemUI/res/values-te/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB డీబగ్గింగ్ను అనుమతించాలా?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"ఇది కంప్యూటర్ యొక్క RSA కీ వేలిముద్ర:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"ఈ కంప్యూటర్ నుండి ఎల్లప్పుడూ అనుమతించు"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"అనుమతించు"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB డీబగ్గింగ్కి అనుమతి లేదు"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"ఈ పరికరానికి ప్రస్తుతం సైన్ ఇన్ చేసిన వినియోగదారు USB డీబగ్గింగ్ ఆన్ చేయలేరు. ఈ ఫీచర్ ఉపయోగించడానికి, ప్రాథమిక వినియోగదారుకి మారాలి."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB పోర్ట్ నిలిపివేయబడింది"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"మీ పరికరాన్ని ద్రవ లేదా వ్యర్థ పదార్థాల నుండి కాపాడే తరుణంలో USB పోర్ట్ని నిలిపివేయడంతో పాటు ఎలాంటి యాక్సెసరీస్ను గుర్తించలేదు.\n\n కనుక USB పోర్ట్ని ఉపయోగించడం సురక్షితం అయ్యాక, మళ్లీ మీకో నోటిఫికేషన్ రూపంలో తెలియజేస్తాం."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"స్క్రీన్కు నింపేలా జూమ్ చేయండి"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"స్క్రీన్కు నింపేలా విస్తరించండి"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"స్క్రీన్షాట్"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> అప్లికేషన్లు మీ <xliff:g id="TYPE_5">%2$s</xliff:g>ని ఉపయోగిస్తున్నాయి.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> అప్లికేషన్ మీ <xliff:g id="TYPE_1">%2$s</xliff:g>ని ఉపయోగిస్తుంది.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"అర్థమైంది"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"వివరాలను చూడండి"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"మీ <xliff:g id="TYPES_LIST">%s</xliff:g> ఉపయోగించే యాప్"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"మీ<xliff:g id="TYPES_LIST">%s</xliff:g> ఉపయోగిస్తున్న యాప్లు"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"సెన్సార్లు ఆఫ్"</string>
<string name="device_services" msgid="1191212554435440592">"పరికర సేవలు"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"శీర్షిక లేదు"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-th/strings.xml b/packages/SystemUI/res/values-th/strings.xml
index 707bcf9..b8a840e 100644
--- a/packages/SystemUI/res/values-th/strings.xml
+++ b/packages/SystemUI/res/values-th/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"อนุญาตให้แก้ไขข้อบกพร่อง USB หรือไม่"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"ลายนิ้วมือหลัก RSA ของคอมพิวเตอร์คือ:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"อนุญาตจากคอมพิวเตอร์เครื่องนี้เสมอ"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"อนุญาต"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"ไม่อนุญาตให้แก้ไขข้อบกพร่องผ่าน USB"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"ผู้ใช้ที่ลงชื่อเข้าใช้อุปกรณ์อยู่ในขณะนี้ไม่สามารถเปิดการแก้ไขข้อบกพร่องผ่าน USB ได้ หากต้องการใช้ฟีเจอร์นี้ ให้เปลี่ยนไปเป็นผู้ใช้หลัก"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"พอร์ต USB ถูกปิดใช้"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"พอร์ต USB ถูกปิดใช้และจะไม่ตรวจจับอุปกรณ์เสริมใดๆ เพื่อปกป้องอุปกรณ์จากของเหลวและฝุ่นละออง \n\nคุณจะได้รับแจ้งเมื่อใช้พอร์ต USB ได้อย่างปลอดภัยอีกครั้ง"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"ขยายจนเต็มหน้าจอ"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"ยืดจนเต็มหน้าจอ"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"ภาพหน้าจอ"</string>
@@ -881,9 +878,9 @@
<item quantity="other">มี <xliff:g id="NUM_APPS_4">%1$d</xliff:g> แอปพลิเคชันกำลังใช้<xliff:g id="TYPE_5">%2$s</xliff:g></item>
<item quantity="one">มี <xliff:g id="NUM_APPS_0">%1$d</xliff:g> แอปพลิเคชันกำลังใช้<xliff:g id="TYPE_1">%2$s</xliff:g></item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"รับทราบ"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"ดูรายละเอียด"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"มีแอปกำลังใช้<xliff:g id="TYPES_LIST">%s</xliff:g>ของคุณ"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"มีหลายแอปกำลังใช้<xliff:g id="TYPES_LIST">%s</xliff:g>ของคุณ"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"เซ็นเซอร์ปิดอยู่"</string>
<string name="device_services" msgid="1191212554435440592">"บริการของอุปกรณ์"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"ไม่มีชื่อ"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-tl/strings.xml b/packages/SystemUI/res/values-tl/strings.xml
index 1d9460c..72c5eac 100644
--- a/packages/SystemUI/res/values-tl/strings.xml
+++ b/packages/SystemUI/res/values-tl/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Payagan ang pag-debug ng USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Ang RSA key fingerprint ng computer ay:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Palaging payagan mula sa computer na ito"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Payagan"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Hindi pinapayagan ang pagde-debug sa pamamagitan ng USB"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Hindi mao-on ng user na kasalukuyang naka-sign in sa device na ito ang pag-debug ng USB. Upang magamit ang feature na ito, lumipat sa pangunahing user."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Na-disable ang USB port"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Para protektahan ang iyong device sa liquid o debris, na-disable ang USB port at hindi ito makaka-detect ng anumang accessory.\n\nMaaabisuhan ka kapag ligtas na gamitin muli ang USB port."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"I-zoom upang punan screen"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"I-stretch upang mapuno screen"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Screenshot"</string>
@@ -881,9 +878,9 @@
<item quantity="one">Ginagamit ng <xliff:g id="NUM_APPS_4">%1$d</xliff:g> application ang iyong <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
<item quantity="other">Ginagamit ng <xliff:g id="NUM_APPS_4">%1$d</xliff:g> na application ang iyong <xliff:g id="TYPE_5">%2$s</xliff:g>.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Tingnan ang mga detalye"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"App na gumagamit ng iyong <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Mga app na gumagamit ng iyong <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Naka-off ang mga sensor"</string>
<string name="device_services" msgid="1191212554435440592">"Mga Serbisyo ng Device"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Walang pamagat"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-tr/strings.xml b/packages/SystemUI/res/values-tr/strings.xml
index 0217720..5cd4e4c 100644
--- a/packages/SystemUI/res/values-tr/strings.xml
+++ b/packages/SystemUI/res/values-tr/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB hata ayıklamasına izin verilsin mi?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Bilgisayarın RSA anahtarı parmak izi:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Bu bilgisayardan her zaman izin ver"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"İzin ver"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB hata ayıklama işlevine izin verilmiyor"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Bu cihazda geçerli olarak oturum açmış olan kullanıcı, USB hata ayıklama özelliğini açamaz. Bu özelliği kullanmak için birincil kullanıcıya geçin."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB bağlantı noktası devre dışı bırakıldı"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Cihazınızı sıvılardan veya tozlardan korumak için USB bağlantı noktası devre dışı bırakıldı ve aksesuarları algılamayacak.\n\nUSB bağlantı noktasını tekrar güvenli bir şekilde kullanabileceğiniz zaman bilgilendirileceksiniz."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Yakınlaştır (ekranı kaplasın)"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Genişlet (ekran kapansın)"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Ekran görüntüsü"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> uygulama, cihazınızın <xliff:g id="TYPE_5">%2$s</xliff:g> özelliğini kullanıyor.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> uygulama, cihazınızın <xliff:g id="TYPE_1">%2$s</xliff:g> özelliğini kullanıyor.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Anladım"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Ayrıntıları göster"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Uygulama cihazınızın <xliff:g id="TYPES_LIST">%s</xliff:g> özelliklerini kullanıyor"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Uygulamalar cihazınızın <xliff:g id="TYPES_LIST">%s</xliff:g> özelliklerini kullanıyor"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensörler kapalı"</string>
<string name="device_services" msgid="1191212554435440592">"Cihaz Hizmetleri"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Başlıksız"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-uk/strings.xml b/packages/SystemUI/res/values-uk/strings.xml
index 69ed197..b231c58 100644
--- a/packages/SystemUI/res/values-uk/strings.xml
+++ b/packages/SystemUI/res/values-uk/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Дозволити налагодження USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Цифровий відбиток ключа RSA комп’ютера:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Завжди дозволяти з цього комп’ютера"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Дозволити"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Ви не можете вмикати налагодження USB"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Користувач поточного облікового запису не може вмикати налагодження USB. Щоб увімкнути цю функцію, увійдіть в обліковий запис основного користувача."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB-порт вимкнено"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Щоб захистити ваш пристрій від рідини та сміття, USB-порт вимкнено. Він не виявлятиме жодних аксесуарів.\n\nКоли USB-порт можна буде безпечно використовувати, ви отримаєте сповіщення."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Масштабув. на весь екран"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Розтягнути на весь екран"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Знімок екрана"</string>
@@ -895,9 +892,9 @@
<item quantity="many"><xliff:g id="TYPE_5">%2$s</xliff:g> працює в <xliff:g id="NUM_APPS_4">%1$d</xliff:g> додатках.</item>
<item quantity="other"><xliff:g id="TYPE_5">%2$s</xliff:g> працює в <xliff:g id="NUM_APPS_4">%1$d</xliff:g> додатка.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Докладніше"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Додаток, яким використовується <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Додатки, якими використовується <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -914,4 +911,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Датчики вимкнено"</string>
<string name="device_services" msgid="1191212554435440592">"Сервіси на пристрої"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Без назви"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-ur/strings.xml b/packages/SystemUI/res/values-ur/strings.xml
index 59e8946..90447d7 100644
--- a/packages/SystemUI/res/values-ur/strings.xml
+++ b/packages/SystemUI/res/values-ur/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB ڈیبگ کرنے کی اجازت دیں؟"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"کمپیوٹر کے RSA کا کلیدی فنگر پرنٹ ہے:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"اس کمپیوٹر سے ہمیشہ اجازت دیں"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"اجازت دیں"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB ڈیبگ کرنے کی اجازت نہیں ہے"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"اس آلہ پر فی الحال سائن ان کردہ صارف USB ڈیبگنگ آن نہیں کر سکتا۔ اس خصوصیت کا استعمال کرنے کیلئے، ابتدائی صارف پر سوئچ کریں۔"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB پورٹ غیر فعال ہو گیا"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"آپ کے آلے کی سیال یا دھول سے حفاظت کرنے کیلئے، USB پورٹ کو غیر فعال کر دیا گیا ہے اور یہ کسی لوازم کا پتہ نہیں لگا پائے گا۔\n\nUSB پورٹ کا دوبارہ استعمال کرنا محفوظ ہونے پر آپ کو مطلع کیا جائے گا۔"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"پوری سکرین پر زوم کریں"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"پوری سکرین پر پھیلائیں"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"اسکرین شاٹ"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ایپلیکیشنز آپ کی <xliff:g id="TYPE_5">%2$s</xliff:g> کا استعمال کر رہی ہیں۔</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> ایپلیکیشن آپ کی <xliff:g id="TYPE_1">%2$s</xliff:g> کا استعمال کر رہی ہے۔</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"سمجھ آ گئی"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"تفصیلات دیکھیں"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"ایپ آپ کی <xliff:g id="TYPES_LIST">%s</xliff:g> کا استعمال کر رہی ہیں"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"ایپس آپ کی <xliff:g id="TYPES_LIST">%s</xliff:g> کا استعمال کر رہی ہیں"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">"، "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"سینسرز آف ہیں"</string>
<string name="device_services" msgid="1191212554435440592">"آلہ کی سروس"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"کوئی عنوان نہیں ہے"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-uz/strings.xml b/packages/SystemUI/res/values-uz/strings.xml
index 85204af..4a7af62 100644
--- a/packages/SystemUI/res/values-uz/strings.xml
+++ b/packages/SystemUI/res/values-uz/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"USB orqali nosozliklarni tuzatishga ruxsat berilsinmi?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Kompyuterning RSA tugmasi barmoq izlari:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Doimo ushbu kompyuterdan ruxsat berilsin"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Ruxsat berish"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"USB orqali nosozliklarni tuzatishga ruxsat berilmagan"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Ayni paytda ushbu qurilmaga o‘z hisobi bilan kirgan foydalanuvchi USB orqali nosozliklarni tuzatish funksiyasini yoqa olmaydi. Bu funksiyadan foydalanish uchun asosiy foydalanuvchi profiliga o‘ting."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB port faolsizlashtirildi"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Qurilmangizni suyuqlik va turli parchalardan himoya qilish uchun USB port faolsizlashtiriladi va hech qanday aksessuarni aniqlay olmaydi.\n\nUSB portdan xavfsiz foydalanish mumkin boʻlganda, sizga xabar beriladi."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Ekranga moslashtirish"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Ekran hajmida cho‘zish"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Skrinshot"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ta ilova <xliff:g id="TYPE_5">%2$s</xliff:g> ishlatmoqda.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> ta ilova <xliff:g id="TYPE_1">%2$s</xliff:g> ishlatmoqda.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Tafsilotlar"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"<xliff:g id="TYPES_LIST">%s</xliff:g> ishlatayotgan ilova"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Ilovalar <xliff:g id="TYPES_LIST">%s</xliff:g> ishlatmoqda"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Sensorlar nofaol"</string>
<string name="device_services" msgid="1191212554435440592">"Qurilma xizmatlari"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Nomsiz"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-vi/strings.xml b/packages/SystemUI/res/values-vi/strings.xml
index d2b1384..ad8d17c 100644
--- a/packages/SystemUI/res/values-vi/strings.xml
+++ b/packages/SystemUI/res/values-vi/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Cho phép gỡ lỗi USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Tệp tham chiếu khóa RSA của máy tính là:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Luôn cho phép từ máy tính này"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Cho phép"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Tính năng gỡ lỗi USB không được phép"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Người dùng hiện đã đăng nhập vào thiết bị này không thể bật tính năng gỡ lỗi USB. Để sử dụng tính năng này, hãy chuyển sang người dùng chính."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Đã tắt cổng USB"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Để bảo vệ thiết bị của bạn khỏi chất lỏng hay mảnh vỡ, cổng USB sẽ tắt và không thể phát hiện được bất kỳ phụ kiện nào.\n\nBạn sẽ được thông báo khi có thể sử dụng lại cổng USB một cách an toàn."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"T.phóng để lấp đầy m.hình"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Giãn ra để lấp đầy m.hình"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Chụp ảnh màn hình"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> ứng dụng đang dùng <xliff:g id="TYPE_5">%2$s</xliff:g> của bạn.</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> ứng dụng đang dùng <xliff:g id="TYPE_1">%2$s</xliff:g> của bạn.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"OK"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Xem chi tiết"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Ứng dụng đang sử dụng <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Các ứng dụng đang sử dụng <xliff:g id="TYPES_LIST">%s</xliff:g>"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Tắt cảm biến"</string>
<string name="device_services" msgid="1191212554435440592">"Dịch vụ cho thiết bị"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Không có tiêu đề"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml
index b1eff03..0330edf 100644
--- a/packages/SystemUI/res/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"允许 USB 调试吗？"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"这台计算机的 RSA 密钥指纹如下：\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"一律允许使用这台计算机进行调试"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"允许"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"不允许使用 USB 调试功能"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"目前已登录此设备的用户无法开启 USB 调试功能。要使用此功能，请切换为主要用户的帐号。"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB 端口已停用"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"为避免液体或碎屑导致您的设备受损，系统已停用 USB 端口，因此目前无法检测任何配件。\n\n系统会在可重新安全使用 USB 端口时通知您。"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"缩放以填满屏幕"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"拉伸以填满屏幕"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"屏幕截图"</string>
@@ -881,9 +878,9 @@
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> 个应用正在使用您的<xliff:g id="TYPE_5">%2$s</xliff:g>。</item>
<item quantity="one"><xliff:g id="NUM_APPS_0">%1$d</xliff:g> 个应用正在使用您的<xliff:g id="TYPE_1">%2$s</xliff:g>。</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"知道了"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"查看详情"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"正在使用您的<xliff:g id="TYPES_LIST">%s</xliff:g>的应用"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"正在使用您的<xliff:g id="TYPES_LIST">%s</xliff:g>的应用"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">"、 "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"已关闭传感器"</string>
<string name="device_services" msgid="1191212554435440592">"设备服务"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"无标题"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml
index 64f4e21..01797fb 100644
--- a/packages/SystemUI/res/values-zh-rHK/strings.xml
+++ b/packages/SystemUI/res/values-zh-rHK/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"允許 USB 除錯嗎？"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"這部電腦的 RSA 密鑰指紋如下：\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"一律允許透過這部電腦進行"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"允許"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"不允許 USB 偵錯"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"目前登入此裝置的使用者無法啟用 USB 偵錯功能。如要使用此功能，請切換至主要使用者。"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"已停用 USB 連接埠"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"為了保護您的裝置免受液體或碎片損害，USB 連接埠已停用，因此不會偵測到任何配件。\n\nUSB 連接埠可安全使用時，您會收到通知。"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"放大為全螢幕"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"放大為全螢幕"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"擷取螢幕畫面"</string>
@@ -881,9 +878,9 @@
<item quantity="other">有 <xliff:g id="NUM_APPS_4">%1$d</xliff:g> 個應用程式正在使用您的<xliff:g id="TYPE_5">%2$s</xliff:g>。</item>
<item quantity="one">有 <xliff:g id="NUM_APPS_0">%1$d</xliff:g> 個應用程式正在使用您的<xliff:g id="TYPE_1">%2$s</xliff:g>。</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"知道了"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"查看詳情"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"使用<xliff:g id="TYPES_LIST">%s</xliff:g>的應用程式"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"使用<xliff:g id="TYPES_LIST">%s</xliff:g>的應用程式"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">"、 "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"感應器已關閉"</string>
<string name="device_services" msgid="1191212554435440592">"裝置服務"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"無標題"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-zh-rTW/strings.xml b/packages/SystemUI/res/values-zh-rTW/strings.xml
index bd1896a..62b7cb6 100644
--- a/packages/SystemUI/res/values-zh-rTW/strings.xml
+++ b/packages/SystemUI/res/values-zh-rTW/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"允許 USB 偵錯嗎？"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"這台電腦的 RSA 金鑰指紋如下：\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"一律允許透過這台電腦進行"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"允許"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"無權使用 USB 偵錯功能"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"目前登入這個裝置的使用者無法啟用 USB 偵錯功能。如要使用這項功能，請切換到主要使用者。"</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"USB 連接埠已停用"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"為了避免液體或灰塵導致你的裝置受損，系統已停用 USB 連接埠，因此目前無法偵測任何配件。\n\n系統會在可繼續安全使用 USB 連接埠時通知你。"</string>
<string name="compat_mode_on" msgid="6623839244840638213">"放大為全螢幕"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"放大為全螢幕"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"擷取螢幕畫面"</string>
@@ -881,9 +878,9 @@
<item quantity="other">有 <xliff:g id="NUM_APPS_4">%1$d</xliff:g> 個應用程式正在使用你的<xliff:g id="TYPE_5">%2$s</xliff:g>。</item>
<item quantity="one">有 <xliff:g id="NUM_APPS_0">%1$d</xliff:g> 個應用程式正在使用你的<xliff:g id="TYPE_1">%2$s</xliff:g>。</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"我知道了"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"查看詳細資料"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"使用<xliff:g id="TYPES_LIST">%s</xliff:g>的應用程式"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"使用<xliff:g id="TYPES_LIST">%s</xliff:g>的應用程式"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">"、 "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"已關閉感應器"</string>
<string name="device_services" msgid="1191212554435440592">"裝置服務"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"無標題"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values-zu/strings.xml b/packages/SystemUI/res/values-zu/strings.xml
index 9f70420..f8bf2e3 100644
--- a/packages/SystemUI/res/values-zu/strings.xml
+++ b/packages/SystemUI/res/values-zu/strings.xml
@@ -57,14 +57,11 @@
<string name="usb_debugging_title" msgid="4513918393387141949">"Vumela ukulungisa iphutha le-USB?"</string>
<string name="usb_debugging_message" msgid="2220143855912376496">"Izigxivizo zeminwe zokhiye we-RSA wekhompyutha ngu:\n<xliff:g id="FINGERPRINT">%1$s</xliff:g>"</string>
<string name="usb_debugging_always" msgid="303335496705863070">"Hlala uvumela njalo kusuka kule khompyutha"</string>
- <!-- no translation found for usb_debugging_allow (2272145052073254852) -->
- <skip />
+ <string name="usb_debugging_allow" msgid="2272145052073254852">"Vumela"</string>
<string name="usb_debugging_secondary_user_title" msgid="6353808721761220421">"Ukususa iphutha kwe-USB akuvunyelwe"</string>
<string name="usb_debugging_secondary_user_message" msgid="6067122453571699801">"Umsebenzisi manje ongene ngemvume kule divayisi entsha akakwazi ukuvula ukulungisa amaphutha ku-USB. Ukuze usebenzise lesi sici, shintshela kumsebenzisi oyinhloko."</string>
- <!-- no translation found for usb_contaminant_title (206854874263058490) -->
- <skip />
- <!-- no translation found for usb_contaminant_message (2205845572186473860) -->
- <skip />
+ <string name="usb_contaminant_title" msgid="206854874263058490">"Imbobo ye-USB ikhutshaziwe"</string>
+ <string name="usb_contaminant_message" msgid="2205845572186473860">"Ukuze uvikele idivayisi yakho kusukela kuketshezi noma ama-debris, imbobo ye-USB iyakhutshazwa futhi ngeke ithole noma iziphi izisetshenziswa.\n\nUzokwaziswa uma kuphephile ukuphinda usebenzise imbobo yakho ye-USB."</string>
<string name="compat_mode_on" msgid="6623839244840638213">"Sondeza ukugcwalisa isikrini"</string>
<string name="compat_mode_off" msgid="4434467572461327898">"Nweba ukugcwalisa isikrini"</string>
<string name="global_action_screenshot" msgid="8329831278085426283">"Isithombe-skrini"</string>
@@ -881,9 +878,9 @@
<item quantity="one"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> izinhlelo zokusebenza zisebenzisa i-<xliff:g id="TYPE_5">%2$s</xliff:g> yakho.</item>
<item quantity="other"><xliff:g id="NUM_APPS_4">%1$d</xliff:g> izinhlelo zokusebenza zisebenzisa i-<xliff:g id="TYPE_5">%2$s</xliff:g> yakho.</item>
</plurals>
- <!-- no translation found for ongoing_privacy_dialog_ok (3273300106348958308) -->
+ <string name="ongoing_privacy_dialog_ok" msgid="3273300106348958308">"Ngiyezwa"</string>
+ <!-- no translation found for ongoing_privacy_dialog_open_settings (6773015940472748876) -->
<skip />
- <string name="ongoing_privacy_dialog_open_settings" msgid="2074844974365194279">"Buka imininingwane"</string>
<string name="ongoing_privacy_dialog_single_app_title" msgid="6019646962021696632">"Uhlelo lokusebenza olusebenzisa i-<xliff:g id="TYPES_LIST">%s</xliff:g> yakho"</string>
<string name="ongoing_privacy_dialog_multiple_apps_title" msgid="8013356222977903365">"Izinhlelo zokusebenza ezisebenzisa i-<xliff:g id="TYPES_LIST">%s</xliff:g> yakho"</string>
<string name="ongoing_privacy_dialog_separator" msgid="6854860652480837439">", "</string>
@@ -898,4 +895,8 @@
<string name="sensor_privacy_mode" msgid="8982771253020769598">"Izinzwa zivaliwe"</string>
<string name="device_services" msgid="1191212554435440592">"Amasevisi edivayisi"</string>
<string name="music_controls_no_title" msgid="5236895307087002011">"Asikho isihloko"</string>
+ <!-- no translation found for bubbles_deep_link_button_description (8895837143057564517) -->
+ <skip />
+ <!-- no translation found for bubbles_settings_button_description (1940331766151865776) -->
+ <skip />
</resources>
diff --git a/packages/SystemUI/res/values/attrs.xml b/packages/SystemUI/res/values/attrs.xml
index baaf9d6..0fed96e 100644
--- a/packages/SystemUI/res/values/attrs.xml
+++ b/packages/SystemUI/res/values/attrs.xml
@@ -124,6 +124,7 @@
<attr name="darkIconTheme" format="reference" />
<attr name="wallpaperTextColor" format="reference|color" />
<attr name="wallpaperTextColorSecondary" format="reference|color" />
+ <attr name="backgroundProtectedStyle" format="reference" />
<declare-styleable name="SmartReplyView">
<attr name="spacing" format="dimension" />
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 8f5effb..81c00bc 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -23,8 +23,9 @@
<dimen name="navigation_bar_size">@*android:dimen/navigation_bar_height</dimen>
<!-- Minimum swipe distance to catch the swipe gestures to invoke assist or switch tasks. -->
<dimen name="navigation_bar_min_swipe_distance">48dp</dimen>
- <!-- The distance from a side of device of the navigation bar to start an edge swipe -->
- <dimen name="navigation_bar_edge_swipe_threshold">48dp</dimen>
+ <!-- The default distance from a side of the device to start an edge swipe from -->
+ <dimen name="navigation_bar_default_edge_width">48dp</dimen>
+ <dimen name="navigation_bar_default_edge_height">500dp</dimen>
<!-- thickness (height) of the dead zone at the top of the navigation bar,
reducing false presses on navbar buttons; approx 2mm -->
@@ -646,10 +647,15 @@
+ 8dp. -->
<dimen name="assist_orb_navbar_scrim_height">56dp</dimen>
- <!-- The width/height of the phone/camera/unlock icon view on keyguard. -->
+ <!-- The width/height of the phone/camera icon view on keyguard. -->
<dimen name="keyguard_affordance_height">56dp</dimen>
<dimen name="keyguard_affordance_width">56dp</dimen>
+ <!-- The width/height of the unlock icon view on keyguard. -->
+ <dimen name="keyguard_lock_height">32dp</dimen>
+ <dimen name="keyguard_lock_width">32dp</dimen>
+ <dimen name="keyguard_lock_padding">24dp</dimen>
+
<dimen name="keyguard_indication_margin_bottom">65dp</dimen>
<!-- The text size for battery level -->
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 56d9bf4c..5365dcf 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -1829,6 +1829,9 @@
<!-- SysUI Tuner: Button that leads to the navigation bar customization screen [CHAR LIMIT=60] -->
<string name="nav_bar">Navigation bar</string>
+ <!-- Label for navigation edge panel for gestures [CHAR LIMIT=60] -->
+ <string name="nav_bar_edge_panel" translatable="false">Navigation bar Edge Panel</string>
+
<!-- SysUI Tuner: Button that controls layout of navigation bar [CHAR LIMIT=60] -->
<string name="nav_bar_layout">Layout</string>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index fa675b7..96cdbd3 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -269,6 +269,8 @@
<item name="android:colorControlHighlight">@*android:color/primary_text_material_dark</item>
<item name="*android:lockPatternStyle">@style/LockPatternStyle</item>
<item name="passwordStyle">@style/PasswordTheme</item>
+ <item name="backgroundProtectedStyle">@style/BackgroundProtectedStyle</item>
+ <item name="android:forceDarkAllowed">false</item>
<!-- Needed for MediaRoute chooser dialog -->
<item name="*android:isLightTheme">false</item>
@@ -285,6 +287,10 @@
<item name="*android:isLightTheme">true</item>
</style>
+ <style name="BackgroundProtectedStyle">
+ <item name="android:textColor">?attr/wallpaperTextColor</item>
+ </style>
+
<style name="LockPatternStyle">
<item name="*android:regularColor">?attr/wallpaperTextColor</item>
<item name="*android:successColor">?attr/wallpaperTextColor</item>
diff --git a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java
index a6b66e7..ea6fb48 100644
--- a/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java
+++ b/packages/SystemUI/shared/src/com/android/systemui/shared/system/ActivityOptionsCompat.java
@@ -20,6 +20,7 @@
import static android.app.ActivityTaskManager.SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT;
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
+import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
import android.app.ActivityOptions;
import android.content.Context;
@@ -31,11 +32,20 @@
public abstract class ActivityOptionsCompat {
/**
- * @return ActivityOptions for starting a task in split screen.
+ * @return ActivityOptions for starting a task in split screen as the primary window.
*/
public static ActivityOptions makeSplitScreenOptions(boolean dockTopLeft) {
+ return makeSplitScreenOptions(dockTopLeft, true);
+ }
+
+ /**
+ * @return ActivityOptions for starting a task in split screen.
+ */
+ public static ActivityOptions makeSplitScreenOptions(boolean dockTopLeft, boolean isPrimary) {
final ActivityOptions options = ActivityOptions.makeBasic();
- options.setLaunchWindowingMode(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
+ options.setLaunchWindowingMode(isPrimary
+ ? WINDOWING_MODE_SPLIT_SCREEN_PRIMARY
+ : WINDOWING_MODE_SPLIT_SCREEN_SECONDARY);
options.setSplitScreenCreateMode(dockTopLeft
? SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT
: SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT);
diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
index 1d8a21d..12f40f3 100644
--- a/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
+++ b/packages/SystemUI/src/com/android/systemui/SystemUIApplication.java
@@ -24,6 +24,8 @@
import android.content.IntentFilter;
import android.content.pm.ApplicationInfo;
import android.content.res.Configuration;
+import android.os.Handler;
+import android.os.Looper;
import android.os.Process;
import android.os.SystemProperties;
import android.os.Trace;
@@ -200,34 +202,46 @@
}
Dependency.get(InitController.class).executePostInitTasks();
log.traceEnd();
+ final Handler mainHandler = new Handler(Looper.getMainLooper());
Dependency.get(PluginManager.class).addPluginListener(
new PluginListener<OverlayPlugin>() {
private ArraySet<OverlayPlugin> mOverlays;
@Override
public void onPluginConnected(OverlayPlugin plugin, Context pluginContext) {
- StatusBar statusBar = getComponent(StatusBar.class);
- if (statusBar != null) {
- plugin.setup(statusBar.getStatusBarWindow(),
- statusBar.getNavigationBarView());
- }
- // Lazy init.
- if (mOverlays == null) mOverlays = new ArraySet<>();
- if (plugin.holdStatusBarOpen()) {
- mOverlays.add(plugin);
- Dependency.get(StatusBarWindowController.class).setStateListener(b ->
- mOverlays.forEach(o -> o.setCollapseDesired(b)));
- Dependency.get(StatusBarWindowController.class).setForcePluginOpen(
- mOverlays.size() != 0);
+ mainHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ StatusBar statusBar = getComponent(StatusBar.class);
+ if (statusBar != null) {
+ plugin.setup(statusBar.getStatusBarWindow(),
+ statusBar.getNavigationBarView());
+ }
+ // Lazy init.
+ if (mOverlays == null) mOverlays = new ArraySet<>();
+ if (plugin.holdStatusBarOpen()) {
+ mOverlays.add(plugin);
+ Dependency.get(StatusBarWindowController.class)
+ .setStateListener(b -> mOverlays.forEach(
+ o -> o.setCollapseDesired(b)));
+ Dependency.get(StatusBarWindowController.class)
+ .setForcePluginOpen(mOverlays.size() != 0);
- }
+ }
+ }
+ });
}
@Override
public void onPluginDisconnected(OverlayPlugin plugin) {
- mOverlays.remove(plugin);
- Dependency.get(StatusBarWindowController.class).setForcePluginOpen(
- mOverlays.size() != 0);
+ mainHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mOverlays.remove(plugin);
+ Dependency.get(StatusBarWindowController.class).setForcePluginOpen(
+ mOverlays.size() != 0);
+ }
+ });
}
}, OverlayPlugin.class, true /* Allow multiple plugins */);
diff --git a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
index 0fc2b27..404f2e5 100644
--- a/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
+++ b/packages/SystemUI/src/com/android/systemui/bubbles/BubbleController.java
@@ -78,11 +78,14 @@
// Enables some subset of notifs to automatically become bubbles
private static final boolean DEBUG_ENABLE_AUTO_BUBBLE = false;
- // Secure settings
+ // Secure settings flags
+ // Feature level flag
+ private static final String ENABLE_BUBBLES = "experiment_enable_bubbles";
+ // Auto bubble flags set whether different notification types should be presented as a bubble
private static final String ENABLE_AUTO_BUBBLE_MESSAGES = "experiment_autobubble_messaging";
private static final String ENABLE_AUTO_BUBBLE_ONGOING = "experiment_autobubble_ongoing";
private static final String ENABLE_AUTO_BUBBLE_ALL = "experiment_autobubble_all";
- private static final String ENABLE_BUBBLE_ACTIVITY_VIEW = "experiment_bubble_activity_view";
+ // Use an activity view for an auto-bubbled notification if it has an appropriate content intent
private static final String ENABLE_BUBBLE_CONTENT_INTENT = "experiment_bubble_content_intent";
private final Context mContext;
@@ -264,8 +267,8 @@
R.layout.bubble_view, mStackView, false /* attachToRoot */);
bubble.setNotif(notif);
PendingIntent bubbleIntent = getValidBubbleIntent(notif);
- if (shouldUseActivityView(mContext) || bubbleIntent != null) {
- bubble.setBubbleIntent(getValidBubbleIntent(notif));
+ if (bubbleIntent != null) {
+ bubble.setBubbleIntent(bubbleIntent);
}
mBubbles.put(bubble.getKey(), bubble);
mStackView.addBubble(bubble);
@@ -273,22 +276,6 @@
updateVisibility();
}
- @Nullable
- private PendingIntent getValidBubbleIntent(NotificationEntry notif) {
- Notification notification = notif.notification.getNotification();
- if (canLaunchInActivityView(notification.getBubbleMetadata() != null
- ? notification.getBubbleMetadata().getIntent() : null)) {
- return notification.getBubbleMetadata().getIntent();
- } else if (shouldUseContentIntent(mContext)
- && canLaunchInActivityView(notification.contentIntent)) {
- Log.d(TAG, "[addBubble " + notif.key
- + "]: No appOverlayIntent, using contentIntent.");
- return notification.contentIntent;
- }
- Log.d(TAG, "[addBubble " + notif.key + "]: No supported intent for ActivityView.");
- return null;
- }
-
/**
* Removes the bubble associated with the {@param uri}.
* <p>
@@ -314,7 +301,10 @@
private final NotificationEntryListener mEntryListener = new NotificationEntryListener() {
@Override
public void onPendingEntryAdded(NotificationEntry entry) {
- if (shouldAutoBubble(mContext, entry) || shouldBubble(entry)) {
+ if (!areBubblesEnabled(mContext)) {
+ return;
+ }
+ if (shouldAutoBubbleForFlags(mContext, entry) || shouldBubble(entry)) {
// TODO: handle group summaries
// It's a new notif, it shows in the shade and as a bubble
entry.setIsBubble(true);
@@ -325,6 +315,9 @@
@Override
public void onEntryInflated(NotificationEntry entry,
@NotificationInflater.InflationFlag int inflatedFlags) {
+ if (!areBubblesEnabled(mContext)) {
+ return;
+ }
if (entry.isBubble() && mNotificationInterruptionStateProvider.shouldBubbleUp(entry)) {
updateBubble(entry, true /* updatePosition */);
}
@@ -332,6 +325,9 @@
@Override
public void onPreEntryUpdated(NotificationEntry entry) {
+ if (!areBubblesEnabled(mContext)) {
+ return;
+ }
if (mNotificationInterruptionStateProvider.shouldBubbleUp(entry)
&& alertAgain(entry, entry.notification.getNotification())) {
entry.setShowInShadeWhenBubble(true);
@@ -347,6 +343,9 @@
public void onEntryRemoved(NotificationEntry entry,
@Nullable NotificationVisibility visibility,
boolean removedByUser) {
+ if (!areBubblesEnabled(mContext)) {
+ return;
+ }
entry.setShowInShadeWhenBubble(false);
if (mBubbles.containsKey(entry.key)) {
mBubbles.get(entry.key).updateDotVisibility();
@@ -401,6 +400,30 @@
return mTempRect;
}
+ @VisibleForTesting
+ BubbleStackView getStackView() {
+ return mStackView;
+ }
+
+ @Nullable
+ private PendingIntent getValidBubbleIntent(NotificationEntry notif) {
+ Notification notification = notif.notification.getNotification();
+ Notification.BubbleMetadata data = notif.getBubbleMetadata();
+ if (data != null && canLaunchInActivityView(data.getIntent())) {
+ return data.getIntent();
+ } else if (shouldUseContentIntent(mContext)
+ && canLaunchInActivityView(notification.contentIntent)) {
+ Log.d(TAG, "[addBubble " + notif.key
+ + "]: No appOverlayIntent, using contentIntent.");
+ return notification.contentIntent;
+ }
+ Log.d(TAG, "[addBubble " + notif.key + "]: No supported intent for ActivityView.");
+ return null;
+ }
+
+ /**
+ * Whether an intent is properly configured to display in an {@link android.app.ActivityView}.
+ */
private boolean canLaunchInActivityView(PendingIntent intent) {
if (intent == null) {
return false;
@@ -412,11 +435,6 @@
&& (info.flags & ActivityInfo.FLAG_ALLOW_EMBEDDED) != 0;
}
- @VisibleForTesting
- BubbleStackView getStackView() {
- return mStackView;
- }
-
/**
* Whether the notification has been developer configured to bubble and is allowed by the user.
*/
@@ -436,18 +454,14 @@
boolean canChannelOverlay = channel != null && channel.canBubble();
boolean hasOverlayIntent = n.getNotification().getBubbleMetadata() != null
&& n.getNotification().getBubbleMetadata().getIntent() != null;
- return DEBUG_ENABLE_AUTO_BUBBLE && hasOverlayIntent && canChannelOverlay && canAppOverlay;
+ return hasOverlayIntent && canChannelOverlay && canAppOverlay;
}
/**
- * Whether the notification should bubble or not. Gated by debug flag.
- * <p>
- * If a notification has been set to bubble via proper bubble APIs or if it is an important
- * message-like notification.
- * </p>
+ * Whether the notification should automatically bubble or not. Gated by secure settings flags.
*/
@VisibleForTesting
- protected boolean shouldAutoBubble(Context context, NotificationEntry entry) {
+ protected boolean shouldAutoBubbleForFlags(Context context, NotificationEntry entry) {
if (entry.isBubbleDismissed()) {
return false;
}
@@ -474,11 +488,9 @@
Class<? extends Notification.Style> style = n.getNotification().getNotificationStyle();
boolean isMessageType = Notification.CATEGORY_MESSAGE.equals(n.getNotification().category);
boolean isMessageStyle = Notification.MessagingStyle.class.equals(style);
- boolean shouldAutoBubble =
- (((isMessageType && hasRemoteInput) || isMessageStyle) && autoBubbleMessages)
+ return (((isMessageType && hasRemoteInput) || isMessageStyle) && autoBubbleMessages)
|| (isImportantOngoing && autoBubbleOngoing)
|| autoBubbleAll;
- return DEBUG_ENABLE_AUTO_BUBBLE && shouldAutoBubble;
}
private static boolean shouldAutoBubbleMessages(Context context) {
@@ -496,13 +508,13 @@
ENABLE_AUTO_BUBBLE_ALL, 0) != 0;
}
- private static boolean shouldUseActivityView(Context context) {
- return Settings.Secure.getInt(context.getContentResolver(),
- ENABLE_BUBBLE_ACTIVITY_VIEW, 0) != 0;
- }
-
private static boolean shouldUseContentIntent(Context context) {
return Settings.Secure.getInt(context.getContentResolver(),
ENABLE_BUBBLE_CONTENT_INTENT, 0) != 0;
}
+
+ private static boolean areBubblesEnabled(Context context) {
+ return Settings.Secure.getInt(context.getContentResolver(),
+ ENABLE_BUBBLES, 1) != 0;
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
index 8a35e70..873fbc2 100644
--- a/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
+++ b/packages/SystemUI/src/com/android/systemui/doze/DozeTriggers.java
@@ -142,7 +142,7 @@
boolean wakeEvent = rawValues != null && rawValues.length > 0 && rawValues[0] != 0;
if (isWakeDisplay) {
- onWakeScreen(wakeEvent);
+ onWakeScreen(wakeEvent, mMachine.getState());
} else if (isLongPress || isWakeLockScreen) {
requestPulse(pulseReason, sensorPerformedProxCheck);
} else {
@@ -195,9 +195,8 @@
}
}
- private void onWakeScreen(boolean wake) {
+ private void onWakeScreen(boolean wake, DozeMachine.State state) {
DozeLog.traceWakeDisplay(wake);
- DozeMachine.State state = mMachine.getState();
boolean paused = (state == DozeMachine.State.DOZE_AOD_PAUSED);
boolean pausing = (state == DozeMachine.State.DOZE_AOD_PAUSING);
sWakeDisplaySensorState = wake;
@@ -208,7 +207,7 @@
// In pocket, drop event.
return;
}
- if (mMachine.getState() == DozeMachine.State.DOZE) {
+ if (state == DozeMachine.State.DOZE) {
mMachine.requestState(DozeMachine.State.DOZE_AOD);
}
}, false /* alreadyPerformedProxCheck */, DozeLog.REASON_SENSOR_WAKE_UP);
@@ -236,7 +235,7 @@
}
mDozeSensors.setListening(true);
if (newState == DozeMachine.State.DOZE_AOD && !sWakeDisplaySensorState) {
- onWakeScreen(false);
+ onWakeScreen(false, newState);
}
break;
case DOZE_AOD_PAUSED:
diff --git a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
old mode 100755
new mode 100644
index ca3cdf4..5f2614e
--- a/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
+++ b/packages/SystemUI/src/com/android/systemui/pip/tv/PipManager.java
@@ -42,6 +42,7 @@
import android.os.Debug;
import android.os.Handler;
import android.os.RemoteException;
+import android.os.UserHandle;
import android.text.TextUtils;
import android.util.Log;
import android.util.Pair;
@@ -247,7 +248,8 @@
ActivityManagerWrapper.getInstance().registerTaskStackListener(mTaskStackListener);
IntentFilter intentFilter = new IntentFilter();
intentFilter.addAction(Intent.ACTION_MEDIA_RESOURCE_GRANTED);
- mContext.registerReceiver(mBroadcastReceiver, intentFilter);
+ mContext.registerReceiverAsUser(mBroadcastReceiver, UserHandle.ALL, intentFilter,
+ null, null);
if (sSettingsPackageAndClassNamePairList == null) {
String[] settings = mContext.getResources().getStringArray(
diff --git a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt
index 1cd3509..fa1426e 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/OngoingPrivacyDialog.kt
@@ -52,6 +52,10 @@
private val MAX_ITEMS = context.resources.getInteger(R.integer.ongoing_appops_dialog_max_apps)
private val iconFactory = IconDrawableFactory.newInstance(context, true)
private var dismissDialog: (() -> Unit)? = null
+ private val appsAndTypes = dialogBuilder.appsAndTypes
+ .sortedWith(compareBy({ -it.second.size }, // Sort by number of AppOps
+ { it.second.min() },
+ { it.first }))
init {
val a = context.theme.obtainStyledAttributes(
@@ -90,10 +94,10 @@
title.setText(dialogBuilder.getDialogTitle())
- val numItems = dialogBuilder.appsAndTypes.size
+ val numItems = appsAndTypes.size
for (i in 0..(numItems - 1)) {
if (i >= MAX_ITEMS) break
- val item = dialogBuilder.appsAndTypes[i]
+ val item = appsAndTypes[i]
addAppItem(appsList, item.first, item.second, dialogBuilder.types.size > 1)
}
diff --git a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogBuilder.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogBuilder.kt
index 2894621..9c1076a 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogBuilder.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyDialogBuilder.kt
@@ -30,8 +30,7 @@
appsAndTypes = itemsList.groupBy({ it.application }, { it.privacyType })
.toList()
.sortedWith(compareBy({ -it.second.size }, // Sort by number of AppOps
- { it.second.min() }, // Sort by "smallest" AppOpp (Location is largest)
- { it.first })) // Sort alphabetically bt App Name
+ { it.second.min() })) // Sort by "smallest" AppOpp (Location is largest)
types = itemsList.map { it.privacyType }.distinct().sorted()
val singleApp = appsAndTypes.size == 1
app = if (singleApp) appsAndTypes[0].first else null
diff --git a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItem.kt b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItem.kt
index dbe87d1..f7ca51d 100644
--- a/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItem.kt
+++ b/packages/SystemUI/src/com/android/systemui/privacy/PrivacyItem.kt
@@ -44,17 +44,22 @@
return applicationName.compareTo(other.applicationName)
}
- var icon: Drawable = context.getDrawable(android.R.drawable.sym_def_app_icon)
- var applicationName: String
-
- init {
+ private val applicationInfo: ApplicationInfo? by lazy {
try {
- val app: ApplicationInfo = context.packageManager
- .getApplicationInfo(packageName, 0)
- icon = context.packageManager.getApplicationIcon(app)
- applicationName = context.packageManager.getApplicationLabel(app) as String
- } catch (e: PackageManager.NameNotFoundException) {
- applicationName = packageName
+ context.packageManager.getApplicationInfo(packageName, 0)
+ } catch (_: PackageManager.NameNotFoundException) {
+ null
}
}
+ val icon: Drawable by lazy {
+ applicationInfo?.let {
+ context.packageManager.getApplicationIcon(it)
+ } ?: context.getDrawable(android.R.drawable.sym_def_app_icon)
+ }
+
+ val applicationName: String by lazy {
+ applicationInfo?.let {
+ context.packageManager.getApplicationLabel(it) as String
+ } ?: packageName
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
index 5f04e56..7fcd59f 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java
@@ -235,7 +235,7 @@
state.label = getTileLabel();
state.secondaryLabel = TextUtils.emptyIfNull(ZenModeConfig.getDescription(mContext,
zen != Global.ZEN_MODE_OFF, mController.getConfig(), false));
- state.icon = ResourceIcon.get(R.drawable.ic_qs_dnd_on);
+ state.icon = ResourceIcon.get(R.drawable.ic_dnd);
checkIfRestrictionEnforcedByAdminOnly(state, UserManager.DISALLOW_ADJUST_VOLUME);
switch (zen) {
case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
index a188c5a..0a39549 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
@@ -462,13 +462,6 @@
}
}
- public void setRestingAlpha(float alpha) {
- mRestingAlpha = alpha;
-
- // TODO: Handle the case an animation is playing.
- setImageAlpha(alpha, false);
- }
-
public float getRestingAlpha() {
return mRestingAlpha;
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
index 158430f..2811505 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java
@@ -486,7 +486,7 @@
if (msg.what == MSG_HIDE_TRANSIENT) {
hideTransientIndication();
} else if (msg.what == MSG_CLEAR_BIOMETRIC_MSG) {
- mLockIcon.setTransientFpError(false);
+ mLockIcon.setTransientBiometricsError(false);
}
}
};
@@ -579,7 +579,7 @@
mStatusBarKeyguardViewManager.showBouncerMessage(helpString,
errorColorState);
} else if (updateMonitor.isScreenOn()) {
- mLockIcon.setTransientFpError(true);
+ mLockIcon.setTransientBiometricsError(true);
showTransientIndication(helpString, errorColorState);
hideTransientIndicationDelayed(TRANSIENT_BIOMETRIC_ERROR_TIMEOUT);
mHandler.removeMessages(MSG_CLEAR_BIOMETRIC_MSG);
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java
index e1b231b..333239e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java
@@ -268,7 +268,7 @@
m.postTranslate(0, (float) (mParams.top - app.position.y));
mWindowCrop.set(mParams.left, 0, mParams.right, mParams.getHeight());
SurfaceParams params = new SurfaceParams(app.leash, 1f /* alpha */, m, mWindowCrop,
- app.prefixOrderIndex, mCornerRadius);
+ app.prefixOrderIndex, mCornerRadius, true /* visible */);
mSyncRtTransactionApplier.scheduleApply(params);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java
index ef5e936..81d0e25 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationEntryManager.java
@@ -27,7 +27,6 @@
import com.android.internal.statusbar.NotificationVisibility;
import com.android.systemui.Dependency;
import com.android.systemui.Dumpable;
-import com.android.systemui.ForegroundServiceController;
import com.android.systemui.statusbar.NotificationLifetimeExtender;
import com.android.systemui.statusbar.NotificationPresenter;
import com.android.systemui.statusbar.NotificationRemoteInputManager;
@@ -48,6 +47,7 @@
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
* NotificationEntryManager is responsible for the adding, removing, and updating of notifications.
@@ -62,12 +62,11 @@
private static final String TAG = "NotificationEntryMgr";
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
- private final Context mContext;
@VisibleForTesting
protected final HashMap<String, NotificationEntry> mPendingNotifications = new HashMap<>();
- private final ForegroundServiceController mForegroundServiceController =
- Dependency.get(ForegroundServiceController.class);
+ private final Map<NotificationEntry, NotificationLifetimeExtender> mRetainedNotifications =
+ new ArrayMap<>();
// Lazily retrieved dependencies
private NotificationRemoteInputManager mRemoteInputManager;
@@ -94,10 +93,19 @@
pw.println(entry.notification);
}
}
+ pw.println(" Lifetime-extended notifications:");
+ if (mRetainedNotifications.isEmpty()) {
+ pw.println(" None");
+ } else {
+ for (Map.Entry<NotificationEntry, NotificationLifetimeExtender> entry
+ : mRetainedNotifications.entrySet()) {
+ pw.println(" " + entry.getKey().notification + " retained by "
+ + entry.getValue().getClass().getName());
+ }
+ }
}
public NotificationEntryManager(Context context) {
- mContext = context;
mNotificationData = new NotificationData();
}
@@ -250,7 +258,7 @@
for (NotificationLifetimeExtender extender : mNotificationLifetimeExtenders) {
if (extender.shouldExtendLifetime(entry)) {
mLatestRankingMap = ranking;
- extender.setShouldManageLifetime(entry, true /* shouldManage */);
+ extendLifetime(entry, extender);
lifetimeExtended = true;
break;
}
@@ -261,9 +269,7 @@
// At this point, we are guaranteed the notification will be removed
// Ensure any managers keeping the lifetime extended stop managing the entry
- for (NotificationLifetimeExtender extender : mNotificationLifetimeExtenders) {
- extender.setShouldManageLifetime(entry, false /* shouldManage */);
- }
+ cancelLifetimeExtension(entry);
if (entry.rowExists()) {
entry.removeRow();
@@ -374,9 +380,7 @@
// Notification is updated so it is essentially re-added and thus alive again. Don't need
// to keep its lifetime extended.
- for (NotificationLifetimeExtender extender : mNotificationLifetimeExtenders) {
- extender.setShouldManageLifetime(entry, false /* shouldManage */);
- }
+ cancelLifetimeExtension(entry);
mNotificationData.update(entry, ranking, notification);
@@ -470,4 +474,20 @@
public Iterable<NotificationEntry> getPendingNotificationsIterator() {
return mPendingNotifications.values();
}
+
+ private void extendLifetime(NotificationEntry entry, NotificationLifetimeExtender extender) {
+ NotificationLifetimeExtender activeExtender = mRetainedNotifications.get(entry);
+ if (activeExtender != null && activeExtender != extender) {
+ activeExtender.setShouldManageLifetime(entry, false);
+ }
+ mRetainedNotifications.put(entry, extender);
+ extender.setShouldManageLifetime(entry, true);
+ }
+
+ private void cancelLifetimeExtension(NotificationEntry entry) {
+ NotificationLifetimeExtender activeExtender = mRetainedNotifications.remove(entry);
+ if (activeExtender != null) {
+ activeExtender.setShouldManageLifetime(entry, false);
+ }
+ }
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
index 2fa9415..6fe23fb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -251,7 +251,6 @@
mUnlockMethodCache.addListener(this);
KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
mLockIcon.setScreenOn(updateMonitor.isScreenOn());
- mLockIcon.setDeviceInteractive(updateMonitor.isDeviceInteractive());
mLockIcon.update();
setClipChildren(false);
setClipToPadding(false);
@@ -337,8 +336,8 @@
updateRightAffordanceIcon();
lp = mLockIcon.getLayoutParams();
- lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_width);
- lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_affordance_height);
+ lp.width = getResources().getDimensionPixelSize(R.dimen.keyguard_lock_width);
+ lp.height = getResources().getDimensionPixelSize(R.dimen.keyguard_lock_height);
mLockIcon.setLayoutParams(lp);
mLockIcon.setContentDescription(getContext().getText(R.string.accessibility_unlock_button));
mLockIcon.update(true /* force */);
@@ -748,16 +747,6 @@
}
@Override
- public void onStartedWakingUp() {
- mLockIcon.setDeviceInteractive(true);
- }
-
- @Override
- public void onFinishedGoingToSleep(int why) {
- mLockIcon.setDeviceInteractive(false);
- }
-
- @Override
public void onScreenTurnedOn() {
mLockIcon.setScreenOn(true);
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
index d934d95..60015ef 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java
@@ -18,12 +18,13 @@
import android.content.Context;
import android.content.res.Configuration;
+import android.content.res.TypedArray;
import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.drawable.AnimatedVectorDrawable;
import android.graphics.drawable.Drawable;
-import android.os.SystemProperties;
import android.util.AttributeSet;
+import android.view.ContextThemeWrapper;
import android.view.accessibility.AccessibilityNodeInfo;
import com.android.internal.graphics.ColorUtils;
@@ -44,28 +45,33 @@
private static final int STATE_LOCK_OPEN = 1;
private static final int STATE_FACE_UNLOCK = 2;
private static final int STATE_FINGERPRINT = 3;
- private static final int STATE_FINGERPRINT_ERROR = 4;
+ private static final int STATE_BIOMETRICS_ERROR = 4;
private int mLastState = 0;
- private boolean mLastDeviceInteractive;
- private boolean mTransientFpError;
- private boolean mDeviceInteractive;
+ private boolean mTransientBiometricsError;
private boolean mScreenOn;
private boolean mLastScreenOn;
private Drawable mUserAvatarIcon;
private final UnlockMethodCache mUnlockMethodCache;
private AccessibilityController mAccessibilityController;
- private boolean mHasFingerPrintIcon;
- private boolean mHasFaceUnlockIcon;
+ private boolean mHasFingerPrintState;
+ private boolean mIsFaceUnlockState;
private int mDensity;
private boolean mPulsing;
private boolean mDozing;
+ private boolean mLastDozing;
+ private boolean mLastPulsing;
private final Runnable mDrawOffTimeout = () -> update(true /* forceUpdate */);
private float mDarkAmount;
public LockIcon(Context context, AttributeSet attrs) {
super(context, attrs);
+ TypedArray typedArray = context.getTheme().obtainStyledAttributes(
+ attrs, new int[]{ R.attr.backgroundProtectedStyle }, 0, 0);
+ mContext = new ContextThemeWrapper(context,
+ typedArray.getResourceId(0, R.style.BackgroundProtectedStyle));
+ typedArray.recycle();
mUnlockMethodCache = UnlockMethodCache.getInstance(context);
}
@@ -75,13 +81,11 @@
update();
}
- public void setTransientFpError(boolean transientFpError) {
- mTransientFpError = transientFpError;
- update();
- }
-
- public void setDeviceInteractive(boolean deviceInteractive) {
- mDeviceInteractive = deviceInteractive;
+ /**
+ * If we're currently presenting an authentication error message.
+ */
+ public void setTransientBiometricsError(boolean transientBiometricsError) {
+ mTransientBiometricsError = transientBiometricsError;
update();
}
@@ -106,21 +110,14 @@
public void update(boolean force) {
int state = getState();
- boolean anyFingerprintIcon = state == STATE_FINGERPRINT || state == STATE_FINGERPRINT_ERROR;
- mHasFaceUnlockIcon = state == STATE_FACE_UNLOCK;
- if (state != mLastState || mDeviceInteractive != mLastDeviceInteractive
- || mScreenOn != mLastScreenOn || force) {
- int iconAnimRes =
- getAnimationResForTransition(mLastState, state, mLastDeviceInteractive,
- mDeviceInteractive, mLastScreenOn, mScreenOn);
+ boolean anyFingerprintState = state == STATE_FINGERPRINT
+ || state == STATE_BIOMETRICS_ERROR;
+ mIsFaceUnlockState = state == STATE_FACE_UNLOCK;
+ if (state != mLastState || mLastDozing == mDozing || mLastPulsing == mPulsing
+ || mLastScreenOn != mScreenOn || force) {
+ int iconAnimRes = getAnimationResForTransition(mLastState, state, mLastPulsing,
+ mPulsing, mLastDozing, mDozing);
boolean isAnim = iconAnimRes != -1;
- if (iconAnimRes == R.drawable.lockscreen_fingerprint_draw_off_animation) {
- anyFingerprintIcon = true;
- } else if (iconAnimRes == R.drawable.trusted_state_to_error_animation) {
- anyFingerprintIcon = true;
- } else if (iconAnimRes == R.drawable.error_to_trustedstate_animation) {
- anyFingerprintIcon = true;
- }
Drawable icon;
if (isAnim) {
@@ -128,7 +125,7 @@
icon = mContext.getDrawable(iconAnimRes);
} else {
// Load the static icon resource based on the current state.
- icon = getIconForState(state, mScreenOn, mDeviceInteractive);
+ icon = getIconForState(state);
}
final AnimatedVectorDrawable animation = icon instanceof AnimatedVectorDrawable
@@ -136,18 +133,18 @@
: null;
setImageDrawable(icon, false);
updateDarkTint();
- if (mHasFaceUnlockIcon) {
+ if (mIsFaceUnlockState) {
announceForAccessibility(getContext().getString(
R.string.accessibility_scanning_face));
}
- mHasFingerPrintIcon = anyFingerprintIcon;
+ mHasFingerPrintState = anyFingerprintState;
if (animation != null && isAnim) {
animation.forceAnimationOnUI();
animation.start();
}
- if (iconAnimRes == R.drawable.lockscreen_fingerprint_draw_off_animation) {
+ if (isAnim && !mLastScreenOn) {
removeCallbacks(mDrawOffTimeout);
postDelayed(mDrawOffTimeout, FP_DRAW_OFF_TIMEOUT);
} else {
@@ -155,8 +152,9 @@
}
mLastState = state;
- mLastDeviceInteractive = mDeviceInteractive;
mLastScreenOn = mScreenOn;
+ mLastDozing = mDozing;
+ mLastPulsing = mPulsing;
}
setVisibility(mDozing && !mPulsing ? GONE : VISIBLE);
@@ -167,11 +165,11 @@
if (mAccessibilityController == null) {
return;
}
+ boolean canLock = mUnlockMethodCache.isMethodSecure()
+ && mUnlockMethodCache.canSkipBouncer();
boolean clickToUnlock = mAccessibilityController.isAccessibilityEnabled();
- boolean clickToForceLock = mUnlockMethodCache.isTrustManaged()
- && !clickToUnlock;
- boolean longClickToForceLock = mUnlockMethodCache.isTrustManaged()
- && !clickToForceLock;
+ boolean clickToForceLock = canLock && !clickToUnlock;
+ boolean longClickToForceLock = canLock && !clickToForceLock;
setClickable(clickToForceLock || clickToUnlock);
setLongClickable(longClickToForceLock);
setFocusable(mAccessibilityController.isAccessibilityEnabled());
@@ -180,7 +178,7 @@
@Override
public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {
super.onInitializeAccessibilityNodeInfo(info);
- if (mHasFingerPrintIcon) {
+ if (mHasFingerPrintState) {
AccessibilityNodeInfo.AccessibilityAction unlock
= new AccessibilityNodeInfo.AccessibilityAction(
AccessibilityNodeInfo.ACTION_CLICK,
@@ -188,7 +186,7 @@
info.addAction(unlock);
info.setHintText(getContext().getString(
R.string.accessibility_waiting_for_fingerprint));
- } else if (mHasFaceUnlockIcon){
+ } else if (mIsFaceUnlockState) {
//Avoid 'button' to be spoken for scanning face
info.setClassName(LockIcon.class.getName());
info.setContentDescription(getContext().getString(
@@ -200,26 +198,24 @@
mAccessibilityController = accessibilityController;
}
- private Drawable getIconForState(int state, boolean screenOn, boolean deviceInteractive) {
+ private Drawable getIconForState(int state) {
int iconRes;
switch (state) {
case STATE_FINGERPRINT:
case STATE_LOCKED:
- iconRes = R.drawable.ic_lock;
+ case STATE_FACE_UNLOCK:
+ iconRes = com.android.internal.R.drawable.ic_lock_24dp;
break;
case STATE_LOCK_OPEN:
if (mUnlockMethodCache.isTrustManaged() && mUnlockMethodCache.isTrusted()
&& mUserAvatarIcon != null) {
return mUserAvatarIcon;
} else {
- iconRes = R.drawable.ic_lock_open;
+ iconRes = com.android.internal.R.drawable.ic_lock_open_24dp;
}
break;
- case STATE_FACE_UNLOCK:
- iconRes = R.drawable.ic_face_unlock;
- break;
- case STATE_FINGERPRINT_ERROR:
- iconRes = R.drawable.ic_fingerprint_error;
+ case STATE_BIOMETRICS_ERROR:
+ iconRes = com.android.internal.R.drawable.ic_auth_error;
break;
default:
throw new IllegalArgumentException();
@@ -229,36 +225,36 @@
}
private int getAnimationResForTransition(int oldState, int newState,
- boolean oldDeviceInteractive, boolean deviceInteractive,
- boolean oldScreenOn, boolean screenOn) {
- if (oldState == STATE_FINGERPRINT && newState == STATE_FINGERPRINT_ERROR) {
- return R.drawable.lockscreen_fingerprint_fp_to_error_state_animation;
- } else if (oldState == STATE_LOCK_OPEN && newState == STATE_FINGERPRINT_ERROR) {
- return R.drawable.trusted_state_to_error_animation;
- } else if (oldState == STATE_FINGERPRINT_ERROR && newState == STATE_LOCK_OPEN) {
- return R.drawable.error_to_trustedstate_animation;
- } else if (oldState == STATE_FINGERPRINT_ERROR && newState == STATE_FINGERPRINT) {
- return R.drawable.lockscreen_fingerprint_error_state_to_fp_animation;
- } else if (oldState == STATE_FINGERPRINT && newState == STATE_LOCK_OPEN
- && !mUnlockMethodCache.isTrusted()) {
- return R.drawable.lockscreen_fingerprint_draw_off_animation;
- } else if (newState == STATE_FINGERPRINT && (!oldScreenOn && screenOn && deviceInteractive
- || screenOn && !oldDeviceInteractive && deviceInteractive)) {
- return R.drawable.lockscreen_fingerprint_draw_on_animation;
- } else {
- return -1;
+ boolean wasPulsing, boolean pulsing,
+ boolean wasDozing, boolean dozing) {
+
+ boolean isError = newState == STATE_BIOMETRICS_ERROR;
+ boolean isUnlocked = newState == STATE_LOCK_OPEN;
+ boolean isLocked = !isUnlocked;
+ boolean wasUnlocked = oldState == STATE_LOCK_OPEN;
+
+ if (isError) {
+ return com.android.internal.R.anim.lock_to_error;
+ } else if (isUnlocked) {
+ return com.android.internal.R.anim.lock_unlock;
+ } else if (wasUnlocked && isLocked && mScreenOn) {
+ return com.android.internal.R.anim.lock_lock;
+ } else if (isLocked && (!wasPulsing && pulsing || wasDozing && !dozing)) {
+ return com.android.internal.R.anim.lock_in;
}
+ return -1;
}
private int getState() {
KeyguardUpdateMonitor updateMonitor = KeyguardUpdateMonitor.getInstance(mContext);
boolean fingerprintRunning = updateMonitor.isFingerprintDetectionRunning();
boolean unlockingAllowed = updateMonitor.isUnlockingWithBiometricAllowed();
- if (mTransientFpError) {
- return STATE_FINGERPRINT_ERROR;
+ if (mTransientBiometricsError) {
+ return STATE_BIOMETRICS_ERROR;
} else if (mUnlockMethodCache.canSkipBouncer()) {
return STATE_LOCK_OPEN;
- } else if (mUnlockMethodCache.isFaceUnlockRunning()) {
+ } else if (mUnlockMethodCache.isFaceUnlockRunning()
+ || updateMonitor.isFaceDetectionRunning()) {
return STATE_FACE_UNLOCK;
} else if (fingerprintRunning && unlockingAllowed) {
return STATE_FINGERPRINT;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarEdgePanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarEdgePanel.java
new file mode 100644
index 0000000..dae4da7
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarEdgePanel.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2019 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.statusbar.phone;
+
+import android.annotation.NonNull;
+import android.content.Context;
+import android.graphics.PixelFormat;
+import android.view.View;
+import android.view.WindowManager;
+
+import com.android.systemui.R;
+
+public class NavigationBarEdgePanel extends View {
+ private static final String TAG = "NavigationBarEdgePanel";
+
+ public static NavigationBarEdgePanel create(@NonNull Context context, int width, int height,
+ int gravity) {
+ final WindowManager.LayoutParams lp = new WindowManager.LayoutParams(width, height,
+ WindowManager.LayoutParams.TYPE_NAVIGATION_BAR_PANEL,
+ WindowManager.LayoutParams.FLAG_TOUCHABLE_WHEN_WAKING
+ | WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE
+ | WindowManager.LayoutParams.FLAG_NOT_TOUCH_MODAL
+ | WindowManager.LayoutParams.FLAG_SPLIT_TOUCH,
+ PixelFormat.TRANSLUCENT);
+ lp.gravity = gravity;
+ lp.setTitle(TAG + context.getDisplayId());
+ lp.accessibilityTitle = context.getString(R.string.nav_bar_edge_panel);
+ lp.windowAnimations = 0;
+ NavigationBarEdgePanel panel = new NavigationBarEdgePanel(context);
+ panel.setLayoutParams(lp);
+ return panel;
+ }
+
+ private NavigationBarEdgePanel(Context context) {
+ super(context);
+ }
+
+ public void setWindowFlag(int flags, boolean enable) {
+ WindowManager.LayoutParams lp = (WindowManager.LayoutParams) getLayoutParams();
+ if (lp == null || enable == ((lp.flags & flags) != 0)) {
+ return;
+ }
+ if (enable) {
+ lp.flags |= flags;
+ } else {
+ lp.flags &= ~flags;
+ }
+ updateLayout(lp);
+ }
+
+ public void setDimensions(int width, int height) {
+ final WindowManager.LayoutParams lp = (WindowManager.LayoutParams) getLayoutParams();
+ if (lp.width != width || lp.height != height) {
+ lp.width = width;
+ lp.height = height;
+ updateLayout(lp);
+ }
+ }
+
+ private void updateLayout(WindowManager.LayoutParams lp) {
+ WindowManager wm = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
+ wm.updateViewLayout(this, lp);
+ }
+}
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 02683c1..651670c 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java
@@ -18,6 +18,8 @@
import static android.view.MotionEvent.ACTION_DOWN;
import static android.view.WindowManagerPolicyConstants.NAV_BAR_INVALID;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_LEFT;
+import static android.view.WindowManagerPolicyConstants.NAV_BAR_RIGHT;
import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_DISABLE_QUICK_SCRUB;
import static com.android.systemui.shared.system.NavigationBarCompat.FLAG_SHOW_OVERVIEW_BUTTON;
@@ -35,6 +37,8 @@
import android.animation.TimeInterpolator;
import android.animation.ValueAnimator;
import android.annotation.DrawableRes;
+import android.annotation.IntDef;
+import android.annotation.SuppressLint;
import android.app.StatusBarManager;
import android.content.Context;
import android.content.res.Configuration;
@@ -51,6 +55,7 @@
import android.util.Slog;
import android.util.SparseArray;
import android.view.Display;
+import android.view.Gravity;
import android.view.MotionEvent;
import android.view.Surface;
import android.view.View;
@@ -87,12 +92,21 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
import java.util.function.Consumer;
public class NavigationBarView extends FrameLayout implements PluginListener<NavGesture> {
final static boolean DEBUG = false;
final static String TAG = "StatusBar/NavBarView";
+ @Retention(RetentionPolicy.SOURCE)
+ @IntDef({WINDOW_TARGET_BOTTOM, WINDOW_TARGET_LEFT, WINDOW_TARGET_RIGHT})
+ public @interface WindowTarget{}
+ public static final int WINDOW_TARGET_BOTTOM = 0;
+ public static final int WINDOW_TARGET_LEFT = 1;
+ public static final int WINDOW_TARGET_RIGHT = 2;
+
// slippery nav bar when everything is disabled, e.g. during setup
final static boolean SLIPPERY_WHEN_DISABLED = true;
@@ -109,6 +123,7 @@
int mNavigationIconHints = 0;
private @NavigationBarCompat.HitTarget int mDownHitTarget = HIT_TARGET_NONE;
+ private @WindowTarget int mWindowHitTarget = WINDOW_TARGET_BOTTOM;
private Rect mHomeButtonBounds = new Rect();
private Rect mBackButtonBounds = new Rect();
private Rect mRecentsButtonBounds = new Rect();
@@ -160,6 +175,9 @@
private NavigationAssistantAction mAssistantAction;
private NavigationNotificationPanelAction mNotificationPanelAction;
+ private NavigationBarEdgePanel mLeftEdgePanel;
+ private NavigationBarEdgePanel mRightEdgePanel;
+
/**
* Helper that is responsible for showing the right toast when a disallowed activity operation
* occurred. In pinned mode, we show instructions on how to break out of this mode, whilst in
@@ -222,6 +240,18 @@
}
};
+ private final OnTouchListener mEdgePanelTouchListener = new OnTouchListener() {
+ @SuppressLint("ClickableViewAccessibility")
+ @Override
+ public boolean onTouch(View v, MotionEvent event) {
+ if (event.getActionMasked() == ACTION_DOWN) {
+ mWindowHitTarget = v == mLeftEdgePanel ? WINDOW_TARGET_LEFT : WINDOW_TARGET_RIGHT;
+ mDownHitTarget = HIT_TARGET_NONE;
+ }
+ return mGestureHelper.onTouchEvent(event);
+ }
+ };
+
private class H extends Handler {
public void handleMessage(Message m) {
switch (m.what) {
@@ -297,6 +327,16 @@
mColorAdaptionController.end();
}
}
+
+ @Override
+ public void onEdgeSensitivityChanged(int width, int height) {
+ if (mLeftEdgePanel != null) {
+ mLeftEdgePanel.setDimensions(width, height);
+ }
+ if (mRightEdgePanel != null) {
+ mRightEdgePanel.setDimensions(width, height);
+ }
+ }
};
public NavigationBarView(Context context, AttributeSet attrs) {
@@ -433,6 +473,7 @@
int x = (int) event.getX();
int y = (int) event.getY();
mDownHitTarget = HIT_TARGET_NONE;
+ mWindowHitTarget = WINDOW_TARGET_BOTTOM;
if (deadZoneConsumed) {
mDownHitTarget = HIT_TARGET_DEAD_ZONE;
} else if (getBackButton().isVisible() && mBackButtonBounds.contains(x, y)) {
@@ -483,6 +524,10 @@
return mDownHitTarget;
}
+ public @WindowTarget int getWindowTarget() {
+ return mWindowHitTarget;
+ }
+
public void abortCurrentGesture() {
getHomeButton().abortCurrentGesture();
}
@@ -837,24 +882,32 @@
}
private void setSlippery(boolean slippery) {
- boolean changed = false;
+ setWindowFlag(WindowManager.LayoutParams.FLAG_SLIPPERY, slippery);
+ }
+
+ public void setWindowTouchable(boolean flag) {
+ setWindowFlag(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, !flag);
+ if (mLeftEdgePanel != null) {
+ mLeftEdgePanel.setWindowFlag(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, !flag);
+ }
+ if (mRightEdgePanel != null) {
+ mRightEdgePanel.setWindowFlag(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE, !flag);
+ }
+ }
+
+ private void setWindowFlag(int flags, boolean enable) {
final ViewGroup navbarView = ((ViewGroup) getParent());
- final WindowManager.LayoutParams lp = (WindowManager.LayoutParams) navbarView
- .getLayoutParams();
- if (lp == null) {
+ WindowManager.LayoutParams lp = (WindowManager.LayoutParams) navbarView.getLayoutParams();
+ if (lp == null || enable == ((lp.flags & flags) != 0)) {
return;
}
- if (slippery && (lp.flags & WindowManager.LayoutParams.FLAG_SLIPPERY) == 0) {
- lp.flags |= WindowManager.LayoutParams.FLAG_SLIPPERY;
- changed = true;
- } else if (!slippery && (lp.flags & WindowManager.LayoutParams.FLAG_SLIPPERY) != 0) {
- lp.flags &= ~WindowManager.LayoutParams.FLAG_SLIPPERY;
- changed = true;
+ if (enable) {
+ lp.flags |= flags;
+ } else {
+ lp.flags &= ~flags;
}
- if (changed) {
- WindowManager wm = (WindowManager)getContext().getSystemService(Context.WINDOW_SERVICE);
- wm.updateViewLayout(navbarView, lp);
- }
+ WindowManager wm = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
+ wm.updateViewLayout(navbarView, lp);
}
public void setMenuVisibility(final boolean show) {
@@ -1016,6 +1069,17 @@
} catch (RemoteException e) {
Slog.e(TAG, "Failed to get nav bar position.", e);
}
+
+ // For landscape, hide the panel that would interfere with navigation bar layout
+ if (mLeftEdgePanel != null && mRightEdgePanel != null) {
+ mLeftEdgePanel.setVisibility(VISIBLE);
+ mRightEdgePanel.setVisibility(VISIBLE);
+ if (navBarPos == NAV_BAR_LEFT) {
+ mLeftEdgePanel.setVisibility(GONE);
+ } else if (navBarPos == NAV_BAR_RIGHT) {
+ mRightEdgePanel.setVisibility(GONE);
+ }
+ }
mGestureHelper.setBarState(isRtl, navBarPos);
}
@@ -1142,6 +1206,21 @@
NavGesture.class, false /* Only one */);
setUpSwipeUpOnboarding(isQuickStepSwipeUpEnabled());
mColorAdaptionController.start();
+
+ if (mPrototypeController.isEnabled()) {
+ WindowManager wm = (WindowManager) getContext()
+ .getSystemService(Context.WINDOW_SERVICE);
+ int width = mPrototypeController.getEdgeSensitivityWidth();
+ int height = mPrototypeController.getEdgeSensitivityHeight();
+ mLeftEdgePanel = NavigationBarEdgePanel.create(getContext(), width, height,
+ Gravity.START | Gravity.BOTTOM);
+ mRightEdgePanel = NavigationBarEdgePanel.create(getContext(), width, height,
+ Gravity.END | Gravity.BOTTOM);
+ mLeftEdgePanel.setOnTouchListener(mEdgePanelTouchListener);
+ mRightEdgePanel.setOnTouchListener(mEdgePanelTouchListener);
+ wm.addView(mLeftEdgePanel, mLeftEdgePanel.getLayoutParams());
+ wm.addView(mRightEdgePanel, mRightEdgePanel.getLayoutParams());
+ }
}
@Override
@@ -1157,6 +1236,17 @@
for (int i = 0; i < mButtonDispatchers.size(); ++i) {
mButtonDispatchers.valueAt(i).onDestroy();
}
+
+ if (mPrototypeController.isEnabled()) {
+ WindowManager wm = (WindowManager) getContext()
+ .getSystemService(Context.WINDOW_SERVICE);
+ if (mLeftEdgePanel != null) {
+ wm.removeView(mLeftEdgePanel);
+ }
+ if (mRightEdgePanel != null) {
+ wm.removeView(mRightEdgePanel);
+ }
+ }
}
private void setUpSwipeUpOnboarding(boolean connectedToOverviewProxy) {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationGestureAction.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationGestureAction.java
index 39fbbb1..eca14eb 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationGestureAction.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationGestureAction.java
@@ -20,12 +20,10 @@
import static android.view.WindowManagerPolicyConstants.NAV_BAR_RIGHT;
import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_NONE;
-import static com.android.systemui.statusbar.phone.NavigationPrototypeController.PROTOTYPE_ENABLED;
import android.annotation.NonNull;
import android.content.Context;
import android.graphics.Canvas;
-import android.provider.Settings;
import android.view.MotionEvent;
import com.android.systemui.recents.OverviewProxyService;
@@ -34,10 +32,6 @@
* A gesture action that would be triggered and reassigned by {@link QuickStepController}
*/
public abstract class NavigationGestureAction {
- private static final String ENABLE_TASK_STABILIZER_FLAG = "ENABLE_TASK_STABILIZER";
-
- static private boolean sLastTaskStabilizationFlag;
-
protected final NavigationBarView mNavigationBarView;
protected final OverviewProxyService mProxySender;
@@ -50,9 +44,6 @@
@NonNull OverviewProxyService service) {
mNavigationBarView = navigationBarView;
mProxySender = service;
- sLastTaskStabilizationFlag = Settings.Global.getInt(
- mNavigationBarView.getContext().getContentResolver(),
- ENABLE_TASK_STABILIZER_FLAG, 0) != 0;
}
/**
@@ -82,15 +73,6 @@
*/
public void startGesture(MotionEvent event) {
mIsActive = true;
-
- // Tell launcher that this action requires a stable task list or not
- boolean flag = requiresStableTaskList();
- if (getGlobalBoolean(PROTOTYPE_ENABLED) && flag != sLastTaskStabilizationFlag) {
- Settings.Global.putInt(mNavigationBarView.getContext().getContentResolver(),
- ENABLE_TASK_STABILIZER_FLAG, flag ? 1 : 0);
- sLastTaskStabilizationFlag = flag;
- }
-
onGestureStart(event);
}
@@ -163,13 +145,6 @@
*/
public abstract boolean isEnabled();
- /**
- * @return action requires a stable task list from launcher
- */
- protected boolean requiresStableTaskList() {
- return false;
- }
-
protected void onDarkIntensityChange(float intensity) {
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationPrototypeController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationPrototypeController.java
index f4f86eb..8421e23 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationPrototypeController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationPrototypeController.java
@@ -18,6 +18,7 @@
import android.annotation.IntDef;
import android.content.Context;
+import android.content.res.Resources;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
@@ -34,10 +35,14 @@
public class NavigationPrototypeController extends ContentObserver {
private static final String HIDE_BACK_BUTTON_SETTING = "quickstepcontroller_hideback";
private static final String HIDE_HOME_BUTTON_SETTING = "quickstepcontroller_hidehome";
+ private static final String PROTOTYPE_ENABLED = "prototype_enabled";
+ private static final String EDGE_SENSITIVITY_HEIGHT_SETTING =
+ "quickstepcontroller_edge_height_sensitivity";
+ public static final String EDGE_SENSITIVITY_WIDTH_SETTING =
+ "quickstepcontroller_edge_width_sensitivity";
private final String GESTURE_MATCH_SETTING = "quickstepcontroller_gesture_match_map";
public static final String NAV_COLOR_ADAPT_ENABLE_SETTING = "navbar_color_adapt_enable";
- public static final String PROTOTYPE_ENABLED = "prototype_enabled";
@Retention(RetentionPolicy.SOURCE)
@IntDef({ACTION_DEFAULT, ACTION_QUICKSTEP, ACTION_QUICKSCRUB, ACTION_BACK,
@@ -80,6 +85,8 @@
registerObserver(HIDE_HOME_BUTTON_SETTING);
registerObserver(GESTURE_MATCH_SETTING);
registerObserver(NAV_COLOR_ADAPT_ENABLE_SETTING);
+ registerObserver(EDGE_SENSITIVITY_WIDTH_SETTING);
+ registerObserver(EDGE_SENSITIVITY_HEIGHT_SETTING);
}
/**
@@ -107,10 +114,26 @@
} else if (path.endsWith(NAV_COLOR_ADAPT_ENABLE_SETTING)) {
mListener.onColorAdaptChanged(
NavBarTintController.isEnabled(mContext));
+ } else if (path.endsWith(EDGE_SENSITIVITY_WIDTH_SETTING)
+ || path.endsWith(EDGE_SENSITIVITY_HEIGHT_SETTING)) {
+ mListener.onEdgeSensitivityChanged(getEdgeSensitivityWidth(),
+ getEdgeSensitivityHeight());
}
}
}
+ public int getEdgeSensitivityWidth() {
+ return convertDpToPixel(getGlobalInt(EDGE_SENSITIVITY_WIDTH_SETTING, 0));
+ }
+
+ public int getEdgeSensitivityHeight() {
+ return convertDpToPixel(getGlobalInt(EDGE_SENSITIVITY_HEIGHT_SETTING, 0));
+ }
+
+ public boolean isEnabled() {
+ return getGlobalBool(PROTOTYPE_ENABLED, false);
+ }
+
/**
* Retrieve the action map to apply to the quick step controller
* @return an action map
@@ -145,15 +168,24 @@
return Settings.Global.getInt(mContext.getContentResolver(), name, defaultVal ? 1 : 0) == 1;
}
+ private int getGlobalInt(String name, int defaultVal) {
+ return Settings.Global.getInt(mContext.getContentResolver(), name, defaultVal);
+ }
+
private void registerObserver(String name) {
mContext.getContentResolver()
.registerContentObserver(Settings.Global.getUriFor(name), false, this);
}
+ private static int convertDpToPixel(float dp) {
+ return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
+ }
+
public interface OnPrototypeChangedListener {
void onGestureRemap(@GestureAction int[] actions);
void onBackButtonVisibilityChanged(boolean visible);
void onHomeButtonVisibilityChanged(boolean visible);
void onColorAdaptChanged(boolean enabled);
+ void onEdgeSensitivityChanged(int width, int height);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
index 711b08e..a9727c9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java
@@ -1800,11 +1800,9 @@
|| mBarState == StatusBarState.SHADE_LOCKED) {
boolean active = getMaxPanelHeight() - getExpandedHeight() > mUnlockMoveDistance;
KeyguardAffordanceView lockIcon = mKeyguardBottomArea.getLockIcon();
- if (active && !mUnlockIconActive && mTracking) {
- lockIcon.setImageAlpha(1.0f, true, 150, Interpolators.FAST_OUT_LINEAR_IN, null);
- } else if (!active && mUnlockIconActive && mTracking) {
- lockIcon.setImageAlpha(lockIcon.getRestingAlpha(), true /* animate */,
- 150, Interpolators.FAST_OUT_LINEAR_IN, null);
+ if (active != mUnlockIconActive && mTracking) {
+ lockIcon.setImageAlpha(lockIcon.getRestingAlpha(), true, 150,
+ Interpolators.FAST_OUT_LINEAR_IN, null);
}
mUnlockIconActive = active;
}
@@ -2015,7 +2013,6 @@
|| mBarState == StatusBarState.SHADE_LOCKED)) {
KeyguardAffordanceView lockIcon = mKeyguardBottomArea.getLockIcon();
lockIcon.setImageAlpha(0.0f, true, 100, Interpolators.FAST_OUT_LINEAR_IN, null);
- lockIcon.setImageScale(2.0f, true, 100, Interpolators.FAST_OUT_LINEAR_IN);
}
}
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepAction.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepAction.java
index 1999f9a..b18b79e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepAction.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepAction.java
@@ -47,10 +47,6 @@
return mNavigationBarView.isQuickStepSwipeUpEnabled();
}
- protected boolean requiresStableTaskList() {
- return true;
- }
-
@Override
public void onGestureStart(MotionEvent event) {
try {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java
index d5d283c..84f1cef 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickStepController.java
@@ -28,9 +28,12 @@
import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_HOME;
import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_NONE;
import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_OVERVIEW;
+import static com.android.systemui.statusbar.phone.NavigationBarView.WINDOW_TARGET_BOTTOM;
+import static com.android.systemui.statusbar.phone.NavigationPrototypeController.EDGE_SENSITIVITY_WIDTH_SETTING;
import android.annotation.Nullable;
import android.content.Context;
+import android.content.res.Resources;
import android.graphics.Canvas;
import android.graphics.Matrix;
import android.graphics.Rect;
@@ -42,12 +45,9 @@
import android.view.InputDevice;
import android.view.MotionEvent;
import android.view.View;
-import android.view.ViewGroup;
+import android.view.ViewConfiguration;
import android.view.ViewPropertyAnimator;
-import android.view.WindowManager;
-import android.view.WindowManager.LayoutParams;
-
import com.android.systemui.Dependency;
import com.android.systemui.Interpolators;
import com.android.systemui.R;
@@ -72,6 +72,7 @@
/** Experiment to swipe home button left to execute a back key press */
private static final String HIDE_BACK_BUTTON_PROP = "quickstepcontroller_hideback";
private static final String ENABLE_CLICK_THROUGH_NAV_PROP = "quickstepcontroller_clickthrough";
+ private static final String GESTURE_REGION_THRESHOLD_SETTING = "gesture_region_threshold";
private static final long BACK_BUTTON_FADE_IN_ALPHA = 150;
private static final long CLICK_THROUGH_TAP_DELAY = 70;
private static final long CLICK_THROUGH_TAP_RESET_DELAY = 100;
@@ -109,10 +110,10 @@
private float mMaxDragLimit;
private float mMinDragLimit;
private float mDragDampeningFactor;
- private float mEdgeSwipeThreshold;
private boolean mClickThroughPressed;
private float mClickThroughPressX;
private float mClickThroughPressY;
+ private int mGestureRegionThreshold;
private NavigationGestureAction mCurrentAction;
private NavigationGestureAction[] mGestureActions = new NavigationGestureAction[MAX_GESTURES];
@@ -139,7 +140,7 @@
};
private final Runnable mClickThroughResetTap = () -> {
- setWindowTouchable(true);
+ mNavigationBarView.setWindowTouchable(true);
mClickThroughPressed = false;
};
@@ -210,7 +211,8 @@
// The same down event was just sent on intercept and therefore can be ignored here
final boolean ignoreProxyDownEvent = event.getAction() == MotionEvent.ACTION_DOWN
- && mOverviewEventSender.getProxy() != null;
+ && mOverviewEventSender.getProxy() != null
+ && mNavigationBarView.getWindowTarget() == WINDOW_TARGET_BOTTOM;
return ignoreProxyDownEvent || handleTouchEvent(event);
}
@@ -268,12 +270,15 @@
mNavigationBarView.transformMatrixToLocal(mTransformLocalMatrix);
mAllowGestureDetection = true;
mNotificationsVisibleOnDown = !mNavigationBarView.isNotificationsFullyCollapsed();
- mEdgeSwipeThreshold = mContext.getResources()
- .getDimensionPixelSize(R.dimen.navigation_bar_edge_swipe_threshold);
+ final int defaultRegionThreshold = mContext.getResources()
+ .getDimensionPixelOffset(R.dimen.navigation_bar_default_edge_width);
+ mGestureRegionThreshold = convertDpToPixel(getIntGlobalSetting(mContext,
+ EDGE_SENSITIVITY_WIDTH_SETTING, defaultRegionThreshold));
break;
}
case MotionEvent.ACTION_MOVE: {
- if (!mAllowGestureDetection) {
+ if (!mAllowGestureDetection
+ || mNavigationBarView.getWindowTarget() != WINDOW_TARGET_BOTTOM) {
break;
}
int x = (int) event.getX();
@@ -330,18 +335,12 @@
} else if (exceededSwipeHorizontalTouchSlop) {
if (mDragHPositive ? (posH < touchDownH) : (posH > touchDownH)) {
// Swiping left (rtl) gesture
- int index = mGestureActions[ACTION_SWIPE_LEFT_FROM_EDGE_INDEX] != null
- && isEdgeSwipeAlongNavBar(touchDownH, !mDragHPositive)
- ? ACTION_SWIPE_LEFT_FROM_EDGE_INDEX : ACTION_SWIPE_LEFT_INDEX;
- tryToStartGesture(mGestureActions[index], true /* alignedWithNavBar */,
- event);
+ tryToStartGesture(mGestureActions[ACTION_SWIPE_LEFT_INDEX],
+ true /* alignedWithNavBar */, event);
} else {
// Swiping right (ltr) gesture
- int index = mGestureActions[ACTION_SWIPE_RIGHT_FROM_EDGE_INDEX] != null
- && isEdgeSwipeAlongNavBar(touchDownH, mDragHPositive)
- ? ACTION_SWIPE_RIGHT_FROM_EDGE_INDEX : ACTION_SWIPE_RIGHT_INDEX;
- tryToStartGesture(mGestureActions[index], true /* alignedWithNavBar */,
- event);
+ tryToStartGesture(mGestureActions[ACTION_SWIPE_RIGHT_INDEX],
+ true /* alignedWithNavBar */, event);
}
}
}
@@ -354,24 +353,34 @@
case MotionEvent.ACTION_UP:
if (mCurrentAction != null) {
mCurrentAction.endGesture();
- } else if (action == MotionEvent.ACTION_UP
- && getBoolGlobalSetting(mContext, ENABLE_CLICK_THROUGH_NAV_PROP)
- && !mClickThroughPressed) {
- // Enable click through functionality where no gesture has been detected and not
- // passed the drag slop so inject a touch event at the same location
- // after making the navigation bar window untouchable. After a some time, the
- // navigation bar will be able to take input events again
- float diffX = Math.abs(event.getX() - mTouchDownX);
- float diffY = Math.abs(event.getY() - mTouchDownY);
+ } else if (action == MotionEvent.ACTION_UP) {
+ if (canTriggerEdgeSwipe(event)) {
+ int index = mNavigationBarView.getWindowTarget() == NAV_BAR_LEFT
+ ? ACTION_SWIPE_RIGHT_FROM_EDGE_INDEX
+ : ACTION_SWIPE_LEFT_FROM_EDGE_INDEX;
+ tryToStartGesture(mGestureActions[index], false /* alignedWithNavBar */,
+ event);
+ if (mCurrentAction != null) {
+ mCurrentAction.endGesture();
+ }
+ } else if (getBoolGlobalSetting(mContext, ENABLE_CLICK_THROUGH_NAV_PROP)
+ && !mClickThroughPressed) {
+ // Enable click through functionality where no gesture has been detected and
+ // not passed the drag slop so inject a touch event at the same location
+ // after making the navigation bar window untouchable. After a some time,
+ // the navigation bar will be able to take input events again
+ float diffX = Math.abs(event.getX() - mTouchDownX);
+ float diffY = Math.abs(event.getY() - mTouchDownY);
- if ((diffX <= NavigationBarCompat.getQuickStepDragSlopPx()
- && diffY <= NavigationBarCompat.getQuickStepDragSlopPx())) {
- setWindowTouchable(false);
- mClickThroughPressX = event.getRawX();
- mClickThroughPressY = event.getRawY();
- mClickThroughPressed = true;
- mNavigationBarView.postDelayed(mClickThroughSendTap,
- CLICK_THROUGH_TAP_DELAY);
+ if ((diffX <= NavigationBarCompat.getQuickStepDragSlopPx()
+ && diffY <= NavigationBarCompat.getQuickStepDragSlopPx())) {
+ mNavigationBarView.setWindowTouchable(false);
+ mClickThroughPressX = event.getRawX();
+ mClickThroughPressY = event.getRawY();
+ mClickThroughPressed = true;
+ mNavigationBarView.postDelayed(mClickThroughSendTap,
+ CLICK_THROUGH_TAP_DELAY);
+ }
}
}
@@ -403,30 +412,6 @@
return mCurrentAction != null || deadZoneConsumed;
}
- private void setWindowTouchable(boolean flag) {
- final WindowManager.LayoutParams lp = (WindowManager.LayoutParams)
- ((ViewGroup) mNavigationBarView.getParent()).getLayoutParams();
- if (flag) {
- lp.flags &= ~LayoutParams.FLAG_NOT_TOUCHABLE;
- } else {
- lp.flags |= LayoutParams.FLAG_NOT_TOUCHABLE;
- }
- final WindowManager wm = (WindowManager) mNavigationBarView.getContext()
- .getSystemService(Context.WINDOW_SERVICE);
- wm.updateViewLayout((View) mNavigationBarView.getParent(), lp);
- }
-
- private boolean isEdgeSwipeAlongNavBar(int touchDown, boolean dragPositiveDirection) {
- // Detect edge swipe from side of 0 -> threshold
- if (dragPositiveDirection) {
- return touchDown < mEdgeSwipeThreshold;
- }
- // Detect edge swipe from side of size -> (size - threshold)
- final int largeSide = isNavBarVertical()
- ? mNavigationBarView.getHeight() : mNavigationBarView.getWidth();
- return touchDown > largeSide - mEdgeSwipeThreshold;
- }
-
private void handleDragHitTarget(int position, int touchDown) {
// Drag the hit target if gesture action requires it
if (mHitTarget != null && (mGestureVerticalDragsButton || mGestureHorizontalDragsButton)) {
@@ -448,6 +433,10 @@
}
private boolean shouldProxyEvents(int action) {
+ // Do not send events for side navigation bar panels
+ if (mNavigationBarView.getWindowTarget() != WINDOW_TARGET_BOTTOM) {
+ return false;
+ }
final boolean actionValid = (mCurrentAction == null
|| !mCurrentAction.disableProxyEvents());
if (actionValid && !mIsInScreenPinning) {
@@ -619,6 +608,32 @@
}
}
+ /**
+ * To trigger an edge swipe, the user must start from the left or right edges of certain height
+ * from the bottom then past the drag slope towards the center of the screen, followed by either
+ * a timed trigger for fast swipes or distance if held on the screen longer.
+ * For time, user must swipe up quickly before the Tap Timeout (typically 100ms) and for
+ * distance, the user can drag back to cancel if the touch up has not past the threshold.
+ * @param event Touch up event
+ * @return whether or not edge swipe gesture occurs
+ */
+ private boolean canTriggerEdgeSwipe(MotionEvent event) {
+ if (mNavigationBarView.getWindowTarget() == WINDOW_TARGET_BOTTOM) {
+ return false;
+ }
+ int x = (int) event.getX();
+ int y = (int) event.getY();
+ int xDiff = Math.abs(x - mTouchDownX);
+ int yDiff = Math.abs(y - mTouchDownY);
+ final boolean exceededSwipeTouchSlop = xDiff > NavigationBarCompat.getQuickStepDragSlopPx()
+ && xDiff > yDiff;
+ if (exceededSwipeTouchSlop) {
+ long timeDiff = event.getEventTime() - event.getDownTime();
+ return xDiff > mGestureRegionThreshold || timeDiff < ViewConfiguration.getTapTimeout();
+ }
+ return false;
+ }
+
private boolean canPerformAnyAction() {
for (NavigationGestureAction action: mGestureActions) {
if (action != null && action.isEnabled()) {
@@ -684,10 +699,18 @@
return mNavBarPosition == NAV_BAR_LEFT || mNavBarPosition == NAV_BAR_RIGHT;
}
+ private static int convertDpToPixel(float dp) {
+ return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
+ }
+
static boolean getBoolGlobalSetting(Context context, String key) {
return Settings.Global.getInt(context.getContentResolver(), key, 0) != 0;
}
+ static int getIntGlobalSetting(Context context, String key, int defaultValue) {
+ return Settings.Global.getInt(context.getContentResolver(), key, defaultValue);
+ }
+
public static boolean shouldhideBackButton(Context context) {
return getBoolGlobalSetting(context, HIDE_BACK_BUTTON_PROP);
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java
index 5be8826..e32d48d 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/bubbles/BubbleControllerTest.java
@@ -304,7 +304,7 @@
}
@Override
- public boolean shouldAutoBubble(Context c, NotificationEntry entry) {
+ public boolean shouldAutoBubbleForFlags(Context c, NotificationEntry entry) {
return entry.notification.getNotification().getBubbleMetadata() != null;
}
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyDialogBuilderTest.kt b/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyDialogBuilderTest.kt
index f163b88..b6e0d90 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyDialogBuilderTest.kt
+++ b/packages/SystemUI/tests/src/com/android/systemui/privacy/PrivacyDialogBuilderTest.kt
@@ -37,7 +37,7 @@
"Bar", TEST_UID, context))
val bar3 = PrivacyItem(Privacy.TYPE_LOCATION, PrivacyApplication(
"Bar", TEST_UID, context))
- val foo0 = PrivacyItem(Privacy.TYPE_CAMERA, PrivacyApplication(
+ val foo0 = PrivacyItem(Privacy.TYPE_MICROPHONE, PrivacyApplication(
"Foo", TEST_UID, context))
val baz1 = PrivacyItem(Privacy.TYPE_CAMERA, PrivacyApplication(
"Baz", TEST_UID, context))
@@ -50,10 +50,11 @@
assertEquals(3, list.size)
val appsList = list.map { it.first }
val typesList = list.map { it.second }
+ // List is sorted by number of types and then by types
assertEquals(listOf("Bar", "Baz", "Foo"), appsList.map { it.packageName })
assertEquals(listOf(Privacy.TYPE_CAMERA, Privacy.TYPE_LOCATION), typesList[0])
assertEquals(listOf(Privacy.TYPE_CAMERA), typesList[1])
- assertEquals(listOf(Privacy.TYPE_CAMERA), typesList[2])
+ assertEquals(listOf(Privacy.TYPE_MICROPHONE), typesList[2])
}
@Test
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java
index 9ce6ae1..a0b3420 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationEntryManagerTest.java
@@ -45,8 +45,11 @@
import android.support.test.filters.SmallTest;
import android.testing.AndroidTestingRunner;
import android.testing.TestableLooper;
+import android.util.ArraySet;
import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
+
import com.android.internal.logging.MetricsLogger;
import com.android.systemui.Dependency;
import com.android.systemui.ForegroundServiceController;
@@ -84,6 +87,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -348,28 +352,6 @@
}
@Test
- public void testRemoveNotification_blockedByLifetimeExtender() {
- com.android.systemui.util.Assert.isNotMainThread();
-
- NotificationLifetimeExtender extender = mock(NotificationLifetimeExtender.class);
- when(extender.shouldExtendLifetime(mEntry)).thenReturn(true);
-
- ArrayList<NotificationLifetimeExtender> extenders = mEntryManager.getLifetimeExtenders();
- extenders.clear();
- extenders.add(extender);
-
- mEntry.setRow(mRow);
- mEntryManager.getNotificationData().add(mEntry);
-
- mEntryManager.removeNotification(mSbn.getKey(), mRankingMap);
-
- assertNotNull(mEntryManager.getNotificationData().get(mSbn.getKey()));
- verify(extender).setShouldManageLifetime(mEntry, true /* shouldManage */);
- verify(mEntryListener, never()).onEntryRemoved(
- mEntry, null, false /* removedByUser */);
- }
-
- @Test
public void testRemoveNotification_onEntryRemoveNotFiredIfEntryDoesntExist() {
com.android.systemui.util.Assert.isNotMainThread();
@@ -453,10 +435,142 @@
assertEquals("action", mEntry.systemGeneratedSmartActions.get(0).title);
}
+ @Test
+ public void testLifetimeExtenders_ifNotificationIsRetainedItIsntRemoved() {
+ // GIVEN an entry manager with a notification
+ mEntryManager.setRowBinder(mMockedRowBinder);
+ mEntryManager.getNotificationData().add(mEntry);
+
+ // GIVEN a lifetime extender that always tries to extend lifetime
+ NotificationLifetimeExtender extender = mock(NotificationLifetimeExtender.class);
+ when(extender.shouldExtendLifetime(mEntry)).thenReturn(true);
+ mEntryManager.addNotificationLifetimeExtender(extender);
+
+ // WHEN the notification is removed
+ mEntryManager.removeNotification(mEntry.key, mRankingMap);
+
+ // THEN the extender is asked to manage the lifetime
+ verify(extender).setShouldManageLifetime(mEntry, true);
+ // THEN the notification is retained
+ assertNotNull(mEntryManager.getNotificationData().get(mSbn.getKey()));
+ verify(mEntryListener, never()).onEntryRemoved(mEntry, null, false);
+ }
+
+ @Test
+ public void testLifetimeExtenders_whenRetentionEndsNotificationIsRemoved() {
+ // GIVEN an entry manager with a notification whose life has been extended
+ mEntryManager.setRowBinder(mMockedRowBinder);
+ mEntryManager.getNotificationData().add(mEntry);
+ final FakeNotificationLifetimeExtender extender = new FakeNotificationLifetimeExtender();
+ mEntryManager.addNotificationLifetimeExtender(extender);
+ mEntryManager.removeNotification(mEntry.key, mRankingMap);
+ assertTrue(extender.isManaging(mEntry.key));
+
+ // WHEN the extender finishes its extension
+ extender.setExtendLifetimes(false);
+ extender.getCallback().onSafeToRemove(mEntry.key);
+
+ // THEN the notification is removed
+ assertNull(mEntryManager.getNotificationData().get(mSbn.getKey()));
+ verify(mEntryListener).onEntryRemoved(mEntry, null, false);
+ }
+
+ @Test
+ public void testLifetimeExtenders_whenNotificationUpdatedRetainersAreCanceled() {
+ // GIVEN an entry manager with a notification whose life has been extended
+ mEntryManager.setRowBinder(mMockedRowBinder);
+ mEntryManager.getNotificationData().add(mEntry);
+ NotificationLifetimeExtender extender = mock(NotificationLifetimeExtender.class);
+ when(extender.shouldExtendLifetime(mEntry)).thenReturn(true);
+ mEntryManager.addNotificationLifetimeExtender(extender);
+ mEntryManager.removeNotification(mEntry.key, mRankingMap);
+
+ // WHEN the notification is updated
+ mEntryManager.updateNotification(mEntry.notification, mRankingMap);
+
+ // THEN the lifetime extension is canceled
+ verify(extender).setShouldManageLifetime(mEntry, false);
+ }
+
+ @Test
+ public void testLifetimeExtenders_whenNewExtenderTakesPrecedenceOldExtenderIsCanceled() {
+ // GIVEN an entry manager with a notification
+ mEntryManager.setRowBinder(mMockedRowBinder);
+ mEntryManager.getNotificationData().add(mEntry);
+
+ // GIVEN two lifetime extenders, the first which never extends and the second which
+ // always extends
+ NotificationLifetimeExtender extender1 = mock(NotificationLifetimeExtender.class);
+ when(extender1.shouldExtendLifetime(mEntry)).thenReturn(false);
+ NotificationLifetimeExtender extender2 = mock(NotificationLifetimeExtender.class);
+ when(extender2.shouldExtendLifetime(mEntry)).thenReturn(true);
+ mEntryManager.addNotificationLifetimeExtender(extender1);
+ mEntryManager.addNotificationLifetimeExtender(extender2);
+
+ // GIVEN a notification was lifetime-extended and extender2 is managing it
+ mEntryManager.removeNotification(mEntry.key, mRankingMap);
+ verify(extender1, never()).setShouldManageLifetime(mEntry, true);
+ verify(extender2).setShouldManageLifetime(mEntry, true);
+
+ // WHEN the extender1 changes its mind and wants to extend the lifetime of the notif
+ when(extender1.shouldExtendLifetime(mEntry)).thenReturn(true);
+ mEntryManager.removeNotification(mEntry.key, mRankingMap);
+
+ // THEN extender2 stops managing the notif and extender1 starts managing it
+ verify(extender1).setShouldManageLifetime(mEntry, true);
+ verify(extender2).setShouldManageLifetime(mEntry, false);
+ }
+
private Notification.Action createAction() {
return new Notification.Action.Builder(
Icon.createWithResource(getContext(), android.R.drawable.sym_def_app_icon),
"action",
PendingIntent.getBroadcast(getContext(), 0, new Intent("Action"), 0)).build();
}
+
+ private static class FakeNotificationLifetimeExtender implements NotificationLifetimeExtender {
+ private NotificationSafeToRemoveCallback mCallback;
+ private boolean mExtendLifetimes = true;
+ private Set<String> mManagedNotifs = new ArraySet<>();
+
+ @Override
+ public void setCallback(@NonNull NotificationSafeToRemoveCallback callback) {
+ mCallback = callback;
+ }
+
+ @Override
+ public boolean shouldExtendLifetime(@NonNull NotificationEntry entry) {
+ return mExtendLifetimes;
+ }
+
+ @Override
+ public void setShouldManageLifetime(
+ @NonNull NotificationEntry entry,
+ boolean shouldManage) {
+ final boolean hasEntry = mManagedNotifs.contains(entry.key);
+ if (shouldManage) {
+ if (hasEntry) {
+ throw new RuntimeException("Already managing this entry: " + entry.key);
+ }
+ mManagedNotifs.add(entry.key);
+ } else {
+ if (!hasEntry) {
+ throw new RuntimeException("Not managing this entry: " + entry.key);
+ }
+ mManagedNotifs.remove(entry.key);
+ }
+ }
+
+ public void setExtendLifetimes(boolean extendLifetimes) {
+ mExtendLifetimes = extendLifetimes;
+ }
+
+ public NotificationSafeToRemoveCallback getCallback() {
+ return mCallback;
+ }
+
+ public boolean isManaging(String notificationKey) {
+ return mManagedNotifs.contains(notificationKey);
+ }
+ }
}
diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/QuickStepControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/QuickStepControllerTest.java
index 382dde9..dbf00a3 100644
--- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/QuickStepControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/QuickStepControllerTest.java
@@ -23,6 +23,7 @@
import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_DEAD_ZONE;
import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_HOME;
import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_NONE;
+import static com.android.systemui.statusbar.phone.NavigationBarView.WINDOW_TARGET_BOTTOM;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -63,7 +64,6 @@
public class QuickStepControllerTest extends SysuiTestCase {
private static final int NAVBAR_WIDTH = 1000;
private static final int NAVBAR_HEIGHT = 300;
- private static final int EDGE_THRESHOLD = 100;
private QuickStepController mController;
private NavigationBarView mNavigationBarView;
@@ -77,8 +77,6 @@
MockitoAnnotations.initMocks(this);
final ButtonDispatcher backButton = mock(ButtonDispatcher.class);
mResources = mock(Resources.class);
- doReturn(EDGE_THRESHOLD).when(mResources)
- .getDimensionPixelSize(R.dimen.navigation_bar_edge_swipe_threshold);
mProxyService = mock(OverviewProxyService.class);
mProxy = mock(IOverviewProxy.Stub.class);
@@ -95,6 +93,7 @@
doReturn(true).when(mNavigationBarView).isNotificationsFullyCollapsed();
doReturn(true).when(mNavigationBarView).isQuickScrubEnabled();
doReturn(HIT_TARGET_NONE).when(mNavigationBarView).getDownHitTarget();
+ doReturn(WINDOW_TARGET_BOTTOM).when(mNavigationBarView).getWindowTarget();
doReturn(backButton).when(mNavigationBarView).getBackButton();
doReturn(mResources).when(mNavigationBarView).getResources();
doReturn(mContext).when(mNavigationBarView).getContext();
@@ -196,10 +195,8 @@
NavigationGestureAction swipeDown = mockAction(true);
NavigationGestureAction swipeLeft = mockAction(true);
NavigationGestureAction swipeRight = mockAction(true);
- NavigationGestureAction swipeLeftFromEdge = mockAction(true);
- NavigationGestureAction swipeRightFromEdge = mockAction(true);
- mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight, swipeLeftFromEdge,
- swipeRightFromEdge);
+ mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight,
+ null /* leftEdgeSwipe */, null /* rightEdgeSwipe */);
// Swipe Up
assertGestureTriggersAction(swipeUp, 1, 100, 5, 1);
@@ -209,10 +206,6 @@
assertGestureTriggersAction(swipeLeft, NAVBAR_WIDTH / 2, 1, 5, 1);
// Swipe Right
assertGestureTriggersAction(swipeRight, NAVBAR_WIDTH / 2, 1, NAVBAR_WIDTH, 5);
- // Swipe Left from Edge
- assertGestureTriggersAction(swipeLeftFromEdge, NAVBAR_WIDTH, 1, 5, 1);
- // Swipe Right from Edge
- assertGestureTriggersAction(swipeRightFromEdge, 0, 1, NAVBAR_WIDTH, 5);
}
@Test
@@ -224,10 +217,8 @@
NavigationGestureAction swipeDown = mockAction(true);
NavigationGestureAction swipeLeft = mockAction(true);
NavigationGestureAction swipeRight = mockAction(true);
- NavigationGestureAction swipeLeftFromEdge = mockAction(true);
- NavigationGestureAction swipeRightFromEdge = mockAction(true);
- mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight, swipeLeftFromEdge,
- swipeRightFromEdge);
+ mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight,
+ null /* leftEdgeSwipe */, null /* rightEdgeSwipe */);
// In landscape
mController.setBarState(false /* isRTL */, NAV_BAR_RIGHT);
@@ -240,10 +231,6 @@
assertGestureTriggersAction(swipeUp, 100, 1, 5, 1);
// Swipe Right
assertGestureTriggersAction(swipeDown, 1, 1, 100, 5);
- // Swipe Up from Edge
- assertGestureTriggersAction(swipeRightFromEdge, 1, NAVBAR_WIDTH, 5, 0);
- // Swipe Down from Edge
- assertGestureTriggersAction(swipeLeftFromEdge, 0, 1, 0, NAVBAR_WIDTH);
}
@Test
@@ -256,10 +243,8 @@
NavigationGestureAction swipeDown = mockAction(true);
NavigationGestureAction swipeLeft = mockAction(true);
NavigationGestureAction swipeRight = mockAction(true);
- NavigationGestureAction swipeLeftFromEdge = mockAction(true);
- NavigationGestureAction swipeRightFromEdge = mockAction(true);
- mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight, swipeLeftFromEdge,
- swipeRightFromEdge);
+ mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight,
+ null /* leftEdgeSwipe */, null /* rightEdgeSwipe */);
// Swipe Up
assertGestureTriggersAction(swipeLeft, 1, NAVBAR_WIDTH / 2, 5, 1);
@@ -269,10 +254,6 @@
assertGestureTriggersAction(swipeDown, 100, 1, 5, 1);
// Swipe Right
assertGestureTriggersAction(swipeUp, 1, 1, 100, 5);
- // Swipe Up from Edge
- assertGestureTriggersAction(swipeLeftFromEdge, 1, NAVBAR_WIDTH, 5, 0);
- // Swipe Down from Edge
- assertGestureTriggersAction(swipeRightFromEdge, 0, 1, 0, NAVBAR_WIDTH);
}
@Test
@@ -286,10 +267,8 @@
NavigationGestureAction swipeDown = mockAction(true);
NavigationGestureAction swipeLeft = mockAction(true);
NavigationGestureAction swipeRight = mockAction(true);
- NavigationGestureAction swipeLeftFromEdge = mockAction(true);
- NavigationGestureAction swipeRightFromEdge = mockAction(true);
- mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight, swipeLeftFromEdge,
- swipeRightFromEdge);
+ mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight,
+ null /* leftEdgeSwipe */, null /* rightEdgeSwipe */);
// Swipe Up in RTL
assertGestureTriggersAction(swipeUp, 1, 100, 5, 1);
@@ -299,10 +278,6 @@
assertGestureTriggersAction(swipeRight, NAVBAR_WIDTH / 2, 1, 5, 1);
// Swipe Right in RTL
assertGestureTriggersAction(swipeLeft, NAVBAR_WIDTH / 2, 1, NAVBAR_WIDTH, 0);
- // Swipe Left from Edge
- assertGestureTriggersAction(swipeRightFromEdge, NAVBAR_WIDTH, 1, 5, 1);
- // Swipe Right from Edge
- assertGestureTriggersAction(swipeLeftFromEdge, 0, 1, NAVBAR_WIDTH, 5);
}
@Test
@@ -316,10 +291,8 @@
NavigationGestureAction swipeDown = mockAction(true);
NavigationGestureAction swipeLeft = mockAction(true);
NavigationGestureAction swipeRight = mockAction(true);
- NavigationGestureAction swipeLeftFromEdge = mockAction(true);
- NavigationGestureAction swipeRightFromEdge = mockAction(true);
- mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight, swipeLeftFromEdge,
- swipeRightFromEdge);
+ mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight,
+ null /* leftEdgeSwipe */, null /* rightEdgeSwipe */);
// Swipe Up
assertGestureTriggersAction(swipeLeft, 1, NAVBAR_WIDTH / 2, 5, 1);
@@ -329,10 +302,6 @@
assertGestureTriggersAction(swipeUp, 100, 1, 5, 1);
// Swipe Right
assertGestureTriggersAction(swipeDown, 1, 1, 100, 5);
- // Swipe Up from Edge
- assertGestureTriggersAction(swipeLeftFromEdge, 1, NAVBAR_WIDTH, 5, 0);
- // Swipe Down from Edge
- assertGestureTriggersAction(swipeRightFromEdge, 0, 1, 0, NAVBAR_WIDTH);
}
@Test
@@ -346,10 +315,8 @@
NavigationGestureAction swipeDown = mockAction(true);
NavigationGestureAction swipeLeft = mockAction(true);
NavigationGestureAction swipeRight = mockAction(true);
- NavigationGestureAction swipeLeftFromEdge = mockAction(true);
- NavigationGestureAction swipeRightFromEdge = mockAction(true);
- mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight, swipeLeftFromEdge,
- swipeRightFromEdge);
+ mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight,
+ null /* leftEdgeSwipe */, null /* rightEdgeSwipe */);
// Swipe Up
assertGestureTriggersAction(swipeRight, 1, NAVBAR_WIDTH / 2, 5, 1);
@@ -359,10 +326,6 @@
assertGestureTriggersAction(swipeDown, 100, 1, 5, 1);
// Swipe Right
assertGestureTriggersAction(swipeUp, 1, 1, 100, 5);
- // Swipe Up from Edge
- assertGestureTriggersAction(swipeRightFromEdge, 1, NAVBAR_WIDTH, 5, 0);
- // Swipe Down from Edge
- assertGestureTriggersAction(swipeLeftFromEdge, 0, 1, 0, NAVBAR_WIDTH);
}
@Test
@@ -602,25 +565,6 @@
assertGestureDragsHitTargetAllDirections(buttonView, true /* isRTL */, NAV_BAR_LEFT);
}
- @Test
- public void testNoEdgeActionsTriggerNormalActions() {
- doReturn(NAVBAR_WIDTH).when(mNavigationBarView).getWidth();
- doReturn(NAVBAR_HEIGHT).when(mNavigationBarView).getHeight();
-
- NavigationGestureAction swipeUp = mockAction(true);
- NavigationGestureAction swipeDown = mockAction(true);
- NavigationGestureAction swipeLeft = mockAction(true);
- NavigationGestureAction swipeRight = mockAction(true);
- mController.setGestureActions(swipeUp, swipeDown, swipeLeft, swipeRight,
- null /* swipeLeftFromEdgeAction */,
- null /* swipeLeftFromEdgeAction */);
-
- // Swipe Left from Edge
- assertGestureTriggersAction(swipeLeft, NAVBAR_WIDTH, 1, 5, 1);
- // Swipe Right from Edge
- assertGestureTriggersAction(swipeRight, 0, 1, NAVBAR_WIDTH, 5);
- }
-
private void assertGestureDragsHitTargetAllDirections(View buttonView, boolean isRTL,
int navPos) {
mController.setBarState(isRTL, navPos);
diff --git a/packages/VpnDialogs/res/values-en-rXC/strings.xml b/packages/VpnDialogs/res/values-en-rXC/strings.xml
index 089845a..9d010e6 100644
--- a/packages/VpnDialogs/res/values-en-rXC/strings.xml
+++ b/packages/VpnDialogs/res/values-en-rXC/strings.xml
@@ -16,21 +16,21 @@
<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">"Connection request"</string>
- <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> wants to set up a VPN connection that allows it to monitor network traffic. Only accept if you trust the source. <br /> <br /> <img src=vpn_icon /> appears at the top of your screen when VPN is active."</string>
- <string name="legacy_title" msgid="192936250066580964">"VPN is connected"</string>
- <string name="session" msgid="6470628549473641030">"Session:"</string>
- <string name="duration" msgid="3584782459928719435">"Duration:"</string>
- <string name="data_transmitted" msgid="7988167672982199061">"Sent:"</string>
- <string name="data_received" msgid="4062776929376067820">"Received:"</string>
- <string name="data_value_format" msgid="2192466557826897580">"<xliff:g id="NUMBER_0">%1$s</xliff:g> bytes / <xliff:g id="NUMBER_1">%2$s</xliff:g> packets"</string>
- <string name="always_on_disconnected_title" msgid="1906740176262776166">"Can\'t connect to always-on VPN"</string>
- <string name="always_on_disconnected_message" msgid="555634519845992917">"<xliff:g id="VPN_APP_0">%1$s</xliff:g> is set up to stay connected all the time, but it can\'t connect right now. Your phone will use a public network until it can reconnect to <xliff:g id="VPN_APP_1">%1$s</xliff:g>."</string>
- <string name="always_on_disconnected_message_lockdown" msgid="4232225539869452120">"<xliff:g id="VPN_APP">%1$s</xliff:g> is set up to stay connected all the time, but it can\'t connect right now. You won\'t have a connection until the VPN can reconnect."</string>
- <string name="always_on_disconnected_message_separator" msgid="3310614409322581371">" "</string>
- <string name="always_on_disconnected_message_settings_link" msgid="6172280302829992412">"Change VPN settings"</string>
- <string name="configure" msgid="4905518375574791375">"Configure"</string>
- <string name="disconnect" msgid="971412338304200056">"Disconnect"</string>
- <string name="open_app" msgid="3717639178595958667">"Open app"</string>
- <string name="dismiss" msgid="6192859333764711227">"Dismiss"</string>
+ <string name="prompt" msgid="3183836924226407828">"Connection request"</string>
+ <string name="warning" msgid="809658604548412033">"<xliff:g id="APP">%s</xliff:g> wants to set up a VPN connection that allows it to monitor network traffic. Only accept if you trust the source. <br /> <br /> <img src=vpn_icon /> appears at the top of your screen when VPN is active."</string>
+ <string name="legacy_title" msgid="192936250066580964">"VPN is connected"</string>
+ <string name="session" msgid="6470628549473641030">"Session:"</string>
+ <string name="duration" msgid="3584782459928719435">"Duration:"</string>
+ <string name="data_transmitted" msgid="7988167672982199061">"Sent:"</string>
+ <string name="data_received" msgid="4062776929376067820">"Received:"</string>
+ <string name="data_value_format" msgid="2192466557826897580">"<xliff:g id="NUMBER_0">%1$s</xliff:g> bytes / <xliff:g id="NUMBER_1">%2$s</xliff:g> packets"</string>
+ <string name="always_on_disconnected_title" msgid="1906740176262776166">"Can\'t connect to always-on VPN"</string>
+ <string name="always_on_disconnected_message" msgid="555634519845992917">"<xliff:g id="VPN_APP_0">%1$s</xliff:g> is set up to stay connected all the time, but it can\'t connect right now. Your phone will use a public network until it can reconnect to <xliff:g id="VPN_APP_1">%1$s</xliff:g>."</string>
+ <string name="always_on_disconnected_message_lockdown" msgid="4232225539869452120">"<xliff:g id="VPN_APP">%1$s</xliff:g> is set up to stay connected all the time, but it can\'t connect right now. You won\'t have a connection until the VPN can reconnect."</string>
+ <string name="always_on_disconnected_message_separator" msgid="3310614409322581371">" "</string>
+ <string name="always_on_disconnected_message_settings_link" msgid="6172280302829992412">"Change VPN settings"</string>
+ <string name="configure" msgid="4905518375574791375">"Configure"</string>
+ <string name="disconnect" msgid="971412338304200056">"Disconnect"</string>
+ <string name="open_app" msgid="3717639178595958667">"Open app"</string>
+ <string name="dismiss" msgid="6192859333764711227">"Dismiss"</string>
</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rXC/strings.xml b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rXC/strings.xml
index 1edef0b..8d7b3fa 100644
--- a/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationCornerOverlay/res/values-en-rXC/strings.xml
@@ -17,5 +17,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Corner cutout"</string>
+ <string name="display_cutout_emulation_overlay" msgid="1677693377327336341">"Corner cutout"</string>
</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rXC/strings.xml b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rXC/strings.xml
index ea09dde..5e2ca8b 100644
--- a/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationDoubleOverlay/res/values-en-rXC/strings.xml
@@ -17,5 +17,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Double cutout"</string>
+ <string name="display_cutout_emulation_overlay" msgid="5323179900047630217">"Double cutout"</string>
</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rXC/strings.xml b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rXC/strings.xml
index df51da4..97e9ed5 100644
--- a/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationNarrowOverlay/res/values-en-rXC/strings.xml
@@ -19,5 +19,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Narrow cutout"</string>
+ <string name="display_cutout_emulation_overlay" msgid="3947428012427075896">"Narrow cutout"</string>
</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rXC/strings.xml b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rXC/strings.xml
index 01a2d7c..cac5ca1 100644
--- a/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationTallOverlay/res/values-en-rXC/strings.xml
@@ -17,5 +17,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Tall cutout"</string>
+ <string name="display_cutout_emulation_overlay" msgid="6424539415439220018">"Tall cutout"</string>
</resources>
diff --git a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rXC/strings.xml b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rXC/strings.xml
index 83689c4..db4e03b 100644
--- a/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/DisplayCutoutEmulationWideOverlay/res/values-en-rXC/strings.xml
@@ -17,5 +17,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Wide cutout"</string>
+ <string name="display_cutout_emulation_overlay" msgid="4043478945358357737">"Wide cutout"</string>
</resources>
diff --git a/packages/overlays/ExperimentNavigationBarDefaultOverlay/res/values-en-rXC/strings.xml b/packages/overlays/ExperimentNavigationBarDefaultOverlay/res/values-en-rXC/strings.xml
index c5ed415..108ef50 100644
--- a/packages/overlays/ExperimentNavigationBarDefaultOverlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/ExperimentNavigationBarDefaultOverlay/res/values-en-rXC/strings.xml
@@ -19,5 +19,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="experiment_navigationbar_overlay" msgid="3475628315769912732">"Default Navigation Bar Experiment (48dp)"</string>
+ <string name="experiment_navigationbar_overlay" msgid="3475628315769912732">"Default Navigation Bar Experiment (48dp)"</string>
</resources>
diff --git a/packages/overlays/ExperimentNavigationBarFloatingOverlay/res/values-en-rXC/strings.xml b/packages/overlays/ExperimentNavigationBarFloatingOverlay/res/values-en-rXC/strings.xml
index d379ec1..c826b30 100644
--- a/packages/overlays/ExperimentNavigationBarFloatingOverlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/ExperimentNavigationBarFloatingOverlay/res/values-en-rXC/strings.xml
@@ -19,5 +19,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="experiment_navigationbar_overlay" msgid="7290469683147348228">"Floating Navigation Bar Experiment"</string>
+ <string name="experiment_navigationbar_overlay" msgid="7290469683147348228">"Floating Navigation Bar Experiment"</string>
</resources>
diff --git a/packages/overlays/ExperimentNavigationBarSlim32Overlay/res/values-en-rXC/strings.xml b/packages/overlays/ExperimentNavigationBarSlim32Overlay/res/values-en-rXC/strings.xml
index ca8c4fa..27d284b 100644
--- a/packages/overlays/ExperimentNavigationBarSlim32Overlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/ExperimentNavigationBarSlim32Overlay/res/values-en-rXC/strings.xml
@@ -19,5 +19,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="experiment_navigationbar_overlay" msgid="2616250866244714325">"Slim Navigation Bar Experiment (32dp)"</string>
+ <string name="experiment_navigationbar_overlay" msgid="2616250866244714325">"Slim Navigation Bar Experiment (32dp)"</string>
</resources>
diff --git a/packages/overlays/ExperimentNavigationBarSlim40Overlay/res/values-en-rXC/strings.xml b/packages/overlays/ExperimentNavigationBarSlim40Overlay/res/values-en-rXC/strings.xml
index 9209c2b..8bfaade 100644
--- a/packages/overlays/ExperimentNavigationBarSlim40Overlay/res/values-en-rXC/strings.xml
+++ b/packages/overlays/ExperimentNavigationBarSlim40Overlay/res/values-en-rXC/strings.xml
@@ -19,5 +19,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="experiment_navigationbar_overlay" msgid="6415947279345789008">"Slim Navigation Bar Experiment (40dp)"</string>
+ <string name="experiment_navigationbar_overlay" msgid="6415947279345789008">"Slim Navigation Bar Experiment (40dp)"</string>
</resources>
diff --git a/packages/overlays/IconPackCircularOverlay/Android.mk b/packages/overlays/IconPackCircularAndroidOverlay/Android.mk
similarity index 89%
copy from packages/overlays/IconPackCircularOverlay/Android.mk
copy to packages/overlays/IconPackCircularAndroidOverlay/Android.mk
index 010eb81..60f525b6 100644
--- a/packages/overlays/IconPackCircularOverlay/Android.mk
+++ b/packages/overlays/IconPackCircularAndroidOverlay/Android.mk
@@ -13,11 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_RRO_THEME := IconPackCircular
+LOCAL_RRO_THEME := IconPackCircularAndroid
LOCAL_CERTIFICATE := platform
LOCAL_PRODUCT_MODULE := true
@@ -25,7 +24,7 @@
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_PACKAGE_NAME := IconPackCircularOverlay
+LOCAL_PACKAGE_NAME := IconPackCircularAndroidOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)
diff --git a/packages/overlays/IconPackCircularOverlay/AndroidManifest.xml b/packages/overlays/IconPackCircularAndroidOverlay/AndroidManifest.xml
similarity index 87%
rename from packages/overlays/IconPackCircularOverlay/AndroidManifest.xml
rename to packages/overlays/IconPackCircularAndroidOverlay/AndroidManifest.xml
index 6f0124d..9405676 100644
--- a/packages/overlays/IconPackCircularOverlay/AndroidManifest.xml
+++ b/packages/overlays/IconPackCircularAndroidOverlay/AndroidManifest.xml
@@ -16,9 +16,9 @@
*/
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.theme.icon_pack.circular"
+ package="com.android.theme.icon_pack.circular.android"
android:versionCode="1"
android:versionName="1.0">
- <overlay android:targetPackage="android" android:category="android.theme.customization.icon_pack" android:priority="1"/>
+ <overlay android:targetPackage="android" android:category="android.theme.customization.icon_pack.android" android:priority="1"/>
<application android:label="Circular" android:hasCode="false"/>
</manifest>
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_bt_headphones_a2dp.xml
similarity index 70%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_bt_headphones_a2dp.xml
index 45cf95f..4d8c366f 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_bt_headphones_a2dp.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,6 +23,8 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M21,18V11A9,9,0,0,0,3,11v7a2.93,2.93,0,0,0,2.88,3H8V13H4V11a8,8,0,0,1,16,0v2H16v8h2.12A2.93,2.93,0,0,0,21,18ZM7,14v6H5.88A1.92,1.92,0,0,1,4,18V14Zm13,4a1.92,1.92,0,0,1-1.88,2H17V14h3Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_expand_more.xml
similarity index 73%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_expand_more.xml
index 45cf95f..ab6aec5 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_expand_more.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,6 +23,8 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M18.35,9.65a0.48 0.48 ,0,0,0-0.7,0L12,15.28,6.35,9.65a0.49 0.49 ,0,0,0-0.7 0.7 L12,16.7l6.35-6.35A0.48 0.48 ,0,0,0,18.35,9.65Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_info_outline_24.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_info_outline_24.xml
new file mode 100644
index 0000000..0e108ca
--- /dev/null
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_info_outline_24.xml
@@ -0,0 +1,36 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,22A10,10,0,1,0,2,12,10,10,0,0,0,12,22ZM12,3a9,9,0,1,1-9,9A9,9,0,0,1,12,3Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,11a0.5 0.5 ,0,0,0-0.5 0.5 v5a0.5 0.5 ,0,0,0,1,0v-5A0.5 0.5 ,0,0,0,12,11Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 12 7 C 12.4142135624 7 12.75 7.33578643763 12.75 7.75 C 12.75 8.16421356237 12.4142135624 8.5 12 8.5 C 11.5857864376 8.5 11.25 8.16421356237 11.25 7.75 C 11.25 7.33578643763 11.5857864376 7 12 7 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_invert_colors.xml
similarity index 70%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_invert_colors.xml
index 45cf95f..59e7838 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_invert_colors.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,6 +23,8 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M12.62,2.23A1,1,0,0,0,12,2a1.07,1.07,0,0,0-0.63 0.22 C9.48,3.75,4,8.5,4,14a7.89,7.89,0,0,0,8,8,8,8,0,0,0,8-8C20,8.5,14.5,3.73,12.62,2.23ZM12,21a6.92,6.92,0,0,1-7-7C5,9.16,9.89,4.71,12,3Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_lockscreen_ime.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_lockscreen_ime.xml
new file mode 100644
index 0000000..04a2c24
--- /dev/null
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_lockscreen_ime.xml
@@ -0,0 +1,57 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21,21a2,2,0,0,0,2-2V6a2,2,0,0,0-2-2H3A2,2,0,0,0,1,6V19a2,2,0,0,0,2,2ZM2,19V6A1,1,0,0,1,3,5H21a1,1,0,0,1,1,1V19a1,1,0,0,1-1,1H3A1,1,0,0,1,2,19Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9.5 8 L 10.5 8 Q 11 8 11 8.5 L 11 9.5 Q 11 10 10.5 10 L 9.5 10 Q 9 10 9 9.5 L 9 8.5 Q 9 8 9.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 5.5 8 L 6.5 8 Q 7 8 7 8.5 L 7 9.5 Q 7 10 6.5 10 L 5.5 10 Q 5 10 5 9.5 L 5 8.5 Q 5 8 5.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 13.5 8 L 14.5 8 Q 15 8 15 8.5 L 15 9.5 Q 15 10 14.5 10 L 13.5 10 Q 13 10 13 9.5 L 13 8.5 Q 13 8 13.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9.5 12 L 10.5 12 Q 11 12 11 12.5 L 11 13.5 Q 11 14 10.5 14 L 9.5 14 Q 9 14 9 13.5 L 9 12.5 Q 9 12 9.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 5.5 12 L 6.5 12 Q 7 12 7 12.5 L 7 13.5 Q 7 14 6.5 14 L 5.5 14 Q 5 14 5 13.5 L 5 12.5 Q 5 12 5.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 13.5 12 L 14.5 12 Q 15 12 15 12.5 L 15 13.5 Q 15 14 14.5 14 L 13.5 14 Q 13 14 13 13.5 L 13 12.5 Q 13 12 13.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 17.5 8 L 18.5 8 Q 19 8 19 8.5 L 19 9.5 Q 19 10 18.5 10 L 17.5 10 Q 17 10 17 9.5 L 17 8.5 Q 17 8 17.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 17.5 12 L 18.5 12 Q 19 12 19 12.5 L 19 13.5 Q 19 14 18.5 14 L 17.5 14 Q 17 14 17 13.5 L 17 12.5 Q 17 12 17.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M8.5,17h7a0.5 0.5 ,0,0,0,0-1h-7a0.5 0.5 ,0,0,0,0,1Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_mode_edit.xml
similarity index 69%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_mode_edit.xml
index 45cf95f..f9b0f6c 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_mode_edit.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,6 +23,8 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M3,21H7.18L20.41,7.77a2,2,0,0,0,0-2.83L19.06,3.59a2,2,0,0,0-2.83,0L3,16.82ZM16.94,4.3a1,1,0,0,1,1.41,0l1.36,1.35a1,1,0,0,1,0.29 0.7 ,1,1,0,0,1-0.3 0.71 l-2,2L15,6.26ZM4,17.23,14.26,7,17,9.74,6.77,20H4Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_phone.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_phone.xml
new file mode 100644
index 0000000..ac47a86
--- /dev/null
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_phone.xml
@@ -0,0 +1,30 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21,18.06a3.22,3.22,0,0,0-5.49-2.28L13.26,18A17.13,17.13,0,0,1,9.2,15.1,18.37,18.37,0,0,1,6,10.69L8.22,8.48A3.19,3.19,0,0,0,9,5.33,3.24,3.24,0,0,0,6,3H3.49s0,0,0,0L3.39,3l-0.1,0-0.07 0.05 -0.08 0.06 a0.35 0.35 ,0,0,0-0.05 0.08 A0.35 0.35 ,0,0,0,3,3.3a0.36 0.36 ,0,0,0,0,0.1 0.24 0.24,0,0,0,0,0.08v0H3a19.11,19.11,0,0,0,5.5,12.3,18.38,18.38,0,0,0,12,5.2h0a0.58 0.58 ,0,0,0,0.19,0,0.18 0.18 ,0,0,0,0.07-0.05l0.09-0.06,0-0.07a0.35 0.35 ,0,0,0,0.05-0.08 0.29 0.29,0,0,0,0-0.1s0-0.05,0-0.08h0ZM4.06,4H6A2.22,2.22,0,0,1,7.52,7.78l-2,2A18.05,18.05,0,0,1,4.06,4ZM14.21,18.5l2-2A2.22,2.22,0,0,1,20,18.06V20A17.64,17.64,0,0,1,14.21,18.5Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_qs_night_display_on.xml
similarity index 63%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_qs_night_display_on.xml
index 2bcaf2a..8ee7e2f 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_qs_night_display_on.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,12 +23,8 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
- android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M22.36,15.7a0.51 0.51 ,0,0,0-0.51-0.22,11.59,11.59,0,0,1-2.07 0.2 A11.5,11.5,0,0,1,8.31,4.17a10.91,10.91,0,0,1,0.2-2.08 0.51 0.51,0,0,0-0.22-0.51 0.5 0.5,0,0,0-0.55,0A10.57,10.57,0,1,0,22.36,16.25 0.5 0.5,0,0,0,22.36,15.7ZM13.55,20A9.59,9.59,0,0,1,7.36,3.12a9.34,9.34,0,0,0-0.05,1A12.46,12.46,0,0,0,20.82,16.63,9.49,9.49,0,0,1,13.55,20Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_signal_location.xml
similarity index 65%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_signal_location.xml
index 2bcaf2a..25535c7 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_signal_location.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,12 +23,11 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
- android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M12,21.5s7-5.34,7-11.25A7.13,7.13,0,0,0,12,3a7.13,7.13,0,0,0-7,7.25C5,16.16,12,21.5,12,21.5ZM12,4a6.13,6.13,0,0,1,6,6.25c0,4.37-4.37,8.54-6,10-1.63-1.4-6-5.57-6-9.95A6.13,6.13,0,0,1,12,4Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M15,10a3,3,0,1,0-3,3A3,3,0,0,0,15,10Zm-5,0a2,2,0,1,1,2,2A2,2,0,0,1,10,10Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_0.xml
similarity index 99%
rename from packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml
rename to packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_0.xml
index e1ca60d..b73fcb2 100644
--- a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_0.xml
@@ -48,4 +48,4 @@
android:strokeAlpha="0.3"
android:strokeWidth="1"
android:pathData="M15.93,14.64a0.49 0.49 ,0,0,0,0.35-0.15 0.5 0.5,0,0,0,0-0.71,6.08,6.08,0,0,0-8.58,0,0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.08,5.08,0,0,1,7.16,0A0.51 0.51 ,0,0,0,15.93,14.64Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_1.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_1.xml
similarity index 96%
rename from packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_1.xml
rename to packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_1.xml
index 06ac16d..69b1bd8 100644
--- a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_1.xml
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_1.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -46,4 +45,4 @@
android:strokeAlpha="0.3"
android:strokeWidth="1"
android:pathData="M15.93,14.64a0.49 0.49 ,0,0,0,0.35-0.15 0.5 0.5,0,0,0,0-0.71,6.08,6.08,0,0,0-8.58,0,0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.08,5.08,0,0,1,7.16,0A0.51 0.51 ,0,0,0,15.93,14.64Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_2.xml
similarity index 96%
rename from packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_2.xml
rename to packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_2.xml
index 844fabf..353fccb 100644
--- a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_2.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -43,4 +42,4 @@
<path
android:fillColor="#000000"
android:pathData="M15.93,14.64a0.49 0.49 ,0,0,0,0.35-0.15 0.5 0.5,0,0,0,0-0.71,6.08,6.08,0,0,0-8.58,0,0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.07,5.07,0,0,1,7.16,0A0.51 0.51 ,0,0,0,15.93,14.64Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_3.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_3.xml
similarity index 96%
rename from packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_3.xml
rename to packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_3.xml
index 3a01032..a8bade5 100644
--- a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_3.xml
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_3.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -40,4 +39,4 @@
<path
android:fillColor="#000000"
android:pathData="M15.93,14.64a0.49 0.49 ,0,0,0,0.35-0.15 0.5 0.5,0,0,0,0-0.71,6.08,6.08,0,0,0-8.58,0,0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.07,5.07,0,0,1,7.16,0A0.51 0.51 ,0,0,0,15.93,14.64Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_4.xml
similarity index 95%
rename from packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_4.xml
rename to packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_4.xml
index 3512d44ad..a4afffd 100644
--- a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackCircularAndroidOverlay/res/drawable/ic_wifi_signal_4.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -37,4 +36,4 @@
<path
android:fillColor="#000000"
android:pathData="M15.93,14.64a0.49 0.49 ,0,0,0,0.35-0.15 0.5 0.5,0,0,0,0-0.71,6.08,6.08,0,0,0-8.58,0,0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.08,5.08,0,0,1,7.16,0A0.51 0.51 ,0,0,0,15.93,14.64Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/Android.mk b/packages/overlays/IconPackCircularSystemUIOverlay/Android.mk
similarity index 89%
copy from packages/overlays/IconPackCircularOverlay/Android.mk
copy to packages/overlays/IconPackCircularSystemUIOverlay/Android.mk
index 010eb81..711063d 100644
--- a/packages/overlays/IconPackCircularOverlay/Android.mk
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/Android.mk
@@ -17,7 +17,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_RRO_THEME := IconPackCircular
+LOCAL_RRO_THEME := IconPackCircularSystemUI
LOCAL_CERTIFICATE := platform
LOCAL_PRODUCT_MODULE := true
@@ -25,7 +25,7 @@
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_PACKAGE_NAME := IconPackCircularOverlay
+LOCAL_PACKAGE_NAME := IconPackCircularSystemUIOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)
diff --git a/packages/overlays/IconPackCircularOverlay/AndroidManifest.xml b/packages/overlays/IconPackCircularSystemUIOverlay/AndroidManifest.xml
similarity index 80%
copy from packages/overlays/IconPackCircularOverlay/AndroidManifest.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/AndroidManifest.xml
index 6f0124d..356b7e2 100644
--- a/packages/overlays/IconPackCircularOverlay/AndroidManifest.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/AndroidManifest.xml
@@ -16,9 +16,9 @@
*/
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.theme.icon_pack.circular"
+ package="com.android.theme.icon_pack.circular.systemui"
android:versionCode="1"
android:versionName="1.0">
- <overlay android:targetPackage="android" android:category="android.theme.customization.icon_pack" android:priority="1"/>
+ <overlay android:targetPackage="com.android.systemui" android:category="android.theme.customization.icon_pack.systemui" android:priority="1"/>
<application android:label="Circular" android:hasCode="false"/>
</manifest>
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_brightness_thumb.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_brightness_thumb.xml
new file mode 100644
index 0000000..04ee7cd
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_brightness_thumb.xml
@@ -0,0 +1,33 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="M3.41,14.72A2,2,0,0,1,4,16.14V18a2,2,0,0,0,2,2H7.86a2,2,0,0,1,1.42 0.59 l1.31,1.31a2,2,0,0,0,2.82,0l1.31-1.31A2,2,0,0,1,16.14,20H18a2,2,0,0,0,2-2V16.14a2,2,0,0,1,0.59-1.42l1.31-1.31a2,2,0,0,0,0-2.82L20.59,9.28A2,2,0,0,1,20,7.86V6a2,2,0,0,0-2-2H16.14a2,2,0,0,1-1.42-0.59L13.41,2.1a2,2,0,0,0-2.82,0L9.28,3.41A2,2,0,0,1,7.86,4H6A2,2,0,0,0,4,6V7.86a2,2,0,0,1-0.59,1.42L2.1,10.59a2,2,0,0,0,0,2.82Zm-0.6-3.43L4.12,10A3,3,0,0,0,5,7.86V6A1,1,0,0,1,6,5H7.86A3,3,0,0,0,10,4.12l1.31-1.31a1,1,0,0,1,1.42,0L14,4.12A3,3,0,0,0,16.14,5H18a1,1,0,0,1,1,1V7.86A3,3,0,0,0,19.88,10l1.31,1.31a1,1,0,0,1,0,1.42L19.88,14A3,3,0,0,0,19,16.14V18a1,1,0,0,1-1,1H16.14a3,3,0,0,0-2.12 0.88 l-1.31,1.31a1,1,0,0,1-1.42,0L10,19.88A3,3,0,0,0,7.86,19H6a1,1,0,0,1-1-1V16.14A3,3,0,0,0,4.12,14L2.81,12.71a1,1,0,0,1,0-1.42Z" />
+ <path
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="M 12 7 C 14.7614237492 7 17 9.23857625085 17 12 C 17 14.7614237492 14.7614237492 17 12 17 C 9.23857625085 17 7 14.7614237492 7 12 C 7 9.23857625085 9.23857625085 7 12 7 Z" />
+</vector>
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_data_saver_off.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_data_saver_off.xml
new file mode 100644
index 0000000..d25350a
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_data_saver_off.xml
@@ -0,0 +1,36 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,7.5a0.5 0.5 ,0,0,0-0.5 0.5 v3.5H8a0.5 0.5 ,0,0,0,0,1h3.5V16a0.5 0.5 ,0,0,0,1,0V12.5H16a0.5 0.5 ,0,0,0,0-1H12.5V8A0.5 0.5 ,0,0,0,12,7.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M22,12a10,10,0,0,0-9-9.95v3A7,7,0,0,1,19,12a7.12,7.12,0,0,1-0.48,2.54h0l2.6,1.53A9.88,9.88,0,0,0,22,12Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M2.09,13.39a10,10,0,0,0,18,4.52l-2.6-1.53h0A7,7,0,1,1,11,5.08v-3A10,10,0,0,0,2.09,13.39Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_dnd.xml
similarity index 69%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_dnd.xml
index 45cf95f..3e32b3b 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_dnd.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,6 +23,11 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M12,22A10,10,0,1,0,2,12,10,10,0,0,0,12,22ZM12,3a9,9,0,1,1-9,9A9,9,0,0,1,12,3Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M7,12.5H17a0.5 0.5 ,0,0,0,0-1H7a0.5 0.5 ,0,0,0,0,1Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_drag_handle.xml
similarity index 70%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_drag_handle.xml
index 45cf95f..793b32f 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_drag_handle.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,6 +23,11 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M19.5,9H4.5a0.5 0.5 ,0,0,0,0,1h15a0.5 0.5 ,0,0,0,0-1Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M19.5,14H4.5a0.5 0.5 ,0,0,0,0,1h15a0.5 0.5 ,0,0,0,0-1Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_headset.xml
similarity index 70%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_headset.xml
index 45cf95f..4d8c366f 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_headset.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,6 +23,8 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M21,18V11A9,9,0,0,0,3,11v7a2.93,2.93,0,0,0,2.88,3H8V13H4V11a8,8,0,0,1,16,0v2H16v8h2.12A2.93,2.93,0,0,0,21,18ZM7,14v6H5.88A1.92,1.92,0,0,1,4,18V14Zm13,4a1.92,1.92,0,0,1-1.88,2H17V14h3Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_hotspot.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_hotspot.xml
new file mode 100644
index 0000000..670449a
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_hotspot.xml
@@ -0,0 +1,36 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 12 11 C 12.8284271247 11 13.5 11.6715728753 13.5 12.5 C 13.5 13.3284271247 12.8284271247 14 12 14 C 11.1715728753 14 10.5 13.3284271247 10.5 12.5 C 10.5 11.6715728753 11.1715728753 11 12 11 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M15.18,16.39a0.51 0.51 ,0,0,0,0.71,0,5.5,5.5,0,0,0,0-7.78,5.52,5.52,0,0,0-7.78,0,5.5,5.5,0,0,0,0,7.78 0.5 0.5,0,0,0,0.35 0.15 0.51 0.51 ,0,0,0,0.36-0.15 0.51 0.51,0,0,0,0-0.71,4.5,4.5,0,1,1,6.36,0A0.51 0.51 ,0,0,0,15.18,16.39Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M18,19.22a0.49 0.49 ,0,0,0,0.35 0.14 0.5 0.5 ,0,0,0,0.36-0.14,9.5,9.5,0,1,0-13.44,0,0.51 0.51 ,0,0,0,0.71,0,0.5 0.5 ,0,0,0,0-0.71,8.5,8.5,0,0,1,12-12,8.5,8.5,0,0,1,0,12A0.5 0.5 ,0,0,0,18,19.22Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_info.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_info.xml
new file mode 100644
index 0000000..0e108ca
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_info.xml
@@ -0,0 +1,36 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,22A10,10,0,1,0,2,12,10,10,0,0,0,12,22ZM12,3a9,9,0,1,1-9,9A9,9,0,0,1,12,3Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,11a0.5 0.5 ,0,0,0-0.5 0.5 v5a0.5 0.5 ,0,0,0,1,0v-5A0.5 0.5 ,0,0,0,12,11Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 12 7 C 12.4142135624 7 12.75 7.33578643763 12.75 7.75 C 12.75 8.16421356237 12.4142135624 8.5 12 8.5 C 11.5857864376 8.5 11.25 8.16421356237 11.25 7.75 C 11.25 7.33578643763 11.5857864376 7 12 7 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_lockscreen_ime.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_lockscreen_ime.xml
new file mode 100644
index 0000000..04a2c24
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_lockscreen_ime.xml
@@ -0,0 +1,57 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21,21a2,2,0,0,0,2-2V6a2,2,0,0,0-2-2H3A2,2,0,0,0,1,6V19a2,2,0,0,0,2,2ZM2,19V6A1,1,0,0,1,3,5H21a1,1,0,0,1,1,1V19a1,1,0,0,1-1,1H3A1,1,0,0,1,2,19Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9.5 8 L 10.5 8 Q 11 8 11 8.5 L 11 9.5 Q 11 10 10.5 10 L 9.5 10 Q 9 10 9 9.5 L 9 8.5 Q 9 8 9.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 5.5 8 L 6.5 8 Q 7 8 7 8.5 L 7 9.5 Q 7 10 6.5 10 L 5.5 10 Q 5 10 5 9.5 L 5 8.5 Q 5 8 5.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 13.5 8 L 14.5 8 Q 15 8 15 8.5 L 15 9.5 Q 15 10 14.5 10 L 13.5 10 Q 13 10 13 9.5 L 13 8.5 Q 13 8 13.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9.5 12 L 10.5 12 Q 11 12 11 12.5 L 11 13.5 Q 11 14 10.5 14 L 9.5 14 Q 9 14 9 13.5 L 9 12.5 Q 9 12 9.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 5.5 12 L 6.5 12 Q 7 12 7 12.5 L 7 13.5 Q 7 14 6.5 14 L 5.5 14 Q 5 14 5 13.5 L 5 12.5 Q 5 12 5.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 13.5 12 L 14.5 12 Q 15 12 15 12.5 L 15 13.5 Q 15 14 14.5 14 L 13.5 14 Q 13 14 13 13.5 L 13 12.5 Q 13 12 13.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 17.5 8 L 18.5 8 Q 19 8 19 8.5 L 19 9.5 Q 19 10 18.5 10 L 17.5 10 Q 17 10 17 9.5 L 17 8.5 Q 17 8 17.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 17.5 12 L 18.5 12 Q 19 12 19 12.5 L 19 13.5 Q 19 14 18.5 14 L 17.5 14 Q 17 14 17 13.5 L 17 12.5 Q 17 12 17.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M8.5,17h7a0.5 0.5 ,0,0,0,0-1h-7a0.5 0.5 ,0,0,0,0,1Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_notifications_alert.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_notifications_alert.xml
new file mode 100644
index 0000000..2b9e371
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_notifications_alert.xml
@@ -0,0 +1,39 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,2.5A1.5,1.5,0,0,0,10.5,4v0.2A6,6,0,0,0,6,10v5.5a0.5 0.5 ,0,0,1-0.5 0.5 A1.5,1.5,0,0,0,4,17.5v1a0.5 0.5 ,0,0,0,0.5 0.5 h15a0.5 0.5 ,0,0,0,0.5-0.5v-1A1.5,1.5,0,0,0,18.5,16a0.5 0.5 ,0,0,1-0.5-0.5V10a6,6,0,0,0-4.5-5.8V4A1.5,1.5,0,0,0,12,2.5ZM17,10v5.5A1.5,1.5,0,0,0,18.5,17a0.5 0.5 ,0,0,1,0.5 0.5 V18H5v-0.5a0.5 0.5 ,0,0,1,0.5-0.5A1.5,1.5,0,0,0,7,15.5V10a5,5,0,0,1,10,0Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M14,20H10a2,2,0,0,0,4,0Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M6,3.2a9.24,9.24,0,0,0-3.26,7.05 0.5 0.5,0,0,0,1,0A8.25,8.25,0,0,1,6.66,4,0.5 0.5 ,0,0,0,6,3.2Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21.25,10.25A9.24,9.24,0,0,0,18,3.2a0.5 0.5 ,0,0,0-0.65 0.76 ,8.25,8.25,0,0,1,2.91,6.29 0.5 0.5,0,0,0,1,0Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_notifications_silence.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_notifications_silence.xml
new file mode 100644
index 0000000..838f752
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_notifications_silence.xml
@@ -0,0 +1,36 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,5a5,5,0,0,1,5,5v5.17l3,3V17.5A1.5,1.5,0,0,0,18.5,16a0.5 0.5 ,0,0,1-0.5-0.5V10a6,6,0,0,0-4.5-5.8V4a1.5,1.5,0,0,0-3,0v0.2A6,6,0,0,0,7.68,5.85l0.71 0.71 A5,5,0,0,1,12,5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M14,20H10a2,2,0,0,0,4,0Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M20.85,21.15l-18-18a0.48 0.48 ,0,0,0-0.7,0h0a0.48 0.48 ,0,0,0,0,0.7L6.33,8A6.06,6.06,0,0,0,6,10v5.5a0.5 0.5 ,0,0,1-0.5 0.5 A1.5,1.5,0,0,0,4,17.5v1a0.5 0.5 ,0,0,0,0.5 0.5 H17.29l2.86,2.85a0.48 0.48 ,0,0,0,0.7,0h0A0.48 0.48 ,0,0,0,20.85,21.15ZM5,18v-0.5a0.5 0.5 ,0,0,1,0.5-0.5A1.5,1.5,0,0,0,7,15.5V10a4.83,4.83,0,0,1,0.15-1.15L16.29,18Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_auto_rotate.xml
similarity index 60%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_auto_rotate.xml
index 2bcaf2a..f98e2b8 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_auto_rotate.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,12 +23,11 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
- android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M3.5,6a0.5 0.5 ,0,0,0-0.5 0.5 V11H7.5a0.5 0.5 ,0,0,0,0-1H4.76l5-4.65a2.49,2.49,0,0,1,3.48 0.05 l4.95,4.95a0.49 0.49 ,0,1,0,0.7-0.7L13.91,4.7A3.47,3.47,0,0,0,9,4.62L4,9.35V6.5A0.5 0.5 ,0,0,0,3.5,6Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M20.5,18a0.5 0.5 ,0,0,0,0.5-0.5V13H16.5a0.5 0.5 ,0,0,0,0,1h2.74l-5,4.65a2.49,2.49,0,0,1-3.48,0l-5-5a0.49 0.49 ,0,0,0-0.7 0.7 l4.94,5a3.47,3.47,0,0,0,4.87 0.08 l5-4.73V17.5A0.5 0.5 ,0,0,0,20.5,18Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_bluetooth_connecting.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_bluetooth_connecting.xml
new file mode 100644
index 0000000..10b1cbf
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_bluetooth_connecting.xml
@@ -0,0 +1,36 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M18.16,17.37a0.51 0.51 ,0,0,0,0.71,0,7.76,7.76,0,0,0,0-10.68 0.5 0.5,0,1,0-0.74 0.68 ,6.74,6.74,0,0,1,0,9.32A0.51 0.51 ,0,0,0,18.16,17.37Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M16.27,14.47a0.51 0.51 ,0,0,0,0.7,0,3.48,3.48,0,0,0,0-4.92l-0.72 0.7 a2.47,2.47,0,0,1,0,3.51A0.5 0.5 ,0,0,0,16.27,14.47Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3.15,18.15a0.48 0.48 ,0,0,0,0,0.7 0.48 0.48,0,0,0,0.7,0L9,13.71V22h0.5a5.25,5.25,0,0,0,2.25-10A5.25,5.25,0,0,0,9.5,2H9v8.29L3.85,5.15a0.49 0.49 ,0,0,0-0.7 0.7 L9,11.71v0.58Zm10.63-1.4A4.26,4.26,0,0,1,10,21V12.53A4.26,4.26,0,0,1,13.78,16.75ZM10,3a4.25,4.25,0,0,1,0,8.44Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_bluetooth_on.xml
similarity index 63%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_bluetooth_on.xml
index 45cf95f..e8664f6 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_bluetooth_on.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,6 +23,8 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M16.78,7.25A5.27,5.27,0,0,0,11.5,2H11v8.29L5.85,5.15a0.49 0.49 ,0,0,0-0.7 0.7 L11,11.71v0.58L5.15,18.15a0.48 0.48 ,0,0,0,0,0.7 0.48 0.48,0,0,0,0.7,0L11,13.71V22h0.5a5.25,5.25,0,0,0,2.25-10A5.25,5.25,0,0,0,16.78,7.25Zm-1,9.5A4.26,4.26,0,0,1,12,21V12.53A4.26,4.26,0,0,1,15.78,16.75ZM12,11.47V3a4.25,4.25,0,0,1,0,8.44Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_brightness_auto_on.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_brightness_auto_on.xml
new file mode 100644
index 0000000..fc990d8
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_brightness_auto_on.xml
@@ -0,0 +1,33 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3.41,14.72A2,2,0,0,1,4,16.14V18a2,2,0,0,0,2,2H7.86a2,2,0,0,1,1.42 0.59 l1.31,1.31a2,2,0,0,0,2.82,0l1.31-1.31A2,2,0,0,1,16.14,20H18a2,2,0,0,0,2-2V16.14a2,2,0,0,1,0.59-1.42l1.31-1.31a2,2,0,0,0,0-2.82L20.59,9.28A2,2,0,0,1,20,7.86V6a2,2,0,0,0-2-2H16.14a2,2,0,0,1-1.42-0.59L13.41,2.1a2,2,0,0,0-2.82,0L9.28,3.41A2,2,0,0,1,7.86,4H6A2,2,0,0,0,4,6V7.86a2,2,0,0,1-0.59,1.42L2.1,10.59a2,2,0,0,0,0,2.82Zm-0.6-3.43L4.12,10A3,3,0,0,0,5,7.86V6A1,1,0,0,1,6,5H7.86A3,3,0,0,0,10,4.12l1.31-1.31a1,1,0,0,1,1.42,0L14,4.12A3,3,0,0,0,16.14,5H18a1,1,0,0,1,1,1V7.86A3,3,0,0,0,19.88,10l1.31,1.31a1,1,0,0,1,0,1.42L19.88,14A3,3,0,0,0,19,16.14V18a1,1,0,0,1-1,1H16.14a3,3,0,0,0-2.12 0.88 l-1.31,1.31a1,1,0,0,1-1.42,0L10,19.88A3,3,0,0,0,7.86,19H6a1,1,0,0,1-1-1V16.14A3,3,0,0,0,4.12,14L2.81,12.71a1,1,0,0,1,0-1.42Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M10,14.61h4L14.85,17H17L13.11,7H10.87L7,17H9.15Zm1.92-5.44h0.11l1.29,3.71H10.63Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_cancel.xml
similarity index 63%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_cancel.xml
index 2bcaf2a..40de609 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_cancel.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,12 +23,11 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
- android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M12,22A10,10,0,1,0,2,12,10,10,0,0,0,12,22ZM12,3a9,9,0,1,1-9,9A9,9,0,0,1,12,3Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M7.15,16.85a0.48 0.48 ,0,0,0,0.7,0L12,12.71l4.15,4.14a0.48 0.48 ,0,0,0,0.7,0,0.48 0.48 ,0,0,0,0-0.7L12.71,12l4.14-4.15a0.49 0.49 ,0,1,0-0.7-0.7L12,11.29,7.85,7.15a0.49 0.49 ,0,0,0-0.7 0.7 L11.29,12,7.15,16.15A0.48 0.48 ,0,0,0,7.15,16.85Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_cast_on.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_cast_on.xml
new file mode 100644
index 0000000..d12cf9e
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_cast_on.xml
@@ -0,0 +1,42 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M22,17.5V6.5A2.5,2.5,0,0,0,19.5,4H4.5A2.5,2.5,0,0,0,2,6.5v2a0.5 0.5 ,0,0,0,1,0v-2A1.5,1.5,0,0,1,4.5,5h15A1.5,1.5,0,0,1,21,6.5v11A1.5,1.5,0,0,1,19.5,19h-6a0.5 0.5 ,0,0,0,0,1h6A2.5,2.5,0,0,0,22,17.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M2.21,19.61A1,1,0,0,0,3,20a1,1,0,0,0,0-2H3a1,1,0,0,0-0.79,1.61Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M2.5,12A7.5,7.5,0,0,1,10,19.5a0.5 0.5 ,0,0,0,1,0A8.51,8.51,0,0,0,2.5,11a0.5 0.5 ,0,0,0,0,1Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M2.5,16A3.5,3.5,0,0,1,6,19.5a0.5 0.5 ,0,0,0,1,0A4.51,4.51,0,0,0,2.5,15a0.5 0.5 ,0,0,0,0,1Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M16.5,15h-3a0.5 0.5 ,0,0,0,0,1h3A1.5,1.5,0,0,0,18,14.5v-5A1.5,1.5,0,0,0,16.5,8H6.5a0.5 0.5 ,0,0,0,0,1h10a0.5 0.5 ,0,0,1,0.5 0.5 v5A0.5 0.5 ,0,0,1,16.5,15Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_no_sim.xml
similarity index 62%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_no_sim.xml
index 2bcaf2a..e17d646 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_no_sim.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,12 +23,11 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
- android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M10.41,4H17a1,1,0,0,1,1,1V16.17l1,1V5a2,2,0,0,0-2-2H10L7.42,5.58l0.7 0.71 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M20.85,21.15l-18-18a0.48 0.48 ,0,0,0-0.7,0h0a0.48 0.48 ,0,0,0,0,0.7l3.5,3.5L5,8V19a2,2,0,0,0,2,2H17a2,2,0,0,0,1.55-0.75l1.6,1.6a0.48 0.48 ,0,0,0,0.7,0h0A0.48 0.48 ,0,0,0,20.85,21.15ZM17,20H7a1,1,0,0,1-1-1V8.41l0.35-0.35L17.83,19.53A1,1,0,0,1,17,20Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_vpn.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_vpn.xml
new file mode 100644
index 0000000..e5c1f4e
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_vpn.xml
@@ -0,0 +1,33 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M7.5,9A2.5,2.5,0,1,0,10,11.5,2.5,2.5,0,0,0,7.5,9Zm0,4A1.5,1.5,0,1,1,9,11.5,1.5,1.5,0,0,1,7.5,13Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21.5,9H12.39A5.5,5.5,0,0,0,2.12,10.32,5.58,5.58,0,0,0,3.23,15a5.49,5.49,0,0,0,9.16-1H15v1.5A1.5,1.5,0,0,0,16.5,17h2A1.5,1.5,0,0,0,20,15.5V14h1.5a0.5 0.5 ,0,0,0,0.5-0.5v-4A0.5 0.5 ,0,0,0,21.5,9ZM21,13H19.5a0.5 0.5 ,0,0,0-0.5 0.5 v2a0.5 0.5 ,0,0,1-0.5 0.5 h-2a0.5 0.5 ,0,0,1-0.5-0.5v-2a0.5 0.5 ,0,0,0-0.5-0.5H12.08a0.51 0.51 ,0,0,0-0.46 0.3 ,4.5,4.5,0,0,1-7.61,1,4.57,4.57,0,0,1-0.91-3.82A4.48,4.48,0,0,1,6.7,7.07,4.53,4.53,0,0,1,11.62,9.7a0.51 0.51 ,0,0,0,0.46 0.3 H21Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_0.xml
similarity index 66%
copy from packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_0.xml
index e1ca60d..ad48771 100644
--- a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_0.xml
@@ -35,17 +35,20 @@
android:fillAlpha="0.3"
android:strokeAlpha="0.3"
android:strokeWidth="1"
- android:pathData="M18.76,11.8a0.54 0.54 ,0,0,0,0.36-0.14 0.51 0.51,0,0,0,0-0.71A10.08,10.08,0,0,0,4.87,11a0.5 0.5 ,0,0,0,0,0.71 0.51 0.51,0,0,0,0.71,0,9.07,9.07,0,0,1,12.83,0A0.54 0.54 ,0,0,0,18.76,11.8Z" />
+ android:pathData="M4.87,11a0.5 0.5 ,0,0,0,0,0.71 0.51 0.51,0,0,0,0.71,0,9.07,9.07,0,0,1,12.83,0,0.52 0.52 ,0,0,0,0.71,0,0.51 0.51 ,0,0,0,0-0.71A10.08,10.08,0,0,0,4.87,11Z" />
<path
android:fillColor="#000000"
android:fillAlpha="0.3"
android:strokeAlpha="0.3"
android:strokeWidth="1"
- android:pathData="M2.15,8.85a0.48 0.48 ,0,0,0,0.7,0,12.8,12.8,0,0,1,18.3,0,0.48 0.48 ,0,0,0,0.7,0,0.48 0.48 ,0,0,0,0-0.7,13.77,13.77,0,0,0-19.7,0A0.48 0.48 ,0,0,0,2.15,8.85Z" />
+ android:pathData="M21.5,9a0.47 0.47 ,0,0,0,0.35-0.15 0.48 0.48,0,0,0,0-0.7,13.77,13.77,0,0,0-19.7,0,0.49 0.49 ,0,0,0,0.7 0.7 ,12.8,12.8,0,0,1,18.3,0A0.47 0.47 ,0,0,0,21.5,9Z" />
<path
android:fillColor="#000000"
android:fillAlpha="0.3"
android:strokeAlpha="0.3"
android:strokeWidth="1"
- android:pathData="M15.93,14.64a0.49 0.49 ,0,0,0,0.35-0.15 0.5 0.5,0,0,0,0-0.71,6.08,6.08,0,0,0-8.58,0,0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.08,5.08,0,0,1,7.16,0A0.51 0.51 ,0,0,0,15.93,14.64Z" />
-</vector>
+ android:pathData="M7.7,13.78a0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.06,5.06,0,0,1,6.77-0.32,3.85,3.85,0,0,1,0.82-0.62A6.08,6.08,0,0,0,7.7,13.78Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M16.15,15.15a0.48 0.48 ,0,0,0,0,0.7L18.29,18l-2.14,2.15a0.48 0.48 ,0,0,0,0,0.7 0.48 0.48,0,0,0,0.7,0L19,18.71l2.15,2.14a0.48 0.48 ,0,0,0,0.7,0,0.48 0.48 ,0,0,0,0-0.7L19.71,18l2.14-2.15a0.49 0.49 ,0,1,0-0.7-0.7L19,17.29l-2.15-2.14A0.48 0.48 ,0,0,0,16.15,15.15Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_1.xml
similarity index 73%
copy from packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_1.xml
index e1ca60d..cc87827 100644
--- a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_1.xml
@@ -26,16 +26,13 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
android:pathData="M 11.99 16.5 C 12.8184271247 16.5 13.49 17.1715728753 13.49 18 C 13.49 18.8284271247 12.8184271247 19.5 11.99 19.5 C 11.1615728753 19.5 10.49 18.8284271247 10.49 18 C 10.49 17.1715728753 11.1615728753 16.5 11.99 16.5 Z" />
<path
android:fillColor="#000000"
android:fillAlpha="0.3"
android:strokeAlpha="0.3"
android:strokeWidth="1"
- android:pathData="M18.76,11.8a0.54 0.54 ,0,0,0,0.36-0.14 0.51 0.51,0,0,0,0-0.71A10.08,10.08,0,0,0,4.87,11a0.5 0.5 ,0,0,0,0,0.71 0.51 0.51,0,0,0,0.71,0,9.07,9.07,0,0,1,12.83,0A0.54 0.54 ,0,0,0,18.76,11.8Z" />
+ android:pathData="M5.58,11.66a9.07,9.07,0,0,1,12.83,0,0.52 0.52 ,0,0,0,0.71,0,0.51 0.51 ,0,0,0,0-0.71A10.08,10.08,0,0,0,4.87,11a0.5 0.5 ,0,0,0,0,0.71A0.51 0.51 ,0,0,0,5.58,11.66Z" />
<path
android:fillColor="#000000"
android:fillAlpha="0.3"
@@ -47,5 +44,8 @@
android:fillAlpha="0.3"
android:strokeAlpha="0.3"
android:strokeWidth="1"
- android:pathData="M15.93,14.64a0.49 0.49 ,0,0,0,0.35-0.15 0.5 0.5,0,0,0,0-0.71,6.08,6.08,0,0,0-8.58,0,0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.08,5.08,0,0,1,7.16,0A0.51 0.51 ,0,0,0,15.93,14.64Z" />
-</vector>
+ android:pathData="M7.7,13.78a0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.06,5.06,0,0,1,6.77-0.32,3.85,3.85,0,0,1,0.82-0.62A6.08,6.08,0,0,0,7.7,13.78Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M16.15,20.85a0.48 0.48 ,0,0,0,0.7,0L19,18.71l2.15,2.14a0.48 0.48 ,0,0,0,0.7,0,0.48 0.48 ,0,0,0,0-0.7L19.71,18l2.14-2.15a0.49 0.49 ,0,1,0-0.7-0.7L19,17.29l-2.15-2.14a0.49 0.49 ,0,0,0-0.7 0.7 L18.29,18l-2.14,2.15A0.48 0.48 ,0,0,0,16.15,20.85Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_2.xml
similarity index 64%
copy from packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_2.xml
index e1ca60d..eceaa74 100644
--- a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_2.xml
@@ -26,26 +26,23 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
android:pathData="M 11.99 16.5 C 12.8184271247 16.5 13.49 17.1715728753 13.49 18 C 13.49 18.8284271247 12.8184271247 19.5 11.99 19.5 C 11.1615728753 19.5 10.49 18.8284271247 10.49 18 C 10.49 17.1715728753 11.1615728753 16.5 11.99 16.5 Z" />
<path
android:fillColor="#000000"
android:fillAlpha="0.3"
android:strokeAlpha="0.3"
android:strokeWidth="1"
- android:pathData="M18.76,11.8a0.54 0.54 ,0,0,0,0.36-0.14 0.51 0.51,0,0,0,0-0.71A10.08,10.08,0,0,0,4.87,11a0.5 0.5 ,0,0,0,0,0.71 0.51 0.51,0,0,0,0.71,0,9.07,9.07,0,0,1,12.83,0A0.54 0.54 ,0,0,0,18.76,11.8Z" />
+ android:pathData="M18.41,11.66a0.52 0.52 ,0,0,0,0.71,0,0.51 0.51 ,0,0,0,0-0.71A10.08,10.08,0,0,0,4.87,11a0.5 0.5 ,0,0,0,0,0.71 0.51 0.51,0,0,0,0.71,0,9.07,9.07,0,0,1,12.83,0Z" />
<path
android:fillColor="#000000"
android:fillAlpha="0.3"
android:strokeAlpha="0.3"
android:strokeWidth="1"
- android:pathData="M2.15,8.85a0.48 0.48 ,0,0,0,0.7,0,12.8,12.8,0,0,1,18.3,0,0.48 0.48 ,0,0,0,0.7,0,0.48 0.48 ,0,0,0,0-0.7,13.77,13.77,0,0,0-19.7,0A0.48 0.48 ,0,0,0,2.15,8.85Z" />
+ android:pathData="M21.5,9a0.47 0.47 ,0,0,0,0.35-0.15 0.48 0.48,0,0,0,0-0.7,13.77,13.77,0,0,0-19.7,0,0.49 0.49 ,0,0,0,0.7 0.7 ,12.8,12.8,0,0,1,18.3,0A0.47 0.47 ,0,0,0,21.5,9Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M15.93,14.64a0.49 0.49 ,0,0,0,0.35-0.15 0.5 0.5,0,0,0,0-0.71,6.08,6.08,0,0,0-8.58,0,0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.08,5.08,0,0,1,7.16,0A0.51 0.51 ,0,0,0,15.93,14.64Z" />
-</vector>
+ android:pathData="M7.7,13.78a0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.06,5.06,0,0,1,6.77-0.32,3.85,3.85,0,0,1,0.82-0.62A6.08,6.08,0,0,0,7.7,13.78Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M16.15,15.15a0.48 0.48 ,0,0,0,0,0.7L18.29,18l-2.14,2.15a0.48 0.48 ,0,0,0,0,0.7 0.48 0.48,0,0,0,0.7,0L19,18.71l2.15,2.14a0.48 0.48 ,0,0,0,0.7,0,0.48 0.48 ,0,0,0,0-0.7L19.71,18l2.14-2.15a0.49 0.49 ,0,1,0-0.7-0.7L19,17.29l-2.15-2.14A0.48 0.48 ,0,0,0,16.15,15.15Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_3.xml
similarity index 69%
copy from packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_3.xml
index e1ca60d..7640376 100644
--- a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_0.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_3.xml
@@ -26,16 +26,10 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
android:pathData="M 11.99 16.5 C 12.8184271247 16.5 13.49 17.1715728753 13.49 18 C 13.49 18.8284271247 12.8184271247 19.5 11.99 19.5 C 11.1615728753 19.5 10.49 18.8284271247 10.49 18 C 10.49 17.1715728753 11.1615728753 16.5 11.99 16.5 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M18.76,11.8a0.54 0.54 ,0,0,0,0.36-0.14 0.51 0.51,0,0,0,0-0.71A10.08,10.08,0,0,0,4.87,11a0.5 0.5 ,0,0,0,0,0.71 0.51 0.51,0,0,0,0.71,0,9.07,9.07,0,0,1,12.83,0A0.54 0.54 ,0,0,0,18.76,11.8Z" />
+ android:pathData="M18.41,11.66a0.52 0.52 ,0,0,0,0.71,0,0.51 0.51 ,0,0,0,0-0.71A10.08,10.08,0,0,0,4.87,11a0.5 0.5 ,0,0,0,0,0.71 0.51 0.51,0,0,0,0.71,0,9.07,9.07,0,0,1,12.83,0Z" />
<path
android:fillColor="#000000"
android:fillAlpha="0.3"
@@ -44,8 +38,8 @@
android:pathData="M2.15,8.85a0.48 0.48 ,0,0,0,0.7,0,12.8,12.8,0,0,1,18.3,0,0.48 0.48 ,0,0,0,0.7,0,0.48 0.48 ,0,0,0,0-0.7,13.77,13.77,0,0,0-19.7,0A0.48 0.48 ,0,0,0,2.15,8.85Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M15.93,14.64a0.49 0.49 ,0,0,0,0.35-0.15 0.5 0.5,0,0,0,0-0.71,6.08,6.08,0,0,0-8.58,0,0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.08,5.08,0,0,1,7.16,0A0.51 0.51 ,0,0,0,15.93,14.64Z" />
-</vector>
+ android:pathData="M12,12A6.05,6.05,0,0,0,7.7,13.78a0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5,5,0,0,1,6.77-0.32,3.77,3.77,0,0,1,0.84-0.63A6,6,0,0,0,12,12Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M16.15,15.15a0.48 0.48 ,0,0,0,0,0.7L18.29,18l-2.14,2.15a0.48 0.48 ,0,0,0,0,0.7 0.48 0.48,0,0,0,0.7,0L19,18.71l2.15,2.14a0.48 0.48 ,0,0,0,0.7,0,0.48 0.48 ,0,0,0,0-0.7L19.71,18l2.14-2.15a0.49 0.49 ,0,1,0-0.7-0.7L19,17.29l-2.15-2.14A0.48 0.48 ,0,0,0,16.15,15.15Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_3.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_4.xml
similarity index 65%
copy from packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_3.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_4.xml
index 3a01032..8213e1c 100644
--- a/packages/overlays/IconPackCircularOverlay/res/drawable/ic_wifi_signal_3.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_4.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -30,14 +29,14 @@
android:pathData="M 11.99 16.5 C 12.8184271247 16.5 13.49 17.1715728753 13.49 18 C 13.49 18.8284271247 12.8184271247 19.5 11.99 19.5 C 11.1615728753 19.5 10.49 18.8284271247 10.49 18 C 10.49 17.1715728753 11.1615728753 16.5 11.99 16.5 Z" />
<path
android:fillColor="#000000"
- android:pathData="M18.76,11.8a0.54 0.54 ,0,0,0,0.36-0.14 0.51 0.51,0,0,0,0-0.71A10.08,10.08,0,0,0,4.87,11a0.5 0.5 ,0,0,0,0,0.71 0.51 0.51,0,0,0,0.71,0,9.07,9.07,0,0,1,12.83,0A0.54 0.54 ,0,0,0,18.76,11.8Z" />
+ android:pathData="M18.41,11.66a0.52 0.52 ,0,0,0,0.71,0,0.51 0.51 ,0,0,0,0-0.71A10.08,10.08,0,0,0,4.87,11a0.5 0.5 ,0,0,0,0,0.71 0.51 0.51,0,0,0,0.71,0,9.07,9.07,0,0,1,12.83,0Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
android:pathData="M21.5,9a0.47 0.47 ,0,0,0,0.35-0.15 0.48 0.48,0,0,0,0-0.7,13.77,13.77,0,0,0-19.7,0,0.49 0.49 ,0,0,0,0.7 0.7 ,12.8,12.8,0,0,1,18.3,0A0.47 0.47 ,0,0,0,21.5,9Z" />
<path
android:fillColor="#000000"
- android:pathData="M15.93,14.64a0.49 0.49 ,0,0,0,0.35-0.15 0.5 0.5,0,0,0,0-0.71,6.08,6.08,0,0,0-8.58,0,0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5.07,5.07,0,0,1,7.16,0A0.51 0.51 ,0,0,0,15.93,14.64Z" />
-</vector>
+ android:pathData="M12,12A6.05,6.05,0,0,0,7.7,13.78a0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0,5,5,0,0,1,6.77-0.32,3.77,3.77,0,0,1,0.84-0.63A6,6,0,0,0,12,12Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M16.15,15.15a0.48 0.48 ,0,0,0,0,0.7L18.29,18l-2.14,2.15a0.48 0.48 ,0,0,0,0,0.7 0.48 0.48,0,0,0,0.7,0L19,18.71l2.15,2.14a0.48 0.48 ,0,0,0,0.7,0,0.48 0.48 ,0,0,0,0-0.7L19.71,18l2.14-2.15a0.49 0.49 ,0,1,0-0.7-0.7L19,17.29l-2.15-2.14A0.48 0.48 ,0,0,0,16.15,15.15Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_disconnected.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_disconnected.xml
new file mode 100644
index 0000000..86c03c6
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_qs_wifi_disconnected.xml
@@ -0,0 +1,57 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M 11.99 16.5 C 12.8184271247 16.5 13.49 17.1715728753 13.49 18 C 13.49 18.8284271247 12.8184271247 19.5 11.99 19.5 C 11.1615728753 19.5 10.49 18.8284271247 10.49 18 C 10.49 17.1715728753 11.1615728753 16.5 11.99 16.5 Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M12,8A10,10,0,0,0,4.87,11a0.5 0.5 ,0,0,0,0,0.71 0.51 0.51,0,0,0,0.71,0,9.08,9.08,0,0,1,9.94-1.95A5.11,5.11,0,0,1,16.35,9,10,10,0,0,0,12,8Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M21.85,8.15a13.77,13.77,0,0,0-19.7,0,0.49 0.49 ,0,0,0,0.7 0.7 ,12.79,12.79,0,0,1,17.42-0.79A5.51,5.51,0,0,1,22,8.6 0.47 0.47,0,0,0,21.85,8.15Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M7.7,13.78a0.51 0.51 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.71,0A5.06,5.06,0,0,1,14,13.43a5.9,5.9,0,0,1,0.11-1A6.07,6.07,0,0,0,7.7,13.78Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M17.1,11.27a3.42,3.42,0,0,0-0.89,1.64 0.5 0.5,0,0,0,0.37 0.6 0.5 0.5 ,0,0,0,0.6-0.37A2.56,2.56,0,0,1,17.81,12a2.4,2.4,0,0,1,3.38,0,2.18,2.18,0,0,1,0.64,1.76A1.85,1.85,0,0,1,21,15.12a3.13,3.13,0,0,1-0.36 0.22 A2.8,2.8,0,0,0,19,17.5a0.51 0.51 ,0,0,0,0.41 0.58 h0.08a0.5 0.5 ,0,0,0,0.5-0.41,1.81,1.81,0,0,1,1.14-1.46l0.42-0.26a2.86,2.86,0,0,0,1.27-2.12,3.21,3.21,0,0,0-0.92-2.56A3.43,3.43,0,0,0,17.1,11.27Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 19.5 19.5 C 19.9142135624 19.5 20.25 19.8357864376 20.25 20.25 C 20.25 20.6642135624 19.9142135624 21 19.5 21 C 19.0857864376 21 18.75 20.6642135624 18.75 20.25 C 18.75 19.8357864376 19.0857864376 19.5 19.5 19.5 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_screenshot_delete.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_screenshot_delete.xml
new file mode 100644
index 0000000..174f36e
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_screenshot_delete.xml
@@ -0,0 +1,36 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M9,20h6a3,3,0,0,0,3-3V6h0.5a0.5 0.5 ,0,0,0,0-1H15L14,4H10L9,5H5.5a0.5 0.5 ,0,0,0,0,1H6V17A3,3,0,0,0,9,20ZM17,6V17a2,2,0,0,1-2,2H9a2,2,0,0,1-2-2V6Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M14,16a0.5 0.5 ,0,0,0,0.5-0.5v-7A0.5 0.5 ,0,0,0,14,8a0.5 0.5 ,0,0,0-0.5 0.5 v7A0.5 0.5 ,0,0,0,14,16Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M10,16a0.5 0.5 ,0,0,0,0.5-0.5v-7a0.5 0.5 ,0,0,0-1,0v7A0.5 0.5 ,0,0,0,10,16Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_settings_16dp.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_settings_16dp.xml
new file mode 100644
index 0000000..33d172c
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_settings_16dp.xml
@@ -0,0 +1,33 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="16dp"
+ android:height="16dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M5.31,19.26a1.6,1.6,0,0,0,0.53-0.09l1.8-0.7c0.26 0.16 0.52 0.31 0.79 0.45 l0.27,1.84A1.44,1.44,0,0,0,10.15,22h3.7a1.46,1.46,0,0,0,1.46-1.19l0.27-1.87c0.26-0.13 0.52 -0.28 0.78 -0.44l1.8 0.7 a1.47,1.47,0,0,0,0.54 0.1 A1.44,1.44,0,0,0,20,18.58l1.86-3.14a1.4,1.4,0,0,0-0.37-1.81l-1.52-1.17c0-0.14,0-0.29,0-0.45s0-0.3,0-0.44l1.52-1.17a1.41,1.41,0,0,0,0.36-1.83L20,5.47a1.46,1.46,0,0,0-1.29-0.73,1.69,1.69,0,0,0-0.53 0.09 l-1.8 0.7 c-0.26-0.16-0.52-0.31-0.79-0.45l-0.27-1.84A1.44,1.44,0,0,0,13.84,2h-3.7A1.45,1.45,0,0,0,8.7,3.22L8.43,5.08q-0.39 0.21 -0.78 0.45 L5.84,4.82a1.47,1.47,0,0,0-0.54-0.1,1.43,1.43,0,0,0-1.25 0.72 L2.2,8.55a1.37,1.37,0,0,0,0.37,1.83l1.52,1.17c0,0.14,0,0.3,0,0.45s0,0.3,0,0.44L2.56,13.61a1.42,1.42,0,0,0-0.36,1.83L4,18.53A1.46,1.46,0,0,0,5.31,19.26ZM3.16,14.4l1.53-1.16 0.43 -0.33,0-0.53c0-0.13,0-0.25,0-0.38s0-0.26,0-0.39l0-0.53-0.42-0.33L3.17,9.58a0.38 0.38 ,0,0,1-0.11-0.52L4.92,5.93a0.43 0.43 ,0,0,1,0.38-0.21 0.47 0.47,0,0,1,0.17,0l1.81 0.71 0.48 0.19 0.43-0.27A6.39,6.39,0,0,1,8.9,6l0.45-0.24 0.07 -0.5 0.27 -1.88A0.44 0.44 ,0,0,1,10.14,3h3.7a0.44 0.44 ,0,0,1,0.46 0.38 l0.27,1.85 0.08 0.51 0.46 0.24a5.3,5.3,0,0,1,0.7 0.4 l0.43 0.27 0.47-0.19,1.78-0.69a0.63 0.63 ,0,0,1,0.19,0,0.47 0.47 ,0,0,1,0.43 0.24 l1.83,3.08a0.42 0.42 ,0,0,1-0.1 0.55 l-1.52,1.16-0.42 0.33 ,0,0.53c0,0.13,0,0.25,0,0.38s0,0.26,0,0.39l0,0.53 0.42 0.33,1.51,1.15a0.42 0.42 ,0,0,1,0.13 0.52 l-1.87,3.16a0.43 0.43 ,0,0,1-0.39 0.21 0.57 0.57 ,0,0,1-0.18,0l-1.8-0.71-0.47-0.18-0.43 0.27 a7.46,7.46,0,0,1-0.71 0.41 l-0.45 0.24 -0.07 0.5 -0.27,1.86a0.47 0.47 ,0,0,1-0.47 0.34 h-3.7a0.44 0.44 ,0,0,1-0.46-0.38l-0.27-1.85-0.08-0.51L8.88,18a5.3,5.3,0,0,1-0.7-0.4l-0.43-0.27-0.47 0.19 -1.78 0.69 a0.58 0.58 ,0,0,1-0.19,0A0.48 0.48 ,0,0,1,4.89,18L3.08,15A0.42 0.42 ,0,0,1,3.16,14.4Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,15.91A3.92,3.92,0,1,0,8,12,4,4,0,0,0,12,15.91Zm0-6.83A2.92,2.92,0,1,1,9,12,3,3,0,0,1,12,9.08Z" />
+</vector>
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_signal_airplane.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_signal_airplane.xml
new file mode 100644
index 0000000..a5ef380
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_signal_airplane.xml
@@ -0,0 +1,30 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M2.8,15l7.2-0.73v3.49L8,19.38a1.52,1.52,0,0,0-0.54,1.16v1a0.52 0.52 ,0,0,0,0.17 0.38 0.51 0.51 ,0,0,0,0.39 0.12 L12,21.5l3.94 0.5 H16a0.5 0.5 ,0,0,0,0.33-0.12 0.52 0.52,0,0,0,0.17-0.38v-1A1.52,1.52,0,0,0,16,19.38l-2-1.62V14.27l7.2 0.73 a0.51 0.51 ,0,0,0,0.55-0.5,3.49,3.49,0,0,0-2.15-3.23L14,8.94V3.5a2,2,0,0,0-4,0V8.94L4.4,11.27A3.49,3.49,0,0,0,2.25,14.5a0.51 0.51 ,0,0,0,0.55 0.5 Zm2-2.81,5.9-2.45A0.5 0.5 ,0,0,0,11,9.28V3.5a1,1,0,0,1,2,0V9.28a0.5 0.5 ,0,0,0,0.31 0.46 l5.9,2.45a2.51,2.51,0,0,1,1.48,1.75l-7.14-0.72a0.52 0.52 ,0,0,0-0.38 0.13 0.5 0.5 ,0,0,0-0.17 0.37 V18a0.53 0.53 ,0,0,0,0.18 0.39 l2.14,1.76a0.53 0.53 ,0,0,1,0.18 0.39 v0.39l-3.44-0.43h-0.12l-3.44 0.43 v-0.39a0.53 0.53 ,0,0,1,0.18-0.39l2.14-1.76A0.53 0.53 ,0,0,0,11,18V13.72a0.5 0.5 ,0,0,0-0.17-0.37 0.52 0.52,0,0,0-0.38-0.13l-7.14 0.72 A2.51,2.51,0,0,1,4.79,12.19Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_signal_flashlight.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_signal_flashlight.xml
new file mode 100644
index 0000000..1526691
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_signal_flashlight.xml
@@ -0,0 +1,33 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M11,22h2a2,2,0,0,0,2-2V10a6.84,6.84,0,0,0,3-6V3H6V4a6.84,6.84,0,0,0,3,6V20A2,2,0,0,0,11,22ZM17,4a8.26,8.26,0,0,1-0.07,1H7.07A8.26,8.26,0,0,1,7,4ZM7.28,6h9.45a5.24,5.24,0,0,1-2.24,3.14L14,9.43V20a1,1,0,0,1-1,1H11a1,1,0,0,1-1-1V9.43l-0.49-0.29A5.25,5.25,0,0,1,7.28,6Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 12 13 C 12.5522847498 13 13 13.4477152502 13 14 C 13 14.5522847498 12.5522847498 15 12 15 C 11.4477152502 15 11 14.5522847498 11 14 C 11 13.4477152502 11.4477152502 13 12 13 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_swap_vert.xml
similarity index 62%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_swap_vert.xml
index 2bcaf2a..2f3ac2e 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_swap_vert.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,12 +23,11 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
- android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M18.85,16.65a0.48 0.48 ,0,0,0-0.7,0L16,18.79V10.5a0.5 0.5 ,0,0,0-1,0v8.29l-2.15-2.14a0.49 0.49 ,0,0,0-0.7 0.7 l3.35,3.36,3.35-3.36A0.48 0.48 ,0,0,0,18.85,16.65Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M11.85,6.64l-3-3h0L8.5,3.29l-0.35 0.35 h0l-3,3a0.5 0.5 ,0,0,0,0,0.71 0.5 0.5,0,0,0,0.7,0L8,5.2v8.3a0.5 0.5 ,0,0,0,1,0V5.2l2.15,2.15a0.48 0.48 ,0,0,0,0.7,0A0.5 0.5 ,0,0,0,11.85,6.64Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_volume_alarm.xml b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_volume_alarm.xml
new file mode 100644
index 0000000..c67e897
--- /dev/null
+++ b/packages/overlays/IconPackCircularSystemUIOverlay/res/drawable/ic_volume_alarm.xml
@@ -0,0 +1,39 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,4a9,9,0,1,0,9,9A9,9,0,0,0,12,4Zm0,17a8,8,0,1,1,8-8A8,8,0,0,1,12,21Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M17.51,2.71a2,2,0,0,0-1.36 0.71 0.5 0.5 ,0,0,0,0.76 0.64 ,1,1,0,0,1,1.41-0.12l1.53,1.29a1,1,0,0,1,0.35 0.68 ,1,1,0,0,1-0.23 0.73 0.49 0.49 ,0,0,0,0.06 0.7 0.51 0.51 ,0,0,0,0.32 0.12 0.5 0.5 ,0,0,0,0.39-0.18,2,2,0,0,0,0.46-1.46,2,2,0,0,0-0.7-1.35L19,3.18A1.92,1.92,0,0,0,17.51,2.71Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3.65,7.46A0.51 0.51 ,0,0,0,4,7.34 0.49 0.49,0,0,0,4,6.64a1,1,0,0,1-0.23-0.73,1,1,0,0,1,0.35-0.68L5.68,3.94a1,1,0,0,1,0.73-0.23,1,1,0,0,1,0.68 0.35 0.5 0.5 ,0,1,0,0.76-0.64,2,2,0,0,0-1.36-0.71A1.92,1.92,0,0,0,5,3.18L3.5,4.47a2,2,0,0,0-0.7,1.35,2,2,0,0,0,0.46,1.46A0.5 0.5 ,0,0,0,3.65,7.46Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12.5,12.79V8a0.5 0.5 ,0,0,0-1,0v5.21l3.13,3.12a0.47 0.47 ,0,0,0,0.35 0.15 0.5 0.5 ,0,0,0,0.35-0.85Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/Android.mk b/packages/overlays/IconPackFilledAndroidOverlay/Android.mk
similarity index 90%
rename from packages/overlays/IconPackCircularOverlay/Android.mk
rename to packages/overlays/IconPackFilledAndroidOverlay/Android.mk
index 010eb81..e0db3a2 100644
--- a/packages/overlays/IconPackCircularOverlay/Android.mk
+++ b/packages/overlays/IconPackFilledAndroidOverlay/Android.mk
@@ -13,11 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_RRO_THEME := IconPackCircular
+LOCAL_RRO_THEME := IconPackFilledAndroid
LOCAL_CERTIFICATE := platform
LOCAL_PRODUCT_MODULE := true
@@ -25,7 +24,7 @@
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_PACKAGE_NAME := IconPackCircularOverlay
+LOCAL_PACKAGE_NAME := IconPackFilledAndroidOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)
diff --git a/packages/overlays/IconPackFilledOverlay/AndroidManifest.xml b/packages/overlays/IconPackFilledAndroidOverlay/AndroidManifest.xml
similarity index 87%
rename from packages/overlays/IconPackFilledOverlay/AndroidManifest.xml
rename to packages/overlays/IconPackFilledAndroidOverlay/AndroidManifest.xml
index bf507cd..6613407 100644
--- a/packages/overlays/IconPackFilledOverlay/AndroidManifest.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/AndroidManifest.xml
@@ -16,9 +16,9 @@
*/
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.theme.icon_pack.filled"
+ package="com.android.theme.icon_pack.filled.android"
android:versionCode="1"
android:versionName="1.0">
- <overlay android:targetPackage="android" android:category="android.theme.customization.icon_pack" android:priority="1"/>
+ <overlay android:targetPackage="android" android:category="android.theme.customization.icon_pack.android" android:priority="1"/>
<application android:label="Filled" android:hasCode="false"/>
</manifest>
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_bt_headphones_a2dp.xml
similarity index 72%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_bt_headphones_a2dp.xml
index 45cf95f..428d453 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_bt_headphones_a2dp.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M21,18V11a9,9,0,0,0-9.6-9A9.21,9.21,0,0,0,3,11.31V17.2C3,19.66,4.34,21,6,21H8a1,1,0,0,0,1-1V14a1,1,0,0,0-1-1H5V11.29A7.19,7.19,0,0,1,11.79,4,7,7,0,0,1,19,11v2H16a1,1,0,0,0-1,1v6a1,1,0,0,0,1,1h2A3,3,0,0,0,21,18Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_expand_more.xml
similarity index 76%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_expand_more.xml
index 45cf95f..3ef7dd1 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_expand_more.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M19.29,8.29a1,1,0,0,0-1.41,0L12,14.17,6.12,8.29A1,1,0,1,0,4.71,9.71l6.58,6.58a1,1,0,0,0,1.42,0l6.58-6.58A1,1,0,0,0,19.29,8.29Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_info_outline_24.xml
similarity index 76%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_info_outline_24.xml
index 45cf95f..e39a2a0 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_info_outline_24.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M2,12A10,10,0,1,0,12,2,10,10,0,0,0,2,12Zm11,5.42a1,1,0,0,1-2,0V10.68a1,1,0,0,1,2,0ZM12,5.58a1.35,1.35,0,1,1-1.35,1.35A1.34,1.34,0,0,1,12,5.58Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_invert_colors.xml
similarity index 76%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_invert_colors.xml
index 45cf95f..0564c73 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_invert_colors.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M17.44,7.71,12.7,3a1,1,0,0,0-1.41,0h0L6.56,7.71a8.21,8.21,0,0,0-0.62,11.1,8,8,0,0,0,12.12,0A8.21,8.21,0,0,0,17.44,7.71ZM12,19.59A6,6,0,0,1,7.76,9.35L12,5.1Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_lockscreen_ime.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_lockscreen_ime.xml
new file mode 100644
index 0000000..8b9f562
--- /dev/null
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_lockscreen_ime.xml
@@ -0,0 +1,55 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3,21H21a2,2,0,0,0,2-2V6a2,2,0,0,0-2-2H3A2,2,0,0,0,1,6V19A2,2,0,0,0,3,21ZM3,6H21V19H3Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9 8 H 11 V 10 H 9 V 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 5 8 H 7 V 10 H 5 V 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 8 16 H 16 V 17 H 8 V 16 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 13 8 H 15 V 10 H 13 V 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9 12 H 11 V 14 H 9 V 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 5 12 H 7 V 14 H 5 V 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 13 12 H 15 V 14 H 13 V 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 17 8 H 19 V 10 H 17 V 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 17 12 H 19 V 14 H 17 V 12 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_mode_edit.xml
similarity index 69%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_mode_edit.xml
index 45cf95f..217845d 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_mode_edit.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M20.71,7a1,1,0,0,0,0-1.41h0L18.37,3.29a1,1,0,0,0-1.41,0h0L15.13,5.12l3.75,3.75Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3,18.08V20.5a0.5 0.5 ,0,0,0,0.5 0.5 H5.92a2,2,0,0,0,1.41-0.59L17.81,9.94,14.06,6.19,3.59,16.66A2,2,0,0,0,3,18.08Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_phone.xml
similarity index 69%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_phone.xml
index 45cf95f..2eaa368 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_phone.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M9.78,7.06,9.13,3.8a1,1,0,0,0-1-0.8H4A1,1,0,0,0,3,4a17.92,17.92,0,0,0,2.43,8,18.08,18.08,0,0,0,6.5,6.5,17.92,17.92,0,0,0,8,2.43,1,1,0,0,0,1-1V15.82a1,1,0,0,0-0.8-1l-3.26-0.65a1,1,0,0,0-0.9 0.27 l-2.62,2.62a16.14,16.14,0,0,1-6.5-6.5L9.51,8A1,1,0,0,0,9.78,7.06Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_qs_night_display_on.xml
similarity index 76%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_qs_night_display_on.xml
index 45cf95f..f12beec 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_qs_night_display_on.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M17.32,4.13a1,1,0,0,0-0.19-1.9A10,10,0,1,0,15,22a9.91,9.91,0,0,0,2.12-0.23,1,1,0,0,0,0.2-1.9,8.48,8.48,0,0,1,0-15.74Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_signal_location.xml
similarity index 76%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_signal_location.xml
index 45cf95f..1d107b9 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_signal_location.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M12,2A7,7,0,0,0,5,9c0,4.17,4.42,9.92,6.24,12.11a1,1,0,0,0,1.53,0C14.58,18.92,19,13.17,19,9A7,7,0,0,0,12,2Zm0,9.5A2.5,2.5,0,1,1,14.5,9,2.5,2.5,0,0,1,12,11.5Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_0.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_0.xml
similarity index 93%
rename from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_0.xml
rename to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_0.xml
index 7ff3d08..0f7c589 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_0.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_0.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -29,4 +28,4 @@
android:strokeAlpha="0.3"
android:strokeWidth="1"
android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_1.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_1.xml
similarity index 94%
rename from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_1.xml
rename to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_1.xml
index f83e6d5..aa13b7e 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_1.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_1.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -32,4 +31,4 @@
<path
android:fillColor="#000000"
android:pathData="M12.82,21.6l5.11-6.36a9,9,0,0,0-11.87,0l5.1,6.35A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_2.xml
similarity index 94%
rename from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
rename to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_2.xml
index 2bcaf2a..b6d1b72 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_2.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -32,4 +31,4 @@
<path
android:fillColor="#000000"
android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_3.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_3.xml
similarity index 94%
rename from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_3.xml
rename to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_3.xml
index 82b4c9d..fe57182 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_3.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_3.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -32,4 +31,4 @@
<path
android:fillColor="#000000"
android:pathData="M12.82,21.6l8.25-10.26a14,14,0,0,0-18.14,0l8.23,10.26A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_4.xml
similarity index 93%
rename from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
rename to packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_4.xml
index 45cf95f..d8aa0c2 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledAndroidOverlay/res/drawable/ic_wifi_signal_4.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -26,4 +25,4 @@
<path
android:fillColor="#000000"
android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/Android.mk b/packages/overlays/IconPackFilledOverlay/Android.mk
deleted file mode 100644
index 14bc1d6..0000000
--- a/packages/overlays/IconPackFilledOverlay/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2019, 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.
-#
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := IconPackFilled
-LOCAL_CERTIFICATE := platform
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := IconPackFilledOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/packages/overlays/IconPackCircularOverlay/Android.mk b/packages/overlays/IconPackFilledSystemUIOverlay/Android.mk
similarity index 89%
copy from packages/overlays/IconPackCircularOverlay/Android.mk
copy to packages/overlays/IconPackFilledSystemUIOverlay/Android.mk
index 010eb81..2506132 100644
--- a/packages/overlays/IconPackCircularOverlay/Android.mk
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/Android.mk
@@ -17,7 +17,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_RRO_THEME := IconPackCircular
+LOCAL_RRO_THEME := IconPackFilledSystemUI
LOCAL_CERTIFICATE := platform
LOCAL_PRODUCT_MODULE := true
@@ -25,7 +25,7 @@
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_PACKAGE_NAME := IconPackCircularOverlay
+LOCAL_PACKAGE_NAME := IconPackFilledSystemUIOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)
diff --git a/packages/overlays/IconPackFilledOverlay/AndroidManifest.xml b/packages/overlays/IconPackFilledSystemUIOverlay/AndroidManifest.xml
similarity index 80%
copy from packages/overlays/IconPackFilledOverlay/AndroidManifest.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/AndroidManifest.xml
index bf507cd..a1210c7 100644
--- a/packages/overlays/IconPackFilledOverlay/AndroidManifest.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/AndroidManifest.xml
@@ -16,9 +16,9 @@
*/
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.theme.icon_pack.filled"
+ package="com.android.theme.icon_pack.filled.systemui"
android:versionCode="1"
android:versionName="1.0">
- <overlay android:targetPackage="android" android:category="android.theme.customization.icon_pack" android:priority="1"/>
+ <overlay android:targetPackage="com.android.systemui" android:category="android.theme.customization.icon_pack.systemui" android:priority="1"/>
<application android:label="Filled" android:hasCode="false"/>
</manifest>
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_brightness_thumb.xml
similarity index 65%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_brightness_thumb.xml
index 45cf95f..fce6e94 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_brightness_thumb.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -24,6 +23,6 @@
<path
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
- android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="M4,15.3V19a1,1,0,0,0,1,1H8.69l2.6,2.6a1,1,0,0,0,1.41,0L15.3,20H19a1,1,0,0,0,1-1V15.31l2.6-2.6a1,1,0,0,0,0-1.41L20,8.69V5a1,1,0,0,0-1-1H15.31l-2.6-2.6a1,1,0,0,0-1.41,0L8.69,4H5A1,1,0,0,0,4,5V8.69l-2.6,2.6a1,1,0,0,0,0,1.41ZM12,7a5,5,0,1,1-5,5A5,5,0,0,1,12,7Z" />
</vector>
diff --git a/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_data_saver_off.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_data_saver_off.xml
new file mode 100644
index 0000000..0949dc9
--- /dev/null
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_data_saver_off.xml
@@ -0,0 +1,34 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,8a1,1,0,0,0-1,1v2H9a1,1,0,0,0,0,2h2v2a1,1,0,0,0,2,0V13h2a1,1,0,0,0,0-2H13V9A1,1,0,0,0,12,8Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21.37,15.5A10.15,10.15,0,0,0,22,12a10,10,0,0,0-8.43-9.88 0.51 0.51,0,0,0-0.57 0.5 V4.15a0.49 0.49 ,0,0,0,0.41 0.48 ,7.5,7.5,0,0,1,5.7,9.75 0.49 0.49,0,0,0,0.21 0.59 l1.33 0.77 A0.51 0.51 ,0,0,0,21.37,15.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M10.43,2.12a10,10,0,1,0,9.36,16.13 0.5 0.5,0,0,0-0.15-0.74l-1.32-0.76a0.48 0.48 ,0,0,0-0.62 0.12 ,7.44,7.44,0,0,1-5.93,2.63,7.58,7.58,0,0,1-7.25-7.07,7.5,7.5,0,0,1,6.07-7.79A0.51 0.51 ,0,0,0,11,4.15V2.62A0.5 0.5 ,0,0,0,10.43,2.12Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_dnd.xml
similarity index 76%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_dnd.xml
index 45cf95f..e6086f3 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_dnd.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M12,22A10,10,0,1,0,2,12,10,10,0,0,0,12,22ZM8,11h8a1,1,0,0,1,0,2H8a1,1,0,0,1,0-2Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_drag_handle.xml
similarity index 76%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_drag_handle.xml
index 45cf95f..8f6db49 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_drag_handle.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M19,9H5a1,1,0,0,0,0,2H19a1,1,0,0,0,0-2Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M19,13H5a1,1,0,0,0,0,2H19a1,1,0,0,0,0-2Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_headset.xml
similarity index 72%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_headset.xml
index 45cf95f..428d453 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_headset.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M21,18V11a9,9,0,0,0-9.6-9A9.21,9.21,0,0,0,3,11.31V17.2C3,19.66,4.34,21,6,21H8a1,1,0,0,0,1-1V14a1,1,0,0,0-1-1H5V11.29A7.19,7.19,0,0,1,11.79,4,7,7,0,0,1,19,11v2H16a1,1,0,0,0-1,1v6a1,1,0,0,0,1,1h2A3,3,0,0,0,21,18Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_hotspot.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_hotspot.xml
new file mode 100644
index 0000000..00241f8
--- /dev/null
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_hotspot.xml
@@ -0,0 +1,34 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M15.46,16.46h0A1,1,0,0,0,17,16.35,5.9,5.9,0,0,0,18,13,6,6,0,1,0,7,16.35a1,1,0,0,0,1.51 0.11 h0a1,1,0,0,0,0.11-1.29A3.9,3.9,0,0,1,8,12.44a4,4,0,1,1,7.32,2.73A1,1,0,0,0,15.46,16.46Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M10.86,3.06A10,10,0,0,0,4.19,19.25a1,1,0,0,0,1.49 0.07 A1,1,0,0,0,5.75,18a8.05,8.05,0,0,1-1.59-6.61A8,8,0,0,1,20,13a7.89,7.89,0,0,1-1.77,5,1,1,0,0,0,0.08,1.31h0a1,1,0,0,0,1.49-0.07A9.9,9.9,0,0,0,22,13,10,10,0,0,0,10.86,3.06Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M10,13a2,2,0,1,0,2-2A2,2,0,0,0,10,13Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_info.xml
similarity index 76%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_info.xml
index 45cf95f..e39a2a0 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_info.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M2,12A10,10,0,1,0,12,2,10,10,0,0,0,2,12Zm11,5.42a1,1,0,0,1-2,0V10.68a1,1,0,0,1,2,0ZM12,5.58a1.35,1.35,0,1,1-1.35,1.35A1.34,1.34,0,0,1,12,5.58Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_lockscreen_ime.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_lockscreen_ime.xml
new file mode 100644
index 0000000..8b9f562
--- /dev/null
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_lockscreen_ime.xml
@@ -0,0 +1,55 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3,21H21a2,2,0,0,0,2-2V6a2,2,0,0,0-2-2H3A2,2,0,0,0,1,6V19A2,2,0,0,0,3,21ZM3,6H21V19H3Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9 8 H 11 V 10 H 9 V 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 5 8 H 7 V 10 H 5 V 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 8 16 H 16 V 17 H 8 V 16 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 13 8 H 15 V 10 H 13 V 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9 12 H 11 V 14 H 9 V 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 5 12 H 7 V 14 H 5 V 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 13 12 H 15 V 14 H 13 V 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 17 8 H 19 V 10 H 17 V 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 17 12 H 19 V 14 H 17 V 12 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_notifications_alert.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_notifications_alert.xml
new file mode 100644
index 0000000..7858b05
--- /dev/null
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_notifications_alert.xml
@@ -0,0 +1,37 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M5.4,3.27A10.45,10.45,0,0,0,2.15,9.34a1,1,0,0,0,2,0.33A8.44,8.44,0,0,1,6.77,4.73a1,1,0,0,0,0-1.43A1,1,0,0,0,5.4,3.27Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M19.88,9.66a1,1,0,1,0,2-0.32A10.51,10.51,0,0,0,18.6,3.28a1,1,0,0,0-1.4,0,1,1,0,0,0,0,1.42A8.5,8.5,0,0,1,19.88,9.66Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M14,20H10a2,2,0,0,0,4,0Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,2.5A1.5,1.5,0,0,0,10.5,4v0.68C7.63,5.36,6,7.92,6,11v5L3.85,18.15a0.5 0.5 ,0,0,0,0,0.71A0.48 0.48 ,0,0,0,4.2,19H19.8a0.49 0.49 ,0,0,0,0.35-0.85L18,16V11c0-3.07-1.64-5.64-4.5-6.32V4A1.5,1.5,0,0,0,12,2.5ZM16,11v6H8V11c0-2.48,1.51-4.5,4-4.5S16,8.52,16,11Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_notifications_silence.xml
similarity index 61%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_notifications_silence.xml
index 2bcaf2a..2cefe4b 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_notifications_silence.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,11 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M20.73,19.46l-0.6-0.6L5.54,4.26A0.9 0.9 ,0,1,0,4.27,5.53l2.4,2.4A7.35,7.35,0,0,0,6,11v5L3.85,18.15a0.5 0.5 ,0,0,0,0,0.71A0.48 0.48 ,0,0,0,4.2,19H17.73l1.73,1.73a0.9 0.9 ,0,0,0,1.27,0A0.88 0.88 ,0,0,0,20.73,19.46Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M12,2.5A1.5,1.5,0,0,0,10.5,4v0.68a5.62,5.62,0,0,0-1.7 0.72 L18,14.6V11c0-3.07-1.64-5.64-4.5-6.32V4A1.5,1.5,0,0,0,12,2.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M14,20H10a2,2,0,0,0,4,0Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_auto_rotate.xml
similarity index 64%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_auto_rotate.xml
index 2bcaf2a..f823812 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_auto_rotate.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M16.41,11h2.83L11.05,2.78a1.62,1.62,0,0,0-2.29,0L4.27,7.31,2.85,5.89A0.5 0.5 ,0,0,0,2,6.25V10.5a0.5 0.5 ,0,0,0,0.5 0.5 H6.75a0.5 0.5 ,0,0,0,0.36-0.85L5.69,8.73,9.93,4.49Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M22,13.51a0.5 0.5 ,0,0,0-0.5-0.5H17.25a0.5 0.5 ,0,0,0-0.36 0.85 l1.35,1.35-4.31,4.31L7.44,13H4.61l8.19,8.18a1.62,1.62,0,0,0,2.29,0l4.57-4.55,1.49,1.49a0.5 0.5 ,0,0,0,0.85-0.36Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_bluetooth_connecting.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_bluetooth_connecting.xml
new file mode 100644
index 0000000..f64bd30
--- /dev/null
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_bluetooth_connecting.xml
@@ -0,0 +1,34 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M18.67,16.42A0.84 0.84 ,0,0,0,20,16.19a9.83,9.83,0,0,0,1-4.3,10,10,0,0,0-0.91-4.12 0.85 0.85,0,0,0-1.39-0.23 0.87 0.87,0,0,0-0.17,1,8.71,8.71,0,0,1,0,7A0.84 0.84 ,0,0,0,18.67,16.42Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3.48,18.56a1,1,0,0,0,1.47,0l4.05-4V21a1,1,0,0,0,1,1,1.07,1.07,0,0,0,0.71-0.27l0.05-0.05,4.46-4.46a1,1,0,0,0,0-1.48L11.51,12l3.75-3.73a1,1,0,0,0,0-1.48L10.79,2.32l0,0A1,1,0,0,0,9,3V9.49L5,5.43A1,1,0,0,0,3.48,6.9L8.57,12,3.48,17.09A1,1,0,0,0,3.48,18.56ZM11,5.38l2.15,2.15L11,9.68Zm0,8.94,2.15,2.15L11,18.62Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M15,11.3a1,1,0,0,0,0,1.42l1.61,1.61A6.44,6.44,0,0,0,17,12a6.54,6.54,0,0,0-0.43-2.31Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_bluetooth_on.xml
similarity index 67%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_bluetooth_on.xml
index 45cf95f..b014083 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_bluetooth_on.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M17.21,6.79l-4.5-4.5A1,1,0,0,0,11,3V9.59L7.2,5.78A1,1,0,0,0,5.79,7.2l4.8,4.8-4.8,4.8A1,1,0,0,0,7.2,18.22L11,14.41V21a1,1,0,0,0,0.62 0.92 A0.84 0.84 ,0,0,0,12,22a1,1,0,0,0,0.71-0.29l4.5-4.5a1,1,0,0,0,0-1.42L13.42,12l3.79-3.79A1,1,0,0,0,17.21,6.79ZM15.09,16.5,13,18.58V14.42ZM13,9.58V5.42L15.09,7.5Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_brightness_auto_on.xml
similarity index 66%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_brightness_auto_on.xml
index 2bcaf2a..f3b1c01 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_brightness_auto_on.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M10,14.61h4L14.85,17H17L13.11,7H10.87L7,17H9.15Zm1.54-4.24 0.38 -1.2h0.11l0.38,1.2 0.91 ,2.51H10.63Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M4,20H8.69L12,23.31,15.31,20H20V15.31L23.31,12,20,8.69V4H15.31L12,0.69,8.69,4H4V8.69L0.69,12,4,15.31Zm-0.48-8L6,9.52V6H9.52L12,3.52,14.48,6H18V9.52L20.48,12,18,14.48V18H14.48L12,20.48,9.52,18H6V14.48Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_cancel.xml
similarity index 72%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_cancel.xml
index 45cf95f..0403d81 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_cancel.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M12,2A10,10,0,1,0,22,12,10,10,0,0,0,12,2Zm4.3,12.89a1,1,0,0,1,0,1.41,1,1,0,0,1-1.41,0h0L12,13.41,9.11,16.3A1,1,0,1,1,7.7,14.89L10.59,12,7.7,9.11A1,1,0,1,1,9.11,7.7L12,10.59,14.89,7.7A1,1,0,1,1,16.3,9.11L13.41,12Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_cast_on.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_cast_on.xml
new file mode 100644
index 0000000..0fd763b
--- /dev/null
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_cast_on.xml
@@ -0,0 +1,40 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M1.82,16.08a5,5,0,0,1,4.1,4.08,1,1,0,0,0,1,0.84,1,1,0,0,0,1-1.14,7,7,0,0,0-5.8-5.78,1,1,0,0,0-0.29,2Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M19,7H5V8.63A13,13,0,0,1,13.37,17H19Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3,5H21V19H14v2h7a2,2,0,0,0,2-2V5a2,2,0,0,0-2-2H3A2,2,0,0,0,1,5V8H3Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M1.85,12A9.06,9.06,0,0,1,10,20.12a1,1,0,0,0,1,0.88,1,1,0,0,0,1-1.1,11,11,0,0,0-9.87-9.85A1,1,0,0,0,1,11,1,1,0,0,0,1.85,12Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M2,21H4a3,3,0,0,0-3-3v2A1,1,0,0,0,2,21Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_no_sim.xml
similarity index 68%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_no_sim.xml
index 45cf95f..a488ee1 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_no_sim.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M17,3H10L7.66,5.34,19,16.68V5A2,2,0,0,0,17,3Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M20.73,22.23a0.9 0.9 ,0,0,0,0-1.27L4.28,4.51A0.88 0.88 ,0,0,0,3,4.5H3A0.9 0.9 ,0,0,0,3,5.78l2,2V19a2,2,0,0,0,2,2H17a2,2,0,0,0,1-0.26l1.49,1.49A0.9 0.9 ,0,0,0,20.73,22.23Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_vpn.xml
similarity index 76%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_vpn.xml
index 45cf95f..ee2677d 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_vpn.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M21,10H12.65a6,6,0,1,0,0,4H16v2a2,2,0,0,0,4,0V14h1a2,2,0,0,0,0-4ZM7,14a2,2,0,1,1,2-2A2,2,0,0,1,7,14Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_0.xml
similarity index 62%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_0.xml
index 2bcaf2a..395b2e2 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_0.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M23.43,6.57A20.54,20.54,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L14,20.13V12h6.54l3.12-3.89A1.06,1.06,0,0,0,23.43,6.57Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M22.32,14.68a1,1,0,0,0-1.37,0l-1.44,1.44-1.45-1.45a1,1,0,0,0-1.37,0h0a1,1,0,0,0,0,1.37l1.45,1.45L16.68,19h0a1,1,0,0,0,0,1.37h0a1,1,0,0,0,1.37,0l1.45-1.45L21,20.32A1,1,0,0,0,22.32,19L20.87,17.5l1.45-1.45A1,1,0,0,0,22.32,14.68Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_1.xml
similarity index 64%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_1.xml
index 2bcaf2a..f24bb24 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_1.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -28,8 +27,8 @@
android:fillAlpha="0.3"
android:strokeAlpha="0.3"
android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M14,12h6.54l3.12-3.89a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L14,20.13Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M22.71,15.67,20.88,17.5l1.83,1.83a1,1,0,0,1,0,1.38h0a1,1,0,0,1-1.38,0L19.5,18.88l-1.83,1.83a1,1,0,0,1-1.38,0h0a1,1,0,0,1,0-1.38l1.83-1.83-1.82-1.82a1,1,0,0,1,0-1.38h0a1,1,0,0,1,1.38,0L19.5,16.1l1.82-1.82a1,1,0,0,1,1.38,0h0A1,1,0,0,1,22.71,15.67Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_2.xml
similarity index 60%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_2.xml
index 2bcaf2a..4491abb 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_2.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -28,8 +27,8 @@
android:fillAlpha="0.3"
android:strokeAlpha="0.3"
android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M14,12h6.54l3.12-3.89a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L14,20.13Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M14,20.13,12.82,21.6a1.07,1.07,0,0,1-1.66,0l-5.1-6.35A9,9,0,0,1,12,13a8.76,8.76,0,0,1,2,0.23Zm8.71-5.84h0a1,1,0,0,0-1.38,0l-1.82,1.82-1.82-1.82a1,1,0,0,0-1.38,0h0a1,1,0,0,0,0,1.38l1.82,1.82-1.83,1.83a1,1,0,0,0,0,1.38h0a1,1,0,0,0,1.38,0l1.83-1.83,1.83,1.83a1,1,0,0,0,1.38,0h0a1,1,0,0,0,0-1.38l-1.83-1.83,1.83-1.83A1,1,0,0,0,22.71,14.29Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_3.xml
similarity index 61%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_3.xml
index 2bcaf2a..cd4f78f5 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_3.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -28,8 +27,8 @@
android:fillAlpha="0.3"
android:strokeAlpha="0.3"
android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M14,12h6.54l3.12-3.89a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L14,20.13Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M14,20.13,12.82,21.6a1.07,1.07,0,0,1-1.66,0l-7-8.7A12,12,0,0,1,18.62,12H14Zm8.71-5.84h0a1,1,0,0,0-1.38,0l-1.82,1.82-1.82-1.82a1,1,0,0,0-1.38,0h0a1,1,0,0,0,0,1.38l1.82,1.82-1.83,1.83a1,1,0,0,0,0,1.38h0a1,1,0,0,0,1.38,0l1.83-1.83,1.83,1.83a1,1,0,0,0,1.38,0h0a1,1,0,0,0,0-1.38l-1.83-1.83,1.83-1.83A1,1,0,0,0,22.71,14.29Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_4.xml
similarity index 60%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_4.xml
index 2bcaf2a..47ee832 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_4.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -28,8 +27,8 @@
android:fillAlpha="0.3"
android:strokeAlpha="0.3"
android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M14,12h6.54l3.12-3.89a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L14,20.13Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M14,20.13,12.82,21.6a1.07,1.07,0,0,1-1.66,0L2.93,11.35a14,14,0,0,1,18.14,0l-0.53 0.66 H14Zm8.71-5.84h0a1,1,0,0,0-1.38,0l-1.82,1.82-1.82-1.82a1,1,0,0,0-1.38,0h0a1,1,0,0,0,0,1.38l1.82,1.82-1.83,1.83a1,1,0,0,0,0,1.38h0a1,1,0,0,0,1.38,0l1.83-1.83,1.83,1.83a1,1,0,0,0,1.38,0h0a1,1,0,0,0,0-1.38l-1.83-1.83,1.83-1.83A1,1,0,0,0,22.71,14.29Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_disconnected.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_disconnected.xml
new file mode 100644
index 0000000..8bef29c
--- /dev/null
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_qs_wifi_disconnected.xml
@@ -0,0 +1,34 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M14.61,13a5,5,0,0,1,5-5A4.93,4.93,0,0,1,22.8,9.18l0.86-1.07a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0l3.74-4.66A5,5,0,0,1,14.61,13Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M20,22a1.1,1.1,0,1,0-1.1-1.1A1.1,1.1,0,0,0,20,22Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M22.69,15.48a2.79,2.79,0,0,0,0.82-2,3.51,3.51,0,0,0-6.82-1.15 0.86 0.86,0,0,0,0.81,1.14 0.89 0.89,0,0,0,0.84-0.55,1.75,1.75,0,0,1,3.41 0.55 ,1.79,1.79,0,0,1-0.51,1.24l-1.09,1.1a3.21,3.21,0,0,0-1,2.12s0,0.05,0,0.08A0.89 0.89 ,0,0,0,20,19a0.87 0.87 ,0,0,0,0.87-0.77,2.85,2.85,0,0,1,1-1.95Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_screenshot_delete.xml
similarity index 70%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_screenshot_delete.xml
index 45cf95f..447d848 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_screenshot_delete.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M18,4H15.5l-0.71-0.71a1,1,0,0,0-0.7-0.29H9.9a1,1,0,0,0-0.7 0.29 L8.49,4H6A1,1,0,0,0,6,6H18a1,1,0,0,0,1-1A1,1,0,0,0,18,4Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M18,19V7H6V19a2,2,0,0,0,2,2h8A2,2,0,0,0,18,19Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_settings_16dp.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_settings_16dp.xml
new file mode 100644
index 0000000..d292b13
--- /dev/null
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_settings_16dp.xml
@@ -0,0 +1,28 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="16dp"
+ android:height="16dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21.64,8.39,20,5.63a1.12,1.12,0,0,0-1.36-0.5L16.54,6A7.26,7.26,0,0,0,15,5.12l-0.27-2.2A1.1,1.1,0,0,0,13.59,2H10.41a1.1,1.1,0,0,0-1.11 0.92 L9,5.11A7.1,7.1,0,0,0,7.46,6L5.32,5.12A1.12,1.12,0,0,0,4,5.62L2.36,8.38A1.1,1.1,0,0,0,2.6,9.8l1.94,1.45a6.06,6.06,0,0,0,0,0.75,6.34,6.34,0,0,0,0,0.76L2.6,14.2a1.09,1.09,0,0,0-0.24,1.41L4,18.37a1.12,1.12,0,0,0,1.36 0.5 L7.46,18A7.26,7.26,0,0,0,9,18.88l0.27,2.19a1.1,1.1,0,0,0,1.11 0.93 h3.18a1.11,1.11,0,0,0,1.11-0.92L15,18.89A7.26,7.26,0,0,0,16.54,18l2.14 0.91 a1.12,1.12,0,0,0,1.36-0.5l1.6-2.76a1.1,1.1,0,0,0-0.24-1.42l-1.94-1.45a7.24,7.24,0,0,0,0-1.52L21.4,9.8A1.09,1.09,0,0,0,21.64,8.39ZM12,15.5A3.5,3.5,0,1,1,15.5,12,3.5,3.5,0,0,1,12,15.5Z" />
+</vector>
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_signal_airplane.xml
similarity index 66%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_signal_airplane.xml
index 45cf95f..999a9bf 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_signal_airplane.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M3.15,15.8l7.35-2.3V19L8.9,20.2a1,1,0,0,0-0.4 0.8 v0.67a0.24 0.24 ,0,0,0,0.31 0.24 L12,21l3.19 0.91 a0.24 0.24 ,0,0,0,0.31-0.24V21a1,1,0,0,0-0.4-0.8L13.5,19V13.5l7.35,2.3a0.5 0.5 ,0,0,0,0.65-0.48v-0.49a1.5,1.5,0,0,0-0.7-1.27L13.5,9V3.5a1.5,1.5,0,0,0-3,0V9L3.2,13.56a1.5,1.5,0,0,0-0.7,1.27v0.49A0.5 0.5 ,0,0,0,3.15,15.8Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_signal_flashlight.xml
similarity index 70%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_signal_flashlight.xml
index 45cf95f..1ffb32b 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_signal_flashlight.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M10,22h4a1,1,0,0,0,1-1V10a2,2,0,0,0,2-2V5.5H7V8a2,2,0,0,0,2,2V21A1,1,0,0,0,10,22Zm2-10a1.5,1.5,0,1,1-1.5,1.5A1.5,1.5,0,0,1,12,12Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M17,3a1,1,0,0,0-1-1H8A1,1,0,0,0,7,3V4H17Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_swap_vert.xml
similarity index 66%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_swap_vert.xml
index 2bcaf2a..43a01c6 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_swap_vert.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M18,17H16V11a1,1,0,0,0-2,0v6H12a0.53 0.53 ,0,0,0-0.37 0.9 l2.95,2.94a0.53 0.53 ,0,0,0,0.75,0l3-2.94A0.52 0.52 ,0,0,0,18,17Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M12.32,6.09l-3-2.95a0.52 0.52 ,0,0,0-0.74,0h0L5.68,6.09a0.53 0.53 ,0,0,0,0.37 0.9 H8v6a1,1,0,0,0,2,0V7H12A0.52 0.52 ,0,0,0,12.32,6.09Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_volume_alarm.xml
similarity index 63%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_volume_alarm.xml
index 2bcaf2a..c300bed 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackFilledSystemUIOverlay/res/drawable/ic_volume_alarm.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,11 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M16.8,2.6A1,1,0,0,0,16.9,4L20,6.6a1,1,0,0,0,1.4-0.1,1,1,0,0,0-0.1-1.4L18.2,2.5A1,1,0,0,0,16.8,2.6Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M4.1,6.6,7.1,4A1,1,0,1,0,5.8,2.5l-3,2.6a1,1,0,0,0-0.1,1.4A1,1,0,0,0,4.1,6.6Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3,13a9,9,0,1,0,9-9A9,9,0,0,0,3,13Zm8-4.25a0.75 0.75 ,0,0,1,1.5,0v4.5l3.37,2a0.72 0.72 ,0,0,1,0.25,1,0.71 0.71 ,0,0,1-1,0.24L11,14Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackCircularOverlay/Android.mk b/packages/overlays/IconPackRoundedAndroidOverlay/Android.mk
similarity index 89%
copy from packages/overlays/IconPackCircularOverlay/Android.mk
copy to packages/overlays/IconPackRoundedAndroidOverlay/Android.mk
index 010eb81..2937fb8 100644
--- a/packages/overlays/IconPackCircularOverlay/Android.mk
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/Android.mk
@@ -13,11 +13,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_RRO_THEME := IconPackCircular
+LOCAL_RRO_THEME := IconPackRoundedAndroid
LOCAL_CERTIFICATE := platform
LOCAL_PRODUCT_MODULE := true
@@ -25,7 +24,7 @@
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_PACKAGE_NAME := IconPackCircularOverlay
+LOCAL_PACKAGE_NAME := IconPackRoundedAndroidOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)
diff --git a/packages/overlays/IconPackRoundedOverlay/AndroidManifest.xml b/packages/overlays/IconPackRoundedAndroidOverlay/AndroidManifest.xml
similarity index 87%
rename from packages/overlays/IconPackRoundedOverlay/AndroidManifest.xml
rename to packages/overlays/IconPackRoundedAndroidOverlay/AndroidManifest.xml
index 8014733..8da1948 100644
--- a/packages/overlays/IconPackRoundedOverlay/AndroidManifest.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/AndroidManifest.xml
@@ -16,9 +16,9 @@
*/
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.theme.icon_pack.rounded"
+ package="com.android.theme.icon_pack.rounded.android"
android:versionCode="1"
android:versionName="1.0">
- <overlay android:targetPackage="android" android:category="android.theme.customization.icon_pack" android:priority="1"/>
+ <overlay android:targetPackage="android" android:category="android.theme.customization.icon_pack.android" android:priority="1"/>
<application android:label="Rounded" android:hasCode="false"/>
</manifest>
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_bt_headphones_a2dp.xml
similarity index 67%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_bt_headphones_a2dp.xml
index 45cf95f..264e212 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_bt_headphones_a2dp.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M21.5,18V11.5C21.5,5.82,17.68,2,12,2S2.5,5.82,2.5,11.5V18a3,3,0,0,0,3,3H7a1.5,1.5,0,0,0,1.5-1.5V14A1.5,1.5,0,0,0,7,12.5H4v-1c0-4.86,3.14-8,8-8s8,3.14,8,8v1H17A1.5,1.5,0,0,0,15.5,14v5.5A1.5,1.5,0,0,0,17,21h1.5A3,3,0,0,0,21.5,18ZM7,19.5H5.5A1.5,1.5,0,0,1,4,18V14H7ZM20,18a1.5,1.5,0,0,1-1.5,1.5H17V14h3Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_expand_more.xml
similarity index 73%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_expand_more.xml
index 45cf95f..407adac 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_expand_more.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M18.54,8.48a0.75 0.75 ,0,0,0-1.06,0L12,13.82,6.52,8.46a0.75 0.75 ,0,0,0-1.06,0,0.75 0.75 ,0,0,0,0,1.06l5.74,5.62a1.11,1.11,0,0,0,0.78 0.36 ,1.09,1.09,0,0,0,0.77-0.36l5.75-5.62A0.75 0.75 ,0,0,0,18.54,8.48Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_info_outline_24.xml
similarity index 60%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_info_outline_24.xml
index 2bcaf2a..642ac42 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_info_outline_24.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,11 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M19.07,4.93A10,10,0,1,0,22,12,10,10,0,0,0,19.07,4.93ZM18,18a8.5,8.5,0,1,1,2.5-6A8.53,8.53,0,0,1,18,18Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M12,10a0.76 0.76 ,0,0,0-0.75 0.75 v5.5a0.75 0.75 ,0,0,0,1.5,0v-5.5A0.76 0.76 ,0,0,0,12,10Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 12 7 C 12.5522847498 7 13 7.44771525017 13 8 C 13 8.55228474983 12.5522847498 9 12 9 C 11.4477152502 9 11 8.55228474983 11 8 C 11 7.44771525017 11.4477152502 7 12 7 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_invert_colors.xml
similarity index 73%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_invert_colors.xml
index 45cf95f..173824b 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_invert_colors.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M12.62,2.23A1,1,0,0,0,12,2a1.07,1.07,0,0,0-0.63 0.22 C9.48,3.75,4,8.5,4,14a7.89,7.89,0,0,0,8,8,8,8,0,0,0,8-8C20,8.5,14.5,3.73,12.62,2.23ZM5.5,14c0-4.4,4.32-8.53,6.5-10.33V20.49A6.43,6.43,0,0,1,5.5,14Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_lockscreen_ime.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_lockscreen_ime.xml
new file mode 100644
index 0000000..7897fa3a
--- /dev/null
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_lockscreen_ime.xml
@@ -0,0 +1,55 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3,21H21a2,2,0,0,0,2-2V6a2,2,0,0,0-2-2H3A2,2,0,0,0,1,6V19A2,2,0,0,0,3,21ZM2.5,6A0.51 0.51 ,0,0,1,3,5.5H21a0.51 0.51 ,0,0,1,0.5 0.5 V19a0.51 0.51 ,0,0,1-0.5 0.5 H3a0.51 0.51 ,0,0,1-0.5-0.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9.5 8 L 10.5 8 Q 11 8 11 8.5 L 11 9.5 Q 11 10 10.5 10 L 9.5 10 Q 9 10 9 9.5 L 9 8.5 Q 9 8 9.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 5.5 8 L 6.5 8 Q 7 8 7 8.5 L 7 9.5 Q 7 10 6.5 10 L 5.5 10 Q 5 10 5 9.5 L 5 8.5 Q 5 8 5.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M8.75,17.5h6.5a0.75 0.75 ,0,0,0,0-1.5H8.75a0.75 0.75 ,0,0,0,0,1.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 13.5 8 L 14.5 8 Q 15 8 15 8.5 L 15 9.5 Q 15 10 14.5 10 L 13.5 10 Q 13 10 13 9.5 L 13 8.5 Q 13 8 13.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9.5 12 L 10.5 12 Q 11 12 11 12.5 L 11 13.5 Q 11 14 10.5 14 L 9.5 14 Q 9 14 9 13.5 L 9 12.5 Q 9 12 9.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 5.5 12 L 6.5 12 Q 7 12 7 12.5 L 7 13.5 Q 7 14 6.5 14 L 5.5 14 Q 5 14 5 13.5 L 5 12.5 Q 5 12 5.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 13.5 12 L 14.5 12 Q 15 12 15 12.5 L 15 13.5 Q 15 14 14.5 14 L 13.5 14 Q 13 14 13 13.5 L 13 12.5 Q 13 12 13.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 17.5 8 L 18.5 8 Q 19 8 19 8.5 L 19 9.5 Q 19 10 18.5 10 L 17.5 10 Q 17 10 17 9.5 L 17 8.5 Q 17 8 17.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 17.5 12 L 18.5 12 Q 19 12 19 12.5 L 19 13.5 Q 19 14 18.5 14 L 17.5 14 Q 17 14 17 13.5 L 17 12.5 Q 17 12 17.5 12 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_mode_edit.xml
similarity index 66%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_mode_edit.xml
index 45cf95f..8532bdd 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_mode_edit.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M3.35,21.15h0.07l3.88-0.6a1,1,0,0,0,0.56-0.28L21,7.07h0A0.75 0.75 ,0,0,0,21,6L18,3h0a0.73 0.73 ,0,0,0-0.52-0.21A0.74 0.74 ,0,0,0,17,3L15.51,4.45h0L14.44,5.5h0L3.73,16.14a1,1,0,0,0-0.28 0.56 l-0.6,3.88A0.51 0.51 ,0,0,0,3.35,21.15ZM17.5,4.59l1.95,1.94-0.93 0.93 L16.57,5.51ZM4.91,17.09,15.51,6.56l2,2L6.91,19.09l-2.37 0.37 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_phone.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_phone.xml
new file mode 100644
index 0000000..c62203d
--- /dev/null
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_phone.xml
@@ -0,0 +1,28 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21,16.35A1.41,1.41,0,0,0,20,15l-2.42-0.73a1.43,1.43,0,0,0-1.41 0.34 l-2.95,2.87a16.48,16.48,0,0,1-3.74-2.7,17.33,17.33,0,0,1-3-4L9.36,7.94a1.42,1.42,0,0,0,0.37-1.36L9.07,4.12a1.43,1.43,0,0,0-1.37-1h-4a0.56 0.56 ,0,0,0-0.12,0,0.58 0.58 ,0,0,0-0.14,0,0.54 0.54 ,0,0,0-0.12 0.09 l-0.11 0.08 a0.94 0.94 ,0,0,0-0.09 0.12 l-0.07 0.12 ,0,0.15s0,0.08,0,0.12v0a18.53,18.53,0,0,0,5.42,12,18.25,18.25,0,0,0,11.79,5.07h0a0.72 0.72 ,0,0,0,0.29-0.06l0.08-0.05a0.53 0.53 ,0,0,0,0.15-0.11 0.31 0.31,0,0,0,0.07-0.09 0.67 0.67,0,0,0,0.09-0.14 0.53 0.53,0,0,0,0-0.12 0.37 0.37,0,0,0,0-0.15h0V16.35ZM8.3,6.88,5.81,9.33A17.23,17.23,0,0,1,4.58,4.58H7.64Zm8.83,8.82,2.37 0.72 v2.93a17.06,17.06,0,0,1-4.85-1.19Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_qs_night_display_on.xml
similarity index 65%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_qs_night_display_on.xml
index 45cf95f..96ce11c 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_qs_night_display_on.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M22.63,16.12a0.75 0.75 ,0,0,0-0.76-0.32,12.23,12.23,0,0,1-2.12 0.2 A11.76,11.76,0,0,1,8,4.25a12.23,12.23,0,0,1,0.2-2.12 0.73 0.73,0,0,0-0.32-0.76 0.74 0.74,0,0,0-0.83,0A11.25,11.25,0,1,0,22.63,17,0.74 0.74 ,0,0,0,22.63,16.12ZM13.25,20.5A9.75,9.75,0,0,1,6.51,3.71c0,0.18,0,0.36,0,0.54A13.27,13.27,0,0,0,20.29,17.49,9.71,9.71,0,0,1,13.25,20.5Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_signal_location.xml
similarity index 65%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_signal_location.xml
index 2bcaf2a..eb94952 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_signal_location.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M15,10a3,3,0,1,0-3,3A3,3,0,0,0,15,10Zm-4.5,0A1.5,1.5,0,1,1,12,11.5,1.5,1.5,0,0,1,10.5,10Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M11.37,21.76A1,1,0,0,0,12,22a1,1,0,0,0,0.62-0.22C14.5,20.26,20,15.5,20,10a8,8,0,0,0-8-8,7.89,7.89,0,0,0-8,8C4,15.5,9.48,20.25,11.37,21.76ZM12,3.51A6.5,6.5,0,0,1,18.5,10c0,4.4-4.31,8.53-6.5,10.34C9.82,18.54,5.5,14.4,5.5,10A6.43,6.43,0,0,1,12,3.51Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_0.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_0.xml
similarity index 96%
rename from packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_0.xml
rename to packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_0.xml
index 089974d..96d04c3 100644
--- a/packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_0.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_0.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -47,4 +46,4 @@
android:strokeAlpha="0.3"
android:strokeWidth="1"
android:pathData="M 12 17 C 12.8284271247 17 13.5 17.6715728753 13.5 18.5 C 13.5 19.3284271247 12.8284271247 20 12 20 C 11.1715728753 20 10.5 19.3284271247 10.5 18.5 C 10.5 17.6715728753 11.1715728753 17 12 17 Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_1.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_1.xml
similarity index 96%
rename from packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_1.xml
rename to packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_1.xml
index e51879e..b887320 100644
--- a/packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_1.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_1.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -44,4 +43,4 @@
android:strokeAlpha="0.3"
android:strokeWidth="1"
android:pathData="M22.79,7.23A14.76,14.76,0,0,0,12,2.75,14.72,14.72,0,0,0,1.23,7.2a0.75 0.75 ,0,0,0,1.07,1,13.25,13.25,0,0,1,9.7-4,13.27,13.27,0,0,1,9.72,4,0.75 0.75 ,0,0,0,1.07-1Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_2.xml
similarity index 96%
rename from packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_2.xml
rename to packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_2.xml
index 77343af..af41245 100644
--- a/packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_2.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -41,4 +40,4 @@
android:strokeAlpha="0.3"
android:strokeWidth="1"
android:pathData="M22.79,7.23A14.76,14.76,0,0,0,12,2.75,14.72,14.72,0,0,0,1.23,7.2a0.75 0.75 ,0,0,0,1.07,1,13.25,13.25,0,0,1,9.7-4,13.27,13.27,0,0,1,9.72,4,0.75 0.75 ,0,0,0,1.07-1Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_3.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_3.xml
similarity index 96%
rename from packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_3.xml
rename to packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_3.xml
index 0b89382..c137643 100644
--- a/packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_3.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_3.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -38,4 +37,4 @@
android:strokeAlpha="0.3"
android:strokeWidth="1"
android:pathData="M22.79,7.23A14.76,14.76,0,0,0,12,2.75,14.72,14.72,0,0,0,1.23,7.2a0.75 0.75 ,0,0,0,1.07,1,13.25,13.25,0,0,1,9.7-4,13.27,13.27,0,0,1,9.72,4,0.75 0.75 ,0,0,0,1.07-1Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_4.xml
similarity index 96%
rename from packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_4.xml
rename to packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_4.xml
index f02bc83..b8f2d78 100644
--- a/packages/overlays/IconPackRoundedOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackRoundedAndroidOverlay/res/drawable/ic_wifi_signal_4.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -35,4 +34,4 @@
<path
android:fillColor="#000000"
android:pathData="M2.3,8.25a13.25,13.25,0,0,1,9.7-4,13.27,13.27,0,0,1,9.72,4,0.73 0.73 ,0,0,0,1,0,0.75 0.75 ,0,0,0,0.05-1.06A14.76,14.76,0,0,0,12,2.75,14.76,14.76,0,0,0,1.22,7.2a0.77 0.77 ,0,0,0,0,1A0.75 0.75 ,0,0,0,2.3,8.25Z" />
-</vector>
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedOverlay/Android.mk b/packages/overlays/IconPackRoundedOverlay/Android.mk
deleted file mode 100644
index 075ed28..0000000
--- a/packages/overlays/IconPackRoundedOverlay/Android.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-#
-# Copyright 2019, 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.
-#
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_RRO_THEME := IconPackRounded
-LOCAL_CERTIFICATE := platform
-LOCAL_PRODUCT_MODULE := true
-
-LOCAL_SRC_FILES := $(call all-subdir-java-files)
-
-LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-
-LOCAL_PACKAGE_NAME := IconPackRoundedOverlay
-LOCAL_SDK_VERSION := current
-
-include $(BUILD_RRO_PACKAGE)
diff --git a/packages/overlays/IconPackCircularOverlay/Android.mk b/packages/overlays/IconPackRoundedSystemUIOverlay/Android.mk
similarity index 89%
copy from packages/overlays/IconPackCircularOverlay/Android.mk
copy to packages/overlays/IconPackRoundedSystemUIOverlay/Android.mk
index 010eb81..2d34a54 100644
--- a/packages/overlays/IconPackCircularOverlay/Android.mk
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/Android.mk
@@ -17,7 +17,7 @@
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-LOCAL_RRO_THEME := IconPackCircular
+LOCAL_RRO_THEME := IconPackRoundedSystemUI
LOCAL_CERTIFICATE := platform
LOCAL_PRODUCT_MODULE := true
@@ -25,7 +25,7 @@
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
-LOCAL_PACKAGE_NAME := IconPackCircularOverlay
+LOCAL_PACKAGE_NAME := IconPackRoundedSystemUIOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)
diff --git a/packages/overlays/IconPackRoundedOverlay/AndroidManifest.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/AndroidManifest.xml
similarity index 80%
copy from packages/overlays/IconPackRoundedOverlay/AndroidManifest.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/AndroidManifest.xml
index 8014733..01b121d 100644
--- a/packages/overlays/IconPackRoundedOverlay/AndroidManifest.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/AndroidManifest.xml
@@ -16,9 +16,9 @@
*/
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.theme.icon_pack.rounded"
+ package="com.android.theme.icon_pack.rounded.systemui"
android:versionCode="1"
android:versionName="1.0">
- <overlay android:targetPackage="android" android:category="android.theme.customization.icon_pack" android:priority="1"/>
+ <overlay android:targetPackage="com.android.systemui" android:category="android.theme.customization.icon_pack.systemui" android:priority="1"/>
<application android:label="Rounded" android:hasCode="false"/>
</manifest>
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_brightness_thumb.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_brightness_thumb.xml
new file mode 100644
index 0000000..abfcfce
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_brightness_thumb.xml
@@ -0,0 +1,52 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="M12,19.5h0A7.49,7.49,0,0,0,19.5,12h0A7.5,7.5,0,1,0,12,19.5ZM12,6a6,6,0,0,1,6,6h0a6,6,0,0,1-6,6h0A6,6,0,0,1,12,6Z" />
+ <path
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="M11.25 0.75 v1.5a0.75 0.75 ,0,0,0,1.5,0V0.75a0.75 0.75 ,0,0,0-1.5,0Z" />
+ <path
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="M4.58,3.51A0.76 0.76 ,0,0,0,3.51,4.58L4.57,5.64a0.79 0.79 ,0,0,0,1.07,0,0.77 0.77 ,0,0,0,0-1.07Z" />
+ <path
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="M3,12a0.76 0.76 ,0,0,0-0.75-0.75H0.75a0.75 0.75 ,0,0,0,0,1.5h1.5A0.76 0.76 ,0,0,0,3,12Z" />
+ <path
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="M3.51,20.49a0.76 0.76 ,0,0,0,1.07,0l1.06-1.06a0.76 0.76 ,0,1,0-1.07-1.07L3.51,19.42A0.77 0.77 ,0,0,0,3.51,20.49Z" />
+ <path
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="M11.25,21.75v1.5a0.75 0.75 ,0,0,0,1.5,0v-1.5a0.75 0.75 ,0,0,0-1.5,0Z" />
+ <path
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="M18.36,18.36a0.77 0.77 ,0,0,0,0,1.07l1.06,1.06a0.76 0.76 ,0,0,0,1.07,0,0.77 0.77 ,0,0,0,0-1.07l-1.06-1.06A0.77 0.77 ,0,0,0,18.36,18.36Z" />
+ <path
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="M23.25,11.25h-1.5a0.75 0.75 ,0,0,0,0,1.5h1.5a0.75 0.75 ,0,0,0,0-1.5Z" />
+ <path
+ android:fillColor="?android:attr/colorControlActivated"
+ android:pathData="M19.42,3.51,18.36,4.57a0.77 0.77 ,0,0,0,0,1.07 0.79 0.79,0,0,0,1.07,0l1.06-1.06a0.76 0.76 ,0,0,0-1.07-1.07Z" />
+</vector>
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_data_saver_off.xml
similarity index 62%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_data_saver_off.xml
index 2bcaf2a..1158b27 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_data_saver_off.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,11 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M22,12a10,10,0,0,0-9-9.95v3A7,7,0,0,1,19,12a7.12,7.12,0,0,1-0.48,2.54h0l2.6,1.53A9.88,9.88,0,0,0,22,12Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M2.09,13.39a10,10,0,0,0,18,4.52l-2.6-1.53h0A7,7,0,1,1,11,5.08v-3A10,10,0,0,0,2.09,13.39Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M11.25,8v3.25H8a0.75 0.75 ,0,0,0,0,1.5h3.25V16a0.75 0.75 ,0,0,0,1.5,0V12.75H16a0.75 0.75 ,0,0,0,0-1.5H12.75V8a0.75 0.75 ,0,0,0-1.5,0Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_dnd.xml
similarity index 68%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_dnd.xml
index 45cf95f..a9a32ee 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_dnd.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M7.25,12.75h9.5a0.75 0.75 ,0,0,0,0-1.5H7.25a0.75 0.75 ,0,0,0,0,1.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,22h0A10,10,0,0,0,22,12v0A10,10,0,1,0,12,22ZM12,3.5A8.51,8.51,0,0,1,20.5,12h0.75l-0.75,0A8.49,8.49,0,0,1,12,20.5h0a8.5,8.5,0,0,1,0-17Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_drag_handle.xml
similarity index 73%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_drag_handle.xml
index 45cf95f..915597e 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_drag_handle.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M4,10.5H20A0.75 0.75 ,0,0,0,20,9H4a0.75 0.75 ,0,0,0,0,1.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M4,15H20a0.75 0.75 ,0,0,0,0-1.5H4A0.75 0.75 ,0,0,0,4,15Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_headset.xml
similarity index 67%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_headset.xml
index 45cf95f..264e212 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_headset.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M21.5,18V11.5C21.5,5.82,17.68,2,12,2S2.5,5.82,2.5,11.5V18a3,3,0,0,0,3,3H7a1.5,1.5,0,0,0,1.5-1.5V14A1.5,1.5,0,0,0,7,12.5H4v-1c0-4.86,3.14-8,8-8s8,3.14,8,8v1H17A1.5,1.5,0,0,0,15.5,14v5.5A1.5,1.5,0,0,0,17,21h1.5A3,3,0,0,0,21.5,18ZM7,19.5H5.5A1.5,1.5,0,0,1,4,18V14H7ZM20,18a1.5,1.5,0,0,1-1.5,1.5H17V14h3Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_hotspot.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_hotspot.xml
new file mode 100644
index 0000000..ae78a14
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_hotspot.xml
@@ -0,0 +1,34 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 12 11 C 12.8284271247 11 13.5 11.6715728753 13.5 12.5 C 13.5 13.3284271247 12.8284271247 14 12 14 C 11.1715728753 14 10.5 13.3284271247 10.5 12.5 C 10.5 11.6715728753 11.1715728753 11 12 11 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M15,16.57a0.75 0.75 ,0,0,0,1.06,0,5.75,5.75,0,1,0-8.14,0,0.79 0.79 ,0,0,0,0.53 0.22 A0.75 0.75 ,0,0,0,9,16.57a0.74 0.74 ,0,0,0,0-1.06,4.25,4.25,0,1,1,6,0A0.75 0.75 ,0,0,0,15,16.57Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M18.36,19.61a0.71 0.71 ,0,0,0,0.53-0.22A9.74,9.74,0,0,0,5.11,5.61a9.73,9.73,0,0,0,0,13.78 0.74 0.74,0,0,0,1.06,0,0.75 0.75 ,0,0,0,0-1.06A8.24,8.24,0,0,1,17.83,6.67a8.23,8.23,0,0,1,0,11.66 0.75 0.75,0,0,0,0,1.06A0.74 0.74 ,0,0,0,18.36,19.61Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_info.xml
similarity index 60%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_info.xml
index 2bcaf2a..642ac42 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_info.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,11 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M19.07,4.93A10,10,0,1,0,22,12,10,10,0,0,0,19.07,4.93ZM18,18a8.5,8.5,0,1,1,2.5-6A8.53,8.53,0,0,1,18,18Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M12,10a0.76 0.76 ,0,0,0-0.75 0.75 v5.5a0.75 0.75 ,0,0,0,1.5,0v-5.5A0.76 0.76 ,0,0,0,12,10Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 12 7 C 12.5522847498 7 13 7.44771525017 13 8 C 13 8.55228474983 12.5522847498 9 12 9 C 11.4477152502 9 11 8.55228474983 11 8 C 11 7.44771525017 11.4477152502 7 12 7 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_lockscreen_ime.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_lockscreen_ime.xml
new file mode 100644
index 0000000..7897fa3a
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_lockscreen_ime.xml
@@ -0,0 +1,55 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3,21H21a2,2,0,0,0,2-2V6a2,2,0,0,0-2-2H3A2,2,0,0,0,1,6V19A2,2,0,0,0,3,21ZM2.5,6A0.51 0.51 ,0,0,1,3,5.5H21a0.51 0.51 ,0,0,1,0.5 0.5 V19a0.51 0.51 ,0,0,1-0.5 0.5 H3a0.51 0.51 ,0,0,1-0.5-0.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9.5 8 L 10.5 8 Q 11 8 11 8.5 L 11 9.5 Q 11 10 10.5 10 L 9.5 10 Q 9 10 9 9.5 L 9 8.5 Q 9 8 9.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 5.5 8 L 6.5 8 Q 7 8 7 8.5 L 7 9.5 Q 7 10 6.5 10 L 5.5 10 Q 5 10 5 9.5 L 5 8.5 Q 5 8 5.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M8.75,17.5h6.5a0.75 0.75 ,0,0,0,0-1.5H8.75a0.75 0.75 ,0,0,0,0,1.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 13.5 8 L 14.5 8 Q 15 8 15 8.5 L 15 9.5 Q 15 10 14.5 10 L 13.5 10 Q 13 10 13 9.5 L 13 8.5 Q 13 8 13.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9.5 12 L 10.5 12 Q 11 12 11 12.5 L 11 13.5 Q 11 14 10.5 14 L 9.5 14 Q 9 14 9 13.5 L 9 12.5 Q 9 12 9.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 5.5 12 L 6.5 12 Q 7 12 7 12.5 L 7 13.5 Q 7 14 6.5 14 L 5.5 14 Q 5 14 5 13.5 L 5 12.5 Q 5 12 5.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 13.5 12 L 14.5 12 Q 15 12 15 12.5 L 15 13.5 Q 15 14 14.5 14 L 13.5 14 Q 13 14 13 13.5 L 13 12.5 Q 13 12 13.5 12 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 17.5 8 L 18.5 8 Q 19 8 19 8.5 L 19 9.5 Q 19 10 18.5 10 L 17.5 10 Q 17 10 17 9.5 L 17 8.5 Q 17 8 17.5 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 17.5 12 L 18.5 12 Q 19 12 19 12.5 L 19 13.5 Q 19 14 18.5 14 L 17.5 14 Q 17 14 17 13.5 L 17 12.5 Q 17 12 17.5 12 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_notifications_alert.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_notifications_alert.xml
new file mode 100644
index 0000000..74311e7
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_notifications_alert.xml
@@ -0,0 +1,37 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M14,20H10a2,2,0,0,0,4,0Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,2.5a1.25,1.25,0,0,0-1.25,1.25v0.78A6,6,0,0,0,6,10.4V17H4.75a0.75 0.75 ,0,0,0,0,1.5h14.5a0.75 0.75 ,0,0,0,0-1.5H18V10.4a6,6,0,0,0-4.75-5.87V3.75A1.25,1.25,0,0,0,12,2.5Zm4.5,7.9V17h-9V10.4a4.5,4.5,0,1,1,9,0Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M5.85,3A9.49,9.49,0,0,0,2.5,10.25a0.75 0.75 ,0,0,0,1.5,0,8,8,0,0,1,2.82-6.1A0.75 0.75 ,0,1,0,5.85,3Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M18.15,3a0.75 0.75 ,0,1,0-1,1.14A8,8,0,0,1,20,10.25a0.75 0.75 ,0,0,0,1.5,0A9.49,9.49,0,0,0,18.15,3Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_notifications_silence.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_notifications_silence.xml
new file mode 100644
index 0000000..a93c45b
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_notifications_silence.xml
@@ -0,0 +1,34 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M14,20H10a2,2,0,0,0,4,0Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,5.9a4.5,4.5,0,0,1,4.5,4.5v3.92l1.5,1.5V10.4a6,6,0,0,0-4.75-5.87V3.75a1.25,1.25,0,0,0-2.5,0v0.78A5.92,5.92,0,0,0,8.06,5.88L9.14,7A4.45,4.45,0,0,1,12,5.9Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21,22A0.75 0.75 ,0,0,0,21,21L3,3A0.75 0.75 ,0,0,0,2,3H2A0.75 0.75 ,0,0,0,2,4L6.35,8.41a6,6,0,0,0-0.35,2V17H4.75a0.75 0.75 ,0,0,0,0,1.5H16.44L20,22A0.75 0.75 ,0,0,0,21,22ZM7.5,17V10.4a3.84,3.84,0,0,1,0.08-0.76L14.94,17Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_auto_rotate.xml
similarity index 61%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_auto_rotate.xml
index 2bcaf2a..fe7ecfd 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_auto_rotate.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M3,6.81a0.75 0.75 ,0,0,0-0.75 0.75 v2.83a0.74 0.74 ,0,0,0,0.75 0.75 H5.8a0.75 0.75 ,0,1,0,0-1.5h-1l5.6-5.59,7.07,7.06a0.75 0.75 ,0,0,0,1.06-1.06l-7.6-7.6a0.75 0.75 ,0,0,0-1.06,0L3.72,8.62V7.56A0.76 0.76 ,0,0,0,3,6.81Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M21,12.85H18.21a0.75 0.75 ,0,0,0,0,1.5h1L13.59,20,6.52,12.89a0.75 0.75 ,0,0,0-1.06,0,0.74 0.74 ,0,0,0,0,1.06l7.6,7.6a0.75 0.75 ,0,0,0,1.06,0l6.17-6.17v1.06a0.75 0.75 ,0,1,0,1.5,0V13.6A0.76 0.76 ,0,0,0,21,12.85Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_bluetooth_connecting.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_bluetooth_connecting.xml
new file mode 100644
index 0000000..70282d4
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_bluetooth_connecting.xml
@@ -0,0 +1,34 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M4.47,17.78a0.75 0.75 ,0,0,0,1.06,0l4-4V21.5a0.74 0.74 ,0,0,0,0.46 0.69 0.75 0.75 ,0,0,0,0.29 0.06 0.77 0.77 ,0,0,0,0.53-0.22l4.75-4.75a0.75 0.75 ,0,0,0,0-1.06L11.31,12l4.22-4.22a0.75 0.75 ,0,0,0,0-1.06L10.78,2A0.75 0.75 ,0,0,0,10,1.81a0.74 0.74 ,0,0,0-0.46 0.69 v7.69l-4-4A0.75 0.75 ,0,0,0,4.47,7.28L9.19,12,4.47,16.72A0.75 0.75 ,0,0,0,4.47,17.78ZM11,4.31l2.94,2.94L11,10.19Zm0,9.5,2.94,2.94L11,19.69Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 16 11 C 16.5522847498 11 17 11.4477152502 17 12 C 17 12.5522847498 16.5522847498 13 16 13 C 15.4477152502 13 15 12.5522847498 15 12 C 15 11.4477152502 15.4477152502 11 16 11 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M18.55,16.37a0.74 0.74 ,0,0,0,0.45 0.15 0.77 0.77 ,0,0,0,0.6-0.3,7,7,0,0,0,0-8.42 0.76 0.76,0,0,0-1.05-0.15 0.75 0.75,0,0,0-0.15,1,5.53,5.53,0,0,1,0,6.62A0.75 0.75 ,0,0,0,18.55,16.37Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_bluetooth_on.xml
similarity index 66%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_bluetooth_on.xml
index 45cf95f..dfef14b 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_4.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_bluetooth_on.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,5 +24,5 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:pathData="M12,3A20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0L23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3Z" />
-</vector>
+ android:pathData="M17.53,6.72,12.78,2a0.75 0.75 ,0,0,0-1.28 0.53 v7.69l-4-4A0.75 0.75 ,0,0,0,6.47,7.28L11.19,12,6.47,16.72a0.75 0.75 ,0,0,0,1.06,1.06l4-4V21.5a0.74 0.74 ,0,0,0,0.46 0.69 0.74 0.74 ,0,0,0,0.82-0.16l4.75-4.75a0.75 0.75 ,0,0,0,0-1.06L13.31,12l4.22-4.22A0.75 0.75 ,0,0,0,17.53,6.72Zm-1.59,10L13,19.69V13.81ZM13,10.19V4.31l2.94,2.94Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_brightness_auto_on.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_brightness_auto_on.xml
new file mode 100644
index 0000000..9bf1274
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_brightness_auto_on.xml
@@ -0,0 +1,52 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12.75,2.25V0.75a0.75 0.75 ,0,0,0-1.5,0v1.5a0.75 0.75 ,0,0,0,1.5,0Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M4.57,5.64a0.79 0.79 ,0,0,0,1.07,0,0.77 0.77 ,0,0,0,0-1.07L4.58,3.51A0.76 0.76 ,0,0,0,3.51,4.58Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M0.75,12.75h1.5a0.75 0.75 ,0,0,0,0-1.5H0.75a0.75 0.75 ,0,0,0,0,1.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3.51,20.49a0.76 0.76 ,0,0,0,1.07,0l1.06-1.06a0.76 0.76 ,0,1,0-1.07-1.07L3.51,19.42A0.77 0.77 ,0,0,0,3.51,20.49Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M11.25,21.75v1.5a0.75 0.75 ,0,0,0,1.5,0v-1.5a0.75 0.75 ,0,0,0-1.5,0Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M20,20.71a0.79 0.79 ,0,0,0,0.53-0.22 0.77 0.77,0,0,0,0-1.07l-1.06-1.06a0.76 0.76 ,0,0,0-1.07,1.07l1.06,1.06A0.79 0.79 ,0,0,0,20,20.71Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M23.25,11.25h-1.5a0.75 0.75 ,0,0,0,0,1.5h1.5a0.75 0.75 ,0,0,0,0-1.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M19.42,3.51,18.36,4.57a0.77 0.77 ,0,0,0,0,1.07 0.79 0.79,0,0,0,1.07,0l1.06-1.06a0.76 0.76 ,0,0,0-1.07-1.07Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M14.85,17H17L13.11,7H10.87L7,17H9.15L10,14.61h4Zm-4.22-4.12,1.31-3.71h0.11l1.29,3.71Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_cancel.xml
similarity index 62%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_cancel.xml
index 2bcaf2a..cc819a0 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_cancel.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M12,2A10,10,0,1,0,22,12,10,10,0,0,0,12,2Zm0,18.5A8.5,8.5,0,1,1,20.5,12,8.51,8.51,0,0,1,12,20.5Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M16.6,7.4a0.75 0.75 ,0,0,0-1.06,0L12,10.94,8.46,7.4A0.75 0.75 ,0,0,0,7.4,8.46L10.94,12,7.4,15.54a0.75 0.75 ,0,0,0,0,1.06 0.79 0.79,0,0,0,0.53 0.22 0.75 0.75 ,0,0,0,0.53-0.22L12,13.06l3.54,3.54a0.75 0.75 ,0,0,0,0.53 0.22 0.79 0.79 ,0,0,0,0.53-0.22 0.75 0.75,0,0,0,0-1.06L13.06,12,16.6,8.46A0.75 0.75 ,0,0,0,16.6,7.4Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_cast_on.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_cast_on.xml
new file mode 100644
index 0000000..34ca21a
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_cast_on.xml
@@ -0,0 +1,40 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M22,18V5.5A1.5,1.5,0,0,0,20.5,4h-17A1.5,1.5,0,0,0,2,5.53V8.46a0.75 0.75 ,0,0,0,1.5,0v-3l17,0V18H13.15a0.75 0.75 ,0,1,0,0,1.5h7.38A1.5,1.5,0,0,0,22,18Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3.25,19.5a1.25,1.25,0,0,0,0-2.5h0a1.25,1.25,0,0,0,0,2.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M2,11.25a0.76 0.76 ,0,0,0,0.75 0.75 A6.75,6.75,0,0,1,9.5,18.75a0.75 0.75 ,0,0,0,1.5,0A8.25,8.25,0,0,0,2.75,10.5 0.76 0.76,0,0,0,2,11.25Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M2.75,15.25a3.5,3.5,0,0,1,3.5,3.5 0.75 0.75,0,0,0,1.5,0,5,5,0,0,0-5-5,0.75 0.75 ,0,0,0,0,1.5Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M13.25,15a0.75 0.75 ,0,0,0,0,1.5h5a0.76 0.76 ,0,0,0,0.75-0.75v-8A0.76 0.76 ,0,0,0,18.25,7H5.75A0.76 0.76 ,0,0,0,5,7.75V8.5a0.75 0.75 ,0,0,0,1.5,0h11V15Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_no_sim.xml
similarity index 65%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_no_sim.xml
index 2bcaf2a..7020463 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_no_sim.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M10.62,4.5H17a0.5 0.5 ,0,0,1,0.5 0.5 V15.32l1.5,1.5V5a2,2,0,0,0-2-2H10L7.59,5.41,8.65,6.47Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M21,21,3,3A0.75 0.75 ,0,0,0,2,3H2A0.75 0.75 ,0,0,0,2,4l3.5,3.5L5,8V19a2,2,0,0,0,2,2H17a2,2,0,0,0,1.38-0.56L20,22A0.75 0.75 ,0,0,0,21,22h0A0.75 0.75 ,0,0,0,21,21ZM17,19.5H7a0.5 0.5 ,0,0,1-0.5-0.5V8.62l0,0L17.32,19.38A0.53 0.53 ,0,0,1,17,19.5Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_vpn.xml
similarity index 63%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_vpn.xml
index 2bcaf2a..65c56f8 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_vpn.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M21,9.5H11.37a5.25,5.25,0,1,0,0,5H14.5v1A1.5,1.5,0,0,0,16,17h2.5A1.5,1.5,0,0,0,20,15.5v-1h1A1.5,1.5,0,0,0,22.5,13V11A1.5,1.5,0,0,0,21,9.5ZM21,13H18.5v2.5H16V13H10.4l-0.19 0.46 A3.75,3.75,0,1,1,6.09,8.31a3.57,3.57,0,0,1,0.65-0.06,3.76,3.76,0,0,1,3.47,2.29l0.19 0.46 H21Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M6.75,9.75A2.25,2.25,0,1,0,9,12,2.25,2.25,0,0,0,6.75,9.75Zm0,3A0.75 0.75 ,0,1,1,7.5,12,0.76 0.76 ,0,0,1,6.75,12.75Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_0.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_0.xml
new file mode 100644
index 0000000..ff02c59
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_0.xml
@@ -0,0 +1,52 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M21.7,8.3a0.83 0.83 ,0,0,0,1.05,0l0,0a0.73 0.73 ,0,0,0,0-1A14.51,14.51,0,0,0,12,2.8,14.77,14.77,0,0,0,1.25,7.25a0.76 0.76 ,0,0,0,0,1.05l0,0a0.72 0.72 ,0,0,0,1,0,13.34,13.34,0,0,1,9.7-4A13.16,13.16,0,0,1,21.7,8.3Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M19,11.8a0.74 0.74 ,0,0,0,1.05-1.05,11.43,11.43,0,0,0-8-3.5,11.36,11.36,0,0,0-8,3.5 0.74 0.74,0,0,0,1,1.05,9.93,9.93,0,0,1,7-3A10.15,10.15,0,0,1,19,11.8Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M7.25,13.75a0.76 0.76 ,0,0,0,0,1l0,0a0.73 0.73 ,0,0,0,1,0,5.28,5.28,0,0,1,6.2-0.9,3.87,3.87,0,0,1,1.57-0.78A6.73,6.73,0,0,0,7.25,13.75Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21.92,16.08a0.74 0.74 ,0,0,0-1.06,0L19,17.94l-1.86-1.86a0.75 0.75 ,0,0,0-1.06,1.06L17.94,19l-1.86,1.86a0.74 0.74 ,0,0,0,0,1.06 0.73 0.73,0,0,0,0.53 0.22 0.74 0.74 ,0,0,0,0.53-0.22L19,20.06l1.86,1.86a0.74 0.74 ,0,0,0,0.53 0.22 0.73 0.73 ,0,0,0,0.53-0.22 0.74 0.74,0,0,0,0-1.06L20.06,19l1.86-1.86A0.74 0.74 ,0,0,0,21.92,16.08Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M13.5,18.5a1.5,1.5,0,0,0-0.5-1.11,1.5,1.5,0,1,0,0,2.22A1.5,1.5,0,0,0,13.5,18.5Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_1.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_1.xml
new file mode 100644
index 0000000..6a645a3
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_1.xml
@@ -0,0 +1,49 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M7.23,13.71a0.75 0.75 ,0,0,0,1.06,1.06,5.23,5.23,0,0,1,6.22-0.88,4,4,0,0,1,1.57-0.78A6.75,6.75,0,0,0,7.23,13.71Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M19,11.77a0.75 0.75 ,0,0,0,1.06,0,0.77 0.77 ,0,0,0,0-1.07h0a11.59,11.59,0,0,0-8-3.5,11.63,11.63,0,0,0-8,3.5 0.75 0.75,0,0,0-0.1,1.06 0.74 0.74,0,0,0,1,0.1A0.38 0.38 ,0,0,0,5,11.77a10.12,10.12,0,0,1,7-3A10.1,10.1,0,0,1,19,11.77Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M21.72,8.27a0.75 0.75 ,0,0,0,1.07-1A14.76,14.76,0,0,0,12,2.75,14.76,14.76,0,0,0,1.22,7.2a0.76 0.76 ,0,0,0,0.05,1.06 0.76 0.76,0,0,0,1,0,13.25,13.25,0,0,1,9.7-4A13.27,13.27,0,0,1,21.72,8.27Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21.92,16.08a0.74 0.74 ,0,0,0-1.06,0L19,17.94l-1.86-1.86a0.75 0.75 ,0,0,0-1.06,1.06L17.94,19l-1.86,1.86a0.74 0.74 ,0,0,0,0,1.06 0.73 0.73,0,0,0,0.53 0.22 0.74 0.74 ,0,0,0,0.53-0.22L19,20.06l1.86,1.86a0.74 0.74 ,0,0,0,0.53 0.22 0.73 0.73 ,0,0,0,0.53-0.22 0.74 0.74,0,0,0,0-1.06L20.06,19l1.86-1.86A0.74 0.74 ,0,0,0,21.92,16.08Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M13.5,18.5a1.5,1.5,0,0,0-0.5-1.11,1.5,1.5,0,1,0,0,2.22A1.5,1.5,0,0,0,13.5,18.5Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_2.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_2.xml
new file mode 100644
index 0000000..b2207f9
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_2.xml
@@ -0,0 +1,46 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M7.23,13.71a0.75 0.75 ,0,0,0,1.06,1.06,5.23,5.23,0,0,1,6.22-0.88,4,4,0,0,1,1.57-0.78A6.75,6.75,0,0,0,7.23,13.71Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M21.72,8.27a0.75 0.75 ,0,0,0,1.07-1A14.76,14.76,0,0,0,12,2.75,14.76,14.76,0,0,0,1.22,7.2a0.76 0.76 ,0,0,0,0.05,1.06 0.76 0.76,0,0,0,1,0,13.25,13.25,0,0,1,9.7-4A13.27,13.27,0,0,1,21.72,8.27Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M19,11.77a0.75 0.75 ,0,0,0,1.06,0,0.77 0.77 ,0,0,0,0-1.07h0a11.59,11.59,0,0,0-8-3.5,11.63,11.63,0,0,0-8,3.5 0.75 0.75,0,0,0-0.1,1.06 0.74 0.74,0,0,0,1,0.1A0.38 0.38 ,0,0,0,5,11.77a10.12,10.12,0,0,1,7-3A10.1,10.1,0,0,1,19,11.77Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21.92,16.08a0.74 0.74 ,0,0,0-1.06,0L19,17.94l-1.86-1.86a0.75 0.75 ,0,0,0-1.06,1.06L17.94,19l-1.86,1.86a0.74 0.74 ,0,0,0,0,1.06 0.73 0.73,0,0,0,0.53 0.22 0.74 0.74 ,0,0,0,0.53-0.22L19,20.06l1.86,1.86a0.74 0.74 ,0,0,0,0.53 0.22 0.73 0.73 ,0,0,0,0.53-0.22 0.74 0.74,0,0,0,0-1.06L20.06,19l1.86-1.86A0.74 0.74 ,0,0,0,21.92,16.08Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M13.5,18.5a1.5,1.5,0,0,0-0.5-1.11,1.5,1.5,0,1,0,0,2.22A1.5,1.5,0,0,0,13.5,18.5Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_3.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_3.xml
new file mode 100644
index 0000000..6dd92a0
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_3.xml
@@ -0,0 +1,43 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M7.23,13.71a0.75 0.75 ,0,0,0,1.06,1.06,5.23,5.23,0,0,1,6.22-0.88,4,4,0,0,1,1.57-0.78A6.75,6.75,0,0,0,7.23,13.71Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M21.72,8.27a0.75 0.75 ,0,0,0,1.07-1A14.76,14.76,0,0,0,12,2.75,14.76,14.76,0,0,0,1.22,7.2a0.76 0.76 ,0,0,0,0.05,1.06 0.76 0.76,0,0,0,1,0,13.25,13.25,0,0,1,9.7-4A13.27,13.27,0,0,1,21.72,8.27Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M19,11.77a0.75 0.75 ,0,0,0,1.06,0,0.77 0.77 ,0,0,0,0-1.07h0a11.59,11.59,0,0,0-8-3.5,11.63,11.63,0,0,0-8,3.5 0.75 0.75,0,0,0-0.1,1.06 0.74 0.74,0,0,0,1,0.1A0.38 0.38 ,0,0,0,5,11.77a10.12,10.12,0,0,1,7-3A10.1,10.1,0,0,1,19,11.77Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M21.92,16.08a0.74 0.74 ,0,0,0-1.06,0L19,17.94l-1.86-1.86a0.75 0.75 ,0,0,0-1.06,1.06L17.94,19l-1.86,1.86a0.74 0.74 ,0,0,0,0,1.06 0.73 0.73,0,0,0,0.53 0.22 0.74 0.74 ,0,0,0,0.53-0.22L19,20.06l1.86,1.86a0.74 0.74 ,0,0,0,0.53 0.22 0.73 0.73 ,0,0,0,0.53-0.22 0.74 0.74,0,0,0,0-1.06L20.06,19l1.86-1.86A0.74 0.74 ,0,0,0,21.92,16.08Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M13.5,18.5a1.5,1.5,0,0,0-0.5-1.11,1.5,1.5,0,1,0,0,2.22A1.5,1.5,0,0,0,13.5,18.5Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_4.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_4.xml
new file mode 100644
index 0000000..13b0069
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_4.xml
@@ -0,0 +1,40 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M7.23,13.71a0.75 0.75 ,0,0,0,1.06,1.06,5.23,5.23,0,0,1,6.22-0.88,4,4,0,0,1,1.57-0.78A6.75,6.75,0,0,0,7.23,13.71Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M2.3,8.25a13.25,13.25,0,0,1,9.7-4,13.27,13.27,0,0,1,9.72,4,0.75 0.75 ,0,0,0,1.07-1A14.76,14.76,0,0,0,12,2.75,14.76,14.76,0,0,0,1.22,7.2a0.76 0.76 ,0,0,0,0.05,1.06A0.76 0.76 ,0,0,0,2.3,8.25Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M19,11.77a0.75 0.75 ,0,0,0,1.06,0,0.77 0.77 ,0,0,0,0-1.07h0a11.59,11.59,0,0,0-8-3.5,11.63,11.63,0,0,0-8,3.5 0.75 0.75,0,0,0-0.1,1.06 0.74 0.74,0,0,0,1,0.1A0.38 0.38 ,0,0,0,5,11.77a10.12,10.12,0,0,1,7-3A10.1,10.1,0,0,1,19,11.77Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M16.08,16.08a0.74 0.74 ,0,0,0,0,1.06L17.94,19l-1.86,1.86a0.74 0.74 ,0,0,0,0,1.06 0.73 0.73,0,0,0,0.53 0.22 0.74 0.74 ,0,0,0,0.53-0.22L19,20.06l1.86,1.86a0.74 0.74 ,0,0,0,0.53 0.22 0.73 0.73 ,0,0,0,0.53-0.22 0.74 0.74,0,0,0,0-1.06L20.06,19l1.86-1.86a0.75 0.75 ,0,0,0-1.06-1.06L19,17.94l-1.86-1.86A0.74 0.74 ,0,0,0,16.08,16.08Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M13.5,18.5a1.5,1.5,0,0,0-0.5-1.11,1.5,1.5,0,1,0,0,2.22A1.5,1.5,0,0,0,13.5,18.5Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_disconnected.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_disconnected.xml
new file mode 100644
index 0000000..c6607a7
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_qs_wifi_disconnected.xml
@@ -0,0 +1,55 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M21.7,8.3a0.83 0.83 ,0,0,0,1.05,0l0,0a0.73 0.73 ,0,0,0,0-1A14.51,14.51,0,0,0,12,2.8,14.77,14.77,0,0,0,1.25,7.25a0.76 0.76 ,0,0,0,0,1.05l0,0a0.72 0.72 ,0,0,0,1,0,13.34,13.34,0,0,1,9.7-4A13.16,13.16,0,0,1,21.7,8.3Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M12.05,7.25a11.36,11.36,0,0,0-8,3.5 0.74 0.74,0,0,0,1,1.05,9.93,9.93,0,0,1,7-3,9.94,9.94,0,0,1,3.25 0.64 ,5.58,5.58,0,0,1,1.56-1A11.38,11.38,0,0,0,12.05,7.25Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M7.25,13.75a0.76 0.76 ,0,0,0,0,1l0,0a0.73 0.73 ,0,0,0,1,0,5.26,5.26,0,0,1,5.2-1.3A5.48,5.48,0,0,1,13.72,12,6.73,6.73,0,0,0,7.25,13.75Z" />
+ <path
+ android:fillColor="#000000"
+ android:fillAlpha="0.3"
+ android:strokeAlpha="0.3"
+ android:strokeWidth="1"
+ android:pathData="M 12 17 C 12.8284271247 17 13.5 17.6715728753 13.5 18.5 C 13.5 19.3284271247 12.8284271247 20 12 20 C 11.1715728753 20 10.5 19.3284271247 10.5 18.5 C 10.5 17.6715728753 11.1715728753 17 12 17 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M16.42,11.09a3.66,3.66,0,0,0-1,1.76 0.73 0.73,0,0,0,0.56 0.9 0.74 0.74 ,0,0,0,0.9-0.56,2.23,2.23,0,0,1,0.56-1,2.14,2.14,0,0,1,3,0,2,2,0,0,1,0.57,1.57,1.61,1.61,0,0,1-0.72,1.2,3.13,3.13,0,0,1-0.34 0.21 ,3.07,3.07,0,0,0-1.76,2.34 0.75 0.75,0,0,0,0.62 0.86 H19a0.75 0.75 ,0,0,0,0.74-0.62,1.62,1.62,0,0,1,1-1.29c0.15-0.09 0.3 -0.17 0.44 -0.27a3.14,3.14,0,0,0,1.37-2.29,3.46,3.46,0,0,0-1-2.77A3.68,3.68,0,0,0,16.42,11.09Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 19 20 C 19.5522847498 20 20 20.4477152502 20 21 C 20 21.5522847498 19.5522847498 22 19 22 C 18.4477152502 22 18 21.5522847498 18 21 C 18 20.4477152502 18.4477152502 20 19 20 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_screenshot_delete.xml
similarity index 65%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_screenshot_delete.xml
index 2bcaf2a..9b42490 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_screenshot_delete.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,11 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M8,21h8a3,3,0,0,0,3-3V5.5h1A0.75 0.75 ,0,0,0,20,4H15a1,1,0,0,0-1-1H10A1,1,0,0,0,9,4H4A0.75 0.75 ,0,0,0,4,5.5H5V18A3,3,0,0,0,8,21ZM9,5.5h8.5V18A1.5,1.5,0,0,1,16,19.5H8A1.5,1.5,0,0,1,6.5,18V5.5Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M 13.5 8 H 15 V 17 H 13.5 V 8 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 9 8 H 10.5 V 17 H 9 V 8 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_settings_16dp.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_settings_16dp.xml
new file mode 100644
index 0000000..4237323
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_settings_16dp.xml
@@ -0,0 +1,31 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="16dp"
+ android:height="16dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M2.2,15.53,4,18.7a1.46,1.46,0,0,0,1.28 0.75 ,1.61,1.61,0,0,0,0.53-0.1l1.8-0.72a9,9,0,0,0,0.79 0.46 L8.7,21a1.45,1.45,0,0,0,1.45,1.27h3.7A1.47,1.47,0,0,0,15.31,21l0.27-1.91c0.26-0.14 0.52 -0.29 0.78 -0.46l1.8 0.72 a1.47,1.47,0,0,0,0.54 0.1 A1.43,1.43,0,0,0,20,18.75l1.86-3.22a1.47,1.47,0,0,0-0.37-1.86l-1.52-1.19c0-0.15,0-0.3,0-0.46s0-0.31,0-0.46l1.52-1.19a1.47,1.47,0,0,0,0.36-1.88L20,5.31a1.46,1.46,0,0,0-1.29-0.75,1.71,1.71,0,0,0-0.53 0.1 l-1.8 0.72 a9,9,0,0,0-0.79-0.46L15.29,3a1.45,1.45,0,0,0-1.45-1.27h-3.7A1.46,1.46,0,0,0,8.7,3L8.43,4.92c-0.26 0.14 -0.52 0.29 -0.78 0.46 L5.84,4.65a1.47,1.47,0,0,0-0.54-0.1,1.42,1.42,0,0,0-1.25 0.73 L2.2,8.47a1.44,1.44,0,0,0,0.37,1.88l1.52,1.19c0,0.15,0,0.31,0,0.46s0,0.31,0,0.46L2.56,13.65A1.48,1.48,0,0,0,2.2,15.53ZM5,13.64l0.63-0.49,0-0.79c0-0.12,0-0.23,0-0.36s0-0.24,0-0.36l0-0.79L5,10.36,3.52,9.19,5.33,6.06l1.76 0.71 0.73 0.29 0.65-0.42a6.59,6.59,0,0,1,0.67-0.4l0.67-0.36 0.11 -0.75 0.26 -1.87h3.63l0.27,1.87 0.1 0.77 0.69 0.35a6,6,0,0,1,0.66 0.39 l0.65 0.42 0.73-0.29,1.76-0.71L20.5,9.21,19,10.38l-0.63 0.49 0.05 0.79 c0,0.12,0,0.23,0,0.36s0,0.24,0,0.36l-0.05 0.79 0.63 0.49 ,1.48,1.17L18.68,18l-1.76-0.7L16.19,17l-0.65 0.42 a6.59,6.59,0,0,1-0.67 0.4 l-0.67 0.36 -0.11 0.75 -0.26,1.84H10.18l-0.27-1.87-0.1-0.77-0.69-0.35a6,6,0,0,1-0.66-0.39L7.81,17l-0.73 0.29 L5.33,18,3.52,14.8Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M12,16a4,4,0,1,0-4-4A4,4,0,0,0,12,16Zm0-6.5A2.5,2.5,0,1,1,9.5,12,2.5,2.5,0,0,1,12,9.5Z" />
+</vector>
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_signal_airplane.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_signal_airplane.xml
new file mode 100644
index 0000000..2d36a39
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_signal_airplane.xml
@@ -0,0 +1,28 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M2.52,16.17a1.25,1.25,0,0,0,1.11 0.19 L9.5,14.52v3.87L8,19.52a1.26,1.26,0,0,0-0.5,1v0.75a1.25,1.25,0,0,0,1.25,1.25h6.5a1.25,1.25,0,0,0,1.25-1.25v-0.75a1.26,1.26,0,0,0-0.5-1l-1.5-1.13V14.52l5.88,1.84a1.23,1.23,0,0,0,1.11-0.19,1.25,1.25,0,0,0,0.51-1V13.33a1.74,1.74,0,0,0-0.89-1.52L14.5,8.06V3.75a2.5,2.5,0,0,0-5,0V8.06L2.89,11.8A1.78,1.78,0,0,0,2,13.33v1.83A1.25,1.25,0,0,0,2.52,16.17Zm1.11-3.06L11,8.94V3.75a1,1,0,0,1,2,0V8.94l7.37,4.17a0.26 0.26 ,0,0,1,0.13 0.22 v1.49L13,12.48v6.66l2,1.5V21H9v-0.38l2-1.5V12.48L3.51,14.82V13.33A0.25 0.25 ,0,0,1,3.63,13.11Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_signal_flashlight.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_signal_flashlight.xml
new file mode 100644
index 0000000..3bde46f
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_signal_flashlight.xml
@@ -0,0 +1,31 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M9,22h6a0.76 0.76 ,0,0,0,0.75-0.75V11.46l1.89-3.07A0.77 0.77 ,0,0,0,17.75,8V2.75A0.76 0.76 ,0,0,0,17,2H7a0.76 0.76 ,0,0,0-0.75 0.75 v5a0.77 0.77 ,0,0,0,0.11 0.39 l1.89,3.07v10A0.76 0.76 ,0,0,0,9,22ZM16.25,3.5V5H7.75V3.5Zm-8.5,4v-1h8.5V7.79l-1.89,3.07a0.77 0.77 ,0,0,0-0.11 0.39 V20.5H9.75V11a0.77 0.77 ,0,0,0-0.11-0.39Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M 12 12.75 C 12.6903559373 12.75 13.25 13.3096440627 13.25 14 C 13.25 14.6903559373 12.6903559373 15.25 12 15.25 C 11.3096440627 15.25 10.75 14.6903559373 10.75 14 C 10.75 13.3096440627 11.3096440627 12.75 12 12.75 Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_swap_vert.xml
similarity index 66%
copy from packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
copy to packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_swap_vert.xml
index 2bcaf2a..297d886 100644
--- a/packages/overlays/IconPackFilledOverlay/res/drawable/ic_wifi_signal_2.xml
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_swap_vert.xml
@@ -7,8 +7,7 @@
* 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
+ * * 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
@@ -25,11 +24,8 @@
android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
<path
android:fillColor="#000000"
- android:fillAlpha="0.3"
- android:strokeAlpha="0.3"
- android:strokeWidth="1"
- android:pathData="M23.66,8.11a1.06,1.06,0,0,0-0.22-1.54A20.58,20.58,0,0,0,12,3,20.55,20.55,0,0,0,0.56,6.57,1.07,1.07,0,0,0,0.33,8.11L11.16,21.6a1.07,1.07,0,0,0,1.66,0Z" />
+ android:pathData="M6,8,8.25,5.81V13a0.75 0.75 ,0,1,0,1.5,0V5.81L12,8A0.75 0.75 ,0,0,0,13,8,0.75 0.75 ,0,0,0,13,7l-3.5-3.5a0.75 0.75 ,0,0,0-1.06,0L5,7A0.75 0.75 ,0,1,0,6,8Z" />
<path
android:fillColor="#000000"
- android:pathData="M12.82,21.6l7-8.7a12,12,0,0,0-15.63,0l7,8.7A1.07,1.07,0,0,0,12.82,21.6Z" />
-</vector>
+ android:pathData="M19,16A0.75 0.75 ,0,0,0,18,16l-2.22,2.22V11a0.75 0.75 ,0,0,0-1.5,0v7.21L12,16A0.75 0.75 ,0,1,0,11,17l3.5,3.5a0.75 0.75 ,0,0,0,1.06,0L19,17A0.75 0.75 ,0,0,0,19,16Z" />
+</vector>
\ No newline at end of file
diff --git a/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_volume_alarm.xml b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_volume_alarm.xml
new file mode 100644
index 0000000..167d15f
--- /dev/null
+++ b/packages/overlays/IconPackRoundedSystemUIOverlay/res/drawable/ic_volume_alarm.xml
@@ -0,0 +1,37 @@
+<!--
+/**
+ * Copyright (c) 2019, 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.
+ */
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24">
+
+ <path
+ android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M14.43,16.52a0.76 0.76 ,0,0,0,0.54 0.23 0.79 0.79 ,0,0,0,0.53-0.22 0.75 0.75,0,0,0,0-1.06l-2.75-2.78V8a0.75 0.75 ,0,0,0-1.5,0v5a0.75 0.75 ,0,0,0,0.22 0.53 Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M16.4,2.55a0.75 0.75 ,0,0,0,0.15,1.05l4,3a0.78 0.78 ,0,0,0,0.45 0.15 0.73 0.73 ,0,0,0,0.6-0.3 0.75 0.75,0,0,0-0.15-1l-4-3A0.75 0.75 ,0,0,0,16.4,2.55Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3,6.75a0.78 0.78 ,0,0,0,0.45-0.15l4-3a0.75 0.75 ,0,1,0-0.9-1.2l-4,3a0.75 0.75 ,0,0,0-0.15,1A0.73 0.73 ,0,0,0,3,6.75Z" />
+ <path
+ android:fillColor="#000000"
+ android:pathData="M3.08,13A9,9,0,0,0,12,22h0a8.81,8.81,0,0,0,6.3-2.63A9,9,0,0,0,20.92,13v0A8.92,8.92,0,1,0,3.08,13ZM12,5.5A7.47,7.47,0,0,1,19.42,13h0.75l-0.75,0a7.47,7.47,0,0,1-2.18,5.29A7.33,7.33,0,0,1,12,20.5h0a7.5,7.5,0,0,1,0-15Z" />
+</vector>
\ No newline at end of file
diff --git a/proto/src/metrics_constants/metrics_constants.proto b/proto/src/metrics_constants/metrics_constants.proto
index fceb656..76bb24d 100644
--- a/proto/src/metrics_constants/metrics_constants.proto
+++ b/proto/src/metrics_constants/metrics_constants.proto
@@ -6920,6 +6920,22 @@
// OS: Q
ACTION_CLICK_ACCOUNT_AVATAR = 1643;
+ // OPEN: Set new password (action intents android.app.action.SET_NEW_PASSWORD or
+ // android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD)
+ // CATEGORY: SETTINGS
+ // OS: Q
+ SET_NEW_PASSWORD_ACTIVITY = 1644;
+
+ // ACTION: Set new password (action intent android.app.action.SET_NEW_PASSWORD)
+ // CATEGORY: SETTINGS
+ // OS: Q
+ ACTION_SET_NEW_PASSWORD = 1645;
+
+ // ACTION: Set new password (action intent android.app.action.SET_NEW_PARENT_PROFILE_PASSWORD)
+ // CATEGORY: SETTINGS
+ // OS: Q
+ ACTION_SET_NEW_PARENT_PROFILE_PASSWORD = 1646;
+
// ---- End Q Constants, all Q constants go above this line ----
// Add new aosp constants above this line.
// END OF AOSP CONSTANTS
diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java
index 75ee99f..9249c9c 100644
--- a/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java
+++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCaptureManagerService.java
@@ -26,6 +26,7 @@
import android.content.ComponentName;
import android.content.ContentResolver;
import android.content.Context;
+import android.content.pm.ActivityPresentationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.UserInfo;
@@ -346,21 +347,16 @@
@NonNull ComponentName componentName, @NonNull String sessionId, int flags,
@NonNull IResultReceiver result) {
Preconditions.checkNotNull(activityToken);
- Preconditions.checkNotNull(componentName);
Preconditions.checkNotNull(sessionId);
final int userId = UserHandle.getCallingUserId();
- // TODO(b/111276913): refactor getTaskIdForActivity() to also return ComponentName,
- // so we don't pass it on startSession (same for Autofill)
- final int taskId = getAmInternal().getTaskIdForActivity(activityToken, false);
-
- // TODO(b/121260224): get from AM as well
- final int displayId = 0;
+ final ActivityPresentationInfo activityPresentationInfo = getAmInternal()
+ .getActivityPresentationInfo(activityToken);
synchronized (mLock) {
final ContentCapturePerUserService service = getServiceForUserLocked(userId);
- service.startSessionLocked(activityToken, componentName, taskId, displayId,
- sessionId, Binder.getCallingUid(), flags, result);
+ service.startSessionLocked(activityToken, activityPresentationInfo, sessionId,
+ Binder.getCallingUid(), flags, result);
}
}
diff --git a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
index b487b0d..7102b82 100644
--- a/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
+++ b/services/contentcapture/java/com/android/server/contentcapture/ContentCapturePerUserService.java
@@ -19,6 +19,7 @@
import static android.service.contentcapture.ContentCaptureService.setClientState;
import static android.view.contentcapture.ContentCaptureSession.STATE_DISABLED;
import static android.view.contentcapture.ContentCaptureSession.STATE_DUPLICATED_ID;
+import static android.view.contentcapture.ContentCaptureSession.STATE_INTERNAL_ERROR;
import static android.view.contentcapture.ContentCaptureSession.STATE_NO_SERVICE;
import static com.android.server.wm.ActivityTaskManagerInternal.ASSIST_KEY_CONTENT;
@@ -33,6 +34,7 @@
import android.app.assist.AssistContent;
import android.app.assist.AssistStructure;
import android.content.ComponentName;
+import android.content.pm.ActivityPresentationInfo;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ServiceInfo;
@@ -171,10 +173,18 @@
// TODO(b/119613670): log metrics
@GuardedBy("mLock")
public void startSessionLocked(@NonNull IBinder activityToken,
- @NonNull ComponentName componentName, int taskId, int displayId,
+ @NonNull ActivityPresentationInfo activityPresentationInfo,
@NonNull String sessionId, int uid, int flags,
@NonNull IResultReceiver clientReceiver) {
-
+ if (activityPresentationInfo == null) {
+ Slog.w(TAG, "basic activity info is null");
+ setClientState(clientReceiver, STATE_DISABLED | STATE_INTERNAL_ERROR,
+ /* binder= */ null);
+ return;
+ }
+ final int taskId = activityPresentationInfo.taskId;
+ final int displayId = activityPresentationInfo.displayId;
+ final ComponentName componentName = activityPresentationInfo.componentName;
final ComponentName serviceComponentName = getServiceComponentName();
final boolean enabled = isEnabledLocked();
final String historyItem =
diff --git a/services/core/Android.bp b/services/core/Android.bp
index f9de554..259aa50 100644
--- a/services/core/Android.bp
+++ b/services/core/Android.bp
@@ -19,7 +19,6 @@
":storaged_aidl",
":vold_aidl",
":gsiservice_aidl",
- ":mediaupdateservice_aidl",
"java/com/android/server/EventLogTags.logtags",
"java/com/android/server/am/EventLogTags.logtags",
],
diff --git a/services/core/java/com/android/server/BinderCallsStatsService.java b/services/core/java/com/android/server/BinderCallsStatsService.java
index 8b7f321..eafa0e2 100644
--- a/services/core/java/com/android/server/BinderCallsStatsService.java
+++ b/services/core/java/com/android/server/BinderCallsStatsService.java
@@ -61,11 +61,11 @@
mAppIdWhitelist = new ArraySet<>();
}
- public int resolveWorkSourceUid() {
+ public int resolveWorkSourceUid(int untrustedWorkSourceUid) {
final int callingUid = getCallingUid();
final int appId = UserHandle.getAppId(callingUid);
if (mAppIdWhitelist.contains(appId)) {
- final int workSource = getCallingWorkSourceUid();
+ final int workSource = untrustedWorkSourceUid;
final boolean isWorkSourceSet = workSource != Binder.UNSET_WORKSOURCE;
return isWorkSourceSet ? workSource : callingUid;
}
@@ -88,10 +88,6 @@
return Binder.getCallingUid();
}
- protected int getCallingWorkSourceUid() {
- return Binder.getCallingWorkSourceUid();
- }
-
private ArraySet<Integer> createAppidWhitelist(Context context) {
// Use a local copy instead of mAppIdWhitelist to prevent concurrent read access.
final ArraySet<Integer> whitelist = new ArraySet<>();
@@ -186,7 +182,7 @@
} else {
Binder.setObserver(null);
Binder.setProxyTransactListener(null);
- Binder.setWorkSourceProvider(Binder::getCallingUid);
+ Binder.setWorkSourceProvider((x) -> Binder.getCallingUid());
}
mEnabled = enabled;
mBinderCallsStats.reset();
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index f807543..1cb2c4a 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -60,7 +60,6 @@
import android.database.ContentObserver;
import android.net.ConnectionInfo;
import android.net.ConnectivityManager;
-import android.net.ConnectivityManager.PacketKeepalive;
import android.net.IConnectivityManager;
import android.net.IIpConnectivityMetrics;
import android.net.INetd;
@@ -94,6 +93,7 @@
import android.net.PrivateDnsConfigParcel;
import android.net.ProxyInfo;
import android.net.RouteInfo;
+import android.net.SocketKeepalive;
import android.net.UidRange;
import android.net.Uri;
import android.net.VpnService;
@@ -2488,8 +2488,8 @@
nai.networkMisc.acceptUnvalidated = msg.arg1 == 1;
break;
}
- case NetworkAgent.EVENT_PACKET_KEEPALIVE: {
- mKeepaliveTracker.handleEventPacketKeepalive(nai, msg);
+ case NetworkAgent.EVENT_SOCKET_KEEPALIVE: {
+ mKeepaliveTracker.handleEventSocketKeepalive(nai, msg);
break;
}
}
@@ -2863,8 +2863,7 @@
// sending all CALLBACK_LOST messages (for requests, not listens) at the end
// of rematchAllNetworksAndRequests
notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_LOST);
- mKeepaliveTracker.handleStopAllKeepalives(nai,
- ConnectivityManager.PacketKeepalive.ERROR_INVALID_NETWORK);
+ mKeepaliveTracker.handleStopAllKeepalives(nai, SocketKeepalive.ERROR_INVALID_NETWORK);
for (String iface : nai.linkProperties.getAllInterfaceNames()) {
// Disable wakeup packet monitoring for each interface.
wakeupModifyInterface(iface, nai.networkCapabilities, false);
@@ -3456,12 +3455,12 @@
break;
}
// Sent by KeepaliveTracker to process an app request on the state machine thread.
- case NetworkAgent.CMD_START_PACKET_KEEPALIVE: {
+ case NetworkAgent.CMD_START_SOCKET_KEEPALIVE: {
mKeepaliveTracker.handleStartKeepalive(msg);
break;
}
// Sent by KeepaliveTracker to process an app request on the state machine thread.
- case NetworkAgent.CMD_STOP_PACKET_KEEPALIVE: {
+ case NetworkAgent.CMD_STOP_SOCKET_KEEPALIVE: {
NetworkAgentInfo nai = getNetworkAgentInfoForNetwork((Network) msg.obj);
int slot = msg.arg1;
int reason = msg.arg2;
@@ -6363,7 +6362,7 @@
mKeepaliveTracker.startNattKeepalive(
getNetworkAgentInfoForNetwork(network),
intervalSeconds, messenger, binder,
- srcAddr, srcPort, dstAddr, ConnectivityManager.PacketKeepalive.NATT_PORT);
+ srcAddr, srcPort, dstAddr, NattSocketKeepalive.NATT_PORT);
}
@Override
@@ -6380,7 +6379,7 @@
@Override
public void stopKeepalive(Network network, int slot) {
mHandler.sendMessage(mHandler.obtainMessage(
- NetworkAgent.CMD_STOP_PACKET_KEEPALIVE, slot, PacketKeepalive.SUCCESS, network));
+ NetworkAgent.CMD_STOP_SOCKET_KEEPALIVE, slot, SocketKeepalive.SUCCESS, network));
}
@Override
diff --git a/services/core/java/com/android/server/LocationManagerService.java b/services/core/java/com/android/server/LocationManagerService.java
index 33c6dd2..1165b09 100644
--- a/services/core/java/com/android/server/LocationManagerService.java
+++ b/services/core/java/com/android/server/LocationManagerService.java
@@ -92,6 +92,7 @@
import com.android.internal.util.Preconditions;
import com.android.server.location.AbstractLocationProvider;
import com.android.server.location.ActivityRecognitionProxy;
+import com.android.server.location.CallerIdentity;
import com.android.server.location.GeocoderProxy;
import com.android.server.location.GeofenceManager;
import com.android.server.location.GeofenceProxy;
@@ -113,6 +114,7 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -223,10 +225,10 @@
private final ArraySet<String> mIgnoreSettingsPackageWhitelist = new ArraySet<>();
@GuardedBy("mLock")
- private final ArrayMap<IBinder, Identity> mGnssMeasurementsListeners = new ArrayMap<>();
+ private final ArrayMap<IBinder, CallerIdentity> mGnssMeasurementsListeners = new ArrayMap<>();
@GuardedBy("mLock")
- private final ArrayMap<IBinder, Identity>
+ private final ArrayMap<IBinder, CallerIdentity>
mGnssNavigationMessageListeners = new ArrayMap<>();
// current active user on the device - other users are denied location data
@@ -456,7 +458,7 @@
ArrayList<Receiver> deadReceivers = null;
for (Receiver receiver : mReceivers.values()) {
- if (receiver.mIdentity.mPackageName.equals(packageName)) {
+ if (receiver.mCallerIdentity.mPackageName.equals(packageName)) {
if (deadReceivers == null) {
deadReceivers = new ArrayList<>();
}
@@ -479,7 +481,7 @@
for (Entry<String, ArrayList<UpdateRecord>> entry : mRecordsByProvider.entrySet()) {
String provider = entry.getKey();
for (UpdateRecord record : entry.getValue()) {
- if (record.mReceiver.mIdentity.mUid == uid
+ if (record.mReceiver.mCallerIdentity.mUid == uid
&& record.mIsForegroundUid != foreground) {
if (D) {
Log.d(TAG, "request from uid " + uid + " is now "
@@ -487,7 +489,7 @@
}
record.updateForeground(foreground);
- if (!isThrottlingExemptLocked(record.mReceiver.mIdentity)) {
+ if (!isThrottlingExemptLocked(record.mReceiver.mCallerIdentity)) {
affectedProviders.add(provider);
}
}
@@ -497,8 +499,8 @@
applyRequirementsLocked(provider);
}
- for (Entry<IBinder, Identity> entry : mGnssMeasurementsListeners.entrySet()) {
- Identity callerIdentity = entry.getValue();
+ for (Entry<IBinder, CallerIdentity> entry : mGnssMeasurementsListeners.entrySet()) {
+ CallerIdentity callerIdentity = entry.getValue();
if (callerIdentity.mUid == uid) {
if (D) {
Log.d(TAG, "gnss measurements listener from uid " + uid
@@ -507,7 +509,7 @@
if (foreground || isThrottlingExemptLocked(entry.getValue())) {
mGnssMeasurementsProvider.addListener(
IGnssMeasurementsListener.Stub.asInterface(entry.getKey()),
- callerIdentity.mUid, callerIdentity.mPackageName);
+ callerIdentity);
} else {
mGnssMeasurementsProvider.removeListener(
IGnssMeasurementsListener.Stub.asInterface(entry.getKey()));
@@ -515,8 +517,8 @@
}
}
- for (Entry<IBinder, Identity> entry : mGnssNavigationMessageListeners.entrySet()) {
- Identity callerIdentity = entry.getValue();
+ for (Entry<IBinder, CallerIdentity> entry : mGnssNavigationMessageListeners.entrySet()) {
+ CallerIdentity callerIdentity = entry.getValue();
if (callerIdentity.mUid == uid) {
if (D) {
Log.d(TAG, "gnss navigation message listener from uid "
@@ -526,7 +528,7 @@
if (foreground || isThrottlingExemptLocked(entry.getValue())) {
mGnssNavigationMessageProvider.addListener(
IGnssNavigationMessageListener.Stub.asInterface(entry.getKey()),
- callerIdentity.mUid, callerIdentity.mPackageName);
+ callerIdentity);
} else {
mGnssNavigationMessageProvider.removeListener(
IGnssNavigationMessageListener.Stub.asInterface(entry.getKey()));
@@ -668,7 +670,7 @@
// create a passive location provider, which is always enabled
LocationProvider passiveProviderManager = new LocationProvider(PASSIVE_PROVIDER);
addProviderLocked(passiveProviderManager);
- mPassiveProvider = new PassiveProvider(passiveProviderManager);
+ mPassiveProvider = new PassiveProvider(mContext, passiveProviderManager);
passiveProviderManager.attachLocked(mPassiveProvider);
if (GnssLocationProvider.isSupported()) {
@@ -804,7 +806,7 @@
Integer.parseInt(fragments[9]) /* accuracy */);
LocationProvider testProviderManager = new LocationProvider(name);
addProviderLocked(testProviderManager);
- new MockProvider(testProviderManager, properties);
+ new MockProvider(mContext, testProviderManager, properties);
}
}
@@ -835,18 +837,6 @@
onProviderAllowedChangedLocked(false);
}
- private static final class Identity {
- final int mUid;
- final int mPid;
- final String mPackageName;
-
- Identity(int uid, int pid, String packageName) {
- mUid = uid;
- mPid = pid;
- mPackageName = packageName;
- }
- }
-
private class LocationProvider implements AbstractLocationProvider.LocationProviderManager {
private final String mName;
@@ -906,15 +896,12 @@
}
@GuardedBy("mLock")
- @Nullable
- public String getPackageLocked() {
+ public List<String> getPackagesLocked() {
if (mProvider == null) {
- return null;
- } else if (mProvider instanceof LocationProviderProxy) {
- // safe to not clear binder context since this doesn't call into the actual provider
- return ((LocationProviderProxy) mProvider).getConnectedPackageName();
+ return Collections.emptyList();
} else {
- return mContext.getPackageName();
+ // safe to not clear binder context since this doesn't call into the real provider
+ return mProvider.getProviderPackages();
}
}
@@ -1234,7 +1221,7 @@
*/
private final class Receiver implements IBinder.DeathRecipient, PendingIntent.OnFinished {
private static final long WAKELOCK_TIMEOUT_MILLIS = 60 * 1000;
- final Identity mIdentity;
+ final CallerIdentity mCallerIdentity;
private final int mAllowedResolutionLevel; // resolution level allowed to receiver
private final ILocationListener mListener;
@@ -1262,7 +1249,7 @@
mKey = intent;
}
mAllowedResolutionLevel = getAllowedResolutionLevel(pid, uid);
- mIdentity = new Identity(uid, pid, packageName);
+ mCallerIdentity = new CallerIdentity(uid, pid, packageName);
if (workSource != null && workSource.isEmpty()) {
workSource = null;
}
@@ -1274,7 +1261,7 @@
// construct/configure wakelock
mWakeLock = mPowerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, WAKELOCK_KEY);
if (workSource == null) {
- workSource = new WorkSource(mIdentity.mUid, mIdentity.mPackageName);
+ workSource = new WorkSource(mCallerIdentity.mUid, mCallerIdentity.mPackageName);
}
mWakeLock.setWorkSource(workSource);
@@ -1377,14 +1364,14 @@
int op) {
if (!currentlyMonitoring) {
if (allowMonitoring) {
- return mAppOps.startOpNoThrow(op, mIdentity.mUid, mIdentity.mPackageName)
- == AppOpsManager.MODE_ALLOWED;
+ return mAppOps.startOpNoThrow(op, mCallerIdentity.mUid,
+ mCallerIdentity.mPackageName) == AppOpsManager.MODE_ALLOWED;
}
} else {
if (!allowMonitoring
- || mAppOps.noteOpNoThrow(op, mIdentity.mUid, mIdentity.mPackageName)
- != AppOpsManager.MODE_ALLOWED) {
- mAppOps.finishOp(op, mIdentity.mUid, mIdentity.mPackageName);
+ || mAppOps.noteOpNoThrow(op, mCallerIdentity.mUid,
+ mCallerIdentity.mPackageName) != AppOpsManager.MODE_ALLOWED) {
+ mAppOps.finishOp(op, mCallerIdentity.mUid, mCallerIdentity.mPackageName);
return false;
}
}
@@ -1722,7 +1709,6 @@
}
}
-
@Override
public void flushGnssBatch(String packageName) {
mContext.enforceCallingPermission(android.Manifest.permission.LOCATION_HARDWARE,
@@ -2014,7 +2000,7 @@
if (records != null) {
for (UpdateRecord record : records) {
if (!isCurrentProfileLocked(
- UserHandle.getUserId(record.mReceiver.mIdentity.mUid))) {
+ UserHandle.getUserId(record.mReceiver.mCallerIdentity.mUid))) {
continue;
}
@@ -2073,13 +2059,13 @@
providerRequest.lowPowerMode = true;
for (UpdateRecord record : records) {
if (!isCurrentProfileLocked(
- UserHandle.getUserId(record.mReceiver.mIdentity.mUid))) {
+ UserHandle.getUserId(record.mReceiver.mCallerIdentity.mUid))) {
continue;
}
if (!checkLocationAccess(
- record.mReceiver.mIdentity.mPid,
- record.mReceiver.mIdentity.mUid,
- record.mReceiver.mIdentity.mPackageName,
+ record.mReceiver.mCallerIdentity.mPid,
+ record.mReceiver.mCallerIdentity.mUid,
+ record.mReceiver.mCallerIdentity.mPackageName,
record.mReceiver.mAllowedResolutionLevel)) {
continue;
}
@@ -2090,7 +2076,7 @@
LocationRequest locationRequest = record.mRealRequest;
long interval = locationRequest.getInterval();
- if (!isThrottlingExemptLocked(record.mReceiver.mIdentity)) {
+ if (!isThrottlingExemptLocked(record.mReceiver.mCallerIdentity)) {
if (!record.mIsForegroundUid) {
interval = Math.max(interval, backgroundThrottleInterval);
}
@@ -2120,7 +2106,7 @@
long thresholdInterval = (providerRequest.interval + 1000) * 3 / 2;
for (UpdateRecord record : records) {
if (isCurrentProfileLocked(
- UserHandle.getUserId(record.mReceiver.mIdentity.mUid))) {
+ UserHandle.getUserId(record.mReceiver.mCallerIdentity.mUid))) {
LocationRequest locationRequest = record.mRequest;
// Don't assign battery blame for update records whose
@@ -2137,8 +2123,8 @@
// Assign blame to caller if there's no WorkSource associated with
// the request or if it's invalid.
worksource.add(
- record.mReceiver.mIdentity.mUid,
- record.mReceiver.mIdentity.mPackageName);
+ record.mReceiver.mCallerIdentity.mUid,
+ record.mReceiver.mCallerIdentity.mPackageName);
}
}
}
@@ -2175,19 +2161,17 @@
}
@GuardedBy("mLock")
- private boolean isThrottlingExemptLocked(Identity identity) {
- if (identity.mUid == Process.SYSTEM_UID) {
+ private boolean isThrottlingExemptLocked(CallerIdentity callerIdentity) {
+ if (callerIdentity.mUid == Process.SYSTEM_UID) {
return true;
}
- if (mBackgroundThrottlePackageWhitelist.contains(identity.mPackageName)) {
+ if (mBackgroundThrottlePackageWhitelist.contains(callerIdentity.mPackageName)) {
return true;
}
- for (LocationProvider provider : mProviders) {
- if (identity.mPackageName.equals(provider.getPackageLocked())) {
- return true;
- }
+ if (isProviderPackage(callerIdentity.mPackageName)) {
+ return true;
}
return false;
@@ -2199,14 +2183,13 @@
return false;
}
- if (mIgnoreSettingsPackageWhitelist.contains(record.mReceiver.mIdentity.mPackageName)) {
+ if (mIgnoreSettingsPackageWhitelist.contains(
+ record.mReceiver.mCallerIdentity.mPackageName)) {
return true;
}
- for (LocationProvider provider : mProviders) {
- if (record.mReceiver.mIdentity.mPackageName.equals(provider.getPackageLocked())) {
- return true;
- }
+ if (isProviderPackage(record.mReceiver.mCallerIdentity.mPackageName)) {
+ return true;
}
return false;
@@ -2230,7 +2213,7 @@
mRequest = request;
mReceiver = receiver;
mIsForegroundUid = isImportanceForeground(
- mActivityManager.getPackageImportance(mReceiver.mIdentity.mPackageName));
+ mActivityManager.getPackageImportance(mReceiver.mCallerIdentity.mPackageName));
ArrayList<UpdateRecord> records = mRecordsByProvider.get(provider);
if (records == null) {
@@ -2243,7 +2226,7 @@
// Update statistics for historical location requests by package/provider
mRequestStatistics.startRequesting(
- mReceiver.mIdentity.mPackageName, provider, request.getInterval(),
+ mReceiver.mCallerIdentity.mPackageName, provider, request.getInterval(),
mIsForegroundUid);
}
@@ -2253,14 +2236,14 @@
private void updateForeground(boolean isForeground) {
mIsForegroundUid = isForeground;
mRequestStatistics.updateForeground(
- mReceiver.mIdentity.mPackageName, mProvider, isForeground);
+ mReceiver.mCallerIdentity.mPackageName, mProvider, isForeground);
}
/**
* Method to be called when a record will no longer be used.
*/
private void disposeLocked(boolean removeReceiver) {
- mRequestStatistics.stopRequesting(mReceiver.mIdentity.mPackageName, mProvider);
+ mRequestStatistics.stopRequesting(mReceiver.mCallerIdentity.mPackageName, mProvider);
// remove from mRecordsByProvider
ArrayList<UpdateRecord> globalRecords = mRecordsByProvider.get(this.mProvider);
@@ -2282,8 +2265,8 @@
@Override
public String toString() {
- return "UpdateRecord[" + mProvider + " " + mReceiver.mIdentity.mPackageName
- + "(" + mReceiver.mIdentity.mUid + (mIsForegroundUid ? " foreground"
+ return "UpdateRecord[" + mProvider + " " + mReceiver.mCallerIdentity.mPackageName
+ + "(" + mReceiver.mCallerIdentity.mUid + (mIsForegroundUid ? " foreground"
: " background")
+ ")" + " " + mRealRequest + " "
+ mReceiver.mWorkSource + "]";
@@ -2458,7 +2441,7 @@
Log.d(TAG, "request " + Integer.toHexString(System.identityHashCode(receiver))
+ " " + name + " " + request + " from " + packageName + "(" + uid + " "
+ (record.mIsForegroundUid ? "foreground" : "background")
- + (isThrottlingExemptLocked(receiver.mIdentity)
+ + (isThrottlingExemptLocked(receiver.mCallerIdentity)
? " [whitelisted]" : "") + ")");
}
@@ -2582,8 +2565,8 @@
if (provider == null) return null;
// only the current user or location providers may get location this way
- if (!isCurrentProfileLocked(UserHandle.getUserId(uid)) && !isLocationProviderLocked(
- uid)) {
+ if (!isCurrentProfileLocked(UserHandle.getUserId(uid)) && !isProviderPackage(
+ packageName)) {
return null;
}
@@ -2734,7 +2717,8 @@
// TODO(b/120449926): The GNSS status listeners should be handled similar to the GNSS
// measurements listeners.
- return mGnssStatusProvider.addListener(callback, Binder.getCallingUid(), packageName);
+ return mGnssStatusProvider.addListener(callback, new CallerIdentity(Binder.getCallingUid(),
+ Binder.getCallingPid(), packageName));
}
@Override
@@ -2750,8 +2734,8 @@
}
synchronized (mLock) {
- Identity callerIdentity
- = new Identity(Binder.getCallingUid(), Binder.getCallingPid(), packageName);
+ CallerIdentity callerIdentity = new CallerIdentity(Binder.getCallingUid(),
+ Binder.getCallingPid(), packageName);
// TODO(b/120481270): Register for client death notification and update map.
mGnssMeasurementsListeners.put(listener.asBinder(), callerIdentity);
long identity = Binder.clearCallingIdentity();
@@ -2759,8 +2743,7 @@
if (isThrottlingExemptLocked(callerIdentity)
|| isImportanceForeground(
mActivityManager.getPackageImportance(packageName))) {
- return mGnssMeasurementsProvider.addListener(listener,
- callerIdentity.mUid, callerIdentity.mPackageName);
+ return mGnssMeasurementsProvider.addListener(listener, callerIdentity);
}
} finally {
Binder.restoreCallingIdentity(identity);
@@ -2815,8 +2798,8 @@
}
synchronized (mLock) {
- Identity callerIdentity
- = new Identity(Binder.getCallingUid(), Binder.getCallingPid(), packageName);
+ CallerIdentity callerIdentity = new CallerIdentity(Binder.getCallingUid(),
+ Binder.getCallingPid(), packageName);
// TODO(b/120481270): Register for client death notification and update map.
mGnssNavigationMessageListeners.put(listener.asBinder(), callerIdentity);
@@ -2825,8 +2808,7 @@
if (isThrottlingExemptLocked(callerIdentity)
|| isImportanceForeground(
mActivityManager.getPackageImportance(packageName))) {
- return mGnssNavigationMessageProvider.addListener(listener,
- callerIdentity.mUid, callerIdentity.mPackageName);
+ return mGnssNavigationMessageProvider.addListener(listener, callerIdentity);
}
} finally {
Binder.restoreCallingIdentity(identity);
@@ -2906,7 +2888,25 @@
if (provider == null) {
return null;
}
- return provider.getPackageLocked();
+ List<String> packages = provider.getPackagesLocked();
+ if (packages.isEmpty()) {
+ return null;
+ } else {
+ return packages.get(0);
+ }
+ }
+ }
+
+ @Override
+ public boolean isProviderPackage(String packageName) {
+ synchronized (mLock) {
+ for (LocationProvider provider : mProviders) {
+ if (provider.getPackagesLocked().contains(packageName)) {
+ return true;
+ }
+ }
+
+ return false;
}
}
@@ -2988,28 +2988,6 @@
}
@GuardedBy("mLock")
- private boolean isLocationProviderLocked(int uid) {
- if (uid == Process.SYSTEM_UID) {
- return true;
- }
-
- String[] packageNames = mPackageManager.getPackagesForUid(uid);
- if (packageNames == null) {
- return false;
- }
- for (LocationProvider provider : mProviders) {
- String packageName = provider.getPackageLocked();
- if (packageName == null) {
- continue;
- }
- if (ArrayUtils.contains(packageNames, packageName)) {
- return true;
- }
- }
- return false;
- }
-
- @GuardedBy("mLock")
private static boolean shouldBroadcastSafeLocked(
Location loc, Location lastLoc, UpdateRecord record, long now) {
// Always broadcast the first update
@@ -3109,33 +3087,33 @@
continue;
}
- int receiverUserId = UserHandle.getUserId(receiver.mIdentity.mUid);
+ int receiverUserId = UserHandle.getUserId(receiver.mCallerIdentity.mUid);
if (!isCurrentProfileLocked(receiverUserId)
- && !isLocationProviderLocked(receiver.mIdentity.mUid)) {
+ && !isProviderPackage(receiver.mCallerIdentity.mPackageName)) {
if (D) {
Log.d(TAG, "skipping loc update for background user " + receiverUserId +
" (current user: " + mCurrentUserId + ", app: " +
- receiver.mIdentity.mPackageName + ")");
+ receiver.mCallerIdentity.mPackageName + ")");
}
continue;
}
- if (mBlacklist.isBlacklisted(receiver.mIdentity.mPackageName)) {
+ if (mBlacklist.isBlacklisted(receiver.mCallerIdentity.mPackageName)) {
if (D) {
Log.d(TAG, "skipping loc update for blacklisted app: " +
- receiver.mIdentity.mPackageName);
+ receiver.mCallerIdentity.mPackageName);
}
continue;
}
if (!reportLocationAccessNoThrow(
- receiver.mIdentity.mPid,
- receiver.mIdentity.mUid,
- receiver.mIdentity.mPackageName,
+ receiver.mCallerIdentity.mPid,
+ receiver.mCallerIdentity.mUid,
+ receiver.mCallerIdentity.mPackageName,
receiver.mAllowedResolutionLevel)) {
if (D) {
Log.d(TAG, "skipping loc update for no op app: " +
- receiver.mIdentity.mPackageName);
+ receiver.mCallerIdentity.mPackageName);
}
continue;
}
@@ -3300,7 +3278,8 @@
MockLocationProvider mockProviderManager = new MockLocationProvider(name);
addProviderLocked(mockProviderManager);
- mockProviderManager.attachLocked(new MockProvider(mockProviderManager, properties));
+ mockProviderManager.attachLocked(
+ new MockProvider(mContext, mockProviderManager, properties));
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -3424,21 +3403,23 @@
}
}
pw.println(" Active GnssMeasurement Listeners:");
- for (Identity identity : mGnssMeasurementsListeners.values()) {
- pw.println(" " + identity.mPid + " " + identity.mUid + " "
- + identity.mPackageName + ": " + isThrottlingExemptLocked(identity));
+ for (CallerIdentity callerIdentity : mGnssMeasurementsListeners.values()) {
+ pw.println(" " + callerIdentity.mPid + " " + callerIdentity.mUid + " "
+ + callerIdentity.mPackageName + ": "
+ + isThrottlingExemptLocked(callerIdentity));
}
pw.println(" Active GnssNavigationMessage Listeners:");
- for (Identity identity : mGnssNavigationMessageListeners.values()) {
- pw.println(" " + identity.mPid + " " + identity.mUid + " "
- + identity.mPackageName + ": " + isThrottlingExemptLocked(identity));
+ for (CallerIdentity callerIdentity : mGnssNavigationMessageListeners.values()) {
+ pw.println(" " + callerIdentity.mPid + " " + callerIdentity.mUid + " "
+ + callerIdentity.mPackageName + ": "
+ + isThrottlingExemptLocked(callerIdentity));
}
pw.println(" Overlay Provider Packages:");
for (LocationProvider provider : mProviders) {
if (provider.mProvider instanceof LocationProviderProxy) {
pw.println(" " + provider.getName() + ": "
+ ((LocationProviderProxy) provider.mProvider)
- .getConnectedPackageName());
+ .getProviderPackages());
}
}
pw.println(" Historical Records by Provider:");
diff --git a/services/core/java/com/android/server/LooperStatsService.java b/services/core/java/com/android/server/LooperStatsService.java
index 2f7929c..9184128 100644
--- a/services/core/java/com/android/server/LooperStatsService.java
+++ b/services/core/java/com/android/server/LooperStatsService.java
@@ -59,7 +59,8 @@
private final Context mContext;
private final LooperStats mStats;
- private boolean mEnabled = DEFAULT_ENABLED;
+ // Default should be false so that the first call to #setEnabled installed the looper observer.
+ private boolean mEnabled = false;
private LooperStatsService(Context context, LooperStats stats) {
this.mContext = context;
diff --git a/services/core/java/com/android/server/PackageWatchdog.java b/services/core/java/com/android/server/PackageWatchdog.java
index 4507193..ec40971 100644
--- a/services/core/java/com/android/server/PackageWatchdog.java
+++ b/services/core/java/com/android/server/PackageWatchdog.java
@@ -247,9 +247,8 @@
}
for (int pIndex = 0; pIndex < packages.size(); pIndex++) {
- String packageToReport = packages.get(pIndex).getPackageName();
- long packageVersionCode = packages.get(pIndex).getVersionCode();
- // Observer that will receive failure for packageToReport
+ VersionedPackage versionedPackage = packages.get(pIndex);
+ // Observer that will receive failure for versionedPackage
PackageHealthObserver currentObserverToNotify = null;
int currentObserverImpact = Integer.MAX_VALUE;
@@ -258,9 +257,8 @@
ObserverInternal observer = mAllObservers.valueAt(oIndex);
PackageHealthObserver registeredObserver = observer.mRegisteredObserver;
if (registeredObserver != null
- && observer.onPackageFailure(packageToReport)) {
- int impact = registeredObserver.onHealthCheckFailed(packageToReport,
- packageVersionCode);
+ && observer.onPackageFailure(versionedPackage.getPackageName())) {
+ int impact = registeredObserver.onHealthCheckFailed(versionedPackage);
if (impact != PackageHealthObserverImpact.USER_IMPACT_NONE
&& impact < currentObserverImpact) {
currentObserverToNotify = registeredObserver;
@@ -271,7 +269,7 @@
// Execute action with least user impact
if (currentObserverToNotify != null) {
- currentObserverToNotify.execute(packageToReport, packageVersionCode);
+ currentObserverToNotify.execute(versionedPackage);
}
}
}
@@ -310,19 +308,19 @@
/** Register instances of this interface to receive notifications on package failure. */
public interface PackageHealthObserver {
/**
- * Called when health check fails for the {@code packageName}.
+ * Called when health check fails for the {@code versionedPackage}.
*
* @return any one of {@link PackageHealthObserverImpact} to express the impact
* to the user on {@link #execute}
*/
- @PackageHealthObserverImpact int onHealthCheckFailed(String packageName, long versionCdoe);
+ @PackageHealthObserverImpact int onHealthCheckFailed(VersionedPackage versionedPackage);
/**
* Executes mitigation for {@link #onHealthCheckFailed}.
*
* @return {@code true} if action was executed successfully, {@code false} otherwise
*/
- boolean execute(String packageName, long versionCode);
+ boolean execute(VersionedPackage versionedPackage);
// TODO(zezeozue): Ensure uniqueness?
/**
diff --git a/services/core/java/com/android/server/VibratorService.java b/services/core/java/com/android/server/VibratorService.java
index 9b9911a..545baa0 100644
--- a/services/core/java/com/android/server/VibratorService.java
+++ b/services/core/java/com/android/server/VibratorService.java
@@ -1454,6 +1454,17 @@
private final IBinder mToken;
+ private final class CommonOptions {
+ public boolean force = false;
+ public void check(String opt) {
+ switch (opt) {
+ case "-f":
+ force = true;
+ break;
+ }
+ }
+ }
+
private VibratorShellCommand(IBinder token) {
mToken = token;
}
@@ -1473,11 +1484,11 @@
return handleDefaultCommands(cmd);
}
- private boolean checkDoNotDisturb() {
+ private boolean checkDoNotDisturb(CommonOptions opts) {
try {
final int zenMode = Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ZEN_MODE);
- if (zenMode != Settings.Global.ZEN_MODE_OFF) {
+ if (zenMode != Settings.Global.ZEN_MODE_OFF && !opts.force) {
try (PrintWriter pw = getOutPrintWriter();) {
pw.print("Ignoring because device is on DND mode ");
pw.println(DebugUtils.flagsToString(Settings.Global.class, "ZEN_MODE_",
@@ -1495,7 +1506,14 @@
private int runVibrate() {
Trace.traceBegin(Trace.TRACE_TAG_VIBRATOR, "runVibrate");
try {
- if (checkDoNotDisturb()) {
+ CommonOptions commonOptions = new CommonOptions();
+
+ String opt;
+ while ((opt = getNextOption()) != null) {
+ commonOptions.check(opt);
+ }
+
+ if (checkDoNotDisturb(commonOptions)) {
return 0;
}
@@ -1518,13 +1536,10 @@
private int runWaveform() {
Trace.traceBegin(Trace.TRACE_TAG_VIBRATOR, "runWaveform");
try {
- if (checkDoNotDisturb()) {
- return 0;
- }
-
String description = "Shell command";
int repeat = -1;
ArrayList<Integer> amplitudesList = null;
+ CommonOptions commonOptions = new CommonOptions();
String opt;
while ((opt = getNextOption()) != null) {
@@ -1540,9 +1555,16 @@
amplitudesList = new ArrayList<Integer>();
}
break;
+ default:
+ commonOptions.check(opt);
+ break;
}
}
+ if (checkDoNotDisturb(commonOptions)) {
+ return 0;
+ }
+
ArrayList<Long> timingsList = new ArrayList<Long>();
String arg;
@@ -1574,7 +1596,14 @@
private int runPrebaked() {
Trace.traceBegin(Trace.TRACE_TAG_VIBRATOR, "runPrebaked");
try {
- if (checkDoNotDisturb()) {
+ CommonOptions commonOptions = new CommonOptions();
+
+ String opt;
+ while ((opt = getNextOption()) != null) {
+ commonOptions.check(opt);
+ }
+
+ if (checkDoNotDisturb(commonOptions)) {
return 0;
}
@@ -1618,6 +1647,8 @@
pw.println(" (Do Not Disturb) mode.");
pw.println(" cancel");
pw.println(" Cancels any active vibration");
+ pw.println("Common Options:");
+ pw.println(" -f - Force. Ignore Do Not Disturb setting.");
pw.println("");
}
}
diff --git a/services/core/java/com/android/server/am/ActivityManagerService.java b/services/core/java/com/android/server/am/ActivityManagerService.java
index 29baacb..94fc552 100644
--- a/services/core/java/com/android/server/am/ActivityManagerService.java
+++ b/services/core/java/com/android/server/am/ActivityManagerService.java
@@ -121,6 +121,7 @@
import static com.android.server.am.MemoryStatUtil.hasMemcg;
import static com.android.server.am.MemoryStatUtil.readMemoryStatFromFilesystem;
import static com.android.server.am.MemoryStatUtil.readRssHighWaterMarkFromProcfs;
+import static com.android.server.pm.PackageManagerService.PLATFORM_PACKAGE_NAME;
import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_CLEANUP;
import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_CONFIGURATION;
import static com.android.server.wm.ActivityTaskManagerDebugConfig.DEBUG_SWITCH;
@@ -198,6 +199,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
+import android.content.pm.ActivityPresentationInfo;
import android.content.pm.ApplicationInfo;
import android.content.pm.ApplicationInfo.HiddenApiEnforcementPolicy;
import android.content.pm.IPackageDataObserver;
@@ -284,6 +286,7 @@
import android.util.TimingsTraceLog;
import android.util.proto.ProtoOutputStream;
import android.util.proto.ProtoUtils;
+import android.view.Display;
import android.view.Gravity;
import android.view.IRecentsAnimationRunner;
import android.view.LayoutInflater;
@@ -1678,7 +1681,7 @@
synchronized (mPidsSelfLocked) {
for (int i = 0; i < mPidsSelfLocked.size(); i++) {
final ProcessRecord p = mPidsSelfLocked.valueAt(i);
- if (p.uid == uid) {
+ if (p.uid == uid && p.thread != null) {
try {
p.thread.notifyCleartextNetwork(firstPacket);
} catch (RemoteException ignored) {
@@ -3585,6 +3588,9 @@
if (tracesFile == null) {
return null;
}
+ if (DEBUG_ANR) {
+ Slog.d(TAG, "Dumping to " + tracesFile.getAbsolutePath());
+ }
dumpStackTraces(tracesFile.getAbsolutePath(), firstPids, nativePids, extraPids);
return tracesFile;
@@ -4504,6 +4510,7 @@
// next app record if we are emulating process with anonymous threads.
ProcessRecord app;
long startTime = SystemClock.uptimeMillis();
+ long bindApplicationTimeMillis;
if (pid != MY_PID && pid >= 0) {
synchronized (mPidsSelfLocked) {
app = mPidsSelfLocked.get(pid);
@@ -4741,6 +4748,7 @@
}
checkTime(startTime, "attachApplicationLocked: immediately before bindApplication");
+ bindApplicationTimeMillis = SystemClock.elapsedRealtime();
mAtmInternal.preBindApplication(app.getWindowProcessController());
final ActiveInstrumentation instr2 = app.getActiveInstrumentation();
if (app.isolatedEntryPoint != null) {
@@ -4844,7 +4852,7 @@
try {
thread.scheduleCreateBackupAgent(backupTarget.appInfo,
compatibilityInfoForPackage(backupTarget.appInfo),
- backupTarget.backupMode);
+ backupTarget.backupMode, backupTarget.userId);
} catch (Exception e) {
Slog.wtf(TAG, "Exception thrown creating backup agent in " + app, e);
badApp = true;
@@ -4862,6 +4870,17 @@
checkTime(startTime, "attachApplicationLocked: after updateOomAdjLocked");
}
+ StatsLog.write(
+ StatsLog.PROCESS_START_TIME,
+ app.info.uid,
+ app.pid,
+ app.info.packageName,
+ StatsLog.PROCESS_START_TIME__TYPE__COLD,
+ app.startTime,
+ (int) (bindApplicationTimeMillis - app.startTime),
+ (int) (SystemClock.elapsedRealtime() - app.startTime),
+ app.hostingType,
+ (app.hostingNameStr != null ? app.hostingNameStr : ""));
return true;
}
@@ -13680,18 +13699,26 @@
// Cause the target app to be launched if necessary and its backup agent
// instantiated. The backup agent will invoke backupAgentCreated() on the
// activity manager to announce its creation.
- public boolean bindBackupAgent(String packageName, int backupMode, int userId) {
+ public boolean bindBackupAgent(String packageName, int backupMode, int targetUserId) {
if (DEBUG_BACKUP) {
- Slog.v(TAG, "bindBackupAgent: app=" + packageName + " mode="
- + backupMode + " userId=" + userId + " callingUid = " + Binder.getCallingUid()
+ Slog.v(TAG, "bindBackupAgent: app=" + packageName + " mode=" + backupMode
+ + " targetUserId=" + targetUserId + " callingUid = " + Binder.getCallingUid()
+ " uid = " + Process.myUid());
}
enforceCallingPermission("android.permission.CONFIRM_FULL_BACKUP", "bindBackupAgent");
+ // The instantiatedUserId is the user of the process the backup agent is started in. This is
+ // different from the targetUserId which is the user whose data is to be backed up or
+ // restored. This distinction is important for system-process packages that live in the
+ // system user's process but backup/restore data for non-system users.
+ // TODO (b/123688746): Handle all system-process packages with singleton check.
+ final int instantiatedUserId =
+ PLATFORM_PACKAGE_NAME.equals(packageName) ? UserHandle.USER_SYSTEM : targetUserId;
+
IPackageManager pm = AppGlobals.getPackageManager();
ApplicationInfo app = null;
try {
- app = pm.getApplicationInfo(packageName, STOCK_PM_FLAGS, userId);
+ app = pm.getApplicationInfo(packageName, STOCK_PM_FLAGS, instantiatedUserId);
} catch (RemoteException e) {
// can't happen; package manager is process-local
}
@@ -13715,7 +13742,7 @@
+ app.packageName + ": " + e);
}
- BackupRecord r = new BackupRecord(app, backupMode);
+ BackupRecord r = new BackupRecord(app, backupMode, targetUserId);
ComponentName hostingName =
(backupMode == ApplicationThreadConstants.BACKUP_MODE_INCREMENTAL)
? new ComponentName(app.packageName, app.backupAgentName)
@@ -13737,10 +13764,10 @@
proc.inFullBackup = true;
}
r.app = proc;
- final BackupRecord backupTarget = mBackupTargets.get(userId);
+ final BackupRecord backupTarget = mBackupTargets.get(targetUserId);
oldBackupUid = backupTarget != null ? backupTarget.appInfo.uid : -1;
newBackupUid = proc.inFullBackup ? r.appInfo.uid : -1;
- mBackupTargets.put(userId, r);
+ mBackupTargets.put(targetUserId, r);
// Try not to kill the process during backup
updateOomAdjLocked(proc, true);
@@ -13751,7 +13778,7 @@
if (DEBUG_BACKUP) Slog.v(TAG_BACKUP, "Agent proc already running: " + proc);
try {
proc.thread.scheduleCreateBackupAgent(app,
- compatibilityInfoForPackage(app), backupMode);
+ compatibilityInfoForPackage(app), backupMode, targetUserId);
} catch (RemoteException e) {
// Will time out on the backup manager side
}
@@ -13791,16 +13818,18 @@
// A backup agent has just come up
@Override
- public void backupAgentCreated(String agentPackageName, IBinder agent) {
- final int callingUserId = UserHandle.getCallingUserId();
+ public void backupAgentCreated(String agentPackageName, IBinder agent, int userId) {
+ // Resolve the target user id and enforce permissions.
+ userId = mUserController.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(),
+ userId, /* allowAll */ false, ALLOW_FULL_ONLY, "backupAgentCreated", null);
if (DEBUG_BACKUP) {
Slog.v(TAG_BACKUP, "backupAgentCreated: " + agentPackageName + " = " + agent
- + " callingUserId = " + callingUserId + " callingUid = "
- + Binder.getCallingUid() + " uid = " + Process.myUid());
+ + " callingUserId = " + UserHandle.getCallingUserId() + " userId = " + userId
+ + " callingUid = " + Binder.getCallingUid() + " uid = " + Process.myUid());
}
synchronized(this) {
- final BackupRecord backupTarget = mBackupTargets.get(callingUserId);
+ final BackupRecord backupTarget = mBackupTargets.get(userId);
String backupAppName = backupTarget == null ? null : backupTarget.appInfo.packageName;
if (!agentPackageName.equals(backupAppName)) {
Slog.e(TAG, "Backup agent created for " + agentPackageName + " but not requested!");
@@ -13812,7 +13841,7 @@
try {
IBackupManager bm = IBackupManager.Stub.asInterface(
ServiceManager.getService(Context.BACKUP_SERVICE));
- bm.agentConnectedForUser(callingUserId, agentPackageName, agent);
+ bm.agentConnectedForUser(userId, agentPackageName, agent);
} catch (RemoteException e) {
// can't happen; the backup manager service is local
} catch (Exception e) {
@@ -13865,7 +13894,7 @@
if (proc.thread != null) {
try {
proc.thread.scheduleDestroyBackupAgent(appInfo,
- compatibilityInfoForPackage(appInfo));
+ compatibilityInfoForPackage(appInfo), userId);
} catch (Exception e) {
Slog.e(TAG, "Exception when unbinding backup agent:");
e.printStackTrace();
@@ -14099,7 +14128,8 @@
BroadcastQueue queue = broadcastQueueForIntent(intent);
BroadcastRecord r = new BroadcastRecord(queue, intent, null,
null, -1, -1, false, null, null, OP_NONE, null, receivers,
- null, 0, null, null, false, true, true, -1, false);
+ null, 0, null, null, false, true, true, -1, false,
+ false /* only PRE_BOOT_COMPLETED should be exempt, no stickies */);
queue.enqueueParallelBroadcastLocked(r);
queue.scheduleBroadcastsLocked();
}
@@ -14484,6 +14514,8 @@
}
}
+ boolean timeoutExempt = false;
+
if (action != null) {
if (getBackgroundLaunchBroadcasts().contains(action)) {
if (DEBUG_BACKGROUND_CHECK) {
@@ -14709,6 +14741,9 @@
Log.w(TAG, "Broadcast " + action
+ " no longer supported. It will not be delivered.");
return ActivityManager.BROADCAST_SUCCESS;
+ case Intent.ACTION_PRE_BOOT_COMPLETED:
+ timeoutExempt = true;
+ break;
}
if (Intent.ACTION_PACKAGE_ADDED.equals(action) ||
@@ -14851,7 +14886,7 @@
callerPackage, callingPid, callingUid, callerInstantApp, resolvedType,
requiredPermissions, appOp, brOptions, registeredReceivers, resultTo,
resultCode, resultData, resultExtras, ordered, sticky, false, userId,
- allowBackgroundActivityStarts);
+ allowBackgroundActivityStarts, timeoutExempt);
if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST, "Enqueueing parallel broadcast " + r);
final boolean replaced = replacePending
&& (queue.replaceParallelBroadcastLocked(r) != null);
@@ -14948,7 +14983,7 @@
callerPackage, callingPid, callingUid, callerInstantApp, resolvedType,
requiredPermissions, appOp, brOptions, receivers, resultTo, resultCode,
resultData, resultExtras, ordered, sticky, false, userId,
- allowBackgroundActivityStarts);
+ allowBackgroundActivityStarts, timeoutExempt);
if (DEBUG_BROADCAST) Slog.v(TAG_BROADCAST, "Enqueueing ordered broadcast " + r);
@@ -17637,6 +17672,19 @@
}
@Override
+ public ActivityPresentationInfo getActivityPresentationInfo(IBinder token) {
+ int displayId = Display.INVALID_DISPLAY;
+ try {
+ displayId = mActivityTaskManager.getActivityDisplayId(token);
+ } catch (RemoteException e) {
+ }
+
+ return new ActivityPresentationInfo(mActivityTaskManager.getTaskForActivity(token,
+ /*onlyRoot=*/ false), displayId,
+ mActivityTaskManager.getActivityClassForToken(token));
+ }
+
+ @Override
public void setBooting(boolean booting) {
mBooting = booting;
}
diff --git a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
index 740c0da..4f6f9fd 100644
--- a/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
+++ b/services/core/java/com/android/server/am/ActivityManagerShellCommand.java
@@ -1815,7 +1815,7 @@
int runTrackAssociations(PrintWriter pw) {
mInternal.enforceCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER,
- "registerUidObserver()");
+ "runTrackAssociations()");
synchronized (mInternal) {
if (!mInternal.mTrackingAssociations) {
mInternal.mTrackingAssociations = true;
@@ -1829,7 +1829,7 @@
int runUntrackAssociations(PrintWriter pw) {
mInternal.enforceCallingPermission(android.Manifest.permission.SET_ACTIVITY_WATCHER,
- "registerUidObserver()");
+ "runUntrackAssociations()");
synchronized (mInternal) {
if (mInternal.mTrackingAssociations) {
mInternal.mTrackingAssociations = false;
diff --git a/services/core/java/com/android/server/am/BackupRecord.java b/services/core/java/com/android/server/am/BackupRecord.java
index 40ad383..37b4be4 100644
--- a/services/core/java/com/android/server/am/BackupRecord.java
+++ b/services/core/java/com/android/server/am/BackupRecord.java
@@ -28,14 +28,16 @@
String stringName; // cached toString() output
final ApplicationInfo appInfo; // information about BackupAgent's app
+ final int userId; // user for which backup is performed
final int backupMode; // full backup / incremental / restore
ProcessRecord app; // where this agent is running or null
// ----- Implementation -----
- BackupRecord(ApplicationInfo _appInfo, int _backupMode) {
+ BackupRecord(ApplicationInfo _appInfo, int _backupMode, int _userId) {
appInfo = _appInfo;
backupMode = _backupMode;
+ userId = _userId;
}
public String toString() {
diff --git a/services/core/java/com/android/server/am/BroadcastQueue.java b/services/core/java/com/android/server/am/BroadcastQueue.java
index 1fb11ba..a11ebfd 100644
--- a/services/core/java/com/android/server/am/BroadcastQueue.java
+++ b/services/core/java/com/android/server/am/BroadcastQueue.java
@@ -461,14 +461,21 @@
// if this receiver was slow, impose deferral policy on the app. This will kick in
// when processNextBroadcastLocked() next finds this uid as a receiver identity.
- if (mConstants.SLOW_TIME > 0 && elapsed > mConstants.SLOW_TIME) {
- if (DEBUG_BROADCAST_DEFERRAL) {
- Slog.i(TAG, "Broadcast receiver was slow: " + receiver + " br=" + r);
+ if (!r.timeoutExempt) {
+ if (mConstants.SLOW_TIME > 0 && elapsed > mConstants.SLOW_TIME) {
+ if (DEBUG_BROADCAST_DEFERRAL) {
+ Slog.i(TAG, "Broadcast receiver was slow: " + receiver + " br=" + r);
+ }
+ if (r.curApp != null) {
+ mDispatcher.startDeferring(r.curApp.uid);
+ } else {
+ Slog.d(TAG, "finish receiver curApp is null? " + r);
+ }
}
- if (r.curApp != null) {
- mDispatcher.startDeferring(r.curApp.uid);
- } else {
- Slog.d(TAG, "finish receiver curApp is null? " + r);
+ } else {
+ if (DEBUG_BROADCAST_DEFERRAL) {
+ Slog.i(TAG_BROADCAST, "Finished broadcast " + r.intent.getAction()
+ + " is exempt from deferral policy");
}
}
@@ -1008,12 +1015,11 @@
// detection, we catch "hung" broadcasts here, discard them,
// and continue to make progress.
//
- // This is only done if the system is ready so that PRE_BOOT_COMPLETED
- // receivers don't get executed with timeouts. They're intended for
- // one time heavy lifting after system upgrades and can take
- // significant amounts of time.
+ // This is only done if the system is ready so that early-stage receivers
+ // don't get executed with timeouts; and of course other timeout-
+ // exempt broadcasts are ignored.
int numReceivers = (r.receivers != null) ? r.receivers.size() : 0;
- if (mService.mProcessesReady && r.dispatchTime > 0) {
+ if (mService.mProcessesReady && !r.timeoutExempt && r.dispatchTime > 0) {
if ((numReceivers > 0) &&
(now > r.dispatchTime + (2 * mConstants.TIMEOUT * numReceivers))) {
Slog.w(TAG, "Hung broadcast ["
@@ -1619,9 +1625,17 @@
BroadcastRecord r = mDispatcher.getActiveBroadcastLocked();
if (fromMsg) {
if (!mService.mProcessesReady) {
- // Only process broadcast timeouts if the system is ready. That way
- // PRE_BOOT_COMPLETED broadcasts can't timeout as they are intended
- // to do heavy lifting for system up.
+ // Only process broadcast timeouts if the system is ready; some early
+ // broadcasts do heavy work setting up system facilities
+ return;
+ }
+
+ // If the broadcast is generally exempt from timeout tracking, we're done
+ if (r.timeoutExempt) {
+ if (DEBUG_BROADCAST) {
+ Slog.i(TAG_BROADCAST, "Broadcast timeout but it's exempt: "
+ + r.intent.getAction());
+ }
return;
}
diff --git a/services/core/java/com/android/server/am/BroadcastRecord.java b/services/core/java/com/android/server/am/BroadcastRecord.java
index d9e03f8..fa9b79d 100644
--- a/services/core/java/com/android/server/am/BroadcastRecord.java
+++ b/services/core/java/com/android/server/am/BroadcastRecord.java
@@ -74,6 +74,7 @@
long dispatchClockTime; // the clock time the dispatch started
long receiverTime; // when current receiver started for timeouts.
long finishTime; // when we finished the broadcast.
+ boolean timeoutExempt; // true if this broadcast is not subject to receiver timeouts
int resultCode; // current result code value.
String resultData; // current result data value.
Bundle resultExtras; // current result extra data values.
@@ -236,7 +237,7 @@
String[] _requiredPermissions, int _appOp, BroadcastOptions _options, List _receivers,
IIntentReceiver _resultTo, int _resultCode, String _resultData, Bundle _resultExtras,
boolean _serialized, boolean _sticky, boolean _initialSticky, int _userId,
- boolean _allowBackgroundActivityStarts) {
+ boolean _allowBackgroundActivityStarts, boolean _timeoutExempt) {
if (_intent == null) {
throw new NullPointerException("Can't construct with a null intent");
}
@@ -266,6 +267,7 @@
nextReceiver = 0;
state = IDLE;
allowBackgroundActivityStarts = _allowBackgroundActivityStarts;
+ timeoutExempt = _timeoutExempt;
}
/**
@@ -310,6 +312,7 @@
manifestSkipCount = from.manifestSkipCount;
queue = from.queue;
allowBackgroundActivityStarts = from.allowBackgroundActivityStarts;
+ timeoutExempt = from.timeoutExempt;
}
/**
@@ -345,7 +348,7 @@
callerPackage, callingPid, callingUid, callerInstantApp, resolvedType,
requiredPermissions, appOp, options, splitReceivers, resultTo, resultCode,
resultData, resultExtras, ordered, sticky, initialSticky, userId,
- allowBackgroundActivityStarts);
+ allowBackgroundActivityStarts, timeoutExempt);
return split;
}
diff --git a/services/core/java/com/android/server/am/ProcessList.java b/services/core/java/com/android/server/am/ProcessList.java
index 9cbd065..f90c0ca 100644
--- a/services/core/java/com/android/server/am/ProcessList.java
+++ b/services/core/java/com/android/server/am/ProcessList.java
@@ -58,7 +58,6 @@
import android.graphics.Point;
import android.net.LocalSocket;
import android.net.LocalSocketAddress;
-import android.net.Uri;
import android.os.AppZygote;
import android.os.Binder;
import android.os.Build;
@@ -1481,6 +1480,9 @@
mService.mSafeMode == true) {
runtimeFlags |= Zygote.DEBUG_ENABLE_SAFEMODE;
}
+ if ((app.info.privateFlags & ApplicationInfo.PRIVATE_FLAG_PROFILEABLE_BY_SHELL) != 0) {
+ runtimeFlags |= Zygote.PROFILE_FROM_SHELL;
+ }
if ("1".equals(SystemProperties.get("debug.checkjni"))) {
runtimeFlags |= Zygote.DEBUG_ENABLE_CHECKJNI;
}
diff --git a/services/core/java/com/android/server/am/ProcessRecord.java b/services/core/java/com/android/server/am/ProcessRecord.java
index 6161f7d..5dccaf1 100644
--- a/services/core/java/com/android/server/am/ProcessRecord.java
+++ b/services/core/java/com/android/server/am/ProcessRecord.java
@@ -1172,9 +1172,9 @@
void setActiveInstrumentation(ActiveInstrumentation instr) {
mInstr = instr;
- mWindowProcessController.setInstrumenting(instr != null);
- mWindowProcessController.setInstrumentingWithBackgroundActivityStartPrivileges(instr != null
- && instr.mHasBackgroundActivityStartsPermission);
+ boolean isInstrumenting = instr != null;
+ mWindowProcessController.setInstrumenting(isInstrumenting,
+ isInstrumenting && instr.mHasBackgroundActivityStartsPermission);
}
ActiveInstrumentation getActiveInstrumentation() {
diff --git a/services/core/java/com/android/server/am/TEST_MAPPING b/services/core/java/com/android/server/am/TEST_MAPPING
index c84b5c7..117174a 100644
--- a/services/core/java/com/android/server/am/TEST_MAPPING
+++ b/services/core/java/com/android/server/am/TEST_MAPPING
@@ -1,17 +1,6 @@
{
"presubmit": [
{
- "name": "CtsActivityManagerDeviceSdk25TestCases",
- "options": [
- {
- "include-annotation": "android.platform.test.annotations.Presubmit"
- },
- {
- "exclude-annotation": "androidx.test.filters.FlakyTest"
- }
- ]
- },
- {
"name": "CtsAppTestCases",
"options": [
{
@@ -38,20 +27,6 @@
"exclude-annotation": "androidx.test.filters.FlakyTest"
}
]
- },
- {
- "name": "WmTests",
- "options": [
- {
- "include-filter": "com.android.server.am."
- },
- {
- "include-annotation": "android.platform.test.annotations.Presubmit"
- },
- {
- "exclude-annotation": "androidx.test.filters.FlakyTest"
- }
- ]
}
],
"postsubmit": [
diff --git a/services/core/java/com/android/server/attention/AttentionManagerService.java b/services/core/java/com/android/server/attention/AttentionManagerService.java
index 2061b26..9a1d7bf 100644
--- a/services/core/java/com/android/server/attention/AttentionManagerService.java
+++ b/services/core/java/com/android/server/attention/AttentionManagerService.java
@@ -108,24 +108,23 @@
AttentionService.ATTENTION_FAILURE_UNKNOWN);
}
- @Override
- public void onBootPhase(int phase) {
- super.onBootPhase(phase);
- if (phase == SystemService.PHASE_THIRD_PARTY_APPS_CAN_START) {
+ /** Resolves and sets up the attention service if it had not been done yet. */
+ private boolean isServiceAvailable() {
+ if (mComponentName == null) {
mComponentName = resolveAttentionService(mContext);
- if (isAttentionServiceSupported()) {
- // If the service is supported we want to keep receiving the screen off events.
+ if (mComponentName != null) {
mContext.registerReceiver(new ScreenStateReceiver(),
new IntentFilter(Intent.ACTION_SCREEN_OFF));
}
}
+ return mComponentName != null;
}
/**
* Returns {@code true} if attention service is supported on this device.
*/
public boolean isAttentionServiceSupported() {
- return mComponentName != null && isServiceEnabled();
+ return isServiceEnabled() && isServiceAvailable();
}
private boolean isServiceEnabled() {
@@ -258,7 +257,7 @@
private UserState getOrCreateUserStateLocked(int userId) {
UserState result = mUserStates.get(userId);
if (result == null) {
- result = new UserState(userId, mContext, mLock);
+ result = new UserState(userId, mContext, mLock, mComponentName);
mUserStates.put(userId, result);
}
return result;
@@ -397,6 +396,7 @@
}
private static final class UserState {
+ final ComponentName mComponentName;
final AttentionServiceConnection mConnection = new AttentionServiceConnection();
@GuardedBy("mLock")
@@ -416,10 +416,11 @@
final Context mContext;
final Object mLock;
- private UserState(int userId, Context context, Object lock) {
+ private UserState(int userId, Context context, Object lock, ComponentName componentName) {
mUserId = userId;
mContext = Preconditions.checkNotNull(context);
mLock = Preconditions.checkNotNull(lock);
+ mComponentName = Preconditions.checkNotNull(componentName);
}
@@ -443,15 +444,9 @@
final long identity = Binder.clearCallingIdentity();
try {
- final ComponentName componentName =
- resolveAttentionService(mContext);
- if (componentName == null) {
- // Might happen if the storage is encrypted and the user is not unlocked
- return false;
- }
final Intent mServiceIntent = new Intent(
AttentionService.SERVICE_INTERFACE).setComponent(
- componentName);
+ mComponentName);
willBind = mContext.bindServiceAsUser(mServiceIntent, mConnection,
Context.BIND_AUTO_CREATE, UserHandle.CURRENT);
mBinding = willBind;
diff --git a/services/core/java/com/android/server/audio/AudioService.java b/services/core/java/com/android/server/audio/AudioService.java
index 1723163..9457fe3 100644
--- a/services/core/java/com/android/server/audio/AudioService.java
+++ b/services/core/java/com/android/server/audio/AudioService.java
@@ -908,6 +908,9 @@
// Restore mono mode
updateMasterMono(mContentResolver);
+ // Restore audio balance
+ updateMasterBalance(mContentResolver);
+
// Restore ringer mode
setRingerModeInt(getRingerModeInternal(), false);
@@ -1196,6 +1199,17 @@
AudioSystem.setMasterMono(masterMono);
}
+ private void updateMasterBalance(ContentResolver cr) {
+ final float masterBalance = System.getFloatForUser(
+ cr, System.MASTER_BALANCE, 0.f /* default */, UserHandle.USER_CURRENT);
+ if (DEBUG_VOL) {
+ Log.d(TAG, String.format("Master balance %f", masterBalance));
+ }
+ if (AudioSystem.setMasterBalance(masterBalance) != 0) {
+ Log.e(TAG, String.format("setMasterBalance failed for %f", masterBalance));
+ }
+ }
+
private void sendEncodedSurroundMode(ContentResolver cr, String eventSource)
{
final int encodedSurroundMode = Settings.Global.getInt(
@@ -1372,6 +1386,8 @@
updateMasterMono(cr);
+ updateMasterBalance(cr);
+
// Each stream will read its own persisted settings
// Broadcast the sticky intents
@@ -4948,6 +4964,8 @@
Settings.Global.DOCK_AUDIO_MEDIA_ENABLED), false, this);
mContentResolver.registerContentObserver(Settings.System.getUriFor(
Settings.System.MASTER_MONO), false, this);
+ mContentResolver.registerContentObserver(Settings.System.getUriFor(
+ Settings.System.MASTER_BALANCE), false, this);
mEncodedSurroundMode = Settings.Global.getInt(
mContentResolver, Settings.Global.ENCODED_SURROUND_OUTPUT,
@@ -4981,6 +4999,7 @@
}
readDockAudioSettings(mContentResolver);
updateMasterMono(mContentResolver);
+ updateMasterBalance(mContentResolver);
updateEncodedSurroundOutput();
sendEnabledSurroundFormats(mContentResolver, mSurroundModeChanged);
updateAssistantUId(false);
diff --git a/services/core/java/com/android/server/biometrics/AuthenticationClient.java b/services/core/java/com/android/server/biometrics/AuthenticationClient.java
index eaa7a83..bd4acdb 100644
--- a/services/core/java/com/android/server/biometrics/AuthenticationClient.java
+++ b/services/core/java/com/android/server/biometrics/AuthenticationClient.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricsProtoEnums;
import android.os.IBinder;
import android.os.RemoteException;
import android.security.KeyStore;
@@ -71,6 +72,11 @@
stop(false /* initiatedByClient */);
}
+ @Override
+ protected int statsAction() {
+ return BiometricsProtoEnums.ACTION_AUTHENTICATE;
+ }
+
public boolean isBiometricPrompt() {
return getCookie() != 0;
}
@@ -80,8 +86,16 @@
}
@Override
+ protected boolean isCryptoOperation() {
+ return mOpId != 0;
+ }
+
+ @Override
public boolean onAuthenticated(BiometricAuthenticator.Identifier identifier,
boolean authenticated, ArrayList<Byte> token) {
+ super.logOnAuthenticated(authenticated, mRequireConfirmation, getTargetUserId(),
+ isBiometricPrompt());
+
final BiometricServiceBase.ServiceListener listener = getListener();
mMetricsLogger.action(mMetrics.actionBiometricAuth(), authenticated);
@@ -142,10 +156,7 @@
final int errorCode = lockoutMode == LOCKOUT_TIMED
? BiometricConstants.BIOMETRIC_ERROR_LOCKOUT
: BiometricConstants.BIOMETRIC_ERROR_LOCKOUT_PERMANENT;
- if (listener != null) {
- listener.onError(getHalDeviceId(), errorCode, 0 /* vendorCode */,
- getCookie());
- }
+ onError(getHalDeviceId(), errorCode, 0 /* vendorCode */);
} else {
// Don't send onAuthenticationFailed if we're in lockout, it causes a
// janky UI on Keyguard/BiometricPrompt since "authentication failed"
diff --git a/services/core/java/com/android/server/biometrics/BiometricService.java b/services/core/java/com/android/server/biometrics/BiometricService.java
index 8cc560e..b50b800 100644
--- a/services/core/java/com/android/server/biometrics/BiometricService.java
+++ b/services/core/java/com/android/server/biometrics/BiometricService.java
@@ -41,6 +41,7 @@
import android.hardware.biometrics.BiometricConstants;
import android.hardware.biometrics.BiometricPrompt;
import android.hardware.biometrics.BiometricSourceType;
+import android.hardware.biometrics.BiometricsProtoEnums;
import android.hardware.biometrics.IBiometricEnabledOnKeyguardCallback;
import android.hardware.biometrics.IBiometricService;
import android.hardware.biometrics.IBiometricServiceReceiver;
@@ -64,6 +65,7 @@
import android.text.TextUtils;
import android.util.Pair;
import android.util.Slog;
+import android.util.StatsLog;
import com.android.internal.R;
import com.android.internal.statusbar.IStatusBarService;
@@ -309,6 +311,7 @@
// Continue authentication with the same modality/modalities after "try again" is
// pressed
final int mModality;
+ final boolean mRequireConfirmation;
// The current state, which can be either idle, called, or started
private int mState = STATE_AUTH_IDLE;
@@ -316,10 +319,13 @@
// the authentication.
byte[] mTokenEscrow;
+ // Timestamp when hardware authentication occurred
+ private long mAuthenticatedTimeMs;
+
AuthSession(HashMap<Integer, Integer> modalities, IBinder token, long sessionId,
int userId, IBiometricServiceReceiver receiver, String opPackageName,
Bundle bundle, int callingUid, int callingPid, int callingUserId,
- int modality) {
+ int modality, boolean requireConfirmation) {
mModalitiesWaiting = modalities;
mToken = token;
mSessionId = sessionId;
@@ -331,6 +337,11 @@
mCallingPid = callingPid;
mCallingUserId = callingUserId;
mModality = modality;
+ mRequireConfirmation = requireConfirmation;
+ }
+
+ boolean isCrypto() {
+ return mSessionId != 0;
}
boolean containsCookie(int cookie) {
@@ -412,6 +423,7 @@
mCurrentAuthSession.mState = STATE_AUTH_IDLE;
mCurrentAuthSession = null;
} else {
+ mCurrentAuthSession.mAuthenticatedTimeMs = System.currentTimeMillis();
// Store the auth token and submit it to keystore after the confirmation
// button has been pressed.
mCurrentAuthSession.mTokenEscrow = token;
@@ -557,6 +569,8 @@
return;
}
+ logDialogDismissed(reason);
+
if (reason != BiometricPrompt.DISMISSED_REASON_POSITIVE) {
// Positive button is used by passive modalities as a "confirm" button,
// do not send to client
@@ -599,6 +613,77 @@
mCurrentAuthSession.mModality);
});
}
+
+ private void logDialogDismissed(int reason) {
+ if (reason == BiometricPrompt.DISMISSED_REASON_POSITIVE) {
+ // Explicit auth, authentication confirmed.
+ // Latency in this case is authenticated -> confirmed. <Biometric>Service
+ // should have the first half (first acquired -> authenticated).
+ final long latency = System.currentTimeMillis()
+ - mCurrentAuthSession.mAuthenticatedTimeMs;
+
+ if (LoggableMonitor.DEBUG) {
+ Slog.v(LoggableMonitor.TAG, "Confirmed! Modality: " + statsModality()
+ + ", User: " + mCurrentAuthSession.mUserId
+ + ", IsCrypto: " + mCurrentAuthSession.isCrypto()
+ + ", Client: " + BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT
+ + ", RequireConfirmation: "
+ + mCurrentAuthSession.mRequireConfirmation
+ + ", State: " + StatsLog.BIOMETRIC_AUTHENTICATED__STATE__CONFIRMED
+ + ", Latency: " + latency);
+ }
+
+ StatsLog.write(StatsLog.BIOMETRIC_AUTHENTICATED,
+ statsModality(),
+ mCurrentAuthSession.mUserId,
+ mCurrentAuthSession.isCrypto(),
+ BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT,
+ mCurrentAuthSession.mRequireConfirmation,
+ StatsLog.BIOMETRIC_AUTHENTICATED__STATE__CONFIRMED,
+ latency);
+ } else {
+ int error = reason == BiometricPrompt.DISMISSED_REASON_NEGATIVE
+ ? BiometricConstants.BIOMETRIC_ERROR_NEGATIVE_BUTTON
+ : reason == BiometricPrompt.DISMISSED_REASON_USER_CANCEL
+ ? BiometricConstants.BIOMETRIC_ERROR_USER_CANCELED
+ : 0;
+ if (LoggableMonitor.DEBUG) {
+ Slog.v(LoggableMonitor.TAG, "Dismissed! Modality: " + statsModality()
+ + ", User: " + mCurrentAuthSession.mUserId
+ + ", IsCrypto: " + mCurrentAuthSession.isCrypto()
+ + ", Action: " + BiometricsProtoEnums.ACTION_AUTHENTICATE
+ + ", Client: " + BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT
+ + ", Error: " + error);
+ }
+ // Auth canceled
+ StatsLog.write(StatsLog.BIOMETRIC_ERROR_OCCURRED,
+ statsModality(),
+ mCurrentAuthSession.mUserId,
+ mCurrentAuthSession.isCrypto(),
+ BiometricsProtoEnums.ACTION_AUTHENTICATE,
+ BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT,
+ error,
+ 0 /* vendorCode */);
+ }
+ }
+
+ private int statsModality() {
+ int modality = 0;
+ if (mCurrentAuthSession == null) {
+ return BiometricsProtoEnums.MODALITY_UNKNOWN;
+ }
+ if ((mCurrentAuthSession.mModality & BiometricAuthenticator.TYPE_FINGERPRINT)
+ != 0) {
+ modality |= BiometricsProtoEnums.MODALITY_FINGERPRINT;
+ }
+ if ((mCurrentAuthSession.mModality & BiometricAuthenticator.TYPE_IRIS) != 0) {
+ modality |= BiometricsProtoEnums.MODALITY_IRIS;
+ }
+ if ((mCurrentAuthSession.mModality & BiometricAuthenticator.TYPE_FACE) != 0) {
+ modality |= BiometricsProtoEnums.MODALITY_FACE;
+ }
+ return modality;
+ }
};
@Override // Binder call
@@ -818,7 +903,11 @@
try {
boolean requireConfirmation = bundle.getBoolean(
BiometricPrompt.KEY_REQUIRE_CONFIRMATION, true /* default */);
-
+ if ((modality & TYPE_FACE) != 0) {
+ // Check if the user has forced confirmation to be required in Settings.
+ requireConfirmation = requireConfirmation
+ || mSettingObserver.getFaceAlwaysRequireConfirmation();
+ }
// Generate random cookies to pass to the services that should prepare to start
// authenticating. Store the cookie here and wait for all services to "ack"
// with the cookie. Once all cookies are received, we can show the prompt
@@ -830,7 +919,7 @@
authenticators.put(modality, cookie);
mPendingAuthSession = new AuthSession(authenticators, token, sessionId, userId,
receiver, opPackageName, bundle, callingUid, callingPid, callingUserId,
- modality);
+ modality, requireConfirmation);
mPendingAuthSession.mState = STATE_AUTH_CALLED;
// No polymorphism :(
if ((modality & TYPE_FINGERPRINT) != 0) {
@@ -842,9 +931,6 @@
Slog.w(TAG, "Iris unsupported");
}
if ((modality & TYPE_FACE) != 0) {
- // Check if the user has forced confirmation to be required in Settings.
- requireConfirmation = requireConfirmation
- || mSettingObserver.getFaceAlwaysRequireConfirmation();
mFaceService.prepareForAuthentication(requireConfirmation,
token, sessionId, userId, mInternalReceiver, opPackageName,
cookie, callingUid, callingPid, callingUserId);
diff --git a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
index 2791165..b65535a 100644
--- a/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
+++ b/services/core/java/com/android/server/biometrics/BiometricServiceBase.java
@@ -35,6 +35,7 @@
import android.content.pm.UserInfo;
import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricsProtoEnums;
import android.hardware.biometrics.IBiometricService;
import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;
import android.hardware.biometrics.IBiometricServiceReceiverInternal;
@@ -55,6 +56,7 @@
import android.util.Slog;
import android.util.SparseBooleanArray;
import android.util.SparseIntArray;
+import android.util.StatsLog;
import com.android.internal.logging.MetricsLogger;
import com.android.internal.statusbar.IStatusBarService;
@@ -220,8 +222,16 @@
*/
protected void notifyClientActiveCallbacks(boolean isActive) {}
+ protected abstract int statsModality();
+
protected abstract class AuthenticationClientImpl extends AuthenticationClient {
+ // Used to check if the public API that was invoked was from FingerprintManager. Only
+ // to be overridden by FingerprintService.
+ protected boolean isFingerprint() {
+ return false;
+ }
+
public AuthenticationClientImpl(Context context, DaemonWrapper daemon, long halDeviceId,
IBinder token, ServiceListener listener, int targetUserId, int groupId, long opId,
boolean restricted, String owner, int cookie, boolean requireConfirmation) {
@@ -230,6 +240,19 @@
}
@Override
+ protected int statsClient() {
+ if (isKeyguard(getOwnerString())) {
+ return BiometricsProtoEnums.CLIENT_KEYGUARD;
+ } else if (isBiometricPrompt()) {
+ return BiometricsProtoEnums.CLIENT_BIOMETRIC_PROMPT;
+ } else if (isFingerprint()) {
+ return BiometricsProtoEnums.CLIENT_FINGERPRINT_MANAGER;
+ } else {
+ return BiometricsProtoEnums.CLIENT_UNKNOWN;
+ }
+ }
+
+ @Override
public void onStart() {
try {
mActivityTaskManager.registerTaskStackListener(mTaskStackListener);
@@ -296,7 +319,7 @@
}
}
- protected class RemovalClientImpl extends RemovalClient {
+ protected abstract class RemovalClientImpl extends RemovalClient {
private boolean mShouldNotify;
public RemovalClientImpl(Context context, DaemonWrapper daemon, long halDeviceId,
@@ -318,7 +341,7 @@
}
}
- protected class EnumerateClientImpl extends EnumerateClient {
+ protected abstract class EnumerateClientImpl extends EnumerateClient {
public EnumerateClientImpl(Context context, DaemonWrapper daemon, long halDeviceId,
IBinder token, ServiceListener listener, int groupId, int userId,
@@ -600,6 +623,8 @@
mHALDeathCount++;
handleError(getHalDeviceId(), BiometricConstants.BIOMETRIC_ERROR_HW_UNAVAILABLE,
0 /*vendorCode */);
+
+ StatsLog.write(StatsLog.BIOMETRIC_HAL_DEATH_REPORTED, statsModality());
}
protected ClientMonitor getCurrentClient() {
@@ -653,7 +678,6 @@
} else {
updateActiveGroup(mCurrentUserId, null);
}
-
}
}
diff --git a/services/core/java/com/android/server/biometrics/ClientMonitor.java b/services/core/java/com/android/server/biometrics/ClientMonitor.java
index d19aff6..e80b39b 100644
--- a/services/core/java/com/android/server/biometrics/ClientMonitor.java
+++ b/services/core/java/com/android/server/biometrics/ClientMonitor.java
@@ -36,7 +36,7 @@
* the current client. Subclasses are responsible for coordinating the interaction with
* the biometric's HAL for the specific action (e.g. authenticate, enroll, enumerate, etc.).
*/
-public abstract class ClientMonitor implements IBinder.DeathRecipient {
+public abstract class ClientMonitor extends LoggableMonitor implements IBinder.DeathRecipient {
protected static final int ERROR_ESRCH = 3; // Likely HAL is dead. See errno.h.
protected static final boolean DEBUG = BiometricServiceBase.DEBUG;
private static final AudioAttributes FINGERPRINT_SONFICATION_ATTRIBUTES =
@@ -157,6 +157,7 @@
* @return true if client should be removed
*/
public boolean onAcquired(int acquiredInfo, int vendorCode) {
+ super.logOnAcquired(acquiredInfo, vendorCode, getTargetUserId());
try {
if (mListener != null) {
mListener.onAcquired(getHalDeviceId(), acquiredInfo, vendorCode);
@@ -180,6 +181,7 @@
* @return true if client should be removed
*/
public boolean onError(long deviceId, int error, int vendorCode) {
+ super.logOnError(error, vendorCode, getTargetUserId());
try {
if (mListener != null) {
mListener.onError(deviceId, error, vendorCode, getCookie());
diff --git a/services/core/java/com/android/server/biometrics/EnrollClient.java b/services/core/java/com/android/server/biometrics/EnrollClient.java
index 3ff94bc..882a929 100644
--- a/services/core/java/com/android/server/biometrics/EnrollClient.java
+++ b/services/core/java/com/android/server/biometrics/EnrollClient.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricsProtoEnums;
import android.os.IBinder;
import android.os.RemoteException;
import android.util.Slog;
@@ -51,11 +52,17 @@
}
@Override
+ protected int statsAction() {
+ return BiometricsProtoEnums.ACTION_ENROLL;
+ }
+
+ @Override
public boolean onEnrollResult(BiometricAuthenticator.Identifier identifier,
int remaining) {
if (remaining == 0) {
mBiometricUtils.addBiometricForUser(getContext(), getTargetUserId(), identifier);
}
+ notifyUserActivity();
return sendEnrollResult(identifier, remaining);
}
diff --git a/services/core/java/com/android/server/biometrics/EnumerateClient.java b/services/core/java/com/android/server/biometrics/EnumerateClient.java
index df6220c..0f57f48 100644
--- a/services/core/java/com/android/server/biometrics/EnumerateClient.java
+++ b/services/core/java/com/android/server/biometrics/EnumerateClient.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricsProtoEnums;
import android.os.IBinder;
import android.os.RemoteException;
import android.util.Slog;
@@ -38,6 +39,11 @@
}
@Override
+ protected int statsAction() {
+ return BiometricsProtoEnums.ACTION_ENUMERATE;
+ }
+
+ @Override
public int start() {
// The biometric template ids will be removed when we get confirmation from the HAL
try {
diff --git a/services/core/java/com/android/server/biometrics/LoggableMonitor.java b/services/core/java/com/android/server/biometrics/LoggableMonitor.java
new file mode 100644
index 0000000..91c924d
--- /dev/null
+++ b/services/core/java/com/android/server/biometrics/LoggableMonitor.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright (C) 2019 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.biometrics;
+
+import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricsProtoEnums;
+import android.hardware.face.FaceManager;
+import android.util.Slog;
+import android.util.StatsLog;
+
+/**
+ * Abstract class that adds logging functionality to the ClientMonitor classes.
+ */
+public abstract class LoggableMonitor {
+
+ public static final String TAG = "BiometricStats";
+ public static final boolean DEBUG = true;
+
+ private long mFirstAcquireTimeMs;
+
+ /**
+ * Only valid for AuthenticationClient.
+ * @return true if the client is authenticating for a crypto operation.
+ */
+ protected boolean isCryptoOperation() {
+ return false;
+ }
+
+ /**
+ * @return One of {@link BiometricsProtoEnums} MODALITY_* constants.
+ */
+ protected abstract int statsModality();
+
+ /**
+ * Action == enroll, authenticate, remove, enumerate.
+ * @return One of {@link BiometricsProtoEnums} ACTION_* constants.
+ */
+ protected abstract int statsAction();
+
+ /**
+ * Only matters for AuthenticationClient. Should only be overridden in
+ * {@link BiometricServiceBase}, which determines if a client is for BiometricPrompt, Keyguard,
+ * etc.
+ * @return one of {@link BiometricsProtoEnums} CLIENT_* constants.
+ */
+ protected int statsClient() {
+ return BiometricsProtoEnums.CLIENT_UNKNOWN;
+ }
+
+ protected final void logOnAcquired(int acquiredInfo, int vendorCode, int targetUserId) {
+ if (statsModality() == BiometricsProtoEnums.MODALITY_FACE) {
+ if (acquiredInfo == FaceManager.FACE_ACQUIRED_START) {
+ mFirstAcquireTimeMs = System.currentTimeMillis();
+ }
+ } else if (acquiredInfo == BiometricConstants.BIOMETRIC_ACQUIRED_GOOD) {
+ if (mFirstAcquireTimeMs == 0) {
+ mFirstAcquireTimeMs = System.currentTimeMillis();
+ }
+ }
+ if (DEBUG) {
+ Slog.v(TAG, "Acquired! Modality: " + statsModality()
+ + ", User: " + targetUserId
+ + ", IsCrypto: " + isCryptoOperation()
+ + ", Action: " + statsAction()
+ + ", Client: " + statsClient()
+ + ", AcquiredInfo: " + acquiredInfo
+ + ", VendorCode: " + vendorCode);
+ }
+ StatsLog.write(StatsLog.BIOMETRIC_ACQUIRED,
+ statsModality(),
+ targetUserId,
+ isCryptoOperation(),
+ statsAction(),
+ statsClient(),
+ acquiredInfo,
+ 0 /* vendorCode */); // Don't log vendorCode for now
+ }
+
+ protected final void logOnError(int error, int vendorCode, int targetUserId) {
+ if (DEBUG) {
+ Slog.v(TAG, "Error! Modality: " + statsModality()
+ + ", User: " + targetUserId
+ + ", IsCrypto: " + isCryptoOperation()
+ + ", Action: " + statsAction()
+ + ", Client: " + statsClient()
+ + ", Error: " + error
+ + ", VendorCode: " + vendorCode);
+ }
+ StatsLog.write(StatsLog.BIOMETRIC_ERROR_OCCURRED,
+ statsModality(),
+ targetUserId,
+ isCryptoOperation(),
+ statsAction(),
+ statsClient(),
+ error,
+ vendorCode);
+ }
+
+ protected final void logOnAuthenticated(boolean authenticated, boolean requireConfirmation,
+ int targetUserId, boolean isBiometricPrompt) {
+ int authState = StatsLog.BIOMETRIC_AUTHENTICATED__STATE__UNKNOWN;
+ if (!authenticated) {
+ authState = StatsLog.BIOMETRIC_AUTHENTICATED__STATE__REJECTED;
+ } else {
+ // Authenticated
+ if (isBiometricPrompt && requireConfirmation) {
+ authState = StatsLog.BIOMETRIC_AUTHENTICATED__STATE__PENDING_CONFIRMATION;
+ } else {
+ authState = StatsLog.BIOMETRIC_AUTHENTICATED__STATE__CONFIRMED;
+ }
+ }
+
+ // Only valid if we have a first acquired time, otherwise set to -1
+ final long latency = mFirstAcquireTimeMs != 0
+ ? (System.currentTimeMillis() - mFirstAcquireTimeMs)
+ : -1;
+
+ if (DEBUG) {
+ Slog.v(TAG, "Authenticated! Modality: " + statsModality()
+ + ", User: " + targetUserId
+ + ", IsCrypto: " + isCryptoOperation()
+ + ", Client: " + statsClient()
+ + ", RequireConfirmation: " + requireConfirmation
+ + ", State: " + authState
+ + ", Latency: " + latency);
+ }
+
+ StatsLog.write(StatsLog.BIOMETRIC_AUTHENTICATED,
+ statsModality(),
+ targetUserId,
+ isCryptoOperation(),
+ statsClient(),
+ requireConfirmation,
+ authState,
+ latency);
+ }
+}
diff --git a/services/core/java/com/android/server/biometrics/RemovalClient.java b/services/core/java/com/android/server/biometrics/RemovalClient.java
index be233ec..0509067 100644
--- a/services/core/java/com/android/server/biometrics/RemovalClient.java
+++ b/services/core/java/com/android/server/biometrics/RemovalClient.java
@@ -19,6 +19,7 @@
import android.content.Context;
import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricsProtoEnums;
import android.os.IBinder;
import android.os.RemoteException;
import android.util.Slog;
@@ -43,6 +44,11 @@
}
@Override
+ protected int statsAction() {
+ return BiometricsProtoEnums.ACTION_REMOVE;
+ }
+
+ @Override
public int start() {
// The biometric template ids will be removed when we get confirmation from the HAL
try {
diff --git a/services/core/java/com/android/server/biometrics/face/FaceService.java b/services/core/java/com/android/server/biometrics/face/FaceService.java
index d4be539..90342ee 100644
--- a/services/core/java/com/android/server/biometrics/face/FaceService.java
+++ b/services/core/java/com/android/server/biometrics/face/FaceService.java
@@ -27,6 +27,7 @@
import android.content.pm.UserInfo;
import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricsProtoEnums;
import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;
import android.hardware.biometrics.IBiometricServiceReceiverInternal;
import android.hardware.biometrics.face.V1_0.IBiometricsFace;
@@ -90,6 +91,11 @@
super(context, daemon, halDeviceId, token, listener, targetUserId, groupId, opId,
restricted, owner, cookie, requireConfirmation);
}
+
+ @Override
+ protected int statsModality() {
+ return FaceService.this.statsModality();
+ }
}
/**
@@ -126,6 +132,11 @@
public boolean shouldVibrate() {
return false;
}
+
+ @Override
+ protected int statsModality() {
+ return FaceService.this.statsModality();
+ }
};
enrollInternal(client, UserHandle.getCallingUserId());
@@ -206,7 +217,12 @@
final boolean restricted = isRestricted();
final RemovalClientImpl client = new RemovalClientImpl(getContext(), mDaemonWrapper,
mHalDeviceId, token, new ServiceListenerImpl(receiver), faceId, 0 /* groupId */,
- userId, restricted, token.toString());
+ userId, restricted, token.toString()) {
+ @Override
+ protected int statsModality() {
+ return FaceService.this.statsModality();
+ }
+ };
client.setShouldNotifyUserActivity(true);
removeInternal(client);
}
@@ -219,7 +235,12 @@
final boolean restricted = isRestricted();
final EnumerateClientImpl client = new EnumerateClientImpl(getContext(), mDaemonWrapper,
mHalDeviceId, token, new ServiceListenerImpl(receiver), userId, userId,
- restricted, getContext().getOpPackageName());
+ restricted, getContext().getOpPackageName()) {
+ @Override
+ protected int statsModality() {
+ return FaceService.this.statsModality();
+ }
+ };
enumerateInternal(client);
}
@@ -770,6 +791,11 @@
// noop for Face.
}
+ @Override
+ protected int statsModality() {
+ return BiometricsProtoEnums.MODALITY_FACE;
+ }
+
/** Gets the face daemon */
private synchronized IBiometricsFace getFaceDaemon() {
if (mDaemon == null) {
diff --git a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
index f84cda03..62947c7 100644
--- a/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
+++ b/services/core/java/com/android/server/biometrics/fingerprint/FingerprintService.java
@@ -30,6 +30,7 @@
import android.content.pm.UserInfo;
import android.hardware.biometrics.BiometricAuthenticator;
import android.hardware.biometrics.BiometricConstants;
+import android.hardware.biometrics.BiometricsProtoEnums;
import android.hardware.biometrics.IBiometricServiceLockoutResetCallback;
import android.hardware.biometrics.IBiometricServiceReceiverInternal;
import android.hardware.biometrics.fingerprint.V2_1.IBiometricsFingerprint;
@@ -101,6 +102,11 @@
}
private final class FingerprintAuthClient extends AuthenticationClientImpl {
+ @Override
+ protected boolean isFingerprint() {
+ return true;
+ }
+
public FingerprintAuthClient(Context context,
DaemonWrapper daemon, long halDeviceId, IBinder token,
ServiceListener listener, int targetUserId, int groupId, long opId,
@@ -109,6 +115,11 @@
super(context, daemon, halDeviceId, token, listener, targetUserId, groupId, opId,
restricted, owner, cookie, requireConfirmation);
}
+
+ @Override
+ protected int statsModality() {
+ return FingerprintService.this.statsModality();
+ }
}
/**
@@ -147,6 +158,11 @@
public boolean shouldVibrate() {
return true;
}
+
+ @Override
+ protected int statsModality() {
+ return FingerprintService.this.statsModality();
+ }
};
enrollInternal(client, userId);
@@ -225,7 +241,12 @@
final boolean restricted = isRestricted();
final RemovalClientImpl client = new RemovalClientImpl(getContext(), mDaemonWrapper,
mHalDeviceId, token, new ServiceListenerImpl(receiver), fingerId, groupId,
- userId, restricted, token.toString());
+ userId, restricted, token.toString()) {
+ @Override
+ protected int statsModality() {
+ return FingerprintService.this.statsModality();
+ }
+ };
client.setShouldNotifyUserActivity(true);
removeInternal(client);
}
@@ -238,7 +259,12 @@
final boolean restricted = isRestricted();
final EnumerateClientImpl client = new EnumerateClientImpl(getContext(), mDaemonWrapper,
mHalDeviceId, token, new ServiceListenerImpl(receiver), userId, userId,
- restricted, getContext().getOpPackageName());
+ restricted, getContext().getOpPackageName()) {
+ @Override
+ protected int statsModality() {
+ return FingerprintService.this.statsModality();
+ }
+ };
enumerateInternal(client);
}
@@ -544,6 +570,11 @@
}
return remaining == 0;
}
+
+ @Override
+ protected int statsModality() {
+ return FingerprintService.this.statsModality();
+ }
}
/**
@@ -558,6 +589,11 @@
restricted,
owner);
}
+
+ @Override
+ protected int statsModality() {
+ return FingerprintService.this.statsModality();
+ }
}
private final FingerprintMetrics mFingerprintMetrics = new FingerprintMetrics();
@@ -885,6 +921,11 @@
}
}
+ @Override
+ protected int statsModality() {
+ return BiometricsProtoEnums.MODALITY_FINGERPRINT;
+ }
+
/** Gets the fingerprint daemon */
private synchronized IBiometricsFingerprint getFingerprintDaemon() {
if (mDaemon == null) {
diff --git a/services/core/java/com/android/server/biometrics/iris/IrisService.java b/services/core/java/com/android/server/biometrics/iris/IrisService.java
index 37cdc2a..eb457b6 100644
--- a/services/core/java/com/android/server/biometrics/iris/IrisService.java
+++ b/services/core/java/com/android/server/biometrics/iris/IrisService.java
@@ -17,6 +17,7 @@
package com.android.server.biometrics.iris;
import android.content.Context;
+import android.hardware.biometrics.BiometricsProtoEnums;
import com.android.server.biometrics.BiometricServiceBase;
import com.android.server.biometrics.BiometricUtils;
@@ -128,4 +129,9 @@
protected boolean checkAppOps(int uid, String opPackageName) {
return false;
}
+
+ @Override
+ protected int statsModality() {
+ return BiometricsProtoEnums.MODALITY_IRIS;
+ }
}
diff --git a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java
index 1559ba8..07e28f9 100644
--- a/services/core/java/com/android/server/connectivity/KeepaliveTracker.java
+++ b/services/core/java/com/android/server/connectivity/KeepaliveTracker.java
@@ -16,26 +16,27 @@
package com.android.server.connectivity;
-// TODO: Clean up imports and remove references of PacketKeepalive constants.
-
-import static android.net.ConnectivityManager.PacketKeepalive.ERROR_INVALID_INTERVAL;
-import static android.net.ConnectivityManager.PacketKeepalive.ERROR_INVALID_IP_ADDRESS;
-import static android.net.ConnectivityManager.PacketKeepalive.ERROR_INVALID_NETWORK;
-import static android.net.ConnectivityManager.PacketKeepalive.MIN_INTERVAL;
-import static android.net.ConnectivityManager.PacketKeepalive.NATT_PORT;
-import static android.net.ConnectivityManager.PacketKeepalive.NO_KEEPALIVE;
-import static android.net.ConnectivityManager.PacketKeepalive.SUCCESS;
-import static android.net.NetworkAgent.CMD_START_PACKET_KEEPALIVE;
-import static android.net.NetworkAgent.CMD_STOP_PACKET_KEEPALIVE;
-import static android.net.NetworkAgent.EVENT_PACKET_KEEPALIVE;
+import static android.net.NattSocketKeepalive.NATT_PORT;
+import static android.net.NetworkAgent.CMD_START_SOCKET_KEEPALIVE;
+import static android.net.NetworkAgent.CMD_STOP_SOCKET_KEEPALIVE;
+import static android.net.NetworkAgent.EVENT_SOCKET_KEEPALIVE;
+import static android.net.SocketKeepalive.BINDER_DIED;
+import static android.net.SocketKeepalive.ERROR_INVALID_INTERVAL;
+import static android.net.SocketKeepalive.ERROR_INVALID_IP_ADDRESS;
+import static android.net.SocketKeepalive.ERROR_INVALID_NETWORK;
import static android.net.SocketKeepalive.ERROR_INVALID_SOCKET;
+import static android.net.SocketKeepalive.MAX_INTERVAL_SEC;
+import static android.net.SocketKeepalive.MIN_INTERVAL_SEC;
+import static android.net.SocketKeepalive.NO_KEEPALIVE;
+import static android.net.SocketKeepalive.SUCCESS;
import android.annotation.NonNull;
import android.annotation.Nullable;
-import android.net.ConnectivityManager.PacketKeepalive;
import android.net.KeepalivePacketData;
+import android.net.NattKeepalivePacketData;
import android.net.NetworkAgent;
import android.net.NetworkUtils;
+import android.net.SocketKeepalive.InvalidPacketException;
import android.net.util.IpUtils;
import android.os.Binder;
import android.os.Handler;
@@ -60,7 +61,7 @@
import java.util.HashMap;
/**
- * Manages packet keepalive requests.
+ * Manages socket keepalive requests.
*
* Provides methods to stop and start keepalive requests, and keeps track of keepalives across all
* networks. This class is tightly coupled to ConnectivityService. It is not thread-safe and its
@@ -83,13 +84,13 @@
}
/**
- * Tracks information about a packet keepalive.
+ * Tracks information about a socket keepalive.
*
* All information about this keepalive is known at construction time except the slot number,
* which is only returned when the hardware has successfully started the keepalive.
*/
class KeepaliveInfo implements IBinder.DeathRecipient {
- // Bookkeping data.
+ // Bookkeeping data.
private final Messenger mMessenger;
private final IBinder mBinder;
private final int mUid;
@@ -98,7 +99,7 @@
/** Keepalive slot. A small integer that identifies this keepalive among the ones handled
* by this network. */
- private int mSlot = PacketKeepalive.NO_KEEPALIVE;
+ private int mSlot = NO_KEEPALIVE;
// Packet data.
private final KeepalivePacketData mPacket;
@@ -144,7 +145,7 @@
.toString();
}
- /** Sends a message back to the application via its PacketKeepalive.Callback. */
+ /** Sends a message back to the application via its SocketKeepalive.Callback. */
void notifyMessenger(int slot, int err) {
KeepaliveTracker.this.notifyMessenger(mMessenger, slot, err);
}
@@ -153,8 +154,8 @@
public void binderDied() {
// Not called from ConnectivityService handler thread, so send it a message.
mConnectivityServiceHandler.obtainMessage(
- NetworkAgent.CMD_STOP_PACKET_KEEPALIVE,
- mSlot, PacketKeepalive.BINDER_DIED, mNai.network).sendToTarget();
+ NetworkAgent.CMD_STOP_SOCKET_KEEPALIVE,
+ mSlot, BINDER_DIED, mNai.network).sendToTarget();
}
void unlinkDeathRecipient() {
@@ -181,7 +182,10 @@
}
private int checkInterval() {
- return mInterval >= MIN_INTERVAL ? SUCCESS : ERROR_INVALID_INTERVAL;
+ if (mInterval < MIN_INTERVAL_SEC || mInterval > MAX_INTERVAL_SEC) {
+ return ERROR_INVALID_INTERVAL;
+ }
+ return SUCCESS;
}
private int isValid() {
@@ -198,7 +202,7 @@
int error = isValid();
if (error == SUCCESS) {
Log.d(TAG, "Starting keepalive " + mSlot + " on " + mNai.name());
- mNai.asyncChannel.sendMessage(CMD_START_PACKET_KEEPALIVE, slot, mInterval, mPacket);
+ mNai.asyncChannel.sendMessage(CMD_START_SOCKET_KEEPALIVE, slot, mInterval, mPacket);
} else {
handleStopKeepalive(mNai, mSlot, error);
return;
@@ -214,7 +218,7 @@
}
if (isStarted) {
Log.d(TAG, "Stopping keepalive " + mSlot + " on " + mNai.name());
- mNai.asyncChannel.sendMessage(CMD_STOP_PACKET_KEEPALIVE, mSlot);
+ mNai.asyncChannel.sendMessage(CMD_STOP_SOCKET_KEEPALIVE, mSlot);
}
// TODO: at the moment we unconditionally return failure here. In cases where the
// NetworkAgent is alive, should we ask it to reply, so it can return failure?
@@ -225,7 +229,7 @@
void notifyMessenger(Messenger messenger, int slot, int err) {
Message message = Message.obtain();
- message.what = EVENT_PACKET_KEEPALIVE;
+ message.what = EVENT_SOCKET_KEEPALIVE;
message.arg1 = slot;
message.arg2 = err;
message.obj = null;
@@ -310,7 +314,7 @@
}
/** Handle keepalive events from lower layer. */
- public void handleEventPacketKeepalive(@NonNull NetworkAgentInfo nai,
+ public void handleEventSocketKeepalive(@NonNull NetworkAgentInfo nai,
@NonNull Message message) {
int slot = message.arg1;
int reason = message.arg2;
@@ -369,16 +373,16 @@
KeepalivePacketData packet;
try {
- packet = KeepalivePacketData.nattKeepalivePacket(
+ packet = NattKeepalivePacketData.nattKeepalivePacket(
srcAddress, srcPort, dstAddress, NATT_PORT);
- } catch (KeepalivePacketData.InvalidPacketException e) {
+ } catch (InvalidPacketException e) {
notifyMessenger(messenger, NO_KEEPALIVE, e.error);
return;
}
KeepaliveInfo ki = new KeepaliveInfo(messenger, binder, nai, packet, intervalSeconds);
Log.d(TAG, "Created keepalive: " + ki.toString());
mConnectivityServiceHandler.obtainMessage(
- NetworkAgent.CMD_START_PACKET_KEEPALIVE, ki).sendToTarget();
+ CMD_START_SOCKET_KEEPALIVE, ki).sendToTarget();
}
/**
@@ -432,7 +436,7 @@
}
public void dump(IndentingPrintWriter pw) {
- pw.println("Packet keepalives:");
+ pw.println("Socket keepalives:");
pw.increaseIndent();
for (NetworkAgentInfo nai : mKeepalives.keySet()) {
pw.println(nai.name());
diff --git a/services/core/java/com/android/server/display/BrightnessTracker.java b/services/core/java/com/android/server/display/BrightnessTracker.java
index 019d726..727cf0e 100644
--- a/services/core/java/com/android/server/display/BrightnessTracker.java
+++ b/services/core/java/com/android/server/display/BrightnessTracker.java
@@ -27,12 +27,17 @@
import android.content.IntentFilter;
import android.content.pm.ParceledListSlice;
import android.database.ContentObserver;
+import android.graphics.PixelFormat;
import android.hardware.Sensor;
import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
import android.hardware.display.AmbientBrightnessDayStats;
import android.hardware.display.BrightnessChangeEvent;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.DisplayManagerInternal;
+import android.hardware.display.DisplayedContentSample;
+import android.hardware.display.DisplayedContentSamplingAttributes;
import android.net.Uri;
import android.os.BatteryManager;
import android.os.Environment;
@@ -48,6 +53,7 @@
import android.util.AtomicFile;
import android.util.Slog;
import android.util.Xml;
+import android.view.Display;
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
@@ -55,6 +61,7 @@
import com.android.internal.os.BackgroundThread;
import com.android.internal.util.FastXmlSerializer;
import com.android.internal.util.RingBuffer;
+import com.android.server.LocalServices;
import libcore.io.IoUtils;
@@ -111,6 +118,8 @@
private static final String ATTR_DEFAULT_CONFIG = "defaultConfig";
private static final String ATTR_POWER_SAVE = "powerSaveFactor";
private static final String ATTR_USER_POINT = "userPoint";
+ private static final String ATTR_COLOR_SAMPLE_DURATION = "colorSampleDuration";
+ private static final String ATTR_COLOR_VALUE_BUCKETS = "colorValueBuckets";
private static final int MSG_BACKGROUND_START = 0;
private static final int MSG_BRIGHTNESS_CHANGED = 1;
@@ -119,6 +128,10 @@
private static final SimpleDateFormat FORMAT = new SimpleDateFormat("MM-dd HH:mm:ss.SSS");
+ private static final long COLOR_SAMPLE_DURATION = TimeUnit.SECONDS.toSeconds(10);
+ // Sample chanel 2 of HSV which is the Value component.
+ private static final int COLOR_SAMPLE_COMPONENT_MASK = 0x1 << 2;
+
// Lock held while accessing mEvents, is held while writing events to flash.
private final Object mEventsLock = new Object();
@GuardedBy("mEventsLock")
@@ -136,12 +149,16 @@
private final ContentResolver mContentResolver;
private final Handler mBgHandler;
- // mBroadcastReceiver, mSensorListener, mSettingsObserver and mSensorRegistered
- // should only be used on the mBgHandler thread.
+ // These members should only be accessed on the mBgHandler thread.
private BroadcastReceiver mBroadcastReceiver;
private SensorListener mSensorListener;
private SettingsObserver mSettingsObserver;
+ private DisplayListener mDisplayListener;
private boolean mSensorRegistered;
+ private boolean mColorSamplingEnabled;
+ private int mNoFramesToSample;
+ private float mFrameRate;
+ // End of block of members that should only be accessed on the mBgHandler thread.
private @UserIdInt int mCurrentUserId = UserHandle.USER_NULL;
@@ -208,6 +225,7 @@
mLastBrightness = initialBrightness;
mStarted = true;
}
+ enableColorSampling();
}
/** Stop listening for events */
@@ -226,6 +244,7 @@
synchronized (mDataCollectionLock) {
mStarted = false;
}
+ disableColorSampling();
}
public void onSwitchUser(@UserIdInt int newUserId) {
@@ -367,6 +386,17 @@
builder.setColorTemperature(mInjector.getColorTemperature(mContext,
UserHandle.USER_CURRENT));
+ if (mColorSamplingEnabled) {
+ DisplayedContentSample sample = mInjector.sampleColor(mNoFramesToSample);
+ if (sample != null && sample.getSampleComponent(
+ DisplayedContentSample.ColorComponent.CHANNEL2) != null) {
+ float numMillis = (sample.getNumFrames() / mFrameRate) * 1000.0f;
+ builder.setColorValues(
+ sample.getSampleComponent(DisplayedContentSample.ColorComponent.CHANNEL2),
+ Math.round(numMillis));
+ }
+ }
+
BrightnessChangeEvent event = builder.build();
if (DEBUG) {
Slog.d(TAG, "Event " + event.brightness + " " + event.packageName);
@@ -541,6 +571,19 @@
}
out.attribute(null, ATTR_LUX, luxValues.toString());
out.attribute(null, ATTR_LUX_TIMESTAMPS, luxTimestamps.toString());
+ if (toWrite[i].colorValueBuckets != null
+ && toWrite[i].colorValueBuckets.length > 0) {
+ out.attribute(null, ATTR_COLOR_SAMPLE_DURATION,
+ Long.toString(toWrite[i].colorSampleDuration));
+ StringBuilder buckets = new StringBuilder();
+ for (int j = 0; j < toWrite[i].colorValueBuckets.length; ++j) {
+ if (j > 0) {
+ buckets.append(',');
+ }
+ buckets.append(Long.toString(toWrite[i].colorValueBuckets[j]));
+ }
+ out.attribute(null, ATTR_COLOR_VALUE_BUCKETS, buckets.toString());
+ }
out.endTag(null, TAG_EVENT);
}
}
@@ -628,6 +671,20 @@
builder.setUserBrightnessPoint(Boolean.parseBoolean(userPoint));
}
+ String colorSampleDurationString =
+ parser.getAttributeValue(null, ATTR_COLOR_SAMPLE_DURATION);
+ String colorValueBucketsString =
+ parser.getAttributeValue(null, ATTR_COLOR_VALUE_BUCKETS);
+ if (colorSampleDurationString != null && colorValueBucketsString != null) {
+ long colorSampleDuration = Long.parseLong(colorSampleDurationString);
+ String[] buckets = colorValueBucketsString.split(",");
+ long[] bucketValues = new long[buckets.length];
+ for (int i = 0; i < bucketValues.length; ++i) {
+ bucketValues[i] = Long.parseLong(buckets[i]);
+ }
+ builder.setColorValues(bucketValues, colorSampleDuration);
+ }
+
BrightnessChangeEvent event = builder.build();
if (DEBUG) {
Slog.i(TAG, "Read event " + event.brightness
@@ -695,6 +752,73 @@
private void dumpLocal(PrintWriter pw) {
pw.println(" mSensorRegistered=" + mSensorRegistered);
+ pw.println(" mColorSamplingEnabled=" + mColorSamplingEnabled);
+ pw.println(" mNoFramesToSample=" + mNoFramesToSample);
+ pw.println(" mFrameRate=" + mFrameRate);
+ }
+
+ private void enableColorSampling() {
+ if (!mInjector.isBrightnessModeAutomatic(mContentResolver)
+ || !mInjector.isInteractive(mContext)
+ || mColorSamplingEnabled) {
+ return;
+ }
+
+ mFrameRate = mInjector.getFrameRate(mContext);
+ if (mFrameRate <= 0) {
+ Slog.wtf(TAG, "Default display has a zero or negative framerate.");
+ return;
+ }
+ mNoFramesToSample = (int) (mFrameRate * COLOR_SAMPLE_DURATION);
+
+ DisplayedContentSamplingAttributes attributes = mInjector.getSamplingAttributes();
+ if (DEBUG && attributes != null) {
+ Slog.d(TAG, "Color sampling"
+ + " mask=0x" + Integer.toHexString(attributes.getComponentMask())
+ + " dataSpace=0x" + Integer.toHexString(attributes.getDataspace())
+ + " pixelFormat=0x" + Integer.toHexString(attributes.getPixelFormat()));
+ }
+ // Do we support sampling the Value component of HSV
+ if (attributes != null && attributes.getPixelFormat() == PixelFormat.HSV_888
+ && (attributes.getComponentMask() & COLOR_SAMPLE_COMPONENT_MASK) != 0) {
+
+ mColorSamplingEnabled = mInjector.enableColorSampling(/* enable= */true,
+ mNoFramesToSample);
+ if (DEBUG) {
+ Slog.i(TAG, "turning on color sampling for "
+ + mNoFramesToSample + " frames, success=" + mColorSamplingEnabled);
+ }
+ }
+ if (mColorSamplingEnabled && mDisplayListener == null) {
+ mDisplayListener = new DisplayListener();
+ mInjector.registerDisplayListener(mContext, mDisplayListener, mBgHandler);
+ }
+ }
+
+ private void disableColorSampling() {
+ if (!mColorSamplingEnabled) {
+ return;
+ }
+ mInjector.enableColorSampling(/* enable= */ false, /* noFrames= */ 0);
+ mColorSamplingEnabled = false;
+ if (mDisplayListener != null) {
+ mInjector.unRegisterDisplayListener(mContext, mDisplayListener);
+ mDisplayListener = null;
+ }
+ if (DEBUG) {
+ Slog.i(TAG, "turning off color sampling");
+ }
+ }
+
+ private void updateColorSampling() {
+ if (!mColorSamplingEnabled) {
+ return;
+ }
+ float frameRate = mInjector.getFrameRate(mContext);
+ if (frameRate != mFrameRate) {
+ disableColorSampling();
+ enableColorSampling();
+ }
}
public ParceledListSlice<AmbientBrightnessDayStats> getAmbientBrightnessStats(int userId) {
@@ -768,6 +892,26 @@
}
}
+ private final class DisplayListener implements DisplayManager.DisplayListener {
+
+ @Override
+ public void onDisplayAdded(int displayId) {
+ // Ignore
+ }
+
+ @Override
+ public void onDisplayRemoved(int displayId) {
+ // Ignore
+ }
+
+ @Override
+ public void onDisplayChanged(int displayId) {
+ if (displayId == Display.DEFAULT_DISPLAY) {
+ updateColorSampling();
+ }
+ }
+ }
+
private final class SettingsObserver extends ContentObserver {
public SettingsObserver(Handler handler) {
super(handler);
@@ -828,9 +972,11 @@
break;
case MSG_START_SENSOR_LISTENER:
startSensorListener();
+ enableColorSampling();
break;
case MSG_STOP_SENSOR_LISTENER:
stopSensorListener();
+ disableColorSampling();
break;
}
}
@@ -957,5 +1103,44 @@
public boolean isNightModeActive(Context context, int userId) {
return new ColorDisplayController(context, userId).isActivated();
}
+
+ public DisplayedContentSample sampleColor(int noFramesToSample) {
+ final DisplayManagerInternal displayManagerInternal =
+ LocalServices.getService(DisplayManagerInternal.class);
+ return displayManagerInternal.getDisplayedContentSample(
+ Display.DEFAULT_DISPLAY, noFramesToSample, 0);
+ }
+
+ public float getFrameRate(Context context) {
+ final DisplayManager displayManager = context.getSystemService(DisplayManager.class);
+ Display display = displayManager.getDisplay(Display.DEFAULT_DISPLAY);
+ return display.getRefreshRate();
+ }
+
+ public DisplayedContentSamplingAttributes getSamplingAttributes() {
+ final DisplayManagerInternal displayManagerInternal =
+ LocalServices.getService(DisplayManagerInternal.class);
+ return displayManagerInternal.getDisplayedContentSamplingAttributes(
+ Display.DEFAULT_DISPLAY);
+ }
+
+ public boolean enableColorSampling(boolean enable, int noFrames) {
+ final DisplayManagerInternal displayManagerInternal =
+ LocalServices.getService(DisplayManagerInternal.class);
+ return displayManagerInternal.setDisplayedContentSamplingEnabled(
+ Display.DEFAULT_DISPLAY, enable, COLOR_SAMPLE_COMPONENT_MASK, noFrames);
+ }
+
+ public void registerDisplayListener(Context context,
+ DisplayManager.DisplayListener listener, Handler handler) {
+ final DisplayManager displayManager = context.getSystemService(DisplayManager.class);
+ displayManager.registerDisplayListener(listener, handler);
+ }
+
+ public void unRegisterDisplayListener(Context context,
+ DisplayManager.DisplayListener listener) {
+ final DisplayManager displayManager = context.getSystemService(DisplayManager.class);
+ displayManager.unregisterDisplayListener(listener);
+ }
}
}
diff --git a/services/core/java/com/android/server/display/ColorDisplayService.java b/services/core/java/com/android/server/display/ColorDisplayService.java
index 591ce8d..b3a1a06 100644
--- a/services/core/java/com/android/server/display/ColorDisplayService.java
+++ b/services/core/java/com/android/server/display/ColorDisplayService.java
@@ -23,6 +23,7 @@
import static android.hardware.display.ColorDisplayManager.COLOR_MODE_BOOSTED;
import static android.hardware.display.ColorDisplayManager.COLOR_MODE_NATURAL;
import static android.hardware.display.ColorDisplayManager.COLOR_MODE_SATURATED;
+
import static com.android.server.display.DisplayTransformManager.LEVEL_COLOR_MATRIX_DISPLAY_WHITE_BALANCE;
import static com.android.server.display.DisplayTransformManager.LEVEL_COLOR_MATRIX_NIGHT_DISPLAY;
import static com.android.server.display.DisplayTransformManager.LEVEL_COLOR_MATRIX_SATURATION;
@@ -65,10 +66,9 @@
import android.util.MathUtils;
import android.util.Slog;
import android.view.SurfaceControl;
+import android.view.SurfaceControl.DisplayPrimaries;
import android.view.accessibility.AccessibilityManager;
import android.view.animation.AnimationUtils;
-import android.view.SurfaceControl;
-import android.view.SurfaceControl.DisplayPrimaries;
import com.android.internal.R;
import com.android.internal.annotations.VisibleForTesting;
@@ -79,6 +79,7 @@
import com.android.server.twilight.TwilightListener;
import com.android.server.twilight.TwilightManager;
import com.android.server.twilight.TwilightState;
+
import java.io.FileDescriptor;
import java.io.PrintWriter;
import java.lang.ref.WeakReference;
@@ -145,6 +146,7 @@
private float[] mCurrentColorTemperatureXYZ;
private boolean mSetUp = false;
private float[] mMatrixDisplayWhiteBalance = new float[16];
+ private Boolean mIsAvailable;
@Override
public void setUp(Context context, boolean needsLinear) {
@@ -255,6 +257,14 @@
return LEVEL_COLOR_MATRIX_DISPLAY_WHITE_BALANCE;
}
+ @Override
+ public boolean isAvailable(Context context) {
+ if (mIsAvailable == null) {
+ mIsAvailable = ColorDisplayManager.isDisplayWhiteBalanceAvailable(context);
+ }
+ return mIsAvailable;
+ }
+
/**
* Format a given matrix into a string.
*
@@ -280,9 +290,7 @@
@Override
public void dump(PrintWriter pw) {
synchronized (mLock) {
- pw.println("ColorDisplayService");
pw.println(" mSetUp = " + mSetUp);
-
if (!mSetUp) {
return;
}
@@ -402,6 +410,11 @@
public int getLevel() {
return LEVEL_COLOR_MATRIX_SATURATION;
}
+
+ @Override
+ public boolean isAvailable(Context context) {
+ return ColorDisplayManager.isColorTransformAccelerated(context);
+ }
};
/**
@@ -623,7 +636,7 @@
// existing activated state. This ensures consistency of tint across the color mode change.
onDisplayColorModeChanged(mNightDisplayController.getColorMode());
- if (ColorDisplayManager.isNightDisplayAvailable(getContext())) {
+ if (mNightDisplayTintController.isAvailable(getContext())) {
// Reset the activated state.
mNightDisplayTintController.setActivated(null);
@@ -641,7 +654,7 @@
}
}
- if (ColorDisplayManager.isDisplayWhiteBalanceAvailable(getContext())) {
+ if (mDisplayWhiteBalanceTintController.isAvailable(getContext())) {
// Prepare the display white balance transform matrix.
mDisplayWhiteBalanceTintController.setUp(getContext(), true /* needsLinear */);
@@ -658,7 +671,7 @@
mNightDisplayController = null;
}
- if (ColorDisplayManager.isNightDisplayAvailable(getContext())) {
+ if (mNightDisplayTintController.isAvailable(getContext())) {
if (mNightDisplayAutoMode != null) {
mNightDisplayAutoMode.onStop();
mNightDisplayAutoMode = null;
@@ -666,7 +679,7 @@
mNightDisplayTintController.endAnimator();
}
- if (ColorDisplayManager.isDisplayWhiteBalanceAvailable(getContext())) {
+ if (mDisplayWhiteBalanceTintController.isAvailable(getContext())) {
mDisplayWhiteBalanceTintController.endAnimator();
}
}
@@ -714,9 +727,11 @@
mNightDisplayTintController.cancelAnimator();
mDisplayWhiteBalanceTintController.cancelAnimator();
- mNightDisplayTintController
- .setUp(getContext(), DisplayTransformManager.needsLinearColorMatrix(mode));
- mNightDisplayTintController.setMatrix(getNightDisplayColorTemperatureSetting());
+ if (mNightDisplayTintController.isAvailable(getContext())) {
+ mNightDisplayTintController
+ .setUp(getContext(), DisplayTransformManager.needsLinearColorMatrix(mode));
+ mNightDisplayTintController.setMatrix(getNightDisplayColorTemperatureSetting());
+ }
updateDisplayWhiteBalanceStatus();
@@ -1064,13 +1079,32 @@
private void dumpInternal(PrintWriter pw) {
pw.println("COLOR DISPLAY MANAGER dumpsys (color_display)");
+
pw.println("Night Display:");
- if (ColorDisplayManager.isNightDisplayAvailable(getContext())) {
+ if (mNightDisplayTintController.isAvailable(getContext())) {
pw.println(" Activated: " + mNightDisplayTintController.isActivated());
+ pw.println(" Color temp: " + mNightDisplayTintController.getColorTemperature());
} else {
pw.println(" Not available");
}
+
+ pw.println("Global saturation:");
+ if (mGlobalSaturationTintController.isAvailable(getContext())) {
+ pw.println(" Activated: " + mGlobalSaturationTintController.isActivated());
+ } else {
+ pw.println(" Not available");
+ }
+
mAppSaturationController.dump(pw);
+
+ pw.println("Display white balance:");
+ if (mDisplayWhiteBalanceTintController.isAvailable(getContext())) {
+ pw.println(" Activated: " + mDisplayWhiteBalanceTintController.isActivated());
+ } else {
+ pw.println(" Not available");
+ }
+
+ pw.println("Color mode: " + getColorModeInternal());
}
private boolean isNightDisplayActivatedSetting() {
@@ -1368,12 +1402,19 @@
* Get the color transform level to apply the matrix.
*/
public abstract int getLevel();
+
+ /**
+ * Returns whether or not this transform type is available on this device.
+ */
+ public abstract boolean isAvailable(Context context);
}
private final class NightDisplayTintController extends TintController {
- private float[] mMatrix = new float[16];
+ private final float[] mMatrix = new float[16];
private final float[] mColorTempCoefficients = new float[9];
+
+ private Boolean mIsAvailable;
private Integer mColorTemp;
/**
@@ -1446,13 +1487,21 @@
return LEVEL_COLOR_MATRIX_NIGHT_DISPLAY;
}
+ @Override
+ public boolean isAvailable(Context context) {
+ if (mIsAvailable == null) {
+ mIsAvailable = ColorDisplayManager.isNightDisplayAvailable(context);
+ }
+ return mIsAvailable;
+ }
+
void onActivated(boolean activated) {
Slog.i(TAG, activated ? "Turning on night display" : "Turning off night display");
if (mNightDisplayAutoMode != null) {
mNightDisplayAutoMode.onActivated(activated);
}
- if (ColorDisplayManager.isDisplayWhiteBalanceAvailable(getContext())) {
+ if (mDisplayWhiteBalanceTintController.isAvailable(getContext())) {
updateDisplayWhiteBalanceStatus();
}
diff --git a/services/core/java/com/android/server/hdmi/Constants.java b/services/core/java/com/android/server/hdmi/Constants.java
index 297a418..7c42cc2 100644
--- a/services/core/java/com/android/server/hdmi/Constants.java
+++ b/services/core/java/com/android/server/hdmi/Constants.java
@@ -393,15 +393,6 @@
"persist.sys.hdmi.property_sytem_audio_mode_audio_port";
/**
- * Property to indicate if a CEC audio device should forward volume keys when system audio mode
- * is off.
- *
- * <p>Default is false.
- */
- static final String PROPERTY_CEC_AUDIO_DEVICE_FORWARD_VOLUME_KEYS_SYSTEM_AUDIO_MODE_OFF =
- "persist.sys.hdmi.property_cec_audio_device_forward_volume_keys_system_audio_mode_off";
-
- /**
* Property to strip local audio of amplifier and use local speaker
* when TV does not support system audio mode.
*
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java b/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
index adc1cd7..2c0cacd 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecKeycode.java
@@ -450,6 +450,20 @@
}
/**
+ * Returns {@code true} if given Android keycode is volume control related,
+ * otherwise {@code false}.
+ */
+ static boolean isVolumeKeycode(int androidKeycode) {
+ int cecKeyCode = HdmiCecKeycode.androidKeyToCecKey(androidKeycode)[0];
+ return isSupportedKeycode(androidKeycode)
+ && (cecKeyCode == CEC_KEYCODE_VOLUME_UP
+ || cecKeyCode == CEC_KEYCODE_VOLUME_DOWN
+ || cecKeyCode == CEC_KEYCODE_MUTE
+ || cecKeyCode == CEC_KEYCODE_MUTE_FUNCTION
+ || cecKeyCode == CEC_KEYCODE_RESTORE_VOLUME_FUNCTION);
+ }
+
+ /**
* Returns CEC keycode to control audio mute status.
*
* @param muting {@code true} if audio is being muted
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
index 414f6bb..78b091e 100755
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevice.java
@@ -1016,6 +1016,40 @@
}
/**
+ * Send a volume key event to other CEC device. The logical address of target device will be
+ * given by {@link #findAudioReceiverAddress()}.
+ *
+ * @param keyCode key code defined in {@link android.view.KeyEvent}
+ * @param isPressed {@code true} for key down event
+ * @see #findAudioReceiverAddress()
+ */
+ @ServiceThreadOnly
+ protected void sendVolumeKeyEvent(int keyCode, boolean isPressed) {
+ assertRunOnServiceThread();
+ if (!HdmiCecKeycode.isVolumeKeycode(keyCode)) {
+ Slog.w(TAG, "Not a volume key: " + keyCode);
+ return;
+ }
+ List<SendKeyAction> action = getActions(SendKeyAction.class);
+ int logicalAddress = findAudioReceiverAddress();
+ if (logicalAddress == Constants.ADDR_INVALID || logicalAddress == mAddress) {
+ // Don't send key event to invalid device or itself.
+ Slog.w(
+ TAG,
+ "Discard volume key event: "
+ + keyCode
+ + ", pressed:"
+ + isPressed
+ + ", receiverAddr="
+ + logicalAddress);
+ } else if (!action.isEmpty()) {
+ action.get(0).processKeyEvent(keyCode, isPressed);
+ } else if (isPressed) {
+ addAndStartAction(new SendKeyAction(this, logicalAddress, keyCode));
+ }
+ }
+
+ /**
* Returns the logical address of the device which will receive key events via {@link
* #sendKeyEvent}.
*
@@ -1026,6 +1060,17 @@
return Constants.ADDR_INVALID;
}
+ /**
+ * Returns the logical address of the audio receiver device which will receive volume key events
+ * via {@link#sendVolumeKeyEvent}.
+ *
+ * @see #sendVolumeKeyEvent(int, boolean)
+ */
+ protected int findAudioReceiverAddress() {
+ Slog.w(TAG, "findAudioReceiverAddress is not implemented");
+ return Constants.ADDR_INVALID;
+ }
+
@ServiceThreadOnly
void invokeCallback(IHdmiControlCallback callback, int result) {
assertRunOnServiceThread();
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
index cac1a95..6710986 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceAudioSystem.java
@@ -20,6 +20,7 @@
import static com.android.server.hdmi.Constants.USE_LAST_STATE_SYSTEM_AUDIO_CONTROL_ON_POWER_ON;
import android.annotation.Nullable;
+import android.content.ActivityNotFoundException;
import android.content.Intent;
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.HdmiDeviceInfo;
@@ -67,11 +68,6 @@
private static final String TAG = "HdmiCecLocalDeviceAudioSystem";
- // Whether System audio mode is activated or not.
- // This becomes true only when all system audio sequences are finished.
- @GuardedBy("mLock")
- private boolean mSystemAudioActivated;
-
// Whether the System Audio Control feature is enabled or not. True by default.
@GuardedBy("mLock")
private boolean mSystemAudioControlFeatureEnabled;
@@ -270,7 +266,7 @@
synchronized (mLock) {
mService.writeStringSystemProperty(
Constants.PROPERTY_LAST_SYSTEM_AUDIO_CONTROL,
- mSystemAudioActivated ? "true" : "false");
+ isSystemAudioActivated() ? "true" : "false");
}
terminateSystemAudioMode();
}
@@ -458,9 +454,19 @@
@ServiceThreadOnly
protected boolean handleGiveSystemAudioModeStatus(HdmiCecMessage message) {
assertRunOnServiceThread();
+ // If the audio system is initiating the system audio mode on and TV asks the sam status at
+ // the same time, respond with true. Since we know TV supports sam in this situation.
+ // If the query comes from STB, we should respond with the current sam status and the STB
+ // should listen to the <Set System Audio Mode> broadcasting.
+ boolean isSystemAudioModeOnOrTurningOn = isSystemAudioActivated();
+ if (!isSystemAudioModeOnOrTurningOn
+ && message.getSource() == Constants.ADDR_TV
+ && hasAction(SystemAudioInitiationActionFromAvr.class)) {
+ isSystemAudioModeOnOrTurningOn = true;
+ }
mService.sendCecCommand(
HdmiCecMessageBuilder.buildReportSystemAudioMode(
- mAddress, message.getSource(), mSystemAudioActivated));
+ mAddress, message.getSource(), isSystemAudioModeOnOrTurningOn));
return true;
}
@@ -775,7 +781,7 @@
int maxVolume = mService.getAudioManager().getStreamMaxVolume(AudioManager.STREAM_MUSIC);
int minVolume = mService.getAudioManager().getStreamMinVolume(AudioManager.STREAM_MUSIC);
int scaledVolume = VolumeControlAction.scaleToCecVolume(volume, maxVolume);
- HdmiLogger.debug("Reporting volume %i (%i-%i) as CEC volume %i", volume,
+ HdmiLogger.debug("Reporting volume %d (%d-%d) as CEC volume %d", volume,
minVolume, maxVolume, scaledVolume);
mService.sendCecCommand(
@@ -803,7 +809,7 @@
}
HdmiLogger.debug(
"System Audio Mode change[old:%b new:%b]",
- mSystemAudioActivated, newSystemAudioMode);
+ isSystemAudioActivated(), newSystemAudioMode);
// Wake up device if System Audio Control is turned on
if (newSystemAudioMode) {
mService.wakeUp();
@@ -843,8 +849,8 @@
}
updateAudioManagerForSystemAudio(newSystemAudioMode);
synchronized (mLock) {
- if (mSystemAudioActivated != newSystemAudioMode) {
- mSystemAudioActivated = newSystemAudioMode;
+ if (isSystemAudioActivated() != newSystemAudioMode) {
+ mService.setSystemAudioActivated(newSystemAudioMode);
mService.announceSystemAudioModeChange(newSystemAudioMode);
}
}
@@ -935,9 +941,7 @@
}
protected boolean isSystemAudioActivated() {
- synchronized (mLock) {
- return mSystemAudioActivated;
- }
+ return mService.isSystemAudioActivated();
}
protected void terminateSystemAudioMode() {
@@ -1075,20 +1079,28 @@
// For device to switch to specific TvInput with corresponding URI.
private void switchToTvInput(String uri) {
- mService.getContext().startActivity(new Intent(Intent.ACTION_VIEW,
- TvContract.buildChannelUriForPassthroughInput(uri))
- .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+ try {
+ mService.getContext().startActivity(new Intent(Intent.ACTION_VIEW,
+ TvContract.buildChannelUriForPassthroughInput(uri))
+ .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
+ } catch (ActivityNotFoundException e) {
+ Slog.e(TAG, "Can't find activity to switch to " + uri, e);
+ }
}
// For device using TvInput to switch to Home.
private void switchToHomeTvInput() {
- Intent activityIntent = new Intent(Intent.ACTION_MAIN)
- .addCategory(Intent.CATEGORY_HOME)
- .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP
- | Intent.FLAG_ACTIVITY_SINGLE_TOP
- | Intent.FLAG_ACTIVITY_NEW_TASK
- | Intent.FLAG_ACTIVITY_NO_ANIMATION);
- mService.getContext().startActivity(activityIntent);
+ try {
+ Intent activityIntent = new Intent(Intent.ACTION_MAIN)
+ .addCategory(Intent.CATEGORY_HOME)
+ .setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP
+ | Intent.FLAG_ACTIVITY_SINGLE_TOP
+ | Intent.FLAG_ACTIVITY_NEW_TASK
+ | Intent.FLAG_ACTIVITY_NO_ANIMATION);
+ mService.getContext().startActivity(activityIntent);
+ } catch (ActivityNotFoundException e) {
+ Slog.e(TAG, "Can't find activity to switch to HOME", e);
+ }
}
@Override
@@ -1131,7 +1143,8 @@
if (routingInformationPath == mService.getPhysicalAddress()) {
HdmiLogger.debug("Current device can't assign valid physical address"
+ "to devices under it any more. "
- + "It's physical address is " + routingInformationPath);
+ + "It's physical address is "
+ + routingInformationPath);
return;
}
// Otherwise will switch to the current active port and broadcast routing information.
@@ -1195,7 +1208,6 @@
protected void dump(IndentingPrintWriter pw) {
pw.println("HdmiCecLocalDeviceAudioSystem:");
pw.increaseIndent();
- pw.println("mSystemAudioActivated: " + mSystemAudioActivated);
pw.println("isRoutingFeatureEnabled " + isRoutingControlFeatureEnabled());
pw.println("mSystemAudioControlFeatureEnabled: " + mSystemAudioControlFeatureEnabled);
pw.println("mTvSystemAudioModeSupport: " + mTvSystemAudioModeSupport);
@@ -1208,5 +1220,4 @@
pw.decreaseIndent();
super.dump(pw);
}
-
}
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
index ef7d241..20933db 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDevicePlayback.java
@@ -19,6 +19,7 @@
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.IHdmiControlCallback;
+import android.hardware.tv.cec.V1_0.SendMessageResult;
import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
import android.os.SystemProperties;
@@ -30,6 +31,7 @@
import com.android.internal.app.LocalePicker.LocaleInfo;
import com.android.internal.util.IndentingPrintWriter;
import com.android.server.hdmi.HdmiAnnotations.ServiceThreadOnly;
+import com.android.server.hdmi.HdmiControlService.SendMessageCallback;
import java.io.UnsupportedEncodingException;
import java.util.List;
@@ -85,6 +87,22 @@
mAddress, mService.getPhysicalAddress(), mDeviceType));
mService.sendCecCommand(HdmiCecMessageBuilder.buildDeviceVendorIdCommand(
mAddress, mService.getVendorId()));
+ if (mService.audioSystem() == null) {
+ // If current device is not a functional audio system device,
+ // send message to potential audio system device in the system to get the system
+ // audio mode status. If no response, set to false.
+ mService.sendCecCommand(HdmiCecMessageBuilder.buildGiveSystemAudioModeStatus(
+ mAddress, Constants.ADDR_AUDIO_SYSTEM), new SendMessageCallback() {
+ @Override
+ public void onSendCompleted(int error) {
+ if (error != SendMessageResult.SUCCESS) {
+ HdmiLogger.debug(
+ "AVR did not respond to <Give System Audio Mode Status>");
+ mService.setSystemAudioActivated(false);
+ }
+ }
+ });
+ }
startQueuedActions();
}
@@ -275,11 +293,50 @@
}
@Override
+ protected boolean handleSetSystemAudioMode(HdmiCecMessage message) {
+ // System Audio Mode only turns on/off when Audio System broadcasts on/off message.
+ // For device with type 4 and 5, it can set system audio mode on/off
+ // when there is another audio system device connected into the system first.
+ if (message.getDestination() != Constants.ADDR_BROADCAST
+ || message.getSource() != Constants.ADDR_AUDIO_SYSTEM
+ || mService.audioSystem() != null) {
+ return true;
+ }
+ boolean setSystemAudioModeOn = HdmiUtils.parseCommandParamSystemAudioStatus(message);
+ if (mService.isSystemAudioActivated() != setSystemAudioModeOn) {
+ mService.setSystemAudioActivated(setSystemAudioModeOn);
+ }
+ return true;
+ }
+
+ @Override
+ protected boolean handleSystemAudioModeStatus(HdmiCecMessage message) {
+ // Only directly addressed System Audio Mode Status message can change internal
+ // system audio mode status.
+ if (message.getDestination() == mAddress
+ && message.getSource() == Constants.ADDR_AUDIO_SYSTEM) {
+ boolean setSystemAudioModeOn = HdmiUtils.parseCommandParamSystemAudioStatus(message);
+ if (mService.isSystemAudioActivated() != setSystemAudioModeOn) {
+ mService.setSystemAudioActivated(setSystemAudioModeOn);
+ }
+ }
+ return true;
+ }
+
+ @Override
protected int findKeyReceiverAddress() {
return Constants.ADDR_TV;
}
@Override
+ protected int findAudioReceiverAddress() {
+ if (mService.isSystemAudioActivated()) {
+ return Constants.ADDR_AUDIO_SYSTEM;
+ }
+ return Constants.ADDR_TV;
+ }
+
+ @Override
@ServiceThreadOnly
protected void disableDevice(boolean initiatedByCec, PendingActionClearedCallback callback) {
super.disableDevice(initiatedByCec, callback);
diff --git a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
index a8c4350..8a7051f 100644
--- a/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
+++ b/services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java
@@ -77,11 +77,6 @@
// True by default for all the ARC-enabled ports.
private final SparseBooleanArray mArcFeatureEnabled = new SparseBooleanArray();
- // Whether System audio mode is activated or not.
- // This becomes true only when all system audio sequences are finished.
- @GuardedBy("mLock")
- private boolean mSystemAudioActivated = false;
-
// Whether the System Audio Control feature is enabled or not. True by default.
@GuardedBy("mLock")
private boolean mSystemAudioControlFeatureEnabled;
@@ -829,11 +824,12 @@
+ "because the System Audio Control feature is disabled.");
return;
}
- HdmiLogger.debug("System Audio Mode change[old:%b new:%b]", mSystemAudioActivated, on);
+ HdmiLogger.debug("System Audio Mode change[old:%b new:%b]",
+ mService.isSystemAudioActivated(), on);
updateAudioManagerForSystemAudio(on);
synchronized (mLock) {
- if (mSystemAudioActivated != on) {
- mSystemAudioActivated = on;
+ if (mService.isSystemAudioActivated() != on) {
+ mService.setSystemAudioActivated(on);
mService.announceSystemAudioModeChange(on);
}
startArcAction(on);
@@ -849,9 +845,7 @@
if (!hasSystemAudioDevice()) {
return false;
}
- synchronized (mLock) {
- return mSystemAudioActivated;
- }
+ return mService.isSystemAudioActivated();
}
@ServiceThreadOnly
@@ -1904,7 +1898,6 @@
super.dump(pw);
pw.println("mArcEstablished: " + mArcEstablished);
pw.println("mArcFeatureEnabled: " + mArcFeatureEnabled);
- pw.println("mSystemAudioActivated: " + mSystemAudioActivated);
pw.println("mSystemAudioMute: " + mSystemAudioMute);
pw.println("mSystemAudioControlFeatureEnabled: " + mSystemAudioControlFeatureEnabled);
pw.println("mAutoDeviceOff: " + mAutoDeviceOff);
diff --git a/services/core/java/com/android/server/hdmi/HdmiControlService.java b/services/core/java/com/android/server/hdmi/HdmiControlService.java
index f3a1e46..7376ed2 100644
--- a/services/core/java/com/android/server/hdmi/HdmiControlService.java
+++ b/services/core/java/com/android/server/hdmi/HdmiControlService.java
@@ -147,6 +147,10 @@
@GuardedBy("mLock")
protected final ActiveSource mActiveSource = new ActiveSource();
+ // Whether System Audio Mode is activated or not.
+ @GuardedBy("mLock")
+ private boolean mSystemAudioActivated = false;
+
private static final boolean isHdmiCecNeverClaimPlaybackLogicAddr =
SystemProperties.getBoolean(
Constants.PROPERTY_HDMI_CEC_NEVER_CLAIM_PLAYBACK_LOGICAL_ADDRESS, false);
@@ -1392,11 +1396,15 @@
}
@Override
+ @Nullable
public HdmiDeviceInfo getActiveSource() {
enforceAccessPermission();
HdmiCecLocalDeviceTv tv = tv();
if (tv == null) {
- Slog.w(TAG, "Local tv device not available");
+ if (isTvDevice()) {
+ Slog.e(TAG, "Local tv device not available.");
+ return null;
+ }
if (isPlaybackDevice()) {
// if playback device itself is the active source,
// return its own device info.
@@ -1457,7 +1465,10 @@
HdmiControlService.this, deviceId, callback));
return;
}
- Slog.w(TAG, "Local tv device not available");
+ if (isTvDevice()) {
+ Slog.e(TAG, "Local tv device not available");
+ return;
+ }
invokeCallback(callback, HdmiControlManager.RESULT_SOURCE_NOT_AVAILABLE);
return;
}
@@ -1526,7 +1537,7 @@
if (mCecController != null) {
HdmiCecLocalDevice localDevice = mCecController.getLocalDevice(deviceType);
if (localDevice == null) {
- Slog.w(TAG, "Local device not available");
+ Slog.w(TAG, "Local device not available to send key event.");
return;
}
localDevice.sendKeyEvent(keyCode, isPressed);
@@ -1536,6 +1547,28 @@
}
@Override
+ public void sendVolumeKeyEvent(
+ final int deviceType, final int keyCode, final boolean isPressed) {
+ enforceAccessPermission();
+ runOnServiceThread(new Runnable() {
+ @Override
+ public void run() {
+ if (mCecController == null) {
+ Slog.w(TAG, "CEC controller not available to send volume key event.");
+ return;
+ }
+ HdmiCecLocalDevice localDevice = mCecController.getLocalDevice(deviceType);
+ if (localDevice == null) {
+ Slog.w(TAG, "Local device " + deviceType
+ + " not available to send volume key event.");
+ return;
+ }
+ localDevice.sendVolumeKeyEvent(keyCode, isPressed);
+ }
+ });
+ }
+
+ @Override
public void oneTouchPlay(final IHdmiControlCallback callback) {
enforceAccessPermission();
runOnServiceThread(new Runnable() {
@@ -2003,6 +2036,7 @@
pw.increaseIndent();
pw.println("mHdmiControlEnabled: " + mHdmiControlEnabled);
pw.println("mMhlInputChangeEnabled: " + mMhlInputChangeEnabled);
+ pw.println("mSystemAudioActivated: " + isSystemAudioActivated());
pw.decreaseIndent();
pw.println("mMhlController: ");
@@ -2629,6 +2663,18 @@
}
}
+ boolean isSystemAudioActivated() {
+ synchronized (mLock) {
+ return mSystemAudioActivated;
+ }
+ }
+
+ void setSystemAudioActivated(boolean on) {
+ synchronized (mLock) {
+ mSystemAudioActivated = on;
+ }
+ }
+
@ServiceThreadOnly
void setCecOption(int key, boolean value) {
assertRunOnServiceThread();
diff --git a/services/core/java/com/android/server/hdmi/SendKeyAction.java b/services/core/java/com/android/server/hdmi/SendKeyAction.java
index 40d2583..5ad7fab 100644
--- a/services/core/java/com/android/server/hdmi/SendKeyAction.java
+++ b/services/core/java/com/android/server/hdmi/SendKeyAction.java
@@ -17,8 +17,10 @@
import static com.android.server.hdmi.HdmiConfig.IRT_MS;
+import android.hardware.tv.cec.V1_0.SendMessageResult;
import android.util.Slog;
import android.view.KeyEvent;
+import com.android.server.hdmi.HdmiControlService.SendMessageCallback;
/**
* Feature action that transmits remote control key command (User Control Press/
@@ -146,8 +148,26 @@
if (cecKeycodeAndParams == null) {
return;
}
- sendCommand(HdmiCecMessageBuilder.buildUserControlPressed(getSourceAddress(),
- mTargetAddress, cecKeycodeAndParams));
+ // Devices that are not directly connected with audio system device can't detect if the
+ // audio system device is still plugged in. Framework checks if the volume key forwarding is
+ // successful or not every time to make sure the System Audio Mode status is still updated.
+ if (mTargetAddress == Constants.ADDR_AUDIO_SYSTEM
+ && localDevice().mAddress != Constants.ADDR_TV) {
+ sendCommand(HdmiCecMessageBuilder.buildUserControlPressed(getSourceAddress(),
+ mTargetAddress, cecKeycodeAndParams), new SendMessageCallback() {
+ @Override
+ public void onSendCompleted(int error) {
+ if (error != SendMessageResult.SUCCESS) {
+ HdmiLogger.debug(
+ "AVR did not respond to <User Control Pressed>");
+ localDevice().mService.setSystemAudioActivated(false);
+ }
+ }
+ });
+ } else {
+ sendCommand(HdmiCecMessageBuilder.buildUserControlPressed(getSourceAddress(),
+ mTargetAddress, cecKeycodeAndParams));
+ }
}
private void sendKeyUp() {
diff --git a/services/core/java/com/android/server/location/AbstractLocationProvider.java b/services/core/java/com/android/server/location/AbstractLocationProvider.java
index b3f1018..0edd17b 100644
--- a/services/core/java/com/android/server/location/AbstractLocationProvider.java
+++ b/services/core/java/com/android/server/location/AbstractLocationProvider.java
@@ -16,6 +16,7 @@
package com.android.server.location;
+import android.content.Context;
import android.location.Location;
import android.location.LocationProvider;
import android.os.Bundle;
@@ -26,6 +27,7 @@
import java.io.FileDescriptor;
import java.io.PrintWriter;
+import java.util.Collections;
import java.util.List;
/**
@@ -65,9 +67,12 @@
void onReportLocation(List<Location> locations);
}
+ protected final Context mContext;
private final LocationProviderManager mLocationProviderManager;
- protected AbstractLocationProvider(LocationProviderManager locationProviderManager) {
+ protected AbstractLocationProvider(
+ Context context, LocationProviderManager locationProviderManager) {
+ mContext = context;
mLocationProviderManager = locationProviderManager;
}
@@ -101,6 +106,11 @@
mLocationProviderManager.onSetProperties(properties);
}
+ /** Returns list of packages currently associated with this provider. */
+ public List<String> getProviderPackages() {
+ return Collections.singletonList(mContext.getPackageName());
+ }
+
/**
* Called when the location service delivers a new request for fulfillment to the provider.
* Replaces any previous requests completely.
diff --git a/services/core/java/com/android/server/location/CallerIdentity.java b/services/core/java/com/android/server/location/CallerIdentity.java
new file mode 100644
index 0000000..da31d0b
--- /dev/null
+++ b/services/core/java/com/android/server/location/CallerIdentity.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2019 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.location;
+
+/**
+ * Represents the calling process's uid, pid, and package name.
+ */
+public class CallerIdentity {
+ public final int mUid;
+ public final int mPid;
+ public final String mPackageName;
+
+ public CallerIdentity(int uid, int pid, String packageName) {
+ mUid = uid;
+ mPid = pid;
+ mPackageName = packageName;
+ }
+}
diff --git a/services/core/java/com/android/server/location/GnssLocationProvider.java b/services/core/java/com/android/server/location/GnssLocationProvider.java
index d346ddc..b18110e 100644
--- a/services/core/java/com/android/server/location/GnssLocationProvider.java
+++ b/services/core/java/com/android/server/location/GnssLocationProvider.java
@@ -332,9 +332,6 @@
// true if we started navigation
private boolean mStarted;
- // true if single shot request is in progress
- private boolean mSingleShot;
-
// capabilities of the GPS engine
private int mEngineCapabilities;
@@ -371,7 +368,6 @@
private int mC2KServerPort;
private boolean mSuplEsEnabled = false;
- private final Context mContext;
private final Looper mLooper;
private final LocationExtras mLocationExtras = new LocationExtras();
private final GnssStatusListenerHelper mGnssStatusListenerHelper;
@@ -455,7 +451,7 @@
switch (action) {
case ALARM_WAKEUP:
- startNavigating(false);
+ startNavigating();
break;
case ALARM_TIMEOUT:
hibernate();
@@ -565,9 +561,8 @@
public GnssLocationProvider(Context context, LocationProviderManager locationProviderManager,
Looper looper) {
- super(locationProviderManager);
+ super(context, locationProviderManager);
- mContext = context;
mLooper = looper;
// Create a wake lock
@@ -852,10 +847,9 @@
* allowed mode from properties.
*
* @param agpsEnabled whether AGPS is enabled by settings value
- * @param singleShot whether "singleshot" is needed
* @return SUPL mode (MSA vs MSB vs STANDALONE)
*/
- private int getSuplMode(boolean agpsEnabled, boolean singleShot) {
+ private int getSuplMode(boolean agpsEnabled) {
if (agpsEnabled) {
int suplMode = mGnssConfiguration.getSuplMode(0);
if (suplMode == 0) {
@@ -867,14 +861,6 @@
if (hasCapability(GPS_CAPABILITY_MSB) && (suplMode & AGPS_SUPL_MODE_MSB) != 0) {
return GPS_POSITION_MODE_MS_BASED;
}
- // for now, just as the legacy code did, we fallback to MS-Assisted if it is available,
- // do fallback only for single-shot requests, because it is too expensive to do for
- // periodic requests as well
- if (singleShot
- && hasCapability(GPS_CAPABILITY_MSA)
- && (suplMode & AGPS_SUPL_MODE_MSA) != 0) {
- return GPS_POSITION_MODE_MS_ASSISTED;
- }
}
return GPS_POSITION_MODE_STANDALONE;
}
@@ -965,22 +951,6 @@
return;
}
- boolean singleShot = false;
-
- // see if the request is for a single update
- if (mProviderRequest.locationRequests != null
- && mProviderRequest.locationRequests.size() > 0) {
- // if any request has zero or more than one updates
- // requested, then this is not single-shot mode
- singleShot = true;
-
- for (LocationRequest lr : mProviderRequest.locationRequests) {
- if (lr.getNumUpdates() != 1) {
- singleShot = false;
- }
- }
- }
-
if (DEBUG) Log.d(TAG, "setRequest " + mProviderRequest);
if (mProviderRequest.reportLocation && !mDisableGps && isEnabled()) {
// update client uids
@@ -1003,7 +973,7 @@
}
} else if (!mStarted) {
// start GPS
- startNavigating(singleShot);
+ startNavigating();
} else {
// GNSS Engine is already ON, but no GPS_CAPABILITY_SCHEDULING
mAlarmManager.cancel(mTimeoutIntent);
@@ -1148,13 +1118,12 @@
}
}
- private void startNavigating(boolean singleShot) {
+ private void startNavigating() {
if (!mStarted) {
- if (DEBUG) Log.d(TAG, "startNavigating, singleShot is " + singleShot);
+ if (DEBUG) Log.d(TAG, "startNavigating");
mTimeToFirstFix = 0;
mLastFixTime = 0;
mStarted = true;
- mSingleShot = singleShot;
mPositionMode = GPS_POSITION_MODE_STANDALONE;
// Notify about suppressed output, if speed limit was previously exceeded.
// Elsewhere, we check again with every speed output reported.
@@ -1166,7 +1135,7 @@
boolean agpsEnabled =
(Settings.Global.getInt(mContext.getContentResolver(),
Settings.Global.ASSISTED_GPS_ENABLED, 1) != 0);
- mPositionMode = getSuplMode(agpsEnabled, singleShot);
+ mPositionMode = getSuplMode(agpsEnabled);
if (DEBUG) {
String mode;
@@ -1221,7 +1190,6 @@
if (DEBUG) Log.d(TAG, "stopNavigating");
if (mStarted) {
mStarted = false;
- mSingleShot = false;
native_stop();
mLastFixTime = 0;
// native_stop() may reset the position mode in hardware.
@@ -1300,10 +1268,6 @@
mGnssStatusListenerHelper.onFirstFix(mTimeToFirstFix);
}
- if (mSingleShot) {
- stopNavigating();
- }
-
if (mStarted && mStatus != LocationProvider.AVAILABLE) {
// For devices that use framework scheduling, a timer may be set to ensure we don't
// spend too much power searching for a location, when the requested update rate is
diff --git a/services/core/java/com/android/server/location/GnssMeasurementsProvider.java b/services/core/java/com/android/server/location/GnssMeasurementsProvider.java
index 77dee82..1fc7192 100644
--- a/services/core/java/com/android/server/location/GnssMeasurementsProvider.java
+++ b/services/core/java/com/android/server/location/GnssMeasurementsProvider.java
@@ -95,15 +95,11 @@
*/
public void injectGnssMeasurementCorrections(
GnssMeasurementCorrections measurementCorrections) {
- mHandler.post(
- new Runnable() {
- @Override
- public void run() {
- if (!mNative.injectGnssMeasurementCorrections(measurementCorrections)) {
- Log.e(TAG, "Failure in injecting GNSS corrections.");
- }
- }
- });
+ mHandler.post(() -> {
+ if (!mNative.injectGnssMeasurementCorrections(measurementCorrections)) {
+ Log.e(TAG, "Failure in injecting GNSS corrections.");
+ }
+ });
}
@Override
@@ -115,15 +111,14 @@
}
public void onMeasurementsAvailable(final GnssMeasurementsEvent event) {
- foreach(
- (IGnssMeasurementsListener listener, int uid, String packageName) -> {
- if (!hasPermission(uid, packageName)) {
- logPermissionDisabledEventNotReported(
- TAG, packageName, "GNSS measurements");
- return;
- }
- listener.onGnssMeasurementsReceived(event);
- });
+ foreach((IGnssMeasurementsListener listener, CallerIdentity callerIdentity) -> {
+ if (!hasPermission(mContext, callerIdentity)) {
+ logPermissionDisabledEventNotReported(
+ TAG, callerIdentity.mPackageName, "GNSS measurements");
+ return;
+ }
+ listener.onGnssMeasurementsReceived(event);
+ });
}
/** Updates the framework about the capabilities of the GNSS chipset */
@@ -182,7 +177,7 @@
@Override
public void execute(IGnssMeasurementsListener listener,
- int uid, String packageName) throws RemoteException {
+ CallerIdentity callerIdentity) throws RemoteException {
listener.onStatusChanged(mStatus);
}
}
diff --git a/services/core/java/com/android/server/location/GnssNavigationMessageProvider.java b/services/core/java/com/android/server/location/GnssNavigationMessageProvider.java
index 679919f..80a3f9b 100644
--- a/services/core/java/com/android/server/location/GnssNavigationMessageProvider.java
+++ b/services/core/java/com/android/server/location/GnssNavigationMessageProvider.java
@@ -86,7 +86,7 @@
}
public void onNavigationMessageAvailable(final GnssNavigationMessage event) {
- foreach((IGnssNavigationMessageListener listener, int uid, String packageName) -> {
+ foreach((IGnssNavigationMessageListener listener, CallerIdentity callerIdentity) -> {
listener.onGnssNavigationMessageReceived(event);
}
);
@@ -136,7 +136,7 @@
@Override
public void execute(IGnssNavigationMessageListener listener,
- int uid, String packageName) throws RemoteException {
+ CallerIdentity callerIdentity) throws RemoteException {
listener.onStatusChanged(mStatus);
}
}
diff --git a/services/core/java/com/android/server/location/GnssStatusListenerHelper.java b/services/core/java/com/android/server/location/GnssStatusListenerHelper.java
index 454dbdd..d67d0c5 100644
--- a/services/core/java/com/android/server/location/GnssStatusListenerHelper.java
+++ b/services/core/java/com/android/server/location/GnssStatusListenerHelper.java
@@ -48,18 +48,18 @@
public void onStatusChanged(boolean isNavigating) {
if (isNavigating) {
- foreach((IGnssStatusListener listener, int uid, String packageName) -> {
+ foreach((IGnssStatusListener listener, CallerIdentity callerIdentity) -> {
listener.onGnssStarted();
});
} else {
- foreach((IGnssStatusListener listener, int uid, String packageName) -> {
+ foreach((IGnssStatusListener listener, CallerIdentity callerIdentity) -> {
listener.onGnssStopped();
});
}
}
public void onFirstFix(final int timeToFirstFix) {
- foreach((IGnssStatusListener listener, int uid, String packageName) -> {
+ foreach((IGnssStatusListener listener, CallerIdentity callerIdentity) -> {
listener.onFirstFix(timeToFirstFix);
}
);
@@ -72,9 +72,10 @@
final float[] elevations,
final float[] azimuths,
final float[] carrierFreqs) {
- foreach((IGnssStatusListener listener, int uid, String packageName) -> {
- if (!hasPermission(uid, packageName)) {
- logPermissionDisabledEventNotReported(TAG, packageName, "GNSS status");
+ foreach((IGnssStatusListener listener, CallerIdentity callerIdentity) -> {
+ if (!hasPermission(mContext, callerIdentity)) {
+ logPermissionDisabledEventNotReported(TAG, callerIdentity.mPackageName,
+ "GNSS status");
return;
}
listener.onSvStatusChanged(svCount, prnWithFlags, cn0s, elevations, azimuths,
@@ -83,9 +84,9 @@
}
public void onNmeaReceived(final long timestamp, final String nmea) {
- foreach((IGnssStatusListener listener, int uid, String packageName) -> {
- if (!hasPermission(uid, packageName)) {
- logPermissionDisabledEventNotReported(TAG, packageName, "NMEA");
+ foreach((IGnssStatusListener listener, CallerIdentity callerIdentity) -> {
+ if (!hasPermission(mContext, callerIdentity)) {
+ logPermissionDisabledEventNotReported(TAG, callerIdentity.mPackageName, "NMEA");
return;
}
listener.onNmeaReceived(timestamp, nmea);
diff --git a/services/core/java/com/android/server/location/LocationPermissionUtil.java b/services/core/java/com/android/server/location/LocationPermissionUtil.java
new file mode 100644
index 0000000..4465f31
--- /dev/null
+++ b/services/core/java/com/android/server/location/LocationPermissionUtil.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright (C) 2019 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.location;
+
+import android.content.Context;
+import android.content.pm.PackageManager;
+
+/**
+ * Encapsulates utility functions and classes related to location permission checking.
+ */
+public final class LocationPermissionUtil {
+ /**
+ * Returns true if the calling process identified by {@code callerIdentity} is enabled to
+ * report location to AppOps service before providing device location identifiable information
+ * to its clients. Packages with these permissions must report any reporting of location
+ * information to apps, via AppOps.
+ *
+ * <p>The calling package represented by {@code callerIdentity} is considered a part of the
+ * extended Location Manager Service if it has all of the permissions below.
+ * <ul>
+ * <li>{@link android.Manifest.permission#LOCATION_HARDWARE}
+ * <li>{@link android.Manifest.permission#UPDATE_APP_OPS_STATS}
+ * </ul>
+ *
+ * <p>Any package with these permissions, that passes along location information from Android
+ * framework to apps, must report to AppOps, similarly to Location Manager Service - i.e.
+ * whenever it reports device location or location identifiable information such as
+ * GNSS status, GNSS measurements, etc. to its clients.
+ */
+ public static boolean doesCallerReportToAppOps(Context context, CallerIdentity callerIdentity) {
+ return hasPermissionLocationHardware(context, callerIdentity)
+ && hasPermissionUpdateAppOpsStats(context, callerIdentity);
+ }
+
+ private static boolean hasPermissionLocationHardware(Context context,
+ CallerIdentity callerIdentity) {
+ return context.checkPermission(android.Manifest.permission.LOCATION_HARDWARE,
+ callerIdentity.mPid, callerIdentity.mUid) == PackageManager.PERMISSION_GRANTED;
+ }
+
+ private static boolean hasPermissionUpdateAppOpsStats(Context context,
+ CallerIdentity callerIdentity) {
+ return context.checkPermission(android.Manifest.permission.UPDATE_APP_OPS_STATS,
+ callerIdentity.mPid, callerIdentity.mUid) == PackageManager.PERMISSION_GRANTED;
+ }
+
+ private LocationPermissionUtil() {}
+}
diff --git a/services/core/java/com/android/server/location/LocationProviderProxy.java b/services/core/java/com/android/server/location/LocationProviderProxy.java
index 776beb5..34c8786 100644
--- a/services/core/java/com/android/server/location/LocationProviderProxy.java
+++ b/services/core/java/com/android/server/location/LocationProviderProxy.java
@@ -16,8 +16,11 @@
package com.android.server.location;
+import static android.content.pm.PackageManager.MATCH_SYSTEM_ONLY;
+
import android.annotation.Nullable;
import android.content.Context;
+import android.content.pm.PackageManager;
import android.location.Location;
import android.location.LocationProvider;
import android.os.Bundle;
@@ -39,6 +42,10 @@
import java.io.FileDescriptor;
import java.io.IOException;
import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArrayList;
/**
* Proxy for ILocationProvider implementations.
@@ -48,14 +55,21 @@
private static final String TAG = "LocationProviderProxy";
private static final boolean D = LocationManagerService.D;
+ // used to ensure that updates to mProviderPackages are atomic
+ private final Object mProviderPackagesLock = new Object();
+
// used to ensure that updates to mRequest and mWorkSource are atomic
private final Object mRequestLock = new Object();
- private final ServiceWatcher mServiceWatcher;
-
private final ILocationProviderManager.Stub mManager = new ILocationProviderManager.Stub() {
// executed on binder thread
@Override
+ public void onSetAdditionalProviderPackages(List<String> packageNames) {
+ LocationProviderProxy.this.onSetAdditionalProviderPackages(packageNames);
+ }
+
+ // executed on binder thread
+ @Override
public void onSetEnabled(boolean enabled) {
LocationProviderProxy.this.setEnabled(enabled);
}
@@ -73,6 +87,11 @@
}
};
+ private final ServiceWatcher mServiceWatcher;
+
+ @GuardedBy("mProviderPackagesLock")
+ private final CopyOnWriteArrayList<String> mProviderPackages = new CopyOnWriteArrayList<>();
+
@GuardedBy("mRequestLock")
@Nullable
private ProviderRequest mRequest;
@@ -101,7 +120,7 @@
private LocationProviderProxy(Context context, LocationProviderManager locationProviderManager,
String action, int overlaySwitchResId, int defaultServicePackageNameResId,
int initialPackageNamesResId) {
- super(locationProviderManager);
+ super(context, locationProviderManager);
mServiceWatcher = new ServiceWatcher(context, TAG, action, overlaySwitchResId,
defaultServicePackageNameResId, initialPackageNamesResId,
@@ -114,6 +133,7 @@
@Override
protected void onUnbind() {
+ resetProviderPackages(Collections.emptyList());
setEnabled(false);
setProperties(null);
}
@@ -131,6 +151,8 @@
ILocationProvider service = ILocationProvider.Stub.asInterface(binder);
if (D) Log.d(TAG, "applying state to connected service " + mServiceWatcher);
+ resetProviderPackages(Collections.emptyList());
+
service.setLocationProviderManager(mManager);
synchronized (mRequestLock) {
@@ -140,9 +162,11 @@
}
}
- @Nullable
- public String getConnectedPackageName() {
- return mServiceWatcher.getCurrentPackageName();
+ @Override
+ public List<String> getProviderPackages() {
+ synchronized (mProviderPackagesLock) {
+ return mProviderPackages;
+ }
}
@Override
@@ -193,4 +217,30 @@
service.sendExtraCommand(command, extras);
});
}
+
+ private void onSetAdditionalProviderPackages(List<String> packageNames) {
+ resetProviderPackages(packageNames);
+ }
+
+ private void resetProviderPackages(List<String> additionalPackageNames) {
+ ArrayList<String> permittedPackages = new ArrayList<>(additionalPackageNames.size());
+ for (String packageName : additionalPackageNames) {
+ try {
+ mContext.getPackageManager().getPackageInfo(packageName, MATCH_SYSTEM_ONLY);
+ permittedPackages.add(packageName);
+ } catch (PackageManager.NameNotFoundException e) {
+ Log.w(TAG, mServiceWatcher + " specified unknown additional provider package: "
+ + packageName);
+ }
+ }
+
+ synchronized (mProviderPackagesLock) {
+ mProviderPackages.clear();
+ String myPackage = mServiceWatcher.getCurrentPackageName();
+ if (myPackage != null) {
+ mProviderPackages.add(myPackage);
+ mProviderPackages.addAll(permittedPackages);
+ }
+ }
+ }
}
diff --git a/services/core/java/com/android/server/location/MockProvider.java b/services/core/java/com/android/server/location/MockProvider.java
index fe91c63..6accad8 100644
--- a/services/core/java/com/android/server/location/MockProvider.java
+++ b/services/core/java/com/android/server/location/MockProvider.java
@@ -17,6 +17,7 @@
package com.android.server.location;
import android.annotation.Nullable;
+import android.content.Context;
import android.location.Location;
import android.location.LocationProvider;
import android.os.Bundle;
@@ -41,9 +42,9 @@
private long mStatusUpdateTime;
private Bundle mExtras;
- public MockProvider(
+ public MockProvider(Context context,
LocationProviderManager locationProviderManager, ProviderProperties properties) {
- super(locationProviderManager);
+ super(context, locationProviderManager);
mEnabled = true;
mLocation = null;
diff --git a/services/core/java/com/android/server/location/PassiveProvider.java b/services/core/java/com/android/server/location/PassiveProvider.java
index 30260b2..3a841c9 100644
--- a/services/core/java/com/android/server/location/PassiveProvider.java
+++ b/services/core/java/com/android/server/location/PassiveProvider.java
@@ -16,6 +16,7 @@
package com.android.server.location;
+import android.content.Context;
import android.location.Criteria;
import android.location.Location;
import android.os.Bundle;
@@ -42,8 +43,8 @@
private boolean mReportLocation;
- public PassiveProvider(LocationProviderManager locationProviderManager) {
- super(locationProviderManager);
+ public PassiveProvider(Context context, LocationProviderManager locationProviderManager) {
+ super(context, locationProviderManager);
mReportLocation = false;
diff --git a/services/core/java/com/android/server/location/RemoteListenerHelper.java b/services/core/java/com/android/server/location/RemoteListenerHelper.java
index e69b2ec..f03c99b 100644
--- a/services/core/java/com/android/server/location/RemoteListenerHelper.java
+++ b/services/core/java/com/android/server/location/RemoteListenerHelper.java
@@ -71,10 +71,10 @@
return mIsRegistered;
}
- public boolean addListener(@NonNull TListener listener, int uid, String packageName) {
+ public boolean addListener(@NonNull TListener listener, CallerIdentity callerIdentity) {
Preconditions.checkNotNull(listener, "Attempted to register a 'null' listener.");
IBinder binder = listener.asBinder();
- LinkedListener deathListener = new LinkedListener(listener, uid, packageName);
+ LinkedListener deathListener = new LinkedListener(listener, callerIdentity);
synchronized (mListenerMap) {
if (mListenerMap.containsKey(binder)) {
// listener already added
@@ -137,7 +137,7 @@
protected abstract ListenerOperation<TListener> getHandlerOperation(int result);
protected interface ListenerOperation<TListener extends IInterface> {
- void execute(TListener listener, int uid, String packageName) throws RemoteException;
+ void execute(TListener listener, CallerIdentity callerIdentity) throws RemoteException;
}
protected void foreach(ListenerOperation<TListener> operation) {
@@ -177,9 +177,16 @@
}
}
- protected boolean hasPermission(int uid, String packageName) {
- return mAppOps.noteOpNoThrow(AppOpsManager.OP_FINE_LOCATION, uid, packageName)
- == AppOpsManager.MODE_ALLOWED;
+ protected boolean hasPermission(Context context, CallerIdentity callerIdentity) {
+ if (LocationPermissionUtil.doesCallerReportToAppOps(context, callerIdentity)) {
+ // The caller is identified as a location provider that will report location
+ // access to AppOps. Skip noteOp but do checkOp to check for location permission.
+ return mAppOps.checkOpNoThrow(AppOpsManager.OP_FINE_LOCATION, callerIdentity.mUid,
+ callerIdentity.mPackageName) == AppOpsManager.MODE_ALLOWED;
+ }
+
+ return mAppOps.noteOpNoThrow(AppOpsManager.OP_FINE_LOCATION, callerIdentity.mUid,
+ callerIdentity.mPackageName) == AppOpsManager.MODE_ALLOWED;
}
protected void logPermissionDisabledEventNotReported(String tag, String packageName,
@@ -254,13 +261,11 @@
private class LinkedListener implements IBinder.DeathRecipient {
private final TListener mListener;
- private final int mUid;
- private final String mPackageName;
+ private final CallerIdentity mCallerIdentity;
- LinkedListener(@NonNull TListener listener, int uid, String packageName) {
+ LinkedListener(@NonNull TListener listener, CallerIdentity callerIdentity) {
mListener = listener;
- mUid = uid;
- mPackageName = packageName;
+ mCallerIdentity = callerIdentity;
}
@Override
@@ -282,8 +287,7 @@
@Override
public void run() {
try {
- mOperation.execute(mLinkedListener.mListener, mLinkedListener.mUid,
- mLinkedListener.mPackageName);
+ mOperation.execute(mLinkedListener.mListener, mLinkedListener.mCallerIdentity);
} catch (RemoteException e) {
Log.v(mTag, "Error in monitored listener.", e);
}
diff --git a/services/core/java/com/android/server/media/MediaSessionServiceImpl.java b/services/core/java/com/android/server/media/MediaSessionServiceImpl.java
index 409060e..5c73178 100644
--- a/services/core/java/com/android/server/media/MediaSessionServiceImpl.java
+++ b/services/core/java/com/android/server/media/MediaSessionServiceImpl.java
@@ -42,6 +42,8 @@
import android.media.AudioSystem;
import android.media.IAudioService;
import android.media.IRemoteVolumeController;
+import android.media.MediaController2;
+import android.media.Session2CommandGroup;
import android.media.Session2Token;
import android.media.session.IActiveSessionsListener;
import android.media.session.ICallback;
@@ -57,6 +59,7 @@
import android.os.Binder;
import android.os.Bundle;
import android.os.Handler;
+import android.os.HandlerExecutor;
import android.os.IBinder;
import android.os.Message;
import android.os.PowerManager;
@@ -1011,50 +1014,17 @@
if (DEBUG) {
Log.d(TAG, "Session2 is created " + sessionToken);
}
- if (pid != sessionToken.getPid()) {
- throw new SecurityException("Unexpected Session2Token's PID, expected=" + pid
- + " but actually=" + sessionToken.getPid());
- }
if (uid != sessionToken.getUid()) {
throw new SecurityException("Unexpected Session2Token's UID, expected=" + uid
+ " but actually=" + sessionToken.getUid());
}
- int userId = UserHandle.getUserId(uid);
- List<Session2Token> session2Tokens = mSession2TokensPerUser.get(userId);
- if (session2Tokens.contains(sessionToken)) {
- if (DEBUG) {
- Log.d(TAG, "notifySession2Created(): Ignoring already existing token "
- + sessionToken);
- }
- return;
- }
- session2Tokens.add(sessionToken);
- pushSession2TokensChangedLocked(userId);
- } finally {
- Binder.restoreCallingIdentity(token);
- }
- }
-
- @Override
- public void notifySession2Destroyed(Session2Token sessionToken) throws RemoteException {
- final int pid = Binder.getCallingPid();
- final int uid = Binder.getCallingUid();
- final long token = Binder.clearCallingIdentity();
- try {
- if (DEBUG) {
- Log.d(TAG, "Session2 is destroyed " + sessionToken);
- }
- if (pid != sessionToken.getPid()) {
- throw new SecurityException("Unexpected Session2Token's PID, expected=" + pid
- + " but actually=" + sessionToken.getPid());
- }
- if (uid != sessionToken.getUid()) {
- throw new SecurityException("Unexpected Session2Token's UID, expected=" + uid
- + " but actually=" + sessionToken.getUid());
- }
- int userId = UserHandle.getUserId(uid);
- mSession2TokensPerUser.get(userId).remove(sessionToken);
- pushSession2TokensChangedLocked(userId);
+ Controller2Callback callback = new Controller2Callback(sessionToken);
+ // Note: It's safe not to keep controller here because it wouldn't be GC'ed until
+ // it's closed.
+ // TODO: Keep controller as well for better readability
+ // because the GC behavior isn't straightforward.
+ MediaController2 controller = new MediaController2(mContext, sessionToken,
+ new HandlerExecutor(mHandler), callback);
} finally {
Binder.restoreCallingIdentity(token);
}
@@ -2235,4 +2205,30 @@
obtainMessage(MSG_SESSIONS_CHANGED, userIdInteger).sendToTarget();
}
}
+
+ private class Controller2Callback extends MediaController2.ControllerCallback {
+ private final Session2Token mToken;
+
+ Controller2Callback(Session2Token token) {
+ mToken = token;
+ }
+
+ @Override
+ public void onConnected(MediaController2 controller, Session2CommandGroup allowedCommands) {
+ synchronized (mLock) {
+ int userId = UserHandle.getUserId(mToken.getUid());
+ mSession2TokensPerUser.get(userId).add(mToken);
+ pushSession2TokensChangedLocked(userId);
+ }
+ }
+
+ @Override
+ public void onDisconnected(MediaController2 controller) {
+ synchronized (mLock) {
+ int userId = UserHandle.getUserId(mToken.getUid());
+ mSession2TokensPerUser.get(userId).remove(mToken);
+ pushSession2TokensChangedLocked(userId);
+ }
+ }
+ }
}
diff --git a/services/core/java/com/android/server/media/MediaUpdateService.java b/services/core/java/com/android/server/media/MediaUpdateService.java
deleted file mode 100644
index 7304f07..0000000
--- a/services/core/java/com/android/server/media/MediaUpdateService.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * Copyright 2018 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.media;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.content.IntentFilter;
-import android.content.pm.ApplicationInfo;
-import android.content.pm.PackageManager;
-import android.media.IMediaUpdateService;
-import android.os.Build;
-import android.os.IBinder;
-import android.os.Handler;
-import android.os.PatternMatcher;
-import android.os.ServiceManager;
-import android.os.SystemProperties;
-import android.os.UserHandle;
-import android.text.TextUtils;
-import android.util.Log;
-import android.util.Slog;
-import com.android.server.SystemService;
-import java.util.HashMap;
-
-/** This class provides a system service that manages media framework updates. */
-public class MediaUpdateService extends SystemService {
- private static final String TAG = "MediaUpdateService";
- private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
- private static final String MEDIA_UPDATE_PACKAGE_NAME =
- SystemProperties.get("ro.mediacomponents.package");
- private static final String EXTRACTOR_UPDATE_SERVICE_NAME = "media.extractor.update";
- private static final String CODEC_UPDATE_SERVICE_NAME = "media.codec.update";
- private static final String[] UPDATE_SERVICE_NAME_ARRAY = {
- EXTRACTOR_UPDATE_SERVICE_NAME, CODEC_UPDATE_SERVICE_NAME,
- };
- private final HashMap<String, IMediaUpdateService> mUpdateServiceMap = new HashMap<>();
- private final Handler mHandler = new Handler();
-
- public MediaUpdateService(Context context) {
- super(context);
- }
-
- @Override
- public void onStart() {
- if (("userdebug".equals(android.os.Build.TYPE) || "eng".equals(android.os.Build.TYPE))
- && !TextUtils.isEmpty(MEDIA_UPDATE_PACKAGE_NAME)) {
- for (String serviceName : UPDATE_SERVICE_NAME_ARRAY) {
- connect(serviceName);
- }
- registerBroadcastReceiver();
- }
- }
-
- private void connect(final String serviceName) {
- IBinder binder = ServiceManager.getService(serviceName);
- if (binder != null) {
- try {
- binder.linkToDeath(new IBinder.DeathRecipient() {
- @Override
- public void binderDied() {
- Slog.w(TAG, "service " + serviceName + " died; reconnecting");
- synchronized (mUpdateServiceMap) {
- mUpdateServiceMap.remove(serviceName);
- }
- connect(serviceName);
- }
- }, 0);
- } catch (Exception e) {
- binder = null;
- }
- }
- if (binder != null) {
- synchronized (mUpdateServiceMap) {
- mUpdateServiceMap.put(serviceName,
- IMediaUpdateService.Stub.asInterface(binder));
- }
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- packageStateChanged(serviceName);
- }
- });
- } else {
- Slog.w(TAG, serviceName + " not found.");
- }
- }
-
- private void registerBroadcastReceiver() {
- BroadcastReceiver updateReceiver = new BroadcastReceiver() {
- @Override
- public void onReceive(Context context, Intent intent) {
- if (intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_SYSTEM)
- != UserHandle.USER_SYSTEM) {
- // Ignore broadcast for non system users. We don't want to update system
- // service multiple times.
- return;
- }
- switch (intent.getAction()) {
- case Intent.ACTION_PACKAGE_REMOVED:
- if (intent.getExtras().getBoolean(Intent.EXTRA_REPLACING)) {
- // The existing package is updated. Will be handled with the
- // following ACTION_PACKAGE_ADDED case.
- return;
- }
- // fall-thru
- case Intent.ACTION_PACKAGE_CHANGED:
- case Intent.ACTION_PACKAGE_ADDED:
- for (String serviceName : UPDATE_SERVICE_NAME_ARRAY) {
- packageStateChanged(serviceName);
- }
- break;
- }
- }
- };
- IntentFilter filter = new IntentFilter();
- filter.addAction(Intent.ACTION_PACKAGE_ADDED);
- filter.addAction(Intent.ACTION_PACKAGE_REMOVED);
- filter.addAction(Intent.ACTION_PACKAGE_CHANGED);
- filter.addDataScheme("package");
- filter.addDataSchemeSpecificPart(MEDIA_UPDATE_PACKAGE_NAME, PatternMatcher.PATTERN_LITERAL);
-
- getContext().registerReceiverAsUser(updateReceiver, UserHandle.ALL, filter,
- null /* broadcast permission */, null /* handler */);
- }
-
- private void packageStateChanged(String serviceName) {
- ApplicationInfo packageInfo = null;
- boolean pluginsAvailable = false;
- try {
- packageInfo = getContext().getPackageManager().getApplicationInfo(
- MEDIA_UPDATE_PACKAGE_NAME, PackageManager.MATCH_SYSTEM_ONLY);
- pluginsAvailable = packageInfo.enabled;
- } catch (Exception e) {
- Slog.v(TAG, "package '" + MEDIA_UPDATE_PACKAGE_NAME + "' not installed");
- }
- if (packageInfo != null && Build.VERSION.SDK_INT != packageInfo.targetSdkVersion) {
- Slog.w(TAG, "This update package is not for this platform version. Ignoring. "
- + "platform:" + Build.VERSION.SDK_INT
- + " targetSdk:" + packageInfo.targetSdkVersion);
- pluginsAvailable = false;
- }
- loadPlugins(serviceName,
- (packageInfo != null && pluginsAvailable) ? packageInfo.sourceDir : "");
- }
-
- private void loadPlugins(String serviceName, String apkPath) {
- try {
- IMediaUpdateService service = null;
- synchronized (serviceName) {
- service = mUpdateServiceMap.get(serviceName);
- }
- if (service != null) {
- service.loadPlugins(apkPath);
- } else {
- Slog.w(TAG, "service " + serviceName + " passed away");
- }
- } catch (Exception e) {
- Slog.w(TAG, "Error in loadPlugins for " + serviceName, e);
- }
- }
-}
diff --git a/services/core/java/com/android/server/pm/DumpState.java b/services/core/java/com/android/server/pm/DumpState.java
index fe81133..89895c5 100644
--- a/services/core/java/com/android/server/pm/DumpState.java
+++ b/services/core/java/com/android/server/pm/DumpState.java
@@ -41,6 +41,7 @@
public static final int DUMP_CHANGES = 1 << 22;
public static final int DUMP_VOLUMES = 1 << 23;
public static final int DUMP_SERVICE_PERMISSIONS = 1 << 24;
+ public static final int DUMP_APEX = 1 << 25;
public static final int OPTION_SHOW_FILTERS = 1 << 0;
public static final int OPTION_DUMP_ALL_COMPONENTS = 1 << 1;
diff --git a/services/core/java/com/android/server/pm/ModuleInfoProvider.java b/services/core/java/com/android/server/pm/ModuleInfoProvider.java
index 642bfa2..e7dace0 100644
--- a/services/core/java/com/android/server/pm/ModuleInfoProvider.java
+++ b/services/core/java/com/android/server/pm/ModuleInfoProvider.java
@@ -138,7 +138,7 @@
// to dealing with this as we'll now have to listen to all config changes and
// regenerate the data if required. Also, is this the right way to parse a resource
// reference out of an XML file ?
- final String moduleName = packageResources.getString(
+ final CharSequence moduleName = packageResources.getText(
Integer.parseInt(parser.getAttributeValue(null, "name").substring(1)));
final String modulePackageName = XmlUtils.readStringAttribute(parser,
"packageName");
diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index af50c87..21965e4 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -567,8 +567,8 @@
session = new PackageInstallerSession(mInternalCallback, mContext, mPm, this,
mInstallThread.getLooper(), mStagingManager, sessionId, userId,
installerPackageName, callingUid, params, createdMillis, stageDir, stageCid, false,
- false, null, SessionInfo.INVALID_ID, false, false, false, SessionInfo.NO_ERROR,
- "");
+ false, null, SessionInfo.INVALID_ID, false, false, false,
+ SessionInfo.STAGED_SESSION_NO_ERROR, "");
synchronized (mSessions) {
mSessions.put(sessionId, session);
diff --git a/services/core/java/com/android/server/pm/PackageInstallerSession.java b/services/core/java/com/android/server/pm/PackageInstallerSession.java
index dc6751c..d06fc51 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerSession.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerSession.java
@@ -267,7 +267,7 @@
@GuardedBy("mLock")
private boolean mStagedSessionFailed;
@GuardedBy("mLock")
- private int mStagedSessionErrorCode = SessionInfo.NO_ERROR;
+ private int mStagedSessionErrorCode = SessionInfo.STAGED_SESSION_NO_ERROR;
@GuardedBy("mLock")
private String mStagedSessionErrorMessage;
@@ -1001,10 +1001,6 @@
// cannot be modified anymore, there is no leak of information. For staged sessions,
// further validation is performed by the staging manager.
if (!params.isMultiPackage) {
- if ((params.installFlags & PackageManager.INSTALL_APEX) != 0) {
- // For APEX, validation is done by StagingManager post-commit.
- return;
- }
final PackageInfo pkgInfo = mPm.getPackageInfo(
params.appPackageName, PackageManager.GET_SIGNATURES
| PackageManager.MATCH_STATIC_SHARED_LIBRARIES /*flags*/, userId);
@@ -1012,7 +1008,11 @@
resolveStageDirLocked();
try {
- validateApkInstallLocked(pkgInfo);
+ if ((params.installFlags & PackageManager.INSTALL_APEX) != 0) {
+ validateApexInstallLocked();
+ } else {
+ validateApkInstallLocked(pkgInfo);
+ }
} catch (PackageManagerException e) {
throw e;
} catch (Throwable e) {
@@ -1304,6 +1304,27 @@
}
/**
+ * Validate apex install.
+ * <p>
+ * Sets {@link #mResolvedBaseFile} for RollbackManager to use.
+ */
+ @GuardedBy("mLock")
+ private void validateApexInstallLocked()
+ throws PackageManagerException {
+ final File[] addedFiles = mResolvedStageDir.listFiles(sAddedFilter);
+ if (ArrayUtils.isEmpty(addedFiles)) {
+ throw new PackageManagerException(INSTALL_FAILED_INVALID_APK, "No packages staged");
+ }
+
+ if (ArrayUtils.size(addedFiles) > 1) {
+ throw new PackageManagerException(INSTALL_FAILED_INVALID_APK,
+ "Too many files for apex install");
+ }
+
+ mResolvedBaseFile = addedFiles[0];
+ }
+
+ /**
* Validate install by confirming that all application packages are have
* consistent package name, version code, and signing certificates.
* <p>
@@ -1442,7 +1463,7 @@
}
if (mSigningDetails == PackageParser.SigningDetails.UNKNOWN) {
try {
- mSigningDetails = ApkSignatureVerifier.plsCertsNoVerifyOnlyCerts(
+ mSigningDetails = ApkSignatureVerifier.unsafeGetCertsWithoutVerification(
pkgInfo.applicationInfo.sourceDir,
PackageParser.SigningDetails.SignatureSchemeVersion.JAR);
} catch (PackageParserException e) {
@@ -1983,7 +2004,7 @@
mStagedSessionReady = true;
mStagedSessionApplied = false;
mStagedSessionFailed = false;
- mStagedSessionErrorCode = SessionInfo.NO_ERROR;
+ mStagedSessionErrorCode = SessionInfo.STAGED_SESSION_NO_ERROR;
mStagedSessionErrorMessage = "";
}
mCallback.onStagedSessionChanged(this);
@@ -2009,7 +2030,7 @@
mStagedSessionReady = false;
mStagedSessionApplied = true;
mStagedSessionFailed = false;
- mStagedSessionErrorCode = SessionInfo.NO_ERROR;
+ mStagedSessionErrorCode = SessionInfo.STAGED_SESSION_NO_ERROR;
mStagedSessionErrorMessage = "";
}
mCallback.onStagedSessionChanged(this);
@@ -2277,7 +2298,7 @@
final boolean isFailed = readBooleanAttribute(in, ATTR_IS_FAILED);
final boolean isApplied = readBooleanAttribute(in, ATTR_IS_APPLIED);
final int stagedSessionErrorCode = readIntAttribute(in, ATTR_STAGED_SESSION_ERROR_CODE,
- SessionInfo.NO_ERROR);
+ SessionInfo.STAGED_SESSION_NO_ERROR);
final String stagedSessionErrorMessage = readStringAttribute(in,
ATTR_STAGED_SESSION_ERROR_MESSAGE);
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index e370e6b..a0a2f6c 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -120,6 +120,7 @@
import android.annotation.Nullable;
import android.annotation.UserIdInt;
import android.apex.ApexInfo;
+import android.apex.ApexSessionInfo;
import android.apex.IApexService;
import android.app.ActivityManager;
import android.app.ActivityManagerInternal;
@@ -983,6 +984,9 @@
@GuardedBy("mPackages")
private CheckPermissionDelegate mCheckPermissionDelegate;
+ @GuardedBy("mPackages")
+ private PackageManagerInternal.DefaultBrowserProvider mDefaultBrowserProvider;
+
private class IntentVerifierProxy implements IntentFilterVerifier<ActivityIntentInfo> {
private Context mContext;
private ComponentName mIntentFilterVerifierComponent;
@@ -1926,7 +1930,7 @@
final PackageSetting pkgSetting = mSettings.mPackages.get(packageName);
if (pkgSetting.getInstallReason(userId)
!= PackageManager.INSTALL_REASON_DEVICE_RESTORE) {
- mSettings.setDefaultBrowserPackageNameLPw(null, userId);
+ setDefaultBrowserPackageName(null, userId);
}
}
@@ -2940,7 +2944,6 @@
if (!onlyCore && (mPromoteSystemApps || mFirstBoot)) {
for (UserInfo user : sUserManager.getUsers(true)) {
mSettings.applyDefaultPreferredAppsLPw(user.id);
- applyFactoryDefaultBrowserLPw(user.id);
primeDomainVerificationsLPw(user.id);
}
}
@@ -3013,8 +3016,6 @@
ver.fingerprint = Build.FINGERPRINT;
}
- checkDefaultBrowser();
-
// clear only after permissions and other defaults have been updated
mExistingSystemPackages.clear();
mPromoteSystemApps = false;
@@ -3046,7 +3047,6 @@
mSharedSystemSharedLibraryPackageName = getRequiredSharedLibraryLPr(
PackageManager.SYSTEM_SHARED_LIBRARY_SHARED,
SharedLibraryInfo.VERSION_UNDEFINED);
- mRequiredPermissionControllerPackage = getRequiredPermissionControllerLPr();
} else {
mRequiredVerifierPackage = null;
mRequiredInstallerPackage = null;
@@ -3055,8 +3055,10 @@
mIntentFilterVerifier = null;
mServicesSystemSharedLibraryPackageName = null;
mSharedSystemSharedLibraryPackageName = null;
- mRequiredPermissionControllerPackage = null;
}
+ // PermissionController hosts default permission granting and role management, so it's a
+ // critical part of the core system.
+ mRequiredPermissionControllerPackage = getRequiredPermissionControllerLPr();
// Initialize InstantAppRegistry's Instant App list for all users.
final int[] userIds = UserManagerService.getInstance().getUserIds();
@@ -3668,58 +3670,6 @@
scheduleWriteSettingsLocked();
}
- @GuardedBy("mPackages")
- private void applyFactoryDefaultBrowserLPw(int userId) {
- // The default browser app's package name is stored in a string resource,
- // with a product-specific overlay used for vendor customization.
- String browserPkg = mContext.getResources().getString(
- com.android.internal.R.string.default_browser);
- if (!TextUtils.isEmpty(browserPkg)) {
- // non-empty string => required to be a known package
- PackageSetting ps = mSettings.mPackages.get(browserPkg);
- if (ps == null) {
- Slog.e(TAG, "Product default browser app does not exist: " + browserPkg);
- browserPkg = null;
- } else {
- mSettings.setDefaultBrowserPackageNameLPw(browserPkg, userId);
- }
- }
-
- // Nothing valid explicitly set? Make the factory-installed browser the explicit
- // default. If there's more than one, just leave everything alone.
- if (browserPkg == null) {
- calculateDefaultBrowserLPw(userId);
- }
- }
-
- @GuardedBy("mPackages")
- private void calculateDefaultBrowserLPw(int userId) {
- List<String> allBrowsers = resolveAllBrowserApps(userId);
- final String browserPkg = (allBrowsers.size() == 1) ? allBrowsers.get(0) : null;
- mSettings.setDefaultBrowserPackageNameLPw(browserPkg, userId);
- }
-
- private List<String> resolveAllBrowserApps(int userId) {
- // Resolve the canonical browser intent and check that the handleAllWebDataURI boolean is set
- List<ResolveInfo> list = queryIntentActivitiesInternal(sBrowserIntent, null,
- PackageManager.MATCH_ALL, userId);
-
- final int count = list.size();
- List<String> result = new ArrayList<>(count);
- for (int i=0; i<count; i++) {
- ResolveInfo info = list.get(i);
- if (info.activityInfo == null
- || !info.handleAllWebDataURI
- || (info.activityInfo.applicationInfo.flags & ApplicationInfo.FLAG_SYSTEM) == 0
- || result.contains(info.activityInfo.packageName)) {
- continue;
- }
- result.add(info.activityInfo.packageName);
- }
-
- return result;
- }
-
private boolean packageIsBrowser(String packageName, int userId) {
List<ResolveInfo> list = queryIntentActivitiesInternal(sBrowserIntent, null,
PackageManager.MATCH_ALL, userId);
@@ -3733,20 +3683,6 @@
return false;
}
- private void checkDefaultBrowser() {
- final int myUserId = UserHandle.myUserId();
- final String packageName = getDefaultBrowserPackageName(myUserId);
- if (packageName != null) {
- PackageInfo info = getPackageInfo(packageName, 0, myUserId);
- if (info == null) {
- Slog.w(TAG, "Default browser no longer installed: " + packageName);
- synchronized (mPackages) {
- applyFactoryDefaultBrowserLPw(myUserId); // leaves ambiguous when > 1
- }
- }
- }
- }
-
@Override
public boolean onTransact(int code, Parcel data, Parcel reply, int flags)
throws RemoteException {
@@ -3967,6 +3903,7 @@
}
return generatePackageInfo(ps, flags, userId);
}
+ // TODO(b/123680735): support MATCH_APEX|MATCH_FACTORY_ONLY case
}
PackageParser.Package p = mPackages.get(packageName);
@@ -3996,6 +3933,30 @@
}
return generatePackageInfo(ps, flags, userId);
}
+ //
+ if (!matchFactoryOnly && (flags & MATCH_APEX) != 0) {
+ //TODO(b/123052859) Don't do file operations every time there is a query.
+ final IApexService apex = IApexService.Stub.asInterface(
+ ServiceManager.getService("apexservice"));
+ if (apex != null) {
+ try {
+ final ApexInfo activePkg = apex.getActivePackage(packageName);
+ if (activePkg != null) {
+ try {
+ return PackageParser.generatePackageInfoFromApex(
+ new File(activePkg.packagePath), true /* collect certs */);
+ } catch (PackageParserException pe) {
+ throw new IllegalStateException("Unable to parse: " + activePkg,
+ pe);
+ }
+ }
+ } catch (RemoteException e) {
+ Log.e(TAG, "Unable to retrieve packages from apexservice: " + e.toString());
+ }
+ } else {
+ Log.e(TAG, "Unable to connect to apexservice for querying packages.");
+ }
+ }
}
return null;
}
@@ -13618,15 +13579,28 @@
mContext.enforceCallingOrSelfPermission(
android.Manifest.permission.INTERACT_ACROSS_USERS_FULL, null);
}
-
- synchronized (mPackages) {
- boolean result = mSettings.setDefaultBrowserPackageNameLPw(packageName, userId);
- if (packageName != null) {
- mDefaultPermissionPolicy.grantDefaultPermissionsToDefaultBrowser(
- packageName, userId);
- }
- return result;
+ if (userId == UserHandle.USER_ALL) {
+ return false;
}
+ PackageManagerInternal.DefaultBrowserProvider provider;
+ synchronized (mPackages) {
+ provider = mDefaultBrowserProvider;
+ }
+ if (provider == null) {
+ Slog.e(TAG, "mDefaultBrowserProvider is null");
+ return false;
+ }
+ boolean successful = provider.setDefaultBrowser(packageName, userId);
+ if (!successful) {
+ return false;
+ }
+ if (packageName != null) {
+ synchronized (mPackages) {
+ mDefaultPermissionPolicy.grantDefaultPermissionsToDefaultBrowser(packageName,
+ userId);
+ }
+ }
+ return true;
}
@Override
@@ -13638,9 +13612,15 @@
if (getInstantAppPackageName(Binder.getCallingUid()) != null) {
return null;
}
+ PackageManagerInternal.DefaultBrowserProvider provider;
synchronized (mPackages) {
- return mSettings.getDefaultBrowserPackageNameLPw(userId);
+ provider = mDefaultBrowserProvider;
}
+ if (provider == null) {
+ Slog.e(TAG, "mDefaultBrowserProvider is null");
+ return null;
+ }
+ return provider.getDefaultBrowser(userId);
}
/**
@@ -19392,7 +19372,7 @@
// significant refactoring to keep all default apps in the package
// manager (cleaner but more work) or have the services provide
// callbacks to the package manager to request a default app reset.
- applyFactoryDefaultBrowserLPw(userId);
+ setDefaultBrowserPackageName(null, userId);
clearIntentFilterVerificationsLPw(userId);
primeDomainVerificationsLPw(userId);
resetUserChangesToRuntimePermissionsAndFlagsLPw(userId);
@@ -20103,7 +20083,8 @@
return mContext.getString(R.string.config_defaultWellbeingPackage);
}
- private String getAppPredictionServicePackageName() {
+ @Override
+ public String getAppPredictionServicePackageName() {
String flattenedAppPredictionServiceComponentName =
mContext.getString(R.string.config_defaultAppPredictionService);
if (flattenedAppPredictionServiceComponentName == null) {
@@ -20832,6 +20813,7 @@
pw.println(" -h: print this help");
pw.println(" --all-components: include all component names in package dump");
pw.println(" cmd may be one of:");
+ pw.println(" apex: list active APEXes and APEX session state");
pw.println(" l[ibraries]: list known shared libraries");
pw.println(" f[eatures]: list device features");
pw.println(" k[eysets]: print known keysets");
@@ -21360,6 +21342,54 @@
if (dumpState.onTitlePrinted()) pw.println();
mInstallerService.dump(new IndentingPrintWriter(pw, " ", 120));
}
+
+ if (!checkin && dumpState.isDumping(DumpState.DUMP_APEX)) {
+ final IndentingPrintWriter ipw = new IndentingPrintWriter(pw, " ", 120);
+ ipw.println();
+ ipw.println("Active APEX packages:");
+ ipw.increaseIndent();
+ final IApexService apex = IApexService.Stub.asInterface(
+ ServiceManager.getService("apexservice"));
+ try {
+ final ApexInfo[] activeApexes = apex.getActivePackages();
+ for (ApexInfo ai : activeApexes) {
+ if (packageName != null && !packageName.equals(ai.packageName)) {
+ continue;
+ }
+ ipw.println(ai.packageName);
+ ipw.increaseIndent();
+ ipw.println("Version: " + Long.toString(ai.versionCode));
+ ipw.println("Path: " + ai.packagePath);
+ ipw.decreaseIndent();
+ }
+ ipw.decreaseIndent();
+ ipw.println();
+ ipw.println("APEX session state:");
+ ipw.increaseIndent();
+ final ApexSessionInfo[] sessions = apex.getSessions();
+ for (ApexSessionInfo si : sessions) {
+ ipw.println("Session ID: " + Integer.toString(si.sessionId));
+ ipw.increaseIndent();
+ if (si.isUnknown) {
+ ipw.println("State: UNKNOWN");
+ } else if (si.isVerified) {
+ ipw.println("State: VERIFIED");
+ } else if (si.isStaged) {
+ ipw.println("State: STAGED");
+ } else if (si.isActivated) {
+ ipw.println("State: ACTIVATED");
+ } else if (si.isActivationPendingRetry) {
+ ipw.println("State: ACTIVATION PENDING RETRY");
+ } else if (si.isActivationFailed) {
+ ipw.println("State: ACTIVATION FAILED");
+ }
+ ipw.decreaseIndent();
+ }
+ ipw.decreaseIndent();
+ } catch (RemoteException e) {
+ ipw.println("Couldn't communicate with apexd.");
+ }
+ }
}
//TODO: b/111402650
@@ -22684,7 +22714,6 @@
synchronized (mPackages) {
scheduleWritePackageRestrictionsLocked(userId);
scheduleWritePackageListLocked(userId);
- applyFactoryDefaultBrowserLPw(userId);
primeDomainVerificationsLPw(userId);
}
}
@@ -23309,6 +23338,8 @@
return mConfiguratorPackage;
case PackageManagerInternal.PACKAGE_INCIDENT_REPORT_APPROVER:
return mIncidentReportApproverPackage;
+ case PackageManagerInternal.PACKAGE_APP_PREDICTOR:
+ return mAppPredictionServicePackage;
}
return null;
}
@@ -23880,6 +23911,21 @@
public void finishPackageInstall(int token, boolean didLaunch) {
PackageManagerService.this.finishPackageInstall(token, didLaunch);
}
+
+ @Nullable
+ @Override
+ public String removeLegacyDefaultBrowserPackageName(int userId) {
+ synchronized (mPackages) {
+ return mSettings.removeDefaultBrowserPackageNameLPw(userId);
+ }
+ }
+
+ @Override
+ public void setDefaultBrowserProvider(@NonNull DefaultBrowserProvider provider) {
+ synchronized (mPackages) {
+ mDefaultBrowserProvider = provider;
+ }
+ }
}
@GuardedBy("mPackages")
diff --git a/services/core/java/com/android/server/pm/Settings.java b/services/core/java/com/android/server/pm/Settings.java
index b0f2326..975ffb2 100644
--- a/services/core/java/com/android/server/pm/Settings.java
+++ b/services/core/java/com/android/server/pm/Settings.java
@@ -1327,21 +1327,8 @@
return result;
}
- boolean setDefaultBrowserPackageNameLPw(String packageName, int userId) {
- if (userId == UserHandle.USER_ALL) {
- return false;
- }
- if (packageName != null) {
- mDefaultBrowserApp.put(userId, packageName);
- } else {
- mDefaultBrowserApp.remove(userId);
- }
- writePackageRestrictionsLPr(userId);
- return true;
- }
-
- String getDefaultBrowserPackageNameLPw(int userId) {
- return (userId == UserHandle.USER_ALL) ? null : mDefaultBrowserApp.get(userId);
+ String removeDefaultBrowserPackageNameLPw(int userId) {
+ return (userId == UserHandle.USER_ALL) ? null : mDefaultBrowserApp.removeReturnOld(userId);
}
boolean setDefaultDialerPackageNameLPw(String packageName, int userId) {
diff --git a/services/core/java/com/android/server/pm/StagingManager.java b/services/core/java/com/android/server/pm/StagingManager.java
index 84fd01a..0371663 100644
--- a/services/core/java/com/android/server/pm/StagingManager.java
+++ b/services/core/java/com/android/server/pm/StagingManager.java
@@ -215,7 +215,7 @@
if (!success) {
session.setStagedSessionFailed(
- SessionInfo.VERIFICATION_FAILED,
+ SessionInfo.STAGED_SESSION_VERIFICATION_FAILED,
"APEX staging failed, check logcat messages from apexd for more details.");
}
@@ -227,7 +227,7 @@
for (ApexInfo apexPackage : apexInfoList.apexInfos) {
if (!validateApexSignature(apexPackage.packagePath,
apexPackage.packageName)) {
- session.setStagedSessionFailed(SessionInfo.VERIFICATION_FAILED,
+ session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED,
"APK-container signature verification failed for package "
+ apexPackage.packageName + ". Signature of file "
+ apexPackage.packagePath + " does not match the signature of "
@@ -240,7 +240,7 @@
session.setStagedSessionReady();
if (!sendMarkStagedSessionReadyRequest(session.sessionId)) {
- session.setStagedSessionFailed(SessionInfo.VERIFICATION_FAILED,
+ session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_VERIFICATION_FAILED,
"APEX staging failed, check logcat messages from apexd for more "
+ "details.");
}
@@ -276,7 +276,7 @@
return;
}
if (apexSessionInfo.isActivationFailed || apexSessionInfo.isUnknown) {
- session.setStagedSessionFailed(SessionInfo.ACTIVATION_FAILED,
+ session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_ACTIVATION_FAILED,
"APEX activation failed. Check logcat messages from apexd for "
+ "more information.");
return;
@@ -301,8 +301,9 @@
}
// The APEX part of the session is activated, proceed with the installation of APKs.
if (!installApksInSession(session)) {
- session.setStagedSessionFailed(SessionInfo.ACTIVATION_FAILED,
- "APK installation for staged session " + session.sessionId + " failed.");
+ session.setStagedSessionFailed(SessionInfo.STAGED_SESSION_ACTIVATION_FAILED,
+ "APEX activation failed. Check logcat messages from apexd for "
+ + "more information.");
return;
}
session.setStagedSessionApplied();
diff --git a/services/core/java/com/android/server/pm/permission/BasePermission.java b/services/core/java/com/android/server/pm/permission/BasePermission.java
index 848cee0..173d9a0 100644
--- a/services/core/java/com/android/server/pm/permission/BasePermission.java
+++ b/services/core/java/com/android/server/pm/permission/BasePermission.java
@@ -254,6 +254,9 @@
public boolean isIncidentReportApprover() {
return (protectionLevel & PermissionInfo.PROTECTION_FLAG_INCIDENT_REPORT_APPROVER) != 0;
}
+ public boolean isAppPredictor() {
+ return (protectionLevel & PermissionInfo.PROTECTION_FLAG_APP_PREDICTOR) != 0;
+ }
public void transfer(@NonNull String origPackageName, @NonNull String newPackageName) {
if (!origPackageName.equals(sourcePackageName)) {
diff --git a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
index 22780e6..a4413f9 100644
--- a/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
+++ b/services/core/java/com/android/server/pm/permission/PermissionManagerService.java
@@ -1724,6 +1724,12 @@
// this app is the incident report approver, then it gets the permission.
allowed = true;
}
+ if (!allowed && bp.isAppPredictor()
+ && pkg.packageName.equals(mPackageManagerInt.getKnownPackageName(
+ PackageManagerInternal.PACKAGE_APP_PREDICTOR, UserHandle.USER_SYSTEM))) {
+ // Special permissions for the system app predictor.
+ allowed = true;
+ }
}
return allowed;
}
diff --git a/services/core/java/com/android/server/policy/role/LegacyRoleResolutionPolicy.java b/services/core/java/com/android/server/policy/role/LegacyRoleResolutionPolicy.java
index bfe7725..e7de8dd 100644
--- a/services/core/java/com/android/server/policy/role/LegacyRoleResolutionPolicy.java
+++ b/services/core/java/com/android/server/policy/role/LegacyRoleResolutionPolicy.java
@@ -20,6 +20,7 @@
import android.app.role.RoleManager;
import android.content.ComponentName;
import android.content.Context;
+import android.content.pm.PackageManagerInternal;
import android.os.Debug;
import android.provider.Settings;
import android.telecom.TelecomManager;
@@ -29,6 +30,7 @@
import com.android.internal.telephony.SmsApplication;
import com.android.internal.util.CollectionUtils;
+import com.android.server.LocalServices;
import com.android.server.role.RoleManagerService;
import java.util.Collection;
@@ -113,6 +115,13 @@
? setting
: mContext.getSystemService(TelecomManager.class).getSystemDialerPackage());
}
+ case RoleManager.ROLE_BROWSER: {
+ PackageManagerInternal packageManagerInternal = LocalServices.getService(
+ PackageManagerInternal.class);
+ String packageName = packageManagerInternal.removeLegacyDefaultBrowserPackageName(
+ userId);
+ return CollectionUtils.singletonOrEmpty(packageName);
+ }
default: {
Slog.e(LOG_TAG, "Don't know how to find legacy role holders for " + roleName);
return Collections.emptyList();
diff --git a/services/core/java/com/android/server/power/batterysaver/BatterySaverPolicy.java b/services/core/java/com/android/server/power/batterysaver/BatterySaverPolicy.java
index 8550bc3..1d74e1f 100644
--- a/services/core/java/com/android/server/power/batterysaver/BatterySaverPolicy.java
+++ b/services/core/java/com/android/server/power/batterysaver/BatterySaverPolicy.java
@@ -104,7 +104,6 @@
private static final String KEY_AOD_DISABLED = "aod_disabled";
// Go into deep Doze as soon as the screen turns off.
private static final String KEY_QUICK_DOZE_ENABLED = "quick_doze_enabled";
- private static final String KEY_SEND_TRON_LOG = "send_tron_log";
private static final String KEY_CPU_FREQ_INTERACTIVE = "cpufreq-i";
private static final String KEY_CPU_FREQ_NONINTERACTIVE = "cpufreq-n";
@@ -129,8 +128,7 @@
new ArrayMap<>(), /* filesForNoninteractive */
false, /* forceAllAppsStandby */
false, /* forceBackgroundCheck */
- PowerManager.LOCATION_MODE_NO_CHANGE, /* gpsMode */
- false /* sendTronLog */
+ PowerManager.LOCATION_MODE_NO_CHANGE /* gpsMode */
);
private static final Policy DEFAULT_ADAPTIVE_POLICY = OFF_POLICY;
@@ -154,8 +152,7 @@
new ArrayMap<>(), /* filesForNoninteractive */
true, /* forceAllAppsStandby */
true, /* forceBackgroundCheck */
- PowerManager.LOCATION_MODE_ALL_DISABLED_WHEN_SCREEN_OFF, /* gpsMode */
- false /* sendTronLog */
+ PowerManager.LOCATION_MODE_ALL_DISABLED_WHEN_SCREEN_OFF /* gpsMode */
);
private final Object mLock;
@@ -418,13 +415,10 @@
if (currPolicy.disableOptionalSensors) sb.append("S");
if (currPolicy.disableAod) sb.append("o");
if (currPolicy.enableQuickDoze) sb.append("q");
- if (currPolicy.sendTronLog) sb.append("t");
sb.append(currPolicy.gpsMode);
mEventLogKeys = sb.toString();
-
- mBatterySavingStats.setSendTronLog(currPolicy.sendTronLog);
}
static class Policy {
@@ -567,11 +561,6 @@
*/
public final int gpsMode;
- /**
- * Whether BatterySavingStats should send tron events.
- */
- public final boolean sendTronLog;
-
private final int mHashCode;
Policy(
@@ -593,8 +582,7 @@
ArrayMap<String, String> filesForNoninteractive,
boolean forceAllAppsStandby,
boolean forceBackgroundCheck,
- int gpsMode,
- boolean sendTronLog) {
+ int gpsMode) {
this.adjustBrightnessFactor = adjustBrightnessFactor;
this.advertiseIsEnabled = advertiseIsEnabled;
@@ -615,7 +603,6 @@
this.forceAllAppsStandby = forceAllAppsStandby;
this.forceBackgroundCheck = forceBackgroundCheck;
this.gpsMode = gpsMode;
- this.sendTronLog = sendTronLog;
mHashCode = Objects.hash(
adjustBrightnessFactor,
@@ -636,8 +623,7 @@
filesForNoninteractive,
forceAllAppsStandby,
forceBackgroundCheck,
- gpsMode,
- sendTronLog);
+ gpsMode);
}
static Policy fromConfig(BatterySaverPolicyConfig config) {
@@ -674,8 +660,7 @@
(new CpuFrequencies()).parseString(cpuFreqNoninteractive).toSysFileMap(),
config.getForceAllAppsStandby(),
config.getForceBackgroundCheck(),
- config.getGpsMode(),
- OFF_POLICY.sendTronLog
+ config.getGpsMode()
);
}
@@ -737,7 +722,6 @@
boolean forceBackgroundCheck = parser.getBoolean(KEY_FORCE_BACKGROUND_CHECK,
defaultPolicy.forceBackgroundCheck);
int gpsMode = parser.getInt(KEY_GPS_MODE, defaultPolicy.gpsMode);
- boolean sendTronLog = parser.getBoolean(KEY_SEND_TRON_LOG, defaultPolicy.sendTronLog);
return new Policy(
adjustBrightnessFactor,
@@ -761,8 +745,7 @@
(new CpuFrequencies()).parseString(cpuFreqNoninteractive).toSysFileMap(),
forceAllAppsStandby,
forceBackgroundCheck,
- gpsMode,
- sendTronLog
+ gpsMode
);
}
@@ -788,7 +771,6 @@
&& forceAllAppsStandby == other.forceAllAppsStandby
&& forceBackgroundCheck == other.forceBackgroundCheck
&& gpsMode == other.gpsMode
- && sendTronLog == other.sendTronLog
&& filesForInteractive.equals(other.filesForInteractive)
&& filesForNoninteractive.equals(other.filesForNoninteractive);
}
@@ -1026,9 +1008,6 @@
pw.println(" " + KEY_SOUNDTRIGGER_DISABLED + "=" + p.disableSoundTrigger);
pw.print(indent);
pw.println(" " + KEY_QUICK_DOZE_ENABLED + "=" + p.enableQuickDoze);
- pw.print(indent);
- pw.println(" " + KEY_SEND_TRON_LOG + "=" + p.sendTronLog);
- pw.println();
pw.print(" Interactive File values:\n");
dumpMap(pw, " ", p.filesForInteractive);
diff --git a/services/core/java/com/android/server/power/batterysaver/BatterySavingStats.java b/services/core/java/com/android/server/power/batterysaver/BatterySavingStats.java
index 1d30a03..3dbc007 100644
--- a/services/core/java/com/android/server/power/batterysaver/BatterySavingStats.java
+++ b/services/core/java/com/android/server/power/batterysaver/BatterySavingStats.java
@@ -15,7 +15,6 @@
*/
package com.android.server.power.batterysaver;
-import android.metrics.LogMaker;
import android.os.BatteryManagerInternal;
import android.os.SystemClock;
import android.util.ArrayMap;
@@ -24,9 +23,6 @@
import com.android.internal.annotations.GuardedBy;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.server.EventLogTags;
import com.android.server.LocalServices;
@@ -142,7 +138,6 @@
}
private BatteryManagerInternal mBatteryManagerInternal;
- private final MetricsLogger mMetricsLogger;
private static final int STATE_NOT_INITIALIZED = -1;
private static final int STATE_CHARGING = -2;
@@ -172,28 +167,11 @@
@GuardedBy("mLock")
private long mLastBatterySaverDisabledTime = 0;
- private final MetricsLoggerHelper mMetricsLoggerHelper = new MetricsLoggerHelper();
-
- @VisibleForTesting
- @GuardedBy("mLock")
- private boolean mSendTronLog;
-
/** Visible for unit tests */
@VisibleForTesting
- public BatterySavingStats(Object lock, MetricsLogger metricsLogger) {
+ public BatterySavingStats(Object lock) {
mLock = lock;
mBatteryManagerInternal = LocalServices.getService(BatteryManagerInternal.class);
- mMetricsLogger = metricsLogger;
- }
-
- public BatterySavingStats(Object lock) {
- this(lock, new MetricsLogger());
- }
-
- public void setSendTronLog(boolean send) {
- synchronized (mLock) {
- mSendTronLog = send;
- }
}
private BatteryManagerInternal getBatteryManagerInternal() {
@@ -325,7 +303,6 @@
endLastStateLocked(now, batteryLevel, batteryPercent);
startNewStateLocked(newState, now, batteryLevel, batteryPercent);
- mMetricsLoggerHelper.transitionStateLocked(newState, now, batteryLevel, batteryPercent);
}
@GuardedBy("mLock")
@@ -472,61 +449,4 @@
onStat.totalBatteryDrainPercent,
onStat.drainPerHour() / 1000.0));
}
-
- @VisibleForTesting
- class MetricsLoggerHelper {
- private int mLastState = STATE_NOT_INITIALIZED;
- private long mStartTime;
- private int mStartBatteryLevel;
- private int mStartPercent;
-
- private static final int STATE_CHANGE_DETECT_MASK =
- (BatterySaverState.MASK << BatterySaverState.SHIFT) |
- (InteractiveState.MASK << InteractiveState.SHIFT);
-
- @GuardedBy("BatterySavingStats.this.mLock")
- public void transitionStateLocked(
- int newState, long now, int batteryLevel, int batteryPercent) {
- final boolean stateChanging =
- ((mLastState >= 0) ^ (newState >= 0)) ||
- (((mLastState ^ newState) & STATE_CHANGE_DETECT_MASK) != 0);
- if (stateChanging) {
- if (mLastState >= 0) {
- final long deltaTime = now - mStartTime;
-
- reportLocked(mLastState, deltaTime, mStartBatteryLevel, mStartPercent,
- batteryLevel, batteryPercent);
- }
- mStartTime = now;
- mStartBatteryLevel = batteryLevel;
- mStartPercent = batteryPercent;
- }
- mLastState = newState;
- }
-
- @GuardedBy("BatterySavingStats.this.mLock")
- void reportLocked(int state, long deltaTimeMs,
- int startBatteryLevelUa, int startBatteryLevelPercent,
- int endBatteryLevelUa, int endBatteryLevelPercent) {
- if (!mSendTronLog) {
- return;
- }
- final boolean batterySaverOn =
- BatterySaverState.fromIndex(state) != BatterySaverState.OFF;
- final boolean interactive =
- InteractiveState.fromIndex(state) != InteractiveState.NON_INTERACTIVE;
-
- final LogMaker logMaker = new LogMaker(MetricsProto.MetricsEvent.BATTERY_SAVER)
- .setSubtype(batterySaverOn ? 1 : 0)
- .addTaggedData(MetricsEvent.FIELD_INTERACTIVE, interactive ? 1 : 0)
- .addTaggedData(MetricsEvent.FIELD_DURATION_MILLIS, deltaTimeMs)
- .addTaggedData(MetricsEvent.FIELD_START_BATTERY_UA, startBatteryLevelUa)
- .addTaggedData(MetricsEvent.FIELD_START_BATTERY_PERCENT,
- startBatteryLevelPercent)
- .addTaggedData(MetricsEvent.FIELD_END_BATTERY_UA, endBatteryLevelUa)
- .addTaggedData(MetricsEvent.FIELD_END_BATTERY_PERCENT, endBatteryLevelPercent);
-
- mMetricsLogger.write(logMaker);
- }
- }
}
diff --git a/services/core/java/com/android/server/role/RoleManagerServiceInternal.java b/services/core/java/com/android/server/role/RoleManagerInternal.java
similarity index 71%
rename from services/core/java/com/android/server/role/RoleManagerServiceInternal.java
rename to services/core/java/com/android/server/role/RoleManagerInternal.java
index 3afc3f7..7598bf7 100644
--- a/services/core/java/com/android/server/role/RoleManagerServiceInternal.java
+++ b/services/core/java/com/android/server/role/RoleManagerInternal.java
@@ -17,22 +17,23 @@
package com.android.server.role;
import android.annotation.NonNull;
-import android.os.UserHandle;
+import android.annotation.UserIdInt;
import android.util.ArrayMap;
import android.util.ArraySet;
/**
- * Internal calls into {@link RoleManagerService}
+ * Internal calls into {@link RoleManagerService}.
*/
-public abstract class RoleManagerServiceInternal {
+public abstract class RoleManagerInternal {
+
/**
- * Get all roles and packages hold them.
+ * Get all roles and their holders.
*
- * @param user The user to query to roles for
+ * @param userId The user to query to roles for
*
* @return The roles and their holders
*/
@NonNull
- public abstract ArrayMap<String, ArraySet<String>> getRoleHoldersAsUser(
- @NonNull UserHandle user);
+ public abstract ArrayMap<String, ArraySet<String>> getRolesAndHolders(
+ @UserIdInt int userId);
}
diff --git a/services/core/java/com/android/server/role/RoleManagerService.java b/services/core/java/com/android/server/role/RoleManagerService.java
index d72270e..c464dad 100644
--- a/services/core/java/com/android/server/role/RoleManagerService.java
+++ b/services/core/java/com/android/server/role/RoleManagerService.java
@@ -146,8 +146,11 @@
mUserManagerInternal = LocalServices.getService(UserManagerInternal.class);
mAppOpsManager = context.getSystemService(AppOpsManager.class);
- LocalServices.addService(RoleManagerServiceInternal.class,
- new RoleManagerServiceInternalImpl());
+ LocalServices.addService(RoleManagerInternal.class, new Internal());
+
+ PackageManagerInternal packageManagerInternal = LocalServices.getService(
+ PackageManagerInternal.class);
+ packageManagerInternal.setDefaultBrowserProvider(new DefaultBrowserProvider());
registerUserRemovedReceiver();
}
@@ -360,10 +363,10 @@
notifyRoleHoldersChangedForListeners(listeners, roleName, userId);
}
- RemoteCallbackList<IOnRoleHoldersChangedListener> allUserListeners = getListeners(
+ RemoteCallbackList<IOnRoleHoldersChangedListener> allUsersListeners = getListeners(
UserHandle.USER_ALL);
- if (allUserListeners != null) {
- notifyRoleHoldersChangedForListeners(allUserListeners, roleName, userId);
+ if (allUsersListeners != null) {
+ notifyRoleHoldersChangedForListeners(allUsersListeners, roleName, userId);
}
}
@@ -386,19 +389,6 @@
}
}
- /**
- * Get all roles and packages hold them.
- *
- * @param user The user to query to roles for
- *
- * @return The roles and their holders
- */
- @NonNull
- private ArrayMap<String, ArraySet<String>> getRoleHoldersAsUser(@NonNull UserHandle user) {
- RoleUserState userState = getOrCreateUserState(user.getIdentifier());
- return userState.getRoleHolders();
- }
-
private class Stub extends IRoleManager.Stub {
@Override
@@ -406,8 +396,7 @@
Preconditions.checkStringNotEmpty(roleName, "roleName cannot be null or empty");
int userId = UserHandle.getUserId(getCallingUid());
- RoleUserState userState = getOrCreateUserState(userId);
- return userState.isRoleAvailable(roleName);
+ return getOrCreateUserState(userId).isRoleAvailable(roleName);
}
@Override
@@ -418,7 +407,7 @@
mAppOpsManager.checkPackage(callingUid, packageName);
int userId = UserHandle.getUserId(callingUid);
- ArraySet<String> roleHolders = getRoleHoldersInternal(roleName, userId);
+ ArraySet<String> roleHolders = getOrCreateUserState(userId).getRoleHolders(roleName);
if (roleHolders == null) {
return false;
}
@@ -433,24 +422,17 @@
Slog.e(LOG_TAG, "user " + userId + " does not exist");
return Collections.emptyList();
}
- userId = handleIncomingUser(userId, "getRoleHoldersAsUser", false);
+ userId = handleIncomingUser(userId, false, "getRoleHoldersAsUser");
getContext().enforceCallingOrSelfPermission(Manifest.permission.MANAGE_ROLE_HOLDERS,
"getRoleHoldersAsUser");
- ArraySet<String> roleHolders = getRoleHoldersInternal(roleName, userId);
+ ArraySet<String> roleHolders = getOrCreateUserState(userId).getRoleHolders(roleName);
if (roleHolders == null) {
return Collections.emptyList();
}
return new ArrayList<>(roleHolders);
}
- @Nullable
- private ArraySet<String> getRoleHoldersInternal(@NonNull String roleName,
- @UserIdInt int userId) {
- RoleUserState userState = getOrCreateUserState(userId);
- return userState.getRoleHolders(roleName);
- }
-
@Override
public void addRoleHolderAsUser(@NonNull String roleName, @NonNull String packageName,
@UserIdInt int userId, @NonNull IRoleManagerCallback callback) {
@@ -461,7 +443,7 @@
Slog.e(LOG_TAG, "user " + userId + " does not exist");
return;
}
- userId = handleIncomingUser(userId, "addRoleHolderAsUser", false);
+ userId = handleIncomingUser(userId, false, "addRoleHolderAsUser");
getContext().enforceCallingOrSelfPermission(Manifest.permission.MANAGE_ROLE_HOLDERS,
"addRoleHolderAsUser");
@@ -478,7 +460,7 @@
Slog.e(LOG_TAG, "user " + userId + " does not exist");
return;
}
- userId = handleIncomingUser(userId, "removeRoleHolderAsUser", false);
+ userId = handleIncomingUser(userId, false, "removeRoleHolderAsUser");
getContext().enforceCallingOrSelfPermission(Manifest.permission.MANAGE_ROLE_HOLDERS,
"removeRoleHolderAsUser");
@@ -495,7 +477,7 @@
Slog.e(LOG_TAG, "user " + userId + " does not exist");
return;
}
- userId = handleIncomingUser(userId, "clearRoleHoldersAsUser", false);
+ userId = handleIncomingUser(userId, false, "clearRoleHoldersAsUser");
getContext().enforceCallingOrSelfPermission(Manifest.permission.MANAGE_ROLE_HOLDERS,
"clearRoleHoldersAsUser");
@@ -510,8 +492,7 @@
Slog.e(LOG_TAG, "user " + userId + " does not exist");
return;
}
- userId = handleIncomingUser(userId, "addOnRoleHoldersChangedListenerAsUser",
- true);
+ userId = handleIncomingUser(userId, true, "addOnRoleHoldersChangedListenerAsUser");
getContext().enforceCallingOrSelfPermission(Manifest.permission.OBSERVE_ROLE_HOLDERS,
"addOnRoleHoldersChangedListenerAsUser");
@@ -528,8 +509,7 @@
Slog.e(LOG_TAG, "user " + userId + " does not exist");
return;
}
- userId = handleIncomingUser(userId, "removeOnRoleHoldersChangedListenerAsUser",
- true);
+ userId = handleIncomingUser(userId, true, "removeOnRoleHoldersChangedListenerAsUser");
getContext().enforceCallingOrSelfPermission(Manifest.permission.OBSERVE_ROLE_HOLDERS,
"removeOnRoleHoldersChangedListenerAsUser");
@@ -548,8 +528,7 @@
"setRoleNamesFromController");
int userId = UserHandle.getCallingUserId();
- RoleUserState userState = getOrCreateUserState(userId);
- userState.setRoleNames(roleNames);
+ getOrCreateUserState(userId).setRoleNames(roleNames);
}
@Override
@@ -562,8 +541,7 @@
"addRoleHolderFromController");
int userId = UserHandle.getCallingUserId();
- RoleUserState userState = getOrCreateUserState(userId);
- return userState.addRoleHolder(roleName, packageName);
+ return getOrCreateUserState(userId).addRoleHolder(roleName, packageName);
}
@Override
@@ -576,8 +554,7 @@
"removeRoleHolderFromController");
int userId = UserHandle.getCallingUserId();
- RoleUserState userState = getOrCreateUserState(userId);
- return userState.removeRoleHolder(roleName, packageName);
+ return getOrCreateUserState(userId).removeRoleHolder(roleName, packageName);
}
@Override
@@ -588,13 +565,12 @@
"getRolesHeldFromController");
int userId = UserHandle.getCallingUserId();
- RoleUserState userState = getOrCreateUserState(userId);
- return userState.getHeldRoles(packageName);
+ return getOrCreateUserState(userId).getHeldRoles(packageName);
}
@CheckResult
- private int handleIncomingUser(@UserIdInt int userId, @NonNull String name,
- boolean allowAll) {
+ private int handleIncomingUser(@UserIdInt int userId, boolean allowAll,
+ @NonNull String name) {
return ActivityManager.handleIncomingUser(getCallingPid(), getCallingUid(), userId,
allowAll, true, name, null);
}
@@ -694,15 +670,51 @@
}
}
- /**
- * Entry point for internal calls into role manager
- */
- private final class RoleManagerServiceInternalImpl extends RoleManagerServiceInternal {
+ private class Internal extends RoleManagerInternal {
@NonNull
@Override
- public ArrayMap<String, ArraySet<String>> getRoleHoldersAsUser(@NonNull UserHandle user) {
- return RoleManagerService.this.getRoleHoldersAsUser(user);
+ public ArrayMap<String, ArraySet<String>> getRolesAndHolders(@UserIdInt int userId) {
+ return getOrCreateUserState(userId).getRolesAndHolders();
+ }
+ }
+
+ private class DefaultBrowserProvider implements PackageManagerInternal.DefaultBrowserProvider {
+
+ @Nullable
+ @Override
+ public String getDefaultBrowser(@UserIdInt int userId) {
+ return CollectionUtils.firstOrNull(getOrCreateUserState(userId).getRoleHolders(
+ RoleManager.ROLE_BROWSER));
+ }
+
+ @Override
+ public boolean setDefaultBrowser(@Nullable String packageName, @UserIdInt int userId) {
+ CompletableFuture<Void> future = new CompletableFuture<>();
+ IRoleManagerCallback callback = new IRoleManagerCallback.Stub() {
+ @Override
+ public void onSuccess() {
+ future.complete(null);
+ }
+ @Override
+ public void onFailure() {
+ future.completeExceptionally(new RuntimeException());
+ }
+ };
+ if (packageName != null) {
+ getOrCreateControllerService(userId).onAddRoleHolder(RoleManager.ROLE_BROWSER,
+ packageName, callback);
+ } else {
+ getOrCreateControllerService(userId).onClearRoleHolders(RoleManager.ROLE_BROWSER,
+ callback);
+ }
+ try {
+ future.get(5, TimeUnit.SECONDS);
+ return true;
+ } catch (InterruptedException | ExecutionException | TimeoutException e) {
+ Slog.e(LOG_TAG, "Exception while setting default browser: " + packageName, e);
+ return false;
+ }
}
}
}
diff --git a/services/core/java/com/android/server/role/RoleUserState.java b/services/core/java/com/android/server/role/RoleUserState.java
index bc68dde..c7e3fa4 100644
--- a/services/core/java/com/android/server/role/RoleUserState.java
+++ b/services/core/java/com/android/server/role/RoleUserState.java
@@ -376,7 +376,7 @@
version = mVersion;
packagesHash = mPackagesHash;
- roles = getRoleHolders();
+ roles = snapshotRolesLocked();
}
AtomicFile atomicFile = new AtomicFile(getFile(mUserId), "roles-" + mUserId);
@@ -541,7 +541,7 @@
version = mVersion;
packagesHash = mPackagesHash;
- roles = getRoleHolders();
+ roles = snapshotRolesLocked();
}
long fieldToken = dumpOutputStream.start(fieldName, fieldId);
@@ -576,20 +576,26 @@
* @return A copy of the roles and their holders
*/
@NonNull
- public ArrayMap<String, ArraySet<String>> getRoleHolders() {
+ public ArrayMap<String, ArraySet<String>> getRolesAndHolders() {
synchronized (mLock) {
- ArrayMap<String, ArraySet<String>> roles = new ArrayMap<>();
- for (int i = 0, size = CollectionUtils.size(mRoles); i < size; ++i) {
- String roleName = mRoles.keyAt(i);
- ArraySet<String> roleHolders = mRoles.valueAt(i);
-
- roleHolders = new ArraySet<>(roleHolders);
- roles.put(roleName, roleHolders);
- }
- return roles;
+ return snapshotRolesLocked();
}
}
+ @GuardedBy("mLock")
+ @NonNull
+ private ArrayMap<String, ArraySet<String>> snapshotRolesLocked() {
+ ArrayMap<String, ArraySet<String>> roles = new ArrayMap<>();
+ for (int i = 0, size = CollectionUtils.size(mRoles); i < size; ++i) {
+ String roleName = mRoles.keyAt(i);
+ ArraySet<String> roleHolders = mRoles.valueAt(i);
+
+ roleHolders = new ArraySet<>(roleHolders);
+ roles.put(roleName, roleHolders);
+ }
+ return roles;
+ }
+
/**
* Destroy this user state and delete the corresponding file. Any pending writes to the file
* will be cancelled, and any future interaction with this state will throw an exception.
@@ -610,7 +616,8 @@
}
}
- private static @NonNull File getFile(@UserIdInt int userId) {
+ @NonNull
+ private static File getFile(@UserIdInt int userId) {
return new File(Environment.getUserSystemDirectory(userId), ROLES_FILE_NAME);
}
diff --git a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
index 4613400..f5b37b4 100644
--- a/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
+++ b/services/core/java/com/android/server/rollback/RollbackManagerServiceImpl.java
@@ -47,7 +47,6 @@
import com.android.internal.annotations.GuardedBy;
import com.android.server.LocalServices;
import com.android.server.pm.Installer;
-import com.android.server.pm.PackageManagerServiceUtils;
import java.io.File;
import java.io.IOException;
@@ -55,7 +54,6 @@
import java.time.Instant;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
@@ -211,8 +209,9 @@
List<RollbackInfo> rollbacks = new ArrayList<>();
for (int i = 0; i < mAvailableRollbacks.size(); ++i) {
RollbackData data = mAvailableRollbacks.get(i);
- rollbacks.add(new RollbackInfo(data.rollbackId, data.packages,
- Collections.emptyList()));
+ // TODO: Pass the correct value for isStaged instead of
+ // assuming always false.
+ rollbacks.add(new RollbackInfo(data.rollbackId, data.packages, false));
}
return new ParceledListSlice<>(rollbacks);
}
@@ -329,15 +328,18 @@
int sessionId = packageInstaller.createSession(params);
PackageInstaller.Session session = packageInstaller.openSession(sessionId);
- // TODO: Will it always be called "base.apk"? What about splits?
- // What about apex?
- File packageDir = new File(data.backupDir, info.getPackageName());
- File baseApk = new File(packageDir, "base.apk");
- try (ParcelFileDescriptor fd = ParcelFileDescriptor.open(baseApk,
+ File packageCode = RollbackStore.getPackageCode(data, info.getPackageName());
+ if (packageCode == null) {
+ sendFailure(statusReceiver, RollbackManager.STATUS_FAILURE,
+ "Backup copy of package code inaccessible");
+ return;
+ }
+
+ try (ParcelFileDescriptor fd = ParcelFileDescriptor.open(packageCode,
ParcelFileDescriptor.MODE_READ_ONLY)) {
final long token = Binder.clearCallingIdentity();
try {
- session.write("base.apk", 0, baseApk.length(), fd);
+ session.write(packageCode.getName(), 0, packageCode.length(), fd);
} finally {
Binder.restoreCallingIdentity(token);
}
@@ -362,8 +364,11 @@
return;
}
+ // TODO: Set the correct values for isStaged and
+ // committedSessionId.
addRecentlyExecutedRollback(new RollbackInfo(
- data.rollbackId, data.packages, causePackages));
+ data.rollbackId, data.packages, false, causePackages,
+ PackageInstaller.SessionInfo.INVALID_ID));
sendSuccess(statusReceiver);
Intent broadcast = new Intent(Intent.ACTION_ROLLBACK_COMMITTED);
@@ -683,19 +688,61 @@
*/
private boolean enableRollback(int installFlags, File newPackageCodePath,
int[] installedUsers) {
- if ((installFlags & PackageManager.INSTALL_INSTANT_APP) != 0) {
- Log.e(TAG, "Rollbacks not supported for instant app install");
+
+ // Find the session id associated with this install.
+ // TODO: It would be nice if package manager or package installer told
+ // us the session directly, rather than have to search for it
+ // ourselves.
+ PackageInstaller.SessionInfo session = null;
+
+ PackageInstaller installer = mContext.getPackageManager().getPackageInstaller();
+ for (PackageInstaller.SessionInfo info : installer.getAllSessions()) {
+ if (info.isMultiPackage()) {
+ for (int childId : info.getChildSessionIds()) {
+ PackageInstaller.SessionInfo child = installer.getSessionInfo(childId);
+ if (sessionMatchesForEnableRollback(child, installFlags, newPackageCodePath)) {
+ // TODO: Check we only have one matching session?
+ session = child;
+ break;
+ }
+ }
+ } else if (sessionMatchesForEnableRollback(info, installFlags, newPackageCodePath)) {
+ // TODO: Check we only have one matching session?
+ session = info;
+ break;
+ }
+ }
+
+ if (session == null) {
+ Log.e(TAG, "Unable to find session id for enabled rollback.");
return false;
}
- if ((installFlags & PackageManager.INSTALL_APEX) != 0) {
- Log.e(TAG, "Rollbacks not supported for apex install");
+
+ return enableRollbackForSession(session, installedUsers);
+ }
+
+ /**
+ * Do code and userdata backups to enable rollback of the given session.
+ * In case of multiPackage sessions, <code>session</code> should be one of
+ * the child sessions, not the parent session.
+ */
+ private boolean enableRollbackForSession(PackageInstaller.SessionInfo session,
+ int[] installedUsers) {
+ // TODO: Don't attempt to enable rollback for split installs.
+ final int installFlags = session.installFlags;
+ if ((installFlags & PackageManager.INSTALL_ENABLE_ROLLBACK) == 0) {
+ Log.e(TAG, "Rollback is not enabled.");
+ return false;
+ }
+ if ((installFlags & PackageManager.INSTALL_INSTANT_APP) != 0) {
+ Log.e(TAG, "Rollbacks not supported for instant app install");
return false;
}
// Get information about the package to be installed.
PackageParser.PackageLite newPackage = null;
try {
- newPackage = PackageParser.parsePackageLite(newPackageCodePath, 0);
+ newPackage = PackageParser.parsePackageLite(new File(session.resolvedBaseCodePath), 0);
} catch (PackageParser.PackageParserException e) {
Log.e(TAG, "Unable to parse new package", e);
return false;
@@ -704,57 +751,44 @@
String packageName = newPackage.packageName;
Log.i(TAG, "Enabling rollback for install of " + packageName);
- // Figure out the session id associated with this install.
- int parentSessionId = PackageInstaller.SessionInfo.INVALID_ID;
- int childSessionId = PackageInstaller.SessionInfo.INVALID_ID;
- PackageInstaller installer = mContext.getPackageManager().getPackageInstaller();
- for (PackageInstaller.SessionInfo info : installer.getAllSessions()) {
- if (info.isMultiPackage()) {
- for (int childId : info.getChildSessionIds()) {
- PackageInstaller.SessionInfo child = installer.getSessionInfo(childId);
- if (sessionMatchesForEnableRollback(child, installFlags, newPackageCodePath)) {
- // TODO: Check we only have one matching session?
- parentSessionId = info.getSessionId();
- childSessionId = childId;
- }
- }
- } else {
- if (sessionMatchesForEnableRollback(info, installFlags, newPackageCodePath)) {
- // TODO: Check we only have one matching session?
- parentSessionId = info.getSessionId();
- childSessionId = parentSessionId;
- }
- }
- }
-
- if (parentSessionId == PackageInstaller.SessionInfo.INVALID_ID) {
- Log.e(TAG, "Unable to find session id for enabled rollback.");
- return false;
- }
-
VersionedPackage newVersion = new VersionedPackage(packageName, newPackage.versionCode);
// Get information about the currently installed package.
- PackageManagerInternal pm = LocalServices.getService(PackageManagerInternal.class);
- PackageParser.Package installedPackage = pm.getPackage(packageName);
- if (installedPackage == null) {
+ PackageManager pm = mContext.getPackageManager();
+ PackageInfo pkgInfo = null;
+ try {
+ pkgInfo = pm.getPackageInfo(packageName, 0);
+ } catch (PackageManager.NameNotFoundException e) {
// TODO: Support rolling back fresh package installs rather than
// fail here. Test this case.
Log.e(TAG, packageName + " is not installed");
return false;
}
+
VersionedPackage installedVersion = new VersionedPackage(packageName,
- installedPackage.getLongVersionCode());
+ pkgInfo.getLongVersionCode());
+ final boolean isApex = ((installFlags & PackageManager.INSTALL_APEX) != 0);
+ final IntArray pendingBackups;
+ if (isApex) {
+ pendingBackups = IntArray.wrap(new int[0]);
+ } else {
+ pendingBackups = mUserdataHelper.snapshotAppData(packageName, installedUsers);
+ }
- final IntArray pendingBackups = mUserdataHelper.snapshotAppData(packageName,
- installedUsers);
-
+ // TODO: Record if this is an apex or not.
PackageRollbackInfo info = new PackageRollbackInfo(newVersion, installedVersion,
pendingBackups, new ArrayList<>());
RollbackData data;
try {
+ int childSessionId = session.getSessionId();
+ int parentSessionId = session.getParentSessionId();
+ if (parentSessionId == PackageInstaller.SessionInfo.INVALID_ID) {
+ parentSessionId = childSessionId;
+ }
synchronized (mLock) {
+ // TODO: no need to add to mChildSessions if childSessionId is
+ // the same as parentSessionId.
mChildSessions.put(childSessionId, parentSessionId);
data = mPendingRollbacks.get(parentSessionId);
if (data == null) {
@@ -769,16 +803,12 @@
return false;
}
- File packageDir = mRollbackStore.packageCodePathForAvailableRollback(data, packageName);
- packageDir.mkdirs();
-
- // TODO: Copy by hard link instead to save on cpu and storage space?
- int status = PackageManagerServiceUtils.copyPackage(installedPackage.codePath, packageDir);
- if (status != PackageManager.INSTALL_SUCCEEDED) {
- Log.e(TAG, "Unable to copy package for rollback for " + packageName);
+ try {
+ RollbackStore.backupPackageCode(data, packageName, pkgInfo.applicationInfo.sourceDir);
+ } catch (IOException e) {
+ Log.e(TAG, "Unable to copy package for rollback for " + packageName, e);
return false;
}
-
return true;
}
diff --git a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
index b3cc6de..8e04160 100644
--- a/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
+++ b/services/core/java/com/android/server/rollback/RollbackPackageHealthObserver.java
@@ -18,14 +18,18 @@
import android.content.Context;
import android.content.Intent;
-import android.content.pm.PackageInstaller;
+import android.content.pm.PackageManager;
import android.content.pm.VersionedPackage;
import android.content.rollback.PackageRollbackInfo;
import android.content.rollback.RollbackInfo;
import android.content.rollback.RollbackManager;
import android.os.Handler;
import android.os.HandlerThread;
+import android.text.TextUtils;
+import android.util.Slog;
+import android.util.StatsLog;
+import com.android.internal.R;
import com.android.server.PackageWatchdog;
import com.android.server.PackageWatchdog.PackageHealthObserver;
import com.android.server.PackageWatchdog.PackageHealthObserverImpact;
@@ -53,10 +57,16 @@
}
@Override
- public int onHealthCheckFailed(String packageName, long versionCode) {
+ public int onHealthCheckFailed(VersionedPackage failedPackage) {
+ VersionedPackage moduleMetadataPackage = getModuleMetadataPackage();
+ if (moduleMetadataPackage == null) {
+ // Ignore failure, no mainline update available
+ return PackageHealthObserverImpact.USER_IMPACT_NONE;
+ }
+
RollbackInfo rollback =
- getAvailableRollback(mContext.getSystemService(RollbackManager.class),
- packageName, versionCode);
+ getAvailableMainlineRollback(mContext.getSystemService(RollbackManager.class),
+ failedPackage, moduleMetadataPackage);
if (rollback == null) {
// Don't handle the notification, no rollbacks available for the package
return PackageHealthObserverImpact.USER_IMPACT_NONE;
@@ -66,31 +76,46 @@
}
@Override
- public boolean execute(String packageName, long versionCode) {
- RollbackManager rollbackManager = mContext.getSystemService(RollbackManager.class);
- RollbackInfo rollback = getAvailableRollback(rollbackManager, packageName, versionCode);
- if (rollback == null) {
- // Expected a rollback to be available, what happened?
+ public boolean execute(VersionedPackage failedPackage) {
+ VersionedPackage moduleMetadataPackage = getModuleMetadataPackage();
+ if (moduleMetadataPackage == null) {
+ // Ignore failure, no mainline update available
return false;
}
- // TODO(zezeozue): Only rollback if rollback version == failed package version
+ RollbackManager rollbackManager = mContext.getSystemService(RollbackManager.class);
+ RollbackInfo rollback = getAvailableMainlineRollback(rollbackManager,
+ failedPackage, moduleMetadataPackage);
+ if (rollback == null) {
+ Slog.w(TAG, "Expected rollback but no mainline rollback found for package: [ "
+ + failedPackage.getPackageName() + "] with versionCode: ["
+ + failedPackage.getVersionCode() + "]");
+ return false;
+ }
+
+ StatsLog.write(StatsLog.WATCHDOG_ROLLBACK_OCCURRED,
+ StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_INITIATE,
+ moduleMetadataPackage.getPackageName(),
+ moduleMetadataPackage.getVersionCode());
LocalIntentReceiver rollbackReceiver = new LocalIntentReceiver((Intent result) -> {
- int status = result.getIntExtra(PackageInstaller.EXTRA_STATUS,
- PackageInstaller.STATUS_FAILURE);
- if (status == PackageInstaller.STATUS_SUCCESS) {
- // TODO(zezeozue); Log success metrics
- // Rolledback successfully, no action required by other observers
+ int status = result.getIntExtra(RollbackManager.EXTRA_STATUS,
+ RollbackManager.STATUS_FAILURE);
+ if (status == RollbackManager.STATUS_SUCCESS) {
+ StatsLog.write(StatsLog.WATCHDOG_ROLLBACK_OCCURRED,
+ StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_SUCCESS,
+ moduleMetadataPackage.getPackageName(),
+ moduleMetadataPackage.getVersionCode());
} else {
- // TODO(zezeozue); Log failure metrics
- // Rollback failed other observers should have a shot
+ StatsLog.write(StatsLog.WATCHDOG_ROLLBACK_OCCURRED,
+ StatsLog.WATCHDOG_ROLLBACK_OCCURRED__ROLLBACK_TYPE__ROLLBACK_FAILURE,
+ moduleMetadataPackage.getPackageName(),
+ moduleMetadataPackage.getVersionCode());
}
});
- // TODO(zezeozue): Log initiated metrics
mHandler.post(() ->
rollbackManager.commitRollback(rollback.getRollbackId(),
- Collections.singletonList(new VersionedPackage(packageName, versionCode)),
+ Collections.singletonList(moduleMetadataPackage),
rollbackReceiver.getIntentSender()));
// Assume rollback executed successfully
return true;
@@ -109,17 +134,41 @@
PackageWatchdog.getInstance(mContext).startObservingHealth(this, packages, durationMs);
}
- private RollbackInfo getAvailableRollback(RollbackManager rollbackManager,
- String packageName, long versionCode) {
+ private RollbackInfo getAvailableMainlineRollback(RollbackManager rollbackManager,
+ VersionedPackage failedPackage, VersionedPackage moduleMetadataPackage) {
for (RollbackInfo rollback : rollbackManager.getAvailableRollbacks()) {
+ // We only rollback mainline packages, so check if rollback contains the
+ // module metadata provider, if it does, the rollback is a mainline rollback
+ boolean hasModuleMetadataPackage = false;
+ boolean hasFailedPackage = false;
for (PackageRollbackInfo packageRollback : rollback.getPackages()) {
- if (packageName.equals(packageRollback.getPackageName())
+ hasModuleMetadataPackage |= packageRollback.getPackageName().equals(
+ moduleMetadataPackage.getPackageName());
+ hasFailedPackage |= packageRollback.getPackageName().equals(
+ failedPackage.getPackageName())
&& packageRollback.getVersionRolledBackFrom().getVersionCode()
- == versionCode) {
- return rollback;
- }
+ == failedPackage.getVersionCode();
+ }
+ if (hasModuleMetadataPackage && hasFailedPackage) {
+ return rollback;
}
}
return null;
}
+
+ private VersionedPackage getModuleMetadataPackage() {
+ String packageName = mContext.getResources().getString(
+ R.string.config_defaultModuleMetadataProvider);
+ if (!TextUtils.isEmpty(packageName)) {
+ return null;
+ }
+
+ try {
+ return new VersionedPackage(packageName, mContext.getPackageManager().getPackageInfo(
+ packageName, 0 /* flags */).getLongVersionCode());
+ } catch (PackageManager.NameNotFoundException e) {
+ Slog.w(TAG, "Module metadata provider not found");
+ return null;
+ }
+ }
}
diff --git a/services/core/java/com/android/server/rollback/RollbackStore.java b/services/core/java/com/android/server/rollback/RollbackStore.java
index c70f47d..1069530 100644
--- a/services/core/java/com/android/server/rollback/RollbackStore.java
+++ b/services/core/java/com/android/server/rollback/RollbackStore.java
@@ -33,6 +33,7 @@
import java.io.File;
import java.io.IOException;
import java.io.PrintWriter;
+import java.nio.file.Files;
import java.time.Instant;
import java.time.format.DateTimeParseException;
import java.util.ArrayList;
@@ -177,9 +178,12 @@
int rollbackId = element.getInt("rollbackId");
List<PackageRollbackInfo> packages = packageRollbackInfosFromJson(
element.getJSONArray("packages"));
+ boolean isStaged = element.getBoolean("isStaged");
List<VersionedPackage> causePackages = versionedPackagesFromJson(
element.getJSONArray("causePackages"));
- RollbackInfo rollback = new RollbackInfo(rollbackId, packages, causePackages);
+ int committedSessionId = element.getInt("committedSessionId");
+ RollbackInfo rollback = new RollbackInfo(rollbackId, packages, isStaged,
+ causePackages, committedSessionId);
recentlyExecutedRollbacks.add(rollback);
}
} catch (IOException | JSONException e) {
@@ -201,11 +205,30 @@
}
/**
- * Returns the directory where the code for a package should be stored for
- * given rollback <code>data</code> and <code>packageName</code>.
+ * Creates a backup copy of the apk or apex for a package.
*/
- File packageCodePathForAvailableRollback(RollbackData data, String packageName) {
- return new File(data.backupDir, packageName);
+ static void backupPackageCode(RollbackData data, String packageName, String codePath)
+ throws IOException {
+ File sourceFile = new File(codePath);
+ File targetDir = new File(data.backupDir, packageName);
+ targetDir.mkdirs();
+ File targetFile = new File(targetDir, sourceFile.getName());
+
+ // TODO: Copy by hard link instead to save on cpu and storage space?
+ Files.copy(sourceFile.toPath(), targetFile.toPath());
+ }
+
+ /**
+ * Returns the apk or apex file backed up for the given package.
+ * Returns null if none found.
+ */
+ static File getPackageCode(RollbackData data, String packageName) {
+ File targetDir = new File(data.backupDir, packageName);
+ File[] files = targetDir.listFiles();
+ if (files == null || files.length != 1) {
+ return null;
+ }
+ return files[0];
}
/**
@@ -250,7 +273,9 @@
JSONObject element = new JSONObject();
element.put("rollbackId", rollback.getRollbackId());
element.put("packages", toJson(rollback.getPackages()));
+ element.put("isStaged", rollback.isStaged());
element.put("causePackages", versionedPackagesToJson(rollback.getCausePackages()));
+ element.put("committedSessionId", rollback.getCommittedSessionId());
array.put(element);
}
diff --git a/services/core/java/com/android/server/stats/StatsCompanionService.java b/services/core/java/com/android/server/stats/StatsCompanionService.java
index 2be78fe3..0f7407b 100644
--- a/services/core/java/com/android/server/stats/StatsCompanionService.java
+++ b/services/core/java/com/android/server/stats/StatsCompanionService.java
@@ -15,6 +15,8 @@
*/
package com.android.server.stats;
+import static android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED;
+import static android.content.pm.PermissionInfo.PROTECTION_DANGEROUS;
import static android.os.Process.getPidsForCommands;
import static android.os.Process.getUidForPid;
@@ -41,6 +43,7 @@
import android.content.IntentSender;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.content.pm.PermissionInfo;
import android.content.pm.UserInfo;
import android.hardware.fingerprint.FingerprintManager;
import android.net.ConnectivityManager;
@@ -98,6 +101,7 @@
import com.android.internal.os.BinderCallsStats.ExportedCallStat;
import com.android.internal.os.KernelCpuSpeedReader;
import com.android.internal.os.KernelCpuThreadReader;
+import com.android.internal.os.KernelCpuThreadReaderSettingsObserver;
import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidActiveTimeReader;
import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidClusterTimeReader;
import com.android.internal.os.KernelCpuUidTimeReader.KernelCpuUidFreqTimeReader;
@@ -114,7 +118,7 @@
import com.android.server.SystemService;
import com.android.server.SystemServiceManager;
import com.android.server.am.MemoryStatUtil.MemoryStat;
-import com.android.server.role.RoleManagerServiceInternal;
+import com.android.server.role.RoleManagerInternal;
import com.android.server.storage.DiskStatsFileLogger;
import com.android.server.storage.DiskStatsLoggingService;
@@ -203,7 +207,7 @@
"zygote64",
};
- private static final int CPU_TIME_PER_THREAD_FREQ_NUM_FREQUENCIES = 8;
+ private static final int CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES = 8;
static final class CompanionHandler extends Handler {
CompanionHandler(Looper looper) {
@@ -332,7 +336,8 @@
handlerThread.start();
mHandler = new CompanionHandler(handlerThread.getLooper());
- mKernelCpuThreadReader = KernelCpuThreadReader.create();
+ mKernelCpuThreadReader =
+ KernelCpuThreadReaderSettingsObserver.getSettingsModifiedReader(mContext);
}
@Override
@@ -1678,8 +1683,8 @@
return;
}
int[] cpuFrequencies = mKernelCpuThreadReader.getCpuFrequenciesKhz();
- if (cpuFrequencies.length != CPU_TIME_PER_THREAD_FREQ_NUM_FREQUENCIES) {
- Slog.w(TAG, "Expected " + CPU_TIME_PER_THREAD_FREQ_NUM_FREQUENCIES
+ if (cpuFrequencies.length > CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES) {
+ Slog.w(TAG, "Expected maximum " + CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES
+ " frequencies, but got " + cpuFrequencies.length);
return;
}
@@ -1703,9 +1708,17 @@
e.writeInt(threadCpuUsage.threadId);
e.writeString(processCpuUsage.processName);
e.writeString(threadCpuUsage.threadName);
- for (int k = 0; k < CPU_TIME_PER_THREAD_FREQ_NUM_FREQUENCIES; k++) {
- e.writeInt(cpuFrequencies[k]);
- e.writeInt(threadCpuUsage.usageTimesMillis[k]);
+ for (int k = 0; k < CPU_TIME_PER_THREAD_FREQ_MAX_NUM_FREQUENCIES; k++) {
+ if (k < cpuFrequencies.length) {
+ e.writeInt(cpuFrequencies[k]);
+ e.writeInt(threadCpuUsage.usageTimesMillis[k]);
+ } else {
+ // If we have no more frequencies to write, we still must write empty data.
+ // We know that this data is empty (and not just zero) because all
+ // frequencies are expected to be greater than zero
+ e.writeInt(0);
+ e.writeInt(0);
+ }
}
pulledData.add(e);
}
@@ -1783,6 +1796,65 @@
pulledData.add(e);
}
+ private void pullDangerousPermissionState(long elapsedNanos, final long wallClockNanos,
+ List<StatsLogEventWrapper> pulledData) {
+ long token = Binder.clearCallingIdentity();
+ try {
+ PackageManager pm = mContext.getPackageManager();
+
+ List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers();
+
+ int numUsers = users.size();
+ for (int userNum = 0; userNum < numUsers; userNum++) {
+ UserHandle user = users.get(userNum).getUserHandle();
+
+ List<PackageInfo> pkgs = pm.getInstalledPackagesAsUser(
+ PackageManager.GET_PERMISSIONS, user.getIdentifier());
+
+ int numPkgs = pkgs.size();
+ for (int pkgNum = 0; pkgNum < numPkgs; pkgNum++) {
+ PackageInfo pkg = pkgs.get(pkgNum);
+
+ if (pkg.requestedPermissions == null) {
+ continue;
+ }
+
+ int numPerms = pkg.requestedPermissions.length;
+ for (int permNum = 0; permNum < numPerms; permNum++) {
+ String permName = pkg.requestedPermissions[permNum];
+
+ PermissionInfo permissionInfo;
+ try {
+ permissionInfo = pm.getPermissionInfo(permName, 0);
+ } catch (PackageManager.NameNotFoundException ignored) {
+ continue;
+ }
+
+ if (permissionInfo.getProtection() != PROTECTION_DANGEROUS) {
+ continue;
+ }
+
+ StatsLogEventWrapper e = new StatsLogEventWrapper(
+ StatsLog.DANGEROUS_PERMISSION_STATE, elapsedNanos, wallClockNanos);
+
+ e.writeString(permName);
+ e.writeInt(pkg.applicationInfo.uid);
+ e.writeString(pkg.packageName);
+
+ e.writeBoolean((pkg.requestedPermissionsFlags[permNum]
+ & REQUESTED_PERMISSION_GRANTED) != 0);
+
+ pulledData.add(e);
+ }
+ }
+ }
+ } catch (Throwable t) {
+ Log.e(TAG, "Could not read permissions", t);
+ } finally {
+ Binder.restoreCallingIdentity(token);
+ }
+ }
+
/**
* Add a RoleHolder atom for each package that holds a role.
*
@@ -1795,16 +1867,16 @@
long callingToken = Binder.clearCallingIdentity();
try {
PackageManager pm = mContext.getPackageManager();
- RoleManagerServiceInternal rm =
- LocalServices.getService(RoleManagerServiceInternal.class);
+ RoleManagerInternal rmi = LocalServices.getService(RoleManagerInternal.class);
List<UserInfo> users = mContext.getSystemService(UserManager.class).getUsers();
int numUsers = users.size();
for (int userNum = 0; userNum < numUsers; userNum++) {
- UserHandle user = users.get(userNum).getUserHandle();
+ int userId = users.get(userNum).getUserHandle().getIdentifier();
- ArrayMap<String, ArraySet<String>> roles = rm.getRoleHoldersAsUser(user);
+ ArrayMap<String, ArraySet<String>> roles = rmi.getRolesAndHolders(
+ userId);
int numRoles = roles.size();
for (int roleNum = 0; roleNum < numRoles; roleNum++) {
@@ -1817,7 +1889,7 @@
PackageInfo pkg;
try {
- pkg = pm.getPackageInfoAsUser(holderName, 0, user.getIdentifier());
+ pkg = pm.getPackageInfoAsUser(holderName, 0, userId);
} catch (PackageManager.NameNotFoundException e) {
Log.w(TAG, "Role holder " + holderName + " not found");
return;
@@ -2015,6 +2087,10 @@
pullRoleHolders(elapsedNanos, wallClockNanos, ret);
break;
}
+ case StatsLog.DANGEROUS_PERMISSION_STATE: {
+ pullDangerousPermissionState(elapsedNanos, wallClockNanos, ret);
+ break;
+ }
default:
Slog.w(TAG, "No such tagId data as " + tagId);
return null;
diff --git a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java b/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java
deleted file mode 100644
index 5f71b0b..0000000
--- a/services/core/java/com/android/server/timezonedetector/TimeZoneDetectorService.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (C) 2018 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.timezonedetector;
-
-import com.android.internal.util.DumpUtils;
-import com.android.server.SystemService;
-import android.app.timezonedetector.ITimeZoneDetectorService;
-import android.content.Context;
-import android.util.Slog;
-import java.io.FileDescriptor;
-import java.io.PrintWriter;
-
-public final class TimeZoneDetectorService extends ITimeZoneDetectorService.Stub {
- private static final String TAG = "timezonedetector.TimeZoneDetectorService";
-
- public static class Lifecycle extends SystemService {
-
- public Lifecycle(Context context) {
- super(context);
- }
-
- @Override
- public void onStart() {
- TimeZoneDetectorService service = TimeZoneDetectorService.create(getContext());
- // Publish the binder service so it can be accessed from other (appropriately
- // permissioned) processes.
- publishBinderService(Context.TIME_ZONE_DETECTOR_SERVICE, service);
- }
- }
-
- private final Context mContext;
-
- private static TimeZoneDetectorService create(Context context) {
- return new TimeZoneDetectorService(context);
- }
-
- public TimeZoneDetectorService(Context context) {
- mContext = context;
- }
-
- @Override
- public void stubbedCall() {
- // Empty call for initial tests.
- Slog.d(TAG, "stubbedCall() called");
- // TODO: Remove when there are real methods.
- }
-
- @Override
- protected void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
- if (!DumpUtils.checkDumpPermission(mContext, TAG, pw)) return;
- // TODO: Implement when there is state.
- }
-}
diff --git a/services/core/java/com/android/server/tv/TvInputHardwareManager.java b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
old mode 100644
new mode 100755
index c1607e9..f08e585
--- a/services/core/java/com/android/server/tv/TvInputHardwareManager.java
+++ b/services/core/java/com/android/server/tv/TvInputHardwareManager.java
@@ -24,7 +24,6 @@
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.PackageManager;
import android.hardware.hdmi.HdmiControlManager;
import android.hardware.hdmi.HdmiDeviceInfo;
import android.hardware.hdmi.HdmiHotplugEvent;
@@ -46,7 +45,6 @@
import android.media.tv.TvInputHardwareInfo;
import android.media.tv.TvInputInfo;
import android.media.tv.TvStreamConfig;
-import android.os.Binder;
import android.os.Handler;
import android.os.IBinder;
import android.os.Message;
@@ -56,7 +54,6 @@
import android.util.Slog;
import android.util.SparseArray;
import android.util.SparseBooleanArray;
-import android.view.KeyEvent;
import android.view.Surface;
import com.android.internal.util.DumpUtils;
@@ -943,7 +940,7 @@
sinkChannelMask = sinkConfig.channelMask();
}
if (sinkFormat == AudioFormat.ENCODING_DEFAULT) {
- sinkChannelMask = sinkConfig.format();
+ sinkFormat = sinkConfig.format();
}
}
diff --git a/services/core/java/com/android/server/wm/ActivityDisplay.java b/services/core/java/com/android/server/wm/ActivityDisplay.java
index e817dd4..62421ac 100644
--- a/services/core/java/com/android/server/wm/ActivityDisplay.java
+++ b/services/core/java/com/android/server/wm/ActivityDisplay.java
@@ -1267,6 +1267,15 @@
positionChildAt(stack, Math.max(0, insertIndex));
}
+ void ensureActivitiesVisible(ActivityRecord starting, int configChanges,
+ boolean preserveWindows, boolean notifyClients) {
+ for (int stackNdx = getChildCount() - 1; stackNdx >= 0; --stackNdx) {
+ final ActivityStack stack = getChildAt(stackNdx);
+ stack.ensureActivitiesVisibleLocked(starting, configChanges, preserveWindows,
+ notifyClients);
+ }
+ }
+
void moveHomeStackToFront(String reason) {
if (mHomeStack != null) {
mHomeStack.moveToFront(reason);
@@ -1427,9 +1436,10 @@
}
}
- public void writeToProto(ProtoOutputStream proto, long fieldId) {
+ public void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
final long token = proto.start(fieldId);
- super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */);
+ super.writeToProto(proto, CONFIGURATION_CONTAINER, logLevel);
proto.write(ID, mDisplayId);
proto.write(SINGLE_TASK_INSTANCE, mSingleTaskInstance);
final ActivityStack focusedStack = getFocusedStack();
@@ -1444,7 +1454,7 @@
}
for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {
final ActivityStack stack = mStacks.get(stackNdx);
- stack.writeToProto(proto, STACKS);
+ stack.writeToProto(proto, STACKS, logLevel);
}
proto.end(token);
}
diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java
index aa0c62c..ef40648 100644
--- a/services/core/java/com/android/server/wm/ActivityRecord.java
+++ b/services/core/java/com/android/server/wm/ActivityRecord.java
@@ -2065,7 +2065,8 @@
* - should be either the topmost in task, or right below the top activity that is finishing
* If all of these conditions are not met at the same time, the activity cannot be made active.
*/
- private boolean shouldMakeActive(ActivityRecord activeActivity) {
+ @VisibleForTesting
+ boolean shouldMakeActive(ActivityRecord activeActivity) {
// If the activity is stopped, stopping, cycle to an active state. We avoid doing
// this when there is an activity waiting to become translucent as the extra binder
// calls will lead to noticeable jank. A later call to
@@ -2080,6 +2081,11 @@
return false;
}
+ if (!mStackSupervisor.readyToResume()) {
+ // Making active is currently deferred (e.g. because an activity launch is in progress).
+ return false;
+ }
+
if (this.mLaunchTaskBehind) {
// This activity is being launched from behind, which means that it's not intended to be
// presented to user right now, even if it's set to be visible.
@@ -3395,6 +3401,16 @@
stack.checkKeyguardVisibility(this, true /* shouldBeVisible */, true /* isTop */);
}
+ /**
+ * Check if this activity is able to resume. For pre-Q apps, only the topmost activities of each
+ * process are allowed to be resumed.
+ *
+ * @return true if this activity can be resumed.
+ */
+ boolean canResumeByCompat() {
+ return app == null || app.updateTopResumingActivityInProcessIfNeeded(this);
+ }
+
boolean getTurnScreenOnFlag() {
return mTurnScreenOn;
}
@@ -3451,7 +3467,7 @@
* {@code ActivityRecordProto} is the outer-most proto data.
*/
void writeToProto(ProtoOutputStream proto) {
- super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */);
+ super.writeToProto(proto, CONFIGURATION_CONTAINER, WindowTraceLogLevel.ALL);
writeIdentifierToProto(proto, IDENTIFIER);
proto.write(STATE, mState.toString());
proto.write(VISIBLE, visible);
diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java
index 16c44aa..6f07be8 100644
--- a/services/core/java/com/android/server/wm/ActivityStack.java
+++ b/services/core/java/com/android/server/wm/ActivityStack.java
@@ -2597,6 +2597,10 @@
return false;
}
+ if (!next.canResumeByCompat()) {
+ return false;
+ }
+
// If we are sleeping, and there is no resumed activity, and the top
// activity is paused, well that is the state we want.
if (shouldSleepOrShutDownActivities()
@@ -5651,13 +5655,14 @@
return shouldSleepActivities() || mService.mShuttingDown;
}
- public void writeToProto(ProtoOutputStream proto, long fieldId) {
+ public void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
final long token = proto.start(fieldId);
- super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */);
+ super.writeToProto(proto, CONFIGURATION_CONTAINER, logLevel);
proto.write(ID, mStackId);
for (int taskNdx = mTaskHistory.size() - 1; taskNdx >= 0; --taskNdx) {
final TaskRecord task = mTaskHistory.get(taskNdx);
- task.writeToProto(proto, TASKS);
+ task.writeToProto(proto, TASKS, logLevel);
}
if (mResumedActivity != null) {
mResumedActivity.writeIdentifierToProto(proto, RESUMED_ACTIVITY);
diff --git a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
index c8a150b..c0fe6e9 100644
--- a/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
+++ b/services/core/java/com/android/server/wm/ActivityStackSupervisor.java
@@ -720,6 +720,11 @@
r.setProcess(proc);
+ // Ensure activity is allowed to be resumed after process has set.
+ if (andResume && !r.canResumeByCompat()) {
+ andResume = false;
+ }
+
if (getKeyguardController().isKeyguardLocked()) {
r.notifyUnknownVisibilityLaunched();
}
diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
index d1cd1db..1d71d876 100644
--- a/services/core/java/com/android/server/wm/ActivityStarter.java
+++ b/services/core/java/com/android/server/wm/ActivityStarter.java
@@ -980,6 +980,10 @@
if (mSupervisor.mRecentTasks.isCallerRecents(callingUid)) {
return false;
}
+ // don't abort if the callingPackage is a device owner
+ if (mService.getDevicePolicyManager().isDeviceOwnerApp(callingPackage)) {
+ return false;
+ }
// anything that has fallen through would currently be aborted
Slog.w(TAG, "Background activity start [callingPackage: " + callingPackage
+ "; callingUid: " + callingUid
diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
index 09ef4b9..b6bac613 100644
--- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
+++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
@@ -151,6 +151,7 @@
import android.app.WaitResult;
import android.app.WindowConfiguration;
import android.app.admin.DevicePolicyCache;
+import android.app.admin.DevicePolicyManager;
import android.app.assist.AssistContent;
import android.app.assist.AssistStructure;
import android.app.usage.UsageStatsManagerInternal;
@@ -362,6 +363,7 @@
WindowManagerService mWindowManager;
private UserManagerService mUserManager;
private AppOpsService mAppOpsService;
+ private DevicePolicyManager mDpm;
/** All active uids in the system. */
private final SparseArray<Integer> mActiveUids = new SparseArray<>();
private final SparseArray<String> mPendingTempWhitelist = new SparseArray<>();
@@ -836,6 +838,13 @@
return mAppOpsService;
}
+ DevicePolicyManager getDevicePolicyManager() {
+ if (mDpm == null) {
+ mDpm = mContext.getSystemService(DevicePolicyManager.class);
+ }
+ return mDpm;
+ }
+
boolean hasUserRestriction(String restriction, int userId) {
return getUserManager().hasUserRestriction(restriction, userId);
}
@@ -6578,7 +6587,8 @@
// The output proto of "activity --proto activities"
// is ActivityManagerServiceDumpActivitiesProto
mRootActivityContainer.writeToProto(proto,
- ActivityManagerServiceDumpActivitiesProto.ACTIVITY_STACK_SUPERVISOR);
+ ActivityManagerServiceDumpActivitiesProto.ACTIVITY_STACK_SUPERVISOR,
+ WindowTraceLogLevel.ALL);
}
}
diff --git a/services/core/java/com/android/server/wm/AppWindowThumbnail.java b/services/core/java/com/android/server/wm/AppWindowThumbnail.java
index ed029cd..6fcc331 100644
--- a/services/core/java/com/android/server/wm/AppWindowThumbnail.java
+++ b/services/core/java/com/android/server/wm/AppWindowThumbnail.java
@@ -158,7 +158,9 @@
final long token = proto.start(fieldId);
proto.write(WIDTH, mWidth);
proto.write(HEIGHT, mHeight);
- mSurfaceAnimator.writeToProto(proto, SURFACE_ANIMATOR);
+ if (mSurfaceAnimator.isAnimating()) {
+ mSurfaceAnimator.writeToProto(proto, SURFACE_ANIMATOR);
+ }
proto.end(token);
}
diff --git a/services/core/java/com/android/server/wm/AppWindowToken.java b/services/core/java/com/android/server/wm/AppWindowToken.java
index a52f1af..3246a87 100644
--- a/services/core/java/com/android/server/wm/AppWindowToken.java
+++ b/services/core/java/com/android/server/wm/AppWindowToken.java
@@ -978,8 +978,8 @@
}
@Override
- void onParentSet() {
- super.onParentSet();
+ void onParentChanged() {
+ super.onParentChanged();
final Task task = getTask();
@@ -2852,10 +2852,13 @@
// to check super here.
final boolean reallyAnimating = super.isSelfAnimating();
final boolean show = !isHidden() || reallyAnimating;
- if (show && !mLastSurfaceShowing) {
- mPendingTransaction.show(mSurfaceControl);
- } else if (!show && mLastSurfaceShowing) {
- mPendingTransaction.hide(mSurfaceControl);
+
+ if (mSurfaceControl != null) {
+ if (show && !mLastSurfaceShowing) {
+ mPendingTransaction.show(mSurfaceControl);
+ } else if (!show && mLastSurfaceShowing) {
+ mPendingTransaction.hide(mSurfaceControl);
+ }
}
if (mThumbnail != null) {
mThumbnail.setShowing(mPendingTransaction, show);
@@ -2882,10 +2885,16 @@
@CallSuper
@Override
- public void writeToProto(ProtoOutputStream proto, long fieldId, boolean trim) {
+ public void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
+ // Critical log level logs only visible elements to mitigate performance overheard
+ if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
+ return;
+ }
+
final long token = proto.start(fieldId);
writeNameToProto(proto, NAME);
- super.writeToProto(proto, WINDOW_TOKEN, trim);
+ super.writeToProto(proto, WINDOW_TOKEN, logLevel);
proto.write(LAST_SURFACE_SHOWING, mLastSurfaceShowing);
proto.write(IS_WAITING_FOR_TRANSITION_START, isWaitingForTransitionStart());
proto.write(IS_REALLY_ANIMATING, isReallyAnimating());
@@ -2904,7 +2913,7 @@
proto.write(ALL_DRAWN, allDrawn);
proto.write(LAST_ALL_DRAWN, mLastAllDrawn);
proto.write(REMOVED, removed);
- if (startingWindow != null){
+ if (startingWindow != null) {
startingWindow.writeIdentifierToProto(proto, STARTING_WINDOW);
}
proto.write(STARTING_DISPLAYED, startingDisplayed);
diff --git a/services/core/java/com/android/server/wm/ConfigurationContainer.java b/services/core/java/com/android/server/wm/ConfigurationContainer.java
index ce3fb51..97062a6 100644
--- a/services/core/java/com/android/server/wm/ConfigurationContainer.java
+++ b/services/core/java/com/android/server/wm/ConfigurationContainer.java
@@ -331,6 +331,10 @@
return boundsChange;
}
+ boolean hasOverrideConfiguration() {
+ return mHasOverrideConfiguration;
+ }
+
public WindowConfiguration getWindowConfiguration() {
return mFullConfiguration.windowConfiguration;
}
@@ -532,7 +536,7 @@
/**
* Must be called when new parent for the container was set.
*/
- protected void onParentChanged() {
+ void onParentChanged() {
final ConfigurationContainer parent = getParent();
// Removing parent usually means that we've detached this entity to destroy it or to attach
// to another parent. In both cases we don't need to update the configuration now.
@@ -551,18 +555,24 @@
* @param proto Stream to write the ConfigurationContainer object to.
* @param fieldId Field Id of the ConfigurationContainer as defined in the parent
* message.
- * @param trim If true, reduce amount of data written.
+ * @param logLevel Determines the amount of data to be written to the Protobuf.
* @hide
*/
@CallSuper
- public void writeToProto(ProtoOutputStream proto, long fieldId, boolean trim) {
- final long token = proto.start(fieldId);
- if (!trim || mHasOverrideConfiguration) {
- mRequestedOverrideConfiguration.writeToProto(proto, OVERRIDE_CONFIGURATION);
+ protected void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
+ // Critical log level logs only visible elements to mitigate performance overheard
+ if (logLevel != WindowTraceLogLevel.ALL && !mHasOverrideConfiguration) {
+ return;
}
- if (!trim) {
- mFullConfiguration.writeToProto(proto, FULL_CONFIGURATION);
- mMergedOverrideConfiguration.writeToProto(proto, MERGED_OVERRIDE_CONFIGURATION);
+
+ final long token = proto.start(fieldId);
+ mRequestedOverrideConfiguration.writeToProto(proto, OVERRIDE_CONFIGURATION,
+ logLevel != WindowTraceLogLevel.CRITICAL);
+ if (logLevel == WindowTraceLogLevel.ALL) {
+ mFullConfiguration.writeToProto(proto, FULL_CONFIGURATION, false /* critical */);
+ mMergedOverrideConfiguration.writeToProto(proto, MERGED_OVERRIDE_CONFIGURATION,
+ false /* critical */);
}
proto.end(token);
}
diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index df32df0..111808b 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -2679,27 +2679,33 @@
@CallSuper
@Override
- public void writeToProto(ProtoOutputStream proto, long fieldId, boolean trim) {
+ public void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
+ // Critical log level logs only visible elements to mitigate performance overheard
+ if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
+ return;
+ }
+
final long token = proto.start(fieldId);
- super.writeToProto(proto, WINDOW_CONTAINER, trim);
+ super.writeToProto(proto, WINDOW_CONTAINER, logLevel);
proto.write(ID, mDisplayId);
for (int stackNdx = mTaskStackContainers.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
final TaskStack stack = mTaskStackContainers.getChildAt(stackNdx);
- stack.writeToProto(proto, STACKS, trim);
+ stack.writeToProto(proto, STACKS, logLevel);
}
mDividerControllerLocked.writeToProto(proto, DOCKED_STACK_DIVIDER_CONTROLLER);
mPinnedStackControllerLocked.writeToProto(proto, PINNED_STACK_CONTROLLER);
for (int i = mAboveAppWindowsContainers.getChildCount() - 1; i >= 0; --i) {
final WindowToken windowToken = mAboveAppWindowsContainers.getChildAt(i);
- windowToken.writeToProto(proto, ABOVE_APP_WINDOWS, trim);
+ windowToken.writeToProto(proto, ABOVE_APP_WINDOWS, logLevel);
}
for (int i = mBelowAppWindowsContainers.getChildCount() - 1; i >= 0; --i) {
final WindowToken windowToken = mBelowAppWindowsContainers.getChildAt(i);
- windowToken.writeToProto(proto, BELOW_APP_WINDOWS, trim);
+ windowToken.writeToProto(proto, BELOW_APP_WINDOWS, logLevel);
}
for (int i = mImeWindowsContainers.getChildCount() - 1; i >= 0; --i) {
final WindowToken windowToken = mImeWindowsContainers.getChildAt(i);
- windowToken.writeToProto(proto, IME_WINDOWS, trim);
+ windowToken.writeToProto(proto, IME_WINDOWS, logLevel);
}
proto.write(DPI, mBaseDisplayDensity);
mDisplayInfo.writeToProto(proto, DISPLAY_INFO);
@@ -4389,8 +4395,8 @@
}
@Override
- void onParentSet() {
- super.onParentSet();
+ void onParentChanged() {
+ super.onParentChanged();
if (getParent() != null) {
mAppAnimationLayer = makeChildSurface(null)
.setName("animationLayer")
@@ -4645,10 +4651,10 @@
}
@Override
- void onParentSet() {
+ void onParentChanged() {
// Since we are the top of the SurfaceControl hierarchy here
// we create the root surfaces explicitly rather than chaining
- // up as the default implementation in onParentSet does. So we
+ // up as the default implementation in onParentChanged does. So we
// explicitly do NOT call super here.
}
diff --git a/services/core/java/com/android/server/wm/RootActivityContainer.java b/services/core/java/com/android/server/wm/RootActivityContainer.java
index 624fdc2..fb5b1d8 100644
--- a/services/core/java/com/android/server/wm/RootActivityContainer.java
+++ b/services/core/java/com/android/server/wm/RootActivityContainer.java
@@ -777,11 +777,8 @@
// First the front stacks. In case any are not fullscreen and are in front of home.
for (int displayNdx = mActivityDisplays.size() - 1; displayNdx >= 0; --displayNdx) {
final ActivityDisplay display = mActivityDisplays.get(displayNdx);
- for (int stackNdx = display.getChildCount() - 1; stackNdx >= 0; --stackNdx) {
- final ActivityStack stack = display.getChildAt(stackNdx);
- stack.ensureActivitiesVisibleLocked(starting, configChanges, preserveWindows,
- notifyClients);
- }
+ display.ensureActivitiesVisible(starting, configChanges, preserveWindows,
+ notifyClients);
}
} finally {
mStackSupervisor.getKeyguardController().endActivityVisibilityUpdate();
@@ -2372,12 +2369,13 @@
return printed;
}
- void writeToProto(ProtoOutputStream proto, long fieldId) {
+ protected void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
final long token = proto.start(fieldId);
- super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */);
+ super.writeToProto(proto, CONFIGURATION_CONTAINER, logLevel);
for (int displayNdx = 0; displayNdx < mActivityDisplays.size(); ++displayNdx) {
final ActivityDisplay activityDisplay = mActivityDisplays.get(displayNdx);
- activityDisplay.writeToProto(proto, DISPLAYS);
+ activityDisplay.writeToProto(proto, DISPLAYS, logLevel);
}
mStackSupervisor.getKeyguardController().writeToProto(proto, KEYGUARD_CONTROLLER);
// TODO(b/111541062): Update tests to look for resumed activities on all displays
diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
index 8fb7947..300cd17 100644
--- a/services/core/java/com/android/server/wm/RootWindowContainer.java
+++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
@@ -999,17 +999,22 @@
@CallSuper
@Override
- public void writeToProto(ProtoOutputStream proto, long fieldId, boolean trim) {
+ public void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
+ if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
+ return;
+ }
+
final long token = proto.start(fieldId);
- super.writeToProto(proto, WINDOW_CONTAINER, trim);
+ super.writeToProto(proto, WINDOW_CONTAINER, logLevel);
if (mWmService.mDisplayReady) {
final int count = mChildren.size();
for (int i = 0; i < count; ++i) {
final DisplayContent displayContent = mChildren.get(i);
- displayContent.writeToProto(proto, DISPLAYS, trim);
+ displayContent.writeToProto(proto, DISPLAYS, logLevel);
}
}
- if (!trim) {
+ if (logLevel == WindowTraceLogLevel.ALL) {
forAllWindows((w) -> {
w.writeIdentifierToProto(proto, WINDOWS);
}, true);
diff --git a/services/core/java/com/android/server/wm/SurfaceAnimator.java b/services/core/java/com/android/server/wm/SurfaceAnimator.java
index 1a8a911..c600e0f 100644
--- a/services/core/java/com/android/server/wm/SurfaceAnimator.java
+++ b/services/core/java/com/android/server/wm/SurfaceAnimator.java
@@ -325,7 +325,7 @@
if (mAnimation != null) {
mAnimation.writeToProto(proto, ANIMATION_ADAPTER);
}
- if (mLeash != null){
+ if (mLeash != null) {
mLeash.writeToProto(proto, LEASH);
}
proto.write(ANIMATION_START_DELAYED, mAnimationStartDelayed);
diff --git a/services/core/java/com/android/server/wm/Task.java b/services/core/java/com/android/server/wm/Task.java
index 476bd6e..888d741 100644
--- a/services/core/java/com/android/server/wm/Task.java
+++ b/services/core/java/com/android/server/wm/Task.java
@@ -252,8 +252,8 @@
}
@Override
- void onParentSet() {
- super.onParentSet();
+ void onParentChanged() {
+ super.onParentChanged();
// Update task bounds if needed.
adjustBoundsForDisplayChangeIfNeeded(getDisplayContent());
@@ -316,6 +316,7 @@
mRotation = rotation;
+ updateSurfacePosition();
return boundsChange;
}
@@ -358,6 +359,7 @@
} else {
mOverrideDisplayedBounds.setEmpty();
}
+ updateSurfacePosition();
}
/**
@@ -795,13 +797,18 @@
@CallSuper
@Override
- public void writeToProto(ProtoOutputStream proto, long fieldId, boolean trim) {
+ public void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
+ if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
+ return;
+ }
+
final long token = proto.start(fieldId);
- super.writeToProto(proto, WINDOW_CONTAINER, trim);
+ super.writeToProto(proto, WINDOW_CONTAINER, logLevel);
proto.write(ID, mTaskId);
for (int i = mChildren.size() - 1; i >= 0; i--) {
final AppWindowToken appWindowToken = mChildren.get(i);
- appWindowToken.writeToProto(proto, APP_WINDOW_TOKENS, trim);
+ appWindowToken.writeToProto(proto, APP_WINDOW_TOKENS, logLevel);
}
proto.write(FILLS_PARENT, matchParentBounds());
getBounds().writeToProto(proto, BOUNDS);
diff --git a/services/core/java/com/android/server/wm/TaskRecord.java b/services/core/java/com/android/server/wm/TaskRecord.java
index 0529ed1..af38c06 100644
--- a/services/core/java/com/android/server/wm/TaskRecord.java
+++ b/services/core/java/com/android/server/wm/TaskRecord.java
@@ -2476,9 +2476,14 @@
return toString();
}
- public void writeToProto(ProtoOutputStream proto, long fieldId) {
+ public void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
+ if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
+ return;
+ }
+
final long token = proto.start(fieldId);
- super.writeToProto(proto, CONFIGURATION_CONTAINER, false /* trim */);
+ super.writeToProto(proto, CONFIGURATION_CONTAINER, logLevel);
proto.write(ID, taskId);
for (int i = mActivities.size() - 1; i >= 0; i--) {
ActivityRecord activity = mActivities.get(i);
diff --git a/services/core/java/com/android/server/wm/TaskStack.java b/services/core/java/com/android/server/wm/TaskStack.java
index bfef1e9..53cd5ea 100644
--- a/services/core/java/com/android/server/wm/TaskStack.java
+++ b/services/core/java/com/android/server/wm/TaskStack.java
@@ -996,8 +996,8 @@
}
@Override
- void onParentSet() {
- super.onParentSet();
+ void onParentChanged() {
+ super.onParentChanged();
if (getParent() != null || mDisplayContent == null) {
return;
@@ -1340,12 +1340,17 @@
@CallSuper
@Override
- public void writeToProto(ProtoOutputStream proto, long fieldId, boolean trim) {
+ public void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
+ if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
+ return;
+ }
+
final long token = proto.start(fieldId);
- super.writeToProto(proto, WINDOW_CONTAINER, trim);
+ super.writeToProto(proto, WINDOW_CONTAINER, logLevel);
proto.write(ID, mStackId);
for (int taskNdx = mChildren.size() - 1; taskNdx >= 0; taskNdx--) {
- mChildren.get(taskNdx).writeToProto(proto, TASKS, trim);
+ mChildren.get(taskNdx).writeToProto(proto, TASKS, logLevel);
}
proto.write(FILLS_PARENT, matchParentBounds());
getRawBounds().writeToProto(proto, BOUNDS);
diff --git a/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java b/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
index dd94af6..4ff552e 100644
--- a/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
+++ b/services/core/java/com/android/server/wm/TaskTapPointerEventListener.java
@@ -22,6 +22,8 @@
import static android.view.PointerIcon.TYPE_TOP_RIGHT_DIAGONAL_DOUBLE_ARROW;
import static android.view.PointerIcon.TYPE_VERTICAL_DOUBLE_ARROW;
+import static com.android.server.wm.ActivityStackSupervisor.PRESERVE_WINDOWS;
+
import android.graphics.Rect;
import android.graphics.Region;
import android.hardware.input.InputManager;
@@ -86,6 +88,16 @@
if (parent != null && parent.getTopChild() != mDisplayContent) {
parent.positionChildAt(WindowContainer.POSITION_TOP, mDisplayContent,
true /* includingParents */);
+ // For compatibility, only the topmost activity is allowed to be resumed for
+ // pre-Q app. Ensure the topmost activities are resumed whenever a display is
+ // moved to top.
+ // TODO(b/123761773): Investigate whether we can move this into
+ // RootActivityContainer#updateTopResumedActivityIfNeeded(). Currently, it is
+ // risky to do so because it seems possible to resume activities as part of a
+ // larger transaction and it's too early to resume based on current order
+ // when performing updateTopResumedActivityIfNeeded().
+ mDisplayContent.mAcitvityDisplay.ensureActivitiesVisible(null /* starting */,
+ 0 /* configChanges */, !PRESERVE_WINDOWS, true /* notifyClients */);
}
}
};
diff --git a/services/core/java/com/android/server/wm/WindowContainer.java b/services/core/java/com/android/server/wm/WindowContainer.java
index 1905877..ed5f5a8 100644
--- a/services/core/java/com/android/server/wm/WindowContainer.java
+++ b/services/core/java/com/android/server/wm/WindowContainer.java
@@ -32,6 +32,7 @@
import android.annotation.CallSuper;
import android.annotation.IntDef;
import android.annotation.Nullable;
+import android.annotation.TestApi;
import android.app.WindowConfiguration;
import android.content.res.Configuration;
import android.graphics.Point;
@@ -161,23 +162,16 @@
final protected void setParent(WindowContainer<WindowContainer> parent) {
mParent = parent;
- // Removing parent usually means that we've detached this entity to destroy it or to attach
- // to another parent. In both cases we don't need to update the configuration now.
- if (mParent != null) {
- // Update full configuration of this container and all its children.
- onConfigurationChanged(mParent.getConfiguration());
- // Update merged override configuration of this container and all its children.
- onMergedOverrideConfigurationChanged();
- }
-
- onParentSet();
+ onParentChanged();
}
/**
* Callback that is triggered when @link WindowContainer#setParent(WindowContainer)} was called.
* Supposed to be overridden and contain actions that should be executed after parent was set.
*/
- void onParentSet() {
+ @Override
+ void onParentChanged() {
+ super.onParentChanged();
if (mParent == null) {
return;
}
@@ -1103,17 +1097,25 @@
*
* @param proto Stream to write the WindowContainer object to.
* @param fieldId Field Id of the WindowContainer as defined in the parent message.
- * @param trim If true, reduce the amount of data written.
+ * @param logLevel Determines the amount of data to be written to the Protobuf.
* @hide
*/
@CallSuper
@Override
- public void writeToProto(ProtoOutputStream proto, long fieldId, boolean trim) {
+ public void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
+ boolean isVisible = isVisible();
+ if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible) {
+ return;
+ }
+
final long token = proto.start(fieldId);
- super.writeToProto(proto, CONFIGURATION_CONTAINER, trim);
+ super.writeToProto(proto, CONFIGURATION_CONTAINER, logLevel);
proto.write(ORIENTATION, mOrientation);
- proto.write(VISIBLE, isVisible());
- mSurfaceAnimator.writeToProto(proto, SURFACE_ANIMATOR);
+ proto.write(VISIBLE, isVisible);
+ if (mSurfaceAnimator.isAnimating()) {
+ mSurfaceAnimator.writeToProto(proto, SURFACE_ANIMATOR);
+ }
proto.end(token);
}
@@ -1330,6 +1332,11 @@
mLastSurfacePosition.set(mTmpPos.x, mTmpPos.y);
}
+ @TestApi
+ Point getLastSurfacePosition() {
+ return mLastSurfacePosition;
+ }
+
/**
* Displayed bounds specify where to display this container at. It differs from bounds during
* certain operations (like animation or interactive dragging).
diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java
index 975e62a..146a8ed 100644
--- a/services/core/java/com/android/server/wm/WindowManagerService.java
+++ b/services/core/java/com/android/server/wm/WindowManagerService.java
@@ -841,11 +841,8 @@
try {
Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "closeSurfaceTransaction");
synchronized (mGlobalLock) {
- try {
- traceStateLocked(where);
- } finally {
- SurfaceControl.closeTransaction();
- }
+ SurfaceControl.closeTransaction();
+ traceStateLocked(where);
}
} finally {
Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
@@ -5742,11 +5739,11 @@
* {@link com.android.server.wm.WindowManagerServiceDumpProto}.
*
* @param proto Stream to write the WindowContainer object to.
- * @param trim If true, reduce the amount of data written.
+ * @param logLevel Determines the amount of data to be written to the Protobuf.
*/
- void writeToProtoLocked(ProtoOutputStream proto, boolean trim) {
+ void writeToProtoLocked(ProtoOutputStream proto, @WindowTraceLogLevel int logLevel) {
mPolicy.writeToProto(proto, POLICY);
- mRoot.writeToProto(proto, ROOT_WINDOW_CONTAINER, trim);
+ mRoot.writeToProto(proto, ROOT_WINDOW_CONTAINER, logLevel);
final DisplayContent topFocusedDisplayContent = mRoot.getTopFocusedDisplayContent();
if (topFocusedDisplayContent.mCurrentFocus != null) {
topFocusedDisplayContent.mCurrentFocus.writeIdentifierToProto(proto, FOCUSED_WINDOW);
@@ -5765,13 +5762,13 @@
}
void traceStateLocked(String where) {
- Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "traceStateLocked");
+ Trace.traceBegin(TRACE_TAG_WINDOW_MANAGER, "traceStateLocked");
try {
mWindowTracing.traceStateLocked(where, this);
} catch (Exception e) {
Log.wtf(TAG, "Exception while tracing state", e);
} finally {
- Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
+ Trace.traceEnd(TRACE_TAG_WINDOW_MANAGER);
}
}
@@ -6074,7 +6071,7 @@
if (useProto) {
final ProtoOutputStream proto = new ProtoOutputStream(fd);
synchronized (mGlobalLock) {
- writeToProtoLocked(proto, false /* trim */);
+ writeToProtoLocked(proto, WindowTraceLogLevel.ALL);
}
proto.flush();
return;
diff --git a/services/core/java/com/android/server/wm/WindowProcessController.java b/services/core/java/com/android/server/wm/WindowProcessController.java
index 8da39b6..0fb900a 100644
--- a/services/core/java/com/android/server/wm/WindowProcessController.java
+++ b/services/core/java/com/android/server/wm/WindowProcessController.java
@@ -17,6 +17,7 @@
package com.android.server.wm;
import static android.app.ActivityManager.PROCESS_STATE_NONEXISTENT;
+import static android.os.Build.VERSION_CODES.Q;
import static android.view.Display.INVALID_DISPLAY;
import static com.android.server.am.ActivityManagerService.MY_PID;
@@ -32,11 +33,11 @@
import static com.android.server.wm.ActivityTaskManagerDebugConfig.POSTFIX_RELEASE;
import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_ATM;
import static com.android.server.wm.ActivityTaskManagerDebugConfig.TAG_WITH_CLASS_NAME;
-import static com.android.server.wm.ActivityTaskManagerService
- .INSTRUMENTATION_KEY_DISPATCHING_TIMEOUT_MS;
+import static com.android.server.wm.ActivityTaskManagerService.INSTRUMENTATION_KEY_DISPATCHING_TIMEOUT_MS;
import static com.android.server.wm.ActivityTaskManagerService.KEY_DISPATCHING_TIMEOUT_MS;
import static com.android.server.wm.ActivityTaskManagerService.RELAUNCH_REASON_NONE;
+import android.annotation.NonNull;
import android.app.Activity;
import android.app.ActivityThread;
import android.app.IApplicationThread;
@@ -155,6 +156,8 @@
private final ArrayList<ActivityRecord> mActivities = new ArrayList<>();
// any tasks this process had run root activities in
private final ArrayList<TaskRecord> mRecentTasks = new ArrayList<>();
+ // The most recent top-most activity that was resumed in the process for pre-Q app.
+ private ActivityRecord mPreQTopResumedActivity = null;
// Last configuration that was reported to the process.
private final Configuration mLastReportedConfiguration;
@@ -364,8 +367,10 @@
return mAllowBackgroundActivityStarts;
}
- public void setInstrumenting(boolean instrumenting) {
+ public void setInstrumenting(boolean instrumenting,
+ boolean hasBackgroundActivityStartPrivileges) {
mInstrumenting = instrumenting;
+ mInstrumentingWithBackgroundActivityStartPrivileges = hasBackgroundActivityStartPrivileges;
}
boolean isInstrumenting() {
@@ -373,15 +378,6 @@
}
/**
- * {@see isInstrumentingWithBackgroundActivityStartPrivileges}
- */
- public void setInstrumentingWithBackgroundActivityStartPrivileges(
- boolean instrumentingWithBackgroundActivityStartPrivileges) {
- mInstrumentingWithBackgroundActivityStartPrivileges =
- instrumentingWithBackgroundActivityStartPrivileges;
- }
-
- /**
* @return true if the instrumentation was started by a holder of
* START_ACTIVITIES_FROM_BACKGROUND permission
*/
@@ -469,6 +465,59 @@
}
}
+ /**
+ * Update the top resuming activity in process for pre-Q apps, only the top-most visible
+ * activities are allowed to be resumed per process.
+ * @return {@code true} if the activity is allowed to be resumed by compatibility
+ * restrictions, which the activity was the topmost visible activity in process or the app is
+ * targeting after Q.
+ */
+ boolean updateTopResumingActivityInProcessIfNeeded(@NonNull ActivityRecord activity) {
+ if (mInfo.targetSdkVersion >= Q || mPreQTopResumedActivity == activity) {
+ return true;
+ }
+
+ final ActivityDisplay display = activity.getDisplay();
+ if (display == null) {
+ // No need to update if the activity hasn't attach to any display.
+ return false;
+ }
+
+ boolean canUpdate = false;
+ final ActivityDisplay topDisplay =
+ mPreQTopResumedActivity != null ? mPreQTopResumedActivity.getDisplay() : null;
+ // Update the topmost activity if current top activity was not on any display or no
+ // longer visible.
+ if (topDisplay == null || !mPreQTopResumedActivity.visible) {
+ canUpdate = true;
+ }
+
+ // Update the topmost activity if the current top activity wasn't on top of the other one.
+ if (!canUpdate && topDisplay.mDisplayContent.compareTo(display.mDisplayContent) < 0) {
+ canUpdate = true;
+ }
+
+ // Compare the z-order of ActivityStacks if both activities landed on same display.
+ if (display == topDisplay
+ && mPreQTopResumedActivity.getActivityStack().mTaskStack.compareTo(
+ activity.getActivityStack().mTaskStack) <= 0) {
+ canUpdate = true;
+ }
+
+ if (canUpdate) {
+ // Make sure the previous top activity in the process no longer be resumed.
+ if (mPreQTopResumedActivity != null && mPreQTopResumedActivity.isState(RESUMED)) {
+ final ActivityStack stack = mPreQTopResumedActivity.getActivityStack();
+ if (stack != null) {
+ stack.startPausingLocked(false /* userLeaving */, false /* uiSleeping */,
+ null /* resuming */, false /* pauseImmediately */);
+ }
+ }
+ mPreQTopResumedActivity = activity;
+ }
+ return canUpdate;
+ }
+
public void stopFreezingActivities() {
synchronized (mAtm.mGlobalLock) {
int i = mActivities.size();
diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index 62e7200..4bc1400 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -747,8 +747,8 @@
}
@Override
- void onParentSet() {
- super.onParentSet();
+ void onParentChanged() {
+ super.onParentChanged();
setDrawnStateEvaluated(false /*evaluated*/);
getDisplayContent().reapplyMagnificationSpec();
@@ -3221,9 +3221,15 @@
@CallSuper
@Override
- public void writeToProto(ProtoOutputStream proto, long fieldId, boolean trim) {
+ public void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
+ boolean isVisible = isVisible();
+ if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible) {
+ return;
+ }
+
final long token = proto.start(fieldId);
- super.writeToProto(proto, WINDOW_CONTAINER, trim);
+ super.writeToProto(proto, WINDOW_CONTAINER, logLevel);
writeIdentifierToProto(proto, IDENTIFIER);
proto.write(DISPLAY_ID, getDisplayId());
proto.write(STACK_ID, getStackId());
@@ -3235,7 +3241,7 @@
mWinAnimator.writeToProto(proto, ANIMATOR);
proto.write(ANIMATING_EXIT, mAnimatingExit);
for (int i = 0; i < mChildren.size(); i++) {
- mChildren.get(i).writeToProto(proto, CHILD_WINDOWS, trim);
+ mChildren.get(i).writeToProto(proto, CHILD_WINDOWS, logLevel);
}
proto.write(REQUESTED_WIDTH, mRequestedWidth);
proto.write(REQUESTED_HEIGHT, mRequestedHeight);
@@ -3247,7 +3253,7 @@
proto.write(DESTROYING, mDestroying);
proto.write(REMOVED, mRemoved);
proto.write(IS_ON_SCREEN, isOnScreen());
- proto.write(IS_VISIBLE, isVisible());
+ proto.write(IS_VISIBLE, isVisible);
proto.write(PENDING_SEAMLESS_ROTATION, mPendingSeamlessRotate != null);
proto.write(FINISHED_SEAMLESS_ROTATION_FRAME, mFinishSeamlessRotateFrameNumber);
proto.write(FORCE_SEAMLESS_ROTATION, mForceSeamlesslyRotate);
diff --git a/services/core/java/com/android/server/wm/WindowToken.java b/services/core/java/com/android/server/wm/WindowToken.java
index 9c13782..3b9b8ba 100644
--- a/services/core/java/com/android/server/wm/WindowToken.java
+++ b/services/core/java/com/android/server/wm/WindowToken.java
@@ -270,13 +270,18 @@
@CallSuper
@Override
- public void writeToProto(ProtoOutputStream proto, long fieldId, boolean trim) {
+ public void writeToProto(ProtoOutputStream proto, long fieldId,
+ @WindowTraceLogLevel int logLevel) {
+ if (logLevel == WindowTraceLogLevel.CRITICAL && !isVisible()) {
+ return;
+ }
+
final long token = proto.start(fieldId);
- super.writeToProto(proto, WINDOW_CONTAINER, trim);
+ super.writeToProto(proto, WINDOW_CONTAINER, logLevel);
proto.write(HASH_CODE, System.identityHashCode(this));
for (int i = 0; i < mChildren.size(); i++) {
final WindowState w = mChildren.get(i);
- w.writeToProto(proto, WINDOWS, trim);
+ w.writeToProto(proto, WINDOWS, logLevel);
}
proto.write(HIDDEN, mHidden);
proto.write(WAITING_TO_SHOW, waitingToShow);
diff --git a/services/core/java/com/android/server/wm/WindowTraceBuffer.java b/services/core/java/com/android/server/wm/WindowTraceBuffer.java
index 2f672f2..e4461ea 100644
--- a/services/core/java/com/android/server/wm/WindowTraceBuffer.java
+++ b/services/core/java/com/android/server/wm/WindowTraceBuffer.java
@@ -40,7 +40,7 @@
private static final long MAGIC_NUMBER_VALUE = ((long) MAGIC_NUMBER_H << 32) | MAGIC_NUMBER_L;
final Object mBufferLock = new Object();
- final Queue<byte[]> mBuffer = new ArrayDeque<>();
+ final Queue<ProtoOutputStream> mBuffer = new ArrayDeque<>();
final File mTraceFile;
int mBufferSize;
private final int mBufferCapacity;
@@ -64,8 +64,7 @@
* than the buffer size.
*/
void add(ProtoOutputStream proto) {
- byte[] protoBytes = proto.getBytes();
- int protoLength = protoBytes.length;
+ int protoLength = proto.getRawSize();
if (protoLength > mBufferCapacity) {
throw new IllegalStateException("Trace object too large for the buffer. Buffer size:"
+ mBufferCapacity + " Object size: " + protoLength);
@@ -73,7 +72,7 @@
synchronized (mBufferLock) {
boolean canAdd = canAdd(protoLength);
if (canAdd) {
- mBuffer.offer(protoBytes);
+ mBuffer.add(proto);
mBufferSize += protoLength;
}
mBufferLock.notify();
@@ -97,7 +96,7 @@
@VisibleForTesting
boolean contains(byte[] other) {
return mBuffer.stream()
- .anyMatch(p -> Arrays.equals(p, other));
+ .anyMatch(p -> Arrays.equals(p.getBytes(), other));
}
private void initTraceFile() throws IOException {
diff --git a/services/core/java/com/android/server/wm/WindowTraceLogLevel.java b/services/core/java/com/android/server/wm/WindowTraceLogLevel.java
new file mode 100644
index 0000000..2165c66
--- /dev/null
+++ b/services/core/java/com/android/server/wm/WindowTraceLogLevel.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2019 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.wm;
+
+import android.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+@IntDef({
+ WindowTraceLogLevel.ALL,
+ WindowTraceLogLevel.TRIM,
+ WindowTraceLogLevel.CRITICAL,
+})
+@Retention(RetentionPolicy.SOURCE)
+@interface WindowTraceLogLevel{
+ /**
+ * Logs all elements with maximum amount of information.
+ *
+ * Used to store the current window manager state when generating a bug report
+ */
+ int ALL = 0;
+ /**
+ * Logs all elements but doesn't write all configuration data
+ *
+ * Default log level for manually activated Winscope traces
+ */
+ int TRIM = 1;
+ /**
+ * Logs only visible elements, with the minimum amount of performance overhead
+ *
+ * Default log level for continuous traces
+ */
+ int CRITICAL = 2;
+}
diff --git a/services/core/java/com/android/server/wm/WindowTraceQueueBuffer.java b/services/core/java/com/android/server/wm/WindowTraceQueueBuffer.java
index eaedde9..5888b7a 100644
--- a/services/core/java/com/android/server/wm/WindowTraceQueueBuffer.java
+++ b/services/core/java/com/android/server/wm/WindowTraceQueueBuffer.java
@@ -19,6 +19,7 @@
import static android.os.Build.IS_USER;
import android.util.Log;
+import android.util.proto.ProtoOutputStream;
import com.android.internal.annotations.VisibleForTesting;
@@ -67,19 +68,18 @@
private void loop() throws IOException, InterruptedException {
while (!mCancel) {
- byte[] proto;
+ ProtoOutputStream proto;
synchronized (mBufferLock) {
mBufferLock.wait();
-
proto = mBuffer.poll();
if (proto != null) {
- mBufferSize -= proto.length;
+ mBufferSize -= proto.getRawSize();
}
}
-
if (proto != null) {
try (OutputStream os = new FileOutputStream(mTraceFile, true)) {
- os.write(proto);
+ byte[] protoBytes = proto.getBytes();
+ os.write(protoBytes);
}
}
}
@@ -97,7 +97,6 @@
mCancel = true;
mBufferLock.notify();
}
-
if (mConsumerThread != null) {
mConsumerThread.join();
mConsumerThread = null;
diff --git a/services/core/java/com/android/server/wm/WindowTraceRingBuffer.java b/services/core/java/com/android/server/wm/WindowTraceRingBuffer.java
index 7c69f23..77d30be 100644
--- a/services/core/java/com/android/server/wm/WindowTraceRingBuffer.java
+++ b/services/core/java/com/android/server/wm/WindowTraceRingBuffer.java
@@ -16,6 +16,8 @@
package com.android.server.wm;
+import android.util.proto.ProtoOutputStream;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
@@ -49,20 +51,20 @@
synchronized (mBufferLock) {
try (OutputStream os = new FileOutputStream(mTraceFile, true)) {
while (!mBuffer.isEmpty()) {
- byte[] proto;
- proto = mBuffer.poll();
- mBufferSize -= proto.length;
- os.write(proto);
+ ProtoOutputStream proto = mBuffer.poll();
+ mBufferSize -= proto.getRawSize();
+ byte[] protoBytes = proto.getBytes();
+ os.write(protoBytes);
}
}
}
}
private void discardOldest() {
- byte[] item = mBuffer.poll();
+ ProtoOutputStream item = mBuffer.poll();
if (item == null) {
throw new IllegalStateException("No element to discard from buffer");
}
- mBufferSize -= item.length;
+ mBufferSize -= item.getRawSize();
}
}
diff --git a/services/core/java/com/android/server/wm/WindowTracing.java b/services/core/java/com/android/server/wm/WindowTracing.java
index 4c9a917..8b1ffa8 100644
--- a/services/core/java/com/android/server/wm/WindowTracing.java
+++ b/services/core/java/com/android/server/wm/WindowTracing.java
@@ -53,6 +53,7 @@
private WindowTraceBuffer mTraceBuffer;
+ private @WindowTraceLogLevel int mWindowTraceLogLevel = WindowTraceLogLevel.TRIM;
private boolean mContinuousMode;
private boolean mEnabled;
private volatile boolean mEnabledLockFree;
@@ -118,6 +119,8 @@
+ "trace is restarted.");
}
mContinuousMode = continuous;
+ mWindowTraceLogLevel = (continuous) ? WindowTraceLogLevel.CRITICAL :
+ WindowTraceLogLevel.TRIM;
}
private void appendTraceEntry(ProtoOutputStream proto) {
@@ -166,22 +169,26 @@
return;
}
- ProtoOutputStream os = new ProtoOutputStream();
- long tokenOuter = os.start(ENTRY);
- os.write(ELAPSED_REALTIME_NANOS, SystemClock.elapsedRealtimeNanos());
- os.write(WHERE, where);
-
- Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "writeToProtoLocked");
+ Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "writeToBufferLocked");
try {
- long tokenInner = os.start(WINDOW_MANAGER_SERVICE);
- service.writeToProtoLocked(os, true /* trim */);
- os.end(tokenInner);
+ ProtoOutputStream os = new ProtoOutputStream();
+ long tokenOuter = os.start(ENTRY);
+ os.write(ELAPSED_REALTIME_NANOS, SystemClock.elapsedRealtimeNanos());
+ os.write(WHERE, where);
+
+ Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "writeToProtoLocked");
+ try {
+ long tokenInner = os.start(WINDOW_MANAGER_SERVICE);
+ service.writeToProtoLocked(os, mWindowTraceLogLevel);
+ os.end(tokenInner);
+ } finally {
+ Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
+ }
+ os.end(tokenOuter);
+ appendTraceEntry(os);
} finally {
Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
}
- os.end(tokenOuter);
- appendTraceEntry(os);
- Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
}
/**
diff --git a/services/core/jni/com_android_server_security_VerityUtils.cpp b/services/core/jni/com_android_server_security_VerityUtils.cpp
index 988d75c..bf96f9a 100644
--- a/services/core/jni/com_android_server_security_VerityUtils.cpp
+++ b/services/core/jni/com_android_server_security_VerityUtils.cpp
@@ -27,6 +27,8 @@
#include <sys/stat.h>
#include <sys/types.h>
+#include <type_traits>
+
#include <android-base/unique_fd.h>
// TODO(112037636): Always include once fsverity.h is upstreamed.
@@ -99,8 +101,14 @@
class JavaByteArrayHolder {
public:
- static JavaByteArrayHolder* newArray(JNIEnv* env, jsize size) {
- return new JavaByteArrayHolder(env, size);
+ JavaByteArrayHolder(const JavaByteArrayHolder &other) = delete;
+ JavaByteArrayHolder(JavaByteArrayHolder &&other)
+ : mEnv(other.mEnv), mBytes(other.mBytes), mElements(other.mElements) {
+ other.mElements = nullptr;
+ }
+
+ static JavaByteArrayHolder newArray(JNIEnv* env, jsize size) {
+ return JavaByteArrayHolder(env, size);
}
jbyte* getRaw() {
@@ -113,6 +121,10 @@
return mBytes;
}
+ ~JavaByteArrayHolder() {
+ LOG_ALWAYS_FATAL_IF(mElements == nullptr, "Elements are not released");
+ }
+
private:
JavaByteArrayHolder(JNIEnv* env, jsize size) {
mEnv = env;
@@ -121,10 +133,6 @@
memset(mElements, 0, size);
}
- virtual ~JavaByteArrayHolder() {
- LOG_ALWAYS_FATAL_IF(mElements == nullptr, "Elements are not released");
- }
-
JNIEnv* mEnv;
jbyteArray mBytes;
jbyte* mElements;
@@ -143,8 +151,10 @@
}
int measureFsverity(JNIEnv* env, jobject /* clazz */, jstring filePath) {
- auto raii = JavaByteArrayHolder::newArray(env, sizeof(fsverity_digest) + kSha256Bytes);
- fsverity_digest* data = reinterpret_cast<fsverity_digest*>(raii->getRaw());
+ using Storage = std::aligned_storage_t<sizeof(fsverity_digest) + kSha256Bytes>;
+
+ Storage bytes;
+ fsverity_digest *data = reinterpret_cast<fsverity_digest *>(&bytes);
data->digest_size = kSha256Bytes; // the only input/output parameter
const char* path = env->GetStringUTFChars(filePath, nullptr);
@@ -160,7 +170,7 @@
jbyteArray constructFsveritySignedData(JNIEnv* env, jobject /* clazz */, jbyteArray digest) {
auto raii = JavaByteArrayHolder::newArray(env, sizeof(fsverity_digest_disk) + kSha256Bytes);
- fsverity_digest_disk* data = reinterpret_cast<fsverity_digest_disk*>(raii->getRaw());
+ fsverity_digest_disk* data = reinterpret_cast<fsverity_digest_disk*>(raii.getRaw());
data->digest_algorithm = FS_VERITY_ALG_SHA256;
data->digest_size = kSha256Bytes;
@@ -172,13 +182,13 @@
const jbyte* src = env->GetByteArrayElements(digest, nullptr);
memcpy(data->digest, src, kSha256Bytes);
- return raii->release();
+ return raii.release();
}
jbyteArray constructFsverityDescriptor(JNIEnv* env, jobject /* clazz */, jlong fileSize) {
auto raii = JavaByteArrayHolder::newArray(env, sizeof(fsverity_descriptor));
- fsverity_descriptor* desc = reinterpret_cast<fsverity_descriptor*>(raii->getRaw());
+ fsverity_descriptor* desc = reinterpret_cast<fsverity_descriptor*>(raii.getRaw());
memcpy(desc->magic, FS_VERITY_MAGIC, sizeof(desc->magic));
desc->major_version = 1;
@@ -191,29 +201,29 @@
desc->orig_file_size = fileSize;
desc->auth_ext_count = 1;
- return raii->release();
+ return raii.release();
}
jbyteArray constructFsverityExtension(JNIEnv* env, jobject /* clazz */, jshort extensionId,
jint extensionDataSize) {
auto raii = JavaByteArrayHolder::newArray(env, sizeof(fsverity_extension));
- fsverity_extension* ext = reinterpret_cast<fsverity_extension*>(raii->getRaw());
+ fsverity_extension* ext = reinterpret_cast<fsverity_extension*>(raii.getRaw());
ext->length = sizeof(fsverity_extension) + extensionDataSize;
ext->type = extensionId;
- return raii->release();
+ return raii.release();
}
jbyteArray constructFsverityFooter(JNIEnv* env, jobject /* clazz */,
jint offsetToDescriptorHead) {
auto raii = JavaByteArrayHolder::newArray(env, sizeof(fsverity_footer));
- fsverity_footer* footer = reinterpret_cast<fsverity_footer*>(raii->getRaw());
+ fsverity_footer* footer = reinterpret_cast<fsverity_footer*>(raii.getRaw());
footer->desc_reverse_offset = offsetToDescriptorHead + sizeof(fsverity_footer);
memcpy(footer->magic, FS_VERITY_MAGIC, sizeof(footer->magic));
- return raii->release();
+ return raii.release();
}
const JNINativeMethod sMethods[] = {
diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
index 8f5ce74..1155f49 100644
--- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
+++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java
@@ -4765,6 +4765,11 @@
@Override
@PasswordComplexity
public int getPasswordComplexity() {
+ DevicePolicyEventLogger
+ .createEvent(DevicePolicyEnums.GET_USER_PASSWORD_COMPLEXITY_LEVEL)
+ .setStrings(mInjector.getPackageManager()
+ .getPackagesForUid(mInjector.binderGetCallingUid()))
+ .write();
final int callingUserId = mInjector.userHandleGetCallingUserId();
enforceUserUnlocked(callingUserId);
mContext.enforceCallingOrSelfPermission(
diff --git a/services/java/com/android/server/SystemServer.java b/services/java/com/android/server/SystemServer.java
index 6733440..caeedee 100644
--- a/services/java/com/android/server/SystemServer.java
+++ b/services/java/com/android/server/SystemServer.java
@@ -102,7 +102,6 @@
import com.android.server.media.MediaResourceMonitorService;
import com.android.server.media.MediaRouterService;
import com.android.server.media.MediaSessionService;
-import com.android.server.media.MediaUpdateService;
import com.android.server.media.projection.MediaProjectionManagerService;
import com.android.server.net.NetworkPolicyManagerService;
import com.android.server.net.NetworkStatsService;
@@ -263,8 +262,6 @@
"com.android.internal.car.CarServiceHelperService";
private static final String TIME_DETECTOR_SERVICE_CLASS =
"com.android.server.timedetector.TimeDetectorService$Lifecycle";
- private static final String TIME_ZONE_DETECTOR_SERVICE_CLASS =
- "com.android.server.timezonedetector.TimeZoneDetectorService$Lifecycle";
private static final String ACCESSIBILITY_MANAGER_SERVICE_CLASS =
"com.android.server.accessibility.AccessibilityManagerService$Lifecycle";
private static final String ADB_SERVICE_CLASS =
@@ -1428,14 +1425,6 @@
reportWtf("starting StartTimeDetectorService service", e);
}
traceEnd();
-
- traceBeginAndSlog("StartTimeZoneDetectorService");
- try {
- mSystemServiceManager.startService(TIME_ZONE_DETECTOR_SERVICE_CLASS);
- } catch (Throwable e) {
- reportWtf("starting StartTimeZoneDetectorService service", e);
- }
- traceEnd();
}
if (!isWatch) {
@@ -1698,10 +1687,6 @@
mSystemServiceManager.startService(MediaSessionService.class);
traceEnd();
- traceBeginAndSlog("StartMediaUpdateService");
- mSystemServiceManager.startService(MediaUpdateService.class);
- traceEnd();
-
if (mPackageManager.hasSystemFeature(PackageManager.FEATURE_HDMI_CEC)) {
traceBeginAndSlog("StartHdmiControlService");
mSystemServiceManager.startService(HdmiControlService.class);
diff --git a/services/tests/servicestests/src/com/android/server/BinderCallsStatsServiceTest.java b/services/tests/servicestests/src/com/android/server/BinderCallsStatsServiceTest.java
index f75617e..d459163 100644
--- a/services/tests/servicestests/src/com/android/server/BinderCallsStatsServiceTest.java
+++ b/services/tests/servicestests/src/com/android/server/BinderCallsStatsServiceTest.java
@@ -40,14 +40,10 @@
protected int getCallingUid() {
return Process.myUid();
}
-
- protected int getCallingWorkSourceUid() {
- return 1;
- }
};
workSourceProvider.systemReady(InstrumentationRegistry.getContext());
- assertEquals(1, workSourceProvider.resolveWorkSourceUid());
+ assertEquals(1, workSourceProvider.resolveWorkSourceUid(1));
}
@Test
@@ -57,14 +53,10 @@
// System process uid which as UPDATE_DEVICE_STATS.
return 1001;
}
-
- protected int getCallingWorkSourceUid() {
- return 1;
- }
};
workSourceProvider.systemReady(InstrumentationRegistry.getContext());
- assertEquals(1, workSourceProvider.resolveWorkSourceUid());
+ assertEquals(1, workSourceProvider.resolveWorkSourceUid(1));
}
@Test
@@ -74,13 +66,9 @@
// UID without permissions.
return Integer.MAX_VALUE;
}
-
- protected int getCallingWorkSourceUid() {
- return 1;
- }
};
workSourceProvider.systemReady(InstrumentationRegistry.getContext());
- assertEquals(Integer.MAX_VALUE, workSourceProvider.resolveWorkSourceUid());
+ assertEquals(Integer.MAX_VALUE, workSourceProvider.resolveWorkSourceUid(1));
}
}
diff --git a/services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java b/services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java
index d4bb636..089a79b 100644
--- a/services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java
+++ b/services/tests/servicestests/src/com/android/server/am/BroadcastRecordTest.java
@@ -194,6 +194,7 @@
false /* sticky */,
false /* initialSticky */,
userId,
- false /* allowBackgroundActivityStarts */);
+ false, /* allowBackgroundActivityStarts */
+ false /* timeoutExempt */ );
}
}
diff --git a/services/tests/servicestests/src/com/android/server/backup/testutils/IPackageManagerStub.java b/services/tests/servicestests/src/com/android/server/backup/testutils/IPackageManagerStub.java
index a01d589..0355e84 100644
--- a/services/tests/servicestests/src/com/android/server/backup/testutils/IPackageManagerStub.java
+++ b/services/tests/servicestests/src/com/android/server/backup/testutils/IPackageManagerStub.java
@@ -1156,6 +1156,11 @@
}
@Override
+ public String getAppPredictionServicePackageName() {
+ return null;
+ }
+
+ @Override
public boolean isPackageStateProtected(String packageName, int userId) throws RemoteException {
return false;
}
diff --git a/services/tests/servicestests/src/com/android/server/display/BrightnessTrackerTest.java b/services/tests/servicestests/src/com/android/server/display/BrightnessTrackerTest.java
index 79a654b..e3b1245 100644
--- a/services/tests/servicestests/src/com/android/server/display/BrightnessTrackerTest.java
+++ b/services/tests/servicestests/src/com/android/server/display/BrightnessTrackerTest.java
@@ -37,6 +37,9 @@
import android.hardware.SensorEventListener;
import android.hardware.display.AmbientBrightnessDayStats;
import android.hardware.display.BrightnessChangeEvent;
+import android.hardware.display.DisplayManager;
+import android.hardware.display.DisplayedContentSample;
+import android.hardware.display.DisplayedContentSamplingAttributes;
import android.os.BatteryManager;
import android.os.Handler;
import android.os.HandlerThread;
@@ -47,6 +50,7 @@
import android.os.UserManager;
import android.provider.Settings;
import android.util.AtomicFile;
+import android.view.Display;
import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
@@ -116,28 +120,81 @@
assertTrue(mInjector.mIdleScheduled);
mInjector.sendScreenChange(/*screen on */ true);
assertNotNull(mInjector.mSensorListener);
+ assertTrue(mInjector.mColorSamplingEnabled);
mInjector.sendScreenChange(/*screen on */ false);
assertNull(mInjector.mSensorListener);
+ assertFalse(mInjector.mColorSamplingEnabled);
// Turn screen on while brightness mode is manual
mInjector.setBrightnessMode(/* isBrightnessModeAutomatic */ false);
mInjector.sendScreenChange(/*screen on */ true);
assertNull(mInjector.mSensorListener);
+ assertFalse(mInjector.mColorSamplingEnabled);
// Set brightness mode to automatic while screen is off.
mInjector.sendScreenChange(/*screen on */ false);
mInjector.setBrightnessMode(/* isBrightnessModeAutomatic */ true);
assertNull(mInjector.mSensorListener);
+ assertFalse(mInjector.mColorSamplingEnabled);
// Turn on screen while brightness mode is automatic.
mInjector.sendScreenChange(/*screen on */ true);
assertNotNull(mInjector.mSensorListener);
+ assertTrue(mInjector.mColorSamplingEnabled);
mTracker.stop();
assertNull(mInjector.mSensorListener);
assertNull(mInjector.mBroadcastReceiver);
assertFalse(mInjector.mIdleScheduled);
+ assertFalse(mInjector.mColorSamplingEnabled);
+ }
+
+ @Test
+ public void testNoColorSampling_WrongPixelFormat() {
+ mInjector.mDefaultSamplingAttributes =
+ new DisplayedContentSamplingAttributes(
+ 0x23,
+ mInjector.mDefaultSamplingAttributes.getDataspace(),
+ mInjector.mDefaultSamplingAttributes.getComponentMask());
+ startTracker(mTracker);
+ assertFalse(mInjector.mColorSamplingEnabled);
+ assertNull(mInjector.mDisplayListener);
+ }
+
+ @Test
+ public void testNoColorSampling_MissingComponent() {
+ mInjector.mDefaultSamplingAttributes =
+ new DisplayedContentSamplingAttributes(
+ mInjector.mDefaultSamplingAttributes.getPixelFormat(),
+ mInjector.mDefaultSamplingAttributes.getDataspace(),
+ 0x2);
+ startTracker(mTracker);
+ assertFalse(mInjector.mColorSamplingEnabled);
+ assertNull(mInjector.mDisplayListener);
+ }
+
+ @Test
+ public void testNoColorSampling_NoSupport() {
+ mInjector.mDefaultSamplingAttributes = null;
+ startTracker(mTracker);
+ assertFalse(mInjector.mColorSamplingEnabled);
+ assertNull(mInjector.mDisplayListener);
+ }
+
+ @Test
+ public void testColorSampling_FrameRateChange() {
+ startTracker(mTracker);
+ assertTrue(mInjector.mColorSamplingEnabled);
+ assertNotNull(mInjector.mDisplayListener);
+ int noFramesSampled = mInjector.mNoColorSamplingFrames;
+ mInjector.mFrameRate = 120.0f;
+ // Wrong display
+ mInjector.mDisplayListener.onDisplayChanged(Display.DEFAULT_DISPLAY + 10);
+ assertEquals(noFramesSampled, mInjector.mNoColorSamplingFrames);
+ // Correct display
+ mInjector.mDisplayListener.onDisplayChanged(Display.DEFAULT_DISPLAY);
+ assertEquals(noFramesSampled * 2, mInjector.mNoColorSamplingFrames);
}
@Test
@@ -149,26 +206,41 @@
assertNotNull(mInjector.mBroadcastReceiver);
assertNotNull(mInjector.mContentObserver);
assertTrue(mInjector.mIdleScheduled);
+ assertFalse(mInjector.mColorSamplingEnabled);
+ assertNull(mInjector.mDisplayListener);
mInjector.setBrightnessMode(/*isBrightnessModeAutomatic*/ true);
assertNotNull(mInjector.mSensorListener);
+ assertTrue(mInjector.mColorSamplingEnabled);
+ assertNotNull(mInjector.mDisplayListener);
SensorEventListener listener = mInjector.mSensorListener;
+ DisplayManager.DisplayListener displayListener = mInjector.mDisplayListener;
mInjector.mSensorListener = null;
+ mInjector.mColorSamplingEnabled = false;
+ mInjector.mDisplayListener = null;
// Duplicate notification
mInjector.setBrightnessMode(/*isBrightnessModeAutomatic*/ true);
// Sensor shouldn't have been registered as it was already registered.
assertNull(mInjector.mSensorListener);
+ assertFalse(mInjector.mColorSamplingEnabled);
+ assertNull(mInjector.mDisplayListener);
mInjector.mSensorListener = listener;
+ mInjector.mDisplayListener = displayListener;
+ mInjector.mColorSamplingEnabled = true;
mInjector.setBrightnessMode(/*isBrightnessModeAutomatic*/ false);
assertNull(mInjector.mSensorListener);
+ assertFalse(mInjector.mColorSamplingEnabled);
+ assertNull(mInjector.mDisplayListener);
mTracker.stop();
assertNull(mInjector.mSensorListener);
assertNull(mInjector.mBroadcastReceiver);
assertNull(mInjector.mContentObserver);
assertFalse(mInjector.mIdleScheduled);
+ assertFalse(mInjector.mColorSamplingEnabled);
+ assertNull(mInjector.mDisplayListener);
}
@Test
@@ -229,6 +301,8 @@
assertEquals(3333, event.colorTemperature);
assertEquals("a.package", event.packageName);
assertEquals(0, event.userId);
+ assertArrayEquals(new long[] {1, 10, 100, 1000, 300, 30, 10, 1}, event.colorValueBuckets);
+ assertEquals(10000, event.colorSampleDuration);
assertEquals(1, eventsNoPackage.size());
assertNull(eventsNoPackage.get(0).packageName);
@@ -342,7 +416,8 @@
+ "lastNits=\"32\" "
+ "batteryLevel=\"0.5\" nightMode=\"true\" colorTemperature=\"3235\"\n"
+ "lux=\"132.2,131.1\" luxTimestamps=\""
- + Long.toString(someTimeAgo) + "," + Long.toString(someTimeAgo) + "\"/>"
+ + Long.toString(someTimeAgo) + "," + Long.toString(someTimeAgo) + "\""
+ + "colorSampleDuration=\"3456\" colorValueBuckets=\"123,598,23,19\"/>"
// Event that is too old so shouldn't show up.
+ "<event nits=\"142\" timestamp=\""
+ Long.toString(twoMonthsAgo) + "\" packageName=\""
@@ -368,6 +443,7 @@
assertTrue(event.isDefaultBrightnessConfig);
assertEquals(0.5f, event.powerBrightnessFactor, FLOAT_DELTA);
assertTrue(event.isUserSetBrightness);
+ assertNull(event.colorValueBuckets);
events = tracker.getEvents(1, true).getList();
assertEquals(1, events.size());
@@ -386,6 +462,8 @@
assertFalse(event.isDefaultBrightnessConfig);
assertEquals(1.0, event.powerBrightnessFactor, FLOAT_DELTA);
assertFalse(event.isUserSetBrightness);
+ assertEquals(3456L, event.colorSampleDuration);
+ assertArrayEquals(new long[] {123L, 598L, 23L, 19L}, event.colorValueBuckets);
// Pretend user 1 is a profile of user 0.
mInjector.mProfiles = new int[]{0, 1};
@@ -481,6 +559,8 @@
assertEquals(0.5f, event.powerBrightnessFactor, FLOAT_DELTA);
assertTrue(event.isUserSetBrightness);
assertFalse(event.isDefaultBrightnessConfig);
+ assertArrayEquals(new long[] {1, 10, 100, 1000, 300, 30, 10, 1}, event.colorValueBuckets);
+ assertEquals(10000, event.colorSampleDuration);
}
@Test
@@ -546,6 +626,7 @@
builder.setNightMode(false);
builder.setColorTemperature(345);
builder.setLastBrightness(50f);
+ builder.setColorValues(new long[] {23, 34, 45}, 1000L);
BrightnessChangeEvent event = builder.build();
event.writeToParcel(parcel, 0);
@@ -568,6 +649,8 @@
assertEquals(event.nightMode, event2.nightMode);
assertEquals(event.colorTemperature, event2.colorTemperature);
assertEquals(event.lastBrightness, event2.lastBrightness, FLOAT_DELTA);
+ assertArrayEquals(event.colorValueBuckets, event2.colorValueBuckets);
+ assertEquals(event.colorSampleDuration, event2.colorSampleDuration);
parcel = Parcel.obtain();
builder.setBatteryLevel(Float.NaN);
@@ -714,6 +797,7 @@
private class TestInjector extends BrightnessTracker.Injector {
SensorEventListener mSensorListener;
BroadcastReceiver mBroadcastReceiver;
+ DisplayManager.DisplayListener mDisplayListener;
Map<String, Integer> mSecureIntSettings = new HashMap<>();
long mCurrentTimeMillis = System.currentTimeMillis();
long mElapsedRealtimeNanos = SystemClock.elapsedRealtimeNanos();
@@ -723,6 +807,12 @@
int[] mProfiles;
ContentObserver mContentObserver;
boolean mIsBrightnessModeAutomatic = true;
+ boolean mColorSamplingEnabled = false;
+ DisplayedContentSamplingAttributes mDefaultSamplingAttributes =
+ new DisplayedContentSamplingAttributes(0x37, 0, 0x4);
+ float mFrameRate = 60.0f;
+ int mNoColorSamplingFrames;
+
public TestInjector(Handler handler) {
mHandler = handler;
@@ -882,5 +972,43 @@
return mSecureIntSettings.getOrDefault(Settings.Secure.NIGHT_DISPLAY_ACTIVATED,
0) == 1;
}
+
+ @Override
+ public DisplayedContentSample sampleColor(int noFramesToSample) {
+ return new DisplayedContentSample(600L,
+ null,
+ null,
+ new long[] {1, 10, 100, 1000, 300, 30, 10, 1},
+ null);
+ }
+
+ @Override
+ public float getFrameRate(Context context) {
+ return mFrameRate;
+ }
+
+ @Override
+ public DisplayedContentSamplingAttributes getSamplingAttributes() {
+ return mDefaultSamplingAttributes;
+ }
+
+ @Override
+ public boolean enableColorSampling(boolean enable, int noFrames) {
+ mColorSamplingEnabled = enable;
+ mNoColorSamplingFrames = noFrames;
+ return true;
+ }
+
+ @Override
+ public void registerDisplayListener(Context context,
+ DisplayManager.DisplayListener listener, Handler handler) {
+ mDisplayListener = listener;
+ }
+
+ @Override
+ public void unRegisterDisplayListener(Context context,
+ DisplayManager.DisplayListener listener) {
+ mDisplayListener = null;
+ }
}
}
diff --git a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java
index feae4ee..b8799c3 100644
--- a/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java
+++ b/services/tests/servicestests/src/com/android/server/hdmi/HdmiCecLocalDevicePlaybackTest.java
@@ -60,6 +60,11 @@
boolean isControlEnabled() {
return true;
}
+
+ @Override
+ void writeStringSystemProperty(String key, String value) {
+ // do nothing
+ }
};
mMyLooper = mTestLooper.getLooper();
@@ -92,4 +97,39 @@
// TODO(amyjojo): Move set and get LocalActivePath to Control Service.
assertThat(mHdmiCecLocalDevicePlayback.getLocalActivePath()).isEqualTo(1);
}
+
+ @Test
+ public void handleSetSystemAudioModeOn_audioSystemBroadcast() {
+ mHdmiControlService.setSystemAudioActivated(false);
+ assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isFalse();
+ HdmiCecMessage message =
+ HdmiCecMessageBuilder.buildSetSystemAudioMode(
+ Constants.ADDR_AUDIO_SYSTEM, Constants.ADDR_BROADCAST, true);
+ assertThat(mHdmiCecLocalDevicePlayback.handleSetSystemAudioMode(message)).isTrue();
+ assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isTrue();
+ }
+
+ @Test
+ public void handleSetSystemAudioModeOff_audioSystemToPlayback() {
+ mHdmiCecLocalDevicePlayback.mService.setSystemAudioActivated(true);
+ assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isTrue();
+ // This direct message to Playback device is invalid.
+ // Test should ignore it and still keep the system audio mode on.
+ HdmiCecMessage message =
+ HdmiCecMessageBuilder.buildSetSystemAudioMode(
+ Constants.ADDR_AUDIO_SYSTEM, mHdmiCecLocalDevicePlayback.mAddress, false);
+ assertThat(mHdmiCecLocalDevicePlayback.handleSetSystemAudioMode(message)).isTrue();
+ assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isTrue();
+ }
+
+ @Test
+ public void handleSystemAudioModeStatusOn_DirectltToLocalDeviceFromAudioSystem() {
+ mHdmiControlService.setSystemAudioActivated(false);
+ assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isFalse();
+ HdmiCecMessage message =
+ HdmiCecMessageBuilder.buildReportSystemAudioMode(
+ Constants.ADDR_AUDIO_SYSTEM, mHdmiCecLocalDevicePlayback.mAddress, true);
+ assertThat(mHdmiCecLocalDevicePlayback.handleSystemAudioModeStatus(message)).isTrue();
+ assertThat(mHdmiCecLocalDevicePlayback.mService.isSystemAudioActivated()).isTrue();
+ }
}
diff --git a/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java b/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java
index 742ae41..26722fd 100644
--- a/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java
+++ b/services/tests/servicestests/src/com/android/server/pm/PackageInstallerSessionTest.java
@@ -173,7 +173,8 @@
/* isReady */ staged ? true : false,
/* isFailed */ false,
/* isApplied */false,
- /* stagedSessionErrorCode */ PackageInstaller.SessionInfo.VERIFICATION_FAILED,
+ /* stagedSessionErrorCode */
+ PackageInstaller.SessionInfo.STAGED_SESSION_VERIFICATION_FAILED,
/* stagedSessionErrorMessage */ "some error");
}
diff --git a/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java b/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java
index 9cc2b10..e32a789 100644
--- a/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java
+++ b/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySaverPolicyTest.java
@@ -21,8 +21,6 @@
import static com.google.common.truth.Truth.assertThat;
-import static org.mockito.Mockito.mock;
-
import android.content.Context;
import android.os.PowerManager;
import android.os.PowerManager.ServiceType;
@@ -34,10 +32,8 @@
import com.android.frameworks.servicestests.R;
import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.logging.MetricsLogger;
import com.android.server.power.batterysaver.BatterySaverPolicy.Policy;
-import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
/**
@@ -87,9 +83,6 @@
}
}
- @Mock
- MetricsLogger mMetricsLogger = mock(MetricsLogger.class);
-
private BatterySaverPolicyForTest mBatterySaverPolicy;
private final ArrayMap<String, String> mMockGlobalSettings = new ArrayMap<>();
@@ -100,7 +93,7 @@
MockitoAnnotations.initMocks(this);
final Object lock = new Object();
mBatterySaverPolicy = new BatterySaverPolicyForTest(lock, getContext(),
- new BatterySavingStats(lock, mMetricsLogger));
+ new BatterySavingStats(lock));
mBatterySaverPolicy.systemReady();
mBatterySaverPolicy.setPolicyLevel(POLICY_LEVEL_FULL);
diff --git a/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySavingStatsTest.java b/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySavingStatsTest.java
index ba61fd2..76239fc 100644
--- a/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySavingStatsTest.java
+++ b/services/tests/servicestests/src/com/android/server/power/batterysaver/BatterySavingStatsTest.java
@@ -30,14 +30,12 @@
import androidx.test.runner.AndroidJUnit4;
import com.android.internal.logging.MetricsLogger;
-import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.server.power.batterysaver.BatterySavingStats.BatterySaverState;
import com.android.server.power.batterysaver.BatterySavingStats.DozeState;
import com.android.server.power.batterysaver.BatterySavingStats.InteractiveState;
import org.junit.Test;
import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
import java.io.ByteArrayOutputStream;
import java.io.PrintWriter;
@@ -54,7 +52,7 @@
private int mBatteryLevel = 1_000_000_000;
private BatterySavingStatsTestable() {
- super(new Object(), mMetricsLogger);
+ super(new Object());
}
@Override
@@ -104,23 +102,13 @@
public MetricsLogger mMetricsLogger = mock(MetricsLogger.class);
- private boolean sendTronEvents;
-
@Test
- public void testAll_withTron() {
- sendTronEvents = true;
- checkAll();
- }
-
- @Test
- public void testAll_noTron() {
- sendTronEvents = false;
+ public void testAll() {
checkAll();
}
private void checkAll() {
final BatterySavingStatsTestable target = new BatterySavingStatsTestable();
- target.setSendTronLog(sendTronEvents);
target.assertDumpable();
@@ -240,46 +228,13 @@
target.toDebugString());
}
- private void assertLog(boolean batterySaver, boolean interactive, long deltaTimeMs,
- int deltaBatteryLevelUa, int deltaBatteryLevelPercent) {
- if (sendTronEvents) {
- ArgumentCaptor<LogMaker> ac = ArgumentCaptor.forClass(LogMaker.class);
- verify(mMetricsLogger, times(1)).write(ac.capture());
-
- LogMaker lm = ac.getValue();
- assertEquals(MetricsEvent.BATTERY_SAVER, lm.getCategory());
- assertEquals(batterySaver ? 1 : 0,
- lm.getTaggedData(MetricsEvent.RESERVED_FOR_LOGBUILDER_SUBTYPE));
- assertEquals(interactive ? 1 : 0, lm.getTaggedData(MetricsEvent.FIELD_INTERACTIVE));
- assertEquals(deltaTimeMs, lm.getTaggedData(MetricsEvent.FIELD_DURATION_MILLIS));
-
- assertEquals(deltaBatteryLevelUa,
- (int) lm.getTaggedData(MetricsEvent.FIELD_START_BATTERY_UA)
- - (int) lm.getTaggedData(MetricsEvent.FIELD_END_BATTERY_UA));
- assertEquals(deltaBatteryLevelPercent,
- (int) lm.getTaggedData(MetricsEvent.FIELD_START_BATTERY_PERCENT)
- - (int) lm.getTaggedData(MetricsEvent.FIELD_END_BATTERY_PERCENT));
- } else {
- verify(mMetricsLogger, times(0)).write(any(LogMaker.class));
- }
- }
-
-
- @Test
- public void testMetricsLogger_withTron() {
- sendTronEvents = true;
- checkMetricsLogger();
+ private void assertLog() {
+ verify(mMetricsLogger, times(0)).write(any(LogMaker.class));
}
@Test
- public void testMetricsLogger_noTron() {
- sendTronEvents = false;
- checkMetricsLogger();
- }
-
- private void checkMetricsLogger() {
+ public void testMetricsLogger() {
final BatterySavingStatsTestable target = new BatterySavingStatsTestable();
- target.setSendTronLog(sendTronEvents);
target.advanceClock(1);
target.drainBattery(1000);
@@ -300,7 +255,7 @@
InteractiveState.NON_INTERACTIVE,
DozeState.NOT_DOZING);
- assertLog(false, true, 60_000, 2000, 200);
+ assertLog();
target.advanceClock(1);
target.drainBattery(2000);
@@ -331,7 +286,7 @@
InteractiveState.INTERACTIVE,
DozeState.NOT_DOZING);
- assertLog(false, false, 60_000 * 3, 2000 * 3, 200 * 3);
+ assertLog();
target.advanceClock(10);
target.drainBattery(10000);
@@ -339,7 +294,7 @@
reset(mMetricsLogger);
target.startCharging();
- assertLog(true, true, 60_000 * 10, 10000, 1000);
+ assertLog();
target.advanceClock(1);
target.drainBattery(2000);
@@ -357,6 +312,6 @@
target.startCharging();
- assertLog(true, false, 60_000, 2000, 200);
+ assertLog();
}
}
diff --git a/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorServiceTest.java b/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorServiceTest.java
deleted file mode 100644
index 0936fff..0000000
--- a/services/tests/servicestests/src/com/android/server/timezonedetector/TimeZoneDetectorServiceTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2018 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.timezonedetector;
-
-import android.content.Context;
-
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-/**
- * Unit tests for the {@link TimeZoneDetectorService}.
- */
-@RunWith(AndroidJUnit4.class)
-public class TimeZoneDetectorServiceTest {
-
- private TimeZoneDetectorService mTimeZoneDetectorService;
-
- @Before
- public void setUp() {
- final Context context = InstrumentationRegistry.getContext();
- mTimeZoneDetectorService = new TimeZoneDetectorService(context);
- }
-
- @Test
- public void testStubbedCall() {
- mTimeZoneDetectorService.stubbedCall();
- }
-}
diff --git a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java
index 68d3e4c..9c7e028 100644
--- a/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java
+++ b/services/tests/uiservicestests/src/com/android/server/notification/ZenModeConfigTest.java
@@ -67,7 +67,7 @@
@Test
public void testZenPolicyNothingSetToNotificationPolicy() {
- ZenModeConfig config = getMutedAllConfig();
+ ZenModeConfig config = getCustomConfig();
ZenPolicy zenPolicy = new ZenPolicy.Builder().build();
assertEquals(config.toNotificationPolicy(), config.toNotificationPolicy(zenPolicy));
}
@@ -219,6 +219,25 @@
return config;
}
+ private ZenModeConfig getCustomConfig() {
+ ZenModeConfig config = new ZenModeConfig();
+ // Some sounds allowed
+ config.allowAlarms = true;
+ config.allowMedia = false;
+ config.allowSystem = false;
+ config.allowCalls = true;
+ config.allowRepeatCallers = true;
+ config.allowMessages = false;
+ config.allowReminders = false;
+ config.allowEvents = false;
+ config.areChannelsBypassingDnd = false;
+ config.allowCallsFrom = ZenModeConfig.SOURCE_ANYONE;
+ config.allowMessagesFrom = ZenModeConfig.SOURCE_ANYONE;
+
+ config.suppressedVisualEffects = 0;
+ return config;
+ }
+
private ZenModeConfig getMutedAllConfig() {
ZenModeConfig config = new ZenModeConfig();
// No sounds allowed
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
index 319ffed..192915f 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityRecordTests.java
@@ -368,4 +368,50 @@
verify(mService.getLifecycleManager()).scheduleTransaction(eq(mActivity.app.getThread()),
eq(mActivity.appToken), eq(expected));
}
+
+ @Test
+ public void testShouldMakeActive_deferredResume() {
+ mActivity.setState(ActivityStack.ActivityState.STOPPED, "Testing");
+
+ mSupervisor.beginDeferResume();
+ assertEquals(false, mActivity.shouldMakeActive(null /* activeActivity */));
+
+ mSupervisor.endDeferResume();
+ assertEquals(true, mActivity.shouldMakeActive(null /* activeActivity */));
+ }
+
+ @Test
+ public void testPushConfigurationWhenLaunchTaskBehind() throws Exception {
+ mActivity.setState(ActivityStack.ActivityState.STOPPED, "Testing");
+
+ final TestActivityStack stack = (TestActivityStack) new StackBuilder(mRootActivityContainer)
+ .build();
+ try {
+ stack.setIsTranslucent(false);
+ assertFalse(mStack.shouldBeVisible(null /* starting */));
+
+ mTask.onRequestedOverrideConfigurationChanged(mTask.getConfiguration());
+ mActivity.setLastReportedConfiguration(new MergedConfiguration(new Configuration(),
+ mActivity.getConfiguration()));
+
+ mActivity.mLaunchTaskBehind = true;
+ mActivity.info.configChanges |= ActivityInfo.CONFIG_ORIENTATION;
+ final Configuration newConfig = new Configuration(mActivity.getConfiguration());
+ newConfig.orientation = newConfig.orientation == Configuration.ORIENTATION_PORTRAIT
+ ? Configuration.ORIENTATION_LANDSCAPE
+ : Configuration.ORIENTATION_PORTRAIT;
+
+ mTask.onConfigurationChanged(newConfig);
+
+ mActivity.ensureActivityConfiguration(0 /* globalChanges */,
+ false /* preserveWindow */, true /* ignoreStopState */);
+
+ final ActivityConfigurationChangeItem expected =
+ ActivityConfigurationChangeItem.obtain(newConfig);
+ verify(mService.getLifecycleManager()).scheduleTransaction(
+ eq(mActivity.app.getThread()), eq(mActivity.appToken), eq(expected));
+ } finally {
+ stack.getDisplay().removeChild(stack);
+ }
+ }
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
index 62ec838..60f1ae26 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityStarterTests.java
@@ -61,6 +61,7 @@
import android.app.ActivityOptions;
import android.app.IApplicationThread;
+import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Intent;
import android.content.pm.ActivityInfo;
@@ -561,7 +562,7 @@
runAndVerifyBackgroundActivityStartsSubtest("allowed_noStartsAborted", false,
UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
- false, false, false, false);
+ false, false, false, false, false);
}
/**
@@ -576,7 +577,7 @@
"disallowed_unsupportedUsecase_aborted", true,
UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
- false, false, false, false);
+ false, false, false, false, false);
}
/**
@@ -591,56 +592,61 @@
runAndVerifyBackgroundActivityStartsSubtest("disallowed_rootUid_notAborted", false,
Process.ROOT_UID, false, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
- false, false, false, false);
+ false, false, false, false, false);
runAndVerifyBackgroundActivityStartsSubtest("disallowed_systemUid_notAborted", false,
Process.SYSTEM_UID, false, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
- false, false, false, false);
+ false, false, false, false, false);
runAndVerifyBackgroundActivityStartsSubtest("disallowed_nfcUid_notAborted", false,
Process.NFC_UID, false, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
- false, false, false, false);
+ false, false, false, false, false);
runAndVerifyBackgroundActivityStartsSubtest(
"disallowed_callingUidHasVisibleWindow_notAborted", false,
UNIMPORTANT_UID, true, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
- false, false, false, false);
+ false, false, false, false, false);
runAndVerifyBackgroundActivityStartsSubtest(
"disallowed_callingUidProcessStateTop_notAborted", false,
UNIMPORTANT_UID, false, PROCESS_STATE_TOP,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
- false, false, false, false);
+ false, false, false, false, false);
runAndVerifyBackgroundActivityStartsSubtest(
"disallowed_realCallingUidHasVisibleWindow_notAborted", false,
UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, true, PROCESS_STATE_TOP + 1,
- false, false, false, false);
+ false, false, false, false, false);
runAndVerifyBackgroundActivityStartsSubtest(
"disallowed_realCallingUidProcessStateTop_notAborted", false,
UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP,
- false, false, false, false);
+ false, false, false, false, false);
runAndVerifyBackgroundActivityStartsSubtest(
"disallowed_hasForegroundActivities_notAborted", false,
UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
- true, false, false, false);
+ true, false, false, false, false);
runAndVerifyBackgroundActivityStartsSubtest(
"disallowed_callerIsRecents_notAborted", false,
UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
- false, true, false, false);
+ false, true, false, false, false);
runAndVerifyBackgroundActivityStartsSubtest(
"disallowed_callerIsWhitelisted_notAborted", false,
UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
- false, false, true, false);
+ false, false, true, false, false);
runAndVerifyBackgroundActivityStartsSubtest(
"disallowed_callerIsInstrumentingWithBackgroundActivityStartPrivileges_notAborted",
false,
UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1,
UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
- false, false, false, true);
+ false, false, false, true, false);
+ runAndVerifyBackgroundActivityStartsSubtest(
+ "disallowed_callingPackageIsDeviceOwner_notAborted", false,
+ UNIMPORTANT_UID, false, PROCESS_STATE_TOP + 1,
+ UNIMPORTANT_UID2, false, PROCESS_STATE_TOP + 1,
+ false, false, false, false, true);
}
private void runAndVerifyBackgroundActivityStartsSubtest(String name, boolean shouldHaveAborted,
@@ -648,7 +654,8 @@
int realCallingUid, boolean realCallingUidHasVisibleWindow, int realCallingUidProcState,
boolean hasForegroundActivities, boolean callerIsRecents,
boolean callerIsTempWhitelisted,
- boolean callerIsInstrumentingWithBackgroundActivityStartPrivileges) {
+ boolean callerIsInstrumentingWithBackgroundActivityStartPrivileges,
+ boolean isCallingPackageDeviceOwner) {
// window visibility
doReturn(callingUidHasVisibleWindow).when(mService.mWindowManager.mRoot)
.isAnyNonToastWindowVisibleForUid(callingUid);
@@ -672,8 +679,11 @@
// caller is temp whitelisted
callerApp.setAllowBackgroundActivityStarts(callerIsTempWhitelisted);
// caller is instrumenting with background activity starts privileges
- callerApp.setInstrumentingWithBackgroundActivityStartPrivileges(
+ callerApp.setInstrumenting(callerIsInstrumentingWithBackgroundActivityStartPrivileges,
callerIsInstrumentingWithBackgroundActivityStartPrivileges);
+ // caller is device owner
+ DevicePolicyManager dpmMock = mService.getDevicePolicyManager();
+ doReturn(isCallingPackageDeviceOwner).when(dpmMock).isDeviceOwnerApp(any());
final ActivityOptions options = spy(ActivityOptions.makeBasic());
ActivityStarter starter = prepareStarter(FLAG_ACTIVITY_NEW_TASK)
diff --git a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
index 3b399ff..e27dd94 100644
--- a/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
+++ b/services/tests/wmtests/src/com/android/server/wm/ActivityTestsBase.java
@@ -42,6 +42,7 @@
import android.app.ActivityManagerInternal;
import android.app.ActivityOptions;
import android.app.IApplicationThread;
+import android.app.admin.DevicePolicyManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -424,6 +425,7 @@
spyOn(getLifecycleManager());
spyOn(getLockTaskController());
doReturn(mock(IPackageManager.class)).when(this).getPackageManager();
+ doReturn(mock(DevicePolicyManager.class)).when(this).getDevicePolicyManager();
// allow background activity starts by default
doReturn(true).when(this).isBackgroundActivityStartsEnabled();
doNothing().when(this).updateCpuStats();
diff --git a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
index 19ace3c..3bf884f 100644
--- a/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/AppChangeTransitionTests.java
@@ -55,7 +55,7 @@
mStack = createTaskStackOnDisplay(mDisplayContent);
mTask = createTaskInStack(mStack, 0 /* userId */);
mToken = WindowTestUtils.createTestAppWindowToken(mDisplayContent);
- mToken.mSkipOnParentSet = false;
+ mToken.mSkipOnParentChanged = false;
mTask.addChild(mToken, 0);
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java
index ae211d3..4184201 100644
--- a/services/tests/wmtests/src/com/android/server/wm/TaskTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/TaskTests.java
@@ -22,6 +22,8 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import android.graphics.Point;
+import android.graphics.Rect;
import android.platform.test.annotations.Presubmit;
import androidx.test.filters.SmallTest;
@@ -123,4 +125,19 @@
assertEquals(1, task2.positionInParent());
assertTrue(task.mOnDisplayChangedCalled);
}
+
+ @Test
+ public void testBounds() {
+ final TaskStack stack1 = createTaskStackOnDisplay(mDisplayContent);
+ final WindowTestUtils.TestTask task = WindowTestUtils.createTestTask(stack1);
+
+ // Check that setting bounds also updates surface position
+ Rect bounds = new Rect(10, 10, 100, 200);
+ task.setBounds(bounds);
+ assertEquals(new Point(bounds.left, bounds.top), task.getLastSurfacePosition());
+
+ Rect dispBounds = new Rect(20, 30, 110, 220);
+ task.setOverrideDisplayedBounds(dispBounds);
+ assertEquals(new Point(dispBounds.left, dispBounds.top), task.getLastSurfacePosition());
+ }
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowConfigurationTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowConfigurationTests.java
index c653762f..64ceb1b 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowConfigurationTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowConfigurationTests.java
@@ -16,9 +16,12 @@
package com.android.server.wm;
+import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
+import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;
import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM;
+import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
import static android.app.WindowConfiguration.WINDOW_CONFIG_ALWAYS_ON_TOP;
import static android.app.WindowConfiguration.WINDOW_CONFIG_APP_BOUNDS;
import static android.app.WindowConfiguration.WINDOW_CONFIG_ROTATION;
@@ -26,7 +29,9 @@
import static android.content.pm.ActivityInfo.CONFIG_WINDOW_CONFIGURATION;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
import android.app.WindowConfiguration;
import android.content.res.Configuration;
@@ -35,7 +40,6 @@
import android.view.DisplayInfo;
import android.view.Surface;
-import androidx.test.filters.FlakyTest;
import androidx.test.filters.SmallTest;
import org.junit.Before;
@@ -47,7 +51,6 @@
* Build/Install/Run:
* atest FrameworksServicesTests:WindowConfigurationTests
*/
-@FlakyTest(bugId = 74078662)
@SmallTest
@Presubmit
public class WindowConfigurationTests extends WindowTestsBase {
@@ -110,39 +113,39 @@
final Configuration config2 = new Configuration(config1);
final WindowConfiguration winConfig2 = config2.windowConfiguration;
- assertEquals(config1.compareTo(config2), 0);
- assertEquals(winConfig1.compareTo(winConfig2), 0);
+ assertEquals(0, config1.compareTo(config2));
+ assertEquals(0, winConfig1.compareTo(winConfig2));
// Different windowing mode
winConfig2.setWindowingMode(WINDOWING_MODE_FREEFORM);
- assertNotEquals(config1.compareTo(config2), 0);
- assertNotEquals(winConfig1.compareTo(winConfig2), 0);
+ assertNotEquals(0, config1.compareTo(config2));
+ assertNotEquals(0, winConfig1.compareTo(winConfig2));
winConfig2.setWindowingMode(winConfig1.getWindowingMode());
// Different always on top state
winConfig2.setAlwaysOnTop(true);
- assertNotEquals(config1.compareTo(config2), 0);
- assertNotEquals(winConfig1.compareTo(winConfig2), 0);
+ assertNotEquals(0, config1.compareTo(config2));
+ assertNotEquals(0, winConfig1.compareTo(winConfig2));
winConfig2.setAlwaysOnTop(winConfig1.isAlwaysOnTop());
// Different bounds
winConfig2.setAppBounds(0, 2, 3, 4);
- assertNotEquals(config1.compareTo(config2), 0);
- assertNotEquals(winConfig1.compareTo(winConfig2), 0);
+ assertNotEquals(0, config1.compareTo(config2));
+ assertNotEquals(0, winConfig1.compareTo(winConfig2));
winConfig2.setAppBounds(winConfig1.getAppBounds());
// No bounds
- assertEquals(config1.compareTo(blankConfig), -1);
- assertEquals(winConfig1.compareTo(blankWinConfig), -1);
+ assertEquals(-1, config1.compareTo(blankConfig));
+ assertEquals(-1, winConfig1.compareTo(blankWinConfig));
// Different rotation
winConfig2.setRotation(Surface.ROTATION_180);
- assertNotEquals(config1.compareTo(config2), 0);
- assertNotEquals(winConfig1.compareTo(winConfig2), 0);
+ assertNotEquals(0, config1.compareTo(config2));
+ assertNotEquals(0, winConfig1.compareTo(winConfig2));
winConfig2.setRotation(winConfig1.getRotation());
- assertEquals(blankConfig.compareTo(config1), 1);
- assertEquals(blankWinConfig.compareTo(winConfig1), 1);
+ assertEquals(1, blankConfig.compareTo(config1));
+ assertEquals(1, blankWinConfig.compareTo(winConfig1));
}
@Test
@@ -165,12 +168,54 @@
final Rect appBounds = mWm.computeNewConfiguration(
mDisplayContent.getDisplayId()).windowConfiguration.getAppBounds();
- // The bounds should always be positioned in the top left.
- assertEquals(appBounds.left, 0);
- assertEquals(appBounds.top, 0);
+ // The bounds should always be positioned in the top left besides cutout.
+ final int expectedLeft = info.displayCutout != null
+ ? info.displayCutout.getSafeInsetLeft() : 0;
+ final int expectedTop = info.displayCutout != null
+ ? info.displayCutout.getSafeInsetTop() : 0;
+ assertEquals(expectedLeft, appBounds.left);
+ assertEquals(expectedTop, appBounds.top);
// The bounds should equal the defined app width and height
- assertEquals(appBounds.width(), info.appWidth);
- assertEquals(appBounds.height(), info.appHeight);
+ assertEquals(info.appWidth, appBounds.width());
+ assertEquals(info.appHeight, appBounds.height());
+ }
+
+ /** Ensure the window always has a caption in Freeform window mode or display mode. */
+ @Test
+ public void testCaptionShownForFreeformWindowingMode() {
+ final WindowConfiguration config = new WindowConfiguration();
+ config.setActivityType(ACTIVITY_TYPE_STANDARD);
+ config.setWindowingMode(WINDOWING_MODE_FREEFORM);
+ config.setDisplayWindowingMode(WINDOWING_MODE_FULLSCREEN);
+ assertTrue(config.hasWindowDecorCaption());
+
+ config.setDisplayWindowingMode(WINDOWING_MODE_FREEFORM);
+ assertTrue(config.hasWindowDecorCaption());
+
+ config.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
+ assertTrue(config.hasWindowDecorCaption());
+
+ config.setDisplayWindowingMode(WINDOWING_MODE_FULLSCREEN);
+ assertFalse(config.hasWindowDecorCaption());
+ }
+
+ /** Caption should not show for non-standard activity window. */
+ @Test
+ public void testCaptionNotShownForNonStandardActivityType() {
+ final WindowConfiguration config = new WindowConfiguration();
+ config.setActivityType(ACTIVITY_TYPE_HOME);
+ config.setWindowingMode(WINDOWING_MODE_FREEFORM);
+ config.setDisplayWindowingMode(WINDOWING_MODE_FREEFORM);
+ assertFalse(config.hasWindowDecorCaption());
+
+ config.setActivityType(ACTIVITY_TYPE_ASSISTANT);
+ assertFalse(config.hasWindowDecorCaption());
+
+ config.setActivityType(ACTIVITY_TYPE_RECENTS);
+ assertFalse(config.hasWindowDecorCaption());
+
+ config.setActivityType(ACTIVITY_TYPE_STANDARD);
+ assertTrue(config.hasWindowDecorCaption());
}
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java
index e156143..8628575 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowContainerTests.java
@@ -103,13 +103,13 @@
assertEquals(secondLayer1, root.getChildAt(5));
assertEquals(layer2, root.getChildAt(6));
- assertTrue(layer1.mOnParentSetCalled);
- assertTrue(secondLayer1.mOnParentSetCalled);
- assertTrue(layer2.mOnParentSetCalled);
- assertTrue(layerNeg1.mOnParentSetCalled);
- assertTrue(layerNeg2.mOnParentSetCalled);
- assertTrue(secondLayerNeg1.mOnParentSetCalled);
- assertTrue(layer0.mOnParentSetCalled);
+ assertTrue(layer1.mOnParentChangedCalled);
+ assertTrue(secondLayer1.mOnParentChangedCalled);
+ assertTrue(layer2.mOnParentChangedCalled);
+ assertTrue(layerNeg1.mOnParentChangedCalled);
+ assertTrue(layerNeg2.mOnParentChangedCalled);
+ assertTrue(secondLayerNeg1.mOnParentChangedCalled);
+ assertTrue(layer0.mOnParentChangedCalled);
}
@Test
@@ -747,7 +747,7 @@
private boolean mFillsParent;
private Integer mOrientation;
- private boolean mOnParentSetCalled;
+ private boolean mOnParentChangedCalled;
private boolean mOnDescendantOverrideCalled;
/**
@@ -801,8 +801,8 @@
}
@Override
- void onParentSet() {
- mOnParentSetCalled = true;
+ void onParentChanged() {
+ mOnParentChangedCalled = true;
}
@Override
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java
index 2263cf3..a494889 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestUtils.java
@@ -152,7 +152,7 @@
public static class TestAppWindowToken extends AppWindowToken {
boolean mOnTop = false;
private Transaction mPendingTransactionOverride;
- boolean mSkipOnParentSet = true;
+ boolean mSkipOnParentChanged = true;
private TestAppWindowToken(DisplayContent dc) {
super(dc.mWmService, new IApplicationToken.Stub() {
@@ -200,9 +200,11 @@
}
@Override
- void onParentSet() {
- if (!mSkipOnParentSet) {
- super.onParentSet();
+ void onParentChanged() {
+ if (!mSkipOnParentChanged) {
+ super.onParentChanged();
+ } else {
+ updateConfigurationFromParent(this);
}
}
@@ -223,6 +225,21 @@
}
}
+ /**
+ * Used when we don't want to perform surface related operation in
+ * {@link WindowContainer#onParentChanged} or the overridden method, but the configuration
+ * still needs to propagate from parent.
+ *
+ * @see ConfigurationContainer#onParentChanged
+ */
+ static void updateConfigurationFromParent(WindowContainer container) {
+ final WindowContainer parent = container.getParent();
+ if (parent != null) {
+ container.onConfigurationChanged(parent.getConfiguration());
+ container.onMergedOverrideConfigurationChanged();
+ }
+ }
+
static TestWindowToken createTestWindowToken(int type, DisplayContent dc) {
return createTestWindowToken(type, dc, false /* persistOnEmpty */);
}
@@ -341,8 +358,8 @@
}
@Override
- void onParentSet() {
- // Do nothing;
+ void onParentChanged() {
+ updateConfigurationFromParent(this);
}
}
}
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
index e38118e..3cb2814 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowTestsBase.java
@@ -91,6 +91,12 @@
WindowState mChildAppWindowBelow;
HashSet<WindowState> mCommonWindows;
+ /**
+ * To restore the original SurfaceControl.Transaction factory if any tests changed
+ * {@link WindowManagerService#mTransactionFactory}.
+ */
+ private TransactionFactory mOriginalTransactionFactory;
+
@Rule
public final DexmakerShareClassLoaderRule mDexmakerShareClassLoaderRule =
new DexmakerShareClassLoaderRule();
@@ -121,6 +127,7 @@
final Context context = getInstrumentation().getTargetContext();
mWm = TestSystemServices.getWindowManagerService();
+ mOriginalTransactionFactory = mWm.mTransactionFactory;
beforeCreateDisplay();
context.getDisplay().getDisplayInfo(mDisplayInfo);
@@ -170,6 +177,7 @@
// stable state to clean up for consistency.
waitUntilHandlersIdle();
+ mWm.mTransactionFactory = mOriginalTransactionFactory;
final LinkedList<WindowState> nonCommonWindows = new LinkedList<>();
synchronized (mWm.mGlobalLock) {
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTraceBufferTest.java b/services/tests/wmtests/src/com/android/server/wm/WindowTraceBufferTest.java
index df3ef55..2b8e307 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowTraceBufferTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowTraceBufferTest.java
@@ -67,27 +67,25 @@
ProtoOutputStream toWrite1 = getDummy(1);
ProtoOutputStream toWrite2 = getDummy(2);
ProtoOutputStream toWrite3 = getDummy(3);
- byte[] toWrite1Bytes = toWrite1.getBytes();
- byte[] toWrite2Bytes = toWrite2.getBytes();
- byte[] toWrite3Bytes = toWrite3.getBytes();
-
- final int objectSize = toWrite1.getBytes().length;
+ final int objectSize = toWrite1.getRawSize();
final int bufferCapacity = objectSize * 2;
final WindowTraceBuffer buffer = buildQueueBuffer(bufferCapacity);
buffer.add(toWrite1);
+ byte[] toWrite1Bytes = toWrite1.getBytes();
assertTrue("First element should be in the list",
buffer.contains(toWrite1Bytes));
buffer.add(toWrite2);
+ byte[] toWrite2Bytes = toWrite2.getBytes();
assertTrue("First element should be in the list",
buffer.contains(toWrite1Bytes));
assertTrue("Second element should be in the list",
buffer.contains(toWrite2Bytes));
buffer.add(toWrite3);
-
+ byte[] toWrite3Bytes = toWrite3.getBytes();
assertTrue("First element should be in the list",
buffer.contains(toWrite1Bytes));
assertTrue("Second element should be in the list",
@@ -105,7 +103,7 @@
@Test
public void testTraceRingBuffer_addItem() throws Exception {
ProtoOutputStream toWrite = getDummy(1);
- final int objectSize = toWrite.getBytes().length;
+ final int objectSize = toWrite.getRawSize();
final WindowTraceBuffer buffer = buildRingBuffer(objectSize);
@@ -125,25 +123,25 @@
ProtoOutputStream toWrite1 = getDummy(1);
ProtoOutputStream toWrite2 = getDummy(2);
ProtoOutputStream toWrite3 = getDummy(3);
- byte[] toWrite1Bytes = toWrite1.getBytes();
- byte[] toWrite2Bytes = toWrite2.getBytes();
- byte[] toWrite3Bytes = toWrite3.getBytes();
- final int objectSize = toWrite1.getBytes().length;
+ final int objectSize = toWrite1.getRawSize();
final int bufferCapacity = objectSize * 2 + 1;
final WindowTraceBuffer buffer = buildRingBuffer(bufferCapacity);
buffer.add(toWrite1);
+ byte[] toWrite1Bytes = toWrite1.getBytes();
assertTrue("First element should be in the list",
buffer.contains(toWrite1Bytes));
buffer.add(toWrite2);
+ byte[] toWrite2Bytes = toWrite2.getBytes();
assertTrue("First element should be in the list",
buffer.contains(toWrite1Bytes));
assertTrue("Second element should be in the list",
buffer.contains(toWrite2Bytes));
buffer.add(toWrite3);
+ byte[] toWrite3Bytes = toWrite3.getBytes();
assertTrue("First element should not be in the list",
!buffer.contains(toWrite1Bytes));
assertTrue("Second element should be in the list",
@@ -161,9 +159,7 @@
public void testTraceRingBuffer_addItemMustOverwriteMultiple() throws Exception {
ProtoOutputStream toWriteSmall1 = getDummy(1);
ProtoOutputStream toWriteSmall2 = getDummy(2);
- byte[] toWriteSmall1Bytes = toWriteSmall1.getBytes();
- byte[] toWriteSmall2Bytes = toWriteSmall2.getBytes();
- final int objectSize = toWriteSmall1.getBytes().length;
+ final int objectSize = toWriteSmall1.getRawSize();
final int bufferCapacity = objectSize * 2;
final WindowTraceBuffer buffer = buildRingBuffer(bufferCapacity);
@@ -171,20 +167,21 @@
ProtoOutputStream toWriteBig = new ProtoOutputStream();
toWriteBig.write(MAGIC_NUMBER, 1);
toWriteBig.write(MAGIC_NUMBER, 2);
- byte[] toWriteBigBytes = toWriteBig.getBytes();
- toWriteBig.flush();
buffer.add(toWriteSmall1);
+ byte[] toWriteSmall1Bytes = toWriteSmall1.getBytes();
assertTrue("First element should be in the list",
buffer.contains(toWriteSmall1Bytes));
buffer.add(toWriteSmall2);
+ byte[] toWriteSmall2Bytes = toWriteSmall2.getBytes();
assertTrue("First element should be in the list",
buffer.contains(toWriteSmall1Bytes));
assertTrue("Second element should be in the list",
buffer.contains(toWriteSmall2Bytes));
buffer.add(toWriteBig);
+ byte[] toWriteBigBytes = toWriteBig.getBytes();
assertTrue("Third element should overwrite all others",
!buffer.contains(toWriteSmall1Bytes));
assertTrue("Third element should overwrite all others",
diff --git a/services/tests/wmtests/src/com/android/server/wm/WindowTracingTest.java b/services/tests/wmtests/src/com/android/server/wm/WindowTracingTest.java
index 46d6835..b81a8e7 100644
--- a/services/tests/wmtests/src/com/android/server/wm/WindowTracingTest.java
+++ b/services/tests/wmtests/src/com/android/server/wm/WindowTracingTest.java
@@ -123,7 +123,7 @@
mWindowTracing.startTrace(mock(PrintWriter.class));
mWindowTracing.traceStateLocked("where", mWmMock);
- verify(mWmMock).writeToProtoLocked(any(), eq(true));
+ verify(mWmMock).writeToProtoLocked(any(), eq(WindowTraceLogLevel.TRIM));
}
@Test
diff --git a/services/usage/java/com/android/server/usage/UsageStatsService.java b/services/usage/java/com/android/server/usage/UsageStatsService.java
index 85939d4..a6d7ee6 100644
--- a/services/usage/java/com/android/server/usage/UsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UsageStatsService.java
@@ -432,6 +432,7 @@
synchronized (mLock) {
mHandler.removeMessages(MSG_REPORT_EVENT);
Event event = new Event(DEVICE_SHUTDOWN, SystemClock.elapsedRealtime());
+ event.mPackage = Event.DEVICE_EVENT_PACKAGE_NAME;
// orderly shutdown, the last event is DEVICE_SHUTDOWN.
reportEventToAllUserId(event);
flushToDiskLocked();
@@ -449,6 +450,7 @@
*/
void prepareForPossibleShutdown() {
Event event = new Event(DEVICE_SHUTDOWN, SystemClock.elapsedRealtime());
+ event.mPackage = Event.DEVICE_EVENT_PACKAGE_NAME;
mHandler.obtainMessage(MSG_REPORT_EVENT_TO_ALL_USERID, event).sendToTarget();
mHandler.sendEmptyMessage(MSG_FLUSH_TO_DISK);
}
diff --git a/services/usage/java/com/android/server/usage/UserUsageStatsService.java b/services/usage/java/com/android/server/usage/UserUsageStatsService.java
index d52d32f..3cb2216 100644
--- a/services/usage/java/com/android/server/usage/UserUsageStatsService.java
+++ b/services/usage/java/com/android/server/usage/UserUsageStatsService.java
@@ -143,6 +143,7 @@
if (size == 0 || currentDailyStats.events.get(size - 1).mEventType != DEVICE_SHUTDOWN) {
// The last event in event list is not DEVICE_SHUTDOWN, then we insert one.
final Event event = new Event(DEVICE_SHUTDOWN, currentDailyStats.lastTimeSaved);
+ event.mPackage = Event.DEVICE_EVENT_PACKAGE_NAME;
currentDailyStats.addEvent(event);
}
}
diff --git a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
index 718f2d3..7cab432 100644
--- a/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
+++ b/services/voiceinteraction/java/com/android/server/voiceinteraction/VoiceInteractionManagerService.java
@@ -613,11 +613,8 @@
@Override
public void showSession(IVoiceInteractionService service, Bundle args, int flags) {
synchronized (this) {
- if (mImpl == null || mImpl.mService == null
- || service.asBinder() != mImpl.mService.asBinder()) {
- throw new SecurityException(
- "Caller is not the current voice interaction service");
- }
+ enforceIsCurrentVoiceInteractionService(service);
+
final long caller = Binder.clearCallingIdentity();
try {
mImpl.showSessionLocked(args, flags, null, null);
@@ -896,11 +893,7 @@
public boolean isEnrolledForKeyphrase(IVoiceInteractionService service, int keyphraseId,
String bcp47Locale) {
synchronized (this) {
- if (mImpl == null || mImpl.mService == null
- || service.asBinder() != mImpl.mService.asBinder()) {
- throw new SecurityException(
- "Caller is not the current voice interaction service");
- }
+ enforceIsCurrentVoiceInteractionService(service);
}
if (bcp47Locale == null) {
@@ -922,11 +915,7 @@
public ModuleProperties getDspModuleProperties(IVoiceInteractionService service) {
// Allow the call if this is the current voice interaction service.
synchronized (this) {
- if (mImpl == null || mImpl.mService == null
- || service == null || service.asBinder() != mImpl.mService.asBinder()) {
- throw new SecurityException(
- "Caller is not the current voice interaction service");
- }
+ enforceIsCurrentVoiceInteractionService(service);
final long caller = Binder.clearCallingIdentity();
try {
@@ -943,11 +932,7 @@
RecognitionConfig recognitionConfig) {
// Allow the call if this is the current voice interaction service.
synchronized (this) {
- if (mImpl == null || mImpl.mService == null
- || service == null || service.asBinder() != mImpl.mService.asBinder()) {
- throw new SecurityException(
- "Caller is not the current voice interaction service");
- }
+ enforceIsCurrentVoiceInteractionService(service);
if (callback == null || recognitionConfig == null || bcp47Locale == null) {
throw new IllegalArgumentException("Illegal argument(s) in startRecognition");
@@ -983,11 +968,7 @@
IRecognitionStatusCallback callback) {
// Allow the call if this is the current voice interaction service.
synchronized (this) {
- if (mImpl == null || mImpl.mService == null
- || service == null || service.asBinder() != mImpl.mService.asBinder()) {
- throw new SecurityException(
- "Caller is not the current voice interaction service");
- }
+ enforceIsCurrentVoiceInteractionService(service);
}
final long caller = Binder.clearCallingIdentity();
@@ -1212,8 +1193,10 @@
}
@Override
- public void setTranscription(String transcription) {
+ public void setTranscription(IVoiceInteractionService service, String transcription) {
synchronized (this) {
+ enforceIsCurrentVoiceInteractionService(service);
+
final int size = mVoiceInteractionSessionListeners.beginBroadcast();
for (int i = 0; i < size; ++i) {
final IVoiceInteractionSessionListener listener =
@@ -1229,8 +1212,10 @@
}
@Override
- public void clearTranscription(boolean immediate) {
+ public void clearTranscription(IVoiceInteractionService service, boolean immediate) {
synchronized (this) {
+ enforceIsCurrentVoiceInteractionService(service);
+
final int size = mVoiceInteractionSessionListeners.beginBroadcast();
for (int i = 0; i < size; ++i) {
final IVoiceInteractionSessionListener listener =
@@ -1246,8 +1231,10 @@
}
@Override
- public void setVoiceState(int state) {
+ public void setVoiceState(IVoiceInteractionService service, int state) {
synchronized (this) {
+ enforceIsCurrentVoiceInteractionService(service);
+
final int size = mVoiceInteractionSessionListeners.beginBroadcast();
for (int i = 0; i < size; ++i) {
final IVoiceInteractionSessionListener listener =
@@ -1269,6 +1256,14 @@
}
}
+ private void enforceIsCurrentVoiceInteractionService(IVoiceInteractionService service) {
+ if (mImpl == null || mImpl.mService == null
+ || service.asBinder() != mImpl.mService.asBinder()) {
+ throw new
+ SecurityException("Caller is not the current voice interaction service");
+ }
+ }
+
private void setImplLocked(VoiceInteractionManagerServiceImpl impl) {
mImpl = impl;
mAtmInternal.notifyActiveVoiceInteractionServiceChanged(
diff --git a/startop/view_compiler/TEST_MAPPING b/startop/view_compiler/TEST_MAPPING
index 7006075..5f7d3f9 100644
--- a/startop/view_compiler/TEST_MAPPING
+++ b/startop/view_compiler/TEST_MAPPING
@@ -4,6 +4,14 @@
"name": "dex-builder-test"
},
{
+ "name": "CtsViewTestCases",
+ "options": [
+ {
+ "include-filter": "android.view.cts.PrecompiledLayoutTest"
+ }
+ ]
+ },
+ {
"name": "view-compiler-tests",
"host": true
}
diff --git a/startop/view_compiler/dex_builder.cc b/startop/view_compiler/dex_builder.cc
index a78f7d5..4c1a0dc7 100644
--- a/startop/view_compiler/dex_builder.cc
+++ b/startop/view_compiler/dex_builder.cc
@@ -21,8 +21,6 @@
#include <fstream>
#include <memory>
-#define DCHECK_NOT_NULL(p) DCHECK((p) != nullptr)
-
namespace startop {
namespace dex {
@@ -32,6 +30,8 @@
using ::dex::kAccPublic;
using Op = Instruction::Op;
+using Opcode = ::art::Instruction::Code;
+
const TypeDescriptor TypeDescriptor::Int() { return TypeDescriptor{"I"}; };
const TypeDescriptor TypeDescriptor::Void() { return TypeDescriptor{"V"}; };
@@ -42,6 +42,23 @@
// Strings lengths can be 32 bits long, but encoded as LEB128 this can take up to five bytes.
constexpr size_t kMaxEncodedStringLength{5};
+// Converts invoke-* to invoke-*/range
+constexpr Opcode InvokeToInvokeRange(Opcode opcode) {
+ switch (opcode) {
+ case ::art::Instruction::INVOKE_VIRTUAL:
+ return ::art::Instruction::INVOKE_VIRTUAL_RANGE;
+ case ::art::Instruction::INVOKE_DIRECT:
+ return ::art::Instruction::INVOKE_DIRECT_RANGE;
+ case ::art::Instruction::INVOKE_STATIC:
+ return ::art::Instruction::INVOKE_STATIC_RANGE;
+ case ::art::Instruction::INVOKE_INTERFACE:
+ return ::art::Instruction::INVOKE_INTERFACE_RANGE;
+ default:
+ LOG(FATAL) << opcode << " is not a recognized invoke opcode.";
+ UNREACHABLE();
+ }
+}
+
} // namespace
std::ostream& operator<<(std::ostream& out, const Instruction::Op& opcode) {
@@ -55,6 +72,9 @@
case Instruction::Op::kMove:
out << "kMove";
return out;
+ case Instruction::Op::kMoveObject:
+ out << "kMoveObject";
+ return out;
case Instruction::Op::kInvokeVirtual:
out << "kInvokeVirtual";
return out;
@@ -233,6 +253,11 @@
return shorty;
}
+const TypeDescriptor& Prototype::ArgType(size_t index) const {
+ CHECK_LT(index, param_types_.size());
+ return param_types_[index];
+}
+
ClassBuilder::ClassBuilder(DexBuilder* parent, const std::string& name, ir::Class* class_def)
: parent_(parent), type_descriptor_{TypeDescriptor::FromClassname(name)}, class_(class_def) {}
@@ -257,10 +282,10 @@
method->access_flags = kAccPublic | ::dex::kAccStatic;
auto* code = dex_->Alloc<ir::Code>();
- DCHECK_NOT_NULL(decl_->prototype);
+ CHECK(decl_->prototype != nullptr);
size_t const num_args =
decl_->prototype->param_types != nullptr ? decl_->prototype->param_types->types.size() : 0;
- code->registers = num_registers_ + num_args;
+ code->registers = num_registers_ + num_args + kMaxScratchRegisters;
code->ins_count = num_args;
EncodeInstructions();
code->instructions = slicer::ArrayView<const ::dex::u2>(buffer_.data(), buffer_.size());
@@ -292,7 +317,7 @@
}
void MethodBuilder::BuildConst4(Value target, int value) {
- DCHECK_LT(value, 16);
+ CHECK_LT(value, 16);
AddInstruction(Instruction::OpWithArgs(Op::kMove, target, Value::Immediate(value)));
}
@@ -315,6 +340,7 @@
case Instruction::Op::kReturnObject:
return EncodeReturn(instruction, ::art::Instruction::RETURN_OBJECT);
case Instruction::Op::kMove:
+ case Instruction::Op::kMoveObject:
return EncodeMove(instruction);
case Instruction::Op::kInvokeVirtual:
return EncodeInvoke(instruction, art::Instruction::INVOKE_VIRTUAL);
@@ -338,33 +364,43 @@
}
void MethodBuilder::EncodeReturn(const Instruction& instruction, ::art::Instruction::Code opcode) {
- DCHECK(!instruction.dest().has_value());
+ CHECK(!instruction.dest().has_value());
if (instruction.args().size() == 0) {
Encode10x(art::Instruction::RETURN_VOID);
} else {
- DCHECK_EQ(1, instruction.args().size());
+ CHECK_EQ(1, instruction.args().size());
size_t source = RegisterValue(instruction.args()[0]);
Encode11x(opcode, source);
}
}
void MethodBuilder::EncodeMove(const Instruction& instruction) {
- DCHECK_EQ(Instruction::Op::kMove, instruction.opcode());
- DCHECK(instruction.dest().has_value());
- DCHECK(instruction.dest()->is_register() || instruction.dest()->is_parameter());
- DCHECK_EQ(1, instruction.args().size());
+ CHECK(Instruction::Op::kMove == instruction.opcode() ||
+ Instruction::Op::kMoveObject == instruction.opcode());
+ CHECK(instruction.dest().has_value());
+ CHECK(instruction.dest()->is_variable());
+ CHECK_EQ(1, instruction.args().size());
const Value& source = instruction.args()[0];
if (source.is_immediate()) {
// TODO: support more registers
- DCHECK_LT(RegisterValue(*instruction.dest()), 16);
+ CHECK_LT(RegisterValue(*instruction.dest()), 16);
Encode11n(art::Instruction::CONST_4, RegisterValue(*instruction.dest()), source.value());
} else if (source.is_string()) {
constexpr size_t kMaxRegisters = 256;
- DCHECK_LT(RegisterValue(*instruction.dest()), kMaxRegisters);
- DCHECK_LT(source.value(), 65536); // make sure we don't need a jumbo string
+ CHECK_LT(RegisterValue(*instruction.dest()), kMaxRegisters);
+ CHECK_LT(source.value(), 65536); // make sure we don't need a jumbo string
Encode21c(::art::Instruction::CONST_STRING, RegisterValue(*instruction.dest()), source.value());
+ } else if (source.is_variable()) {
+ // For the moment, we only use this when we need to reshuffle registers for
+ // an invoke instruction, meaning we are too big for the 4-bit version.
+ // We'll err on the side of caution and always generate the 16-bit form of
+ // the instruction.
+ Opcode opcode = instruction.opcode() == Instruction::Op::kMove
+ ? ::art::Instruction::MOVE_16
+ : ::art::Instruction::MOVE_OBJECT_16;
+ Encode32x(opcode, RegisterValue(*instruction.dest()), RegisterValue(source));
} else {
UNIMPLEMENTED(FATAL);
}
@@ -373,22 +409,61 @@
void MethodBuilder::EncodeInvoke(const Instruction& instruction, ::art::Instruction::Code opcode) {
constexpr size_t kMaxArgs = 5;
+ // Currently, we only support up to 5 arguments.
CHECK_LE(instruction.args().size(), kMaxArgs);
uint8_t arguments[kMaxArgs]{};
+ bool has_long_args = false;
for (size_t i = 0; i < instruction.args().size(); ++i) {
CHECK(instruction.args()[i].is_variable());
arguments[i] = RegisterValue(instruction.args()[i]);
+ if (!IsShortRegister(arguments[i])) {
+ has_long_args = true;
+ }
}
- Encode35c(opcode,
- instruction.args().size(),
- instruction.method_id(),
- arguments[0],
- arguments[1],
- arguments[2],
- arguments[3],
- arguments[4]);
+ if (has_long_args) {
+ // Some of the registers don't fit in the four bit short form of the invoke
+ // instruction, so we need to do an invoke/range. To do this, we need to
+ // first move all the arguments into contiguous temporary registers.
+ std::array<Value, kMaxArgs> scratch{GetScratchRegisters<kMaxArgs>()};
+
+ const auto& prototype = dex_->GetPrototypeByMethodId(instruction.method_id());
+ CHECK(prototype.has_value());
+
+ for (size_t i = 0; i < instruction.args().size(); ++i) {
+ Instruction::Op move_op;
+ if (opcode == ::art::Instruction::INVOKE_VIRTUAL ||
+ opcode == ::art::Instruction::INVOKE_DIRECT) {
+ // In this case, there is an implicit `this` argument, which is always an object.
+ if (i == 0) {
+ move_op = Instruction::Op::kMoveObject;
+ } else {
+ move_op = prototype->ArgType(i - 1).is_object() ? Instruction::Op::kMoveObject
+ : Instruction::Op::kMove;
+ }
+ } else {
+ move_op = prototype->ArgType(i).is_object() ? Instruction::Op::kMoveObject
+ : Instruction::Op::kMove;
+ }
+
+ EncodeMove(Instruction::OpWithArgs(move_op, scratch[i], instruction.args()[i]));
+ }
+
+ Encode3rc(InvokeToInvokeRange(opcode),
+ instruction.args().size(),
+ instruction.method_id(),
+ RegisterValue(scratch[0]));
+ } else {
+ Encode35c(opcode,
+ instruction.args().size(),
+ instruction.method_id(),
+ arguments[0],
+ arguments[1],
+ arguments[2],
+ arguments[3],
+ arguments[4]);
+ }
// If there is a return value, add a move-result instruction
if (instruction.dest().has_value()) {
@@ -416,26 +491,26 @@
}
void MethodBuilder::EncodeNew(const Instruction& instruction) {
- DCHECK_EQ(Instruction::Op::kNew, instruction.opcode());
- DCHECK(instruction.dest().has_value());
- DCHECK(instruction.dest()->is_variable());
- DCHECK_EQ(1, instruction.args().size());
+ CHECK_EQ(Instruction::Op::kNew, instruction.opcode());
+ CHECK(instruction.dest().has_value());
+ CHECK(instruction.dest()->is_variable());
+ CHECK_EQ(1, instruction.args().size());
const Value& type = instruction.args()[0];
- DCHECK_LT(RegisterValue(*instruction.dest()), 256);
- DCHECK(type.is_type());
+ CHECK_LT(RegisterValue(*instruction.dest()), 256);
+ CHECK(type.is_type());
Encode21c(::art::Instruction::NEW_INSTANCE, RegisterValue(*instruction.dest()), type.value());
}
void MethodBuilder::EncodeCast(const Instruction& instruction) {
- DCHECK_EQ(Instruction::Op::kCheckCast, instruction.opcode());
- DCHECK(instruction.dest().has_value());
- DCHECK(instruction.dest()->is_variable());
- DCHECK_EQ(1, instruction.args().size());
+ CHECK_EQ(Instruction::Op::kCheckCast, instruction.opcode());
+ CHECK(instruction.dest().has_value());
+ CHECK(instruction.dest()->is_variable());
+ CHECK_EQ(1, instruction.args().size());
const Value& type = instruction.args()[0];
- DCHECK_LT(RegisterValue(*instruction.dest()), 256);
- DCHECK(type.is_type());
+ CHECK_LT(RegisterValue(*instruction.dest()), 256);
+ CHECK(type.is_type());
Encode21c(::art::Instruction::CHECK_CAST, RegisterValue(*instruction.dest()), type.value());
}
@@ -443,9 +518,9 @@
if (value.is_register()) {
return value.value();
} else if (value.is_parameter()) {
- return value.value() + num_registers_;
+ return value.value() + num_registers_ + kMaxScratchRegisters;
}
- DCHECK(false && "Must be either a parameter or a register");
+ CHECK(false && "Must be either a parameter or a register");
return 0;
}
@@ -498,7 +573,7 @@
// update the index -> ir node map (see tools/dexter/slicer/dex_ir_builder.cc)
auto new_index = dex_file_->methods_indexes.AllocateIndex();
auto& ir_node = dex_file_->methods_map[new_index];
- SLICER_CHECK(ir_node == nullptr);
+ CHECK(ir_node == nullptr);
ir_node = decl;
decl->orig_index = decl->index = new_index;
@@ -508,6 +583,15 @@
return entry;
}
+std::optional<const Prototype> DexBuilder::GetPrototypeByMethodId(size_t method_id) const {
+ for (const auto& entry : method_id_map_) {
+ if (entry.second.id == method_id) {
+ return entry.first.prototype;
+ }
+ }
+ return {};
+}
+
ir::Proto* DexBuilder::GetOrEncodeProto(Prototype prototype) {
ir::Proto*& ir_proto = proto_map_[prototype];
if (ir_proto == nullptr) {
diff --git a/startop/view_compiler/dex_builder.h b/startop/view_compiler/dex_builder.h
index 757d863..541d800 100644
--- a/startop/view_compiler/dex_builder.h
+++ b/startop/view_compiler/dex_builder.h
@@ -16,6 +16,7 @@
#ifndef DEX_BUILDER_H_
#define DEX_BUILDER_H_
+#include <array>
#include <forward_list>
#include <map>
#include <optional>
@@ -70,6 +71,8 @@
// Return the shorty descriptor, such as I or L
std::string short_descriptor() const { return descriptor().substr(0, 1); }
+ bool is_object() const { return short_descriptor() == "L"; }
+
bool operator<(const TypeDescriptor& rhs) const { return descriptor_ < rhs.descriptor_; }
private:
@@ -92,6 +95,8 @@
// Get the shorty descriptor, such as VII for (Int, Int) -> Void
std::string Shorty() const;
+ const TypeDescriptor& ArgType(size_t index) const;
+
bool operator<(const Prototype& rhs) const {
return std::make_tuple(return_type_, param_types_) <
std::make_tuple(rhs.return_type_, rhs.param_types_);
@@ -124,11 +129,13 @@
size_t value() const { return value_; }
- private:
- enum class Kind { kLocalRegister, kParameter, kImmediate, kString, kLabel, kType };
+ constexpr Value() : value_{0}, kind_{Kind::kInvalid} {}
- const size_t value_;
- const Kind kind_;
+ private:
+ enum class Kind { kInvalid, kLocalRegister, kParameter, kImmediate, kString, kLabel, kType };
+
+ size_t value_;
+ Kind kind_;
constexpr Value(size_t value, Kind kind) : value_{value}, kind_{kind} {}
};
@@ -151,6 +158,7 @@
kInvokeStatic,
kInvokeVirtual,
kMove,
+ kMoveObject,
kNew,
kReturn,
kReturnObject,
@@ -172,7 +180,7 @@
// A cast instruction. Basically, `(type)val`
static inline Instruction Cast(Value val, Value type) {
- DCHECK(type.is_type());
+ CHECK(type.is_type());
return OpWithArgs(Op::kCheckCast, val, type);
}
@@ -343,21 +351,48 @@
buffer_.push_back(b);
}
+ inline void Encode32x(art::Instruction::Code opcode, uint16_t a, uint16_t b) {
+ buffer_.push_back(opcode);
+ buffer_.push_back(a);
+ buffer_.push_back(b);
+ }
+
inline void Encode35c(art::Instruction::Code opcode, size_t a, uint16_t b, uint8_t c, uint8_t d,
uint8_t e, uint8_t f, uint8_t g) {
// a|g|op|bbbb|f|e|d|c
CHECK_LE(a, 5);
- CHECK_LT(c, 16);
- CHECK_LT(d, 16);
- CHECK_LT(e, 16);
- CHECK_LT(f, 16);
- CHECK_LT(g, 16);
+ CHECK(IsShortRegister(c));
+ CHECK(IsShortRegister(d));
+ CHECK(IsShortRegister(e));
+ CHECK(IsShortRegister(f));
+ CHECK(IsShortRegister(g));
buffer_.push_back((a << 12) | (g << 8) | opcode);
buffer_.push_back(b);
buffer_.push_back((f << 12) | (e << 8) | (d << 4) | c);
}
+ inline void Encode3rc(art::Instruction::Code opcode, size_t a, uint16_t b, uint16_t c) {
+ CHECK_LE(a, 255);
+ buffer_.push_back((a << 8) | opcode);
+ buffer_.push_back(b);
+ buffer_.push_back(c);
+ }
+
+ static constexpr bool IsShortRegister(size_t register_value) { return register_value < 16; }
+
+ // Returns an array of num_regs scratch registers. These are guaranteed to be
+ // contiguous, so they are suitable for the invoke-*/range instructions.
+ template <int num_regs>
+ std::array<Value, num_regs> GetScratchRegisters() const {
+ static_assert(num_regs <= kMaxScratchRegisters);
+ std::array<Value, num_regs> regs;
+ for (size_t i = 0; i < num_regs; ++i) {
+ regs[i] = std::move(Value::Local(num_registers_ + i));
+ }
+ return regs;
+ }
+
// Converts a register or parameter to its DEX register number.
size_t RegisterValue(const Value& value) const;
@@ -379,6 +414,10 @@
// A buffer to hold instructions that have been encoded.
std::vector<::dex::u2> buffer_;
+ // We create some scratch registers for when we have to shuffle registers
+ // around to make legal DEX code.
+ static constexpr size_t kMaxScratchRegisters = 5;
+
// How many registers we've allocated
size_t num_registers_{0};
@@ -447,6 +486,8 @@
const MethodDeclData& GetOrDeclareMethod(TypeDescriptor type, const std::string& name,
Prototype prototype);
+ std::optional<const Prototype> GetPrototypeByMethodId(size_t method_id) const;
+
private:
// Looks up the ir::Proto* corresponding to this given prototype, or creates one if it does not
// exist.
diff --git a/startop/view_compiler/dex_builder_test.cc b/startop/view_compiler/dex_builder_test.cc
index 61c86b4..90c256f 100644
--- a/startop/view_compiler/dex_builder_test.cc
+++ b/startop/view_compiler/dex_builder_test.cc
@@ -140,3 +140,41 @@
EXPECT_TRUE(EncodeAndVerify(&dex_file));
}
+
+// Write out and verify a DEX file that corresponds to:
+//
+// package dextest;
+// public class DexTest {
+// public static int foo(String s) { return s.length(); }
+// }
+TEST(DexBuilderTest, VerifyDexCallManyRegisters) {
+ DexBuilder dex_file;
+
+ auto cbuilder{dex_file.MakeClass("dextest.DexTest")};
+
+ MethodBuilder method{cbuilder.CreateMethod(
+ "foo", Prototype{TypeDescriptor::Int()})};
+
+ Value result = method.MakeRegister();
+
+ // Make a bunch of registers
+ for (size_t i = 0; i < 25; ++i) {
+ method.MakeRegister();
+ }
+
+ // Now load a string literal into a register
+ Value string_val = method.MakeRegister();
+ method.BuildConstString(string_val, "foo");
+
+ MethodDeclData string_length =
+ dex_file.GetOrDeclareMethod(TypeDescriptor::FromClassname("java.lang.String"),
+ "length",
+ Prototype{TypeDescriptor::Int()});
+
+ method.AddInstruction(Instruction::InvokeVirtual(string_length.id, result, string_val));
+ method.BuildReturn(result);
+
+ method.Encode();
+
+ EXPECT_TRUE(EncodeAndVerify(&dex_file));
+}
diff --git a/startop/view_compiler/dex_builder_test/Android.bp b/startop/view_compiler/dex_builder_test/Android.bp
index d4f38ed..ac60e96 100644
--- a/startop/view_compiler/dex_builder_test/Android.bp
+++ b/startop/view_compiler/dex_builder_test/Android.bp
@@ -15,7 +15,7 @@
//
genrule {
- name: "generate_compiled_layout",
+ name: "generate_compiled_layout1",
tools: [":viewcompiler"],
cmd: "$(location :viewcompiler) $(in) --dex --out $(out) --package android.startop.test",
srcs: ["res/layout/layout1.xml"],
@@ -24,6 +24,16 @@
],
}
+genrule {
+ name: "generate_compiled_layout2",
+ tools: [":viewcompiler"],
+ cmd: "$(location :viewcompiler) $(in) --dex --out $(out) --package android.startop.test",
+ srcs: ["res/layout/layout2.xml"],
+ out: [
+ "layout2.dex",
+ ],
+}
+
android_test {
name: "dex-builder-test",
srcs: [
@@ -31,7 +41,7 @@
"src/android/startop/test/LayoutCompilerTest.java",
],
sdk_version: "current",
- data: [":generate_dex_testcases", ":generate_compiled_layout"],
+ data: [":generate_dex_testcases", ":generate_compiled_layout1", ":generate_compiled_layout2"],
static_libs: [
"android-support-test",
"guava",
diff --git a/startop/view_compiler/dex_builder_test/AndroidTest.xml b/startop/view_compiler/dex_builder_test/AndroidTest.xml
index 68d8fdc..92e2a71 100644
--- a/startop/view_compiler/dex_builder_test/AndroidTest.xml
+++ b/startop/view_compiler/dex_builder_test/AndroidTest.xml
@@ -26,6 +26,7 @@
<option name="push" value="trivial.dex->/data/local/tmp/dex-builder-test/trivial.dex" />
<option name="push" value="simple.dex->/data/local/tmp/dex-builder-test/simple.dex" />
<option name="push" value="layout1.dex->/data/local/tmp/dex-builder-test/layout1.dex" />
+ <option name="push" value="layout2.dex->/data/local/tmp/dex-builder-test/layout2.dex" />
</target_preparer>
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
diff --git a/startop/view_compiler/dex_builder_test/res/layout/layout2.xml b/startop/view_compiler/dex_builder_test/res/layout/layout2.xml
new file mode 100644
index 0000000..b092e1c
--- /dev/null
+++ b/startop/view_compiler/dex_builder_test/res/layout/layout2.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <TableRow
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Button" />
+
+ <TableRow
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Button" />
+ <TableRow
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Button" />
+
+ <TableRow
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <Button
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="Button" />
+ </TableRow>
+
+ </TableRow>
+ </TableRow>
+ </TableRow>
+</LinearLayout>
diff --git a/startop/view_compiler/dex_builder_test/src/android/startop/test/LayoutCompilerTest.java b/startop/view_compiler/dex_builder_test/src/android/startop/test/LayoutCompilerTest.java
index ce3ce83..a3b1b6c 100644
--- a/startop/view_compiler/dex_builder_test/src/android/startop/test/LayoutCompilerTest.java
+++ b/startop/view_compiler/dex_builder_test/src/android/startop/test/LayoutCompilerTest.java
@@ -36,11 +36,20 @@
}
@Test
- public void loadAndInflaterLayout1() throws Exception {
+ public void loadAndInflateLayout1() throws Exception {
ClassLoader dex_file = loadDexFile("layout1.dex");
Class compiled_view = dex_file.loadClass("android.startop.test.CompiledView");
Method layout1 = compiled_view.getMethod("layout1", Context.class, int.class);
Context context = InstrumentationRegistry.getTargetContext();
layout1.invoke(null, context, R.layout.layout1);
}
+
+ @Test
+ public void loadAndInflateLayout2() throws Exception {
+ ClassLoader dex_file = loadDexFile("layout2.dex");
+ Class compiled_view = dex_file.loadClass("android.startop.test.CompiledView");
+ Method layout1 = compiled_view.getMethod("layout2", Context.class, int.class);
+ Context context = InstrumentationRegistry.getTargetContext();
+ layout1.invoke(null, context, R.layout.layout1);
+ }
}
diff --git a/telecomm/java/android/telecom/DefaultDialerManager.java b/telecomm/java/android/telecom/DefaultDialerManager.java
index b2fa5d4..57ae5d3 100644
--- a/telecomm/java/android/telecom/DefaultDialerManager.java
+++ b/telecomm/java/android/telecom/DefaultDialerManager.java
@@ -22,17 +22,22 @@
import android.content.pm.ActivityInfo;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
+import android.content.pm.ServiceInfo;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Binder;
import android.os.Process;
import android.os.UserHandle;
import android.text.TextUtils;
+import android.util.Slog;
import com.android.internal.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
/**
* Class for managing the default dialer application that will receive incoming calls, and be
@@ -71,19 +76,15 @@
int user) {
long identity = Binder.clearCallingIdentity();
try {
+ RoleManagerCallback.Future cb = new RoleManagerCallback.Future();
context.getSystemService(RoleManager.class).addRoleHolderAsUser(
RoleManager.ROLE_DIALER, packageName, UserHandle.of(user),
- AsyncTask.THREAD_POOL_EXECUTOR, new RoleManagerCallback() {
- @Override
- public void onSuccess() {}
-
- @Override
- public void onFailure() {
- Log.w(TAG, "Failed to set default dialer to %s for user %s",
- packageName, user);
- }
- });
+ AsyncTask.THREAD_POOL_EXECUTOR, cb);
+ cb.get(5, TimeUnit.SECONDS);
return true;
+ } catch (InterruptedException | ExecutionException | TimeoutException e) {
+ Slog.e(TAG, "Failed to set default dialer to " + packageName + " for user " + user, e);
+ return false;
} finally {
Binder.restoreCallingIdentity(identity);
}
@@ -162,7 +163,9 @@
final Intent dialIntentWithTelScheme = new Intent(Intent.ACTION_DIAL);
dialIntentWithTelScheme.setData(Uri.fromParts(PhoneAccount.SCHEME_TEL, "", null));
- return filterByIntent(context, packageNames, dialIntentWithTelScheme, userId);
+ packageNames = filterByIntent(context, packageNames, dialIntentWithTelScheme, userId);
+ packageNames = requireInCallService(packageNames, userId, context);
+ return packageNames;
}
public static List<String> getInstalledDialerApplications(Context context) {
@@ -220,6 +223,35 @@
return result;
}
+ private static List<String> requireInCallService(List<String> packageNames, int userId,
+ Context context) {
+ if (packageNames == null || packageNames.isEmpty()) {
+ return new ArrayList<>();
+ }
+
+ final Intent intent = new Intent(InCallService.SERVICE_INTERFACE);
+ final List<ResolveInfo> resolveInfoList = context.getPackageManager()
+ .queryIntentServicesAsUser(intent, PackageManager.GET_META_DATA, userId);
+ final List<String> result = new ArrayList<>();
+ final int length = resolveInfoList.size();
+ for (int i = 0; i < length; i++) {
+ final ServiceInfo info = resolveInfoList.get(i).serviceInfo;
+ if (info == null || info.metaData == null) {
+ continue;
+ }
+ if (!info.metaData.getBoolean(TelecomManager.METADATA_IN_CALL_SERVICE_UI)) {
+ continue;
+ }
+ if (info.metaData.getBoolean(TelecomManager.METADATA_IN_CALL_SERVICE_CAR_MODE_UI)) {
+ continue;
+ }
+ if (packageNames.contains(info.packageName) && !result.contains(info.packageName)) {
+ result.add(info.packageName);
+ }
+ }
+
+ return result;
+ }
private static TelecomManager getTelecomManager(Context context) {
return (TelecomManager) context.getSystemService(Context.TELECOM_SERVICE);
diff --git a/telecomm/java/android/telecom/TelecomManager.java b/telecomm/java/android/telecom/TelecomManager.java
index 12a5344..0e17a33 100644
--- a/telecomm/java/android/telecom/TelecomManager.java
+++ b/telecomm/java/android/telecom/TelecomManager.java
@@ -1404,8 +1404,14 @@
*
* @return {@code true} if there is a call which will be rejected or terminated, {@code false}
* otherwise.
+ * @deprecated Companion apps for wearable devices should use the {@link InCallService} API
+ * instead. Apps performing call screening should use the {@link CallScreeningService} API
+ * instead.
*/
+
+
@RequiresPermission(Manifest.permission.ANSWER_PHONE_CALLS)
+ @Deprecated
public boolean endCall() {
try {
if (isServiceConnected()) {
@@ -1426,11 +1432,15 @@
*
* Requires permission: {@link android.Manifest.permission#MODIFY_PHONE_STATE} or
* {@link android.Manifest.permission#ANSWER_PHONE_CALLS}
+ *
+ * @deprecated Companion apps for wearable devices should use the {@link InCallService} API
+ * instead.
*/
//TODO: L-release - need to convert all invocation of ITelecmmService#answerRingingCall to use
// this method (clockwork & gearhead).
@RequiresPermission(anyOf =
{Manifest.permission.ANSWER_PHONE_CALLS, Manifest.permission.MODIFY_PHONE_STATE})
+ @Deprecated
public void acceptRingingCall() {
try {
if (isServiceConnected()) {
@@ -1449,9 +1459,12 @@
* {@link android.Manifest.permission#ANSWER_PHONE_CALLS}
*
* @param videoState The desired video state to answer the call with.
+ * @deprecated Companion apps for wearable devices should use the {@link InCallService} API
+ * instead.
*/
@RequiresPermission(anyOf =
{Manifest.permission.ANSWER_PHONE_CALLS, Manifest.permission.MODIFY_PHONE_STATE})
+ @Deprecated
public void acceptRingingCall(int videoState) {
try {
if (isServiceConnected()) {
diff --git a/telephony/java/android/telephony/CallAttributes.java b/telephony/java/android/telephony/CallAttributes.java
index 2d29875..a4cce9c 100644
--- a/telephony/java/android/telephony/CallAttributes.java
+++ b/telephony/java/android/telephony/CallAttributes.java
@@ -50,10 +50,9 @@
}
private CallAttributes(Parcel in) {
- mPreciseCallState = (PreciseCallState)
- in.readValue(PreciseCallState.class.getClassLoader());
- mNetworkType = in.readInt();
- mCallQuality = (CallQuality) in.readValue(CallQuality.class.getClassLoader());
+ this.mPreciseCallState = in.readParcelable(PreciseCallState.class.getClassLoader());
+ this.mNetworkType = in.readInt();
+ this.mCallQuality = in.readParcelable(CallQuality.class.getClassLoader());
}
// getters
@@ -134,9 +133,9 @@
* {@link Parcelable#writeToParcel}
*/
public void writeToParcel(Parcel dest, @Parcelable.WriteFlags int flags) {
- mPreciseCallState.writeToParcel(dest, flags);
+ dest.writeParcelable(mPreciseCallState, flags);
dest.writeInt(mNetworkType);
- mCallQuality.writeToParcel(dest, flags);
+ dest.writeParcelable(mCallQuality, flags);
}
public static final Parcelable.Creator<CallAttributes> CREATOR = new Parcelable.Creator() {
diff --git a/telephony/java/android/telephony/CellSignalStrengthNr.java b/telephony/java/android/telephony/CellSignalStrengthNr.java
index 061cd4b..6f84ec5 100644
--- a/telephony/java/android/telephony/CellSignalStrengthNr.java
+++ b/telephony/java/android/telephony/CellSignalStrengthNr.java
@@ -77,6 +77,14 @@
}
/**
+ * @hide
+ * @param ss signal strength from modem.
+ */
+ public CellSignalStrengthNr(android.hardware.radio.V1_4.NrSignalStrength ss) {
+ this(ss.csiRsrp, ss.csiRsrq, ss.csiSinr, ss.ssRsrp, ss.ssRsrq, ss.ssSinr);
+ }
+
+ /**
* Reference: 3GPP TS 38.215.
* Range: -140 dBm to -44 dBm.
* @return SS reference signal received power, {@link CellInfo#UNAVAILABLE} means unreported
diff --git a/telephony/java/android/telephony/SignalStrength.java b/telephony/java/android/telephony/SignalStrength.java
index 91375bc..d2ae106 100644
--- a/telephony/java/android/telephony/SignalStrength.java
+++ b/telephony/java/android/telephony/SignalStrength.java
@@ -85,6 +85,7 @@
CellSignalStrengthWcdma mWcdma;
CellSignalStrengthTdscdma mTdscdma;
CellSignalStrengthLte mLte;
+ CellSignalStrengthNr mNr;
/**
* Create a new SignalStrength from a intent notifier Bundle
@@ -116,7 +117,7 @@
public SignalStrength() {
this(new CellSignalStrengthCdma(), new CellSignalStrengthGsm(),
new CellSignalStrengthWcdma(), new CellSignalStrengthTdscdma(),
- new CellSignalStrengthLte());
+ new CellSignalStrengthLte(), new CellSignalStrengthNr());
}
/**
@@ -129,12 +130,14 @@
@NonNull CellSignalStrengthGsm gsm,
@NonNull CellSignalStrengthWcdma wcdma,
@NonNull CellSignalStrengthTdscdma tdscdma,
- @NonNull CellSignalStrengthLte lte) {
+ @NonNull CellSignalStrengthLte lte,
+ @NonNull CellSignalStrengthNr nr) {
mCdma = cdma;
mGsm = gsm;
mWcdma = wcdma;
mTdscdma = tdscdma;
mLte = lte;
+ mNr = nr;
}
/**
@@ -147,7 +150,8 @@
new CellSignalStrengthGsm(signalStrength.gw),
new CellSignalStrengthWcdma(),
new CellSignalStrengthTdscdma(signalStrength.tdScdma),
- new CellSignalStrengthLte(signalStrength.lte));
+ new CellSignalStrengthLte(signalStrength.lte),
+ new CellSignalStrengthNr());
}
/**
@@ -160,7 +164,23 @@
new CellSignalStrengthGsm(signalStrength.gsm),
new CellSignalStrengthWcdma(signalStrength.wcdma),
new CellSignalStrengthTdscdma(signalStrength.tdScdma),
- new CellSignalStrengthLte(signalStrength.lte));
+ new CellSignalStrengthLte(signalStrength.lte),
+ new CellSignalStrengthNr());
+ }
+
+ /**
+ * Constructor for Radio HAL V1.4.
+ *
+ * @param signalStrength signal strength reported from modem.
+ * @hide
+ */
+ public SignalStrength(android.hardware.radio.V1_4.SignalStrength signalStrength) {
+ this(new CellSignalStrengthCdma(signalStrength.cdma, signalStrength.evdo),
+ new CellSignalStrengthGsm(signalStrength.gsm),
+ new CellSignalStrengthWcdma(signalStrength.wcdma),
+ new CellSignalStrengthTdscdma(signalStrength.tdscdma),
+ new CellSignalStrengthLte(signalStrength.lte),
+ new CellSignalStrengthNr(signalStrength.nr));
}
private CellSignalStrength getPrimary() {
@@ -171,6 +191,7 @@
if (mTdscdma.isValid()) return mTdscdma;
if (mWcdma.isValid()) return mWcdma;
if (mGsm.isValid()) return mGsm;
+ if (mNr.isValid()) return mNr;
return mLte;
}
@@ -200,6 +221,7 @@
if (mTdscdma.isValid()) cssList.add(mTdscdma);
if (mWcdma.isValid()) cssList.add(mWcdma);
if (mGsm.isValid()) cssList.add(mGsm);
+ if (mNr.isValid()) cssList.add(mNr);
return cssList;
}
@@ -210,6 +232,7 @@
mWcdma.updateLevel(cc, ss);
mTdscdma.updateLevel(cc, ss);
mLte.updateLevel(cc, ss);
+ mNr.updateLevel(cc, ss);
}
/**
@@ -234,6 +257,7 @@
mWcdma = new CellSignalStrengthWcdma(s.mWcdma);
mTdscdma = new CellSignalStrengthTdscdma(s.mTdscdma);
mLte = new CellSignalStrengthLte(s.mLte);
+ mNr = new CellSignalStrengthNr(s.mNr);
}
/**
@@ -250,6 +274,7 @@
mWcdma = in.readParcelable(CellSignalStrengthWcdma.class.getClassLoader());
mTdscdma = in.readParcelable(CellSignalStrengthTdscdma.class.getClassLoader());
mLte = in.readParcelable(CellSignalStrengthLte.class.getClassLoader());
+ mNr = in.readParcelable(CellSignalStrengthLte.class.getClassLoader());
}
/**
@@ -261,6 +286,7 @@
out.writeParcelable(mWcdma, flags);
out.writeParcelable(mTdscdma, flags);
out.writeParcelable(mLte, flags);
+ out.writeParcelable(mNr, flags);
}
/**
@@ -814,7 +840,7 @@
*/
@Override
public int hashCode() {
- return Objects.hash(mCdma, mGsm, mWcdma, mTdscdma, mLte);
+ return Objects.hash(mCdma, mGsm, mWcdma, mTdscdma, mLte, mNr);
}
/**
@@ -830,7 +856,8 @@
&& mGsm.equals(s.mGsm)
&& mWcdma.equals(s.mWcdma)
&& mTdscdma.equals(s.mTdscdma)
- && mLte.equals(s.mLte);
+ && mLte.equals(s.mLte)
+ && mNr.equals(s.mNr);
}
/**
@@ -844,6 +871,7 @@
.append(",mWcdma=").append(mWcdma)
.append(",mTdscdma=").append(mTdscdma)
.append(",mLte=").append(mLte)
+ .append(",mNr=").append(mNr)
.append(",primary=").append(getPrimary().getClass().getSimpleName())
.append("}")
.toString();
@@ -866,6 +894,7 @@
mWcdma = m.getParcelable("Wcdma");
mTdscdma = m.getParcelable("Tdscdma");
mLte = m.getParcelable("Lte");
+ mNr = m.getParcelable("Nr");
}
/**
@@ -885,6 +914,7 @@
m.putParcelable("Wcdma", mWcdma);
m.putParcelable("Tdscdma", mTdscdma);
m.putParcelable("Lte", mLte);
+ m.putParcelable("Nr", mNr);
}
/**
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java
index a1fb090..7c3bde4 100644
--- a/telephony/java/android/telephony/TelephonyManager.java
+++ b/telephony/java/android/telephony/TelephonyManager.java
@@ -354,27 +354,26 @@
* Returns 3 for Tri standby mode.(Tri SIM functionality)
*/
public int getPhoneCount() {
- int phoneCount = 0;
-
- // check for voice and data support, 0 if not supported
- if (!isVoiceCapable() && !isSmsCapable()) {
- ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(
- Context.CONNECTIVITY_SERVICE);
- if (cm != null) {
- if (!cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
- return phoneCount;
+ int phoneCount = 1;
+ switch (getMultiSimConfiguration()) {
+ case UNKNOWN:
+ ConnectivityManager cm = mContext == null ? null : (ConnectivityManager) mContext
+ .getSystemService(Context.CONNECTIVITY_SERVICE);
+ // check for voice and data support, 0 if not supported
+ if (!isVoiceCapable() && !isSmsCapable() && cm != null
+ && !cm.isNetworkSupported(ConnectivityManager.TYPE_MOBILE)) {
+ phoneCount = 0;
+ } else {
+ phoneCount = 1;
}
- }
- }
-
- phoneCount = 1;
- try {
- ITelephony telephony = getITelephony();
- if (telephony != null) {
- phoneCount = telephony.getNumOfActiveSims();
- }
- } catch (RemoteException ex) {
- Rlog.e(TAG, "getNumOfActiveSims RemoteException", ex);
+ break;
+ case DSDS:
+ case DSDA:
+ phoneCount = PhoneConstants.MAX_PHONE_COUNT_DUAL_SIM;
+ break;
+ case TSTS:
+ phoneCount = PhoneConstants.MAX_PHONE_COUNT_TRI_SIM;
+ break;
}
return phoneCount;
}
diff --git a/telephony/java/com/android/internal/telephony/EncodeException.java b/telephony/java/com/android/internal/telephony/EncodeException.java
index 4e3fac1..cdc853e 100644
--- a/telephony/java/com/android/internal/telephony/EncodeException.java
+++ b/telephony/java/com/android/internal/telephony/EncodeException.java
@@ -22,6 +22,12 @@
* {@hide}
*/
public class EncodeException extends Exception {
+
+ private int mError = ERROR_UNENCODABLE;
+
+ public static final int ERROR_UNENCODABLE = 0;
+ public static final int ERROR_EXCEED_SIZE = 1;
+
public EncodeException() {
super();
}
@@ -31,9 +37,18 @@
super(s);
}
+ public EncodeException(String s, int error) {
+ super(s);
+ mError = error;
+ }
+
@UnsupportedAppUsage
public EncodeException(char c) {
super("Unencodable char: '" + c + "'");
}
+
+ public int getError() {
+ return mError;
+ }
}
diff --git a/telephony/java/com/android/internal/telephony/GsmAlphabet.java b/telephony/java/com/android/internal/telephony/GsmAlphabet.java
index 84c0e64..a774cdc 100644
--- a/telephony/java/com/android/internal/telephony/GsmAlphabet.java
+++ b/telephony/java/com/android/internal/telephony/GsmAlphabet.java
@@ -388,7 +388,7 @@
* GSM extension table
* @return the encoded message
*
- * @throws EncodeException if String is too large to encode
+ * @throws EncodeException if String is too large to encode or any characters are unencodable
*/
@UnsupportedAppUsage
public static byte[] stringToGsm7BitPacked(String data, int startingSeptetOffset,
@@ -402,7 +402,8 @@
}
septetCount += startingSeptetOffset;
if (septetCount > 255) {
- throw new EncodeException("Payload cannot exceed 255 septets");
+ throw new EncodeException(
+ "Payload cannot exceed 255 septets", EncodeException.ERROR_EXCEED_SIZE);
}
int byteCount = ((septetCount * 7) + 7) / 8;
byte[] ret = new byte[byteCount + 1]; // Include space for one byte length prefix.
diff --git a/telephony/java/com/android/internal/telephony/ITelephony.aidl b/telephony/java/com/android/internal/telephony/ITelephony.aidl
index 762d886..bc43fea 100644
--- a/telephony/java/com/android/internal/telephony/ITelephony.aidl
+++ b/telephony/java/com/android/internal/telephony/ITelephony.aidl
@@ -1843,11 +1843,6 @@
* @hide
*/
void switchMultiSimConfig(int numOfSims);
- /**
- * Get how many modems have been activated on the phone
- * @hide
- */
- int getNumOfActiveSims();
/**
* Get if reboot is required upon altering modems configurations
diff --git a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
index 4f5bfa9..015efa6 100644
--- a/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
+++ b/telephony/java/com/android/internal/telephony/gsm/SmsMessage.java
@@ -384,16 +384,22 @@
}
}
} catch (EncodeException ex) {
- // Encoding to the 7-bit alphabet failed. Let's see if we can
- // send it as a UCS-2 encoded message
- try {
- userData = encodeUCS2(message, header);
- encoding = ENCODING_16BIT;
- } catch(UnsupportedEncodingException uex) {
- Rlog.e(LOG_TAG,
- "Implausible UnsupportedEncodingException ",
- uex);
+ if (ex.getError() == EncodeException.ERROR_EXCEED_SIZE) {
+ Rlog.e(LOG_TAG, "Exceed size limitation EncodeException", ex);
return null;
+ } else {
+ // Encoding to the 7-bit alphabet failed. Let's see if we can
+ // send it as a UCS-2 encoded message
+ try {
+ userData = encodeUCS2(message, header);
+ encoding = ENCODING_16BIT;
+ } catch (EncodeException ex1) {
+ Rlog.e(LOG_TAG, "Exceed size limitation EncodeException", ex1);
+ return null;
+ } catch (UnsupportedEncodingException uex) {
+ Rlog.e(LOG_TAG, "Implausible UnsupportedEncodingException ", uex);
+ return null;
+ }
}
}
@@ -438,9 +444,10 @@
*
* @return encoded message as UCS2
* @throws UnsupportedEncodingException
+ * @throws EncodeException if String is too large to encode
*/
private static byte[] encodeUCS2(String message, byte[] header)
- throws UnsupportedEncodingException {
+ throws UnsupportedEncodingException, EncodeException {
byte[] userData, textPart;
textPart = message.getBytes("utf-16be");
@@ -455,6 +462,10 @@
else {
userData = textPart;
}
+ if (userData.length > 255) {
+ throw new EncodeException(
+ "Payload cannot exceed 255 bytes", EncodeException.ERROR_EXCEED_SIZE);
+ }
byte[] ret = new byte[userData.length+1];
ret[0] = (byte) (userData.length & 0xff );
System.arraycopy(userData, 0, ret, 1, userData.length);
diff --git a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java
index c1c598d..77cd62e 100644
--- a/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java
+++ b/tests/PackageWatchdog/src/com/android/server/PackageWatchdogTest.java
@@ -242,8 +242,9 @@
PackageWatchdog watchdog = createWatchdog();
long differentVersionCode = 2L;
TestObserver observer = new TestObserver(OBSERVER_NAME_1) {
- public int onHealthCheckFailed(String packageName, long versionCode) {
- if (versionCode == VERSION_CODE) {
+ @Override
+ public int onHealthCheckFailed(VersionedPackage versionedPackage) {
+ if (versionedPackage.getVersionCode() == VERSION_CODE) {
// Only rollback for specific versionCode
return PackageHealthObserverImpact.USER_IMPACT_MEDIUM;
}
@@ -457,12 +458,12 @@
mImpact = impact;
}
- public int onHealthCheckFailed(String packageName, long versionCode) {
+ public int onHealthCheckFailed(VersionedPackage versionedPackage) {
return mImpact;
}
- public boolean execute(String packageName, long versionCode) {
- mFailedPackages.add(packageName);
+ public boolean execute(VersionedPackage versionedPackage) {
+ mFailedPackages.add(versionedPackage.getPackageName());
return true;
}
diff --git a/tests/RollbackTest/Android.bp b/tests/RollbackTest/Android.bp
deleted file mode 100644
index 3d57d56..0000000
--- a/tests/RollbackTest/Android.bp
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (C) 2018 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.
-
-android_app {
- name: "RollbackTestAppAv1",
- manifest: "TestApp/Av1.xml",
- sdk_version: "current",
- srcs: ["TestApp/src/**/*.java"],
-}
-
-android_app {
- name: "RollbackTestAppAv2",
- manifest: "TestApp/Av2.xml",
- sdk_version: "current",
- srcs: ["TestApp/src/**/*.java"],
-}
-
-android_app {
- name: "RollbackTestAppACrashingV2",
- manifest: "TestApp/ACrashingV2.xml",
- sdk_version: "current",
- srcs: ["TestApp/src/**/*.java"],
-}
-
-android_app {
- name: "RollbackTestAppBv1",
- manifest: "TestApp/Bv1.xml",
- sdk_version: "current",
- srcs: ["TestApp/src/**/*.java"],
-}
-
-android_app {
- name: "RollbackTestAppBv2",
- manifest: "TestApp/Bv2.xml",
- sdk_version: "current",
- srcs: ["TestApp/src/**/*.java"],
-}
-
-android_test {
- name: "RollbackTest",
- srcs: ["src/**/*.java"],
- static_libs: ["android-support-test"],
- test_suites: ["general-tests"],
- java_resources: [
- ":RollbackTestAppAv1",
- ":RollbackTestAppAv2",
- ":RollbackTestAppACrashingV2",
- ":RollbackTestAppBv1",
- ":RollbackTestAppBv2",
- ],
- test_config: "RollbackTest.xml",
- sdk_version: "system_current",
-}
diff --git a/tests/RollbackTest/Android.mk b/tests/RollbackTest/Android.mk
new file mode 100644
index 0000000..780bb24
--- /dev/null
+++ b/tests/RollbackTest/Android.mk
@@ -0,0 +1,94 @@
+# Copyright (C) 2018 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.
+
+LOCAL_PATH:= $(call my-dir)
+
+# RollbackTestAppAv1.apk
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := $(call all-java-files-under, TestApp/src)
+LOCAL_MANIFEST_FILE := TestApp/Av1.xml
+LOCAL_PACKAGE_NAME := RollbackTestAppAv1
+include $(BUILD_PACKAGE)
+ROLLBACK_TEST_APP_AV1 := $(LOCAL_INSTALLED_MODULE)
+
+# RollbackTestAppAv2.apk
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := $(call all-java-files-under, TestApp/src)
+LOCAL_MANIFEST_FILE := TestApp/Av2.xml
+LOCAL_PACKAGE_NAME := RollbackTestAppAv2
+include $(BUILD_PACKAGE)
+ROLLBACK_TEST_APP_AV2 := $(LOCAL_INSTALLED_MODULE)
+
+# RollbackTestAppACrashingV2.apk
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := $(call all-java-files-under, TestApp/src)
+LOCAL_MANIFEST_FILE := TestApp/ACrashingV2.xml
+LOCAL_PACKAGE_NAME := RollbackTestAppACrashingV2
+include $(BUILD_PACKAGE)
+ROLLBACK_TEST_APP_A_CRASHING_V2 := $(LOCAL_INSTALLED_MODULE)
+
+# RollbackTestAppBv1.apk
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := $(call all-java-files-under, TestApp/src)
+LOCAL_MANIFEST_FILE := TestApp/Bv1.xml
+LOCAL_PACKAGE_NAME := RollbackTestAppBv1
+include $(BUILD_PACKAGE)
+ROLLBACK_TEST_APP_BV1 := $(LOCAL_INSTALLED_MODULE)
+
+# RollbackTestAppBv2.apk
+include $(CLEAR_VARS)
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
+LOCAL_SDK_VERSION := current
+LOCAL_SRC_FILES := $(call all-java-files-under, TestApp/src)
+LOCAL_MANIFEST_FILE := TestApp/Bv2.xml
+LOCAL_PACKAGE_NAME := RollbackTestAppBv2
+include $(BUILD_PACKAGE)
+ROLLBACK_TEST_APP_BV2 := $(LOCAL_INSTALLED_MODULE)
+
+# RollbackTest
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_PACKAGE_NAME := RollbackTest
+LOCAL_MODULE_TAGS := tests
+LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_COMPATIBILITY_SUITE := general-tests
+LOCAL_JAVA_RESOURCE_FILES := \
+ $(ROLLBACK_TEST_APP_AV1) \
+ $(ROLLBACK_TEST_APP_AV2) \
+ $(ROLLBACK_TEST_APP_A_CRASHING_V2) \
+ $(ROLLBACK_TEST_APP_BV1) \
+ $(ROLLBACK_TEST_APP_BV2)
+LOCAL_SDK_VERSION := system_current
+LOCAL_TEST_CONFIG := RollbackTest.xml
+include $(BUILD_PACKAGE)
+
+# Clean up local variables
+ROLLBACK_TEST_APP_AV1 :=
+ROLLBACK_TEST_APP_AV2 :=
+ROLLBACK_TEST_APP_A_CRASHING_V2 :=
+ROLLBACK_TEST_APP_BV1 :=
+ROLLBACK_TEST_APP_BV2 :=
diff --git a/tests/RollbackTest/TestApp/src/com/android/tests/rollback/testapp/CrashingMainActivity.java b/tests/RollbackTest/TestApp/src/com/android/tests/rollback/testapp/CrashingMainActivity.java
index 2310c82..97958ac 100644
--- a/tests/RollbackTest/TestApp/src/com/android/tests/rollback/testapp/CrashingMainActivity.java
+++ b/tests/RollbackTest/TestApp/src/com/android/tests/rollback/testapp/CrashingMainActivity.java
@@ -33,7 +33,7 @@
throw new RuntimeException("Intended force crash");
}
- public void incrementCountAndBroadcast() {
+ private void incrementCountAndBroadcast() {
SharedPreferences preferences = getSharedPreferences("prefs", Context.MODE_PRIVATE);
SharedPreferences.Editor editor = preferences.edit();
int count = preferences.getInt("crash_count", 0);
diff --git a/tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java b/tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java
index 4b277ae..ace0e6d 100644
--- a/tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java
+++ b/tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java
@@ -37,6 +37,7 @@
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.JUnit4;
@@ -628,9 +629,12 @@
assertEquals(versionRolledBackTo, info.getVersionRolledBackTo().getLongVersionCode());
}
+ // TODO: Allow installing test app along atomically with module metadata package so that
+ // a failed test app will be flagged as a failed mainline app
/**
* Test bad update automatic rollback.
*/
+ @Ignore
@Test
public void testBadUpdateRollback() throws Exception {
BroadcastReceiver crashCountReceiver = null;
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java
index 50468cb..e2d59d6 100644
--- a/tests/net/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java
@@ -194,6 +194,7 @@
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
@@ -500,17 +501,17 @@
public void unwanted() { mDisconnected.open(); }
@Override
- public void startPacketKeepalive(Message msg) {
+ public void startSocketKeepalive(Message msg) {
int slot = msg.arg1;
if (mExpectedKeepaliveSlot != null) {
assertEquals((int) mExpectedKeepaliveSlot, slot);
}
- onPacketKeepaliveEvent(slot, mStartKeepaliveError);
+ onSocketKeepaliveEvent(slot, mStartKeepaliveError);
}
@Override
- public void stopPacketKeepalive(Message msg) {
- onPacketKeepaliveEvent(msg.arg1, mStopKeepaliveError);
+ public void stopSocketKeepalive(Message msg) {
+ onSocketKeepaliveEvent(msg.arg1, mStopKeepaliveError);
}
@Override
@@ -3817,10 +3818,17 @@
@Test
public void testNattSocketKeepalives() throws Exception {
+ final ExecutorService executorSingleThread = Executors.newSingleThreadExecutor();
+ doTestNattSocketKeepalivesWithExecutor(executorSingleThread);
+ executorSingleThread.shutdown();
+
+ final Executor executorInline = (Runnable r) -> r.run();
+ doTestNattSocketKeepalivesWithExecutor(executorInline);
+ }
+
+ private void doTestNattSocketKeepalivesWithExecutor(Executor executor) throws Exception {
// TODO: 1. Move this outside of ConnectivityServiceTest.
- // 2. Add helper function to test against newSingleThreadExecutor as well as inline
- // executor.
- // 3. Make test to verify that Nat-T keepalive socket is created by IpSecService.
+ // 2. Make test to verify that Nat-T keepalive socket is created by IpSecService.
final int srcPort = 12345;
final InetAddress myIPv4 = InetAddress.getByName("192.0.2.129");
final InetAddress notMyIPv4 = InetAddress.getByName("192.0.2.35");
@@ -3834,8 +3842,6 @@
final IpSecManager mIpSec = (IpSecManager) mContext.getSystemService(Context.IPSEC_SERVICE);
final UdpEncapsulationSocket testSocket = mIpSec.openUdpEncapsulationSocket(srcPort);
- final Executor executor = Executors.newSingleThreadExecutor();
-
LinkProperties lp = new LinkProperties();
lp.setInterfaceName("wlan12");
lp.addLinkAddress(new LinkAddress(myIPv6, 64));
@@ -3952,6 +3958,11 @@
ka2.stop();
callback2.expectStopped();
+
+ testSocket.close();
+ testSocket2.close();
+
+ mWiFiNetworkAgent.disconnect();
}
@Test
diff --git a/tools/aapt2/Android.bp b/tools/aapt2/Android.bp
index 8f75287..bc3a9a1 100644
--- a/tools/aapt2/Android.bp
+++ b/tools/aapt2/Android.bp
@@ -108,6 +108,7 @@
"link/ProductFilter.cpp",
"link/PrivateAttributeMover.cpp",
"link/ReferenceLinker.cpp",
+ "link/ResourceExcluder.cpp",
"link/TableMerger.cpp",
"link/XmlCompatVersioner.cpp",
"link/XmlNamespaceRemover.cpp",
diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp
index 729447e..8463046 100644
--- a/tools/aapt2/cmd/Link.cpp
+++ b/tools/aapt2/cmd/Link.cpp
@@ -59,6 +59,7 @@
#include "link/ManifestFixer.h"
#include "link/NoDefaultResourceRemover.h"
#include "link/ReferenceLinker.h"
+#include "link/ResourceExcluder.h"
#include "link/TableMerger.h"
#include "link/XmlCompatVersioner.h"
#include "optimize/ResourceDeduper.h"
@@ -1828,6 +1829,29 @@
}
}
+ if (!options_.exclude_configs_.empty()) {
+ std::vector<ConfigDescription> excluded_configs;
+
+ for (auto& config_string : options_.exclude_configs_) {
+ ConfigDescription config_description;
+
+ if (!ConfigDescription::Parse(config_string, &config_description)) {
+ context_->GetDiagnostics()->Error(DiagMessage()
+ << "failed to parse --excluded-configs "
+ << config_string);
+ return 1;
+ }
+
+ excluded_configs.push_back(config_description);
+ }
+
+ ResourceExcluder excluder(excluded_configs);
+ if (!excluder.Consume(context_, &final_table_)) {
+ context_->GetDiagnostics()->Error(DiagMessage() << "failed excluding configurations");
+ return 1;
+ }
+ }
+
if (!options_.no_resource_deduping) {
ResourceDeduper deduper;
if (!deduper.Consume(context_, &final_table_)) {
diff --git a/tools/aapt2/cmd/Link.h b/tools/aapt2/cmd/Link.h
index f70470a..590a6bb 100644
--- a/tools/aapt2/cmd/Link.h
+++ b/tools/aapt2/cmd/Link.h
@@ -82,6 +82,9 @@
std::vector<SplitConstraints> split_constraints;
std::vector<std::string> split_paths;
+ // Configurations to exclude
+ std::vector<std::string> exclude_configs_;
+
// Stable ID options.
std::unordered_map<ResourceName, ResourceId> stable_id_map;
Maybe<std::string> resource_id_map_path;
@@ -255,6 +258,9 @@
"Syntax: path/to/output.apk:<config>[,<config>[...]].\n"
"On Windows, use a semicolon ';' separator instead.",
&split_args_);
+ AddOptionalFlagList("--exclude-configs",
+ "Excludes values of resources whose configs contain the specified qualifiers.",
+ &options_.exclude_configs_);
AddOptionalSwitch("--debug-mode",
"Inserts android:debuggable=\"true\" in to the application node of the\n"
"manifest, making the application debuggable even on production devices.",
diff --git a/tools/aapt2/link/ResourceExcluder.cpp b/tools/aapt2/link/ResourceExcluder.cpp
new file mode 100644
index 0000000..2555995
--- /dev/null
+++ b/tools/aapt2/link/ResourceExcluder.cpp
@@ -0,0 +1,89 @@
+/*
+ * Copyright (C) 2019 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 "link/ResourceExcluder.h"
+
+#include <algorithm>
+
+#include "DominatorTree.h"
+#include "ResourceTable.h"
+
+using android::ConfigDescription;
+
+namespace aapt {
+
+namespace {
+
+void RemoveIfExcluded(std::set<std::pair<ConfigDescription, int>>& excluded_configs_,
+ IAaptContext* context,
+ ResourceEntry* entry,
+ ResourceConfigValue* value) {
+ const ConfigDescription& config = value->config;
+
+ // If this entry is a default, ignore
+ if (config == ConfigDescription::DefaultConfig()) {
+ return;
+ }
+
+ for (auto& excluded_pair : excluded_configs_) {
+
+ const ConfigDescription& excluded_config = excluded_pair.first;
+ const int& excluded_diff = excluded_pair.second;
+
+ // Check whether config contains all flags in excluded config
+ int node_diff = config.diff(excluded_config);
+ int masked_diff = excluded_diff & node_diff;
+
+ if (masked_diff == 0) {
+ if (context->IsVerbose()) {
+ context->GetDiagnostics()->Note(
+ DiagMessage(value->value->GetSource())
+ << "excluded resource \""
+ << entry->name
+ << "\" with config "
+ << config.toString());
+ }
+ value->value = {};
+ return;
+ }
+ }
+}
+
+} // namespace
+
+bool ResourceExcluder::Consume(IAaptContext* context, ResourceTable* table) {
+ for (auto& package : table->packages) {
+ for (auto& type : package->types) {
+ for (auto& entry : type->entries) {
+ for (auto& value : entry->values) {
+ RemoveIfExcluded(excluded_configs_, context, entry.get(), value.get());
+ }
+
+ // Erase the values that were removed.
+ entry->values.erase(
+ std::remove_if(
+ entry->values.begin(), entry->values.end(),
+ [](const std::unique_ptr<ResourceConfigValue>& val) -> bool {
+ return val == nullptr || val->value == nullptr;
+ }),
+ entry->values.end());
+ }
+ }
+ }
+ return true;
+}
+
+} // namespace aapt
diff --git a/tools/aapt2/link/ResourceExcluder.h b/tools/aapt2/link/ResourceExcluder.h
new file mode 100644
index 0000000..1890b34
--- /dev/null
+++ b/tools/aapt2/link/ResourceExcluder.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2019 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.
+ */
+
+#ifndef AAPT_LINK_RESOURCEEXCLUDER_H
+#define AAPT_LINK_RESOURCEEXCLUDER_H
+
+#include "android-base/macros.h"
+
+#include "process/IResourceTableConsumer.h"
+
+using android::ConfigDescription;
+
+namespace aapt {
+
+// Removes excluded configs from resources.
+class ResourceExcluder : public IResourceTableConsumer {
+ public:
+ explicit ResourceExcluder(std::vector<ConfigDescription>& excluded_configs) {
+ for (auto& config: excluded_configs) {
+ int diff_from_default = config.diff(ConfigDescription::DefaultConfig());
+ excluded_configs_.insert(std::pair(config, diff_from_default));
+ }
+ }
+
+ bool Consume(IAaptContext* context, ResourceTable* table) override;
+
+ private:
+ DISALLOW_COPY_AND_ASSIGN(ResourceExcluder);
+
+ std::set<std::pair<ConfigDescription, int>> excluded_configs_;
+};
+
+} // namespace aapt
+
+#endif // AAPT_LINK_RESOURCEEXCLUDER_H
diff --git a/tools/aapt2/link/ResourceExcluder_test.cpp b/tools/aapt2/link/ResourceExcluder_test.cpp
new file mode 100644
index 0000000..c9d01e4
--- /dev/null
+++ b/tools/aapt2/link/ResourceExcluder_test.cpp
@@ -0,0 +1,221 @@
+/*
+ * Copyright (C) 2019 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 "link/ResourceExcluder.h"
+
+#include "ResourceTable.h"
+#include "test/Test.h"
+
+using ::aapt::test::HasValue;
+using ::android::ConfigDescription;
+using ::testing::Not;
+
+namespace {
+
+ConfigDescription BuildArg(const std::string arg) {
+ ConfigDescription config_description;
+ ConfigDescription::Parse(arg, &config_description);
+ return config_description;
+}
+
+std::vector<ConfigDescription> BuildArgList(const std::string arg) {
+ ConfigDescription config_description;
+ ConfigDescription::Parse(arg, &config_description);
+ return { config_description };
+}
+
+} // namespace
+
+namespace aapt {
+
+TEST(ResourceExcluderTest, NonMatchConfigNotExcluded) {
+ std::unique_ptr<IAaptContext> context = test::ContextBuilder().Build();
+ ConfigDescription default_config;
+ auto fr_config = test::ParseConfigOrDie("fr");
+
+ std::unique_ptr<ResourceTable> table =
+ test::ResourceTableBuilder()
+ .AddString("android:string/test", ResourceId{}, default_config, "default")
+ .AddString("android:string/test", ResourceId{}, fr_config, "fr")
+ .Build();
+
+ auto args = BuildArgList("en");
+
+ ASSERT_TRUE(ResourceExcluder(args).Consume(context.get(), table.get()));
+ EXPECT_THAT(table, HasValue("android:string/test", default_config));
+ EXPECT_THAT(table, HasValue("android:string/test", fr_config));
+}
+
+TEST(ResourceExcluderTest, ExactConfigExcluded) {
+ std::unique_ptr<IAaptContext> context = test::ContextBuilder().Build();
+ ConfigDescription default_config;
+ auto fr_config = test::ParseConfigOrDie("fr");
+
+ std::unique_ptr<ResourceTable> table =
+ test::ResourceTableBuilder()
+ .AddString("android:string/test", ResourceId{}, default_config, "default")
+ .AddString("android:string/test", ResourceId{}, fr_config, "fr")
+ .Build();
+
+ auto args = BuildArgList("fr");
+
+ ASSERT_TRUE(ResourceExcluder(args).Consume(context.get(), table.get()));
+ EXPECT_THAT(table, HasValue("android:string/test", default_config));
+ EXPECT_THAT(table, Not(HasValue("android:string/test", fr_config)));
+}
+
+TEST(ResourceExcluderTest, MoreSpecificConfigExcluded) {
+ std::unique_ptr<IAaptContext> context = test::ContextBuilder().Build();
+ ConfigDescription default_config;
+ auto fr_land_config = test::ParseConfigOrDie("fr-land");
+
+ std::unique_ptr<ResourceTable> table =
+ test::ResourceTableBuilder()
+ .AddString("android:string/test", ResourceId{}, default_config, "default")
+ .AddString("android:string/test", ResourceId{}, fr_land_config, "fr-land")
+ .Build();
+
+ auto args = BuildArgList("fr");
+
+ ASSERT_TRUE(ResourceExcluder(args).Consume(context.get(), table.get()));
+ EXPECT_THAT(table, HasValue("android:string/test", default_config));
+ EXPECT_THAT(table, Not(HasValue("android:string/test", fr_land_config)));
+}
+
+TEST(ResourceExcluderTest, MultipleMoreSpecificConfigExcluded) {
+ std::unique_ptr<IAaptContext> context = test::ContextBuilder().Build();
+ ConfigDescription default_config;
+ auto night_config = test::ParseConfigOrDie("night");
+ auto fr_config = test::ParseConfigOrDie("fr");
+ auto fr_land_config = test::ParseConfigOrDie("fr-land");
+ auto fr_night_config = test::ParseConfigOrDie("fr-night");
+
+ std::unique_ptr<ResourceTable> table =
+ test::ResourceTableBuilder()
+ .AddString("android:string/test", ResourceId{}, default_config, "default")
+ .AddString("android:string/test", ResourceId{}, night_config, "night")
+ .AddString("android:string/test", ResourceId{}, fr_config, "fr")
+ .AddString("android:string/test", ResourceId{}, fr_land_config, "fr-land")
+ .AddString("android:string/test", ResourceId{}, fr_night_config, "fr-night")
+ .Build();
+
+ auto args = BuildArgList("fr");
+
+ ASSERT_TRUE(ResourceExcluder(args).Consume(context.get(), table.get()));
+ EXPECT_THAT(table, HasValue("android:string/test", default_config));
+ EXPECT_THAT(table, HasValue("android:string/test", night_config));
+ EXPECT_THAT(table, Not(HasValue("android:string/test", fr_config)));
+ EXPECT_THAT(table, Not(HasValue("android:string/test", fr_land_config)));
+ EXPECT_THAT(table, Not(HasValue("android:string/test", fr_night_config)));
+}
+
+TEST(ResourceExcluderTest, MultipleConfigsExcluded) {
+ std::unique_ptr<IAaptContext> context = test::ContextBuilder().Build();
+ ConfigDescription default_config;
+ auto night_config = test::ParseConfigOrDie("night");
+ auto fr_config = test::ParseConfigOrDie("fr");
+ auto fr_land_config = test::ParseConfigOrDie("fr-land");
+ auto fr_night_config = test::ParseConfigOrDie("fr-night");
+
+ std::unique_ptr<ResourceTable> table =
+ test::ResourceTableBuilder()
+ .AddString("android:string/test", ResourceId{}, default_config, "default")
+ .AddString("android:string/test", ResourceId{}, night_config, "night")
+ .AddString("android:string/test", ResourceId{}, fr_config, "fr")
+ .AddString("android:string/test", ResourceId{}, fr_land_config, "fr-land")
+ .AddString("android:string/test", ResourceId{}, fr_night_config, "fr-night")
+ .Build();
+
+ std::vector<ConfigDescription> args;
+ args.push_back(BuildArg("land"));
+ args.push_back(BuildArg("night"));
+
+ ASSERT_TRUE(ResourceExcluder(args).Consume(context.get(), table.get()));
+ EXPECT_THAT(table, HasValue("android:string/test", default_config));
+ EXPECT_THAT(table, Not(HasValue("android:string/test", night_config)));
+ EXPECT_THAT(table, HasValue("android:string/test", fr_config));
+ EXPECT_THAT(table, Not(HasValue("android:string/test", fr_land_config)));
+ EXPECT_THAT(table, Not(HasValue("android:string/test", fr_night_config)));
+}
+
+TEST(ResourceExcluderTest, LessSpecificConfigNotExcluded) {
+ std::unique_ptr<IAaptContext> context = test::ContextBuilder().Build();
+ ConfigDescription default_config;
+ auto fr_config = test::ParseConfigOrDie("fr");
+ auto fr_land_config = test::ParseConfigOrDie("fr-land");
+
+ std::unique_ptr<ResourceTable> table =
+ test::ResourceTableBuilder()
+ .AddString("android:string/test", ResourceId{}, default_config, "default")
+ .AddString("android:string/test", ResourceId{}, fr_config, "fr")
+ .AddString("android:string/test", ResourceId{}, fr_land_config, "fr-land")
+ .Build();
+
+ auto args = BuildArgList("fr-land");
+
+ ASSERT_TRUE(ResourceExcluder(args).Consume(context.get(), table.get()));
+ EXPECT_THAT(table, HasValue("android:string/test", default_config));
+ EXPECT_THAT(table, HasValue("android:string/test", fr_config));
+ EXPECT_THAT(table, Not(HasValue("android:string/test", fr_land_config)));
+}
+
+TEST(ResourceExcluderTest, LowerPrecedenceStillExcludes) {
+ std::unique_ptr<IAaptContext> context = test::ContextBuilder().Build();
+ ConfigDescription default_config;
+ auto fr_config = test::ParseConfigOrDie("fr");
+ auto fr_night_config = test::ParseConfigOrDie("fr-night");
+
+ std::unique_ptr<ResourceTable> table =
+ test::ResourceTableBuilder()
+ .AddString("android:string/test", ResourceId{}, default_config, "default")
+ .AddString("android:string/test", ResourceId{}, fr_config, "fr")
+ .AddString("android:string/test", ResourceId{}, fr_night_config, "fr-night")
+ .Build();
+
+ // "night" is lower precedence than "fr"
+ auto args = BuildArgList("night");
+
+ ASSERT_TRUE(ResourceExcluder(args).Consume(context.get(), table.get()));
+ EXPECT_THAT(table, HasValue("android:string/test", default_config));
+ EXPECT_THAT(table, HasValue("android:string/test", fr_config));
+ EXPECT_THAT(table, Not(HasValue("android:string/test", fr_night_config)));
+}
+
+TEST(ResourceExcluderTest, OnlyExcludesSpecificTier) {
+ std::unique_ptr<IAaptContext> context = test::ContextBuilder().Build();
+ ConfigDescription default_config;
+ auto mdpi_config = test::ParseConfigOrDie("mdpi");
+ auto hdpi_config = test::ParseConfigOrDie("hdpi");
+ auto xhdpi_config = test::ParseConfigOrDie("xhdpi");
+
+ std::unique_ptr<ResourceTable> table =
+ test::ResourceTableBuilder()
+ .AddString("android:string/test", ResourceId{}, default_config, "default")
+ .AddString("android:string/test", ResourceId{}, mdpi_config, "mdpi")
+ .AddString("android:string/test", ResourceId{}, hdpi_config, "hdpi")
+ .AddString("android:string/test", ResourceId{}, xhdpi_config, "xhdpi")
+ .Build();
+
+ auto args = BuildArgList("hdpi");
+
+ ASSERT_TRUE(ResourceExcluder(args).Consume(context.get(), table.get()));
+ EXPECT_THAT(table, HasValue("android:string/test", default_config));
+ EXPECT_THAT(table, HasValue("android:string/test", mdpi_config));
+ EXPECT_THAT(table, Not(HasValue("android:string/test", hdpi_config)));
+ EXPECT_THAT(table, HasValue("android:string/test", xhdpi_config));
+}
+
+} // namespace aapt
diff --git a/wifi/java/android/net/wifi/WifiConfiguration.java b/wifi/java/android/net/wifi/WifiConfiguration.java
index c50e6a7..c5b9cf1 100644
--- a/wifi/java/android/net/wifi/WifiConfiguration.java
+++ b/wifi/java/android/net/wifi/WifiConfiguration.java
@@ -1099,9 +1099,13 @@
*/
public static final int DISABLED_BY_WRONG_PASSWORD = 13;
/**
+ * This network is disabled because service is not subscribed
+ */
+ public static final int DISABLED_AUTHENTICATION_NO_SUBSCRIPTION = 14;
+ /**
* This Maximum disable reason value
*/
- public static final int NETWORK_SELECTION_DISABLED_MAX = 14;
+ public static final int NETWORK_SELECTION_DISABLED_MAX = 15;
/**
* Quality network selection disable reason String (for debug purpose)
@@ -1120,7 +1124,8 @@
"NETWORK_SELECTION_DISABLED_NO_INTERNET_PERMANENT",
"NETWORK_SELECTION_DISABLED_BY_WIFI_MANAGER",
"NETWORK_SELECTION_DISABLED_BY_USER_SWITCH",
- "NETWORK_SELECTION_DISABLED_BY_WRONG_PASSWORD"
+ "NETWORK_SELECTION_DISABLED_BY_WRONG_PASSWORD",
+ "NETWORK_SELECTION_DISABLED_AUTHENTICATION_NO_SUBSCRIPTION"
};
/**
diff --git a/wifi/java/android/net/wifi/rtt/CivicLocation.java b/wifi/java/android/net/wifi/rtt/CivicLocation.java
new file mode 100644
index 0000000..a669d77
--- /dev/null
+++ b/wifi/java/android/net/wifi/rtt/CivicLocation.java
@@ -0,0 +1,323 @@
+/*
+ * Copyright (C) 2018 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.wifi.rtt;
+
+import android.annotation.Nullable;
+import android.location.Address;
+import android.net.wifi.rtt.CivicLocationKeys.CivicLocationKeysType;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.os.Parcelable.Creator;
+import android.util.SparseArray;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Locale;
+import java.util.Objects;
+
+/**
+ * Decodes the Type Length Value (TLV) elements found in a Location Civic Record as defined by IEEE
+ * P802.11-REVmc/D8.0 section 9.4.2.22.13 using the format described in IETF RFC 4776.
+ *
+ * <p>The TLVs each define a key, value pair for a civic address type such as apt, street, city,
+ * county, and country. The class provides a general getter method to extract a value for an element
+ * key, returning null if not set.
+ *
+ * @hide
+ */
+public final class CivicLocation implements Parcelable {
+ // Address (class) line indexes
+ private static final int ADDRESS_LINE_0_ROOM_DESK_FLOOR = 0;
+ private static final int ADDRESS_LINE_1_NUMBER_ROAD_SUFFIX_APT = 1;
+ private static final int ADDRESS_LINE_2_CITY = 2;
+ private static final int ADDRESS_LINE_3_STATE_POSTAL_CODE = 3;
+ private static final int ADDRESS_LINE_4_COUNTRY = 4;
+
+ // Buffer management
+ private static final int MIN_CIVIC_BUFFER_SIZE = 3;
+ private static final int MAX_CIVIC_BUFFER_SIZE = 256;
+ private static final int COUNTRY_CODE_LENGTH = 2;
+ private static final int BYTE_MASK = 0xFF;
+ private static final int TLV_TYPE_INDEX = 0;
+ private static final int TLV_LENGTH_INDEX = 1;
+ private static final int TLV_VALUE_INDEX = 2;
+
+ private final boolean mIsValid;
+ private final String mCountryCode; // Two character country code (ISO 3166 standard).
+ private SparseArray<String> mCivicAddressElements =
+ new SparseArray<>(MIN_CIVIC_BUFFER_SIZE);
+
+
+ /**
+ * Constructor
+ *
+ * @param civicTLVs a byte buffer containing parameters in the form type, length, value
+ * @param countryCode the two letter code defined by the ISO 3166 standard
+ *
+ * @hide
+ */
+ public CivicLocation(@Nullable byte[] civicTLVs, @Nullable String countryCode) {
+ this.mCountryCode = countryCode;
+ if (countryCode == null || countryCode.length() != COUNTRY_CODE_LENGTH) {
+ this.mIsValid = false;
+ return;
+ }
+ boolean isValid = false;
+ if (civicTLVs != null
+ && civicTLVs.length >= MIN_CIVIC_BUFFER_SIZE
+ && civicTLVs.length < MAX_CIVIC_BUFFER_SIZE) {
+ isValid = parseCivicTLVs(civicTLVs);
+ }
+
+ mIsValid = isValid;
+ }
+
+ private CivicLocation(Parcel in) {
+ mIsValid = in.readByte() != 0;
+ mCountryCode = in.readString();
+ mCivicAddressElements = in.readSparseArray(this.getClass().getClassLoader());
+ }
+
+ public static final Creator<CivicLocation> CREATOR = new Creator<CivicLocation>() {
+ @Override
+ public CivicLocation createFromParcel(Parcel in) {
+ return new CivicLocation(in);
+ }
+
+ @Override
+ public CivicLocation[] newArray(int size) {
+ return new CivicLocation[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel parcel, int flags) {
+ parcel.writeByte((byte) (mIsValid ? 1 : 0));
+ parcel.writeString(mCountryCode);
+ parcel.writeSparseArray((android.util.SparseArray) mCivicAddressElements);
+ }
+
+ /**
+ * Check TLV format and store TLV key/value pairs in this object so they can be queried by key.
+ *
+ * @param civicTLVs the buffer of TLV elements
+ * @return a boolean indicating success of the parsing process
+ */
+ private boolean parseCivicTLVs(byte[] civicTLVs) {
+ int bufferPtr = 0;
+ int bufferLength = civicTLVs.length;
+
+ // Iterate through the sub-elements contained in the LCI IE checking the accumulated
+ // element lengths do not overflow the total buffer length
+ while (bufferPtr < bufferLength) {
+ int civicAddressType = civicTLVs[bufferPtr + TLV_TYPE_INDEX] & BYTE_MASK;
+ int civicAddressTypeLength = civicTLVs[bufferPtr + TLV_LENGTH_INDEX];
+ if (civicAddressTypeLength != 0) {
+ if (bufferPtr + TLV_VALUE_INDEX + civicAddressTypeLength > bufferLength) {
+ return false;
+ }
+ mCivicAddressElements.put(civicAddressType,
+ new String(civicTLVs, bufferPtr + TLV_VALUE_INDEX,
+ civicAddressTypeLength, StandardCharsets.UTF_8));
+ }
+ bufferPtr += civicAddressTypeLength + TLV_VALUE_INDEX;
+ }
+ return true;
+ }
+
+ /**
+ * Getter for the value of a civic Address element type.
+ *
+ * @param key an integer code for the element type key
+ * @return the string value associated with that element type
+ */
+ @Nullable
+ public String getCivicElementValue(@CivicLocationKeysType int key) {
+ return mCivicAddressElements.get(key);
+ }
+
+ /**
+ * Generates a comma separated string of all the defined elements.
+ *
+ * @return a compiled string representing all elements
+ */
+ @Override
+ public String toString() {
+ return mCivicAddressElements.toString();
+ }
+
+ /**
+ * Converts Civic Location to the best effort Address Object.
+ *
+ * @return the {@link Address} object based on the Civic Location data
+ */
+ @Nullable
+ public Address toAddress() {
+ if (!mIsValid) {
+ return null;
+ }
+ Address address = new Address(Locale.US);
+ String room = formatAddressElement("Room: ", getCivicElementValue(CivicLocationKeys.ROOM));
+ String desk =
+ formatAddressElement(" Desk: ", getCivicElementValue(CivicLocationKeys.DESK));
+ String floor =
+ formatAddressElement(", Flr: ", getCivicElementValue(CivicLocationKeys.FLOOR));
+ String houseNumber = formatAddressElement("", getCivicElementValue(CivicLocationKeys.HNO));
+ String houseNumberSuffix =
+ formatAddressElement("", getCivicElementValue(CivicLocationKeys.HNS));
+ String road =
+ formatAddressElement(" ", getCivicElementValue(
+ CivicLocationKeys.PRIMARY_ROAD_NAME));
+ String roadSuffix = formatAddressElement(" ", getCivicElementValue(CivicLocationKeys.STS));
+ String apt = formatAddressElement(", Apt: ", getCivicElementValue(CivicLocationKeys.APT));
+ String city = formatAddressElement("", getCivicElementValue(CivicLocationKeys.CITY));
+ String state = formatAddressElement("", getCivicElementValue(CivicLocationKeys.STATE));
+ String postalCode =
+ formatAddressElement(" ", getCivicElementValue(CivicLocationKeys.POSTAL_CODE));
+
+ // Aggregation into common address format
+ String addressLine0 =
+ new StringBuilder().append(room).append(desk).append(floor).toString();
+ String addressLine1 =
+ new StringBuilder().append(houseNumber).append(houseNumberSuffix).append(road)
+ .append(roadSuffix).append(apt).toString();
+ String addressLine2 = city;
+ String addressLine3 = new StringBuilder().append(state).append(postalCode).toString();
+ String addressLine4 = mCountryCode;
+
+ // Setting Address object line fields by common convention.
+ address.setAddressLine(ADDRESS_LINE_0_ROOM_DESK_FLOOR, addressLine0);
+ address.setAddressLine(ADDRESS_LINE_1_NUMBER_ROAD_SUFFIX_APT, addressLine1);
+ address.setAddressLine(ADDRESS_LINE_2_CITY, addressLine2);
+ address.setAddressLine(ADDRESS_LINE_3_STATE_POSTAL_CODE, addressLine3);
+ address.setAddressLine(ADDRESS_LINE_4_COUNTRY, addressLine4);
+
+ // Other compatible fields between the CIVIC_ADDRESS and the Address Class.
+ address.setFeatureName(getCivicElementValue(CivicLocationKeys.NAM)); // Structure name
+ address.setSubThoroughfare(getCivicElementValue(CivicLocationKeys.HNO));
+ address.setThoroughfare(getCivicElementValue(CivicLocationKeys.PRIMARY_ROAD_NAME));
+ address.setSubLocality(getCivicElementValue(CivicLocationKeys.NEIGHBORHOOD));
+ address.setSubAdminArea(getCivicElementValue(CivicLocationKeys.COUNTY));
+ address.setAdminArea(getCivicElementValue(CivicLocationKeys.STATE));
+ address.setPostalCode(getCivicElementValue(CivicLocationKeys.POSTAL_CODE));
+ address.setCountryCode(mCountryCode); // Country
+ return address;
+ }
+
+ /**
+ * Prepares an address element so that it can be integrated into an address line convention.
+ *
+ * <p>If an address element is null, the return string will be empty e.g. "".
+ *
+ * @param label a string defining the type of address element
+ * @param value a string defining the elements value
+ * @return the formatted version of the value, with null values converted to empty strings
+ */
+ private String formatAddressElement(String label, String value) {
+ if (value != null) {
+ return label + value;
+ } else {
+ return "";
+ }
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof CivicLocation)) {
+ return false;
+ }
+ CivicLocation other = (CivicLocation) obj;
+ return mIsValid == other.mIsValid
+ && Objects.equals(mCountryCode, other.mCountryCode)
+ && isSparseArrayStringEqual(mCivicAddressElements, other.mCivicAddressElements);
+ }
+
+ @Override
+ public int hashCode() {
+ int[] civicAddressKeys = getSparseArrayKeys(mCivicAddressElements);
+ String[] civicAddressValues = getSparseArrayValues(mCivicAddressElements);
+ return Objects.hash(mIsValid, mCountryCode, civicAddressKeys, civicAddressValues);
+ }
+
+ /**
+ * Tests if the Civic Location object is valid
+ *
+ * @return a boolean defining mIsValid
+ */
+ public boolean isValid() {
+ return mIsValid;
+ }
+
+ /**
+ * Tests if two sparse arrays are equal on a key for key basis
+ *
+ * @param sa1 the first sparse array
+ * @param sa2 the second sparse array
+ * @return the boolean result after comparing values key by key
+ */
+ private boolean isSparseArrayStringEqual(SparseArray<String> sa1, SparseArray<String> sa2) {
+ int size = sa1.size();
+ if (size != sa2.size()) {
+ return false;
+ }
+ for (int i = 0; i < size; i++) {
+ String sa1Value = sa1.valueAt(i);
+ String sa2Value = sa2.valueAt(i);
+ if (!sa1Value.equals(sa2Value)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ /**
+ * Extract an array of all the keys in a SparseArray<String>
+ *
+ * @param sa the sparse array of Strings
+ * @return an integer array of all keys in the SparseArray<String>
+ */
+ private int[] getSparseArrayKeys(SparseArray<String> sa) {
+ int size = sa.size();
+ int[] keys = new int[size];
+ for (int i = 0; i < size; i++) {
+ keys[i] = sa.keyAt(i);
+ }
+ return keys;
+ }
+
+ /**
+ * Extract an array of all the String values in a SparseArray<String>
+ *
+ * @param sa the sparse array of Strings
+ * @return a String array of all values in the SparseArray<String>
+ */
+ private String[] getSparseArrayValues(SparseArray<String> sa) {
+ int size = sa.size();
+ String[] values = new String[size];
+ for (int i = 0; i < size; i++) {
+ values[i] = sa.valueAt(i);
+ }
+ return values;
+ }
+}
diff --git a/wifi/java/android/net/wifi/rtt/CivicLocationKeys.java b/wifi/java/android/net/wifi/rtt/CivicLocationKeys.java
new file mode 100644
index 0000000..17c3671
--- /dev/null
+++ b/wifi/java/android/net/wifi/rtt/CivicLocationKeys.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2018 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.wifi.rtt;
+
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import android.annotation.IntDef;
+
+import java.lang.annotation.Retention;
+
+/**
+ * Civic Address key types used to define address elements.
+ *
+ * <p>These keys can be used in ResponderLocation look-up the corresponding string values.</p>
+ *
+ * @hide
+ */
+public class CivicLocationKeys {
+
+ /**
+ * An enumeration of all civic location keys.
+ *
+ * @hide
+ */
+ @Retention(SOURCE)
+ @IntDef({LANGUAGE, STATE, COUNTY, CITY, BOROUGH, NEIGHBORHOOD, GROUP_OF_STREETS, PRD, POD, STS,
+ HNO, HNS, LMK, LOC, NAM, POSTAL_CODE, BUILDING, APT, FLOOR, ROOM, TYPE_OF_PLACE, PCN,
+ PO_BOX, ADDITIONAL_CODE, DESK, PRIMARY_ROAD_NAME, ROAD_SECTION, BRANCH_ROAD_NAME,
+ SUBBRANCH_ROAD_NAME, STREET_NAME_PRE_MODIFIER, STREET_NAME_POST_MODIFIER, SCRIPT})
+ public @interface CivicLocationKeysType {
+ }
+
+ /** Language key e.g. i-default. */
+ public static final int LANGUAGE = 0;
+ /** Category label A1 key e.g. California. */
+ public static final int STATE = 1;
+ /** Category label A2 key e.g. Marin. */
+ public static final int COUNTY = 2;
+ /** Category label A3 key e.g. San Francisco. */
+ public static final int CITY = 3;
+ /** Category label A4 key e.g. Westminster. */
+ public static final int BOROUGH = 4;
+ /** Category label A5 key e.g. Pacific Heights. */
+ public static final int NEIGHBORHOOD = 5;
+ /** Category label A6 key e.g. University District. */
+ public static final int GROUP_OF_STREETS = 6;
+ // 7 - 15 not defined
+ /** Leading Street direction key e.g. N. */
+ public static final int PRD = 16;
+ /** Trailing street suffix key e.g. SW. */
+ public static final int POD = 17;
+ /** Street suffix or Type key e.g Ave, Platz. */
+ public static final int STS = 18;
+ /** House Number key e.g. 123. */
+ public static final int HNO = 19;
+ /** House number suffix key e.g. A, 1/2. */
+ public static final int HNS = 20;
+ /** Landmark or vanity address key e.g. Columbia Univ. */
+ public static final int LMK = 21;
+ /** Additional Location info key e.g. South Wing. */
+ public static final int LOC = 22;
+ /** Name of residence key e.g. Joe's Barbershop. */
+ public static final int NAM = 23;
+ /** Postal or ZIP code key e.g. 10027-1234. */
+ public static final int POSTAL_CODE = 24;
+ /** Building key e.g. Low Library. */
+ public static final int BUILDING = 25;
+ /** Apartment or suite key e.g. Apt 42. */
+ public static final int APT = 26;
+ /** Floor key e.g. 4. */
+ public static final int FLOOR = 27;
+ /** Room key e.g. 450F. */
+ public static final int ROOM = 28;
+ /** Type of place key e.g. office. */
+ public static final int TYPE_OF_PLACE = 29;
+ /** Postal community name key e.g. Leonia. */
+ public static final int PCN = 30;
+ /** Post Office Box key e.g. 12345. */
+ public static final int PO_BOX = 31;
+ /** Additional Code key e.g. 13203000003. */
+ public static final int ADDITIONAL_CODE = 32;
+ /** Seat, desk, pole, or cubical key e.g. WS 181. */
+ public static final int DESK = 33;
+ /** Primary road name key e.g. Shoreline. */
+ public static final int PRIMARY_ROAD_NAME = 34;
+ /** Road Section key e.g. 14. */
+ public static final int ROAD_SECTION = 35;
+ /** Branch Rd Name key e.g. Lane 7. */
+ public static final int BRANCH_ROAD_NAME = 36;
+ /** Subbranch Rd Name key e.g. Alley 8. */
+ public static final int SUBBRANCH_ROAD_NAME = 37;
+ /** Premodifier key e.g. Old. */
+ public static final int STREET_NAME_PRE_MODIFIER = 38;
+ /** Postmodifier key e.g. Service. */
+ public static final int STREET_NAME_POST_MODIFIER = 39;
+ /** Script key e.g. Latn. */
+ public static final int SCRIPT = 128;
+
+ /** private constructor */
+ private CivicLocationKeys() {}
+}
+
diff --git a/wifi/java/android/net/wifi/rtt/RangingResult.java b/wifi/java/android/net/wifi/rtt/RangingResult.java
index 758a8d5..b53b35c 100644
--- a/wifi/java/android/net/wifi/rtt/RangingResult.java
+++ b/wifi/java/android/net/wifi/rtt/RangingResult.java
@@ -82,12 +82,14 @@
private final int mNumSuccessfulMeasurements;
private final byte[] mLci;
private final byte[] mLcr;
+ private final ResponderLocation mResponderLocation;
private final long mTimestamp;
/** @hide */
public RangingResult(@RangeResultStatus int status, @NonNull MacAddress mac, int distanceMm,
int distanceStdDevMm, int rssi, int numAttemptedMeasurements,
- int numSuccessfulMeasurements, byte[] lci, byte[] lcr, long timestamp) {
+ int numSuccessfulMeasurements, byte[] lci, byte[] lcr,
+ ResponderLocation responderLocation, long timestamp) {
mStatus = status;
mMac = mac;
mPeerHandle = null;
@@ -98,13 +100,15 @@
mNumSuccessfulMeasurements = numSuccessfulMeasurements;
mLci = lci == null ? EMPTY_BYTE_ARRAY : lci;
mLcr = lcr == null ? EMPTY_BYTE_ARRAY : lcr;
+ mResponderLocation = responderLocation;
mTimestamp = timestamp;
}
/** @hide */
public RangingResult(@RangeResultStatus int status, PeerHandle peerHandle, int distanceMm,
int distanceStdDevMm, int rssi, int numAttemptedMeasurements,
- int numSuccessfulMeasurements, byte[] lci, byte[] lcr, long timestamp) {
+ int numSuccessfulMeasurements, byte[] lci, byte[] lcr,
+ ResponderLocation responderLocation, long timestamp) {
mStatus = status;
mMac = null;
mPeerHandle = peerHandle;
@@ -115,6 +119,7 @@
mNumSuccessfulMeasurements = numSuccessfulMeasurements;
mLci = lci == null ? EMPTY_BYTE_ARRAY : lci;
mLcr = lcr == null ? EMPTY_BYTE_ARRAY : lcr;
+ mResponderLocation = responderLocation;
mTimestamp = timestamp;
}
@@ -240,6 +245,24 @@
}
/**
+ * @return The responder location represented as {@link ResponderLocation} which captures
+ * location information the responder is programmed to broadcast.
+ * <p>
+ * Will return a {@code null} when the location information cannot be parsed.
+ * <p>
+ * Only valid if {@link #getStatus()} returns {@link #STATUS_SUCCESS}, otherwise will throw an
+ * exception.
+ */
+ @Nullable
+ public ResponderLocation getResponderLocation() {
+ if (mStatus != STATUS_SUCCESS) {
+ throw new IllegalStateException(
+ "getResponderLocation(): invoked on an invalid result: getStatus()=" + mStatus);
+ }
+ return mResponderLocation;
+ }
+
+ /**
* @return The Location Configuration Information (LCI) as self-reported by the peer. The format
* is specified in the IEEE 802.11-2016 specifications, section 9.4.2.22.10.
* <p>
@@ -322,6 +345,7 @@
dest.writeInt(mNumSuccessfulMeasurements);
dest.writeByteArray(mLci);
dest.writeByteArray(mLcr);
+ dest.writeParcelable(mResponderLocation, flags);
dest.writeLong(mTimestamp);
}
@@ -351,13 +375,17 @@
int numSuccessfulMeasurements = in.readInt();
byte[] lci = in.createByteArray();
byte[] lcr = in.createByteArray();
+ ResponderLocation responderLocation =
+ in.readParcelable(this.getClass().getClassLoader());
long timestamp = in.readLong();
if (peerHandlePresent) {
return new RangingResult(status, peerHandle, distanceMm, distanceStdDevMm, rssi,
- numAttemptedMeasurements, numSuccessfulMeasurements, lci, lcr, timestamp);
+ numAttemptedMeasurements, numSuccessfulMeasurements, lci, lcr,
+ responderLocation, timestamp);
} else {
return new RangingResult(status, mac, distanceMm, distanceStdDevMm, rssi,
- numAttemptedMeasurements, numSuccessfulMeasurements, lci, lcr, timestamp);
+ numAttemptedMeasurements, numSuccessfulMeasurements, lci, lcr,
+ responderLocation, timestamp);
}
}
};
@@ -372,7 +400,8 @@
", rssi=").append(mRssi).append(", numAttemptedMeasurements=").append(
mNumAttemptedMeasurements).append(", numSuccessfulMeasurements=").append(
mNumSuccessfulMeasurements).append(", lci=").append(mLci).append(", lcr=").append(
- mLcr).append(", timestamp=").append(mTimestamp).append("]").toString();
+ mLcr).append(", responderLocation=").append(mResponderLocation)
+ .append(", timestamp=").append(mTimestamp).append("]").toString();
}
@Override
@@ -393,12 +422,14 @@
&& mNumAttemptedMeasurements == lhs.mNumAttemptedMeasurements
&& mNumSuccessfulMeasurements == lhs.mNumSuccessfulMeasurements
&& Arrays.equals(mLci, lhs.mLci) && Arrays.equals(mLcr, lhs.mLcr)
- && mTimestamp == lhs.mTimestamp;
+ && mTimestamp == lhs.mTimestamp
+ && Objects.equals(mResponderLocation, lhs.mResponderLocation);
}
@Override
public int hashCode() {
return Objects.hash(mStatus, mMac, mPeerHandle, mDistanceMm, mDistanceStdDevMm, mRssi,
- mNumAttemptedMeasurements, mNumSuccessfulMeasurements, mLci, mLcr, mTimestamp);
+ mNumAttemptedMeasurements, mNumSuccessfulMeasurements, mLci, mLcr,
+ mResponderLocation, mTimestamp);
}
}
diff --git a/wifi/java/android/net/wifi/rtt/ResponderLocation.java b/wifi/java/android/net/wifi/rtt/ResponderLocation.java
new file mode 100644
index 0000000..2912a67
--- /dev/null
+++ b/wifi/java/android/net/wifi/rtt/ResponderLocation.java
@@ -0,0 +1,1356 @@
+/*
+ * Copyright (C) 2018 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.wifi.rtt;
+
+import static java.lang.annotation.RetentionPolicy.SOURCE;
+
+import android.annotation.IntDef;
+import android.annotation.Nullable;
+import android.annotation.SystemApi;
+import android.location.Address;
+import android.net.MacAddress;
+import android.net.wifi.rtt.CivicLocationKeys.CivicLocationKeysType;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import java.lang.annotation.Retention;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * ResponderLocation is both a Location Configuration Information (LCI) decoder and a Location Civic
+ * Report (LCR) decoder for information received from a Wi-Fi Access Point (AP) during Wi-Fi RTT
+ * ranging process.
+ *
+ * <p>This is based on the IEEE P802.11-REVmc/D8.0 spec section 9.4.2.22, under Measurement Report
+ * Element. Subelement location data-fields parsed from separate input LCI and LCR Information
+ * Elements are unified in this class.</p>
+ *
+ * <p>Note: The information provided by this class is broadcast by a responder (usually an Access
+ * Point), and passed on as-is. There is no guarantee this information is accurate or correct, and
+ * as a result developers should carefully consider how this information should be used and provide
+ * corresponding advice to users.</p>
+ */
+public final class ResponderLocation implements Parcelable {
+ private static final int BYTE_MASK = 0xFF;
+ private static final int LSB_IN_BYTE = 0x01;
+ private static final int MSB_IN_BYTE = 0x80;
+ private static final int MIN_BUFFER_SIZE = 3; // length of LEAD_LCI_ELEMENT_BYTES
+ private static final int MAX_BUFFER_SIZE = 256;
+
+ // Information Element (IE) fields
+ private static final byte MEASUREMENT_TOKEN_AUTONOMOUS = 0x01;
+ private static final byte MEASUREMENT_REPORT_MODE = 0x00;
+ private static final byte MEASUREMENT_TYPE_LCI = 0x08;
+ private static final byte MEASUREMENT_TYPE_LCR = 0x0b;
+
+ // LCI Subelement IDs
+ private static final byte SUBELEMENT_LCI = 0x00;
+ private static final byte SUBELEMENT_Z = 0x04;
+ private static final byte SUBELEMENT_USAGE = 0x06;
+ private static final byte SUBELEMENT_BSSID_LIST = 0x07;
+
+ // LCI Subelement Lengths
+ private static final int SUBELEMENT_LCI_LENGTH = 16;
+ private static final int SUBELEMENT_Z_LENGTH = 6;
+ private static final int SUBELEMENT_USAGE_LENGTH1 = 1;
+ private static final int SUBELEMENT_USAGE_LENGTH3 = 3;
+ private static final int SUBELEMENT_BSSID_LIST_MIN_BUFFER_LENGTH = 1;
+
+ private static final byte[] LEAD_LCI_ELEMENT_BYTES = {
+ MEASUREMENT_TOKEN_AUTONOMOUS, MEASUREMENT_REPORT_MODE, MEASUREMENT_TYPE_LCI
+ };
+
+ // Subelement LCI constants
+
+ /* The LCI subelement bit-field lengths are described in Figure 9-214 of the REVmc spec and
+ represented here as a an array of integers */
+ private static final int[] SUBELEMENT_LCI_BIT_FIELD_LENGTHS = {
+ 6, 34, 6, 34, 4, 6, 30, 3, 1, 1, 1, 2
+ };
+ private static final int LATLNG_FRACTION_BITS = 25;
+ private static final int LATLNG_UNCERTAINTY_BASE = 8;
+ private static final int ALTITUDE_FRACTION_BITS = 8;
+ private static final int ALTITUDE_UNCERTAINTY_BASE = 21;
+ private static final double LAT_ABS_LIMIT = 90.0;
+ private static final double LNG_ABS_LIMIT = 180.0;
+ private static final int UNCERTAINTY_UNDEFINED = 0;
+
+ // Subelement LCI fields indices
+ private static final int SUBELEMENT_LCI_LAT_UNCERTAINTY_INDEX = 0;
+ private static final int SUBELEMENT_LCI_LAT_INDEX = 1;
+ private static final int SUBELEMENT_LCI_LNG_UNCERTAINTY_INDEX = 2;
+ private static final int SUBELEMENT_LCI_LNG_INDEX = 3;
+ private static final int SUBELEMENT_LCI_ALT_TYPE_INDEX = 4;
+ private static final int SUBELEMENT_LCI_ALT_UNCERTAINTY_INDEX = 5;
+ private static final int SUBELEMENT_LCI_ALT_INDEX = 6;
+ private static final int SUBELEMENT_LCI_DATUM_INDEX = 7;
+ private static final int SUBELEMENT_LCI_REGLOC_AGREEMENT_INDEX = 8;
+ private static final int SUBELEMENT_LCI_REGLOC_DSE_INDEX = 9;
+ private static final int SUBELEMENT_LCI_DEPENDENT_STA_INDEX = 10;
+ private static final int SUBELEMENT_LCI_VERSION_INDEX = 11;
+
+ /**
+ * The Altitude value is interpreted based on the Altitude Type, and the selected mDatum.
+ *
+ * @hide
+ */
+ @Retention(SOURCE)
+ @IntDef({ALTITUDE_UNDEFINED, ALTITUDE_METERS, ALTITUDE_FLOORS})
+ public @interface AltitudeType {
+ }
+
+ /**
+ * Altitude is not defined for the Responder.
+ * The altitude and altitude uncertainty should not be used: see section 2.4 of IETF RFC 6225.
+ */
+ public static final int ALTITUDE_UNDEFINED = 0;
+ /** Responder Altitude is measured in meters. */
+ public static final int ALTITUDE_METERS = 1;
+ /** Responder Altitude is measured in floors. */
+ public static final int ALTITUDE_FLOORS = 2;
+
+ /**
+ * The Datum value determines how coordinates are organized in relation to the real world.
+ *
+ * @hide
+ */
+ @Retention(SOURCE)
+ @IntDef({DATUM_UNDEFINED, DATUM_WGS84, DATUM_NAD83_NAV88, DATUM_NAD83_MLLW})
+ public @interface DatumType {
+ }
+
+ /** Datum is not defined. */
+ public static final int DATUM_UNDEFINED = 0;
+ /** Datum used is WGS84. */
+ public static final int DATUM_WGS84 = 1;
+ /** Datum used is NAD83 NAV88. */
+ public static final int DATUM_NAD83_NAV88 = 2;
+ /** Datum used is NAD83 MLLW. */
+ public static final int DATUM_NAD83_MLLW = 3;
+
+
+ /** Version of the LCI protocol is 1.0, the only defined protocol at this time. */
+ public static final int LCI_VERSION_1 = 1;
+
+ /**
+ * Enumerates the flags contained in getLciFlags()
+ *
+ * @hide
+ */
+ @Retention(SOURCE)
+ @IntDef(flag = true, value = {LCI_FLAGS_MASK_REGLOC_AGREEMENT, LCI_FLAGS_MASK_REGLOC_DSE,
+ LCI_FLAGS_MASK_DEPENDENT_STA, LCI_FLAGS_MASK_VERSION})
+ public @interface LciFlagMasks {
+ }
+ /** Location agreement flag is obtained by ANDing this mask with the getLciFlags() value.*/
+ public static final int LCI_FLAGS_MASK_REGLOC_AGREEMENT = 0x10;
+ /** Location DSE flag is obtained by ANDing this mask with the getLciFlags() value.*/
+ public static final int LCI_FLAGS_MASK_REGLOC_DSE = 0x08;
+ /** Dependent station flag is obtained by ANDing this mask with the getLciFlags() value. */
+ public static final int LCI_FLAGS_MASK_DEPENDENT_STA = 0x04;
+ /** Version bits are obtained by ANDing this mask with the getLciFlags() value.*/
+ public static final int LCI_FLAGS_MASK_VERSION = 0x03;
+
+ // LCI Subelement Z constants
+ private static final int[] SUBELEMENT_Z_BIT_FIELD_LENGTHS = {2, 14, 24, 8};
+ private static final int Z_FLOOR_NUMBER_FRACTION_BITS = 4;
+ private static final int Z_FLOOR_HEIGHT_FRACTION_BITS = 12;
+ private static final int Z_MAX_HEIGHT_UNCERTAINTY_FACTOR = 25;
+
+ // LCI Subelement Z fields indices
+ private static final int SUBELEMENT_Z_LAT_EXPECTED_TO_MOVE_INDEX = 0;
+ private static final int SUBELEMENT_Z_STA_FLOOR_NUMBER_INDEX = 1;
+ private static final int SUBELEMENT_Z_STA_HEIGHT_ABOVE_FLOOR_INDEX = 2;
+ private static final int SUBELEMENT_Z_STA_HEIGHT_ABOVE_FLOOR_UNCERTAINTY_INDEX = 3;
+
+ // LCI Subelement Usage Rules constants
+ private static final int SUBELEMENT_USAGE_MASK_RETRANSMIT = 0x01;
+ private static final int SUBELEMENT_USAGE_MASK_RETENTION_EXPIRES = 0x02;
+ private static final int SUBELEMENT_USAGE_MASK_STA_LOCATION_POLICY = 0x04;
+
+ // LCI Subelement Usage Rules field indices
+ private static final int SUBELEMENT_USAGE_PARAMS_INDEX = 0; // 8 bits
+
+ // LCI Subelement BSSID List
+ private static final int SUBELEMENT_BSSID_MAX_INDICATOR_INDEX = 0;
+ private static final int SUBELEMENT_BSSID_LIST_INDEX = 1;
+ private static final int BYTES_IN_A_BSSID = 6;
+
+ /**
+ * The Expected-To-Move value determines how mobile we expect the STA to be.
+ *
+ * @hide
+ */
+ @Retention(SOURCE)
+ @IntDef({LOCATION_FIXED, LOCATION_VARIABLE, LOCATION_MOVEMENT_UNKNOWN, LOCATION_RESERVED})
+ public @interface ExpectedToMoveType {
+ }
+
+ /** Location of responder is fixed (does not move) */
+ public static final int LOCATION_FIXED = 0;
+ /** Location of the responder is variable, and may move */
+ public static final int LOCATION_VARIABLE = 1;
+ /** Location of the responder is not known to be either fixed or variable. */
+ public static final int LOCATION_MOVEMENT_UNKNOWN = 2;
+ /** Location of the responder status is a reserved value */
+ public static final int LOCATION_RESERVED = 3;
+
+ // LCR Subelement IDs
+ private static final byte SUBELEMENT_LOCATION_CIVIC = 0x00;
+ private static final byte SUBELEMENT_MAP_IMAGE = 0x05;
+
+ // LCR Subelement Lengths
+ private static final int SUBELEMENT_LOCATION_CIVIC_MIN_LENGTH = 2;
+ private static final int SUBELEMENT_LOCATION_CIVIC_MAX_LENGTH = 256;
+ private static final int SUBELEMENT_MAP_IMAGE_URL_MAX_LENGTH = 256;
+
+ private static final byte[] LEAD_LCR_ELEMENT_BYTES = {
+ MEASUREMENT_TOKEN_AUTONOMOUS, MEASUREMENT_REPORT_MODE, MEASUREMENT_TYPE_LCR
+ };
+
+ // LCR Location Civic Subelement
+ private static final int CIVIC_COUNTRY_CODE_INDEX = 0;
+ private static final int CIVIC_TLV_LIST_INDEX = 2;
+
+ // LCR Map Image Subelement field indexes.
+ private static final int SUBELEMENT_IMAGE_MAP_TYPE_INDEX = 0;
+
+ /**
+ * The Map Type value specifies the image format type.
+ *
+ * @hide
+ */
+ @Retention(SOURCE)
+ @IntDef({
+ MAP_TYPE_URL_DEFINED,
+ MAP_TYPE_PNG,
+ MAP_TYPE_GIF,
+ MAP_TYPE_JPG,
+ MAP_TYPE_SVG,
+ MAP_TYPE_DXF,
+ MAP_TYPE_DWG,
+ MAP_TYPE_DWF,
+ MAP_TYPE_CAD,
+ MAP_TYPE_TIFF,
+ MAP_TYPE_GML,
+ MAP_TYPE_KML,
+ MAP_TYPE_BMP,
+ MAP_TYPE_PGM,
+ MAP_TYPE_PPM,
+ MAP_TYPE_XBM,
+ MAP_TYPE_XPM,
+ MAP_TYPE_ICO
+ })
+ public @interface MapImageType {
+ }
+
+ /** File type defined by the file suffix itself. */
+ public static final int MAP_TYPE_URL_DEFINED = 0;
+ /** File type is in PNG format. */
+ public static final int MAP_TYPE_PNG = 1;
+ /** File type is in GIF format. */
+ public static final int MAP_TYPE_GIF = 2;
+ /** File type is in JPG format. */
+ public static final int MAP_TYPE_JPG = 3;
+ /** File type is in SVG format. */
+ public static final int MAP_TYPE_SVG = 4;
+ /** File type is in DXF format. */
+ public static final int MAP_TYPE_DXF = 5;
+ /** File type is in DWG format. */
+ public static final int MAP_TYPE_DWG = 6;
+ /** File type is in DWF format. */
+ public static final int MAP_TYPE_DWF = 7;
+ /** File type is in CAD format. */
+ public static final int MAP_TYPE_CAD = 8;
+ /** File type is in TIFF format. */
+ public static final int MAP_TYPE_TIFF = 9;
+ /** File type is in GML format. */
+ public static final int MAP_TYPE_GML = 10;
+ /** File type is in KML format. */
+ public static final int MAP_TYPE_KML = 11;
+ /** File type is in BMP format. */
+ public static final int MAP_TYPE_BMP = 12;
+ /** File type is in PGM format. */
+ public static final int MAP_TYPE_PGM = 13;
+ /** File type is in PPM format. */
+ public static final int MAP_TYPE_PPM = 14;
+ /** File type is in XBM format. */
+ public static final int MAP_TYPE_XBM = 15;
+ /** File type is in XPM format. */
+ public static final int MAP_TYPE_XPM = 16;
+ /** File type is in ICO format. */
+ public static final int MAP_TYPE_ICO = 17;
+
+ // General LCI and LCR state
+ private final boolean mIsValid;
+
+ /*
+ These members are not final because we are not sure if the corresponding subelement will be
+ present until after the parsing process. However, the default value should be set as listed.
+ */
+ private boolean mIsLciValid = false;
+ private boolean mIsZValid = false;
+ private boolean mIsUsageValid = true; // By default this is assumed true
+ private boolean mIsBssidListValid = false;
+ private boolean mIsLocationCivicValid = false;
+ private boolean mIsMapImageValid = false;
+
+ // LCI Subelement LCI state
+ private double mLatitudeUncertainty;
+ private double mLatitude;
+ private double mLongitudeUncertainty;
+ private double mLongitude;
+ private int mAltitudeType;
+ private double mAltitudeUncertainty;
+ private double mAltitude;
+ private int mDatum;
+ private int mLciFlags;
+
+ // LCI Subelement Z state
+ private int mExpectedToMove;
+ private double mStaFloorNumber;
+ private double mStaHeightAboveFloorMeters;
+ private double mStaHeightAboveFloorUncertaintyMeters;
+
+ // LCI Subelement Usage Rights state
+ private boolean mUsageRetransmit;
+ private boolean mUsageRetentionExpires;
+ private boolean mUsageExtraInfoOnAssociation;
+
+ // LCI Subelement BSSID List state
+ private ArrayList<MacAddress> mBssidList;
+
+ // LCR Subelement Location Civic state
+ private String mCivicLocationCountryCode;
+ private String mCivicLocationString;
+ private CivicLocation mCivicLocation;
+
+ // LCR Subelement Map Image state
+ private int mMapImageType;
+ private URL mMapImageUrl;
+
+ /**
+ * Constructor
+ *
+ * @param lciBuffer the bytes received in the LCI Measurement Report Information Element
+ * @param lcrBuffer the bytes received in the LCR Measurement Report Information Element
+ *
+ * @hide
+ */
+ public ResponderLocation(byte[] lciBuffer, byte[] lcrBuffer) {
+ boolean isLciIeValid = false;
+ boolean isLcrIeValid = false;
+ setLciSubelementDefaults();
+ setZSubelementDefaults();
+ setUsageSubelementDefaults();
+ setBssidListSubelementDefaults();
+ setCivicLocationSubelementDefaults();
+ setMapImageSubelementDefaults();
+ if (lciBuffer != null && lciBuffer.length > LEAD_LCI_ELEMENT_BYTES.length) {
+ isLciIeValid = parseInformationElementBuffer(
+ MEASUREMENT_TYPE_LCI, lciBuffer, LEAD_LCI_ELEMENT_BYTES);
+ }
+ if (lcrBuffer != null && lcrBuffer.length > LEAD_LCR_ELEMENT_BYTES.length) {
+ isLcrIeValid = parseInformationElementBuffer(
+ MEASUREMENT_TYPE_LCR, lcrBuffer, LEAD_LCR_ELEMENT_BYTES);
+ }
+
+ boolean isLciValid = isLciIeValid && mIsUsageValid
+ && (mIsLciValid || mIsZValid || mIsBssidListValid);
+
+ boolean isLcrValid = isLcrIeValid && mIsUsageValid
+ && (mIsLocationCivicValid || mIsMapImageValid);
+
+ mIsValid = isLciValid || isLcrValid;
+
+ if (!mIsValid) {
+ setLciSubelementDefaults();
+ setZSubelementDefaults();
+ setCivicLocationSubelementDefaults();
+ setMapImageSubelementDefaults();
+ }
+ }
+
+ private ResponderLocation(Parcel in) {
+ // Object Validation
+ mIsValid = in.readByte() != 0;
+ mIsLciValid = in.readByte() != 0;
+ mIsZValid = in.readByte() != 0;
+ mIsUsageValid = in.readByte() != 0;
+ mIsBssidListValid = in.readByte() != 0;
+ mIsLocationCivicValid = in.readByte() != 0;
+ mIsMapImageValid = in.readByte() != 0;
+
+ // LCI Subelement LCI state
+ mLatitudeUncertainty = in.readDouble();
+ mLatitude = in.readDouble();
+ mLongitudeUncertainty = in.readDouble();
+ mLongitude = in.readDouble();
+ mAltitudeType = in.readInt();
+ mAltitudeUncertainty = in.readDouble();
+ mAltitude = in.readDouble();
+ mDatum = in.readInt();
+ mLciFlags = in.readInt();
+
+ // LCI Subelement Z state
+ mExpectedToMove = in.readInt();
+ mStaFloorNumber = in.readDouble();
+ mStaHeightAboveFloorMeters = in.readDouble();
+ mStaHeightAboveFloorUncertaintyMeters = in.readDouble();
+
+ // LCI Usage Rights
+ mUsageRetransmit = in.readByte() != 0;
+ mUsageRetentionExpires = in.readByte() != 0;
+ mUsageExtraInfoOnAssociation = in.readByte() != 0;
+
+ // LCI Subelement BSSID List
+ mBssidList = in.readArrayList(MacAddress.class.getClassLoader());
+
+ // LCR Subelement Location Civic
+ mCivicLocationCountryCode = in.readString();
+ mCivicLocationString = in.readString();
+ mCivicLocation = in.readParcelable(this.getClass().getClassLoader());
+
+ // LCR Subelement Map Image
+ mMapImageType = in.readInt();
+ try {
+ mMapImageUrl = new URL(in.readString());
+ } catch (MalformedURLException e) {
+ mMapImageUrl = null;
+ }
+ }
+
+ public static final Creator<ResponderLocation> CREATOR = new Creator<ResponderLocation>() {
+ @Override
+ public ResponderLocation createFromParcel(Parcel in) {
+ return new ResponderLocation(in);
+ }
+
+ @Override
+ public ResponderLocation[] newArray(int size) {
+ return new ResponderLocation[size];
+ }
+ };
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel parcel, int flags) {
+ // Object
+ parcel.writeByte((byte) (mIsValid ? 1 : 0));
+ parcel.writeByte((byte) (mIsLciValid ? 1 : 0));
+ parcel.writeByte((byte) (mIsZValid ? 1 : 0));
+ parcel.writeByte((byte) (mIsUsageValid ? 1 : 0));
+ parcel.writeByte((byte) (mIsBssidListValid ? 1 : 0));
+ parcel.writeByte((byte) (mIsLocationCivicValid ? 1 : 0));
+ parcel.writeByte((byte) (mIsMapImageValid ? 1 : 0));
+
+ // LCI Subelement LCI state
+ parcel.writeDouble(mLatitudeUncertainty);
+ parcel.writeDouble(mLatitude);
+ parcel.writeDouble(mLongitudeUncertainty);
+ parcel.writeDouble(mLongitude);
+ parcel.writeInt(mAltitudeType);
+ parcel.writeDouble(mAltitudeUncertainty);
+ parcel.writeDouble(mAltitude);
+ parcel.writeInt(mDatum);
+ parcel.writeInt(mLciFlags);
+
+ // LCI Subelement Z state
+ parcel.writeInt(mExpectedToMove);
+ parcel.writeDouble(mStaFloorNumber);
+ parcel.writeDouble(mStaHeightAboveFloorMeters);
+ parcel.writeDouble(mStaHeightAboveFloorUncertaintyMeters);
+
+ // LCI Usage Rights
+ parcel.writeByte((byte) (mUsageRetransmit ? 1 : 0));
+ parcel.writeByte((byte) (mUsageRetentionExpires ? 1 : 0));
+ parcel.writeByte((byte) (mUsageExtraInfoOnAssociation ? 1 : 0));
+
+ // LCI Subelement BSSID List
+ parcel.writeList(mBssidList);
+
+ // LCR Subelement Location Civic
+ parcel.writeString(mCivicLocationCountryCode);
+ parcel.writeString(mCivicLocationString);
+ parcel.writeParcelable(mCivicLocation, flags);
+
+ // LCR Subelement Map Image
+ parcel.writeInt(mMapImageType);
+ if (mMapImageUrl != null) {
+ parcel.writeString(mMapImageUrl.toString());
+ } else {
+ parcel.writeString("");
+ }
+ }
+
+ /**
+ * Test if the Information Element (IE) is in the correct format, and then parse its Subelements
+ * based on their type, and setting state in this object when present.
+ *
+ * @return a boolean indicating the success of the parsing function
+ */
+ private boolean parseInformationElementBuffer(
+ int ieType, byte[] buffer, byte[] expectedLeadBytes) {
+ int bufferPtr = 0;
+ int bufferLength = buffer.length;
+
+ // Ensure the buffer size is within expected limits
+ if (bufferLength < MIN_BUFFER_SIZE || bufferLength > MAX_BUFFER_SIZE) {
+ return false;
+ }
+
+ // Ensure the IE contains the correct leading bytes
+ byte[] leadBufferBytes = Arrays.copyOfRange(buffer, bufferPtr, expectedLeadBytes.length);
+ if (!Arrays.equals(leadBufferBytes, expectedLeadBytes)) {
+ return false;
+ }
+
+ // Iterate through the sub-elements contained in the Information Element (IE)
+ bufferPtr += expectedLeadBytes.length;
+ // Loop over the buffer ensuring there are 2-bytes available for each new subelement tested.
+ while (bufferPtr + 1 < bufferLength) {
+ byte subelement = buffer[bufferPtr++];
+ int subelementLength = buffer[bufferPtr++];
+ // Check there is enough data for the next subelement
+ if ((bufferPtr + subelementLength) > bufferLength || subelementLength <= 0) {
+ return false;
+ }
+
+ byte[] subelementData =
+ Arrays.copyOfRange(buffer, bufferPtr, bufferPtr + subelementLength);
+
+ if (ieType == MEASUREMENT_TYPE_LCI) {
+ switch (subelement) {
+ case SUBELEMENT_LCI:
+ mIsLciValid = parseSubelementLci(subelementData);
+ if (!mIsLciValid || (mLciFlags & LCI_FLAGS_MASK_VERSION) != LCI_VERSION_1) {
+ setLciSubelementDefaults();
+ }
+ break;
+ case SUBELEMENT_Z:
+ mIsZValid = parseSubelementZ(subelementData);
+ if (!mIsZValid) {
+ setZSubelementDefaults();
+ }
+ break;
+ case SUBELEMENT_USAGE:
+ mIsUsageValid = parseSubelementUsage(subelementData);
+ // Note: if the Usage Subelement is not valid, don't reset the state, as
+ // it is now indicating the whole ResponderLocation is invalid.
+ break;
+ case SUBELEMENT_BSSID_LIST:
+ mIsBssidListValid = parseSubelementBssidList(subelementData);
+ if (!mIsBssidListValid) {
+ setBssidListSubelementDefaults();
+ }
+ break;
+ default:
+ break; // skip over unused or vendor specific subelements
+ }
+ } else if (ieType == MEASUREMENT_TYPE_LCR) {
+ switch (subelement) {
+ case SUBELEMENT_LOCATION_CIVIC:
+ mIsLocationCivicValid = parseSubelementLocationCivic(subelementData);
+ if (!mIsLocationCivicValid) {
+ setCivicLocationSubelementDefaults();
+ }
+ break;
+ case SUBELEMENT_MAP_IMAGE:
+ mIsMapImageValid = parseSubelementMapImage(subelementData);
+ if (!mIsMapImageValid) {
+ setMapImageSubelementDefaults();
+ }
+ break;
+ default:
+ break; // skip over unused or other vendor specific subelements
+ }
+ }
+
+ bufferPtr += subelementLength;
+ }
+ return true;
+ }
+
+ /**
+ * Parse the LCI Sub-Element in the LCI Information Element (IE).
+ *
+ * @param buffer a buffer containing the subelement
+ * @return boolean true indicates success
+ */
+ private boolean parseSubelementLci(byte[] buffer) {
+ if (buffer.length > SUBELEMENT_LCI_LENGTH) {
+ return false;
+ }
+ swapEndianByteByByte(buffer);
+ long[] subelementLciFields = getFieldData(buffer, SUBELEMENT_LCI_BIT_FIELD_LENGTHS);
+ if (subelementLciFields == null) {
+ return false;
+ }
+ // Set member state based on parsed buffer data
+ mLatitudeUncertainty = decodeLciLatLngUncertainty(
+ subelementLciFields[SUBELEMENT_LCI_LAT_UNCERTAINTY_INDEX]);
+ mLatitude = decodeLciLatLng(subelementLciFields, SUBELEMENT_LCI_BIT_FIELD_LENGTHS,
+ SUBELEMENT_LCI_LAT_INDEX, LAT_ABS_LIMIT);
+ mLongitudeUncertainty = decodeLciLatLngUncertainty(
+ subelementLciFields[SUBELEMENT_LCI_LNG_UNCERTAINTY_INDEX]);
+ mLongitude =
+ decodeLciLatLng(subelementLciFields, SUBELEMENT_LCI_BIT_FIELD_LENGTHS,
+ SUBELEMENT_LCI_LNG_INDEX, LNG_ABS_LIMIT);
+ mAltitudeType = (int) subelementLciFields[SUBELEMENT_LCI_ALT_TYPE_INDEX] & BYTE_MASK;
+ mAltitudeUncertainty =
+ decodeLciAltUncertainty(subelementLciFields[SUBELEMENT_LCI_ALT_UNCERTAINTY_INDEX]);
+ mAltitude =
+ Math.scalb(subelementLciFields[SUBELEMENT_LCI_ALT_INDEX], -ALTITUDE_FRACTION_BITS);
+ mDatum = (int) subelementLciFields[SUBELEMENT_LCI_DATUM_INDEX] & BYTE_MASK;
+ mLciFlags =
+ (int) subelementLciFields[SUBELEMENT_LCI_REGLOC_AGREEMENT_INDEX]
+ * LCI_FLAGS_MASK_REGLOC_AGREEMENT
+ | (int) subelementLciFields[SUBELEMENT_LCI_REGLOC_DSE_INDEX]
+ * LCI_FLAGS_MASK_REGLOC_DSE
+ | (int) subelementLciFields[SUBELEMENT_LCI_DEPENDENT_STA_INDEX]
+ * LCI_FLAGS_MASK_DEPENDENT_STA
+ | (int) subelementLciFields[SUBELEMENT_LCI_VERSION_INDEX];
+ return true;
+ }
+
+ /**
+ * Decode the floating point value of an encoded lat or lng in the LCI subelement field.
+ *
+ * @param fields the array of field data represented as longs
+ * @param bitFieldSizes the lengths of each field
+ * @param offset the offset of the field being decoded
+ * @param limit the maximum absolute value (note: different for lat vs lng)
+ * @return the floating point value of the lat or lng
+ */
+ private double decodeLciLatLng(long[] fields, int[] bitFieldSizes, int offset, double limit) {
+ double angle;
+ if ((fields[offset] & (long) Math.pow(2, bitFieldSizes[offset] - 1)) != 0) {
+ // Negative 2's complement value
+ // Note: The Math.pow(...) method cannot return a NaN value because the bitFieldSize
+ // for Lat or Lng is limited to exactly 34 bits.
+ angle = Math.scalb(fields[offset] - Math.pow(2, bitFieldSizes[offset]),
+ -LATLNG_FRACTION_BITS);
+ } else {
+ // Positive 2's complement value
+ angle = Math.scalb(fields[offset], -LATLNG_FRACTION_BITS);
+ }
+ if (angle > limit) {
+ angle = limit;
+ } else if (angle < -limit) {
+ angle = -limit;
+ }
+ return angle;
+ }
+
+ /**
+ * Coverts an encoded Lat/Lng uncertainty into a number of degrees.
+ *
+ * @param encodedValue the encoded uncertainty
+ * @return the value in degrees
+ */
+ private double decodeLciLatLngUncertainty(long encodedValue) {
+ return Math.pow(2, LATLNG_UNCERTAINTY_BASE - encodedValue);
+ }
+
+ /**
+ * Converts an encoded Alt uncertainty into a number of degrees.
+ *
+ * @param encodedValue the encoded uncertainty
+ * @return the value in degrees
+ */
+ private double decodeLciAltUncertainty(long encodedValue) {
+ return Math.pow(2, ALTITUDE_UNCERTAINTY_BASE - encodedValue);
+ }
+
+ /**
+ * Parse the Z subelement of the LCI IE.
+ *
+ * @param buffer a buffer containing the subelement
+ * @return boolean true indicates success
+ */
+ private boolean parseSubelementZ(byte[] buffer) {
+ if (buffer.length != SUBELEMENT_Z_LENGTH) {
+ return false;
+ }
+ swapEndianByteByByte(buffer);
+ long[] subelementZFields = getFieldData(buffer, SUBELEMENT_Z_BIT_FIELD_LENGTHS);
+ if (subelementZFields == null) {
+ return false;
+ }
+
+ mExpectedToMove =
+ (int) subelementZFields[SUBELEMENT_Z_LAT_EXPECTED_TO_MOVE_INDEX] & BYTE_MASK;
+
+ mStaFloorNumber = decodeZUnsignedToSignedValue(subelementZFields,
+ SUBELEMENT_Z_BIT_FIELD_LENGTHS, SUBELEMENT_Z_STA_FLOOR_NUMBER_INDEX,
+ Z_FLOOR_NUMBER_FRACTION_BITS);
+
+ mStaHeightAboveFloorMeters = decodeZUnsignedToSignedValue(subelementZFields,
+ SUBELEMENT_Z_BIT_FIELD_LENGTHS, SUBELEMENT_Z_STA_HEIGHT_ABOVE_FLOOR_INDEX,
+ Z_FLOOR_HEIGHT_FRACTION_BITS);
+
+ long zHeightUncertainty =
+ subelementZFields[SUBELEMENT_Z_STA_HEIGHT_ABOVE_FLOOR_UNCERTAINTY_INDEX];
+ if (zHeightUncertainty > 0 && zHeightUncertainty < Z_MAX_HEIGHT_UNCERTAINTY_FACTOR) {
+ mStaHeightAboveFloorUncertaintyMeters =
+ Math.pow(2, Z_FLOOR_HEIGHT_FRACTION_BITS - zHeightUncertainty - 1);
+ } else {
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Decode a two's complement encoded value, to a signed double based on the field length.
+ *
+ * @param fieldValues the array of field values reprented as longs
+ * @param fieldLengths the array of field lengths
+ * @param index the index of the field being decoded
+ * @param fraction the number of fractional bits in the value
+ * @return the signed value represented as a double
+ */
+ private double decodeZUnsignedToSignedValue(long[] fieldValues, int[] fieldLengths, int index,
+ int fraction) {
+ int value = (int) fieldValues[index];
+ int maxPositiveValue = (int) Math.pow(2, fieldLengths[index] - 1) - 1;
+ if (value > maxPositiveValue) {
+ value -= Math.pow(2, fieldLengths[index]);
+ }
+ return Math.scalb(value, -fraction);
+ }
+
+ /**
+ * Parse Subelement Usage Rights
+ */
+ private boolean parseSubelementUsage(byte[] buffer) {
+ if (buffer.length != SUBELEMENT_USAGE_LENGTH1
+ && buffer.length != SUBELEMENT_USAGE_LENGTH3) {
+ return false;
+ }
+ mUsageRetransmit =
+ (buffer[SUBELEMENT_USAGE_PARAMS_INDEX] & SUBELEMENT_USAGE_MASK_RETRANSMIT) != 0;
+ mUsageRetentionExpires =
+ (buffer[SUBELEMENT_USAGE_PARAMS_INDEX] & SUBELEMENT_USAGE_MASK_RETENTION_EXPIRES)
+ != 0;
+ mUsageExtraInfoOnAssociation =
+ (buffer[SUBELEMENT_USAGE_PARAMS_INDEX] & SUBELEMENT_USAGE_MASK_STA_LOCATION_POLICY)
+ != 0;
+ // Note: the Retransmit flag must be true, and RetentionExpires, false for the
+ // ResponderLocation object to be usable by public applications.
+ return (mUsageRetransmit && !mUsageRetentionExpires);
+ }
+
+ /**
+ * Parse the BSSID List Subelement of the LCI IE.
+ *
+ * @param buffer a buffer containing the subelement
+ * @return boolean true indicates success
+ */
+ private boolean parseSubelementBssidList(byte[] buffer) {
+ if (buffer.length < SUBELEMENT_BSSID_LIST_MIN_BUFFER_LENGTH) {
+ return false;
+ }
+ if ((buffer.length - 1) % BYTES_IN_A_BSSID != 0) {
+ return false;
+ }
+
+ int maxBssidIndicator = (int) buffer[SUBELEMENT_BSSID_MAX_INDICATOR_INDEX] & BYTE_MASK;
+ int bssidListLength = (buffer.length - 1) / BYTES_IN_A_BSSID;
+ // Check the max number of BSSIDs agrees with the list length.
+ if (maxBssidIndicator != bssidListLength) {
+ return false;
+ }
+
+ int bssidOffset = SUBELEMENT_BSSID_LIST_INDEX;
+ for (int i = 0; i < bssidListLength; i++) {
+ byte[] bssid = Arrays.copyOfRange(buffer, bssidOffset, bssidOffset + BYTES_IN_A_BSSID);
+ MacAddress macAddress = MacAddress.fromBytes(bssid);
+ mBssidList.add(macAddress);
+ bssidOffset += BYTES_IN_A_BSSID;
+ }
+ return true;
+ }
+
+ /**
+ * Parse the Location Civic subelement in the LCR IE.
+ *
+ * @param buffer a buffer containing the subelement
+ * @return boolean true indicates success
+ */
+ private boolean parseSubelementLocationCivic(byte[] buffer) {
+ if (buffer.length < SUBELEMENT_LOCATION_CIVIC_MIN_LENGTH
+ || buffer.length > SUBELEMENT_LOCATION_CIVIC_MAX_LENGTH) {
+ return false;
+ }
+ mCivicLocationCountryCode =
+ new String(Arrays.copyOfRange(buffer, CIVIC_COUNTRY_CODE_INDEX,
+ CIVIC_TLV_LIST_INDEX)).toUpperCase();
+ CivicLocation civicLocation =
+ new CivicLocation(
+ Arrays.copyOfRange(buffer, CIVIC_TLV_LIST_INDEX, buffer.length),
+ mCivicLocationCountryCode);
+ if (!civicLocation.isValid()) {
+ return false;
+ }
+ this.mCivicLocation = civicLocation;
+ mCivicLocationString = civicLocation.toString();
+ return true;
+ }
+
+ /**
+ * Parse the Map Image subelement in the LCR IE.
+ *
+ * @param buffer a buffer containing the subelement
+ * @return boolean true indicates success
+ */
+ private boolean parseSubelementMapImage(byte[] buffer) {
+ if (buffer.length > SUBELEMENT_MAP_IMAGE_URL_MAX_LENGTH) {
+ return false;
+ }
+ int mapImageType = buffer[SUBELEMENT_IMAGE_MAP_TYPE_INDEX];
+ if (mapImageType < MAP_TYPE_URL_DEFINED || mapImageType > MAP_TYPE_DWG) {
+ return false;
+ }
+ this.mMapImageType = mapImageType;
+ byte[] urlBytes = Arrays.copyOfRange(buffer, 1, buffer.length);
+ try {
+ mMapImageUrl = new URL(new String(urlBytes));
+ } catch (MalformedURLException e) {
+ mMapImageUrl = null;
+ return false;
+ }
+ return true;
+ }
+
+ /**
+ * Converts a byte array containing fields of variable size, into an array of longs where the
+ * field boundaries are defined in a constant int array passed as an argument.
+ *
+ * @param buffer the byte array containing all the fields
+ * @param bitFieldSizes the int array defining the size of each field
+ */
+ private long[] getFieldData(byte[] buffer, int[] bitFieldSizes) {
+ int bufferLengthBits = buffer.length * Byte.SIZE;
+ int sumBitFieldSizes = 0;
+ for (int i : bitFieldSizes) {
+ if (i > Long.SIZE) {
+ return null;
+ }
+ sumBitFieldSizes += i;
+ }
+ if (bufferLengthBits != sumBitFieldSizes) {
+ return null;
+ }
+ long[] fieldData = new long[bitFieldSizes.length];
+ int bufferBitPos = 0;
+ for (int fieldIndex = 0; fieldIndex < bitFieldSizes.length; fieldIndex++) {
+ int bitFieldSize = bitFieldSizes[fieldIndex];
+ long field = 0;
+ for (int n = 0; n < bitFieldSize; n++) {
+ field |= ((long) getBitAtBitOffsetInByteArray(buffer, bufferBitPos + n) << n);
+ }
+ fieldData[fieldIndex] = field;
+ bufferBitPos += bitFieldSize;
+ }
+ return fieldData;
+ }
+
+ /**
+ * Retrieves state of a bit at the bit-offset in a byte array, where the offset represents the
+ * bytes in contiguous data with each value in big endian order.
+ *
+ * @param buffer the data buffer of bytes containing all the fields
+ * @param bufferBitOffset the bit offset into the entire buffer
+ * @return a zero or one value, representing the state of that bit.
+ */
+ private int getBitAtBitOffsetInByteArray(byte[] buffer, int bufferBitOffset) {
+ int bufferIndex = bufferBitOffset / Byte.SIZE; // The byte index that contains the bit
+ int bitOffsetInByte = bufferBitOffset % Byte.SIZE; // The bit offset within that byte
+ int result = (buffer[bufferIndex] & (MSB_IN_BYTE >> bitOffsetInByte)) == 0 ? 0 : 1;
+ return result;
+ }
+
+ /**
+ * Reverses the order of the bits in each byte of a byte array.
+ *
+ * @param buffer the array containing each byte that will be reversed
+ */
+ private void swapEndianByteByByte(byte[] buffer) {
+ for (int n = 0; n < buffer.length; n++) {
+ byte currentByte = buffer[n];
+ byte reversedByte = 0; // Cleared value
+ byte bitSelectorMask = LSB_IN_BYTE;
+ for (int i = 0; i < Byte.SIZE; i++) {
+ reversedByte = (byte) (reversedByte << 1);
+ if ((currentByte & bitSelectorMask) != 0) {
+ reversedByte = (byte) (reversedByte | LSB_IN_BYTE);
+ }
+ bitSelectorMask = (byte) (bitSelectorMask << 1);
+ }
+ buffer[n] = reversedByte;
+ }
+ }
+
+ /**
+ * Sets the LCI subelement fields to the default undefined values.
+ */
+ private void setLciSubelementDefaults() {
+ mIsLciValid = false;
+ mLatitudeUncertainty = UNCERTAINTY_UNDEFINED;
+ mLatitude = 0;
+ mLongitudeUncertainty = UNCERTAINTY_UNDEFINED;
+ mLongitude = 0;
+ mAltitudeType = ALTITUDE_UNDEFINED;
+ mAltitudeUncertainty = UNCERTAINTY_UNDEFINED;
+ mAltitude = 0;
+ mDatum = DATUM_UNDEFINED;
+ mLciFlags = 0;
+ }
+
+ /**
+ * Sets the Z subelement fields to the default values when undefined.
+ */
+ private void setZSubelementDefaults() {
+ mIsZValid = false;
+ mExpectedToMove = 0;
+ mStaFloorNumber = 0;
+ mStaHeightAboveFloorMeters = 0;
+ mStaHeightAboveFloorUncertaintyMeters = 0;
+ }
+
+ /**
+ * Sets the Usage Policy subelement fields to the default undefined values.
+ */
+ private void setUsageSubelementDefaults() {
+ mUsageRetransmit = true;
+ mUsageRetentionExpires = false;
+ mUsageExtraInfoOnAssociation = false;
+ }
+
+ /**
+ * Sets the BSSID List subelement fields to the default values when undefined.
+ */
+ private void setBssidListSubelementDefaults() {
+ mIsBssidListValid = false;
+ mBssidList = new ArrayList<>();
+ }
+
+ /**
+ * Sets the LCR Civic Location subelement field to the default undefined value.
+ *
+ * @hide
+ */
+ public void setCivicLocationSubelementDefaults() {
+ mIsLocationCivicValid = false;
+ mCivicLocationCountryCode = "";
+ mCivicLocationString = "";
+ mCivicLocation = null;
+ }
+
+ /**
+ * Sets the LCR Map Image subelement field to the default values when undefined.
+ */
+ private void setMapImageSubelementDefaults() {
+ mIsMapImageValid = false;
+ mMapImageType = MAP_TYPE_URL_DEFINED;
+ mMapImageUrl = null;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null || getClass() != obj.getClass()) {
+ return false;
+ }
+ ResponderLocation other = (ResponderLocation) obj;
+ return mIsValid == other.mIsValid
+ && mIsLciValid == other.mIsLciValid
+ && mIsZValid == other.mIsZValid
+ && mIsUsageValid == other.mIsUsageValid
+ && mIsBssidListValid == other.mIsBssidListValid
+ && mIsLocationCivicValid == other.mIsLocationCivicValid
+ && mIsMapImageValid == other.mIsMapImageValid
+ && mLatitudeUncertainty == other.mLatitudeUncertainty
+ && mLatitude == other.mLatitude
+ && mLongitudeUncertainty == other.mLongitudeUncertainty
+ && mLongitude == other.mLongitude
+ && mAltitudeType == other.mAltitudeType
+ && mAltitudeUncertainty == other.mAltitudeUncertainty
+ && mAltitude == other.mAltitude
+ && mDatum == other.mDatum
+ && mLciFlags == other.mLciFlags
+ && mExpectedToMove == other.mExpectedToMove
+ && mStaFloorNumber == other.mStaFloorNumber
+ && mStaHeightAboveFloorMeters == other.mStaHeightAboveFloorMeters
+ && mStaHeightAboveFloorUncertaintyMeters
+ == other.mStaHeightAboveFloorUncertaintyMeters
+ && mUsageRetransmit == other.mUsageRetransmit
+ && mUsageRetentionExpires == other.mUsageRetentionExpires
+ && mUsageExtraInfoOnAssociation == other.mUsageExtraInfoOnAssociation
+ && mBssidList.equals(other.mBssidList)
+ && mCivicLocationCountryCode.equals(other.mCivicLocationCountryCode)
+ && mCivicLocationString.equals(other.mCivicLocationString)
+ && Objects.equals(mCivicLocation, other.mCivicLocation)
+ && mMapImageType == other.mMapImageType
+ && Objects.equals(mMapImageUrl, other.mMapImageUrl);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(mIsValid, mIsLciValid, mIsZValid, mIsUsageValid, mIsBssidListValid,
+ mIsLocationCivicValid, mIsMapImageValid, mLatitudeUncertainty, mLatitude,
+ mLongitudeUncertainty, mLongitude, mAltitudeType, mAltitudeUncertainty, mAltitude,
+ mDatum, mLciFlags, mExpectedToMove, mStaFloorNumber, mStaHeightAboveFloorMeters,
+ mStaHeightAboveFloorUncertaintyMeters, mUsageRetransmit, mUsageRetentionExpires,
+ mUsageExtraInfoOnAssociation, mBssidList, mCivicLocationCountryCode,
+ mCivicLocationString, mCivicLocation, mMapImageType, mMapImageUrl);
+ }
+
+ /**
+ * @return true if the ResponderLocation object is valid and contains useful information
+ * relevant to the location of the Responder. If this is ever false, this object will not be
+ * available to developers, and have a null value.
+ *
+ * @hide
+ */
+ public boolean isValid() {
+ return mIsValid;
+ }
+
+ /**
+ * @return true if the LCI subelement (containing Latitude, Longitude and Altitude) is valid.
+ *
+ * <p> This method tells us if the responder has provided its Location Configuration
+ * Information (LCI) directly, and is useful when an external database of responder locations
+ * is not available</p>
+ *
+ * <p>If isLciSubelementValid() returns true, all the LCI values provided by the corresponding
+ * getter methods will have been set as described by the responder, or else if false, they
+ * should not be used and will throw an IllegalStateException.</p>
+ */
+ public boolean isLciSubelementValid() {
+ return mIsLciValid;
+ }
+
+ /**
+ * @return the latitude uncertainty in degrees.
+ *
+ * Only valid if {@link #isLciSubelementValid()} returns true, or will throw an exception.
+ *
+ * <p> An unknown uncertainty is indicated by 0.</p>
+ */
+ public double getLatitudeUncertainty() {
+ if (!mIsLciValid) {
+ throw new IllegalStateException(
+ "getLatitudeUncertainty(): invoked on an invalid result: mIsLciValid = false)");
+ }
+ return mLatitudeUncertainty;
+ }
+
+ /**
+ * @return the latitude in degrees
+ *
+ * Only valid if {@link #isLciSubelementValid()} returns true, or will throw an exception.
+ */
+ public double getLatitude() {
+ if (!mIsLciValid) {
+ throw new IllegalStateException(
+ "getLatitude(): invoked on an invalid result: mIsLciValid = false)");
+ }
+ return mLatitude;
+ }
+
+ /**
+ * @return the Longitude uncertainty in degrees.
+ *
+ * Only valid if {@link #isLciSubelementValid()} returns true, or will throw an exception.
+ *
+ * <p> An unknown uncertainty is indicated by 0.</p>
+ */
+ public double getLongitudeUncertainty() {
+ if (!mIsLciValid) {
+ throw new IllegalStateException(
+ "getLongitudeUncertainty(): invoked on an invalid result: mIsLciValid = false)");
+ }
+ return mLongitudeUncertainty;
+ }
+
+ /**
+ * @return the Longitude in degrees..
+ *
+ * Only valid if {@link #isLciSubelementValid()} returns true, or will throw an exception.
+ */
+ public double getLongitude() {
+ if (!mIsLciValid) {
+ throw new IllegalStateException(
+ "getLatitudeUncertainty(): invoked on an invalid result: mIsLciValid = false)");
+ }
+ return mLongitude;
+ }
+
+ /**
+ * @return the Altitude type.
+ *
+ * Only valid if {@link #isLciSubelementValid()} returns true, or will throw an exception.
+ */
+ @AltitudeType
+ public int getAltitudeType() {
+ if (!mIsLciValid) {
+ throw new IllegalStateException(
+ "getLatitudeUncertainty(): invoked on an invalid result: mIsLciValid = false)");
+ }
+ return mAltitudeType;
+ }
+
+ /**
+ * @return the Altitude uncertainty in meters.
+ *
+ * Only valid if {@link #isLciSubelementValid()} returns true, or will throw an exception.
+ *
+ * <p>An unknown uncertainty is indicated by 0.</p>
+ */
+ public double getAltitudeUncertainty() {
+ if (!mIsLciValid) {
+ throw new IllegalStateException(
+ "getLatitudeUncertainty(): invoked on an invalid result: mIsLciValid = false)");
+ }
+ return mAltitudeUncertainty;
+ }
+
+ /**
+ * @return the Altitude in units defined by the altitude type.
+ *
+ * Only valid if {@link #isLciSubelementValid()} returns true, or will throw an exception.
+ */
+ public double getAltitude() {
+ if (!mIsLciValid) {
+ throw new IllegalStateException(
+ "getAltitude(): invoked on an invalid result: mIsLciValid = false)");
+ }
+ return mAltitude;
+ }
+
+ /**
+ * @return the Datum used for the LCI positioning information.
+ *
+ * Only valid if {@link #isLciSubelementValid()} returns true, or will throw an exception.
+ */
+ @DatumType
+ public int getDatum() {
+ if (!mIsLciValid) {
+ throw new IllegalStateException(
+ "getDatum(): invoked on an invalid result: mIsLciValid = false)");
+ }
+ return mDatum;
+ }
+
+ /**
+ * @return the LCI sub-element flags (5-bits).
+ *
+ * Only valid if {@link #isLciSubelementValid()} returns true, or will throw an exception.
+ *
+ * <p>Note: The flags/version can be extracted by bitwise ANDing this value with the
+ * corresponding LCI_FLAGS_MASK_* .</p>
+ */
+ public int getLciFlags() {
+ if (!mIsLciValid) {
+ throw new IllegalStateException(
+ "getLciFlags(): invoked on an invalid result: mIsLciValid = false)");
+ }
+ return mLciFlags;
+ }
+
+ /**
+ * @return if the Z subelement (containing mobility, Floor, Height above floor) is valid.
+ */
+ public boolean isZsubelementValid() {
+ return mIsZValid;
+ }
+
+ /**
+ * @return an integer representing the mobility of the responder.
+ *
+ * Only valid if {@link #isZsubelementValid()} returns true, or will throw an exception.
+ */
+ @ExpectedToMoveType
+ public int getExpectedToMove() {
+ if (!mIsZValid) {
+ throw new IllegalStateException(
+ "getExpectedToMove(): invoked on an invalid result: mIsZValid = false)");
+ }
+ return mExpectedToMove;
+ }
+
+ /**
+ * @return the Z sub element STA Floor Number.
+ *
+ * Only valid if {@link #isZsubelementValid()} returns true, or will throw an exception.
+ *
+ * <p>Note: this number can be positive or negative, with value increments of +/- 1/16 of a
+ * floor.</p>.
+ */
+ public double getStaFloorNumber() {
+ if (!mIsZValid) {
+ throw new IllegalStateException(
+ "getStaFloorNumber(): invoked on an invalid result: mIsZValid = false)");
+ }
+ return mStaFloorNumber;
+ }
+
+ /**
+ * @return the Z subelement STA Height above the floor in meters.
+ *
+ * Only valid if {@link #isZsubelementValid()} returns true, or will throw an exception.
+ *
+ * <p>This value can be positive or negative. </p>
+ */
+ public double getStaHeightAboveFloorMeters() {
+ if (!mIsZValid) {
+ throw new IllegalStateException(
+ "getStaHeightAboveFloorMeters(): invoked on an invalid result: mIsZValid = false)");
+ }
+ return mStaHeightAboveFloorMeters;
+ }
+
+ /**
+ * @return the Z subelement STA Height above the floor uncertainty in meters.
+ *
+ * Only valid if {@link #isZsubelementValid()} returns true, or will throw an exception.
+ *
+ * <p>An unknown uncertainty is indicated by 0.</p>
+ */
+ public double getStaHeightAboveFloorUncertaintyMeters() {
+ if (!mIsZValid) {
+ throw new IllegalStateException(
+ "getStaHeightAboveFloorUncertaintyMeters():"
+ + "invoked on an invalid result: mIsZValid = false)");
+ }
+ return mStaHeightAboveFloorUncertaintyMeters;
+ }
+
+ /**
+ * @return true if the location information received from the responder can be
+ * retransmitted to another device, physically separate from the one that received it.
+ *
+ * @hide
+ */
+ public boolean getRetransmitPolicyIndication() {
+ return mUsageRetransmit;
+ }
+
+ /**
+ * @return true if location-data received should expire (and be deleted)
+ * by the time provided in the getRelativeExpirationTimeHours() method.
+ *
+ *
+ * @hide
+ */
+ public boolean getRetentionExpiresIndication() {
+ return mUsageRetentionExpires;
+ }
+
+ /**
+ * @return true if there is extra location info available on association.
+ *
+ * @hide
+ */
+ @SystemApi
+ public boolean getExtraInfoOnAssociationIndication() {
+ return mUsageExtraInfoOnAssociation;
+ }
+
+ /**
+ * @return the list of colocated BSSIDs at the responder.
+ *
+ * <p> Will return an empty list when there are no bssids listed.
+ */
+ public List<MacAddress> getColocatedBssids() {
+ return mBssidList;
+ }
+
+ /**
+ * @return the civic location represented as an {@link Address} object (best effort).
+ *
+ * <p> Will return a {@code null} when there is no Civic Location define defined.
+ *
+ * @hide
+ */
+ @Nullable
+ public Address toCivicLocationAddress() {
+ if (mCivicLocation != null && mCivicLocation.isValid()) {
+ return mCivicLocation.toAddress();
+ } else {
+ return null;
+ }
+ }
+
+
+ /**
+ * @return the civic location two upper-case ASCII character country code defined in ISO 3166.
+ *
+ * <p> Will return a {@code null} when there is no country code defined.
+ *
+ * @hide
+ */
+ @Nullable
+ public String getCivicLocationCountryCode() {
+ return mCivicLocationCountryCode;
+ }
+
+ /**
+ * @return the value of the Civic Location String associated with a key.
+ *
+ * <p> Will return a {@code null} when there is no value associated with the key provided.
+ *
+ * @param key used to find a corresponding value in the Civic Location Tuple list
+ *
+ * @hide
+ */
+ @Nullable
+ public String getCivicLocationElementValue(@CivicLocationKeysType int key) {
+ return mCivicLocation.getCivicElementValue(key);
+ }
+
+ /**
+ * @return the Map Image file type, referred to by getMapImageUrl(), encoded as an integer.
+ */
+ @MapImageType
+ public int getMapImageType() {
+ return mMapImageType;
+ }
+
+ /**
+ * @return a Url referencing a map-file showing the local floor plan.
+ *
+ * <p> Will return a {@code null} when there is no URL defined.
+ */
+ @Nullable
+ public URL getMapImageUrl() {
+ return mMapImageUrl;
+ }
+}
diff --git a/wifi/tests/src/android/net/wifi/rtt/CivicLocationTest.java b/wifi/tests/src/android/net/wifi/rtt/CivicLocationTest.java
new file mode 100644
index 0000000..f746fb7
--- /dev/null
+++ b/wifi/tests/src/android/net/wifi/rtt/CivicLocationTest.java
@@ -0,0 +1,243 @@
+/*
+ * Copyright (C) 2018 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.wifi.rtt;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+
+import android.location.Address;
+import android.os.Parcel;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+/**
+ * Tests for {@link CivicLocation}.
+ */
+@RunWith(JUnit4.class)
+public class CivicLocationTest {
+ private static final String sUsCountryCode = "US";
+
+ private static final byte[] sEmptyBuffer = {};
+
+ private static final byte[] sTestCivicLocationBuffer = {
+ (byte) 17,
+ (byte) 3,
+ (byte) 'a',
+ (byte) 'b',
+ (byte) 'c',
+ (byte) 4,
+ (byte) 4,
+ (byte) 'd',
+ (byte) 'e',
+ (byte) 'f',
+ (byte) 'g',
+ (byte) 12,
+ (byte) 1,
+ (byte) 'h'
+ };
+
+ private static final byte[] sTestCivicLocationBufferWithAddress = {
+ (byte) CivicLocationKeys.HNO,
+ (byte) 2,
+ (byte) '1',
+ (byte) '5',
+ (byte) CivicLocationKeys.PRIMARY_ROAD_NAME,
+ (byte) 4,
+ (byte) 'A',
+ (byte) 'l',
+ (byte) 't',
+ (byte) 'o',
+ (byte) CivicLocationKeys.STREET_NAME_POST_MODIFIER,
+ (byte) 4,
+ (byte) 'R',
+ (byte) 'o',
+ (byte) 'a',
+ (byte) 'd',
+ (byte) CivicLocationKeys.CITY,
+ (byte) 8,
+ (byte) 'M',
+ (byte) 't',
+ (byte) 'n',
+ (byte) ' ',
+ (byte) 'V',
+ (byte) 'i',
+ (byte) 'e',
+ (byte) 'w',
+ (byte) CivicLocationKeys.STATE,
+ (byte) 2,
+ (byte) 'C',
+ (byte) 'A',
+ (byte) CivicLocationKeys.POSTAL_CODE,
+ (byte) 5,
+ (byte) '9',
+ (byte) '4',
+ (byte) '0',
+ (byte) '4',
+ (byte) '3'
+ };
+
+ /**
+ * Test inValid for null CountryCode.
+ */
+ @Test
+ public void testCivicLocationNullCountryCode() {
+ CivicLocation civicLocation = new CivicLocation(sTestCivicLocationBuffer, null);
+
+ boolean valid = civicLocation.isValid();
+
+ assertFalse(valid);
+ }
+
+ /**
+ * Test inValid for CountryCode too short.
+ */
+ @Test
+ public void testCivicLocationCountryCodeTooShort() {
+ CivicLocation civicLocation = new CivicLocation(sTestCivicLocationBuffer, "X");
+
+ boolean valid = civicLocation.isValid();
+
+ assertFalse(valid);
+ }
+
+ /**
+ * Test inValid for CountryCode too long.
+ */
+ @Test
+ public void testCivicLocationCountryCodeTooLong() {
+ CivicLocation civicLocation = new CivicLocation(sTestCivicLocationBuffer, "XYZ");
+
+ boolean valid = civicLocation.isValid();
+
+ assertFalse(valid);
+ }
+
+ /**
+ * Test inValid for null CivicLocation Buffer
+ */
+ @Test
+ public void testCivicLocationNullBuffer() {
+ CivicLocation civicLocation = new CivicLocation(null, sUsCountryCode);
+
+ boolean valid = civicLocation.isValid();
+
+ assertFalse(valid);
+ }
+
+ /**
+ * Test inValid for Empty CivicLocation Buffer.
+ */
+ @Test
+ public void testCivicLocationEmptyBuffer() {
+ CivicLocation civicLocation = new CivicLocation(sEmptyBuffer, sUsCountryCode);
+
+ boolean valid = civicLocation.isValid();
+
+ assertFalse(valid);
+ }
+
+ /**
+ * Test for valid CivicLocationBuffer and Country Code.
+ */
+ @Test
+ public void testCivicLocationValid() {
+ CivicLocation civicLocation = new CivicLocation(sTestCivicLocationBuffer, sUsCountryCode);
+
+ boolean valid = civicLocation.isValid();
+
+ assertTrue(valid);
+ }
+
+ /**
+ * Test toString Representation
+ */
+ @Test
+ public void testCivicLocationToString() {
+ CivicLocation civicLocation = new CivicLocation(sTestCivicLocationBuffer, sUsCountryCode);
+
+ String str = civicLocation.toString();
+
+ assertEquals("{4=defg, 12=h, 17=abc}", str);
+ }
+
+ /**
+ * Test the toString
+ */
+ @Test
+ public void testCivicLocationgetElementValue() {
+ CivicLocation civicLocation = new CivicLocation(sTestCivicLocationBuffer, sUsCountryCode);
+
+ String value1 = civicLocation.getCivicElementValue(4);
+ String value2 = civicLocation.getCivicElementValue(17);
+ String value3 = civicLocation.getCivicElementValue(12);
+ String value4 = civicLocation.getCivicElementValue(156); // not in test data
+ String value5 = civicLocation.getCivicElementValue(276); // greater than key index
+
+ assertEquals("defg", value1);
+ assertEquals("abc", value2);
+ assertEquals("h", value3);
+ assertNull(value4);
+ assertNull(value5);
+ }
+
+ /* Test toAddress representation */
+ @Test
+ public void testCivicLocationToAddress() {
+ CivicLocation civicLocation =
+ new CivicLocation(sTestCivicLocationBufferWithAddress, sUsCountryCode);
+
+ Address address = civicLocation.toAddress();
+
+ assertEquals("", address.getAddressLine(0));
+ assertEquals("15 Alto", address.getAddressLine(1));
+ assertEquals("Mtn View", address.getAddressLine(2));
+ assertEquals("CA 94043", address.getAddressLine(3));
+ assertEquals("US", address.getAddressLine(4));
+ }
+
+ /**
+ * Test toString Representation
+ */
+ @Test
+ public void testCivicLocationToString2() {
+ CivicLocation civicLocation =
+ new CivicLocation(sTestCivicLocationBufferWithAddress, sUsCountryCode);
+
+ String str = civicLocation.toString();
+
+ assertEquals("{1=CA, 3=Mtn View, 19=15, 24=94043, 34=Alto, 39=Road}", str);
+ }
+
+ /** Test object is Parcellable */
+ @Test
+ public void testCivicLocationParcelable() {
+ CivicLocation civicLocation =
+ new CivicLocation(sTestCivicLocationBufferWithAddress, sUsCountryCode);
+
+ Parcel parcel = Parcel.obtain();
+ civicLocation.writeToParcel(parcel, 0);
+ parcel.setDataPosition(0);
+ CivicLocation civicLocationFromParcel =
+ CivicLocation.CREATOR.createFromParcel(parcel);
+
+ assertEquals(civicLocationFromParcel, civicLocation);
+ }
+}
diff --git a/wifi/tests/src/android/net/wifi/rtt/ResponderLocationTest.java b/wifi/tests/src/android/net/wifi/rtt/ResponderLocationTest.java
new file mode 100644
index 0000000..9efb642
--- /dev/null
+++ b/wifi/tests/src/android/net/wifi/rtt/ResponderLocationTest.java
@@ -0,0 +1,551 @@
+/*
+ * Copyright (C) 2018 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.wifi.rtt;
+
+import android.location.Address;
+import android.net.MacAddress;
+import android.os.Parcel;
+
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertTrue;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import java.util.List;
+
+/**
+ * Tests for {@link ResponderLocation}.
+ */
+@RunWith(JUnit4.class)
+public class ResponderLocationTest {
+ private static final double LATLNG_TOLERANCE_DEGREES = 0.001;
+ private static final double ALT_TOLERANCE_METERS = 0.01;
+ private static final double HEIGHT_TOLERANCE_METERS = 0.01;
+ private static final int INDEX_ELEMENT_TYPE = 2;
+ private static final int INDEX_SUBELEMENT_TYPE = 0;
+ private static final int INDEX_SUBELEMENT_LENGTH = 1;
+
+ /* Test Buffers */
+
+ private static final byte[] sTestLciIeHeader = {
+ (byte) 0x01, (byte) 0x00, (byte) 0x08 // LCI Information Element (IE)
+ };
+
+ private static final byte[] sTestLciShortBuffer = {
+ (byte) 0x00
+ };
+
+ private static final byte[] sTestLciSE = {
+ (byte) 0x00, // Subelement LCI
+ (byte) 16, // Subelement LCI length always = 16
+ (byte) 0x52,
+ (byte) 0x83,
+ (byte) 0x4d,
+ (byte) 0x12,
+ (byte) 0xef,
+ (byte) 0xd2,
+ (byte) 0xb0,
+ (byte) 0x8b,
+ (byte) 0x9b,
+ (byte) 0x4b,
+ (byte) 0xf1,
+ (byte) 0xcc,
+ (byte) 0x2c,
+ (byte) 0x00,
+ (byte) 0x00,
+ (byte) 0x41
+ };
+
+ private static final byte[] sTestZHeightSE = {
+ (byte) 0x04, // Subelement Z
+ (byte) 6, // Length always 6
+ (byte) 0x00, // LSB STA Floor Info (2 bytes)
+ (byte) 0x01, // MSB
+ (byte) 0xcd, // LSB Height(m) (3 bytes)
+ (byte) 0x2c,
+ (byte) 0x00, // MSB Height(m)
+ (byte) 0x0e, // STA Height Uncertainty
+ };
+
+ private static final byte[] sTestUsageSE1 = {
+ (byte) 0x06, // Subelement Usage Rights
+ (byte) 1, // Length 1 (with no retention limit)
+ (byte) 0x01, // Retransmit ok, No expiration, no extra info available
+ };
+
+ private static final byte[] sTestUsageSE2 = {
+ (byte) 0x06, // Subelement Usage Rights
+ (byte) 3, // Length 3 (including retention limit)
+ (byte) 0x06, // Retransmit not ok, Expiration, extra info available
+ (byte) 0x00, // LSB expiration time (0x8000 = 32768 hrs)
+ (byte) 0x80 // MSB expiration time
+ };
+
+ private static final byte[] sTestBssidListSE = {
+ (byte) 0x07, // Subelement BSSID list
+ (byte) 13, // length dependent on number of BSSIDs in list
+ (byte) 0x02, // Number of BSSIDs in list
+ (byte) 0x01, // BSSID #1 (MSB)
+ (byte) 0x02,
+ (byte) 0x03,
+ (byte) 0x04,
+ (byte) 0x05,
+ (byte) 0x06, // (LSB)
+ (byte) 0xf1, // BSSID #2 (MSB)
+ (byte) 0xf2,
+ (byte) 0xf3,
+ (byte) 0xf4,
+ (byte) 0xf5,
+ (byte) 0xf6 // (LSB)
+ };
+
+ private static final byte[] sTestLcrBufferHeader = {
+ (byte) 0x01, (byte) 0x00, (byte) 0x0b,
+ };
+
+ private static final byte[] sEmptyBuffer = {};
+
+ private static final byte[] sTestCivicLocationSEWithAddress = {
+ (byte) 0, // Civic Location Subelement
+ (byte) 39, // Length of subelement value
+ (byte) 'U', // CountryCodeChar1
+ (byte) 'S', // CountryCodeChar2
+ (byte) CivicLocationKeys.HNO,
+ (byte) 2,
+ (byte) '1',
+ (byte) '5',
+ (byte) CivicLocationKeys.PRIMARY_ROAD_NAME,
+ (byte) 4,
+ (byte) 'A',
+ (byte) 'l',
+ (byte) 't',
+ (byte) 'o',
+ (byte) CivicLocationKeys.STREET_NAME_POST_MODIFIER,
+ (byte) 4,
+ (byte) 'R',
+ (byte) 'o',
+ (byte) 'a',
+ (byte) 'd',
+ (byte) CivicLocationKeys.CITY,
+ (byte) 8,
+ (byte) 'M',
+ (byte) 't',
+ (byte) 'n',
+ (byte) ' ',
+ (byte) 'V',
+ (byte) 'i',
+ (byte) 'e',
+ (byte) 'w',
+ (byte) CivicLocationKeys.STATE,
+ (byte) 2,
+ (byte) 'C',
+ (byte) 'A',
+ (byte) CivicLocationKeys.POSTAL_CODE,
+ (byte) 5,
+ (byte) '9',
+ (byte) '4',
+ (byte) '0',
+ (byte) '4',
+ (byte) '3'
+ };
+
+ // Buffer representing: "https://map.com/mall.jpg"
+ private static final byte[] sTestMapUrlSE = {
+ (byte) 5, // Map URL Subelement
+ (byte) 25,
+ (byte) ResponderLocation.MAP_TYPE_URL_DEFINED,
+ (byte) 'h',
+ (byte) 't',
+ (byte) 't',
+ (byte) 'p',
+ (byte) 's',
+ (byte) ':',
+ (byte) '/',
+ (byte) '/',
+ (byte) 'm',
+ (byte) 'a',
+ (byte) 'p',
+ (byte) '.',
+ (byte) 'c',
+ (byte) 'o',
+ (byte) 'm',
+ (byte) '/',
+ (byte) 'm',
+ (byte) 'a',
+ (byte) 'l',
+ (byte) 'l',
+ (byte) '.',
+ (byte) 'j',
+ (byte) 'p',
+ (byte) 'g'
+ };
+
+ /**
+ * Test if the lci and lcr buffers are null.
+ */
+ @Test
+ public void testIfLciOrLcrIsNull() {
+ ResponderLocation responderLocation = new ResponderLocation(null, null);
+
+ boolean valid = responderLocation.isValid();
+ boolean lciValid = responderLocation.isLciSubelementValid();
+ boolean zValid = responderLocation.isZsubelementValid();
+
+ assertFalse(valid);
+ assertFalse(lciValid);
+ assertFalse(zValid);
+ }
+
+ /**
+ * Test if the lci and lcr buffers are empty.
+ */
+ @Test
+ public void testIfLciOrLcrIsEmpty() {
+ ResponderLocation responderLocation = new ResponderLocation(sEmptyBuffer, sEmptyBuffer);
+
+ boolean valid = responderLocation.isValid();
+ boolean lciValid = responderLocation.isLciSubelementValid();
+ boolean zValid = responderLocation.isZsubelementValid();
+
+ assertFalse(valid);
+ assertFalse(lciValid);
+ assertFalse(zValid);
+ }
+
+ /**
+ * Test if the lci subelement only has one byte
+ */
+ @Test
+ public void testIfLciShortBuffer() {
+ byte[] testLciBuffer = concatenateArrays(sTestLciIeHeader, sTestLciShortBuffer);
+ ResponderLocation responderLocation =
+ new ResponderLocation(testLciBuffer, sTestLcrBufferHeader);
+
+ boolean valid = responderLocation.isValid();
+ boolean lciValid = responderLocation.isLciSubelementValid();
+ boolean zValid = responderLocation.isZsubelementValid();
+
+ assertFalse(valid);
+ assertFalse(lciValid);
+ assertFalse(zValid);
+ }
+
+ /**
+ * Test that the example buffer contains a valid LCI Subelement.
+ */
+ @Test
+ public void testLciValidSubelement() {
+ byte[] testLciBuffer = concatenateArrays(sTestLciIeHeader, sTestLciSE);
+ ResponderLocation responderLocation =
+ new ResponderLocation(testLciBuffer, sTestLcrBufferHeader);
+
+ boolean valid = responderLocation.isValid();
+ boolean lciValid = responderLocation.isLciSubelementValid();
+ boolean zValid = responderLocation.isZsubelementValid();
+
+ assertTrue(valid);
+ assertTrue(lciValid);
+ assertFalse(zValid);
+ assertEquals(0.0009765625, responderLocation.getLatitudeUncertainty());
+ assertEquals(-33.857009, responderLocation.getLatitude(),
+ LATLNG_TOLERANCE_DEGREES);
+ assertEquals(0.0009765625, responderLocation.getLongitudeUncertainty());
+ assertEquals(151.215200, responderLocation.getLongitude(),
+ LATLNG_TOLERANCE_DEGREES);
+ assertEquals(1, responderLocation.getAltitudeType());
+ assertEquals(64.0, responderLocation.getAltitudeUncertainty());
+ assertEquals(11.2, responderLocation.getAltitude(), ALT_TOLERANCE_METERS);
+ assertEquals(1, responderLocation.getDatum()); // WGS84
+ int lciFlags = responderLocation.getLciFlags();
+ assertEquals(0, lciFlags & ResponderLocation.LCI_FLAGS_MASK_REGLOC_AGREEMENT);
+ assertEquals(0, lciFlags & ResponderLocation.LCI_FLAGS_MASK_REGLOC_DSE);
+ assertEquals(0, lciFlags & ResponderLocation.LCI_FLAGS_MASK_DEPENDENT_STA);
+ assertEquals(1, lciFlags & ResponderLocation.LCI_FLAGS_MASK_VERSION);
+ }
+
+ /**
+ * Test for an invalid LCI element.
+ */
+ @Test
+ public void testLciInvalidElement() {
+ byte[] testBuffer = concatenateArrays(sTestLciIeHeader, sTestLciSE);
+ testBuffer[INDEX_ELEMENT_TYPE] = (byte) 0xFF;
+ ResponderLocation responderLocation =
+ new ResponderLocation(testBuffer, sTestLcrBufferHeader);
+
+ boolean valid = responderLocation.isValid();
+ boolean lciValid = responderLocation.isLciSubelementValid();
+ boolean zValid = responderLocation.isZsubelementValid();
+
+ assertFalse(valid);
+ assertFalse(lciValid);
+ assertFalse(zValid);
+ }
+
+ /**
+ * Test for an invalid subelement type.
+ */
+ @Test
+ public void testSkipLciSubElementUnusedOrUnknown() {
+ byte[] testLciBuffer = concatenateArrays(sTestLciIeHeader, sTestLciSE);
+ // Corrupt the subelement type to an unknown type.
+ testLciBuffer[sTestLciIeHeader.length + INDEX_SUBELEMENT_TYPE] = (byte) 0x77;
+ ResponderLocation responderLocation =
+ new ResponderLocation(testLciBuffer, sTestLcrBufferHeader);
+
+ boolean valid = responderLocation.isValid();
+ boolean lciValid = responderLocation.isLciSubelementValid();
+ boolean zValid = responderLocation.isZsubelementValid();
+
+ assertFalse(valid);
+ assertFalse(lciValid);
+ assertFalse(zValid);
+ }
+
+ /**
+ * Test for a subelement LCI length too small.
+ */
+ @Test
+ public void testInvalidLciSubElementLengthTooSmall() {
+ byte[] testLciBuffer = concatenateArrays(sTestLciIeHeader, sTestLciSE);
+ // Corrupt the length making it too small.
+ testLciBuffer[sTestLciIeHeader.length + INDEX_SUBELEMENT_LENGTH] = (byte) 0x01;
+ ResponderLocation responderLocation =
+ new ResponderLocation(testLciBuffer, sTestLcrBufferHeader);
+
+ boolean valid = responderLocation.isValid();
+ boolean lciValid = responderLocation.isLciSubelementValid();
+ boolean zValid = responderLocation.isZsubelementValid();
+
+ assertFalse(valid);
+ assertFalse(lciValid);
+ assertFalse(zValid);
+ }
+
+ /**
+ * Test for a subelement LCI length too big.
+ */
+ @Test
+ public void testInvalidLciSubElementLengthTooBig() {
+ byte[] testLciBuffer = concatenateArrays(sTestLciIeHeader, sTestLciSE);
+ // Corrupt the length making it too big.
+ testLciBuffer[sTestLciIeHeader.length + INDEX_SUBELEMENT_TYPE] = (byte) 0x11;
+ ResponderLocation responderLocation =
+ new ResponderLocation(testLciBuffer, sTestLcrBufferHeader);
+
+ boolean valid = responderLocation.isValid();
+ boolean lciValid = responderLocation.isLciSubelementValid();
+ boolean zValid = responderLocation.isZsubelementValid();
+
+ assertFalse(valid);
+ assertFalse(lciValid);
+ assertFalse(zValid);
+ }
+
+ /**
+ * Test for a valid Z (Height) subelement following an LCI subelement.
+ */
+ @Test
+ public void testLciValidZBufferSEAfterLci() {
+ byte[] testBufferTmp = concatenateArrays(sTestLciIeHeader, sTestLciSE);
+ byte[] testBuffer = concatenateArrays(testBufferTmp, sTestZHeightSE);
+ ResponderLocation responderLocation =
+ new ResponderLocation(testBuffer, sTestLcrBufferHeader);
+
+ boolean isValid = responderLocation.isValid();
+ boolean isZValid = responderLocation.isZsubelementValid();
+ boolean isLciValid = responderLocation.isLciSubelementValid();
+ double staFloorNumber = responderLocation.getStaFloorNumber();
+ double staHeightAboveFloorMeters = responderLocation.getStaHeightAboveFloorMeters();
+ double staHeightAboveFloorUncertaintyMeters =
+ responderLocation.getStaHeightAboveFloorUncertaintyMeters();
+
+ assertTrue(isValid);
+ assertTrue(isZValid);
+ assertTrue(isLciValid);
+ assertEquals(4.0, staFloorNumber);
+ assertEquals(2.8, staHeightAboveFloorMeters, HEIGHT_TOLERANCE_METERS);
+ assertEquals(0.125, staHeightAboveFloorUncertaintyMeters);
+ }
+
+ /**
+ * Test for a valid Usage Policy that is unrestrictive
+ */
+ @Test
+ public void testLciOpenUsagePolicy() {
+ byte[] testBufferTmp = concatenateArrays(sTestLciIeHeader, sTestLciSE);
+ byte[] testBuffer = concatenateArrays(testBufferTmp, sTestUsageSE1);
+ ResponderLocation responderLocation =
+ new ResponderLocation(testBuffer, sTestLcrBufferHeader);
+
+ boolean valid = responderLocation.isValid();
+ boolean retransmit = responderLocation.getRetransmitPolicyIndication();
+ boolean expiration = responderLocation.getRetentionExpiresIndication();
+ boolean extraInfo = responderLocation.getExtraInfoOnAssociationIndication();
+
+ assertTrue(valid);
+ assertTrue(retransmit);
+ assertFalse(expiration);
+ assertFalse(extraInfo);
+ }
+
+ /**
+ * Test for a valid Usage Policy that is restrictive
+ */
+ @Test
+ public void testLciRestrictiveUsagePolicy() {
+ byte[] testBufferTmp = concatenateArrays(sTestLciIeHeader, sTestLciSE);
+ byte[] testBuffer = concatenateArrays(testBufferTmp, sTestUsageSE2);
+ ResponderLocation responderLocation =
+ new ResponderLocation(testBuffer, sTestLcrBufferHeader);
+
+ boolean valid = responderLocation.isValid();
+ boolean retransmit = responderLocation.getRetransmitPolicyIndication();
+ boolean expiration = responderLocation.getRetentionExpiresIndication();
+ boolean extraInfo = responderLocation.getExtraInfoOnAssociationIndication();
+
+ assertFalse(valid);
+ assertFalse(retransmit);
+ assertTrue(expiration);
+ assertTrue(extraInfo);
+ }
+
+ /**
+ * Test for a valid BSSID element following an LCI subelement.
+ */
+ @Test
+ public void testLciBssidListSEAfterLci() {
+ byte[] testBufferTmp = concatenateArrays(sTestLciIeHeader, sTestLciSE);
+ byte[] testBuffer = concatenateArrays(testBufferTmp, sTestBssidListSE);
+ ResponderLocation responderLocation =
+ new ResponderLocation(testBuffer, sTestLcrBufferHeader);
+
+ boolean valid = responderLocation.isValid();
+ List<MacAddress> bssidList = responderLocation.getColocatedBssids();
+
+ assertTrue(valid);
+ assertEquals(2, bssidList.size());
+ MacAddress macAddress1 = bssidList.get(0);
+ assertEquals("01:02:03:04:05:06", macAddress1.toString());
+ MacAddress macAddress2 = bssidList.get(1);
+ assertEquals("f1:f2:f3:f4:f5:f6", macAddress2.toString());
+ }
+
+ /**
+ * Test for a valid BSSID element before and LCI element
+ */
+ @Test
+ public void testLciBssidListSEBeforeLci() {
+ byte[] testBufferTmp = concatenateArrays(sTestLciIeHeader, sTestBssidListSE);
+ byte[] testBuffer = concatenateArrays(testBufferTmp, sTestLciSE);
+ ResponderLocation responderLocation =
+ new ResponderLocation(testBuffer, sTestLcrBufferHeader);
+
+ boolean valid = responderLocation.isValid();
+ List<MacAddress> bssidList = responderLocation.getColocatedBssids();
+
+ assertTrue(valid);
+ assertEquals(2, bssidList.size());
+ MacAddress macAddress1 = bssidList.get(0);
+ assertEquals("01:02:03:04:05:06", macAddress1.toString());
+ MacAddress macAddress2 = bssidList.get(1);
+ assertEquals("f1:f2:f3:f4:f5:f6", macAddress2.toString());
+ }
+
+ /**
+ * Test that a valid address can be extracted from a valid lcr buffer with Civic Location.
+ */
+ @Test
+ public void testLcrTestCivicLocationAddress() {
+ byte[] testLciBuffer = concatenateArrays(sTestLciIeHeader, sTestLciSE);
+ byte[] testLcrBuffer =
+ concatenateArrays(sTestLcrBufferHeader, sTestCivicLocationSEWithAddress);
+ ResponderLocation responderLocation = new ResponderLocation(testLciBuffer, testLcrBuffer);
+
+ boolean valid = responderLocation.isValid();
+ String countryCode = responderLocation.getCivicLocationCountryCode();
+ Address address = responderLocation.toCivicLocationAddress();
+
+ assertTrue(valid);
+ assertEquals("US", countryCode);
+ assertEquals("", address.getAddressLine(0));
+ assertEquals("15 Alto", address.getAddressLine(1));
+ assertEquals("Mtn View", address.getAddressLine(2));
+ assertEquals("CA 94043", address.getAddressLine(3));
+ assertEquals("US", address.getAddressLine(4));
+ }
+
+ /**
+ * Test that a URL can be extracted from a valid lcr buffer with a map image subelement.
+ */
+ @Test
+ public void testLcrCheckMapUrlIsValid() {
+ byte[] testLciBuffer = concatenateArrays(sTestLciIeHeader, sTestLciSE);
+ byte[] testLcrBuffer = concatenateArrays(sTestLcrBufferHeader, sTestMapUrlSE);
+ ResponderLocation responderLocation = new ResponderLocation(testLciBuffer, testLcrBuffer);
+
+ boolean valid = responderLocation.isValid();
+ int mapImageType = responderLocation.getMapImageType();
+ String urlString = "";
+ if (responderLocation.getMapImageUrl() != null) {
+ urlString = responderLocation.getMapImageUrl().toString();
+ }
+
+ assertTrue(valid);
+ assertEquals(ResponderLocation.MAP_TYPE_URL_DEFINED, mapImageType);
+ assertEquals("https://map.com/mall.jpg", urlString);
+ }
+
+ /**
+ * Test the object is parcelable
+ */
+ @Test
+ public void testResponderLocationParcelable() {
+ byte[] testLciBuffer = concatenateArrays(sTestLciIeHeader, sTestLciSE);
+ ResponderLocation responderLocation =
+ new ResponderLocation(testLciBuffer, sTestLcrBufferHeader);
+
+ Parcel parcel = Parcel.obtain();
+ responderLocation.writeToParcel(parcel, 0);
+ parcel.setDataPosition(0);
+ ResponderLocation responderLocationFromParcel =
+ ResponderLocation.CREATOR.createFromParcel(parcel);
+
+ assertEquals(responderLocationFromParcel, responderLocation);
+ }
+
+ /* Helper Method */
+
+ /**
+ * Concatenate two arrays.
+ *
+ * @param a first array
+ * @param b second array
+ * @return a third array which is the concatenation of the two array params
+ */
+ private byte[] concatenateArrays(byte[] a, byte[] b) {
+ int aLen = a.length;
+ int bLen = b.length;
+ byte[] c = new byte[aLen + bLen];
+ System.arraycopy(a, 0, c, 0, aLen);
+ System.arraycopy(b, 0, c, aLen, bLen);
+ return c;
+ }
+}
diff --git a/wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java b/wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java
index afc7dff..53bd837 100644
--- a/wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java
+++ b/wifi/tests/src/android/net/wifi/rtt/WifiRttManagerTest.java
@@ -81,7 +81,7 @@
List<RangingResult> results = new ArrayList<>();
results.add(
new RangingResult(RangingResult.STATUS_SUCCESS, MacAddress.BROADCAST_ADDRESS, 15, 5,
- 10, 8, 5, null, null, 666));
+ 10, 8, 5, null, null, null, 666));
RangingResultCallback callbackMock = mock(RangingResultCallback.class);
ArgumentCaptor<IRttCallback> callbackCaptor = ArgumentCaptor.forClass(IRttCallback.class);
@@ -243,7 +243,7 @@
// RangingResults constructed with a MAC address
RangingResult result = new RangingResult(status, mac, distanceCm, distanceStdDevCm, rssi,
- numAttemptedMeasurements, numSuccessfulMeasurements, lci, lcr, timestamp);
+ numAttemptedMeasurements, numSuccessfulMeasurements, lci, lcr, null, timestamp);
Parcel parcelW = Parcel.obtain();
result.writeToParcel(parcelW, 0);
@@ -259,7 +259,7 @@
// RangingResults constructed with a PeerHandle
result = new RangingResult(status, peerHandle, distanceCm, distanceStdDevCm, rssi,
- numAttemptedMeasurements, numSuccessfulMeasurements, null, null, timestamp);
+ numAttemptedMeasurements, numSuccessfulMeasurements, null, null, null, timestamp);
parcelW = Parcel.obtain();
result.writeToParcel(parcelW, 0);
@@ -292,9 +292,9 @@
byte[] lcr = { };
RangingResult rr1 = new RangingResult(status, mac, distanceCm, distanceStdDevCm, rssi,
- numAttemptedMeasurements, numSuccessfulMeasurements, lci, lcr, timestamp);
+ numAttemptedMeasurements, numSuccessfulMeasurements, lci, lcr, null, timestamp);
RangingResult rr2 = new RangingResult(status, mac, distanceCm, distanceStdDevCm, rssi,
- numAttemptedMeasurements, numSuccessfulMeasurements, null, null, timestamp);
+ numAttemptedMeasurements, numSuccessfulMeasurements, null, null, null, timestamp);
assertEquals(rr1, rr2);
}